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

SettingsAccessor: Add a QWidget *parent parameter to restoreSettings

Browse Source 
Instead of hardcoding Core::ICore::mainWindow()

Change-Id: Iec7747945cbcb335ae552a0277a1527f598f1ff7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2014-02-27 12:02:02 +01:00
parent feca029249
commit c652a68d41
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/project.cpp
View File

@@ -311,7 +311,7 @@ bool Project::restoreSettings()
{ {
if (!d->m_accessor) if (!d->m_accessor)
d->m_accessor = new Internal::UserFileAccessor(this); d->m_accessor = new Internal::UserFileAccessor(this);
QVariantMap map(d->m_accessor->restoreSettings()); QVariantMap map(d->m_accessor->restoreSettings(Core::ICore::mainWindow()));
bool ok = fromMap(map); bool ok = fromMap(map);
if (ok) if (ok)
emit settingsLoaded(); emit settingsLoaded();

18
src/plugins/projectexplorer/settingsaccessor.cpp
View File

@@ -577,13 +577,13 @@ void trackUserStickySettings(QVariantMap &userMap, const QVariantMap &sharedMap)
} // Anonymous } // Anonymous
QVariantMap SettingsAccessor::restoreSettings() const QVariantMap SettingsAccessor::restoreSettings(QWidget *parent) const
{ {
if (m_lastVersion < 0) if (m_lastVersion < 0)
return QVariantMap(); return QVariantMap();
SettingsData userSettings = readUserSettings(); SettingsData userSettings = readUserSettings(parent);
SettingsData sharedSettings = readSharedSettings(); SettingsData sharedSettings = readSharedSettings(parent);
userSettings = mergeSettings(userSettings, sharedSettings); userSettings = mergeSettings(userSettings, sharedSettings);
if (!userSettings.isValid()) if (!userSettings.isValid())
@@ -696,7 +696,7 @@ void SettingsAccessor::backupUserFile() const
QFile::copy(origName, backupName); QFile::copy(origName, backupName);
} }
SettingsAccessor::SettingsData SettingsAccessor::readUserSettings() const SettingsAccessor::SettingsData SettingsAccessor::readUserSettings(QWidget *parent) const
{ {
SettingsData result; SettingsData result;
QStringList fileList = findSettingsFiles(m_userSuffix); QStringList fileList = findSettingsFiles(m_userSuffix);
@@ -708,7 +708,7 @@ SettingsAccessor::SettingsData SettingsAccessor::readUserSettings() const
// Error handling: // Error handling:
if (!result.isValid()) { if (!result.isValid()) {
QMessageBox::information( QMessageBox::information(
Core::ICore::mainWindow(), parent,
QApplication::translate("ProjectExplorer::SettingsAccessor", QApplication::translate("ProjectExplorer::SettingsAccessor",
"No valid Settings found"), "No valid Settings found"),
QApplication::translate("ProjectExplorer::SettingsAccessor", QApplication::translate("ProjectExplorer::SettingsAccessor",
@@ -732,7 +732,7 @@ SettingsAccessor::SettingsData SettingsAccessor::readUserSettings() const
"<p>Do you still want to load the settings file '%1'?</p>") "<p>Do you still want to load the settings file '%1'?</p>")
.arg(result.fileName().toUserOutput()), .arg(result.fileName().toUserOutput()),
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes | QMessageBox::No,
Core::ICore::mainWindow()); parent);
msgBox.setDefaultButton(QMessageBox::No); msgBox.setDefaultButton(QMessageBox::No);
msgBox.setEscapeButton(QMessageBox::No); msgBox.setEscapeButton(QMessageBox::No);
if (msgBox.exec() == QMessageBox::No) if (msgBox.exec() == QMessageBox::No)
@@ -740,7 +740,7 @@ SettingsAccessor::SettingsData SettingsAccessor::readUserSettings() const
} else if ((result.fileName().toString() != defaultFileName(m_userSuffix)) } else if ((result.fileName().toString() != defaultFileName(m_userSuffix))
&& (result.version() < currentVersion())) { && (result.version() < currentVersion())) {
QMessageBox::information( QMessageBox::information(
Core::ICore::mainWindow(), parent,
QApplication::translate("ProjectExplorer::SettingsAccessor", QApplication::translate("ProjectExplorer::SettingsAccessor",
"Using Old Settings"), "Using Old Settings"),
QApplication::translate("ProjectExplorer::SettingsAccessor", QApplication::translate("ProjectExplorer::SettingsAccessor",
@@ -758,7 +758,7 @@ SettingsAccessor::SettingsData SettingsAccessor::readUserSettings() const
return result; return result;
} }
SettingsAccessor::SettingsData SettingsAccessor::readSharedSettings() const SettingsAccessor::SettingsData SettingsAccessor::readSharedSettings(QWidget *parent) const
{ {
SettingsData sharedSettings; SettingsData sharedSettings;
QString fn = project()->projectFilePath() + m_sharedSuffix; QString fn = project()->projectFilePath() + m_sharedSuffix;
@@ -783,7 +783,7 @@ SettingsAccessor::SettingsData SettingsAccessor::readSharedSettings() const
"supported by Qt Creator. " "supported by Qt Creator. "
"Do you want to try loading it anyway?"), "Do you want to try loading it anyway?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes | QMessageBox::No,
Core::ICore::mainWindow()); parent);
msgBox.setDefaultButton(QMessageBox::No); msgBox.setDefaultButton(QMessageBox::No);
msgBox.setEscapeButton(QMessageBox::No); msgBox.setEscapeButton(QMessageBox::No);
if (msgBox.exec() == QMessageBox::No) if (msgBox.exec() == QMessageBox::No)

6
src/plugins/projectexplorer/settingsaccessor.h
View File

@@ -50,7 +50,7 @@ public:
Project *project() const; Project *project() const;
QVariantMap restoreSettings() const; QVariantMap restoreSettings(QWidget *parent) const;
bool saveSettings(const QVariantMap &data, QWidget *parent) const; bool saveSettings(const QVariantMap &data, QWidget *parent) const;
void addVersionUpgrader(Internal::VersionUpgrader *handler); // Takes ownership of the handler! void addVersionUpgrader(Internal::VersionUpgrader *handler); // Takes ownership of the handler!
@@ -83,8 +83,8 @@ private:
void upgradeSettings(SettingsData &data, int toVersion) const; void upgradeSettings(SettingsData &data, int toVersion) const;
SettingsData readUserSettings() const; SettingsData readUserSettings(QWidget *parent) const;
SettingsData readSharedSettings() const; SettingsData readSharedSettings(QWidget *parent) const;
SettingsData findBestSettings(const QStringList &candidates) const; SettingsData findBestSettings(const QStringList &candidates) const;
SettingsData mergeSettings(const SettingsData &user, const SettingsData &shared) const; SettingsData mergeSettings(const SettingsData &user, const SettingsData &shared) const;