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

UI finetuning and minor code formatting

Browse Source
This commit is contained in:
Klaus Basan
2016-10-22 04:18:31 +02:00
parent f8fe843687
commit 67f5b38391
6 changed files with 159 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackcore/simulator.h
View File

@@ -44,7 +44,6 @@ namespace BlackMisc
namespace BlackCore namespace BlackCore
{ {
//! Interface to a simulator. //! Interface to a simulator.
class BLACKCORE_EXPORT ISimulator : class BLACKCORE_EXPORT ISimulator :
public QObject, public QObject,

1
src/blackgui/components/aircraftcombinedtypeselector.h
View File

@@ -24,7 +24,6 @@ class QWidget;
namespace BlackMisc { namespace Aviation { class CAircraftIcaoCode; } } namespace BlackMisc { namespace Aviation { class CAircraftIcaoCode; } }
namespace Ui { class CAircraftCombinedTypeSelector; } namespace Ui { class CAircraftCombinedTypeSelector; }
namespace BlackGui namespace BlackGui
{ {
namespace Components namespace Components

1
src/blackgui/components/atcstationcomponent.h
View File

@@ -33,7 +33,6 @@ class QWidget;
namespace BlackMisc { namespace Aviation { class CCallsign; } } namespace BlackMisc { namespace Aviation { class CCallsign; } }
namespace Ui { class CAtcStationComponent; } namespace Ui { class CAtcStationComponent; }
namespace BlackGui namespace BlackGui
{ {
class CDockWidgetInfoArea; class CDockWidgetInfoArea;

233
src/blackgui/components/internalscomponent.ui
View File

@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>277</width> <width>282</width>
<height>450</height> <height>450</height>
</rect> </rect>
</property> </property>
@@ -118,10 +118,10 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="lbl_Disclaimer_1"> <widget class="QLabel" name="lbl_Disclaimer_1">
<property name="text"> <property name="text">
<string>WORK IN PROGRES!!!!!</string> <string>WORK IN PROGRESS!</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -154,7 +154,7 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>WORK IN PROGRES!!!!!</string> <string>WORK IN PROGRESS!</string>
</property> </property>
</widget> </widget>
</widget> </widget>
@@ -167,7 +167,7 @@
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>4</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>0</number>
@@ -176,39 +176,34 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="gb_Aircraft"> <widget class="QFrame" name="fr_Aircraft">
<property name="title"> <layout class="QFormLayout" name="fl_Aircraft">
<string>Aircraft</string>
</property>
<layout class="QVBoxLayout" name="vl_GroupAircraftSelector">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin"> <property name="leftMargin">
<number>4</number> <number>2</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>6</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item> <property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lbl_Aircraft">
<property name="text">
<string>Aircraft:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="BlackGui::Components::CRemoteAircraftSelector" name="comp_RemoteAircraftSelector"> <widget class="BlackGui::Components::CRemoteAircraftSelector" name="comp_RemoteAircraftSelector">
<property name="sizePolicy"> <property name="minimumSize">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <size>
<horstretch>0</horstretch> <width>0</width>
<verstretch>0</verstretch> <height>25</height>
</sizepolicy> </size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property> </property>
</widget> </widget>
</item> </item>
@@ -256,13 +251,13 @@
</property> </property>
<layout class="QVBoxLayout" name="vl_GroupParts"> <layout class="QVBoxLayout" name="vl_GroupParts">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>4</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>4</number> <number>4</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>6</number> <number>4</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>4</number> <number>4</number>
@@ -275,13 +270,6 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="3" column="2">
<widget class="QCheckBox" name="cb_AircraftPartsLightsLanding">
<property name="text">
<string>Landing</string>
</property>
</widget>
</item>
<item row="4" column="1"> <item row="4" column="1">
<widget class="QCheckBox" name="cb_AircraftPartsLightsStrobe"> <widget class="QCheckBox" name="cb_AircraftPartsLightsStrobe">
<property name="text"> <property name="text">
@@ -289,6 +277,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2">
<widget class="QCheckBox" name="cb_AircraftPartsLightsLanding">
<property name="text">
<string>Landing</string>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="cb_AircraftPartsGearDown"> <widget class="QCheckBox" name="cb_AircraftPartsGearDown">
<property name="text"> <property name="text">
@@ -296,13 +291,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1">
<widget class="QCheckBox" name="cb_AircraftPartsEngine2">
<property name="text">
<string>2</string>
</property>
</widget>
</item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLabel" name="lbl_AircraftPartsEngines"> <widget class="QLabel" name="lbl_AircraftPartsEngines">
<property name="text"> <property name="text">
@@ -310,41 +298,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0">
<widget class="QCheckBox" name="cb_AircraftPartsEngine1">
<property name="text">
<string>1</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lbl_AircraftPartsFlapsPercentage">
<property name="text">
<string>Flaps %:</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QCheckBox" name="cb_AircraftPartsEngine4">
<property name="text">
<string>4</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QCheckBox" name="cb_AircraftPartsEngine3">
<property name="text">
<string>3</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="cb_AircraftPartsSpoilers">
<property name="text">
<string>Spoilers</string>
</property>
</widget>
</item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QCheckBox" name="cb_AircraftPartsLightsBeacon"> <widget class="QCheckBox" name="cb_AircraftPartsLightsBeacon">
<property name="text"> <property name="text">
@@ -352,17 +305,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="0" column="0">
<widget class="QCheckBox" name="cb_AircraftPartsLightsNav"> <widget class="QLabel" name="lbl_AircraftPartsFlapsPercentage">
<property name="text"> <property name="text">
<string>Nav</string> <string>Flaps %:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="1">
<widget class="QLabel" name="lbl_AircraftPartsLights"> <widget class="QCheckBox" name="cb_AircraftPartsSpoilers">
<property name="text"> <property name="text">
<string>Lights:</string> <string>Spoilers</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -373,6 +326,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_AircraftPartsLights">
<property name="text">
<string>Lights:</string>
</property>
</widget>
</item>
<item row="4" column="2"> <item row="4" column="2">
<widget class="QCheckBox" name="cb_AircraftPartsLightsLogo"> <widget class="QCheckBox" name="cb_AircraftPartsLightsLogo">
<property name="text"> <property name="text">
@@ -380,10 +340,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="3" column="1">
<widget class="QCheckBox" name="cb_AircraftPartsEngine5"> <widget class="QCheckBox" name="cb_AircraftPartsLightsNav">
<property name="text"> <property name="text">
<string>5</string> <string>Nav</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -404,6 +364,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2">
<widget class="QPushButton" name="pb_AircraftPartsLightsOff">
<property name="text">
<string>all off</string>
</property>
</widget>
</item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QPushButton" name="pb_AircraftPartsEnginesOn"> <widget class="QPushButton" name="pb_AircraftPartsEnginesOn">
<property name="text"> <property name="text">
@@ -418,20 +385,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="2">
<widget class="QCheckBox" name="cb_AircraftPartsEngine6">
<property name="text">
<string>6</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="pb_AircraftPartsLightsOff">
<property name="text">
<string>all off</string>
</property>
</widget>
</item>
<item row="5" column="2"> <item row="5" column="2">
<widget class="QPushButton" name="pb_AircraftPartsEnginesOff"> <widget class="QPushButton" name="pb_AircraftPartsEnginesOff">
<property name="text"> <property name="text">
@@ -446,6 +399,78 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="3">
<widget class="QFrame" name="fr_Engines">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="hl_Engines">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="cb_AircraftPartsEngine1">
<property name="text">
<string>1</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_AircraftPartsEngine2">
<property name="text">
<string>2</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_AircraftPartsEngine3">
<property name="text">
<string>3</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_AircraftPartsEngine4">
<property name="text">
<string>4</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_AircraftPartsEngine5">
<property name="text">
<string>5</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_AircraftPartsEngine6">
<property name="text">
<string>6</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

34
src/blackgui/components/settingssimulatormessagescomponent.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>268</width> <width>262</width>
<height>254</height> <height>242</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -25,7 +25,19 @@
<property name="title"> <property name="title">
<string>Technical messages</string> <string>Technical messages</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gl_TechnicalMessages">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QRadioButton" name="rb_ErrorsOnly"> <widget class="QRadioButton" name="rb_ErrorsOnly">
<property name="text"> <property name="text">
@@ -53,7 +65,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QRadioButton" name="rb_ErrorsAndWarnings"> <widget class="QRadioButton" name="rb_ErrorsAndWarnings">
<property name="text"> <property name="text">
<string>wanrings</string> <string>warnings</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -85,7 +97,19 @@
<property name="title"> <property name="title">
<string>Message type</string> <string>Message type</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gl_MessageTypes">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QCheckBox" name="cb_PrivateMessages"> <widget class="QCheckBox" name="cb_PrivateMessages">
<property name="text"> <property name="text">

2
src/blackgui/models/statusmessagelistmodel.cpp
View File

@@ -46,8 +46,8 @@ namespace BlackGui
CColumn col = CColumn("severity", CStatusMessage::IndexIcon); CColumn col = CColumn("severity", CStatusMessage::IndexIcon);
col.setSortPropertyIndex(CStatusMessage::IndexSeverityAsString); col.setSortPropertyIndex(CStatusMessage::IndexSeverityAsString);
this->m_columns.addColumn(col); this->m_columns.addColumn(col);
this->m_columns.addColumn(CColumn::standardString("category", CStatusMessage::IndexCategoryHumanReadableOrTechnicalAsString));
this->m_columns.addColumn(CColumn::standardString("message", CStatusMessage::IndexMessage)); this->m_columns.addColumn(CColumn::standardString("message", CStatusMessage::IndexMessage));
this->m_columns.addColumn(CColumn::standardString("category", CStatusMessage::IndexCategoryHumanReadableOrTechnicalAsString));
this->m_sortColumn = CStatusMessage::IndexUtcTimestamp; this->m_sortColumn = CStatusMessage::IndexUtcTimestamp;
this->m_sortOrder = Qt::DescendingOrder; this->m_sortOrder = Qt::DescendingOrder;