StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

refactor/fix switching profile with separate settings

Browse Source
This commit is contained in:
Dubslow 2014-12-08 16:03:51 -06:00
parent c0303e7a0f
commit 7fc7b57934
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core.cpp
View File

@ -1150,8 +1150,8 @@ QString Core::sanitize(QString name)
bool Core::loadConfiguration(QString path)
{
loadPath = ""; // if not empty, then user forgot a password
// setting the profile is now the responsibility of the caller
loadPath = ""; // if not empty upon return, then user forgot a password and is switching
QFile configurationFile(path);
qDebug() << "Core::loadConfiguration: reading from " << path;
@ -1183,17 +1183,17 @@ bool Core::loadConfiguration(QString path)
QMetaObject::invokeMethod(Widget::getInstance(), "askProfiles", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QString, profile));
if (!profile.isEmpty())
{
loadPath = QDir(Settings::getSettingsDirPath()).filePath(profile + TOX_EXT);
Settings::getInstance().switchProfile(profile);
HistoryKeeper::getInstance()->resetInstance();
}
return false;
}
}
}
configurationFile.close();
Settings::getInstance().setCurrentProfile(QFileInfo(path).completeBaseName());
// this is necessary for anything that doesn't call switchConfiguration, i.e.
// forgetting a password and choosing a different profile
// set GUI with user and statusmsg
QString name = getUsername();
if (!name.isEmpty())
@ -1233,7 +1233,7 @@ void Core::saveConfiguration()
if (profile == "") // happens on creation of a new Tox ID
profile = getIDString();
Settings::getInstance().setCurrentProfile(profile);
Settings::getInstance().switchProfile(profile);
}
QString path = directory.filePath(profile + TOX_EXT);
@ -1266,11 +1266,7 @@ void Core::switchConfiguration(const QString& profile)
else
loadPath = QDir(Settings::getSettingsDirPath()).filePath(profile + TOX_EXT);
// the new profile needs to be set before resetting the settings, so that
// we don't load the old profile's profile.ini
Settings::getInstance().setCurrentProfile(profile);
Settings::getInstance().save(false); // save new profile, but don't write old profile info to newprofile.ini
Settings::resetInstance();
Settings::getInstance().switchProfile(profile);
HistoryKeeper::getInstance()->resetInstance();
start();

7
src/misc/settings.cpp
View File

@ -63,6 +63,13 @@ void Settings::resetInstance()
}
}
void Settings::switchProfile(const QString& profile)
{
setCurrentProfile(profile);
save(false);
resetInstance();
}
void Settings::load()
{
if (loaded)

1
src/misc/settings.h
View File

@ -30,6 +30,7 @@ class Settings : public QObject
public:
static Settings& getInstance();
static void resetInstance();
void switchProfile(const QString& profile);
~Settings() = default;
void executeSettingsDialog(QWidget* parent);

3
src/widget/widget.cpp
View File

@ -402,7 +402,10 @@ QString Widget::detectProfile()
if (profile.isEmpty())
return "";
else
{
Settings::getInstance().setCurrentProfile(profile);
return dir.filePath(profile + Core::TOX_EXT);
}
}
}
else