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

Maemo run configuration: Fix layout bug.

Browse Source 
The simulator's "reset" button must not be visible when the
remote host is a device.
This commit is contained in:
ck
2009-10-30 13:58:46 +01:00
parent be3fafc311
commit 787cbb7b0d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View File

@@ -102,6 +102,7 @@ private:
QCheckBox *m_passwordCheckBox; QCheckBox *m_passwordCheckBox;
QRadioButton *m_hwButton; QRadioButton *m_hwButton;
QRadioButton *m_simButton; QRadioButton *m_simButton;
QToolButton *m_resetButton;
Utils::PathChooser *m_simPathChooser; Utils::PathChooser *m_simPathChooser;
MaemoRunConfiguration *m_runConfiguration; MaemoRunConfiguration *m_runConfiguration;
}; };
@@ -890,10 +891,10 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget(
QHBoxLayout *pathLayout = new QHBoxLayout; QHBoxLayout *pathLayout = new QHBoxLayout;
pathLayout->addWidget(m_simPathChooser); pathLayout->addWidget(m_simPathChooser);
QToolButton *resetButton = new QToolButton(); m_resetButton = new QToolButton();
resetButton->setToolTip(tr("Reset to default")); m_resetButton->setToolTip(tr("Reset to default"));
resetButton->setIcon(QIcon(":/core/images/reset.png")); m_resetButton->setIcon(QIcon(":/core/images/reset.png"));
pathLayout->addWidget(resetButton); pathLayout->addWidget(m_resetButton);
mainLayout->addRow(m_chooseSimPathLabel, pathLayout); mainLayout->addRow(m_chooseSimPathLabel, pathLayout);
m_simParamsNameLabel = new QLabel(tr("Simulator command line:")); m_simParamsNameLabel = new QLabel(tr("Simulator command line:"));
@@ -906,7 +907,7 @@ MaemoRunConfigurationWidget::MaemoRunConfigurationWidget(
this, SLOT(updateSimulatorPath())); this, SLOT(updateSimulatorPath()));
connect(m_runConfiguration, SIGNAL(cachedSimulatorInformationChanged()), connect(m_runConfiguration, SIGNAL(cachedSimulatorInformationChanged()),
this, SLOT(updateVisibleSimulatorParameter())); this, SLOT(updateVisibleSimulatorParameter()));
connect(resetButton, SIGNAL(clicked()), m_runConfiguration, connect(m_resetButton, SIGNAL(clicked()), m_runConfiguration,
SLOT(resetCachedSimulatorInformation())); SLOT(resetCachedSimulatorInformation()));
m_hostNameLineEdit = new QLineEdit(m_runConfiguration->remoteHostName()); m_hostNameLineEdit = new QLineEdit(m_runConfiguration->remoteHostName());
@@ -986,6 +987,7 @@ void MaemoRunConfigurationWidget::hostTypeChanged()
m_simPathChooser->setVisible(isSimulator); m_simPathChooser->setVisible(isSimulator);
m_simParamsNameLabel->setVisible(isSimulator); m_simParamsNameLabel->setVisible(isSimulator);
m_simParamsValueLabel->setVisible(isSimulator); m_simParamsValueLabel->setVisible(isSimulator);
m_resetButton->setVisible(isSimulator);
m_runConfiguration->setRemoteHostIsSimulator(isSimulator); m_runConfiguration->setRemoteHostIsSimulator(isSimulator);
m_argsLineEdit->setText(m_runConfiguration->arguments().join(" ")); m_argsLineEdit->setText(m_runConfiguration->arguments().join(" "));