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

Some UI finetuning

Browse Source
This commit is contained in:
Klaus Basan
2016-12-12 18:15:50 +01:00
parent 3b2468632a
commit 16b9c88abf
5 changed files with 77 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,16 +2,8 @@
<ui version="4.0">
<class>CAudioSetupComponent</class>
<widget class="QFrame" name="CAudioSetupComponent">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>263</width>
<height>343</height>
</rect>
</property>
<property name="windowTitle">
<string>Frame</string>
<string>Audio setup</string>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
@@ -43,9 +35,6 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="horizontalSpacing">
<number>10</number>
</property>
<property name="leftMargin">
<number>2</number>
</property>

19
src/blackgui/components/settingsadvancedcomponent.ui
View File

@@ -13,22 +13,7 @@
<property name="windowTitle">
<string>sample_hotkeys</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<layout class="QGridLayout" name="gl_SettingsAdvanced">
<item row="0" column="0">
<widget class="QCheckBox" name="m_crashDumpsUpload">
<property name="text">
@@ -37,7 +22,7 @@
</widget>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer">
<spacer name="vs_SettingsAdvanced">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>

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

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>487</width>
<height>431</height>
<width>236</width>
<height>297</height>
</rect>
</property>
<property name="sizePolicy">
@@ -26,7 +26,16 @@
<attribute name="title">
<string>Overview</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gl_Overview">
<property name="leftMargin">
<number>4</number>
</property>
<property name="horizontalSpacing">
<number>10</number>
</property>
<property name="verticalSpacing">
<number>20</number>
</property>
<item row="0" column="0">
<widget class="QPushButton" name="pb_Servers">
<property name="text">
@@ -62,13 +71,6 @@
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QPushButton" name="pb_SimulatorMessages">
<property name="text">
<string>Simulator (messages)</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="pb_Gui">
<property name="text">
@@ -97,6 +99,26 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QPushButton" name="pb_SimulatorMessages">
<property name="text">
<string>Simulator (messages)</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<spacer name="vs_Overview">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tb_SettingsTrafficNetworkServers">
@@ -332,7 +354,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>25</height>
<height>35</height>
</size>
</property>
</spacer>
@@ -357,49 +379,31 @@
<number>1</number>
</property>
<item>
<layout class="QFormLayout" name="fl_SettingsGui">
<item row="4" column="1">
<widget class="QWidget" name="qw_SettingsGuiFont" native="true">
<layout class="QHBoxLayout" name="hl_SettingsGuiFontColor">
<property name="spacing">
<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>
</layout>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="BlackGui::Components::CSettingsGuiComponent" name="comp_SettingsGuiGeneral">
<property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="BlackGui::Components::CSettingsViewUpdateTimes" name="comp_SettingsGuiRefreshTimes">
<property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
</size>
</property>
</widget>
</item>
</layout>
<widget class="BlackGui::Components::CSettingsGuiComponent" name="comp_SettingsGuiGeneral"/>
</item>
<item>
<widget class="BlackGui::Components::CSettingsViewUpdateTimes" name="comp_SettingsGuiRefreshTimes"/>
</item>
<item>
<widget class="QWidget" name="qw_SettingsGuiFont" native="true">
<layout class="QHBoxLayout" name="hl_SettingsGuiFontColor">
<property name="spacing">
<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>
</layout>
</widget>
</item>
</layout>
</widget>
@@ -471,8 +475,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>479</width>
<height>198</height>
<width>228</width>
<height>131</height>
</rect>
</property>
<layout class="QVBoxLayout" name="vl_DataLoadOverview">

9
src/blackgui/components/settingsguicomponent.cpp
View File

@@ -8,6 +8,7 @@
*/
#include "settingsguicomponent.h"
#include "blackcore/context/contextnetwork.h"
#include "blackgui/guiapplication.h"
#include "blackmisc/logmessage.h"
#include "ui_settingsguicomponent.h"
@@ -18,6 +19,7 @@
using namespace BlackMisc;
using namespace BlackGui::Settings;
using namespace BlackCore::Context;
namespace BlackGui
{
@@ -149,6 +151,13 @@ namespace BlackGui
{
const CGeneralGuiSettings settings = m_guiSettings.getThreadLocal();
if (!settings.isDifferentValidWidgetStyle(widgetStyle)) { return; }
if (sGui->getIContextNetwork() && sGui->getIContextNetwork()->isConnected())
{
// Style changes freeze the GUI, must not be done in flight mode
CLogMessage(this).validationError("Cannot change style while connected to network");
ui->cb_SettingsGuiWidgetStyle->setCurrentText(settings.getWidgetStyle());
return;
}
const CStatusMessage m = this->m_guiSettings.setAndSaveProperty(CGeneralGuiSettings::IndexWidgetStyle, widgetStyle);
CLogMessage::preformatted(m);
}

7
src/blackgui/components/settingsviewupdatetimes.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>282</width>
<height>100</height>
<width>304</width>
<height>77</height>
</rect>
</property>
<property name="windowTitle">
@@ -50,6 +50,9 @@
<property name="bottomMargin">
<number>4</number>
</property>
<property name="spacing">
<number>4</number>
</property>
<item row="0" column="3">
<widget class="QSlider" name="hs_AtcUpdateTime">
<property name="minimum">