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

refs #400, 2nd stage for Qt 541

Browse Source 
* GUI finetuning after folder split and migration to Qt 5.4.1
* Doxygen fixes
This commit is contained in:
Klaus Basan
2015-04-10 00:04:28 +02:00
parent aafee8eafd
commit 1f5eb16bb1
12 changed files with 597 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/blackgui/components/audiosetupcomponent.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>263</width>
<height>300</height> <height>343</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -68,14 +68,23 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="cb_SetupAudioInputDevice"> <widget class="QComboBox" name="cb_SetupAudioInputDevice">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="sizeAdjustPolicy"> <property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum> <enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property> </property>
<property name="frame">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
@@ -88,11 +97,17 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="cb_SetupAudioOutputDevice"> <widget class="QComboBox" name="cb_SetupAudioOutputDevice">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="sizeAdjustPolicy"> <property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum> <enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property> </property>

12
src/blackgui/components/invisibleinfoareacomponent.ui
View File

@@ -15,6 +15,18 @@
</property> </property>
<widget class="QWidget" name="qw_InvisibleInfoArea"/> <widget class="QWidget" name="qw_InvisibleInfoArea"/>
<widget class="BlackGui::Components::CNavigatorDockWidget" name="comp_Navigator"> <widget class="BlackGui::Components::CNavigatorDockWidget" name="comp_Navigator">
<property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
</size>
</property>
<property name="floating">
<bool>false</bool>
</property>
<property name="features">
<set>QDockWidget::AllDockWidgetFeatures</set>
</property>
<property name="allowedAreas"> <property name="allowedAreas">
<set>Qt::LeftDockWidgetArea</set> <set>Qt::LeftDockWidgetArea</set>
</property> </property>

6
src/blackgui/components/maininfoareacomponent.ui
View File

@@ -376,7 +376,7 @@
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>0</number>
@@ -523,7 +523,7 @@
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>0</number>
@@ -572,7 +572,7 @@
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>0</number>

1
src/blackgui/components/navigatordockwidget.cpp
View File

@@ -20,6 +20,7 @@ namespace BlackGui
CDockWidgetInfoArea(parent), CDockWidgetInfoArea(parent),
ui(new Ui::CNavigatorDockWidget) ui(new Ui::CNavigatorDockWidget)
{ {
this->allowStatusBar(false);
ui->setupUi(this); ui->setupUi(this);
} }

110
src/blackgui/components/settingscomponent.ui
View File

