From 530ddb3d9f6c828f59ad6a93f24988904882c9fb Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 25 Nov 2015 03:39:33 +0100
Subject: [PATCH] refs #521 some minor fixes (after batch refactoring meeting)
 * adjusted simulator info so it can handle X-Plane string * improved qss *
 some size constraints in GUI

---
 .../settingsnetworkserverscomponent.ui           |  2 +-
 src/blackgui/qss/stdwidget.qss                   | 16 ++++++++--------
 src/blackmisc/simulation/simulatorinfo.cpp       | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/blackgui/components/settingsnetworkserverscomponent.ui b/src/blackgui/components/settingsnetworkserverscomponent.ui
index 5ba833772..4d789274f 100644
--- a/src/blackgui/components/settingsnetworkserverscomponent.ui
+++ b/src/blackgui/components/settingsnetworkserverscomponent.ui
@@ -56,7 +56,7 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>80</height>
+       <height>120</height>
       </size>
      </property>
      <property name="frameShape">
diff --git a/src/blackgui/qss/stdwidget.qss b/src/blackgui/qss/stdwidget.qss
index 855f1914d..1e31713c2 100644
--- a/src/blackgui/qss/stdwidget.qss
+++ b/src/blackgui/qss/stdwidget.qss
@@ -129,7 +129,7 @@ QPushButton {
   background-color: rgba(0, 0, 255, 128);
   border-style: 1px solid yellow;
   border-radius:3px;
-  color: yellow;
+  color: yellow;  /** font color **/
   padding: 0px;
   margin-right: 5px;
   min-width:60px;
@@ -137,14 +137,19 @@ QPushButton {
 }
 
 QPushButton::disabled {
-  background-color: grey;
+  background-color: rgba(77, 88, 99, 128); /** slated gray if a channel)
   border-style: none;
-  border-radius:3px;
+  border-radius: 3px;
   color: white;
   padding: 0px;
   margin-right: 5px;
 }
 
+QToolButton {
+  background-color: transparent; /* transparent tool buttons */
+  border: 0px;
+}
+
 QProgressBar {
   border: 1px solid green;
   border-radius: 5px;
@@ -222,11 +227,6 @@ QLabel {
   background: transparent;
 }
 
-QToolButton {
-  background-color: transparent; /* transparent tool buttons */
-  border: 0px;
-}
-
 QLineEdit {
   background: transparent;
   border: 1px solid green;
diff --git a/src/blackmisc/simulation/simulatorinfo.cpp b/src/blackmisc/simulation/simulatorinfo.cpp
index 9099b7715..54fb43ae7 100644
--- a/src/blackmisc/simulation/simulatorinfo.cpp
+++ b/src/blackmisc/simulation/simulatorinfo.cpp
@@ -121,23 +121,23 @@ namespace BlackMisc
 
         CSimulatorInfo::Simulator CSimulatorInfo::identifierToFlag(const QString &identifier)
         {
-            QString i(identifier.toLower().trimmed());
+            QString i(identifier.toLower().trimmed().remove(' ').remove('-'));
             if (i.isEmpty()) { return None; }
 
             Simulator s = None;
-            if (i.contains("fsx") || i.contains(" sx"))
+            if (i.contains("fsx") || i.contains("fs10"))
             {
                 s |= FSX;
             }
-            if (i.contains("fs9"))
+            if (i.contains("fs9") || i.contains("2004"))
             {
                 s |= FS9;
             }
-            if (i.contains("xplane")  || i.contains("xp") || i.contains("x plane"))
+            if (i.contains("plane")  || i.contains("xp"))
             {
                 s |= XPLANE;
             }
-            if (i.contains("3d")  || i.contains("prepare"))
+            if (i.contains("3d")  || i.contains("prepare") || i.contains("martin") || i.contains("lm") || i.contains("lock"))
             {
                 s |= P3D;
             }