From 409a4c972a01caa487a10cfd0997ab5d7ac0fbc5 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 13 Sep 2023 11:46:00 +0200 Subject: [PATCH] OutputPane: Use setter for display name Change-Id: I2e89fbd052330c9e7124272c2f2fa81a0db94de9 Reviewed-by: Marcus Tillmanns --- src/plugins/autotest/testresultspane.cpp | 6 +----- src/plugins/autotest/testresultspane.h | 1 - src/plugins/axivion/axivionoutputpane.cpp | 7 ++----- src/plugins/axivion/axivionoutputpane.h | 1 - .../coreplugin/find/searchresultwindow.cpp | 9 +-------- src/plugins/coreplugin/find/searchresultwindow.h | 1 - src/plugins/coreplugin/ioutputpane.cpp | 6 ------ src/plugins/coreplugin/ioutputpane.h | 5 ++++- src/plugins/coreplugin/messageoutputwindow.cpp | 6 +----- src/plugins/coreplugin/messageoutputwindow.h | 1 - src/plugins/coreplugin/outputpanemanager.cpp | 16 ++++++++++++++++ src/plugins/debugger/console/console.cpp | 6 +----- src/plugins/debugger/console/console.h | 1 - src/plugins/projectexplorer/appoutputpane.cpp | 6 +----- src/plugins/projectexplorer/appoutputpane.h | 1 - .../projectexplorer/compileoutputwindow.cpp | 1 + .../projectexplorer/compileoutputwindow.h | 2 -- src/plugins/projectexplorer/taskwindow.cpp | 6 +----- src/plugins/projectexplorer/taskwindow.h | 1 - src/plugins/serialterminal/serialoutputpane.cpp | 6 +----- src/plugins/serialterminal/serialoutputpane.h | 1 - src/plugins/squish/squishoutputpane.cpp | 6 +----- src/plugins/squish/squishoutputpane.h | 1 - src/plugins/terminal/terminalpane.cpp | 6 +----- src/plugins/terminal/terminalpane.h | 1 - src/plugins/todo/todooutputpane.cpp | 6 +----- src/plugins/todo/todooutputpane.h | 1 - src/plugins/vcsbase/vcsoutputwindow.cpp | 6 +----- src/plugins/vcsbase/vcsoutputwindow.h | 1 - 29 files changed, 34 insertions(+), 84 deletions(-) diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index 2b4cd99b3c8..90f675bc927 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/src/plugins/autotest/testresultspane.cpp @@ -74,6 +74,7 @@ TestResultsPane::TestResultsPane(QObject *parent) : IOutputPane(parent), m_context(new IContext(this)) { + setDisplayName(Tr::tr("Test Results")); m_outputWidget = new QStackedWidget; QWidget *visualOutputWidget = new QWidget; m_outputWidget->addWidget(visualOutputWidget); @@ -274,11 +275,6 @@ QList TestResultsPane::toolBarWidgets() const return result; } -QString TestResultsPane::displayName() const -{ - return Tr::tr("Test Results"); -} - int TestResultsPane::priorityInStatusBar() const { return -666; diff --git a/src/plugins/autotest/testresultspane.h b/src/plugins/autotest/testresultspane.h index 530b17c644c..7db699fc411 100644 --- a/src/plugins/autotest/testresultspane.h +++ b/src/plugins/autotest/testresultspane.h @@ -60,7 +60,6 @@ public: // IOutputPane interface QWidget *outputWidget(QWidget *parent) override; QList toolBarWidgets() const override; - QString displayName() const override; int priorityInStatusBar() const override; void clearContents() override; void setFocus() override; diff --git a/src/plugins/axivion/axivionoutputpane.cpp b/src/plugins/axivion/axivionoutputpane.cpp index 8d33abba7b2..11937b2060d 100644 --- a/src/plugins/axivion/axivionoutputpane.cpp +++ b/src/plugins/axivion/axivionoutputpane.cpp @@ -170,6 +170,8 @@ void DashboardWidget::updateUi() AxivionOutputPane::AxivionOutputPane(QObject *parent) : Core::IOutputPane(parent) { + setDisplayName(Tr::tr("Axivion")); + m_outputWidget = new QStackedWidget; DashboardWidget *dashboardWidget = new DashboardWidget(m_outputWidget); m_outputWidget->addWidget(dashboardWidget); @@ -206,11 +208,6 @@ QList AxivionOutputPane::toolBarWidgets() const return buttons; } -QString AxivionOutputPane::displayName() const -{ - return Tr::tr("Axivion"); -} - int AxivionOutputPane::priorityInStatusBar() const { return -1; diff --git a/src/plugins/axivion/axivionoutputpane.h b/src/plugins/axivion/axivionoutputpane.h index d11accc1401..f156ce3b54c 100644 --- a/src/plugins/axivion/axivionoutputpane.h +++ b/src/plugins/axivion/axivionoutputpane.h @@ -21,7 +21,6 @@ public: // IOutputPane interface QWidget *outputWidget(QWidget *parent) override; QList toolBarWidgets() const override; - QString displayName() const override; int priorityInStatusBar() const override; void clearContents() override; void setFocus() override; diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp index 2f048f93f34..48ed8b875e9 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.cpp +++ b/src/plugins/coreplugin/find/searchresultwindow.cpp @@ -363,6 +363,7 @@ SearchResultWindow *SearchResultWindow::m_instance = nullptr; SearchResultWindow::SearchResultWindow(QWidget *newSearchPanel) : d(new SearchResultWindowPrivate(this, newSearchPanel)) { + setDisplayName(Tr::tr("Search Results")); m_instance = this; readSettings(); } @@ -709,14 +710,6 @@ bool SearchResultWindow::canNavigate() const return true; } -/*! - \internal -*/ -QString SearchResultWindow::displayName() const -{ - return Tr::tr("Search Results"); -} - /*! \internal */ diff --git a/src/plugins/coreplugin/find/searchresultwindow.h b/src/plugins/coreplugin/find/searchresultwindow.h index 0b99269c964..be1d43b1225 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.h +++ b/src/plugins/coreplugin/find/searchresultwindow.h @@ -114,7 +114,6 @@ public: QWidget *outputWidget(QWidget *) override; QList toolBarWidgets() const override; - QString displayName() const override; int priorityInStatusBar() const override; void visibilityChanged(bool visible) override; bool hasFocus() const override; diff --git a/src/plugins/coreplugin/ioutputpane.cpp b/src/plugins/coreplugin/ioutputpane.cpp index 1505a2b923e..be385af5866 100644 --- a/src/plugins/coreplugin/ioutputpane.cpp +++ b/src/plugins/coreplugin/ioutputpane.cpp @@ -49,12 +49,6 @@ namespace Core { Returns the toolbar widgets for the output pane. */ -/*! - \fn QString IOutputPane::displayName() const - - Returns the translated display name of the output pane. -*/ - /*! \fn int IOutputPane::priorityInStatusBar() const diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h index 1b65bad61e9..4521456b3d6 100644 --- a/src/plugins/coreplugin/ioutputpane.h +++ b/src/plugins/coreplugin/ioutputpane.h @@ -33,7 +33,7 @@ public: virtual QWidget *outputWidget(QWidget *parent) = 0; virtual QList toolBarWidgets() const; - virtual QString displayName() const = 0; + QString displayName() const; virtual const QList outputWindows() const { return {}; } virtual void ensureWindowVisible(OutputWindow *) { } @@ -81,6 +81,8 @@ signals: void fontChanged(const QFont &font); protected: + void setDisplayName(const QString &name); + void setupFilterUi(const Utils::Key &historyKey); QString filterText() const; bool filterUsesRegexp() const { return m_filterRegexp; } @@ -104,6 +106,7 @@ private: Utils::Id filterCaseSensitivityActionId() const; Utils::Id filterInvertedActionId() const; + QString m_displayName; Core::CommandButton * const m_zoomInButton; Core::CommandButton * const m_zoomOutButton; QAction *m_filterActionRegexp = nullptr; diff --git a/src/plugins/coreplugin/messageoutputwindow.cpp b/src/plugins/coreplugin/messageoutputwindow.cpp index 2d98164e763..c33fdfe1e46 100644 --- a/src/plugins/coreplugin/messageoutputwindow.cpp +++ b/src/plugins/coreplugin/messageoutputwindow.cpp @@ -20,6 +20,7 @@ const char zoomSettingsKey[] = "Core/MessageOutput/Zoom"; MessageOutputWindow::MessageOutputWindow() { + setDisplayName(Tr::tr("General Messages")); m_widget = new OutputWindow(Context(Constants::C_GENERAL_OUTPUT_PANE), zoomSettingsKey); m_widget->setReadOnly(true); @@ -65,11 +66,6 @@ QWidget *MessageOutputWindow::outputWidget(QWidget *parent) return m_widget; } -QString MessageOutputWindow::displayName() const -{ - return Tr::tr("General Messages"); -} - void MessageOutputWindow::append(const QString &text) { m_widget->appendMessage(text, Utils::GeneralMessageFormat); diff --git a/src/plugins/coreplugin/messageoutputwindow.h b/src/plugins/coreplugin/messageoutputwindow.h index 515c8cee51b..14f9491eff4 100644 --- a/src/plugins/coreplugin/messageoutputwindow.h +++ b/src/plugins/coreplugin/messageoutputwindow.h @@ -20,7 +20,6 @@ public: QWidget *outputWidget(QWidget *parent) override; - QString displayName() const override; int priorityInStatusBar() const override; void clearContents() override; diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index 04c61e35b61..3d6cf74ceeb 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -103,6 +103,22 @@ QList IOutputPane::toolBarWidgets() const return widgets << m_zoomInButton << m_zoomOutButton; } +/*! + Returns the translated display name of the output pane. +*/ +QString IOutputPane::displayName() const +{ + return m_displayName; +} + +/*! + Sets the translated display name of the output pane to \a name. +*/ +void IOutputPane::setDisplayName(const QString &name) +{ + m_displayName = name; +} + void IOutputPane::visibilityChanged(bool /*visible*/) { } diff --git a/src/plugins/debugger/console/console.cpp b/src/plugins/debugger/console/console.cpp index 3535e9d01f2..6ba7bd3d911 100644 --- a/src/plugins/debugger/console/console.cpp +++ b/src/plugins/debugger/console/console.cpp @@ -37,6 +37,7 @@ namespace Debugger::Internal { Console::Console() { + setDisplayName(Tr::tr("QML Debugger Console")); m_consoleItemModel = new ConsoleItemModel(this); m_consoleWidget = new QWidget; @@ -142,11 +143,6 @@ QList Console::toolBarWidgets() const m_spacer, m_statusLabel}; } -QString Console::displayName() const -{ - return Tr::tr("QML Debugger Console"); -} - int Console::priorityInStatusBar() const { return 20; diff --git a/src/plugins/debugger/console/console.h b/src/plugins/debugger/console/console.h index 8e6791ee8ce..be9fb66e116 100644 --- a/src/plugins/debugger/console/console.h +++ b/src/plugins/debugger/console/console.h @@ -34,7 +34,6 @@ public: QWidget *outputWidget(QWidget *) override; QList toolBarWidgets() const override; - QString displayName() const override; int priorityInStatusBar() const override; void clearContents() override; bool canFocus() const override; diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 849c34e35cd..5c1143f40c0 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -152,6 +152,7 @@ AppOutputPane::AppOutputPane() : Tr::tr("Show the output that generated this issue in Application Output."), Tr::tr("A"))) { + setDisplayName(Tr::tr("Application Output")); ExtensionSystem::PluginManager::addObject(m_handler); setObjectName("AppOutputPane"); // Used in valgrind engine @@ -305,11 +306,6 @@ QList AppOutputPane::toolBarWidgets() const m_formatterWidget} + IOutputPane::toolBarWidgets(); } -QString AppOutputPane::displayName() const -{ - return Tr::tr("Application Output"); -} - int AppOutputPane::priorityInStatusBar() const { return 60; diff --git a/src/plugins/projectexplorer/appoutputpane.h b/src/plugins/projectexplorer/appoutputpane.h index 059d78bff19..d62c7ef404b 100644 --- a/src/plugins/projectexplorer/appoutputpane.h +++ b/src/plugins/projectexplorer/appoutputpane.h @@ -46,7 +46,6 @@ public: QWidget *outputWidget(QWidget *) override; QList toolBarWidgets() const override; - QString displayName() const override; int priorityInStatusBar() const override; void clearContents() override; bool canFocus() const override; diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp index f14f80a0587..159cb8f166e 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.cpp +++ b/src/plugins/projectexplorer/compileoutputwindow.cpp @@ -50,6 +50,7 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) : m_cancelBuildButton(new QToolButton), m_settingsButton(new QToolButton) { + setDisplayName(QCoreApplication::translate("QtC::ProjectExplorer", "Compile Output")); Core::Context context(C_COMPILE_OUTPUT); m_outputWindow = new Core::OutputWindow(context, SETTINGS_KEY); m_outputWindow->setWindowTitle(displayName()); diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h index be3e237efa5..3cb79835122 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.h +++ b/src/plugins/projectexplorer/compileoutputwindow.h @@ -48,8 +48,6 @@ public: QWidget *outputWidget(QWidget *) override; QList toolBarWidgets() const override; - QString displayName() const override { - return QCoreApplication::translate("QtC::ProjectExplorer","Compile Output"); } int priorityInStatusBar() const override; void clearContents() override; bool canFocus() const override; diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index a7e419034d8..cd028e0c8bd 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -168,6 +168,7 @@ static QToolButton *createFilterButton(const QIcon &icon, const QString &toolTip TaskWindow::TaskWindow() : d(std::make_unique()) { + setDisplayName(Tr::tr("Issues")); d->m_model = new Internal::TaskModel(this); d->m_filter = new Internal::TaskFilterModel(d->m_model); d->m_filter->setAutoAcceptChildRows(true); @@ -306,11 +307,6 @@ QList TaskWindow::toolBarWidgets() const return {d->m_filterWarningsButton, d->m_categoriesButton, filterWidget()}; } -QString TaskWindow::displayName() const -{ - return Tr::tr("Issues"); -} - QWidget *TaskWindow::outputWidget(QWidget *) { return &d->m_treeView; diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h index 3f0c6586677..06ce354c36e 100644 --- a/src/plugins/projectexplorer/taskwindow.h +++ b/src/plugins/projectexplorer/taskwindow.h @@ -40,7 +40,6 @@ public: QWidget *outputWidget(QWidget *) override; QList toolBarWidgets() const override; - QString displayName() const override; int priorityInStatusBar() const override; void clearContents() override; void visibilityChanged(bool visible) override; diff --git a/src/plugins/serialterminal/serialoutputpane.cpp b/src/plugins/serialterminal/serialoutputpane.cpp index 0f11ceb9a96..63a34d1ce12 100644 --- a/src/plugins/serialterminal/serialoutputpane.cpp +++ b/src/plugins/serialterminal/serialoutputpane.cpp @@ -120,6 +120,7 @@ SerialOutputPane::SerialOutputPane(Settings &settings) : m_closeAllTabsAction(new QAction(Tr::tr("Close All Tabs"), this)), m_closeOtherTabsAction(new QAction(Tr::tr("Close Other Tabs"), this)) { + setDisplayName(Tr::tr(Constants::OUTPUT_PANE_TITLE)); createToolButtons(); auto layout = new QVBoxLayout; @@ -174,11 +175,6 @@ QList SerialOutputPane::toolBarWidgets() const m_resetButton }; } -QString SerialOutputPane::displayName() const -{ - return Tr::tr(Constants::OUTPUT_PANE_TITLE); -} - int SerialOutputPane::priorityInStatusBar() const { return 30; diff --git a/src/plugins/serialterminal/serialoutputpane.h b/src/plugins/serialterminal/serialoutputpane.h index af0772a1f3d..f2a2d5414ca 100644 --- a/src/plugins/serialterminal/serialoutputpane.h +++ b/src/plugins/serialterminal/serialoutputpane.h @@ -50,7 +50,6 @@ public: // IOutputPane QWidget *outputWidget(QWidget *parent) final; QList toolBarWidgets() const final; - QString displayName() const final; int priorityInStatusBar() const final; void clearContents() final; diff --git a/src/plugins/squish/squishoutputpane.cpp b/src/plugins/squish/squishoutputpane.cpp index 33b86794e7a..54704fc0621 100644 --- a/src/plugins/squish/squishoutputpane.cpp +++ b/src/plugins/squish/squishoutputpane.cpp @@ -28,6 +28,7 @@ static SquishOutputPane *m_instance = nullptr; SquishOutputPane::SquishOutputPane() { + setDisplayName(Tr::tr("Squish")); m_instance = this; m_outputPane = new QTabWidget; @@ -114,11 +115,6 @@ QList SquishOutputPane::toolBarWidgets() const return {m_filterButton, m_expandAll, m_collapseAll}; } -QString SquishOutputPane::displayName() const -{ - return Tr::tr("Squish"); -} - int SquishOutputPane::priorityInStatusBar() const { return -777; diff --git a/src/plugins/squish/squishoutputpane.h b/src/plugins/squish/squishoutputpane.h index eac2ab1b614..5b354c8a8c8 100644 --- a/src/plugins/squish/squishoutputpane.h +++ b/src/plugins/squish/squishoutputpane.h @@ -35,7 +35,6 @@ public: // IOutputPane interface QWidget *outputWidget(QWidget *parent) override; QList toolBarWidgets() const override; - QString displayName() const override; int priorityInStatusBar() const override; void clearContents() override; void visibilityChanged(bool visible) override; diff --git a/src/plugins/terminal/terminalpane.cpp b/src/plugins/terminal/terminalpane.cpp index 13a1abac2f5..0a8af297518 100644 --- a/src/plugins/terminal/terminalpane.cpp +++ b/src/plugins/terminal/terminalpane.cpp @@ -40,6 +40,7 @@ TerminalPane::TerminalPane(QObject *parent) : IOutputPane(parent) , m_selfContext("Terminal.Pane") { + setDisplayName(Tr::tr("Terminal")); setupContext(m_selfContext, &m_tabWidget); setZoomButtonsEnabled(true); @@ -348,11 +349,6 @@ QList TerminalPane::toolBarWidgets() const return widgets << m_openSettingsButton << m_lockKeyboardButton << m_escSettingButton; } -QString TerminalPane::displayName() const -{ - return Tr::tr("Terminal"); -} - int TerminalPane::priorityInStatusBar() const { return 50; diff --git a/src/plugins/terminal/terminalpane.h b/src/plugins/terminal/terminalpane.h index bc25ade2b14..4b201ad585d 100644 --- a/src/plugins/terminal/terminalpane.h +++ b/src/plugins/terminal/terminalpane.h @@ -27,7 +27,6 @@ public: QWidget *outputWidget(QWidget *parent) override; QList toolBarWidgets() const override; - QString displayName() const override; int priorityInStatusBar() const override; void clearContents() override; void visibilityChanged(bool visible) override; diff --git a/src/plugins/todo/todooutputpane.cpp b/src/plugins/todo/todooutputpane.cpp index b8197d6b611..ff481033833 100644 --- a/src/plugins/todo/todooutputpane.cpp +++ b/src/plugins/todo/todooutputpane.cpp @@ -26,6 +26,7 @@ TodoOutputPane::TodoOutputPane(TodoItemsModel *todoItemsModel, const Settings *s m_todoItemsModel(todoItemsModel), m_settings(settings) { + setDisplayName(Tr::tr("To-Do Entries")); createTreeView(); createScopeButtons(); setScanningScope(ScanningScopeCurrentFile); // default @@ -59,11 +60,6 @@ QList TodoOutputPane::toolBarWidgets() const return widgets; } -QString TodoOutputPane::displayName() const -{ - return Tr::tr("To-Do Entries"); -} - int TodoOutputPane::priorityInStatusBar() const { return 1; diff --git a/src/plugins/todo/todooutputpane.h b/src/plugins/todo/todooutputpane.h index fa4dda3ddbe..595a9118eac 100644 --- a/src/plugins/todo/todooutputpane.h +++ b/src/plugins/todo/todooutputpane.h @@ -35,7 +35,6 @@ public: QWidget *outputWidget(QWidget *parent) override; QList toolBarWidgets() const override; - QString displayName() const override; int priorityInStatusBar() const override; void clearContents() override; void setFocus() override; diff --git a/src/plugins/vcsbase/vcsoutputwindow.cpp b/src/plugins/vcsbase/vcsoutputwindow.cpp index d02ad28abc7..43396cd1fe6 100644 --- a/src/plugins/vcsbase/vcsoutputwindow.cpp +++ b/src/plugins/vcsbase/vcsoutputwindow.cpp @@ -283,6 +283,7 @@ static VcsOutputWindowPrivate *d = nullptr; VcsOutputWindow::VcsOutputWindow() { + setDisplayName(Tr::tr("Version Control")); d = new VcsOutputWindowPrivate; Q_ASSERT(d->passwordRegExp.isValid()); m_instance = this; @@ -327,11 +328,6 @@ QWidget *VcsOutputWindow::outputWidget(QWidget *parent) return &d->widget; } -QString VcsOutputWindow::displayName() const -{ - return Tr::tr("Version Control"); -} - int VcsOutputWindow::priorityInStatusBar() const { return -1; diff --git a/src/plugins/vcsbase/vcsoutputwindow.h b/src/plugins/vcsbase/vcsoutputwindow.h index f6023560865..a0242dbfd5c 100644 --- a/src/plugins/vcsbase/vcsoutputwindow.h +++ b/src/plugins/vcsbase/vcsoutputwindow.h @@ -22,7 +22,6 @@ class VCSBASE_EXPORT VcsOutputWindow : public Core::IOutputPane public: QWidget *outputWidget(QWidget *parent) override; - QString displayName() const override; int priorityInStatusBar() const override;