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

Add "Run in terminal" option also to cmake runconfigurations

Browse Source 
Task-Nr: QTCREATORBUG-4695
This commit is contained in:
dt_
2011-04-27 16:33:21 +02:00
parent 060778ddf4
commit 5b521e2dad
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View File

@@ -53,6 +53,7 @@
#include <QtGui/QLabel> #include <QtGui/QLabel>
#include <QtGui/QComboBox> #include <QtGui/QComboBox>
#include <QtGui/QToolButton> #include <QtGui/QToolButton>
#include <QtGui/QCheckBox>
using namespace CMakeProjectManager; using namespace CMakeProjectManager;
using namespace CMakeProjectManager::Internal; using namespace CMakeProjectManager::Internal;
@@ -138,6 +139,11 @@ ProjectExplorer::LocalApplicationRunConfiguration::RunMode CMakeRunConfiguration
return m_runMode; return m_runMode;
} }
void CMakeRunConfiguration::setRunMode(RunMode runMode)
{
m_runMode = runMode;
}
QString CMakeRunConfiguration::workingDirectory() const QString CMakeRunConfiguration::workingDirectory() const
{ {
return QDir::cleanPath(environment().expandVariables( return QDir::cleanPath(environment().expandVariables(
@@ -347,6 +353,10 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
fl->addRow(tr("Working directory:"), boxlayout); fl->addRow(tr("Working directory:"), boxlayout);
QCheckBox *runInTerminal = new QCheckBox;
fl->addRow(tr("Run in Terminal"), runInTerminal);
QWidget *debuggerLabelWidget = new QWidget(this); QWidget *debuggerLabelWidget = new QWidget(this);
QVBoxLayout *debuggerLabelLayout = new QVBoxLayout(debuggerLabelWidget); QVBoxLayout *debuggerLabelLayout = new QVBoxLayout(debuggerLabelWidget);
debuggerLabelLayout->setMargin(0); debuggerLabelLayout->setMargin(0);
@@ -411,6 +421,9 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
connect(resetButton, SIGNAL(clicked()), connect(resetButton, SIGNAL(clicked()),
this, SLOT(resetWorkingDirectory())); this, SLOT(resetWorkingDirectory()));
connect(runInTerminal, SIGNAL(toggled(bool)),
this, SLOT(runInTerminalToggled(bool)));
connect(m_debuggerLanguageChooser, SIGNAL(cppLanguageToggled(bool)), connect(m_debuggerLanguageChooser, SIGNAL(cppLanguageToggled(bool)),
this, SLOT(useCppDebuggerToggled(bool))); this, SLOT(useCppDebuggerToggled(bool)));
connect(m_debuggerLanguageChooser, SIGNAL(qmlLanguageToggled(bool)), connect(m_debuggerLanguageChooser, SIGNAL(qmlLanguageToggled(bool)),
@@ -455,6 +468,12 @@ void CMakeRunConfigurationWidget::resetWorkingDirectory()
m_cmakeRunConfiguration->setUserWorkingDirectory(QString()); m_cmakeRunConfiguration->setUserWorkingDirectory(QString());
} }
void CMakeRunConfigurationWidget::runInTerminalToggled(bool toggled)
{
m_cmakeRunConfiguration->setRunMode(toggled ? ProjectExplorer::LocalApplicationRunConfiguration::Console
: ProjectExplorer::LocalApplicationRunConfiguration::Gui);
}
void CMakeRunConfigurationWidget::useCppDebuggerToggled(bool toggled) void CMakeRunConfigurationWidget::useCppDebuggerToggled(bool toggled)
{ {
m_cmakeRunConfiguration->setUseCppDebugger(toggled); m_cmakeRunConfiguration->setUseCppDebugger(toggled);

3
src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
View File

@@ -72,6 +72,7 @@ public:
QString executable() const; QString executable() const;
RunMode runMode() const; RunMode runMode() const;
void setRunMode(RunMode runMode);
QString workingDirectory() const; QString workingDirectory() const;
QString commandLineArguments() const; QString commandLineArguments() const;
Utils::Environment environment() const; Utils::Environment environment() const;
@@ -145,11 +146,11 @@ private slots:
void userChangesChanged(); void userChangesChanged();
void setWorkingDirectory(); void setWorkingDirectory();
void resetWorkingDirectory(); void resetWorkingDirectory();
void runInTerminalToggled(bool toggled);
void useCppDebuggerToggled(bool toggled); void useCppDebuggerToggled(bool toggled);
void useQmlDebuggerToggled(bool toggled); void useQmlDebuggerToggled(bool toggled);
void qmlDebugServerPortChanged(uint port); void qmlDebugServerPortChanged(uint port);
private slots:
void baseEnvironmentComboBoxChanged(int index); void baseEnvironmentComboBoxChanged(int index);
void workingDirectoryChanged(const QString &workingDirectory); void workingDirectoryChanged(const QString &workingDirectory);