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

Ref T180, text message component "private" -> "private slots"

Browse Source
This commit is contained in:
Klaus Basan
2017-11-05 19:11:41 +01:00
parent 4972fe0af2
commit 1bf2f63589
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackgui/components/textmessagecomponent.cpp
View File

@@ -68,9 +68,9 @@ namespace BlackGui
ui->le_textMessages->setVisible(false);
ui->tvp_TextMessagesAll->setResizeMode(CTextMessageView::ResizingAuto);
bool c = connect(ui->le_textMessages, &QLineEdit::returnPressed, this, &CTextMessageComponent::ps_textMessageEntered);
bool c = connect(ui->le_textMessages, &QLineEdit::returnPressed, this, &CTextMessageComponent::textMessageEntered);
Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");
c = connect(sGui->getIContextOwnAircraft(), &IContextOwnAircraft::changedAircraftCockpit, this, &CTextMessageComponent::ps_onChangedAircraftCockpit);
c = connect(sGui->getIContextOwnAircraft(), &IContextOwnAircraft::changedAircraftCockpit, this, &CTextMessageComponent::onChangedAircraftCockpit);
Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");
c = connect(this, &CTextMessageComponent::commandEntered, sApp->getCoreFacade(), &CCoreFacade::parseCommandLine);
Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");
@@ -83,7 +83,7 @@ namespace BlackGui
bool CTextMessageComponent::setParentDockWidgetInfoArea(CDockWidgetInfoArea *parentDockableWidget)
{
bool c = CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea(parentDockableWidget);
c = c && connect(this->getDockWidgetInfoArea(), &CDockWidgetInfoArea::widgetTopLevelChanged, this, &CTextMessageComponent::ps_topLevelChanged);
c = c && connect(this->getDockWidgetInfoArea(), &CDockWidgetInfoArea::widgetTopLevelChanged, this, &CTextMessageComponent::topLevelChanged);
Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");
return c;
}
@@ -201,7 +201,7 @@ namespace BlackGui
return m_identifier;
}
void CTextMessageComponent::ps_onChangedAircraftCockpit()
void CTextMessageComponent::onChangedAircraftCockpit()
{
this->showCurrentFrequenciesFromCockpit();
}
@@ -276,7 +276,7 @@ namespace BlackGui
newTab->setLayout(layout);
textEdit->setContextMenuPolicy(Qt::CustomContextMenu);
const int index = ui->tw_TextMessages->addTab(newTab, tabName);
connect(closeButton, &QPushButton::released, this, &CTextMessageComponent::ps_closeTextMessageTab);
connect(closeButton, &QPushButton::released, this, &CTextMessageComponent::closeTextMessageTab);
ui->tw_TextMessages->setCurrentIndex(index);
if (sGui && sGui->getIContextNetwork())
@@ -350,7 +350,7 @@ namespace BlackGui
return nullptr;
}
void CTextMessageComponent::ps_closeTextMessageTab()
void CTextMessageComponent::closeTextMessageTab()
{
QObject *sender = QObject::sender();
QWidget *parentWidget = qobject_cast<QWidget *>(sender->parent());
@@ -365,14 +365,14 @@ namespace BlackGui
if (index >= 0) { ui->tw_TextMessages->removeTab(index); }
}
void CTextMessageComponent::ps_topLevelChanged(QWidget *widget, bool topLevel)
void CTextMessageComponent::topLevelChanged(QWidget *widget, bool topLevel)
{
// own input field if floating window
Q_UNUSED(widget);
ui->le_textMessages->setVisible(topLevel);
}
void CTextMessageComponent::ps_textMessageEntered()
void CTextMessageComponent::textMessageEntered()
{
if (!ui->le_textMessages->isVisible()) { return; }
if (!this->isVisible()) { return; }
@@ -470,8 +470,8 @@ namespace BlackGui
if (originator == componentIdentifier()) { return false; }
if (commandLine.isEmpty() || commandLine.startsWith(".")) { return false; }
// non command input
if (!this->isVisibleWidget()) { return false; } // invisble, do ignore
// no "dot" command input
if (!this->isVisibleWidget()) { return false; } // invisible, do ignore
this->handleEnteredTextMessage(commandLine); // handle as it was entered by own command line
return false; // we never handle the message directly, but forward it

9
src/blackgui/components/textmessagecomponent.h
View File

@@ -129,18 +129,17 @@ namespace BlackGui
//! Handle a text message entered
void handleEnteredTextMessage(const QString &textMessage);
private slots:
//! Cockpit values changed, used to updated some components
void ps_onChangedAircraftCockpit();
void onChangedAircraftCockpit();
//! Close text message tab
void ps_closeTextMessageTab();
void closeTextMessageTab();
//! Top level was changed (used to enable elements when floating)
void ps_topLevelChanged(QWidget *widget, bool topLevel);
void topLevelChanged(QWidget *widget, bool topLevel);
//! Command line entered
void ps_textMessageEntered();
void textMessageEntered();
};
} // ns
} // ns