feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Simplify AppOutputPane widget nesting

Browse Source 
A TabWidget in a tight layout in a widget doesn't look different then
a TabWidget.

Change-Id: Id042deace1b2ae66a57678fb34d45ee47938716f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-01-12 13:28:30 +01:00
parent a3109a53c0
commit 2f144a56cd
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/projectexplorer/appoutputpane.cpp
View File

@@ -135,7 +135,6 @@ AppOutputPane::RunControlTab::RunControlTab(RunControl *runControl, Core::Output
} }
AppOutputPane::AppOutputPane() : AppOutputPane::AppOutputPane() :
m_mainWidget(new QWidget),
m_tabWidget(new TabWidget), m_tabWidget(new TabWidget),
m_stopAction(new QAction(tr("Stop"), this)), m_stopAction(new QAction(tr("Stop"), this)),
m_closeCurrentTabAction(new QAction(tr("Close Tab"), this)), m_closeCurrentTabAction(new QAction(tr("Close Tab"), this)),
@@ -200,28 +199,24 @@ AppOutputPane::AppOutputPane() :
// Spacer (?) // Spacer (?)
auto *layout = new QVBoxLayout;
layout->setContentsMargins(0, 0, 0, 0);
m_tabWidget->setDocumentMode(true); m_tabWidget->setDocumentMode(true);
m_tabWidget->setTabsClosable(true); m_tabWidget->setTabsClosable(true);
m_tabWidget->setMovable(true); m_tabWidget->setMovable(true);
connect(m_tabWidget, &QTabWidget::tabCloseRequested, connect(m_tabWidget, &QTabWidget::tabCloseRequested,
this, [this](int index) { closeTab(index); }); this, [this](int index) { closeTab(index); });
layout->addWidget(m_tabWidget);
connect(m_tabWidget, &QTabWidget::currentChanged, this, &AppOutputPane::tabChanged); connect(m_tabWidget, &QTabWidget::currentChanged,
this, &AppOutputPane::tabChanged);
connect(m_tabWidget, &TabWidget::contextMenuRequested, connect(m_tabWidget, &TabWidget::contextMenuRequested,
this, &AppOutputPane::contextMenuRequested); this, &AppOutputPane::contextMenuRequested);
m_mainWidget->setLayout(layout);
connect(SessionManager::instance(), &SessionManager::aboutToUnloadSession, connect(SessionManager::instance(), &SessionManager::aboutToUnloadSession,
this, &AppOutputPane::aboutToUnloadSession); this, &AppOutputPane::aboutToUnloadSession);
setupFilterUi("AppOutputPane.Filter"); setupFilterUi("AppOutputPane.Filter");
setFilteringEnabled(false); setFilteringEnabled(false);
setZoomButtonsEnabled(false); setZoomButtonsEnabled(false);
setupContext("Core.AppOutputPane", m_mainWidget); setupContext("Core.AppOutputPane", m_tabWidget);
} }
AppOutputPane::~AppOutputPane() AppOutputPane::~AppOutputPane()
@@ -232,7 +227,7 @@ AppOutputPane::~AppOutputPane()
delete rt.window; delete rt.window;
delete rt.runControl; delete rt.runControl;
} }
delete m_mainWidget; delete m_tabWidget;
ExtensionSystem::PluginManager::removeObject(m_handler); ExtensionSystem::PluginManager::removeObject(m_handler);
delete m_handler; delete m_handler;
} }
@@ -299,7 +294,7 @@ void AppOutputPane::aboutToUnloadSession()
QWidget *AppOutputPane::outputWidget(QWidget *) QWidget *AppOutputPane::outputWidget(QWidget *)
{ {
return m_mainWidget; return m_tabWidget;
} }
QList<QWidget*> AppOutputPane::toolBarWidgets() const QList<QWidget*> AppOutputPane::toolBarWidgets() const

2
src/plugins/projectexplorer/appoutputpane.h
View File

@@ -14,7 +14,6 @@
#include <QVector> #include <QVector>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QTabWidget;
class QToolButton; class QToolButton;
class QAction; class QAction;
class QPoint; class QPoint;
@@ -123,7 +122,6 @@ private:
void loadSettings(); void loadSettings();
void storeSettings() const; void storeSettings() const;
QWidget *m_mainWidget;
TabWidget *m_tabWidget; TabWidget *m_tabWidget;
QVector<RunControlTab> m_runControlTabs; QVector<RunControlTab> m_runControlTabs;
int m_runControlCount = 0; int m_runControlCount = 0;