From 67f5b38391f8e24f5605cf08d5889adb570d720e Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 22 Oct 2016 04:18:31 +0200
Subject: [PATCH] UI finetuning and minor code formatting

---
 src/blackcore/simulator.h                     |   1 -
 .../components/aircraftcombinedtypeselector.h |   1 -
 src/blackgui/components/atcstationcomponent.h |   1 -
 src/blackgui/components/internalscomponent.ui | 233 ++++++++++--------
 .../settingssimulatormessagescomponent.ui     |  34 ++-
 .../models/statusmessagelistmodel.cpp         |   2 +-
 6 files changed, 159 insertions(+), 113 deletions(-)

diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h
index b8a275be8..6a3d3548c 100644
--- a/src/blackcore/simulator.h
+++ b/src/blackcore/simulator.h
@@ -44,7 +44,6 @@ namespace BlackMisc
 
 namespace BlackCore
 {
-
     //! Interface to a simulator.
     class BLACKCORE_EXPORT ISimulator :
         public QObject,
diff --git a/src/blackgui/components/aircraftcombinedtypeselector.h b/src/blackgui/components/aircraftcombinedtypeselector.h
index 998245941..d73ec7f98 100644
--- a/src/blackgui/components/aircraftcombinedtypeselector.h
+++ b/src/blackgui/components/aircraftcombinedtypeselector.h
@@ -24,7 +24,6 @@ class QWidget;
 
 namespace BlackMisc { namespace Aviation { class CAircraftIcaoCode; } }
 namespace Ui { class CAircraftCombinedTypeSelector; }
-
 namespace BlackGui
 {
     namespace Components
diff --git a/src/blackgui/components/atcstationcomponent.h b/src/blackgui/components/atcstationcomponent.h
index e9a68814d..d3925d3e4 100644
--- a/src/blackgui/components/atcstationcomponent.h
+++ b/src/blackgui/components/atcstationcomponent.h
@@ -33,7 +33,6 @@ class QWidget;
 
 namespace BlackMisc { namespace Aviation { class CCallsign; } }
 namespace Ui { class CAtcStationComponent; }
-
 namespace BlackGui
 {
     class CDockWidgetInfoArea;
diff --git a/src/blackgui/components/internalscomponent.ui b/src/blackgui/components/internalscomponent.ui
index 0d9209946..e8f1892b3 100644
--- a/src/blackgui/components/internalscomponent.ui
+++ b/src/blackgui/components/internalscomponent.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>277</width>
+    <width>282</width>
     <height>450</height>
    </rect>
   </property>
@@ -118,10 +118,10 @@
          </layout>
         </widget>
        </item>
-       <item>
+       <item alignment="Qt::AlignHCenter">
         <widget class="QLabel" name="lbl_Disclaimer_1">
          <property name="text">
-          <string>WORK IN PROGRES!!!!!</string>
+          <string>WORK IN PROGRESS!</string>
          </property>
         </widget>
        </item>
@@ -154,7 +154,7 @@
         </rect>
        </property>
        <property name="text">
-        <string>WORK IN PROGRES!!!!!</string>
+        <string>WORK IN PROGRESS!</string>
        </property>
       </widget>
      </widget>
@@ -167,7 +167,7 @@
         <number>0</number>
        </property>
        <property name="topMargin">
-        <number>0</number>
+        <number>4</number>
        </property>
        <property name="rightMargin">
         <number>0</number>
@@ -176,39 +176,34 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="QGroupBox" name="gb_Aircraft">
-         <property name="title">
-          <string>Aircraft</string>
-         </property>
-         <layout class="QVBoxLayout" name="vl_GroupAircraftSelector">
-          <property name="spacing">
-           <number>2</number>
-          </property>
+        <widget class="QFrame" name="fr_Aircraft">
+         <layout class="QFormLayout" name="fl_Aircraft">
           <property name="leftMargin">
-           <number>4</number>
+           <number>2</number>
           </property>
           <property name="topMargin">
-           <number>6</number>
+           <number>0</number>
           </property>
           <property name="rightMargin">
-           <number>4</number>
-          </property>
-          <property name="bottomMargin">
            <number>2</number>
           </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">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="frameShape">
-             <enum>QFrame::StyledPanel</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>25</height>
+             </size>
             </property>
            </widget>
           </item>
@@ -256,13 +251,13 @@
              </property>
              <layout class="QVBoxLayout" name="vl_GroupParts">
               <property name="spacing">
-               <number>6</number>
+               <number>4</number>
               </property>
               <property name="leftMargin">
                <number>4</number>
               </property>
               <property name="topMargin">
-               <number>6</number>
+               <number>4</number>
               </property>
               <property name="rightMargin">
                <number>4</number>
@@ -275,13 +270,6 @@
                 <property name="spacing">
                  <number>6</number>
                 </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">
                  <widget class="QCheckBox" name="cb_AircraftPartsLightsStrobe">
                   <property name="text">
@@ -289,6 +277,13 @@
                   </property>
                  </widget>
                 </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">
                  <widget class="QCheckBox" name="cb_AircraftPartsGearDown">
                   <property name="text">
@@ -296,13 +291,6 @@
                   </property>
                  </widget>
                 </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">
                  <widget class="QLabel" name="lbl_AircraftPartsEngines">
                   <property name="text">
@@ -310,41 +298,6 @@
                   </property>
                  </widget>
                 </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">
                  <widget class="QCheckBox" name="cb_AircraftPartsLightsBeacon">
                   <property name="text">
@@ -352,17 +305,17 @@
                   </property>
                  </widget>
                 </item>
-                <item row="3" column="1">
-                 <widget class="QCheckBox" name="cb_AircraftPartsLightsNav">
+                <item row="0" column="0">
+                 <widget class="QLabel" name="lbl_AircraftPartsFlapsPercentage">
                   <property name="text">
-                   <string>Nav</string>
+                   <string>Flaps %:</string>
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="0">
-                 <widget class="QLabel" name="lbl_AircraftPartsLights">
+                <item row="1" column="1">
+                 <widget class="QCheckBox" name="cb_AircraftPartsSpoilers">
                   <property name="text">
-                   <string>Lights:</string>
+                   <string>Spoilers</string>
                   </property>
                  </widget>
                 </item>
@@ -373,6 +326,13 @@
                   </property>
                  </widget>
                 </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">
                  <widget class="QCheckBox" name="cb_AircraftPartsLightsLogo">
                   <property name="text">
@@ -380,10 +340,10 @@
                   </property>
                  </widget>
                 </item>
-                <item row="7" column="1">
-                 <widget class="QCheckBox" name="cb_AircraftPartsEngine5">
+                <item row="3" column="1">
+                 <widget class="QCheckBox" name="cb_AircraftPartsLightsNav">
                   <property name="text">
-                   <string>5</string>
+                   <string>Nav</string>
                   </property>
                  </widget>
                 </item>
@@ -404,6 +364,13 @@
                   </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="1">
                  <widget class="QPushButton" name="pb_AircraftPartsEnginesOn">
                   <property name="text">
@@ -418,20 +385,6 @@
                   </property>
                  </widget>
                 </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">
                  <widget class="QPushButton" name="pb_AircraftPartsEnginesOff">
                   <property name="text">
@@ -446,6 +399,78 @@
                   </property>
                  </widget>
                 </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>
               </item>
              </layout>
diff --git a/src/blackgui/components/settingssimulatormessagescomponent.ui b/src/blackgui/components/settingssimulatormessagescomponent.ui
index e62bf9ae5..e1bed949d 100644
--- a/src/blackgui/components/settingssimulatormessagescomponent.ui
+++ b/src/blackgui/components/settingssimulatormessagescomponent.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>268</width>
-    <height>254</height>
+    <width>262</width>
+    <height>242</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -25,7 +25,19 @@
      <property name="title">
       <string>Technical messages</string>
      </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">
        <widget class="QRadioButton" name="rb_ErrorsOnly">
         <property name="text">
@@ -53,7 +65,7 @@
       <item row="1" column="0">
        <widget class="QRadioButton" name="rb_ErrorsAndWarnings">
         <property name="text">
-         <string>wanrings</string>
+         <string>warnings</string>
         </property>
        </widget>
       </item>
@@ -85,7 +97,19 @@
      <property name="title">
       <string>Message type</string>
      </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">
        <widget class="QCheckBox" name="cb_PrivateMessages">
         <property name="text">
diff --git a/src/blackgui/models/statusmessagelistmodel.cpp b/src/blackgui/models/statusmessagelistmodel.cpp
index 847bde440..8a9bc054d 100644
--- a/src/blackgui/models/statusmessagelistmodel.cpp
+++ b/src/blackgui/models/statusmessagelistmodel.cpp
@@ -46,8 +46,8 @@ namespace BlackGui
                     CColumn col = CColumn("severity", CStatusMessage::IndexIcon);
                     col.setSortPropertyIndex(CStatusMessage::IndexSeverityAsString);
                     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("category", CStatusMessage::IndexCategoryHumanReadableOrTechnicalAsString));
 
                     this->m_sortColumn = CStatusMessage::IndexUtcTimestamp;
                     this->m_sortOrder = Qt::DescendingOrder;