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

refs #452 adjusted swift GUI

Browse Source 
* CAircraft -> CSimulatedAircraft
* exit menu
This commit is contained in:
Klaus Basan
2015-09-24 01:43:39 +02:00
committed by Mathew Sutcliffe
parent c3575a5b41
commit 8281ef5910
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/swiftgui_standard/swiftguistd.cpp
View File

@@ -19,7 +19,6 @@
#include "blackcore/context_application.h" #include "blackcore/context_application.h"
#include "blackcore/context_ownaircraft.h" #include "blackcore/context_ownaircraft.h"
#include "blackcore/network.h" #include "blackcore/network.h"
#include "blackmisc/aviation/aircraft.h"
#include "blackmisc/logmessage.h" #include "blackmisc/logmessage.h"
#include "blackmisc/notificationsounds.h" #include "blackmisc/notificationsounds.h"
#include <QMouseEvent> #include <QMouseEvent>

2
src/swiftgui_standard/swiftguistd.h
View File

@@ -119,7 +119,7 @@ private:
bool m_contextNetworkAvailable = false; bool m_contextNetworkAvailable = false;
bool m_contextAudioAvailable = false; bool m_contextAudioAvailable = false;
QTimer *m_timerContextWatchdog = nullptr; //!< core available? QTimer *m_timerContextWatchdog = nullptr; //!< core available?
BlackMisc::Aviation::CAircraft m_ownAircraft; //!< own aircraft's state BlackMisc::Simulation::CSimulatedAircraft m_ownAircraft; //!< own aircraft's state
QSize m_windowMinSizeWithMainPageShown; QSize m_windowMinSizeWithMainPageShown;
QSize m_windowMinSizeWithMainPageHidden; QSize m_windowMinSizeWithMainPageHidden;

10
src/swiftgui_standard/swiftguistd.ui
View File

@@ -312,14 +312,14 @@
<addaction name="menu_FileResetSettings"/> <addaction name="menu_FileResetSettings"/>
<addaction name="menu_FileReloadStyleSheets"/> <addaction name="menu_FileReloadStyleSheets"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="menu_FileClose"/> <addaction name="menu_FileExit"/>
</widget> </widget>
<widget class="QMenu" name="menu_InfoAreas"> <widget class="QMenu" name="menu_InfoAreas">
<property name="title"> <property name="title">
<string>Info areas</string> <string>Info areas</string>
</property> </property>
</widget> </widget>
<widget class="QMenu" name="menuWindow"> <widget class="QMenu" name="menu_Window">
<property name="title"> <property name="title">
<string>Window</string> <string>Window</string>
</property> </property>
@@ -329,7 +329,7 @@
<addaction name="menu_WindowToggleNavigator"/> <addaction name="menu_WindowToggleNavigator"/>
</widget> </widget>
<addaction name="menu_File"/> <addaction name="menu_File"/>
<addaction name="menuWindow"/> <addaction name="menu_Window"/>
<addaction name="menu_InfoAreas"/> <addaction name="menu_InfoAreas"/>
<addaction name="menu_Help"/> <addaction name="menu_Help"/>
<addaction name="menu_Test"/> <addaction name="menu_Test"/>
@@ -418,9 +418,9 @@
<string>Position EDNX (Schleißheim, GER)</string> <string>Position EDNX (Schleißheim, GER)</string>
</property> </property>
</action> </action>
<action name="menu_FileClose"> <action name="menu_FileExit">
<property name="text"> <property name="text">
<string>Close</string> <string>Exit</string>
</property> </property>
</action> </action>
<action name="menu_FileSettingsDirectory"> <action name="menu_FileSettingsDirectory">

3
src/swiftgui_standard/swiftguistd_aircraft.cpp
View File

@@ -17,6 +17,7 @@ using namespace BlackMisc;
using namespace BlackGui; using namespace BlackGui;
using namespace BlackMisc::Network; using namespace BlackMisc::Network;
using namespace BlackMisc::Aviation; using namespace BlackMisc::Aviation;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo; using namespace BlackMisc::Geo;
using namespace BlackMisc::Settings; using namespace BlackMisc::Settings;
@@ -31,7 +32,7 @@ bool SwiftGuiStd::ps_reloadOwnAircraft()
// check for changed aircraft // check for changed aircraft
bool changed = false; bool changed = false;
CAircraft loadedAircraft = this->getIContextOwnAircraft()->getOwnAircraft(); CSimulatedAircraft loadedAircraft = this->getIContextOwnAircraft()->getOwnAircraft();
if (loadedAircraft != this->m_ownAircraft) if (loadedAircraft != this->m_ownAircraft)
{ {
this->m_ownAircraft = loadedAircraft; this->m_ownAircraft = loadedAircraft;

2
src/swiftgui_standard/swiftguistd_init.cpp
View File

@@ -167,7 +167,7 @@ void SwiftGuiStd::initGuiSignals()
connect(this->ui->menu_TestLocationsEDNX, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_TestLocationsEDNX, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
connect(this->ui->menu_TestLocationsEDRY, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_TestLocationsEDRY, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
connect(this->ui->menu_TestInternals, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_TestInternals, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
connect(this->ui->menu_FileClose, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_FileExit, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
connect(this->ui->menu_FileSettingsDirectory, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_FileSettingsDirectory, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
connect(this->ui->menu_FileResetSettings, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_FileResetSettings, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);
connect(this->ui->menu_FileReloadStyleSheets, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked); connect(this->ui->menu_FileReloadStyleSheets, &QAction::triggered, this, &SwiftGuiStd::ps_onMenuClicked);

4
src/swiftgui_standard/swiftguistd_menus.cpp
View File

@@ -72,13 +72,13 @@ void SwiftGuiStd::ps_onMenuClicked()
} }
else if (sender == this->ui->menu_WindowMinimize) else if (sender == this->ui->menu_WindowMinimize)
{ {
this->ps_showMinimized(); this->showMinimized();
} }
else if (sender == this->ui->menu_WindowToggleOnTop) else if (sender == this->ui->menu_WindowToggleOnTop)
{ {
this->ps_toogleWindowStayOnTop(); this->ps_toogleWindowStayOnTop();
} }
else if (sender == this->ui->menu_FileClose) else if (sender == this->ui->menu_FileExit)
{ {
CLogMessage(this).info("Closing"); CLogMessage(this).info("Closing");
this->close(); this->close();