-F option now remove all preferences files (palettes, sessions), old behavior is in -R
This commit is contained in:
parent
0bc448ad95
commit
6b04f4885d
1 changed files with 13 additions and 2 deletions
|
@ -129,6 +129,7 @@ static QString pluginName;
|
||||||
static QString styleFile;
|
static QString styleFile;
|
||||||
QString localeName;
|
QString localeName;
|
||||||
bool useFactorySettings = false;
|
bool useFactorySettings = false;
|
||||||
|
bool deletePreferences = false;
|
||||||
QString styleName;
|
QString styleName;
|
||||||
QString revision;
|
QString revision;
|
||||||
QErrorMessage* errorMessage;
|
QErrorMessage* errorMessage;
|
||||||
|
@ -4639,6 +4640,10 @@ int main(int argc, char* av[])
|
||||||
styleFile = argv.takeAt(i + 1);
|
styleFile = argv.takeAt(i + 1);
|
||||||
break;
|
break;
|
||||||
case 'F':
|
case 'F':
|
||||||
|
useFactorySettings = true;
|
||||||
|
deletePreferences = true;
|
||||||
|
break;
|
||||||
|
case 'R':
|
||||||
useFactorySettings = true;
|
useFactorySettings = true;
|
||||||
break;
|
break;
|
||||||
case 'e':
|
case 'e':
|
||||||
|
@ -4692,7 +4697,13 @@ int main(int argc, char* av[])
|
||||||
/**/
|
/**/
|
||||||
if (dataPath.isEmpty())
|
if (dataPath.isEmpty())
|
||||||
dataPath = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
|
dataPath = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
|
||||||
|
|
||||||
|
if (deletePreferences) {
|
||||||
|
QDir(dataPath).removeRecursively();
|
||||||
|
QSettings settings;
|
||||||
|
QFile::remove(settings.fileName());
|
||||||
|
}
|
||||||
|
|
||||||
// create local plugin directory
|
// create local plugin directory
|
||||||
// if not already there:
|
// if not already there:
|
||||||
QDir dir;
|
QDir dir;
|
||||||
|
@ -4710,7 +4721,7 @@ int main(int argc, char* av[])
|
||||||
QSettings s;
|
QSettings s;
|
||||||
localeName = s.value("language", "system").toString();
|
localeName = s.value("language", "system").toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
setMscoreLocale(localeName);
|
setMscoreLocale(localeName);
|
||||||
|
|
||||||
Shortcut::init();
|
Shortcut::init();
|
||||||
|
|
Loading…
Reference in a new issue