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

Ref T731, adjusted settings UI to use notifcation settings

Browse Source
This commit is contained in:
Klaus Basan
2019-09-28 19:39:17 +02:00
committed by Mat Sutcliffe
parent 9d4a821389
commit 2a932c977b
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/components/settingscomponent.cpp
View File

@@ -6,7 +6,7 @@
* or distributed except according to the terms contained in the LICENSE file. * or distributed except according to the terms contained in the LICENSE file.
*/ */
#include "blackgui/components/audiosetupcomponent.h" #include "blackgui/components/audionotificationcomponent.h"
#include "blackgui/components/settingscomponent.h" #include "blackgui/components/settingscomponent.h"
#include "blackgui/guiapplication.h" #include "blackgui/guiapplication.h"
#include "blackgui/stylesheetutility.h" #include "blackgui/stylesheetutility.h"
@@ -132,7 +132,7 @@ namespace BlackGui
bool CSettingsComponent::playNotificationSounds() const bool CSettingsComponent::playNotificationSounds() const
{ {
return ui->comp_AudioSetup->playNotificationSounds(); return ui->comp_AudioNotification->playNotificationSounds();
} }
CSpecializedSimulatorSettings CSettingsComponent::getSimulatorSettings(const CSimulatorInfo &simulator) const CSpecializedSimulatorSettings CSettingsComponent::getSimulatorSettings(const CSimulatorInfo &simulator) const

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

@@ -14,7 +14,7 @@
<string>Settings</string> <string>Settings</string>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>7</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tb_SettingsOverview"> <widget class="QWidget" name="tb_SettingsOverview">
<attribute name="title"> <attribute name="title">
@@ -358,7 +358,7 @@
<number>1</number> <number>1</number>
</property> </property>
<item alignment="Qt::AlignTop"> <item alignment="Qt::AlignTop">
<widget class="BlackGui::Components::CSettingsHotkeyComponent" name="comp_SettingsHotkeysComponent"> <widget class="BlackGui::Components::CSettingsHotkeyComponent" name="comp_SettingsHotkeys">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@@ -389,13 +389,13 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>1</number> <number>1</number>
</property> </property>
<item> <item alignment="Qt::AlignTop">
<widget class="BlackGui::Components::CAudioSetupComponent" name="comp_AudioSetup"> <widget class="BlackGui::Components::CAudioNotificationComponent" name="comp_AudioNotification">
<property name="frameShape"> <property name="minimumSize">
<enum>QFrame::StyledPanel</enum> <size>
</property> <width>0</width>
<property name="frameShadow"> <height>200</height>
<enum>QFrame::Raised</enum> </size>
</property> </property>
</widget> </widget>
</item> </item>
@@ -632,7 +632,7 @@
<number>1</number> <number>1</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Components::CSettingsAdvancedComponent" name="comp_SettingsAdvancedComponent"> <widget class="BlackGui::Components::CSettingsAdvancedComponent" name="comp_SettingsAdvanced">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@@ -663,12 +663,6 @@
<header>blackgui/components/settingsguicomponent.h</header> <header>blackgui/components/settingsguicomponent.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>BlackGui::Components::CAudioSetupComponent</class>
<extends>QFrame</extends>
<header>blackgui/components/audiosetupcomponent.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::Components::CSettingsAdvancedComponent</class> <class>BlackGui::Components::CSettingsAdvancedComponent</class>
<extends>QFrame</extends> <extends>QFrame</extends>
@@ -717,6 +711,12 @@
<header>blackgui/components/settingsmatchingcomponent.h</header> <header>blackgui/components/settingsmatchingcomponent.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>BlackGui::Components::CAudioNotificationComponent</class>
<extends>QFrame</extends>
<header>blackgui/components/audionotificationcomponent.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>pb_Servers</tabstop> <tabstop>pb_Servers</tabstop>