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

Fixes: Use apply()/finish() of Designer settings page interface

Browse Source 
RevBy: Thorbjorn
This commit is contained in:
Friedemann Kleint
2009-01-14 10:00:58 +01:00
parent aa68db058d
commit 49c5ef262c
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/designer/settingspage.cpp
View File

@@ -39,8 +39,7 @@
using namespace Designer::Internal; using namespace Designer::Internal;
SettingsPage::SettingsPage(QDesignerOptionsPageInterface *designerPage) : SettingsPage::SettingsPage(QDesignerOptionsPageInterface *designerPage) :
m_designerPage(designerPage), m_designerPage(designerPage)
m_applyOnFinish(false)
{ {
} }
@@ -65,17 +64,15 @@ QString SettingsPage::trCategory() const
QWidget *SettingsPage::createPage(QWidget *parent) QWidget *SettingsPage::createPage(QWidget *parent)
{ {
m_applyOnFinish = false;
return m_designerPage->createPage(parent); return m_designerPage->createPage(parent);
} }
void SettingsPage::apply() void SettingsPage::apply()
{ {
// FIXME: Since no cleanup should be done here, we can't call finish(true) m_designerPage->apply();
m_applyOnFinish = true;
} }
void SettingsPage::finish() void SettingsPage::finish()
{ {
m_designerPage->finish(m_applyOnFinish); m_designerPage->finish();
} }

7
src/plugins/designer/settingspage.h
View File

@@ -58,13 +58,12 @@ public:
QString category() const; QString category() const;
QString trCategory() const; QString trCategory() const;
QWidget *createPage(QWidget *parent); virtual QWidget *createPage(QWidget *parent);
void apply(); virtual void apply();
void finish(); virtual void finish();
private: private:
QDesignerOptionsPageInterface *m_designerPage; QDesignerOptionsPageInterface *m_designerPage;
bool m_applyOnFinish;
}; };
} // namespace Internal } // namespace Internal