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

refs #485, use global setup directly from sApp where possible

Browse Source
This commit is contained in:
Klaus Basan
2016-02-27 22:24:24 +01:00
committed by Mathew Sutcliffe
parent f03f3ef224
commit b577f9313e
8 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/swiftguistandard/swiftguistd.h
View File

@@ -28,7 +28,6 @@
#include "blackgui/mainwindowaccess.h"
#include "blackcore/contextallinterfaces.h"
#include "blackcore/actionbind.h"
#include "blackcore/data/globalsetup.h"
#include "blackmisc/network/textmessage.h"
#include "blackmisc/loghandler.h"
#include "blackmisc/identifiable.h"
@@ -117,7 +116,6 @@ private:
bool m_init = false;
BlackGui::CManagedStatusBar m_statusBar;
BlackMisc::CLogSubscriber m_logSubscriber { this, &SwiftGuiStd::ps_displayStatusMessageInGui };
BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
// contexts
bool m_coreAvailable = false;

5
src/swiftguistandard/swiftguistdmenus.cpp
View File

@@ -9,8 +9,7 @@
#include "swiftguistd.h"
#include "ui_swiftguistd.h"
#include "blackmisc/datacache.h"
#include "blackmisc/settingscache.h"
#include "blackcore/application.h"
#include "blackgui/stylesheetutility.h"
#include "blackgui/components/settingscomponent.h"
#include "blackgui/components/logcomponent.h"
@@ -131,7 +130,7 @@ void SwiftGuiStd::ps_onMenuClicked()
}
else if (sender == this->ui->menu_InternalsSetup)
{
QString setup(this->m_setup.get().convertToQString("\n", true));
QString setup(sApp->getGlobalSetup().convertToQString("\n", true));
this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(setup);
this->displayConsole();
}