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

refs #521 some minor fixes (after batch refactoring meeting)

Browse Source 
* adjusted simulator info so it can handle X-Plane string
* improved qss
* some size constraints in GUI
This commit is contained in:
Klaus Basan
2015-11-25 03:39:33 +01:00
parent af3ebf71a3
commit 530ddb3d9f
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/settingsnetworkserverscomponent.ui
View File

@@ -56,7 +56,7 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>80</height> <height>120</height>
</size> </size>
</property> </property>
<property name="frameShape"> <property name="frameShape">

16
src/blackgui/qss/stdwidget.qss
View File

@@ -129,7 +129,7 @@ QPushButton {
background-color: rgba(0, 0, 255, 128); background-color: rgba(0, 0, 255, 128);
border-style: 1px solid yellow; border-style: 1px solid yellow;
border-radius:3px; border-radius:3px;
color: yellow; color: yellow; /** font color **/
padding: 0px; padding: 0px;
margin-right: 5px; margin-right: 5px;
min-width:60px; min-width:60px;
@@ -137,14 +137,19 @@ QPushButton {
} }
QPushButton::disabled { QPushButton::disabled {
background-color: grey; background-color: rgba(77, 88, 99, 128); /** slated gray if a channel)
border-style: none; border-style: none;
border-radius:3px; border-radius: 3px;
color: white; color: white;
padding: 0px; padding: 0px;
margin-right: 5px; margin-right: 5px;
} }
QToolButton {
background-color: transparent; /* transparent tool buttons */
border: 0px;
}
QProgressBar { QProgressBar {
border: 1px solid green; border: 1px solid green;
border-radius: 5px; border-radius: 5px;
@@ -222,11 +227,6 @@ QLabel {
background: transparent; background: transparent;
} }
QToolButton {
background-color: transparent; /* transparent tool buttons */
border: 0px;
}
QLineEdit { QLineEdit {
background: transparent; background: transparent;
border: 1px solid green; border: 1px solid green;

10
src/blackmisc/simulation/simulatorinfo.cpp
View File

@@ -121,23 +121,23 @@ namespace BlackMisc
CSimulatorInfo::Simulator CSimulatorInfo::identifierToFlag(const QString &identifier) CSimulatorInfo::Simulator CSimulatorInfo::identifierToFlag(const QString &identifier)
{ {
QString i(identifier.toLower().trimmed()); QString i(identifier.toLower().trimmed().remove(' ').remove('-'));
if (i.isEmpty()) { return None; } if (i.isEmpty()) { return None; }
Simulator s = None; Simulator s = None;
if (i.contains("fsx") || i.contains(" sx")) if (i.contains("fsx") || i.contains("fs10"))
{ {
s |= FSX; s |= FSX;
} }
if (i.contains("fs9")) if (i.contains("fs9") || i.contains("2004"))
{ {
s |= FS9; s |= FS9;
} }
if (i.contains("xplane") || i.contains("xp") || i.contains("x plane")) if (i.contains("plane") || i.contains("xp"))
{ {
s |= XPLANE; 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; s |= P3D;
} }