flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T331, closing "X" on message tab

Browse Source
This commit is contained in:
Klaus Basan
2018-09-07 18:40:48 +02:00
parent d37c52fed5
commit 30669a4d35
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@
#include <QLayout>
#include <QLineEdit>
#include <QPushButton>
#include <QToolButton>
#include <QTabWidget>
#include <QVBoxLayout>
#include <QWidget>
@@ -73,8 +74,12 @@ namespace BlackGui
Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");
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");
if (sGui && sGui->getCoreFacade())
{
c = connect(this, &CTextMessageComponent::commandEntered, sGui->getCoreFacade(), &CCoreFacade::parseCommandLine);
Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");
}
Q_UNUSED(c);
}
@@ -254,6 +259,7 @@ namespace BlackGui
QWidget *CTextMessageComponent::addNewTextMessageTab(const QString &tabName)
{
QWidget *newTab = new QWidget(this);
newTab->setObjectName("Tab widget " + tabName);
QPushButton *closeButton = new QPushButton("Close", newTab);
QVBoxLayout *layout = new QVBoxLayout(newTab);
CTextMessageTextEdit *textEdit = new CTextMessageTextEdit(newTab);
@@ -265,13 +271,21 @@ namespace BlackGui
newTab->setLayout(layout);
textEdit->setContextMenuPolicy(Qt::CustomContextMenu);
const int index = ui->tw_TextMessages->addTab(newTab, tabName);
connect(closeButton, &QPushButton::released, this, &CTextMessageComponent::closeTextMessageTab);
QToolButton *closeButtonInTab = new QToolButton(newTab);
closeButtonInTab->setText("[X]");
ui->tw_TextMessages->tabBar()->setTabButton(index, QTabBar::RightSide, closeButtonInTab);
ui->tw_TextMessages->setCurrentIndex(index);
closeButton->setProperty("messageTabIndex", index);
closeButtonInTab->setProperty("messageTabIndex", index);
connect(closeButton, &QPushButton::released, this, &CTextMessageComponent::closeTextMessageTab);
connect(closeButtonInTab, &QPushButton::released, this, &CTextMessageComponent::closeTextMessageTab);
if (sGui && sGui->getIContextNetwork())
{
QString realName = sGui->getIContextNetwork()->getUserForCallsign(CCallsign(tabName)).getRealName();
if (!realName.isEmpty()) ui->tw_TextMessages->setTabToolTip(index, realName);
const QString realName = sGui->getIContextNetwork()->getUserForCallsign(CCallsign(tabName)).getRealName();
if (!realName.isEmpty()) { ui->tw_TextMessages->setTabToolTip(index, realName); }
}
return newTab;
}
@@ -345,7 +359,11 @@ namespace BlackGui
QWidget *parentWidget = qobject_cast<QWidget *>(sender->parent());
Q_ASSERT(parentWidget);
int index = -1;
const QVariant qvi = sender->property("messageTabIndex");
if (qvi.isValid()) { index = qvi.toInt(); }
// the while loop is the old version
// should not really be needed anymore
while (index < 0 && parentWidget)
{
index = ui->tw_TextMessages->indexOf(parentWidget);

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

@@ -24,8 +24,6 @@
#include <QScopedPointer>
#include <QString>
class QWidget;
namespace Ui { class CTextMessageComponent; }
namespace BlackGui
{
@@ -53,7 +51,7 @@ namespace BlackGui
explicit CTextMessageComponent(QWidget *parent = nullptr);
//! Destructor
virtual ~CTextMessageComponent();
virtual ~CTextMessageComponent() override;
//! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
virtual bool setParentDockWidgetInfoArea(CDockWidgetInfoArea *parentDockableWidget) override;