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

Wizards: Remove settings buttons.

Browse Source 
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
This commit is contained in:
Friedemann Kleint
2010-10-19 11:10:51 +02:00
parent 872f7eb459
commit d4c1862170
5 changed files with 2 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/cppeditor/cppclasswizard.cpp
View File

@@ -83,14 +83,7 @@ ClassNamePage::ClassNamePage(QWidget *parent) :
pageLayout->addWidget(m_newClassWidget); pageLayout->addWidget(m_newClassWidget);
QSpacerItem *vSpacer = new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::Expanding); QSpacerItem *vSpacer = new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::Expanding);
pageLayout->addItem(vSpacer); pageLayout->addItem(vSpacer);
QHBoxLayout *buttonLayout = new QHBoxLayout;
pageLayout->addLayout(buttonLayout);
QSpacerItem *hSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Ignored);
buttonLayout->addItem(hSpacer);
QToolButton *settingsButton = new QToolButton;
settingsButton->setText(tr("Configure..."));
connect(settingsButton, SIGNAL(clicked()), this, SLOT(slotSettings()));
buttonLayout->addWidget(settingsButton);
initParameters(); initParameters();
} }
@@ -114,16 +107,6 @@ void ClassNamePage::initParameters()
m_newClassWidget->setLowerCaseFiles(lowerCaseFiles(core)); m_newClassWidget->setLowerCaseFiles(lowerCaseFiles(core));
} }
void ClassNamePage::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)) {
initParameters();
m_newClassWidget->triggerUpdateFileNames();
}
}
void ClassNamePage::slotValidChanged() void ClassNamePage::slotValidChanged()
{ {
const bool validNow = m_newClassWidget->isValid(); const bool validNow = m_newClassWidget->isValid();

1
src/plugins/cppeditor/cppclasswizard.h
View File

@@ -57,7 +57,6 @@ public:
private slots: private slots:
void slotValidChanged(); void slotValidChanged();
void slotSettings();
private: private:
void initParameters(); void initParameters();

12
src/plugins/designer/cpp/formclasswizardpage.cpp
View File

@@ -60,7 +60,6 @@ FormClassWizardPage::FormClassWizardPage(QWidget * parent) :
m_ui->newClassWidget->setClassTypeComboVisible(false); m_ui->newClassWidget->setClassTypeComboVisible(false);
connect(m_ui->newClassWidget, SIGNAL(validChanged()), this, SLOT(slotValidChanged())); connect(m_ui->newClassWidget, SIGNAL(validChanged()), this, SLOT(slotValidChanged()));
connect(m_ui->settingsToolButton, SIGNAL(clicked()), this, SLOT(slotSettings()));
initFileGenerationSettings(); initFileGenerationSettings();
} }
@@ -90,17 +89,6 @@ void FormClassWizardPage::initFileGenerationSettings()
m_ui->newClassWidget->setLowerCaseFiles(lowercaseHeaderFiles()); 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) void FormClassWizardPage::setClassName(const QString &suggestedClassName)
{ {
// Is it valid, now? // Is it valid, now?

1
src/plugins/designer/cpp/formclasswizardpage.h
View File

@@ -68,7 +68,6 @@ public:
public slots: public slots:
void setClassName(const QString &suggestedClassName); void setClassName(const QString &suggestedClassName);
void setPath(const QString &); void setPath(const QString &);
void slotSettings();
private slots: private slots:
void slotValidChanged(); void slotValidChanged();

34
src/plugins/designer/cpp/formclasswizardpage.ui
View File

@@ -2,14 +2,6 @@
<ui version="4.0"> <ui version="4.0">
<class>Designer::Internal::FormClassWizardPage</class> <class>Designer::Internal::FormClassWizardPage</class>
<widget class="QWizardPage" name="Designer::Internal::FormClassWizardPage"> <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"> <property name="title">
<string>Choose a Class Name</string> <string>Choose a Class Name</string>
</property> </property>
@@ -21,35 +13,11 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="Utils::NewClassWidget" name="newClassWidget" native="true"/> <widget class="Utils::NewClassWidget" name="newClassWidget"/>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </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> </layout>
</widget> </widget>
<customwidgets> <customwidgets>