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

CMake: Use new PagedSettings

Browse Source 
More compact.

Change-Id: Ie800e52b98d23e1acd1deba9d6b6e5f778c016bb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2023-05-10 13:51:34 +02:00
parent 699b804181
commit 72e30b69c5
3 changed files with 31 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/plugins/cmakeprojectmanager/cmakespecificsettings.cpp
View File

@@ -15,8 +15,36 @@ using namespace Utils;
namespace CMakeProjectManager::Internal {
static CMakeSpecificSettings *theSettings;
CMakeSpecificSettings *CMakeSpecificSettings::instance()
{
return theSettings;
}
CMakeSpecificSettings::CMakeSpecificSettings()
{
theSettings = this;
setId(Constants::Settings::GENERAL_ID);
setDisplayName(::CMakeProjectManager::Tr::tr("General"));
setDisplayCategory("CMake");
setCategory(Constants::Settings::CATEGORY);
setCategoryIconPath(Constants::Icons::SETTINGS_CATEGORY);
setSettings(this);
setLayouter([this](QWidget *widget) {
using namespace Layouting;
Column {
autorunCMake,
packageManagerAutoSetup,
askBeforeReConfigureInitialParams,
showSourceSubFolders,
showAdvancedOptionsByDefault,
st
}.attachTo(widget);
});
// TODO: fixup of QTCREATORBUG-26289 , remove in Qt Creator 7 or so
Core::ICore::settings()->remove("CMakeSpecificSettings/NinjaPath");
@@ -61,38 +89,8 @@ CMakeSpecificSettings::CMakeSpecificSettings()
showAdvancedOptionsByDefault.setDefaultValue(false);
showAdvancedOptionsByDefault.setLabelText(
::CMakeProjectManager::Tr::tr("Show advanced options by default"));
}
CMakeSpecificSettings *CMakeSpecificSettings::instance()
{
static CMakeSpecificSettings theSettings;
return &theSettings;
}
// CMakeSpecificSettingsPage
CMakeSpecificSettingsPage::CMakeSpecificSettingsPage()
{
CMakeSpecificSettings *settings = CMakeSpecificSettings::instance();
setId(Constants::Settings::GENERAL_ID);
setDisplayName(::CMakeProjectManager::Tr::tr("General"));
setDisplayCategory("CMake");
setCategory(Constants::Settings::CATEGORY);
setCategoryIconPath(Constants::Icons::SETTINGS_CATEGORY);
setSettings(settings);
setLayouter([settings](QWidget *widget) {
CMakeSpecificSettings &s = *settings;
using namespace Layouting;
Column {
s.autorunCMake,
s.packageManagerAutoSetup,
s.askBeforeReConfigureInitialParams,
s.showSourceSubFolders,
s.showAdvancedOptionsByDefault,
st
}.attachTo(widget);
});
readSettings(Core::ICore::settings());
}
} // CMakeProjectManager::Internal