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

Ref T172, formatting

Browse Source 
* this->m_ => m_
* formatting
* comments / doxygen
This commit is contained in:
Klaus Basan
2017-12-28 18:12:58 +01:00
parent ee1e5e8e95
commit efd4e110b7
10 changed files with 187 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ namespace BlackGui
QComboBox(parent)
{ }
void CServerListSelector::setServers(const BlackMisc::Network::CServerList &servers, bool nameIsCountry)
void CServerListSelector::setServers(const CServerList &servers, bool nameIsCountry)
{
if (m_servers == servers) { return; }
this->setServerItems(servers, nameIsCountry);

84
src/blackgui/managedstatusbar.cpp
View File

@@ -32,75 +32,75 @@ namespace BlackGui
CManagedStatusBar::~CManagedStatusBar()
{
// we are not necessarily the owner of the status bar
this->m_statusBar->removeWidget(this->m_statusBarLabel);
this->m_statusBar->removeWidget(this->m_statusBarIcon);
m_statusBar->removeWidget(m_statusBarLabel);
m_statusBar->removeWidget(m_statusBarIcon);
// labels will be deleted with status bar
if (this->m_ownStatusBar) { delete m_statusBar; }
if (m_ownStatusBar) { delete m_statusBar; }
}
void CManagedStatusBar::initStatusBar(QStatusBar *statusBar)
{
if (this->m_statusBar) { return; }
this->m_ownStatusBar = statusBar ? false : true;
this->m_statusBar = statusBar ? statusBar : new QStatusBar();
if (this->m_statusBar->objectName().isEmpty()) { this->m_statusBar->setObjectName("sb_ManagedStatusBar"); }
if (this->m_ownStatusBar) { m_statusBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);}
if (m_statusBar) { return; }
m_ownStatusBar = statusBar ? false : true;
m_statusBar = statusBar ? statusBar : new QStatusBar();
if (m_statusBar->objectName().isEmpty()) { m_statusBar->setObjectName("sb_ManagedStatusBar"); }
if (m_ownStatusBar) { m_statusBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);}
this->m_statusBarIcon = new QLabel(this->m_statusBar);
this->m_statusBarLabel = new QLabel(this->m_statusBar);
this->m_statusBarLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
this->m_statusBarIcon->setObjectName(QString("lbl_StatusBarIcon").append(this->m_statusBar->objectName()));
this->m_statusBarLabel->setObjectName(QString("lbl_StatusBarLabel").append(this->m_statusBar->objectName()));
m_statusBarIcon = new QLabel(m_statusBar);
m_statusBarLabel = new QLabel(m_statusBar);
m_statusBarLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
m_statusBarIcon->setObjectName(QString("lbl_StatusBarIcon").append(m_statusBar->objectName()));
m_statusBarLabel->setObjectName(QString("lbl_StatusBarLabel").append(m_statusBar->objectName()));
// use insert to insert from left to right
// this keeps any grip on the right size
this->m_statusBar->insertPermanentWidget(0, this->m_statusBarIcon, 0); // status icon
this->m_statusBar->insertPermanentWidget(1, this->m_statusBarLabel, 1); // status text
m_statusBar->insertPermanentWidget(0, m_statusBarIcon, 0); // status icon
m_statusBar->insertPermanentWidget(1, m_statusBarLabel, 1); // status text
// timer
this->m_timerStatusBar = new QTimer(this);
this->m_timerStatusBar->setObjectName(this->objectName().append(":m_timerStatusBar"));
this->m_timerStatusBar->setSingleShot(true);
connect(this->m_timerStatusBar, &QTimer::timeout, this, &CManagedStatusBar::ps_clearStatusBar);
m_timerStatusBar = new QTimer(this);
m_timerStatusBar->setObjectName(this->objectName().append(":m_timerStatusBar"));
m_timerStatusBar->setSingleShot(true);
connect(m_timerStatusBar, &QTimer::timeout, this, &CManagedStatusBar::clearStatusBar);
// done when injected status bar
if (this->m_ownStatusBar)
if (m_ownStatusBar)
{
// self created status bar
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(this->m_statusBar->sizePolicy().hasHeightForWidth());
sizePolicy.setHeightForWidth(m_statusBar->sizePolicy().hasHeightForWidth());
this->m_statusBar->setMinimumHeight(24); // with no minimum height the layout always adjustes when displaying a status message
this->m_statusBar->setSizePolicy(sizePolicy);
this->m_statusBar->setSizeGripEnabled(false);
m_statusBar->setMinimumHeight(24); // with no minimum height the layout always adjustes when displaying a status message
m_statusBar->setSizePolicy(sizePolicy);
m_statusBar->setSizeGripEnabled(false);
}
}
void CManagedStatusBar::show()
{
if (!this->m_statusBar) { return; }
this->m_statusBar->show();
if (!m_statusBar) { return; }
m_statusBar->show();
}
void CManagedStatusBar::hide()
{
if (!this->m_statusBar) { return; }
this->m_statusBar->hide();
if (!m_statusBar) { return; }
m_statusBar->hide();
// reset minimum width
if (this->m_ownStatusBar)
if (m_ownStatusBar)
{
this->m_statusBar->setMinimumWidth(50);
m_statusBar->setMinimumWidth(50);
}
}
void CManagedStatusBar::displayStatusMessage(const CStatusMessage &statusMessage)
{
Q_ASSERT_X(this->m_statusBarIcon, Q_FUNC_INFO, "Missing status bar icon");
Q_ASSERT_X(this->m_statusBar, Q_FUNC_INFO, "Missing status bar");
Q_ASSERT_X(m_statusBarIcon, Q_FUNC_INFO, "Missing status bar icon");
Q_ASSERT_X(m_statusBar, Q_FUNC_INFO, "Missing status bar");
// already displaying a message with severity higher than this one?
if (!statusMessage.isSeverityHigherOrEqual(m_currentSeverity)) { return; }
@@ -110,17 +110,17 @@ namespace BlackGui
statusMessage.markAsHandledBy(this);
this->show();
this->m_timerStatusBar->start(3000); // start / restart
this->m_statusBarIcon->setPixmap(statusMessage.toPixmap());
this->m_statusBarLabel->setText(statusMessage.getMessage());
m_timerStatusBar->start(3000); // start / restart
m_statusBarIcon->setPixmap(statusMessage.toPixmap());
m_statusBarLabel->setText(statusMessage.getMessage());
m_currentSeverity = statusMessage.getSeverity();
// restrict size for own status bars
if (this->m_ownStatusBar)
if (m_ownStatusBar)
{
QSize size = this->m_statusBar->window()->size();
QSize size = m_statusBar->window()->size();
int w = qRound(0.95 * size.width());
this->m_statusBar->setMaximumWidth(w);
m_statusBar->setMaximumWidth(w);
}
}
@@ -132,12 +132,12 @@ namespace BlackGui
}
}
void CManagedStatusBar::ps_clearStatusBar()
void CManagedStatusBar::clearStatusBar()
{
m_currentSeverity = StatusSeverity::SeverityDebug;
if (!this->m_statusBar) { return; }
this->m_statusBarIcon->clear();
this->m_statusBarLabel->clear();
if (!m_statusBar) { return; }
m_statusBarIcon->clear();
m_statusBarLabel->clear();
}
} // namespace