@@ -92,19 +92,19 @@
</attribute> </attribute>
<layout class="QVBoxLayout" name="vl_SettingsAudio"> <layout class="QVBoxLayout" name="vl_SettingsAudio">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>2</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>1</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>1</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>1</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>1</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Components::CAudioSetupComponent" name="comp_AudioSetup"> <widget class="BlackGui::Components::CAudioSetupComponent" name="comp_AudioSetup">
@@ -124,19 +124,19 @@
</attribute> </attribute>
<layout class="QVBoxLayout" name="vl_SettingsSimulator"> <layout class="QVBoxLayout" name="vl_SettingsSimulator">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>2</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>1</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>1</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>1</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>1</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Components::CSettingsSimulatorComponent" name="comp_SettingsSimulator"> <widget class="BlackGui::Components::CSettingsSimulatorComponent" name="comp_SettingsSimulator">
@@ -156,13 +156,13 @@
</attribute> </attribute>
<layout class="QVBoxLayout" name="vl_SettingsGui"> <layout class="QVBoxLayout" name="vl_SettingsGui">
<property name="leftMargin"> <property name="leftMargin">
<number>1</number> <number>3</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>1</number> <number>3</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>1</number> <number>3</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>1</number> <number>1</number>
@@ -182,7 +182,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSlider" name="hs_SettingsGuiOpacity"> <widget class="QSlider" name="hs_SettingsGuiOpacity">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -214,7 +214,7 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSlider" name="hs_SettingsGuiAircraftRefreshTime"> <widget class="QSlider" name="hs_SettingsGuiAircraftRefreshTime">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -255,7 +255,7 @@
<item row="2" column="1"> <item row="2" column="1">
<widget class="QSlider" name="hs_SettingsGuiAtcRefreshTime"> <widget class="QSlider" name="hs_SettingsGuiAtcRefreshTime">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -293,7 +293,7 @@
<item row="3" column="1"> <item row="3" column="1">
<widget class="QSlider" name="hs_SettingsGuiUserRefreshTime"> <widget class="QSlider" name="hs_SettingsGuiUserRefreshTime">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@@ -327,12 +327,6 @@
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
<widget class="QFontComboBox" name="cb_SettingsGuiFont"> <widget class="QFontComboBox" name="cb_SettingsGuiFont">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy"> <property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum> <enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property> </property>
@@ -347,6 +341,12 @@
</item> </item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QComboBox" name="cb_SettingsGuiFontSize"> <widget class="QComboBox" name="cb_SettingsGuiFontSize">
<property name="maximumSize">
<size>
<width>150</width>
<height>16777215</height>
</size>
</property>
<item> <item>
<property name="text"> <property name="text">
<string>6</string> <string>6</string>
@@ -403,6 +403,12 @@
</item> </item>
<item row="6" column="1"> <item row="6" column="1">
<widget class="QComboBox" name="cb_SettingsGuiFontStyle"> <widget class="QComboBox" name="cb_SettingsGuiFontStyle">
<property name="maximumSize">
<size>
<width>150</width>
<height>16777215</height>
</size>
</property>
<item> <item>
<property name="text"> <property name="text">
<string>normal</string> <string>normal</string>
@@ -433,28 +439,42 @@
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="7" column="1">
<layout class="QHBoxLayout" name="hl_SettingsGuiFontColor"> <widget class="QWidget" name="qw_SettingsGuiFont" native="true">
<item> <layout class="QHBoxLayout" name="hl_SettingsGuiFontColor">
<widget class="QToolButton" name="tb_SettingsGuiFontColor"> <property name="spacing">
<property name="text"> <number>3</number>
<string>...</string> </property>
</property> <property name="leftMargin">
</widget> <number>0</number>
</item> </property>
<item> <property name="topMargin">
<widget class="QLineEdit" name="le_SettingsGuiFontColor"> <number>0</number>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <property name="rightMargin">
<horstretch>0</horstretch> <number>0</number>
<verstretch>0</verstretch> </property>
</sizepolicy> <property name="bottomMargin">
</property> <number>0</number>
<property name="readOnly"> </property>
<bool>true</bool> <item>
</property> <widget class="QToolButton" name="tb_SettingsGuiFontColor">
</widget> <property name="text">
</item> <string>...</string>
</layout> </property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="le_SettingsGuiFontColor">
<property name="maxLength">
<number>200</number>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item> </item>
</layout> </layout>
</item> </item>

45
src/blackgui/components/settingsfsxcomponent.cpp
View File

