forked from qt-creator/qt-creator
Rename 'output pane' to simply 'output'
Change-Id: If45e053a32855bca68dc71cb5da22f981146e45b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -210,7 +210,7 @@ static QString qmldumpFailedMessage(const FilePath &libraryPath, const QString &
|
|||||||
"\n"
|
"\n"
|
||||||
"%1"
|
"%1"
|
||||||
"\n"
|
"\n"
|
||||||
"Check 'General Messages' output pane for details."
|
"Check General Messages for details."
|
||||||
).arg(firstLines);
|
).arg(firstLines);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -192,7 +192,7 @@
|
|||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string><html><head/><body>
|
<string><html><head/><body>
|
||||||
<p>What to do with the executable's standard output.
|
<p>What to do with the executable's standard output.
|
||||||
<ul><li>Ignore: Do nothing with it.</li><li>Show in pane: Show it in the general output pane.</li><li>Replace selection: Replace the current selection in the current document with it.</li></ul></p></body></html>
|
<ul><li>Ignore: Do nothing with it.</li><li>Show in General Messages.</li><li>Replace selection: Replace the current selection in the current document with it.</li></ul></p></body></html>
|
||||||
</string>
|
</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -209,7 +209,7 @@
|
|||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Show in Pane</string>
|
<string>Show in General Messages</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@@ -225,7 +225,7 @@
|
|||||||
<string><html><head><body>
|
<string><html><head><body>
|
||||||
<p >What to do with the executable's standard error output.</p>
|
<p >What to do with the executable's standard error output.</p>
|
||||||
<ul><li>Ignore: Do nothing with it.</li>
|
<ul><li>Ignore: Do nothing with it.</li>
|
||||||
<li>Show in pane: Show it in the general output pane.</li>
|
<li>Show in General Messages.</li>
|
||||||
<li>Replace selection: Replace the current selection in the current document with it.</li>
|
<li>Replace selection: Replace the current selection in the current document with it.</li>
|
||||||
</ul></body></html></string>
|
</ul></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
@@ -243,7 +243,7 @@
|
|||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Show in Pane</string>
|
<string>Show in General Messages</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
|
|||||||
@@ -303,10 +303,10 @@ void OutputPaneManager::updateMaximizeButton(bool maximized)
|
|||||||
{
|
{
|
||||||
if (maximized) {
|
if (maximized) {
|
||||||
m_instance->m_minMaxAction->setIcon(m_instance->m_minimizeIcon);
|
m_instance->m_minMaxAction->setIcon(m_instance->m_minimizeIcon);
|
||||||
m_instance->m_minMaxAction->setText(tr("Minimize Output Pane"));
|
m_instance->m_minMaxAction->setText(tr("Minimize"));
|
||||||
} else {
|
} else {
|
||||||
m_instance->m_minMaxAction->setIcon(m_instance->m_maximizeIcon);
|
m_instance->m_minMaxAction->setIcon(m_instance->m_maximizeIcon);
|
||||||
m_instance->m_minMaxAction->setText(tr("Maximize Output Pane"));
|
m_instance->m_minMaxAction->setText(tr("Maximize"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -352,7 +352,7 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
|
|||||||
|
|
||||||
m_minMaxAction = new QAction(this);
|
m_minMaxAction = new QAction(this);
|
||||||
m_minMaxAction->setIcon(m_maximizeIcon);
|
m_minMaxAction->setIcon(m_maximizeIcon);
|
||||||
m_minMaxAction->setText(tr("Maximize Output Pane"));
|
m_minMaxAction->setText(tr("Maximize"));
|
||||||
|
|
||||||
m_closeButton->setIcon(Icons::CLOSE_SPLIT_BOTTOM.icon());
|
m_closeButton->setIcon(Icons::CLOSE_SPLIT_BOTTOM.icon());
|
||||||
connect(m_closeButton, &QAbstractButton::clicked, this, &OutputPaneManager::slotHide);
|
connect(m_closeButton, &QAbstractButton::clicked, this, &OutputPaneManager::slotHide);
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ Settings::Settings()
|
|||||||
registerAspect(&displayOutput);
|
registerAspect(&displayOutput);
|
||||||
displayOutput.setSettingsKey("DisplayOutput");
|
displayOutput.setSettingsKey("DisplayOutput");
|
||||||
displayOutput.setDefaultValue(true);
|
displayOutput.setDefaultValue(true);
|
||||||
displayOutput.setLabelText(tr("Display Output pane after sending a post"));
|
displayOutput.setLabelText(tr("Display General Messages after sending a post"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// SettingsPage
|
// SettingsPage
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ AppOutputPane::AppOutputPane() :
|
|||||||
m_formatterWidget(new QWidget),
|
m_formatterWidget(new QWidget),
|
||||||
m_handler(new ShowOutputTaskHandler(this,
|
m_handler(new ShowOutputTaskHandler(this,
|
||||||
tr("Show &App Output"),
|
tr("Show &App Output"),
|
||||||
tr("Show the output that generated this issue in the Application Output pane."),
|
tr("Show the output that generated this issue in Application Output."),
|
||||||
tr("A")))
|
tr("A")))
|
||||||
{
|
{
|
||||||
ExtensionSystem::PluginManager::addObject(m_handler);
|
ExtensionSystem::PluginManager::addObject(m_handler);
|
||||||
|
|||||||
@@ -113,7 +113,7 @@
|
|||||||
\fn void ProjectExplorer::BuildStep::addOutput(const QString &string, ProjectExplorer::BuildStep::OutputFormat format,
|
\fn void ProjectExplorer::BuildStep::addOutput(const QString &string, ProjectExplorer::BuildStep::OutputFormat format,
|
||||||
ProjectExplorer::BuildStep::OutputNewlineSetting newlineSetting = DoAppendNewline) const
|
ProjectExplorer::BuildStep::OutputNewlineSetting newlineSetting = DoAppendNewline) const
|
||||||
|
|
||||||
The \a string is added to the generated output, usually in the output pane.
|
The \a string is added to the generated output, usually in the output.
|
||||||
It should be in plain text, with the format in the parameter.
|
It should be in plain text, with the format in the parameter.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) :
|
|||||||
|
|
||||||
m_handler = new ShowOutputTaskHandler(this,
|
m_handler = new ShowOutputTaskHandler(this,
|
||||||
tr("Show Compile &Output"),
|
tr("Show Compile &Output"),
|
||||||
tr("Show the output that generated this issue in the Compile Output pane."),
|
tr("Show the output that generated this issue in Compile Output."),
|
||||||
tr("O"));
|
tr("O"));
|
||||||
ExtensionSystem::PluginManager::addObject(m_handler);
|
ExtensionSystem::PluginManager::addObject(m_handler);
|
||||||
setupContext(C_COMPILE_OUTPUT, m_outputWindow);
|
setupContext(C_COMPILE_OUTPUT, m_outputWindow);
|
||||||
|
|||||||
@@ -336,7 +336,7 @@ void DesignModeWidget::setup()
|
|||||||
auto outputPanePlaceholder = new Core::OutputPanePlaceHolder(Core::Constants::MODE_DESIGN);
|
auto outputPanePlaceholder = new Core::OutputPanePlaceHolder(Core::Constants::MODE_DESIGN);
|
||||||
m_outputPaneDockWidget = new ADS::DockWidget(uniqueId);
|
m_outputPaneDockWidget = new ADS::DockWidget(uniqueId);
|
||||||
m_outputPaneDockWidget->setWidget(outputPanePlaceholder);
|
m_outputPaneDockWidget->setWidget(outputPanePlaceholder);
|
||||||
m_outputPaneDockWidget->setWindowTitle(tr("Output Pane"));
|
m_outputPaneDockWidget->setWindowTitle(tr("Output"));
|
||||||
m_dockManager->addDockWidget(ADS::NoDockWidgetArea, m_outputPaneDockWidget);
|
m_dockManager->addDockWidget(ADS::NoDockWidgetArea, m_outputPaneDockWidget);
|
||||||
|
|
||||||
// Set unique id as object name
|
// Set unique id as object name
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ IntroductionWidget::IntroductionWidget(QWidget *parent)
|
|||||||
"<li>click on the magnifier icon for a complete list of possible options</li>"
|
"<li>click on the magnifier icon for a complete list of possible options</li>"
|
||||||
"</ul>")},
|
"</ul>")},
|
||||||
{QLatin1String("OutputPaneButtons"),
|
{QLatin1String("OutputPaneButtons"),
|
||||||
tr("Output Panes"),
|
tr("Output"),
|
||||||
tr("Find compile and application output here, "
|
tr("Find compile and application output here, "
|
||||||
"as well as a list of configuration and build issues, "
|
"as well as a list of configuration and build issues, "
|
||||||
"and the panel for global searches."),
|
"and the panel for global searches."),
|
||||||
@@ -155,7 +155,7 @@ IntroductionWidget::IntroductionWidget(QWidget *parent)
|
|||||||
{{},
|
{{},
|
||||||
tr("Escape to Editor"),
|
tr("Escape to Editor"),
|
||||||
tr("Pressing the Escape key brings you back to the editor. Press it "
|
tr("Pressing the Escape key brings you back to the editor. Press it "
|
||||||
"multiple times to also hide output panes and context help, giving the editor more "
|
"multiple times to also hide context help and output, giving the editor more "
|
||||||
"space."),
|
"space."),
|
||||||
{}},
|
{}},
|
||||||
{{},
|
{{},
|
||||||
|
|||||||
Reference in New Issue
Block a user