Commit 9b18a58a authored by Tobias Hunger's avatar Tobias Hunger
Browse files

s/name/displayName/ in ioutputpane

Reviewed-by: dt
parent c29ef119
......@@ -51,7 +51,7 @@ public:
virtual QWidget *outputWidget(QWidget *parent) = 0;
virtual QList<QWidget*> toolBarWidgets() const = 0;
virtual QString name() const = 0;
virtual QString displayName() const = 0;
// -1 don't show in statusBar
// 100...0 show at front...end
......
......@@ -71,7 +71,7 @@ QWidget *MessageOutputWindow::outputWidget(QWidget *parent)
return m_widget;
}
QString MessageOutputWindow::name() const
QString MessageOutputWindow::displayName() const
{
return tr("General Messages");
}
......
......@@ -50,7 +50,7 @@ public:
QWidget *outputWidget(QWidget *parent);
QList<QWidget*> toolBarWidgets() const { return QList<QWidget *>(); }
QString name() const;
QString displayName() const;
int priorityInStatusBar() const;
void clearContents();
void visibilityChanged(bool visible);
......
......@@ -353,9 +353,9 @@ void OutputPaneManager::init()
m_opToolBarWidgets->addWidget(toolButtonsContainer);
QString actionId = QString("QtCreator.Pane.%1").arg(outPane->name().simplified());
QString actionId = QString("QtCreator.Pane.%1").arg(outPane->displayName().simplified());
actionId.remove(QLatin1Char(' '));
QAction *action = new QAction(outPane->name(), this);
QAction *action = new QAction(outPane->displayName(), this);
Command *cmd = am->registerAction(action, actionId, QList<int>() << Constants::C_GLOBAL_ID);
......@@ -364,7 +364,7 @@ void OutputPaneManager::init()
if (outPane->priorityInStatusBar() != -1) {
cmd->setDefaultKeySequence(QKeySequence(paneShortCut(shortcutNumber)));
QPushButton *button = new OutputPaneToggleButton(shortcutNumber, outPane->name(),
QPushButton *button = new OutputPaneToggleButton(shortcutNumber, outPane->displayName(),
cmd->action());
++shortcutNumber;
m_buttonsWidget->layout()->addWidget(button);
......@@ -373,7 +373,7 @@ void OutputPaneManager::init()
}
// Now add the entry to the combobox, since the first item we add sets the currentIndex, thus we need to be set up for that
m_widgetComboBox->addItem(outPane->name(), idx);
m_widgetComboBox->addItem(outPane->displayName(), idx);
connect(cmd->action(), SIGNAL(triggered()), this, SLOT(shortcutTriggered()));
} while (it != begin);
......
......@@ -96,7 +96,7 @@ SearchResultWindowPrivate::SearchResultWindowPrivate()
SearchResultWindow::SearchResultWindow() : d(new SearchResultWindowPrivate)
{
d->m_widget = new QStackedWidget;
d->m_widget->setWindowTitle(name());
d->m_widget->setWindowTitle(displayName());
d->m_searchResultTreeView = new Internal::SearchResultTreeView(d->m_widget);
d->m_searchResultTreeView->setFrameStyle(QFrame::NoFrame);
......
......@@ -86,7 +86,7 @@ public:
QWidget *outputWidget(QWidget *);
QList<QWidget*> toolBarWidgets() const;
QString name() const { return tr("Search Results"); }
QString displayName() const { return tr("Search Results"); }
int priorityInStatusBar() const;
void visibilityChanged(bool visible);
bool isEmpty() const;
......
......@@ -52,7 +52,7 @@ public:
CompileOutputWindow(BuildManager *bm);
QWidget *outputWidget(QWidget *);
QList<QWidget*> toolBarWidgets() const { return QList<QWidget *>(); }
QString name() const { return tr("Compile Output"); }
QString displayName() const { return tr("Compile Output"); }
int priorityInStatusBar() const;
void clearContents();
void visibilityChanged(bool visible);
......
......@@ -155,7 +155,7 @@ QList<QWidget*> OutputPane::toolBarWidgets() const
return QList<QWidget*>() << m_reRunButton << m_stopButton;
}
QString OutputPane::name() const
QString OutputPane::displayName() const
{
return tr("Application Output");
}
......
......@@ -71,7 +71,7 @@ public:
QWidget *outputWidget(QWidget *);
QList<QWidget*> toolBarWidgets() const;
QString name() const;
QString displayName() const;
int priorityInStatusBar() const;
void clearContents();
void visibilityChanged(bool);
......
......@@ -100,12 +100,11 @@ public:
int taskCount() const;
int errorTaskCount() const;
// IOutputPane
QWidget *outputWidget(QWidget *);
QList<QWidget*> toolBarWidgets() const;
QString name() const { return tr("Build Issues"); }
QString displayName() const { return tr("Build Issues"); }
int priorityInStatusBar() const;
void clearContents();
void visibilityChanged(bool visible);
......
......@@ -273,7 +273,7 @@ QWidgetList VCSBaseOutputWindow::toolBarWidgets() const
return QWidgetList();
}
QString VCSBaseOutputWindow::name() const
QString VCSBaseOutputWindow::displayName() const
{
return tr("Version Control");
}
......
......@@ -56,7 +56,7 @@ public:
virtual QWidget *outputWidget(QWidget *parent);
virtual QList<QWidget*> toolBarWidgets() const;
virtual QString name() const;
virtual QString displayName() const;
virtual int priorityInStatusBar() const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment