Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-20 15:00:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

reworked settings

Browse source 
now there is only one global object for loading and saving settings

RshareSettings *Settings;

the class RSettings can be used too, but it is not prefered, because the default settings has no affect

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2964 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-05-20 21:53:27 +00:00
parent e68e6b54ef
commit 6baf56285b
39 changed files with 336 additions and 390 deletions
Download patch file Download diff file Expand all files Collapse all files

21
retroshare-gui/src/gui/settings/GeneralPage.cpp
View file

@ -55,14 +55,13 @@ GeneralPage::~GeneralPage()
bool
GeneralPage::save(QString &errmsg)
{
RshareSettings settings;
settings.setValue(QString::fromUtf8("StartMinimized"), startMinimized());
Settings->setValue(QString::fromUtf8("StartMinimized"), startMinimized());
settings.setValue(QString::fromUtf8("doQuit"), quit());
Settings->setValue(QString::fromUtf8("doQuit"), quit());
settings.setValue(QString::fromUtf8("ClosetoTray"), closetoTray());
Settings->setValue(QString::fromUtf8("ClosetoTray"), closetoTray());
settings.setRunRetroshareOnBoot(
Settings->setRunRetroshareOnBoot(
ui.chkRunRetroshareAtSystemStartup->isChecked());
return true;
@ -72,14 +71,13 @@ GeneralPage::save(QString &errmsg)
void
GeneralPage::load()
{
RshareSettings settings;
ui.chkRunRetroshareAtSystemStartup->setChecked(settings.runRetroshareOnBoot());
ui.chkRunRetroshareAtSystemStartup->setChecked(Settings->runRetroshareOnBoot());
ui.checkStartMinimized->setChecked(settings.value(QString::fromUtf8("StartMinimized"), false).toBool());
ui.checkStartMinimized->setChecked(Settings->value(QString::fromUtf8("StartMinimized"), false).toBool());
ui.checkQuit->setChecked(settings.value(QString::fromUtf8("doQuit"), false).toBool());
ui.checkQuit->setChecked(Settings->value(QString::fromUtf8("doQuit"), false).toBool());
ui.checkClosetoTray->setChecked(settings.value(QString::fromUtf8("ClosetoTray"), false).toBool());
ui.checkClosetoTray->setChecked(Settings->value(QString::fromUtf8("ClosetoTray"), false).toBool());
}
@ -104,8 +102,7 @@ bool GeneralPage::closetoTray() const {
void
GeneralPage::toggleShowOnStartup(bool checked)
{
RshareSettings settings;
settings.setShowMainWindowAtStart(checked);
Settings->setShowMainWindowAtStart(checked);
}
void GeneralPage::setAutoLogin(){