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

Vcs: Use PagedSettings for common settings

Browse Source 
Also restrict the Reset VCS Cache button to the second
column, as it was earlier.

Change-Id: I291fdceb11df4ecdfdc0887fd521288d0b4544f3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-06-01 14:30:06 +02:00
parent 1348f0cfe0
commit 9b6ff3fb36
6 changed files with 54 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/vcsbase/vcsplugin.cpp
View File

@@ -40,7 +40,7 @@ public:
explicit VcsPluginPrivate(VcsPlugin *plugin)
: q(plugin)
{
QObject::connect(&m_settingsPage.settings(), &CommonVcsSettings::settingsChanged,
QObject::connect(&m_settings, &AspectContainer::changed,
[this] { slotSettingsChanged(); });
slotSettingsChanged();
}
@@ -57,7 +57,7 @@ public:
void populateNickNameModel()
{
QString errorMessage;
if (!NickNameDialog::populateModelFromMailCapFile(m_settingsPage.settings().nickNameMailMap.filePath(),
if (!NickNameDialog::populateModelFromMailCapFile(m_settings.nickNameMailMap(),
m_nickNameModel,
&errorMessage)) {
qWarning("%s", qPrintable(errorMessage));
@@ -71,7 +71,7 @@ public:
}
VcsPlugin *q;
CommonOptionsPage m_settingsPage;
CommonVcsSettings m_settings;
QStandardItemModel *m_nickNameModel = nullptr;
};
@@ -101,9 +101,6 @@ void VcsPlugin::initialize()
return result;
});
connect(&d->m_settingsPage.settings(), &CommonVcsSettings::settingsChanged,
this, &VcsPlugin::settingsChanged);
JsonWizardFactory::registerPageFactory(new Internal::VcsConfigurationPageFactory);
JsonWizardFactory::registerPageFactory(new Internal::VcsCommandPageFactory);
@@ -146,11 +143,6 @@ VcsPlugin *VcsPlugin::instance()
return m_instance;
}
CommonVcsSettings &VcsPlugin::settings() const
{
return d->m_settingsPage.settings();
}
/* Delayed creation/update of the nick name model. */
QStandardItemModel *VcsPlugin::nickNameModel()
{