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

ProjectExplorer: Make ArgumentsAspect's label text configurable

Browse Source 
To be used in QmakeStep.

Change-Id: I5cc95de6b54c40a5dcc5f92768455a69a1d2869c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-10-06 15:17:47 +02:00
parent 00c07ca53e
commit cc5ac00d19
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/runconfigurationaspects.cpp
View File

@@ -259,6 +259,7 @@ ArgumentsAspect::ArgumentsAspect()
setDisplayName(tr("Arguments")); setDisplayName(tr("Arguments"));
setId("ArgumentsAspect"); setId("ArgumentsAspect");
setSettingsKey("RunConfiguration.Arguments"); setSettingsKey("RunConfiguration.Arguments");
m_labelText = tr("Command line arguments:");
} }
QString ArgumentsAspect::arguments(const MacroExpander *expander) const QString ArgumentsAspect::arguments(const MacroExpander *expander) const
@@ -290,6 +291,11 @@ void ArgumentsAspect::setArguments(const QString &arguments)
m_multiLineChooser->setPlainText(arguments); m_multiLineChooser->setPlainText(arguments);
} }
void ArgumentsAspect::setLabelText(const QString &labelText)
{
m_labelText = labelText;
}
void ArgumentsAspect::setResetter(const std::function<QString()> &resetter) void ArgumentsAspect::setResetter(const std::function<QString()> &resetter)
{ {
m_resetter = resetter; m_resetter = resetter;
@@ -351,7 +357,6 @@ QWidget *ArgumentsAspect::setupChooser()
void ArgumentsAspect::addToLayout(LayoutBuilder &builder) void ArgumentsAspect::addToLayout(LayoutBuilder &builder)
{ {
QTC_CHECK(!m_chooser && !m_multiLineChooser && !m_multiLineButton); QTC_CHECK(!m_chooser && !m_multiLineChooser && !m_multiLineButton);
builder.addItem(tr("Command line arguments:"));
const auto container = new QWidget; const auto container = new QWidget;
const auto containerLayout = new QHBoxLayout(container); const auto containerLayout = new QHBoxLayout(container);
@@ -394,7 +399,7 @@ void ArgumentsAspect::addToLayout(LayoutBuilder &builder)
containerLayout->setAlignment(m_resetButton, Qt::AlignTop); containerLayout->setAlignment(m_resetButton, Qt::AlignTop);
} }
builder.addItem(container); builder.addItems({m_labelText, container});
} }
/*! /*!

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

@@ -111,6 +111,7 @@ public:
QString unexpandedArguments() const; QString unexpandedArguments() const;
void setArguments(const QString &arguments); void setArguments(const QString &arguments);
void setLabelText(const QString &labelText);
void setResetter(const std::function<QString()> &resetter); void setResetter(const std::function<QString()> &resetter);
void resetArguments(); void resetArguments();
@@ -121,6 +122,7 @@ private:
QWidget *setupChooser(); QWidget *setupChooser();
QString m_arguments; QString m_arguments;
QString m_labelText;
QPointer<Utils::FancyLineEdit> m_chooser; QPointer<Utils::FancyLineEdit> m_chooser;
QPointer<QPlainTextEdit> m_multiLineChooser; QPointer<QPlainTextEdit> m_multiLineChooser;
QPointer<Utils::ExpandButton> m_multiLineButton; QPointer<Utils::ExpandButton> m_multiLineButton;