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

OutputPane: Use setter for display name

Browse Source 
Change-Id: I2e89fbd052330c9e7124272c2f2fa81a0db94de9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Eike Ziller
2023-09-13 11:46:00 +02:00
parent 11c7cd0c9d
commit 409a4c972a
29 changed files with 34 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/autotest/testresultspane.cpp
View File

@@ -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<QWidget *> TestResultsPane::toolBarWidgets() const
return result;
}
QString TestResultsPane::displayName() const
{
return Tr::tr("Test Results");
}
int TestResultsPane::priorityInStatusBar() const
{
return -666;

1
src/plugins/autotest/testresultspane.h
View File

@@ -60,7 +60,6 @@ public:
// IOutputPane interface
QWidget *outputWidget(QWidget *parent) override;
QList<QWidget *> toolBarWidgets() const override;
QString displayName() const override;
int priorityInStatusBar() const override;
void clearContents() override;
void setFocus() override;

7
src/plugins/axivion/axivionoutputpane.cpp
View File

@@ -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<QWidget *> AxivionOutputPane::toolBarWidgets() const
return buttons;
}
QString AxivionOutputPane::displayName() const
{
return Tr::tr("Axivion");
}
int AxivionOutputPane::priorityInStatusBar() const
{
return -1;

1
src/plugins/axivion/axivionoutputpane.h
View File

@@ -21,7 +21,6 @@ public:
// IOutputPane interface
QWidget *outputWidget(QWidget *parent) override;
QList<QWidget *> toolBarWidgets() const override;
QString displayName() const override;
int priorityInStatusBar() const override;
void clearContents() override;
void setFocus() override;

9
src/plugins/coreplugin/find/searchresultwindow.cpp
View File

@@ -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
*/

1
src/plugins/coreplugin/find/searchresultwindow.h
View File

@@ -114,7 +114,6 @@ public:
QWidget *outputWidget(QWidget *) override;
QList<QWidget*> toolBarWidgets() const override;
QString displayName() const override;
int priorityInStatusBar() const override;
void visibilityChanged(bool visible) override;
bool hasFocus() const override;

6
src/plugins/coreplugin/ioutputpane.cpp
View File

@@ -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

5
src/plugins/coreplugin/ioutputpane.h
View File

@@ -33,7 +33,7 @@ public:
virtual QWidget *outputWidget(QWidget *parent) = 0;
virtual QList<QWidget *> toolBarWidgets() const;
virtual QString displayName() const = 0;
QString displayName() const;
virtual const QList<OutputWindow *> 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;

6
src/plugins/coreplugin/messageoutputwindow.cpp
View File

@@ -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);

1
src/plugins/coreplugin/messageoutputwindow.h
View File

@@ -20,7 +20,6 @@ public:
QWidget *outputWidget(QWidget *parent) override;
QString displayName() const override;
int priorityInStatusBar() const override;
void clearContents() override;

16
src/plugins/coreplugin/outputpanemanager.cpp
View File

@@ -103,6 +103,22 @@ QList<QWidget *> 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*/)
{
}

6
src/plugins/debugger/console/console.cpp
View File

@@ -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<QWidget *> Console::toolBarWidgets() const
m_spacer, m_statusLabel};
}
QString Console::displayName() const
{
return Tr::tr("QML Debugger Console");
}
int Console::priorityInStatusBar() const
{
return 20;

1
src/plugins/debugger/console/console.h
View File

@@ -34,7 +34,6 @@ public:
QWidget *outputWidget(QWidget *) override;
QList<QWidget *> toolBarWidgets() const override;
QString displayName() const override;
int priorityInStatusBar() const override;
void clearContents() override;
bool canFocus() const override;

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

@@ -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<QWidget *> AppOutputPane::toolBarWidgets() const
m_formatterWidget} + IOutputPane::toolBarWidgets();
}
QString AppOutputPane::displayName() const
{
return Tr::tr("Application Output");
}
int AppOutputPane::priorityInStatusBar() const
{
return 60;

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

@@ -46,7 +46,6 @@ public:
QWidget *outputWidget(QWidget *) override;
QList<QWidget *> toolBarWidgets() const override;
QString displayName() const override;
int priorityInStatusBar() const override;
void clearContents() override;
bool canFocus() const override;

1
src/plugins/projectexplorer/compileoutputwindow.cpp
View File

@@ -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());

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