@@ -11,6 +11,7 @@
#include "ui_settingsfsxcomponent.h" #include "ui_settingsfsxcomponent.h"
#include "blackcore/context_simulator.h" #include "blackcore/context_simulator.h"
#include "blackcore/context_application.h" #include "blackcore/context_application.h"
#include "blackmisc/simulation/fsx/simconnectutilities.h"
#include "blackmisc/networkutils.h" #include "blackmisc/networkutils.h"
#include "blackmisc/statusmessage.h" #include "blackmisc/statusmessage.h"
#include "blackmisc/logmessage.h" #include "blackmisc/logmessage.h"
@@ -42,9 +43,7 @@ namespace BlackGui
} }
CSettingsFsxComponent::~CSettingsFsxComponent() CSettingsFsxComponent::~CSettingsFsxComponent()
{ { }
delete ui;
}
/* /*
* SimConnect working? * SimConnect working?
@@ -56,28 +55,28 @@ namespace BlackGui
if (address.isEmpty() || port.isEmpty()) if (address.isEmpty() || port.isEmpty())
{ {
CLogMessage(this).warning("no address or port"); CLogMessage(this).validationWarning("No address or port");
return; return;
} }
if (!CNetworkUtils::isValidIPv4Address(address)) if (!CNetworkUtils::isValidIPv4Address(address))
{ {
CLogMessage(this).warning("IPv4 address invalid"); CLogMessage(this).validationWarning("IPv4 address invalid");
return; return;
} }
if (!CNetworkUtils::isValidPort(port)) if (!CNetworkUtils::isValidPort(port))
{ {
CLogMessage(this).warning("invalid port"); CLogMessage(this).validationWarning("Invalid port");
return; return;
} }
int p = port.toInt(); int p = port.toInt();
QString msg; QString msg;
if (!CNetworkUtils::canConnect(address, p, msg)) if (!CNetworkUtils::canConnect(address, p, msg))
{ {
CLogMessage(this).warning(msg); CLogMessage(this).validationWarning(msg);
return; return;
} }
CLogMessage(this).info("Connected to %1:%2") << address << port; CLogMessage(this).validationInfo("Connected to %1:%2") << address << port;
} }
/* /*
@@ -85,9 +84,9 @@ namespace BlackGui
*/ */
void CSettingsFsxComponent::saveSimConnectCfg() void CSettingsFsxComponent::saveSimConnectCfg()
{ {
if (!this->getIContextSimulator() || !this->getIContextSimulator()->isSimulatorAvailable()) if (!this->getIContextSimulator())
{ {
CLogMessage(this).error("Simulator not available"); CLogMessage(this).validationError("Simulator driver not available");
return; return;
} }
QString address = this->ui->le_SettingsFsxAddress->text().trimmed(); QString address = this->ui->le_SettingsFsxAddress->text().trimmed();
@@ -95,22 +94,27 @@ namespace BlackGui
if (address.isEmpty() || port.isEmpty()) if (address.isEmpty() || port.isEmpty())
{ {
CLogMessage(this).warning("no address or port"); CLogMessage(this).validationError("No address or port");
return; return;
} }
if (!CNetworkUtils::isValidIPv4Address(address)) if (!CNetworkUtils::isValidIPv4Address(address))
{ {
CLogMessage(this).warning("IPv4 address invalid"); CLogMessage(this).validationError("IPv4 address invalid");
return; return;
} }
if (!CNetworkUtils::isValidPort(port)) if (!CNetworkUtils::isValidPort(port))
{ {
CLogMessage(this).warning("invalid port"); CLogMessage(this).validationError("Invalid port");
return; return;
} }
int p = port.toInt(); int p = port.toInt();
QString fileName = this->getIContextSimulator()->getSimulatorInfo().getSimulatorSetupValueAsString(CFsxSimulatorSetup::SetupSimConnectCfgFile); QString fileName = this->getIContextSimulator()->getSimulatorInfo().getSimulatorSetupValueAsString(CFsxSimulatorSetup::SetupSimConnectCfgFile);
Q_ASSERT(!fileName.isEmpty()); if (fileName.isEmpty())
{
CLogMessage(this).validationError("Invalid filename or filename empty");
return;
}
// write either local or remote file // write either local or remote file
bool localSimulatorObject = this->getIContextSimulator()->isUsingImplementingObject(); bool localSimulatorObject = this->getIContextSimulator()->isUsingImplementingObject();
bool success = localSimulatorObject ? bool success = localSimulatorObject ?
@@ -118,11 +122,11 @@ namespace BlackGui
this->getIContextApplication()->writeToFile(fileName, CSimConnectUtilities::simConnectCfg(address, p)); this->getIContextApplication()->writeToFile(fileName, CSimConnectUtilities::simConnectCfg(address, p));
if (success) if (success)
{ {
CLogMessage(this).info(localSimulatorObject ? "Written local %1" : "Written remote %1") << fileName; CLogMessage(this).validationInfo(localSimulatorObject ? "Written local %1" : "Written remote %1") << fileName;
} }
else else
{ {
CLogMessage(this).error("Cannot write %1") << fileName; CLogMessage(this).validationError("Cannot write %1") << fileName;
} }
this->ui->pb_SettingsFsxExistsSimconncetCfg->click(); // update status this->ui->pb_SettingsFsxExistsSimconncetCfg->click(); // update status
} }
@@ -132,9 +136,9 @@ namespace BlackGui
*/ */
void CSettingsFsxComponent::simConnectCfgFile() void CSettingsFsxComponent::simConnectCfgFile()
{ {
if (!this->getIContextSimulator() || !this->getIContextSimulator()->isSimulatorAvailable()) if (!this->getIContextSimulator())
{ {
CLogMessage(this).error("Simulator not available"); CLogMessage(this).validationError("Simulator driver not available");
return; return;
} }
@@ -149,7 +153,6 @@ namespace BlackGui
{ {
if (!this->getIContextSimulator()) return; if (!this->getIContextSimulator()) return;
QString fileName = BlackMisc::Simulation::Fsx::CSimConnectUtilities::getLocalSimConnectCfgFilename(); QString fileName = BlackMisc::Simulation::Fsx::CSimConnectUtilities::getLocalSimConnectCfgFilename();
QString m = QString("Deleted %1 ").append(fileName);
if (this->getIContextSimulator()->isUsingImplementingObject()) if (this->getIContextSimulator()->isUsingImplementingObject())
{ {
QFile f(fileName); QFile f(fileName);
@@ -180,5 +183,5 @@ namespace BlackGui
} }
} }
} }
} } // ns
} } // ns

