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

[AFV] Ref T731, Ref T739 add new dialog in core UI (adv.audio)

Browse Source
This commit is contained in:
Klaus Basan
2019-11-02 19:23:32 +01:00
committed by Mat Sutcliffe
parent 4e7c490d3b
commit b0714d3d80
3 changed files with 63 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/swiftcore/swiftcore.cpp
View File

@@ -11,6 +11,7 @@
#include "blackgui/components/coreinfoareacomponent.h"
#include "blackgui/components/coresettingsdialog.h"
#include "blackgui/components/cockpitcomaudiodialog.h"
#include "blackgui/components/audioadvanceddistributeddialog.h"
#include "blackgui/components/logcomponent.h"
#include "blackgui/components/rawfsdmessagesdialog.h"
#include "blackgui/guiapplication.h"
@@ -57,9 +58,10 @@ CSwiftCore::CSwiftCore(QWidget *parent) :
m_mwaStatusBar = nullptr;
connect(ui->pb_Restart, &QPushButton::clicked, this, &CSwiftCore::restart);
connect(ui->pb_Audio, &QPushButton::clicked, this, &CSwiftCore::audioDialog, Qt::QueuedConnection);
connect(ui->pb_DisconnectNetwork, &QPushButton::clicked, this, &CSwiftCore::disconnectFromNetwork);
connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CSwiftCore::onStyleSheetsChanged, Qt::QueuedConnection);
connect(ui->pb_Audio, &QPushButton::clicked, this, &CSwiftCore::audioDialog, Qt::QueuedConnection);
connect(ui->pb_AudioAdvanced, &QPushButton::clicked, this, &CSwiftCore::audioAdvancedDialog, Qt::QueuedConnection);
connect(ui->pb_DisconnectNetwork, &QPushButton::clicked, this, &CSwiftCore::disconnectFromNetwork, Qt::QueuedConnection);
connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CSwiftCore::onStyleSheetsChanged, Qt::QueuedConnection);
this->initLogDisplay();
this->initStyleSheet();
@@ -150,7 +152,7 @@ void CSwiftCore::restart()
void CSwiftCore::disconnectFromNetwork()
{
if (!sGui || sGui->isShuttingDown()) { return; }
if (!sGui->getIContextNetwork()) { return; }
if (!sGui->getIContextNetwork()) { return; }
if (!sGui->getIContextNetwork()->isConnected()) { return; }
const QMessageBox::StandardButton reply = QMessageBox::question(this, "Disconnect", "Disconnect from network?", QMessageBox::Yes | QMessageBox::No);
@@ -168,6 +170,16 @@ void CSwiftCore::audioDialog()
m_audioDialog->show();
}
void CSwiftCore::audioAdvancedDialog()
{
if (!m_audioAdvDialog)
{
m_audioAdvDialog.reset(new CAudioAdvancedDistributedDialog(this));
}
m_audioAdvDialog->setModal(false);
m_audioAdvDialog->show();
}
QStringList CSwiftCore::getRestartCmdArgs() const
{
const QStringList cmds = ui->comp_DBusSelector->getDBusCmdLineArgs();

13
src/swiftcore/swiftcore.h
View File

@@ -30,6 +30,7 @@ namespace BlackGui
class CCoreSettingsDialog;
class CRawFsdMessagesDialog;
class CCockpitComAudioDialog;
class CAudioAdvancedDistributedDialog;
}
}
namespace Ui { class CSwiftCore; }
@@ -50,7 +51,7 @@ public:
CSwiftCore(QWidget *parent = nullptr);
//! Destructor
virtual ~CSwiftCore();
virtual ~CSwiftCore() override;
private:
//! \name Init
@@ -84,12 +85,16 @@ private:
//! Audio dialog
void audioDialog();
//! Audio adv. dialog
void audioAdvancedDialog();
//! Restart CMD args
QStringList getRestartCmdArgs() const;
QScopedPointer<BlackGui::Components::CCoreSettingsDialog> m_settingsDialog;
QScopedPointer<BlackGui::Components::CRawFsdMessagesDialog> m_rawFsdMessageDialog;
QScopedPointer<BlackGui::Components::CCockpitComAudioDialog> m_audioDialog;
QScopedPointer<BlackGui::Components::CCoreSettingsDialog> m_settingsDialog;
QScopedPointer<BlackGui::Components::CRawFsdMessagesDialog> m_rawFsdMessageDialog;
QScopedPointer<BlackGui::Components::CCockpitComAudioDialog> m_audioDialog;
QScopedPointer<BlackGui::Components::CAudioAdvancedDistributedDialog> m_audioAdvDialog;
QScopedPointer<Ui::CSwiftCore> ui;
};

67
src/swiftcore/swiftcore.ui
View File

@@ -158,34 +158,6 @@ QTextEdit {
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QGroupBox" name="gb_AudioAndCockpit">
<property name="title">
<string>Audio/Cockpit</string>
</property>
<layout class="QVBoxLayout" name="vl_Audio">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<item alignment="Qt::AlignRight">
<widget class="QPushButton" name="pb_Audio">
<property name="text">
<string>audio</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" rowspan="2" colspan="2">
<widget class="QGroupBox" name="gb_DBus">
<property name="title">
@@ -217,6 +189,41 @@ QTextEdit {
</layout>
</widget>
</item>
<item row="1" column="2">
<widget class="QGroupBox" name="gb_AudioAndCockpit">
<property name="title">
<string>Audio/Cockpit</string>
</property>
<layout class="QHBoxLayout" name="hl_AudioCockpit">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<item>
<widget class="QPushButton" name="pb_AudioAdvanced">
<property name="text">
<string>advanced</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_Audio">
<property name="text">
<string>audio</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QMenuBar" name="mb_SwiftCore">
@@ -314,8 +321,10 @@ QTextEdit {
</customwidgets>
<tabstops>
<tabstop>lep_CommandLineInput</tabstop>
<tabstop>pb_DisconnectNetwork</tabstop>
<tabstop>pb_Audio</tabstop>
<tabstop>pb_AudioAdvanced</tabstop>
<tabstop>pb_Restart</tabstop>
<tabstop>pb_DisconnectNetwork</tabstop>
</tabstops>
<resources/>
<connections/>