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

Some tweaks to make the build settings page look better on windows

Browse Source
This commit is contained in:
dt
2009-07-20 16:50:05 +02:00
parent 527a2f7bb0
commit e76e439215
3 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,21 +258,28 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
fl->addRow(tr("Working Directory:"), boxlayout); fl->addRow(tr("Working Directory:"), boxlayout);
QGroupBox *box = new QGroupBox(tr("Environment"),this); QVBoxLayout *vbx = new QVBoxLayout(this);
QVBoxLayout *boxLayout = new QVBoxLayout; vbx->addLayout(fl);
box->setLayout(boxLayout);
box->setFlat(true); QLabel *environmentLabel = new QLabel(this);
environmentLabel->setText(tr("Run Environment"));
QFont f = environmentLabel->font();
f.setBold(true);
f.setPointSizeF(f.pointSizeF() *1.2);
environmentLabel->setFont(f);
vbx->addWidget(environmentLabel);
QFormLayout *formlayout = new QFormLayout(); QFormLayout *formlayout = new QFormLayout();
QLabel *label = new QLabel(tr("Base environment for this runconfiguration:"), this); QLabel *label = new QLabel(tr("Base environment for this runconfiguration:"), this);
m_baseEnvironmentComboBox = new QComboBox(box);
m_baseEnvironmentComboBox = new QComboBox(this);
m_baseEnvironmentComboBox->addItems(QStringList() m_baseEnvironmentComboBox->addItems(QStringList()
<< tr("Clean Environment") << tr("Clean Environment")
<< tr("System Environment") << tr("System Environment")
<< tr("Build Environment")); << tr("Build Environment"));
formlayout->addRow(label, m_baseEnvironmentComboBox); formlayout->addRow(label, m_baseEnvironmentComboBox);
boxLayout->addLayout(formlayout); vbx->addLayout(formlayout);
label->setVisible(false); label->setVisible(false);
m_baseEnvironmentComboBox->setVisible(false); m_baseEnvironmentComboBox->setVisible(false);
@@ -302,11 +309,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
connect(m_environmentWidget, SIGNAL(switchedToDetails()), connect(m_environmentWidget, SIGNAL(switchedToDetails()),
label, SLOT(show())); label, SLOT(show()));
boxLayout->addWidget(m_environmentWidget); vbx->addWidget(m_environmentWidget);
QVBoxLayout *vbx = new QVBoxLayout(this);
vbx->addLayout(fl);
vbx->addWidget(box);
connect(m_environmentWidget, SIGNAL(userChangesUpdated()), connect(m_environmentWidget, SIGNAL(userChangesUpdated()),
this, SLOT(userChangesUpdated())); this, SLOT(userChangesUpdated()));

24
src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
View File

@@ -88,21 +88,27 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
m_useTerminalCheck = new QCheckBox(tr("Run in &Terminal"), this); m_useTerminalCheck = new QCheckBox(tr("Run in &Terminal"), this);
layout->addRow(QString(), m_useTerminalCheck); layout->addRow(QString(), m_useTerminalCheck);
QGroupBox *box = new QGroupBox(tr("Environment"),this); QVBoxLayout *vbox = new QVBoxLayout(this);
QVBoxLayout *boxLayout = new QVBoxLayout(); vbox->addLayout(layout);
box->setLayout(boxLayout);
box->setFlat(true); QLabel *environmentLabel = new QLabel(this);
environmentLabel->setText(tr("Run Environment"));
QFont f = environmentLabel->font();
f.setBold(true);
f.setPointSizeF(f.pointSizeF() *1.2);
environmentLabel->setFont(f);
vbox->addWidget(environmentLabel);
QFormLayout *formlayout = new QFormLayout(); QFormLayout *formlayout = new QFormLayout();
QLabel *label = new QLabel(tr("Base environment for this runconfiguration:"), this); QLabel *label = new QLabel(tr("Base environment for this runconfiguration:"), this);
m_baseEnvironmentComboBox = new QComboBox(box); m_baseEnvironmentComboBox = new QComboBox(this);
m_baseEnvironmentComboBox->addItems(QStringList() m_baseEnvironmentComboBox->addItems(QStringList()
<< tr("Clean Environment") << tr("Clean Environment")
<< tr("System Environment") << tr("System Environment")
<< tr("Build Environment")); << tr("Build Environment"));
formlayout->addRow(label, m_baseEnvironmentComboBox); formlayout->addRow(label, m_baseEnvironmentComboBox);
boxLayout->addLayout(formlayout); vbox->addLayout(formlayout);
label->setVisible(false); label->setVisible(false);
m_baseEnvironmentComboBox->setVisible(false); m_baseEnvironmentComboBox->setVisible(false);
@@ -114,7 +120,7 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
m_environmentWidget = new EnvironmentWidget(this); m_environmentWidget = new EnvironmentWidget(this);
m_environmentWidget->setBaseEnvironment(rc->baseEnvironment()); m_environmentWidget->setBaseEnvironment(rc->baseEnvironment());
m_environmentWidget->setUserChanges(rc->userEnvironmentChanges()); m_environmentWidget->setUserChanges(rc->userEnvironmentChanges());
boxLayout->addWidget(m_environmentWidget); vbox->addWidget(m_environmentWidget);
connect(m_environmentWidget, SIGNAL(switchedToSummary()), connect(m_environmentWidget, SIGNAL(switchedToSummary()),
m_baseEnvironmentComboBox, SLOT(hide())); m_baseEnvironmentComboBox, SLOT(hide()));
@@ -126,9 +132,7 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
connect(m_environmentWidget, SIGNAL(switchedToDetails()), connect(m_environmentWidget, SIGNAL(switchedToDetails()),
label, SLOT(show())); label, SLOT(show()));
QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->addLayout(layout);
vbox->addWidget(box);
changed(); changed();

