mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-20 21:29:01 -04:00
reworked settings
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:
parent
e68e6b54ef
commit
6baf56285b
39 changed files with 336 additions and 390 deletions
|
@ -69,10 +69,9 @@ AppearancePage::save(QString &errmsg)
|
|||
QString languageCode =
|
||||
LanguageSupport::languageCode(ui.cmboLanguage->currentText());
|
||||
|
||||
RshareSettings settings;
|
||||
settings.setLanguageCode(languageCode);
|
||||
settings.setInterfaceStyle(ui.cmboStyle->currentText());
|
||||
settings.setSheetName(ui.styleSheetCombo->currentText());
|
||||
Settings->setLanguageCode(languageCode);
|
||||
Settings->setInterfaceStyle(ui.cmboStyle->currentText());
|
||||
Settings->setSheetName(ui.styleSheetCombo->currentText());
|
||||
|
||||
/* Set to new style */
|
||||
Rshare::setStyle(ui.cmboStyle->currentText());
|
||||
|
@ -85,21 +84,19 @@ AppearancePage::save(QString &errmsg)
|
|||
void
|
||||
AppearancePage::load()
|
||||
{
|
||||
RshareSettings settings;
|
||||
|
||||
int index = ui.cmboLanguage->findData(settings.getLanguageCode());
|
||||
int index = ui.cmboLanguage->findData(Settings->getLanguageCode());
|
||||
ui.cmboLanguage->setCurrentIndex(index);
|
||||
|
||||
index = ui.cmboStyle->findData(Rshare::style().toLower());
|
||||
ui.cmboStyle->setCurrentIndex(index);
|
||||
|
||||
ui.styleSheetCombo->setCurrentIndex(ui.styleSheetCombo->findText(settings.getSheetName()));
|
||||
ui.styleSheetCombo->setCurrentIndex(ui.styleSheetCombo->findText(Settings->getSheetName()));
|
||||
|
||||
/** load saved internal styleSheet **/
|
||||
//QFile file(":/qss/" + (settings.getSheetName().toLower()) + ".qss");
|
||||
|
||||
/** load saved extern Stylesheets **/
|
||||
QFile file(QApplication::applicationDirPath() + "/qss/" + (settings.getSheetName().toLower()) + ".qss");
|
||||
QFile file(QApplication::applicationDirPath() + "/qss/" + (Settings->getSheetName().toLower()) + ".qss");
|
||||
|
||||
file.open(QFile::ReadOnly);
|
||||
QString styleSheet = QLatin1String(file.readAll());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue