flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 18:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Slightly changed ATC stations appearance, reload ATIS / load METAR

Browse Source
This commit is contained in:
Klaus Basan
2014-09-15 00:37:20 +02:00
parent 2d1226fefc
commit b989dec74d
6 changed files with 116 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackgui/components/atcstationcomponent.cpp
View File

@@ -33,6 +33,12 @@ namespace BlackGui
ui->setupUi(this); ui->setupUi(this);
this->m_timerComponent = new CTimerBasedComponent(SLOT(update()), this); this->m_timerComponent = new CTimerBasedComponent(SLOT(update()), this);
// some icons
this->ui->pb_AtcStationsAtisReload->setIcon(CIcons::atis());
this->ui->pb_AtcStationsAtisReload->setText("");
this->ui->pb_AtcStationsLoadMetar->setIcon(CIcons::metar());
this->ui->pb_AtcStationsLoadMetar->setText("");
// set station mode // set station mode
this->ui->tvp_AtcStationsOnline->setStationMode(CAtcStationListModel::StationsOnline); this->ui->tvp_AtcStationsOnline->setStationMode(CAtcStationListModel::StationsOnline);
this->ui->tvp_AtcStationsBooked->setStationMode(CAtcStationListModel::StationsBooked); this->ui->tvp_AtcStationsBooked->setStationMode(CAtcStationListModel::StationsBooked);

173
src/blackgui/components/atcstationcomponent.ui
View File

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>400</width>
<height>501</height> <height>462</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -39,7 +39,7 @@
<item> <item>
<widget class="BlackGui::Views::CAtcStationView" name="tvp_AtcStationsOnline"> <widget class="BlackGui::Views::CAtcStationView" name="tvp_AtcStationsOnline">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -67,70 +67,6 @@
</attribute> </attribute>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="gb_AtcStationsOnlineInfo">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>110</height>
</size>
</property>
<property name="title">
<string>Info (ATIS, METAR, ...)</string>
</property>
<layout class="QVBoxLayout" name="vl_AtcStationsOnlineAtisGroup">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
<widget class="QTextEdit" name="te_AtcStationsOnlineInfo">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>100</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QFrame" name="fr_AtcStationsOnlineBottom"> <widget class="QFrame" name="fr_AtcStationsOnlineBottom">
<property name="sizePolicy"> <property name="sizePolicy">
@@ -142,7 +78,7 @@
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>25</height> <height>75</height>
</size> </size>
</property> </property>
<property name="frameShape"> <property name="frameShape">
@@ -151,12 +87,12 @@
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_6"> <layout class="QGridLayout" name="gl_AtcStationsInfoAtis">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum> <enum>QLayout::SetDefaultConstraint</enum>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>5</number> <number>2</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
@@ -165,35 +101,15 @@
<number>2</number> <number>2</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>2</number>
</property> </property>
<item row="0" column="1"> <property name="horizontalSpacing">
<widget class="QPushButton" name="pb_AtcStationsLoadMetar"> <number>2</number>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="text"> <property name="verticalSpacing">
<string>Load METAR</string> <number>4</number>
</property> </property>
</widget> <item row="1" column="3">
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pb_AtcStationsAtisReload">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Reload ATIS</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLineEdit" name="le_AtcStationsOnlineMetar"> <widget class="QLineEdit" name="le_AtcStationsOnlineMetar">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -203,12 +119,12 @@
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>60</width> <width>40</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string extracomment="Airport ICAO code"/> <string extracomment="METAR: Airport ICAO code">METAR: Airport ICAO code</string>
</property> </property>
<property name="text"> <property name="text">
<string>EDDF</string> <string>EDDF</string>
@@ -221,6 +137,69 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="3">
<widget class="QPushButton" name="pb_AtcStationsLoadMetar">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Load METAR</string>
</property>
<property name="text">
<string>METAR</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QPushButton" name="pb_AtcStationsAtisReload">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Reload ATIS</string>
</property>
<property name="text">
<string>ATIS</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="1" rowspan="4" colspan="2">
<widget class="QTextEdit" name="te_AtcStationsOnlineInfo">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

4
src/blackgui/dockwidget.cpp
View File

@@ -100,13 +100,13 @@ namespace BlackGui
void CDockWidget::hideEvent(QHideEvent *event) void CDockWidget::hideEvent(QHideEvent *event)
{ {
qDebug() << "hide" << this->objectName() << "v:" << isVisible() << "h:" << isHidden(); // qDebug() << "hide" << this->objectName() << "v:" << isVisible() << "h:" << isHidden();
QDockWidget::hideEvent(event); QDockWidget::hideEvent(event);
} }
void CDockWidget::showEvent(QShowEvent *event) void CDockWidget::showEvent(QShowEvent *event)
{ {
qDebug() << "show" << this->objectName() << "v:" << isVisible() << "h:" << isHidden(); // qDebug() << "show" << this->objectName() << "v:" << isVisible() << "h:" << isHidden();
QDockWidget::showEvent(event); QDockWidget::showEvent(event);
} }

2
src/blackmisc/iconlist.cpp
View File

@@ -35,7 +35,9 @@ namespace BlackMisc
static const CIconList icons( static const CIconList icons(
{ {
// keep indexes alphabetically sorted and in sync with CIcons // keep indexes alphabetically sorted and in sync with CIcons
CIcon(CIcons::AviationAtis, "ATIS"),
CIcon(CIcons::AviationAttitudeIndicator, "attitude indicator"), CIcon(CIcons::AviationAttitudeIndicator, "attitude indicator"),
CIcon(CIcons::AviationMetar, "METAR"),
CIcon(CIcons::GeoPosition, "geo position"), CIcon(CIcons::GeoPosition, "geo position"),
CIcon(CIcons::NetworkCapabilityTextOnly, "text only"), CIcon(CIcons::NetworkCapabilityTextOnly, "text only"),
CIcon(CIcons::NetworkCapabilityUnknown, "unknown"), CIcon(CIcons::NetworkCapabilityUnknown, "unknown"),

2
src/blackmisc/icons.cpp
View File

@@ -30,7 +30,9 @@ namespace BlackMisc
{ {
switch (index) switch (index)
{ {
case AviationAtis: return atis();
case AviationAttitudeIndicator: return attitudeIndicator16(); case AviationAttitudeIndicator: return attitudeIndicator16();
case AviationMetar: return metar();
case GeoPosition: return geoPosition16(); case GeoPosition: return geoPosition16();
case NetworkCapabilityTextOnly: return capabilityTextOnly(); case NetworkCapabilityTextOnly: return capabilityTextOnly();
case NetworkCapabilityUnknown: return capabilityUnknown(); case NetworkCapabilityUnknown: return capabilityUnknown();

14
src/blackmisc/icons.h
View File

@@ -29,6 +29,8 @@ namespace BlackMisc
{ {
// keep indexes alphabetically sorted and in sync with CIconList // keep indexes alphabetically sorted and in sync with CIconList
AviationAttitudeIndicator, AviationAttitudeIndicator,
AviationAtis,
AviationMetar,
GeoPosition, GeoPosition,
NetworkCapabilityTextOnly, NetworkCapabilityTextOnly,
NetworkCapabilityUnknown, NetworkCapabilityUnknown,
@@ -683,6 +685,18 @@ namespace BlackMisc
return pm; return pm;
} }
//! METAR
static const QPixmap &metar()
{
return weatherCloudy16();
}
//! ATIS
static const QPixmap &atis()
{
return text16();
}
//! Geo position //! Geo position
static const QPixmap &geoPosition16() static const QPixmap &geoPosition16()
{ {