24
src/plugins/qt4projectmanager/qt4runconfiguration.cpp
View File

@@ -159,21 +159,27 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
this, SLOT(usingDyldImageSuffixToggled(bool))); this, SLOT(usingDyldImageSuffixToggled(bool)));
#endif #endif
QGroupBox *box = new QGroupBox(tr("Environment"),this); QVBoxLayout *vbox = new QVBoxLayout(this);
QVBoxLayout *boxLayout = new QVBoxLayout(); vbox->addLayout(toplayout);
box->setLayout(boxLayout);
box->setFlat(true); QLabel *environmentLabel = new QLabel(this);
environmentLabel->setText(tr("Run Environment"));
QFont f = environmentLabel->font();
f.setBold(true);
f.setPointSizeF(f.pointSizeF() *1.2);
environmentLabel->setFont(f);
vbox->addWidget(environmentLabel);
QFormLayout *formlayout = new QFormLayout(); QFormLayout *formlayout = new QFormLayout();
QLabel *label = new QLabel(tr("Base environment for this runconfiguration:"), this); QLabel *label = new QLabel(tr("Base environment for this runconfiguration:"), this);
m_baseEnvironmentComboBox = new QComboBox(box); m_baseEnvironmentComboBox = new QComboBox(this);
m_baseEnvironmentComboBox->addItems(QStringList() m_baseEnvironmentComboBox->addItems(QStringList()
<< tr("Clean Environment") << tr("Clean Environment")
<< tr("System Environment") << tr("System Environment")
<< tr("Build Environment")); << tr("Build Environment"));
formlayout->addRow(label, m_baseEnvironmentComboBox); formlayout->addRow(label, m_baseEnvironmentComboBox);
boxLayout->addLayout(formlayout); vbox->addLayout(formlayout);
label->setVisible(false); label->setVisible(false);
m_baseEnvironmentComboBox->setVisible(false); m_baseEnvironmentComboBox->setVisible(false);
@@ -186,7 +192,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
m_environmentWidget->setBaseEnvironment(m_qt4RunConfiguration->baseEnvironment()); m_environmentWidget->setBaseEnvironment(m_qt4RunConfiguration->baseEnvironment());
m_environmentWidget->setUserChanges(m_qt4RunConfiguration->userEnvironmentChanges()); m_environmentWidget->setUserChanges(m_qt4RunConfiguration->userEnvironmentChanges());
m_environmentWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); m_environmentWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
boxLayout->addWidget(m_environmentWidget); vbox->addWidget(m_environmentWidget);
connect(m_environmentWidget, SIGNAL(switchedToSummary()), connect(m_environmentWidget, SIGNAL(switchedToSummary()),
m_baseEnvironmentComboBox, SLOT(hide())); m_baseEnvironmentComboBox, SLOT(hide()));
@@ -198,10 +204,6 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
connect(m_environmentWidget, SIGNAL(switchedToDetails()), connect(m_environmentWidget, SIGNAL(switchedToDetails()),
label, SLOT(show())); label, SLOT(show()));
QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->addLayout(toplayout);
vbox->addWidget(box);
connect(m_workingDirectoryEdit, SIGNAL(changed(QString)), connect(m_workingDirectoryEdit, SIGNAL(changed(QString)),
this, SLOT(setWorkingDirectory())); this, SLOT(setWorkingDirectory()));