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

PythonEditor: Simplify PythonRunConfigurationWidget

Browse Source 
Use new wrapWidget() convenience function and don't use
members for locally used items.

Change-Id: Ia063501a124a56d0ade82dbc17d1087b11d4a88e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2018-03-20 14:30:14 +01:00
parent 07870754b6
commit 8e90ce7e01
1 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/pythoneditor/pythoneditorplugin.cpp
View File

@@ -52,7 +52,6 @@
#include <texteditor/texteditorconstants.h> #include <texteditor/texteditorconstants.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/detailswidget.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
@@ -127,16 +126,12 @@ private:
class PythonRunConfigurationWidget : public QWidget class PythonRunConfigurationWidget : public QWidget
{ {
Q_OBJECT
public: public:
PythonRunConfigurationWidget(PythonRunConfiguration *runConfiguration, QWidget *parent = 0); explicit PythonRunConfigurationWidget(PythonRunConfiguration *runConfiguration);
void setInterpreter(const QString &interpreter); void setInterpreter(const QString &interpreter);
private: private:
PythonRunConfiguration *m_runConfiguration; PythonRunConfiguration *m_runConfiguration;
DetailsWidget *m_detailsContainer;
FancyLineEdit *m_interpreterChooser;
QLabel *m_scriptLabel;
}; };
class PythonRunConfiguration : public RunConfiguration class PythonRunConfiguration : public RunConfiguration
@@ -215,7 +210,7 @@ QString PythonRunConfiguration::defaultDisplayName() const
QWidget *PythonRunConfiguration::createConfigurationWidget() QWidget *PythonRunConfiguration::createConfigurationWidget()
{ {
return new PythonRunConfigurationWidget(this); return wrapWidget(new PythonRunConfigurationWidget(this));
} }
Runnable PythonRunConfiguration::runnable() const Runnable PythonRunConfiguration::runnable() const
@@ -236,39 +231,28 @@ QString PythonRunConfiguration::arguments() const
return aspect->arguments(); return aspect->arguments();
} }
PythonRunConfigurationWidget::PythonRunConfigurationWidget(PythonRunConfiguration *runConfiguration, QWidget *parent) PythonRunConfigurationWidget::PythonRunConfigurationWidget(PythonRunConfiguration *runConfiguration)
: QWidget(parent), m_runConfiguration(runConfiguration) : m_runConfiguration(runConfiguration)
{ {
auto fl = new QFormLayout(); auto fl = new QFormLayout(this);
fl->setMargin(0); fl->setMargin(0);
fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
m_interpreterChooser = new FancyLineEdit(this); auto interpreterChooser = new FancyLineEdit(this);
m_interpreterChooser->setText(runConfiguration->interpreter()); interpreterChooser->setText(runConfiguration->interpreter());
connect(m_interpreterChooser, &QLineEdit::textChanged, connect(interpreterChooser, &QLineEdit::textChanged,
this, &PythonRunConfigurationWidget::setInterpreter); this, &PythonRunConfigurationWidget::setInterpreter);
m_scriptLabel = new QLabel(this); auto scriptLabel = new QLabel(this);
m_scriptLabel->setText(runConfiguration->mainScript()); scriptLabel->setText(runConfiguration->mainScript());
fl->addRow(tr("Interpreter: "), m_interpreterChooser); fl->addRow(PythonRunConfiguration::tr("Interpreter: "), interpreterChooser);
fl->addRow(tr("Script: "), m_scriptLabel); fl->addRow(PythonRunConfiguration::tr("Script: "), scriptLabel);
runConfiguration->extraAspect<ArgumentsAspect>()->addToMainConfigurationWidget(this, fl); runConfiguration->extraAspect<ArgumentsAspect>()->addToMainConfigurationWidget(this, fl);
runConfiguration->extraAspect<TerminalAspect>()->addToMainConfigurationWidget(this, fl); runConfiguration->extraAspect<TerminalAspect>()->addToMainConfigurationWidget(this, fl);
m_detailsContainer = new DetailsWidget(this); connect(runConfiguration->target(), &Target::applicationTargetsChanged, this, [this, scriptLabel] {
m_detailsContainer->setState(DetailsWidget::NoSummary); scriptLabel->setText(QDir::toNativeSeparators(m_runConfiguration->mainScript()));
auto details = new QWidget(m_detailsContainer);
m_detailsContainer->setWidget(details);
details->setLayout(fl);
auto vbx = new QVBoxLayout(this);
vbx->setMargin(0);
vbx->addWidget(m_detailsContainer);
connect(runConfiguration->target(), &Target::applicationTargetsChanged, this, [this] {
m_scriptLabel->setText(QDir::toNativeSeparators(m_runConfiguration->mainScript()));
}); });
} }