3
src/blackgui/components/settingsfsxcomponent.h
View File

@@ -14,6 +14,7 @@
#include "blackgui/components/enableforruntime.h" #include "blackgui/components/enableforruntime.h"
#include <QFrame> #include <QFrame>
#include <QScopedPointer>
namespace Ui { class CSettingsFsxComponent; } namespace Ui { class CSettingsFsxComponent; }
@@ -44,7 +45,7 @@ namespace BlackGui
void simConnectCfgFile(); void simConnectCfgFile();
private: private:
Ui::CSettingsFsxComponent *ui; QScopedPointer<Ui::CSettingsFsxComponent> ui;
}; };
} }
} }

330
src/blackgui/components/settingsfsxcomponent.ui
View File

@@ -6,10 +6,16 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>324</width> <width>317</width>
<height>150</height> <height>141</height>
</rect> </rect>
</property> </property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Frame</string> <string>Frame</string>
</property> </property>
@@ -21,7 +27,7 @@
</property> </property>
<layout class="QVBoxLayout" name="vl_SettingsFsxComponent"> <layout class="QVBoxLayout" name="vl_SettingsFsxComponent">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>0</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
@@ -36,153 +42,217 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QFormLayout" name="fl_Settings"> <widget class="QGroupBox" name="gb_FsxSimConnectConfigFile">
<property name="fieldGrowthPolicy"> <property name="title">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <string>FSX SimConnect config file</string>
</property> </property>
<item row="1" column="0"> <layout class="QFormLayout" name="fl_Settings">
<widget class="QLabel" name="lbl_SettingsFsxAddress"> <item row="0" column="0">
<property name="text"> <widget class="QLabel" name="lbl_SettingsFsxAddress">
<string>FSX address</string> <property name="text">
</property> <string>FSX address</string>
</widget> </property>
</item> </widget>
<item row="1" column="1"> </item>
<widget class="QLineEdit" name="le_SettingsFsxAddress"> <item row="0" column="1">
<property name="text"> <widget class="QLineEdit" name="le_SettingsFsxAddress">
<string>127.0.0.1</string> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
</widget> <horstretch>0</horstretch>
</item> <verstretch>0</verstretch>
<item row="2" column="0"> </sizepolicy>
<widget class="QLabel" name="lbl_SettingsFsxPort"> </property>
<property name="text"> <property name="text">
<string>FSX port</string> <string>127.0.0.1</string>
</property> </property>
</widget> <property name="maxLength">
</item> <number>128</number>
<item row="2" column="1"> </property>
<widget class="QLineEdit" name="le_SettingsFsxPort"> </widget>
<property name="text"> </item>
<string>500</string> <item row="1" column="0">
</property> <widget class="QLabel" name="lbl_SettingsFsxPort">
</widget> <property name="text">
</item> <string>FSX port</string>
<item row="4" column="0" colspan="2"> </property>
<layout class="QHBoxLayout" name="hl_SettingsSimconnectCfgButtons"> </widget>
<item> </item>
<widget class="QPushButton" name="pb_SettingsFsxOpenSimconnectCfg"> <item row="1" column="1">
<property name="sizePolicy"> <widget class="QLineEdit" name="le_SettingsFsxPort">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <property name="sizePolicy">
<horstretch>0</horstretch> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<verstretch>0</verstretch> <horstretch>0</horstretch>
</sizepolicy> <verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>500</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_SettingsFsxExistsSimconncetCfg">
<property name="toolTip">
<string>is 'SimConnect.cfg' available?</string>
</property>
<property name="text">
<string>.cfg?</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QWidget" name="wi_SettingsFsxExistsSimconncetCfg" native="true">
<layout class="QHBoxLayout" name="hl_SettingsFsxExistsSimconncetCfg">
<property name="spacing">
<number>4</number>
</property> </property>
<property name="text"> <property name="leftMargin">
<string>Open</string> <number>0</number>
</property> </property>
</widget> <property name="topMargin">
</item> <number>0</number>
<item>
<widget class="QPushButton" name="pb_SettingsFsxDeleteSimconnectCfg">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="text"> <property name="rightMargin">
<string>Delete</string> <number>0</number>
</property> </property>
</widget> <property name="bottomMargin">
</item> <number>0</number>
<item>
<widget class="QPushButton" name="pb_SettingsFsxSaveSimconnectCfg">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="text"> <item>
<string>Save</string> <widget class="QLineEdit" name="le_SettingsFsxExistsSimconncetCfg">
</property> <property name="sizePolicy">
</widget> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
</item> <horstretch>0</horstretch>
<item> <verstretch>0</verstretch>
<widget class="QPushButton" name="pb_SettingsFsxTestConnection"> </sizepolicy>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <property name="readOnly">
<horstretch>0</horstretch> <bool>true</bool>
<verstretch>0</verstretch> </property>
</sizepolicy> </widget>
</property> </item>
<property name="text"> <item>
<string extracomment="Test connection">Test con.</string> <widget class="QPushButton" name="pb_SettingsFsxExistsSimconncetCfg">
</property> <property name="sizePolicy">
</widget> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
</item> <horstretch>0</horstretch>
</layout> <verstretch>0</verstretch>
</item> </sizepolicy>
<item row="3" column="0"> </property>
<widget class="QLabel" name="lbl_SettingsFsxExistsSimconncetCfg"> <property name="minimumSize">
<property name="text"> <size>
<string>&quot;simconnect.cfg&quot;?</string> <width>50</width>
</property> <height>0</height>
</widget> </size>
</item> </property>
<item row="3" column="1"> <property name="text">
<widget class="QWidget" name="wi_SettingsFsxExistsSimconncetCfg" native="true"> <string>check</string>
<layout class="QHBoxLayout" name="hl_SettingsFsxExistsSimconncetCfg"> </property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0" colspan="2">
<layout class="QHBoxLayout" name="hl_SettingsSimconnectCfgButtons">
<property name="spacing"> <property name="spacing">
<number>4</number> <number>3</number>
</property>
<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> </property>
<item> <item>
<widget class="QLineEdit" name="le_SettingsFsxExistsSimconncetCfg"> <widget class="QPushButton" name="pb_SettingsFsxOpenSimconnectCfg">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_SettingsFsxExistsSimconncetCfg">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Check</string> <string>open</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_SettingsFsxDeleteSimconnectCfg">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>del.</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_SettingsFsxSaveSimconnectCfg">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>save</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_SettingsFsxTestConnection">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Test connection</string>
</property>
<property name="text">
<string extracomment="Test connection">test</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </item>
</item> </layout>
<item row="0" column="0" colspan="2"> </widget>
<widget class="QLabel" name="lbl_HeaderFsxSimConnect">
<property name="toolTip">
<string>&quot;simconnect.cfg&quot; exists?</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;FSX simconnect config files&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>

