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

refs #603, new CMD args, formerly passed by env.vars

Browse Source 
* removed from CProject
* removed. env. vars menu items
* prepared for vatlib cmd. args
* prepared for eol (end of lifetime) timestamp (time bomb)
This commit is contained in:
Klaus Basan
2016-02-29 02:17:20 +01:00
committed by Mathew Sutcliffe
parent d7e5b5206c
commit f4cbfc2fa9
22 changed files with 264 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/swiftguistandard/swiftguistd.ui
View File

@@ -221,7 +221,7 @@
<x>0</x>
<y>0</y>
<width>350</width>
<height>20</height>
<height>21</height>
</rect>
</property>
<property name="sizePolicy">
@@ -271,7 +271,6 @@
</property>
<addaction name="menu_Internals"/>
<addaction name="menu_InternalsMetatypes"/>
<addaction name="menu_InternalsEnvVars"/>
<addaction name="menu_InternalsSetup"/>
<addaction name="menu_InternalsCompileInfo"/>
</widget>

3
src/swiftguistandard/swiftguistdapplication.cpp
View File

@@ -19,6 +19,7 @@ CSwiftGuiStdApplication::CSwiftGuiStdApplication() : CGuiApplication("swift pilo
this->addParserOption(this->m_cmdFacadeMode);
this->addWindowModeOption();
this->addDBusAddressOption();
this->addVatlibOptions();
}
bool CSwiftGuiStdApplication::startHookIn()
@@ -28,7 +29,7 @@ bool CSwiftGuiStdApplication::startHookIn()
const QString dBusAddress(this->getCmdDBusAddressValue());
if (this->isParserOptionSet(this->m_cmdFacadeMode))
{
const QString v(this->getParserOptionValue(this->m_cmdFacadeMode));
const QString v(this->getParserValue(this->m_cmdFacadeMode));
coreMode = CoreModes::stringToCoreMode(v);
}

6
src/swiftguistandard/swiftguistdinit.cpp
View File

@@ -38,10 +38,6 @@ void SwiftGuiStd::init()
this->setVisible(false); // hide all, so no flashing windows during init
sGui->initMainApplicationWindow(this);
// init window
this->setWindowTitle(CProject::versionStringDevBetaInfo());
this->initStyleSheet();
// with frameless window, we shift menu and statusbar into central widget
// http://stackoverflow.com/questions/18316710/frameless-and-transparent-window-qt5
if (this->isFrameless())
@@ -110,7 +106,7 @@ void SwiftGuiStd::init()
this->initMenuIcons();
// info
this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(CProject::swiftVersionString());
this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(sGui->swiftVersionString());
this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(CProject::compiledWithInfo());
// update timers

12
src/swiftguistandard/swiftguistdmenus.cpp
View File

@@ -10,7 +10,7 @@
#include "swiftguistd.h"
#include "ui_swiftguistd.h"
#include "blackcore/application.h"
#include "blackgui/stylesheetutility.h"
#include "blackgui/guiapplication.h"
#include "blackgui/components/settingscomponent.h"
#include "blackgui/components/logcomponent.h"
#include "blackmisc/statusmessagelist.h"
@@ -58,7 +58,7 @@ void SwiftGuiStd::ps_onMenuClicked()
}
else if (sender == this->ui->menu_FileReloadStyleSheets)
{
CStyleSheetUtility::instance().read();
sGui->reloadStyleSheets();
}
else if (sender == this->ui->menu_WindowFont)
{
@@ -136,13 +136,7 @@ void SwiftGuiStd::ps_onMenuClicked()
}
else if (sender == this->ui->menu_InternalsCompileInfo)
{
QString project(CProject::convertToQString("\n"));
this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(project);
this->displayConsole();
}
else if (sender == this->ui->menu_InternalsEnvVars)
{
QString project(CProject::getEnvironmentVariables());
QString project(sGui->convertToQString("\n"));
this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(project);
this->displayConsole();
}