@@ -48,8 +48,6 @@ public:
QWidget *outputWidget(QWidget *) override;
QList<QWidget *> 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;

6
src/plugins/projectexplorer/taskwindow.cpp
View File

@@ -168,6 +168,7 @@ static QToolButton *createFilterButton(const QIcon &icon, const QString &toolTip
TaskWindow::TaskWindow() : d(std::make_unique<TaskWindowPrivate>())
{
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<QWidget*> 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;

1
src/plugins/projectexplorer/taskwindow.h
View File

@@ -40,7 +40,6 @@ public:
QWidget *outputWidget(QWidget *) override;
QList<QWidget *> toolBarWidgets() const override;
QString displayName() const override;
int priorityInStatusBar() const override;
void clearContents() override;
void visibilityChanged(bool visible) override;

6
src/plugins/serialterminal/serialoutputpane.cpp
View File

@@ -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<QWidget *> SerialOutputPane::toolBarWidgets() const
m_resetButton };
}
QString SerialOutputPane::displayName() const
{
return Tr::tr(Constants::OUTPUT_PANE_TITLE);
}
int SerialOutputPane::priorityInStatusBar() const
{
return 30;

1
src/plugins/serialterminal/serialoutputpane.h
View File

@@ -50,7 +50,6 @@ public:
// IOutputPane
QWidget *outputWidget(QWidget *parent) final;
QList<QWidget *> toolBarWidgets() const final;
QString displayName() const final;
int priorityInStatusBar() const final;
void clearContents() final;

6
src/plugins/squish/squishoutputpane.cpp
View File

@@ -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<QWidget *> SquishOutputPane::toolBarWidgets() const
return {m_filterButton, m_expandAll, m_collapseAll};
}
QString SquishOutputPane::displayName() const
{
return Tr::tr("Squish");
}
int SquishOutputPane::priorityInStatusBar() const
{
return -777;

1
src/plugins/squish/squishoutputpane.h
View File

@@ -35,7 +35,6 @@ public:
// IOutputPane interface
QWidget *outputWidget(QWidget *parent) override;
QList<QWidget *> toolBarWidgets() const override;
QString displayName() const override;
int priorityInStatusBar() const override;
void clearContents() override;
void visibilityChanged(bool visible) override;

6
src/plugins/terminal/terminalpane.cpp
View File

@@ -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<QWidget *> 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;

1
src/plugins/terminal/terminalpane.h
View File

@@ -27,7 +27,6 @@ public:
QWidget *outputWidget(QWidget *parent) override;
QList<QWidget *> toolBarWidgets() const override;
QString displayName() const override;
int priorityInStatusBar() const override;
void clearContents() override;
void visibilityChanged(bool visible) override;

6
src/plugins/todo/todooutputpane.cpp
View File

@@ -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<QWidget*> TodoOutputPane::toolBarWidgets() const
return widgets;
}
QString TodoOutputPane::displayName() const
{
return Tr::tr("To-Do Entries");
}
int TodoOutputPane::priorityInStatusBar() const
{
return 1;

1
src/plugins/todo/todooutputpane.h
View File

@@ -35,7 +35,6 @@ public:
QWidget *outputWidget(QWidget *parent) override;
QList<QWidget*> toolBarWidgets() const override;
QString displayName() const override;
int priorityInStatusBar() const override;
void clearContents() override;
void setFocus() override;

6
src/plugins/vcsbase/vcsoutputwindow.cpp
View File

@@ -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;

1
src/plugins/vcsbase/vcsoutputwindow.h
View File

@@ -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;