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

Core: Add the IOptionsPage::setSettingsProvider

Browse Source 
This allows creating the options page without having the
settings object already present, potentially delaying
its creation until its first truly necessary use.

Task-number: QTCREATORBUG-29167
Change-Id: I004fb19f0ea2b7e500747b3905283d74f749cd78
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-07-06 09:18:25 +02:00
parent 890cc2ba76
commit c4294bea23
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/coreplugin/dialogs/ioptionspage.cpp
View File

@@ -134,9 +134,10 @@ QWidget *IOptionsPage::widget()
if (!m_widget) {
if (m_widgetCreator) {
m_widget = m_widgetCreator();
} else if (m_settings) {
} else if (m_settingsProvider) {
m_widget = new IOptionsPageWidget;
if (auto layouter = m_settings->layouter()) {
AspectContainer *container = m_settingsProvider();
if (auto layouter = container->layouter()) {
layouter().attachTo(m_widget);
} else {
QTC_CHECK(false);
@@ -162,10 +163,11 @@ void IOptionsPage::apply()
if (auto widget = qobject_cast<IOptionsPageWidget *>(m_widget))
widget->apply();
if (m_settings) {
if (m_settings->isDirty()) {
m_settings->apply();
m_settings->writeSettings(ICore::settings());
if (m_settingsProvider) {
AspectContainer *container = m_settingsProvider();
if (container->isDirty()) {
container->apply();
container->writeSettings(ICore::settings());
}
}
}
@@ -184,8 +186,10 @@ void IOptionsPage::finish()
if (auto widget = qobject_cast<IOptionsPageWidget *>(m_widget))
widget->finish();
if (m_settings)
m_settings->finish();
if (m_settingsProvider) {
AspectContainer *container = m_settingsProvider();
container->finish();
}
delete m_widget;
}
@@ -201,7 +205,12 @@ void IOptionsPage::setCategoryIconPath(const FilePath &categoryIconPath)
void IOptionsPage::setSettings(AspectContainer *settings)
{
m_settings = settings;
m_settingsProvider = [settings] { return settings; };
}
void IOptionsPage::setSettingsProvider(const std::function<AspectContainer *()> &provider)
{
m_settingsProvider = provider;
}
/*!
@@ -234,7 +243,11 @@ void IOptionsPage::setSettings(AspectContainer *settings)
Sets \a categoryIcon as the category icon of the options page.
*/
static QList<IOptionsPage *> g_optionsPages;
static QList<IOptionsPage *> &optionsPages()
{
static QList<IOptionsPage *> thePages;
return thePages;
}
/*!
Constructs an options page and registers it
@@ -243,7 +256,7 @@ static QList<IOptionsPage *> g_optionsPages;
IOptionsPage::IOptionsPage(bool registerGlobally)
{
if (registerGlobally)
g_optionsPages.append(this);
optionsPages().append(this);
}
/*!
@@ -251,7 +264,7 @@ IOptionsPage::IOptionsPage(bool registerGlobally)
*/
IOptionsPage::~IOptionsPage()
{
g_optionsPages.removeOne(this);
optionsPages().removeOne(this);
}
/*!
@@ -259,7 +272,7 @@ IOptionsPage::~IOptionsPage()
*/
const QList<IOptionsPage *> IOptionsPage::allOptionsPages()
{
return g_optionsPages;
return optionsPages();
}
/*!

5
src/plugins/coreplugin/dialogs/ioptionspage.h
View File

@@ -74,7 +74,8 @@ protected:
void setDisplayCategory(const QString &displayCategory) { m_displayCategory = displayCategory; }
void setCategoryIcon(const Utils::Icon &categoryIcon) { m_categoryIcon = categoryIcon; }
void setCategoryIconPath(const Utils::FilePath &categoryIconPath);
void setSettings(Utils::AspectContainer *settings);
void setSettings(Utils::AspectContainer *settings); // FIXME: Remove.
void setSettingsProvider(const std::function<Utils::AspectContainer *()> &provider);
// Used in FontSettingsPage. FIXME?
QPointer<QWidget> m_widget; // Used in conjunction with m_widgetCreator
@@ -90,7 +91,7 @@ private:
mutable bool m_keywordsInitialized = false;
mutable QStringList m_keywords;
Utils::AspectContainer *m_settings = nullptr;
std::function<Utils::AspectContainer *()> m_settingsProvider;
};
/*