diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 031d9bdd5..3b6fd2b95 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -129,7 +129,9 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) ui.quitButton->setToolTip(tr("Quit")); //connect(ui.quitButton, SIGNAL(clicked()), qApp, SLOT(quit())); connect(ui.quitButton, SIGNAL(clicked()), this, SLOT(doQuit())); - loadStyleSheet("Default"); + + /* load the StyleSheet*/ + loadStyleSheet(Rshare::stylesheet()); diff --git a/retroshare-gui/src/gui/Preferences/GeneralDialog.cpp b/retroshare-gui/src/gui/Preferences/GeneralDialog.cpp index c6738b006..2da0e2ecb 100644 --- a/retroshare-gui/src/gui/Preferences/GeneralDialog.cpp +++ b/retroshare-gui/src/gui/Preferences/GeneralDialog.cpp @@ -85,16 +85,13 @@ GeneralDialog::load() index = ui.cmboStyle->findData(Rshare::style().toLower()); ui.cmboStyle->setCurrentIndex(index); - index = ui.styleSheetCombo->findData(Rshare::stylesheet().toLower()); - ui.styleSheetCombo->setCurrentIndex(index); - //index = ui.styleSheetCombo->findData(_settings->getSheetName()); - //ui.styleSheetCombo->setCurrentIndex(index); + ui.styleSheetCombo->setCurrentIndex(ui.styleSheetCombo->findText(_settings->getSheetName())); - /* load internal styleSheet */ + /** load saved internal styleSheet **/ //QFile file(":/qss/" + (_settings->getSheetName().toLower()) + ".qss"); - /** load extern Stylesheets **/ + /** load saved extern Stylesheets **/ QFile file(QApplication::applicationDirPath() + "/qss/" + (_settings->getSheetName().toLower()) + ".qss"); file.open(QFile::ReadOnly);