flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-16 10:25:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T192, formatting and minor tweaks

Browse Source
This commit is contained in:
Klaus Basan
2017-11-18 18:39:56 +01:00
parent 1386fcd0db
commit 63fbeecc00
10 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/infobarstatuscomponent.cpp
View File

@@ -86,7 +86,7 @@ namespace BlackGui
ui->led_DBus->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "DBus connected", "DBus disconnected", 14);
ui->led_Network->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "Network connected", "Network disconnected", 14);
ui->led_Simulator->setValues(CLedWidget::Yellow, CLedWidget::Black, CLedWidget::Blue, shape, "Simulator running", "Simulator disconnected", "Simulator connected", 14);
ui->led_MapperReady->setValues(CLedWidget::Yellow, CLedWidget::Black, CLedWidget::Blue, shape, "Mapper ready", "Mappings loading", "Mappings loading", 14);
ui->led_MapperReady->setValues(CLedWidget::Yellow, CLedWidget::Black, CLedWidget::Blue, shape, "Mapper ready", "Mappings not yet loaded", "Mappings not yet loaded", 14);
shape = CLedWidget::Rounded;
ui->led_Ptt->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "Ptt", "Silence", 18);

11
src/blackgui/components/logincomponent.h
View File

@@ -63,11 +63,14 @@ namespace BlackGui
//! Constructor
explicit CLoginComponent(QWidget *parent = nullptr);
//! Destructor
virtual ~CLoginComponent();
//! Automatically popup
void setAutoPopupWizad(bool autoPopup);
//! Destructor
virtual ~CLoginComponent();
//! Main info area changed
void mainInfoAreaChanged(const QWidget *currentWidget);
signals:
//! Login
@@ -82,10 +85,6 @@ namespace BlackGui
//! Relevant login data changed (digest version)
void loginDataChangedDigest();
public slots:
//! Main info area changed
void mainInfoAreaChanged(const QWidget *currentWidget);
private:
//! Login cancelled
void loginCancelled();

3
src/blackgui/components/mainkeypadareacomponent.cpp
View File

@@ -101,7 +101,8 @@ namespace BlackGui
void CMainKeypadAreaComponent::buttonSelected()
{
QPushButton *senderButton = static_cast<QPushButton *>(QObject::sender());
Q_ASSERT(senderButton);
Q_ASSERT_X(senderButton, Q_FUNC_INFO, "No sender button");
Q_ASSERT_X(sGui, Q_FUNC_INFO, "Need sGui");
if (!senderButton) { return; }
const CMainInfoAreaComponent::InfoArea ia = buttonToMainInfoArea(senderButton);
if (ia != CMainInfoAreaComponent::InfoAreaNone)

6
src/blackgui/stylesheetutility.cpp
View File

@@ -37,8 +37,8 @@ namespace BlackGui
CStyleSheetUtility::CStyleSheetUtility(BlackMisc::Restricted<CGuiApplication>, QObject *parent) : QObject(parent)
{
this->read();
connect(&this->m_fileWatcher, &QFileSystemWatcher::directoryChanged, this, &CStyleSheetUtility::ps_qssDirectoryChanged);
connect(&this->m_fileWatcher, &QFileSystemWatcher::fileChanged, this, &CStyleSheetUtility::ps_qssDirectoryChanged);
connect(&this->m_fileWatcher, &QFileSystemWatcher::directoryChanged, this, &CStyleSheetUtility::qssDirectoryChanged);
connect(&this->m_fileWatcher, &QFileSystemWatcher::fileChanged, this, &CStyleSheetUtility::qssDirectoryChanged);
}
const QString &CStyleSheetUtility::fontStyleAsString(const QFont &font)
@@ -465,7 +465,7 @@ namespace BlackGui
}
}
void CStyleSheetUtility::ps_qssDirectoryChanged(const QString &file)
void CStyleSheetUtility::qssDirectoryChanged(const QString &file)
{
Q_UNUSED(file);
this->read();

7
src/blackgui/stylesheetutility.h
View File

@@ -162,11 +162,10 @@ namespace BlackGui
//! \deprecated use BlackGui::CGuiApplication::styleSheetsChanged
void styleSheetsChanged();
private slots:
//! File changed
void ps_qssDirectoryChanged(const QString &file);
private:
//! File changed
void qssDirectoryChanged(const QString &file);
//! Filename based on OS/existing files
static QString getQssFileName(const QString &fileName);