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

Minor tweaks in swiftdata

Browse Source 
* removed private slots
* formatting
This commit is contained in:
Klaus Basan
2017-07-11 03:00:08 +02:00
committed by Mathew Sutcliffe
parent cd15bdc506
commit 52755e59c8
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/swiftdata/swiftdata.cpp
View File

@@ -76,7 +76,7 @@ void CSwiftData::closeEvent(QCloseEvent *event)
this->performGracefulShutdown();
}
void CSwiftData::ps_appendLogMessage(const CStatusMessage &message)
void CSwiftData::appendLogMessage(const CStatusMessage &message)
{
if (!ui->comp_MainInfoArea) { return; } // not initialized yet
CLogComponent *logComponent = ui->comp_MainInfoArea->getLogComponent();
@@ -87,7 +87,7 @@ void CSwiftData::ps_appendLogMessage(const CStatusMessage &message)
m_statusBar.displayStatusMessage(message);
}
void CSwiftData::ps_onStyleSheetsChanged()
void CSwiftData::onStyleSheetsChanged()
{
this->initStyleSheet();
}
@@ -102,7 +102,7 @@ void CSwiftData::init()
this->m_mwaOverlayFrame = ui->comp_MainInfoArea->getMappingComponent();
this->initStyleSheet();
connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CSwiftData::ps_onStyleSheetsChanged);
connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CSwiftData::onStyleSheetsChanged);
this->initMenu();
// update title
@@ -125,7 +125,7 @@ void CSwiftData::initLogDisplay()
auto logHandler = CLogHandler::instance()->handlerForPattern(
CLogPattern().withSeverityAtOrAbove(CStatusMessage::SeverityInfo)
);
logHandler->subscribe(this, &CSwiftData::ps_appendLogMessage);
logHandler->subscribe(this, &CSwiftData::appendLogMessage);
}
void CSwiftData::initMenu()
@@ -135,9 +135,9 @@ void CSwiftData::initMenu()
this->initDynamicMenus();
ui->menu_WindowMinimize->setIcon(this->style()->standardIcon(QStyle::SP_TitleBarMinButton));
connect(ui->menu_WindowFont, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked);
connect(ui->menu_MappingMaxData, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked);
connect(ui->menu_MappingMaxMapping, &QAction::triggered, this, &CSwiftData::ps_onMenuClicked);
connect(ui->menu_WindowFont, &QAction::triggered, this, &CSwiftData::onMenuClicked);
connect(ui->menu_MappingMaxData, &QAction::triggered, this, &CSwiftData::onMenuClicked);
connect(ui->menu_MappingMaxMapping, &QAction::triggered, this, &CSwiftData::onMenuClicked);
sGui->addMenuFile(*ui->menu_File);
sGui->addMenuInternals(*ui->menu_Internals);

16
src/swiftdata/swiftdata.h
View File

@@ -26,10 +26,7 @@
class QWidget;
namespace Ui { class CSwiftData; }
namespace BlackCore
{
class CWebDataServices;
}
namespace BlackCore { class CWebDataServices; }
/*!
* swift data entry control (aka mapping tool)
@@ -55,17 +52,16 @@ protected:
virtual void closeEvent(QCloseEvent *event) override;
//! @}
private slots:
private:
//! Append log message
void ps_appendLogMessage(const BlackMisc::CStatusMessage &message);
void appendLogMessage(const BlackMisc::CStatusMessage &message);
//! Style sheet has changed
void ps_onStyleSheetsChanged();
void onStyleSheetsChanged();
//! Menu clicked
void ps_onMenuClicked();
void onMenuClicked();
private:
void init();
void initLogDisplay();
void initStyleSheet();
@@ -78,7 +74,7 @@ private:
void displayConsole();
void displayLog();
BlackGui::CManagedStatusBar m_statusBar;
BlackGui::CManagedStatusBar m_statusBar;
QScopedPointer<Ui::CSwiftData> ui;
BlackMisc::CWorkerPointer<BlackCore::Db::CBackgroundDataUpdater> m_updater;
BlackMisc::CSettingReadOnly<BlackGui::Settings::TBackgroundConsolidation> m_consolidationSettings { this, &CSwiftData::consolidationSettingChanged }; //!< consolidation time

2
src/swiftdata/swiftdatamenus.cpp
View File

@@ -29,7 +29,7 @@ using namespace BlackCore;
using namespace BlackGui::Components;
using namespace BlackMisc;
void CSwiftData::ps_onMenuClicked()
void CSwiftData::onMenuClicked()
{
QObject *sender = QObject::sender();
if (sender == ui->menu_WindowFont)