From d398fc7e9ec5bf6a8734bd0afb0224d01a8fa707 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Thu, 1 Dec 2016 03:01:43 +0100
Subject: [PATCH] refs #820, tab order in test UI

---
 src/blackcore/aircraftmatcher.cpp             |  4 +-
 .../components/modelmatchercomponent.ui       | 51 ++++++++++---------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp
index b824cb3e3..b87f82804 100644
--- a/src/blackcore/aircraftmatcher.cpp
+++ b/src/blackcore/aircraftmatcher.cpp
@@ -436,11 +436,11 @@ namespace BlackCore
         {
             if (model.hasModelString())
             {
-                CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Found exact match for " + model.getModelString());
+                CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QString("Found exact match for '%1'").arg(model.getModelString()));
             }
             else
             {
-                CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "No exact match for " + model.getModelString());
+                CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QString("No exact match for '%1'").arg(remoteAircraft.getModelString()));
             }
         }
         model.setModelType(CAircraftModel::TypeModelMatching);
diff --git a/src/blackgui/components/modelmatchercomponent.ui b/src/blackgui/components/modelmatchercomponent.ui
index a510c4468..461d9d041 100644
--- a/src/blackgui/components/modelmatchercomponent.ui
+++ b/src/blackgui/components/modelmatchercomponent.ui
@@ -34,21 +34,15 @@
    </property>
    <item row="0" column="1">
     <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="BlackGui::Components::CAircraftCombinedTypeSelector" name="comp_CombinedCode">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
      </property>
     </widget>
    </item>
@@ -60,11 +54,8 @@
        <height>0</height>
       </size>
      </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
      </property>
     </widget>
    </item>
@@ -102,11 +93,8 @@
    </item>
    <item row="3" column="3">
     <widget class="BlackGui::Components::CDbLiverySelectorComponent" name="comp_LiverySelector">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
      </property>
     </widget>
    </item>
@@ -118,11 +106,8 @@
        <height>0</height>
       </size>
      </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
      </property>
     </widget>
    </item>
@@ -314,6 +299,22 @@
    <header>blackgui/views/statusmessageview.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>comp_SimulatorSelector</tabstop>
+  <tabstop>le_ModelSetCount</tabstop>
+  <tabstop>comp_AircraftSelector</tabstop>
+  <tabstop>comp_AirlineSelector</tabstop>
+  <tabstop>comp_CombinedCode</tabstop>
+  <tabstop>comp_LiverySelector</tabstop>
+  <tabstop>le_Manufacturer</tabstop>
+  <tabstop>le_Callsign</tabstop>
+  <tabstop>le_ModelString</tabstop>
+  <tabstop>pb_ReverseLookup</tabstop>
+  <tabstop>pb_ModelMatching</tabstop>
+  <tabstop>cb_withReverseLookup</tabstop>
+  <tabstop>te_Results</tabstop>
+  <tabstop>tvp_ResultMessages</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>