513
src/blackgui/components/settingssimulatorcomponent.ui
View File

@@ -6,233 +6,132 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>308</width> <width>377</width>
<height>285</height> <height>346</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Frame</string> <string>Frame</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property> </property>
<layout class="QVBoxLayout" name="vl_SettingsSimulatorComponent"> <layout class="QVBoxLayout" name="vl_SettingsSimulatorComponent">
<property name="spacing"> <property name="leftMargin">
<number>2</number> <number>2</number>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>2</number>
</property> </property>
<item> <item>
<layout class="QGridLayout" name="ql_SettingsSimulatorsAll"> <widget class="QWidget" name="qw_SettingsSimulatorsAll" native="true">
<item row="0" column="0"> <layout class="QFormLayout" name="fl_SettingsSimulatorsAll">
<layout class="QFormLayout" name="fl_SettingsSimulatorsAll"> <property name="fieldGrowthPolicy">
<property name="fieldGrowthPolicy"> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> </property>
</property> <property name="horizontalSpacing">
<property name="horizontalSpacing"> <number>10</number>
<number>10</number> </property>
</property> <property name="verticalSpacing">
<property name="verticalSpacing"> <number>6</number>
<number>6</number> </property>
</property> <item row="0" column="0">
<item row="0" column="0" colspan="2"> <widget class="QLabel" name="lbl_Plugin">
<widget class="QLabel" name="lbl_SimulatorAllHeader"> <property name="text">
<property name="text"> <string>Driver</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;All simulators&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> </property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="cb_Plugins">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_TimeSync">
<property name="toolTip">
<string>Time synchronization</string>
</property>
<property name="text">
<string>Time synch.</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QWidget" name="wi_TimeSync" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property> </property>
</widget> <property name="topMargin">
</item> <number>0</number>
<item row="1" column="0">
<widget class="QLabel" name="lbl_Plugin">
<property name="text">
<string>Driver</string>
</property> </property>
</widget> <property name="rightMargin">
</item> <number>0</number>
<item row="1" column="1">
<widget class="QComboBox" name="cb_Plugins">
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property> </property>
</widget> <property name="bottomMargin">
</item> <number>0</number>
<item row="2" column="0">
<widget class="QLabel" name="lbl_TimeSync">
<property name="toolTip">
<string>Time synchronization</string>
</property>
<property name="text">
<string>Time synch.</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QWidget" name="wi_TimeSync" native="true">
<layout class="QHBoxLayout" name="hl_WidgetTimeSync">
<property name="spacing">
<number>4</number>
</property>
<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_TimeSync">
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="le_TimeSyncOffset">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>75</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>offset +/-hh:mm</string>
</property>
<property name="inputMask">
<string>#99:99</string>
</property>
<property name="text">
<string>+00:00</string>
</property>
<property name="maxLength">
<number>6</number>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_ApplyTimeSync">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>75</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>75</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>apply</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="lbl_RestrictedRendering">
<property name="toolTip">
<string>Current rendering restrictions (if any)</string>
</property>
<property name="text">
<string>Restrictions</string>
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="hl_RestrictedRendering">
<property name="spacing">
<number>4</number>
</property> </property>
<item> <item>
<widget class="BlackGui::CLedWidget" name="led_RestrictedRendering" native="true"/> <widget class="QCheckBox" name="cb_TimeSync">
</item> <property name="toolTip">
<item alignment="Qt::AlignRight"> <string>Enable time syncronization</string>
<widget class="QLabel" name="lbl_RestrictionText"> </property>
<property name="text"> <property name="text">
<string>rest.text goes here</string> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pb_ClearRestrictedRendering"> <widget class="QLineEdit" name="le_TimeSyncOffset">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>75</width>
<height>0</height>
</size>
</property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>75</width> <width>75</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>offset +/-hh:mm</string>
</property>
<property name="inputMask">
<string>#99:99</string>
</property>
<property name="text"> <property name="text">
<string>clear</string> <string>+00:00</string>
</property> </property>
</widget> <property name="maxLength">
</item> <number>6</number>
</layout>
</item>
<item row="5" column="0">
<widget class="QLabel" name="lbl_MaxAircraft">
<property name="text">
<string>Max.aircraft</string>
</property>
</widget>
</item>
<item row="5" column="1">
<layout class="QHBoxLayout" name="hl_MaxAircraft">
<property name="spacing">
<number>4</number>
</property>
<item>
<widget class="QSpinBox" name="sb_MaxAircraft">
<property name="maximum">
<number>100</number>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pb_ApplyMaxAircraft"> <widget class="QPushButton" name="pb_ApplyTimeSync">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -241,13 +140,13 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>75</width> <width>60</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>75</width> <width>60</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
@@ -257,73 +156,191 @@
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </widget>
<item row="6" column="0"> </item>
<widget class="QLabel" name="lbl_MaxDistance"> <item row="3" column="0">
<property name="text"> <widget class="QLabel" name="lbl_RestrictedRendering">
<string>Max.distance (NM)</string> <property name="toolTip">
</property> <string>Current rendering restrictions (if any)</string>
</widget> </property>
</item> <property name="text">
<item row="6" column="1"> <string>Restrictions</string>
<layout class="QHBoxLayout" name="hl_MaxDistance"> </property>
<property name="spacing"> </widget>
<number>4</number> </item>
</property> <item row="3" column="1">
<item> <layout class="QHBoxLayout" name="hl_RestrictedRendering">
<widget class="QSpinBox" name="sb_MaxDistance"> <property name="spacing">
<property name="maximum"> <number>4</number>
<number>100</number> </property>
</property> <item>
<property name="value"> <widget class="BlackGui::CLedWidget" name="led_RestrictedRendering" native="true"/>
<number>100</number> </item>
</property> <item alignment="Qt::AlignRight">
</widget> <widget class="QLabel" name="lbl_RestrictionText">
</item> <property name="text">
<item> <string>rest.text goes here</string>
<widget class="QPushButton" name="pb_ApplyMaxDistance"> </property>
<property name="sizePolicy"> </widget>
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> </item>
<horstretch>0</horstretch> <item>
<verstretch>0</verstretch> <widget class="QPushButton" name="pb_ClearRestrictedRendering">
</sizepolicy> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<property name="minimumSize"> <horstretch>0</horstretch>
<size> <verstretch>0</verstretch>
<width>75</width> </sizepolicy>
<height>0</height> </property>
</size> <property name="minimumSize">
</property> <size>
<property name="maximumSize"> <width>60</width>
<size> <height>0</height>
<width>75</width> </size>
<height>16777215</height> </property>
</size> <property name="maximumSize">
</property> <size>
<property name="text"> <width>60</width>
<string>apply</string> <height>16777215</height>
</property> </size>
</widget> </property>
</item> <property name="text">
</layout> <string>clear</string>
</item> </property>
</layout> </widget>
</item> </item>
</layout> </layout>
</item>
<item row="4" column="0">
<widget class="QLabel" name="lbl_MaxAircraft">
<property name="text">
<string>Max.aircraft</string>
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="hl_MaxAircraft">
<property name="spacing">
<number>4</number>
</property>
<item>
<widget class="QSpinBox" name="sb_MaxAircraft">
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_ApplyMaxAircraft">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>60</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>apply</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0">
<widget class="QLabel" name="lbl_MaxDistance">
<property name="text">
<string>Max.distance (NM)</string>
</property>
</widget>
</item>
<item row="5" column="1">
<layout class="QHBoxLayout" name="hl_MaxDistance">
<property name="spacing">
<number>4</number>
</property>
<item>
<widget class="QSpinBox" name="sb_MaxDistance">
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>100</number>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_ApplyMaxDistance">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>60</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>apply</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item> </item>
<item> <item>
<layout class="QGridLayout" name="gl_SettingsSimulatorsSpecific"> <spacer name="verticalSpacer">
<item row="0" column="0"> <property name="orientation">
<widget class="BlackGui::Components::CSettingsFsxComponent" name="comp_SettingsSimulatorFsx"> <enum>Qt::Vertical</enum>
<property name="frameShape"> </property>
<enum>QFrame::StyledPanel</enum> <property name="sizeHint" stdset="0">
</property> <size>
<property name="frameShadow"> <width>20</width>
<enum>QFrame::Raised</enum> <height>40</height>
</property> </size>
</widget> </property>
</item> </spacer>
</layout> </item>
<item>
<widget class="BlackGui::Components::CSettingsFsxComponent" name="comp_SettingsSimulatorFsx">
<layout class="QVBoxLayout" name="vl_SettingsSimulatorSpecific">
<property name="spacing">
<number>0</number>
</property>
<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>
</layout>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