12
src/blackgui/managedstatusbar.h
View File

@@ -15,7 +15,6 @@
#include "blackgui/blackguiexport.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/statusmessagelist.h"
#include <QObject>
class QLabel;
@@ -24,7 +23,6 @@ class QTimer;
namespace BlackGui
{
//! Managed status bar
class BLACKGUI_EXPORT CManagedStatusBar : public QObject
{
@@ -35,7 +33,7 @@ namespace BlackGui
explicit CManagedStatusBar(QObject *parent = nullptr);
//! Destructor
~CManagedStatusBar();
virtual ~CManagedStatusBar();
//! Get the status bar
QStatusBar *getStatusBar() const { return m_statusBar; }
@@ -56,11 +54,10 @@ namespace BlackGui
//! Display status messages
void displayStatusMessages(const BlackMisc::CStatusMessageList &statusMessages);
private slots:
//! Clear status bar
void ps_clearStatusBar();
private:
//! Clear status bar
void clearStatusBar();
QStatusBar *m_statusBar = nullptr; //!< the status bar itself
QLabel *m_statusBarIcon = nullptr; //!< status bar icon
QLabel *m_statusBarLabel = nullptr; //!< status bar label
@@ -68,7 +65,6 @@ namespace BlackGui
bool m_ownStatusBar = false;
BlackMisc::StatusSeverity m_currentSeverity = BlackMisc::StatusSeverity::SeverityDebug; // severity currently displayed
};
} // namespace
#endif // guard

1
src/blackgui/models/serverlistmodel.h
View File

@@ -19,7 +19,6 @@
class QObject;
namespace BlackMisc { namespace Network { class CServer; } }
namespace BlackGui
{
namespace Models