diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-10-19 11:10:51 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-10-19 11:10:51 +0200 |
commit | d4c1862170d98648de266e18f91e42747ba5620c (patch) | |
tree | 6839599aafb3ef1a079215d7d0cbab948b288bcf /src/plugins/designer | |
parent | 872f7eb459cf92161cfb22c7b2237ae90cd5a0c1 (diff) | |
download | qt-creator-d4c1862170d98648de266e18f91e42747ba5620c.tar.gz |
Wizards: Remove settings buttons.
As they do not look nice in the layouts and several
options pages are involved in the case of the form
class wizard.
Reviewed-by: con
Task-number: QTCREATORBUG-2778
Diffstat (limited to 'src/plugins/designer')
-rw-r--r-- | src/plugins/designer/cpp/formclasswizardpage.cpp | 12 | ||||
-rw-r--r-- | src/plugins/designer/cpp/formclasswizardpage.h | 1 | ||||
-rw-r--r-- | src/plugins/designer/cpp/formclasswizardpage.ui | 34 |
3 files changed, 1 insertions, 46 deletions
diff --git a/src/plugins/designer/cpp/formclasswizardpage.cpp b/src/plugins/designer/cpp/formclasswizardpage.cpp index 7d67e03738..8e09656a83 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.cpp +++ b/src/plugins/designer/cpp/formclasswizardpage.cpp @@ -60,7 +60,6 @@ FormClassWizardPage::FormClassWizardPage(QWidget * parent) : m_ui->newClassWidget->setClassTypeComboVisible(false); connect(m_ui->newClassWidget, SIGNAL(validChanged()), this, SLOT(slotValidChanged())); - connect(m_ui->settingsToolButton, SIGNAL(clicked()), this, SLOT(slotSettings())); initFileGenerationSettings(); } @@ -90,17 +89,6 @@ void FormClassWizardPage::initFileGenerationSettings() m_ui->newClassWidget->setLowerCaseFiles(lowercaseHeaderFiles()); } -// Pop up settings dialog for generation settings -void FormClassWizardPage::slotSettings() -{ - const QString id = QLatin1String(CppTools::Constants::CPP_SETTINGS_ID); - const QString cat = QLatin1String(CppTools::Constants::CPP_SETTINGS_CATEGORY); - if (Core::ICore::instance()->showOptionsDialog(cat, id, this)) { - initFileGenerationSettings(); - m_ui->newClassWidget->triggerUpdateFileNames(); - } -} - void FormClassWizardPage::setClassName(const QString &suggestedClassName) { // Is it valid, now? diff --git a/src/plugins/designer/cpp/formclasswizardpage.h b/src/plugins/designer/cpp/formclasswizardpage.h index 8e3c0b9771..cb723a3e3f 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.h +++ b/src/plugins/designer/cpp/formclasswizardpage.h @@ -68,7 +68,6 @@ public: public slots: void setClassName(const QString &suggestedClassName); void setPath(const QString &); - void slotSettings(); private slots: void slotValidChanged(); diff --git a/src/plugins/designer/cpp/formclasswizardpage.ui b/src/plugins/designer/cpp/formclasswizardpage.ui index d46c4e83c6..473125d278 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.ui +++ b/src/plugins/designer/cpp/formclasswizardpage.ui @@ -2,14 +2,6 @@ <ui version="4.0"> <class>Designer::Internal::FormClassWizardPage</class> <widget class="QWizardPage" name="Designer::Internal::FormClassWizardPage"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>542</width> - <height>267</height> - </rect> - </property> <property name="title"> <string>Choose a Class Name</string> </property> @@ -21,35 +13,11 @@ </property> <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="Utils::NewClassWidget" name="newClassWidget" native="true"/> + <widget class="Utils::NewClassWidget" name="newClassWidget"/> </item> </layout> </widget> </item> - <item row="0" column="1"> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QToolButton" name="settingsToolButton"> - <property name="text"> - <string>Configure...</string> - </property> - </widget> - </item> - </layout> - </item> </layout> </widget> <customwidgets> |