2
src/blackgui/enableforframelesswindow.h
View File

@@ -75,7 +75,7 @@ namespace BlackGui
WindowMode m_windowMode = WindowNormal; //!< Window mode, \sa WindowMode WindowMode m_windowMode = WindowNormal; //!< Window mode, \sa WindowMode
bool m_mainApplicationWindow = false; //!< is the main application window (only 1) bool m_mainApplicationWindow = false; //!< is the main application window (only 1)
QWidget *m_widget = nullptr; //!< corresponding main window or dock widget QWidget *m_widget = nullptr; //!< corresponding main window or dock widget
QSizeGrip *m_framelessSizeGrip = nullptr; QSizeGrip *m_framelessSizeGrip = nullptr; //!< size grip object
//! Mouse press, required for frameless window //! Mouse press, required for frameless window
bool handleMousePressEvent(QMouseEvent *event); bool handleMousePressEvent(QMouseEvent *event);

1
src/blackgui/qss/mainwindow.qss
View File

@@ -326,6 +326,7 @@ QComboBox {
QComboBox QAbstractItemView { QComboBox QAbstractItemView {
background-color: lightgray; background-color: lightgray;
color: black; color: black;
qproperty-textElideMode: ElideMiddle;
} }
QDoubleSpinBox { QDoubleSpinBox {

12
src/swiftgui_standard/swiftguistd.ui
View File

@@ -18,16 +18,12 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>20</width> <width>325</width>
<height>100</height> <height>550</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Black GUI</string> <string>swift GUI</string>
</property>
<property name="windowIcon">
<iconset>
<normaloff>:/blackgui/icons/aircraftdeparture.png</normaloff>:/blackgui/icons/aircraftdeparture.png</iconset>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
@@ -128,7 +124,7 @@
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>3</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="pg_MainInfoArea"> <widget class="QWidget" name="pg_MainInfoArea">
<layout class="QVBoxLayout" name="vl_MainInfoArea"> <layout class="QVBoxLayout" name="vl_MainInfoArea">