From 9279838d6503b99d140c94da3a3d76f4463a3a50 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Fri, 24 Aug 2012 23:35:57 +0000 Subject: [PATCH] Added two internal stylesheets: - qss.default - This file is used as default for all stylesheets (e.g. the frames of the AvatarWidget) and can be overloaded from the selected stylesheet - Standard.qss - The standard stylesheet for the current look of RetroShare. More internal stylesheets can be added. The plan is to move nearly all internal stylesheets to the files Standard.qss/qss.default. After that the "empty" stylesheet should represent the system theme of the os. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5467 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/common/AvatarWidget.ui | 9 -- retroshare-gui/src/gui/images.qrc | 2 + .../src/gui/qss/stylesheet/Standard.qss | 1 + .../src/gui/qss/stylesheet/qss.default | 10 ++ .../src/gui/settings/AppearancePage.cpp | 106 ++++++++---------- .../src/gui/settings/AppearancePage.h | 41 +++---- retroshare-gui/src/rshare.cpp | 43 ++++++- retroshare-gui/src/rshare.h | 2 + 8 files changed, 119 insertions(+), 95 deletions(-) create mode 100644 retroshare-gui/src/gui/qss/stylesheet/Standard.qss create mode 100644 retroshare-gui/src/gui/qss/stylesheet/qss.default diff --git a/retroshare-gui/src/gui/common/AvatarWidget.ui b/retroshare-gui/src/gui/common/AvatarWidget.ui index 06b8108e2..c76d9250a 100644 --- a/retroshare-gui/src/gui/common/AvatarWidget.ui +++ b/retroshare-gui/src/gui/common/AvatarWidget.ui @@ -10,15 +10,6 @@ 116 - - AvatarWidget{border-width: 10px;} -AvatarWidget[frameState="NORMAL"]{border-image:url(:/images/avatarstatus-bg-116.png);} -AvatarWidget[frameState="OFFLINE"]{border-image:url(:/images/avatarstatus-bg-offline-116.png);} -AvatarWidget[frameState="INACTIVE"]{border-image:url(:/images/avatarstatus-bg-idle-116.png);} -AvatarWidget[frameState="ONLINE"]{border-image:url(:/images/avatarstatus-bg-online-116.png);} -AvatarWidget[frameState="AWAY"]{border-image:url(:/images/avatarstatus-bg-away-116.png);} -AvatarWidget[frameState="BUSY"]{border-image:url(:/images/avatarstatus-bg-busy-116.png);} - true diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index db6832793..733fdfa67 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -551,6 +551,8 @@ qss/chat/compact/history/system.htm qss/chat/compact/history/main.css qss/chat/compact/history/variants/Standard.css + qss/stylesheet/qss.default + qss/stylesheet/Standard.qss smileys/amorous.png smileys/angry.png smileys/bad.png diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss new file mode 100644 index 000000000..84cf110b9 --- /dev/null +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -0,0 +1 @@ +/* Standard stylesheet for RetroShare */ diff --git a/retroshare-gui/src/gui/qss/stylesheet/qss.default b/retroshare-gui/src/gui/qss/stylesheet/qss.default new file mode 100644 index 000000000..c4be3a9e7 --- /dev/null +++ b/retroshare-gui/src/gui/qss/stylesheet/qss.default @@ -0,0 +1,10 @@ +/* Default stylesheet + This file is used as default for all stylesheets and can be overloaded */ + +AvatarWidget{border-width: 10px;} +AvatarWidget[frameState="NORMAL"]{border-image:url(:/images/avatarstatus-bg-116.png);} +AvatarWidget[frameState="OFFLINE"]{border-image:url(:/images/avatarstatus-bg-offline-116.png);} +AvatarWidget[frameState="INACTIVE"]{border-image:url(:/images/avatarstatus-bg-idle-116.png);} +AvatarWidget[frameState="ONLINE"]{border-image:url(:/images/avatarstatus-bg-online-116.png);} +AvatarWidget[frameState="AWAY"]{border-image:url(:/images/avatarstatus-bg-away-116.png);} +AvatarWidget[frameState="BUSY"]{border-image:url(:/images/avatarstatus-bg-busy-116.png);} diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp index 1b5b1a8c9..549ef19f5 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.cpp +++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp @@ -28,91 +28,79 @@ #include "AppearancePage.h" #include "rsharesettings.h" - /** Constructor */ AppearancePage::AppearancePage(QWidget * parent, Qt::WFlags flags) - : ConfigPage(parent, flags) + : ConfigPage(parent, flags) { - /* Invoke the Qt Designer generated object setup routine */ - ui.setupUi(this); + /* Invoke the Qt Designer generated object setup routine */ + ui.setupUi(this); - connect(ui.styleSheetCombo, SIGNAL(clicked()), this, SLOT(loadStyleSheet())); + connect(ui.styleSheetCombo, SIGNAL(activated(int)), this, SLOT(loadStyleSheet(int))); - /* Populate combo boxes */ - foreach (QString code, LanguageSupport::languageCodes()) { - ui.cmboLanguage->addItem(QIcon(":/images/flags/" + code + ".png"), LanguageSupport::languageName(code), code); - } - foreach (QString style, QStyleFactory::keys()) { - ui.cmboStyle->addItem(style, style.toLower()); - } + /* Populate combo boxes */ + foreach (QString code, LanguageSupport::languageCodes()) { + ui.cmboLanguage->addItem(QIcon(":/images/flags/" + code + ".png"), LanguageSupport::languageName(code), code); + } + foreach (QString style, QStyleFactory::keys()) { + ui.cmboStyle->addItem(style, style.toLower()); + } - //loadStyleSheet("Default"); - loadqss(); + // add empty entry representing "no style sheet" + ui.styleSheetCombo->addItem("", ""); - /* Hide platform specific features */ + QMap styleSheets; + Rshare::getAvailableStyleSheets(styleSheets); + + foreach (QString name, styleSheets.keys()) { + ui.styleSheetCombo->addItem(name, styleSheets[name]); + } + + /* Hide platform specific features */ #ifdef Q_WS_WIN - #endif } AppearancePage::~AppearancePage() { + /* reaload style sheet */ + Rshare::loadStyleSheet(Settings->getSheetName()); } /** Saves the changes on this page */ -bool -AppearancePage::save(QString &errmsg) +bool AppearancePage::save(QString &errmsg) { - Q_UNUSED(errmsg); - QString languageCode = LanguageSupport::languageCode(ui.cmboLanguage->currentText()); + Q_UNUSED(errmsg); - Settings->setLanguageCode(languageCode); - Settings->setInterfaceStyle(ui.cmboStyle->currentText()); - Settings->setSheetName(ui.styleSheetCombo->currentText()); + QString languageCode = LanguageSupport::languageCode(ui.cmboLanguage->currentText()); - /* Set to new style */ - Rshare::setStyle(ui.cmboStyle->currentText()); - return true; + Settings->setLanguageCode(languageCode); + Settings->setInterfaceStyle(ui.cmboStyle->currentText()); + Settings->setSheetName(ui.styleSheetCombo->itemData(ui.styleSheetCombo->currentIndex()).toString()); + + /* Set to new style */ + Rshare::setStyle(ui.cmboStyle->currentText()); + + return true; } /** Loads the settings for this page */ -void -AppearancePage::load() +void AppearancePage::load() { - int index = ui.cmboLanguage->findData(Settings->getLanguageCode()); - ui.cmboLanguage->setCurrentIndex(index); + int index = ui.cmboLanguage->findData(Settings->getLanguageCode()); + ui.cmboLanguage->setCurrentIndex(index); - index = ui.cmboStyle->findData(Rshare::style().toLower()); - ui.cmboStyle->setCurrentIndex(index); + index = ui.cmboStyle->findData(Rshare::style().toLower()); + ui.cmboStyle->setCurrentIndex(index); - index = ui.styleSheetCombo->findText(Settings->getSheetName()); - if (index == -1) { - index = ui.styleSheetCombo->findText("noskin"); - } - ui.styleSheetCombo->setCurrentIndex(index); - - /** load saved extern Stylesheets **/ - loadStyleSheet (Settings->getSheetName()); + index = ui.styleSheetCombo->findData(Settings->getSheetName()); + if (index == -1) { + /* set standard "no style sheet" */ + index = ui.styleSheetCombo->findData(""); + } + ui.styleSheetCombo->setCurrentIndex(index); } -void AppearancePage::on_styleSheetCombo_activated(const QString &sheetName) +void AppearancePage::loadStyleSheet(int index) { - loadStyleSheet(sheetName); -} - -void AppearancePage::loadStyleSheet(const QString &sheetName) -{ - Rshare::loadStyleSheet(sheetName); -} - -void AppearancePage::loadqss() -{ - QFileInfoList slist = QDir(QApplication::applicationDirPath() + "/qss/").entryInfoList(); - // add empty entry representing "no style sheet" - ui.styleSheetCombo->addItem(""); - foreach(QFileInfo st, slist) - { - if(st.fileName() != "." && st.fileName() != ".." && st.isFile()) - ui.styleSheetCombo->addItem(st.fileName().remove(".qss")); - } + Rshare::loadStyleSheet(ui.styleSheetCombo->itemData(index).toString()); } diff --git a/retroshare-gui/src/gui/settings/AppearancePage.h b/retroshare-gui/src/gui/settings/AppearancePage.h index 7e6115e01..fe123e037 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.h +++ b/retroshare-gui/src/gui/settings/AppearancePage.h @@ -27,35 +27,28 @@ class AppearancePage : public ConfigPage { - Q_OBJECT + Q_OBJECT - public: - /** Default Constructor */ - AppearancePage(QWidget * parent = 0, Qt::WFlags flags = 0); - /** Default Destructor */ - ~AppearancePage(); +public: + /** Default Constructor */ + AppearancePage(QWidget * parent = 0, Qt::WFlags flags = 0); + /** Default Destructor */ + ~AppearancePage(); - /** Saves the changes on this page */ - virtual bool save(QString &errmsg); - /** Loads the settings for this page */ - virtual void load(); + /** Saves the changes on this page */ + virtual bool save(QString &errmsg); + /** Loads the settings for this page */ + virtual void load(); - virtual QPixmap iconPixmap() const { return QPixmap(":/images/looknfeel.png") ; } - virtual QString pageName() const { return tr("Appearance") ; } + virtual QPixmap iconPixmap() const { return QPixmap(":/images/looknfeel.png") ; } + virtual QString pageName() const { return tr("Appearance") ; } +private slots: + void loadStyleSheet(int index); - private slots: - - void on_styleSheetCombo_activated(const QString &styleSheetName); - - - private: - void loadStyleSheet(const QString &sheetName); - void loadqss(); - - /** Qt Designer generated object */ - Ui::AppearancePage ui; +private: + /** Qt Designer generated object */ + Ui::AppearancePage ui; }; #endif - diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp index 13aeec2ab..6a48ec01d 100644 --- a/retroshare-gui/src/rshare.cpp +++ b/retroshare-gui/src/rshare.cpp @@ -364,17 +364,54 @@ void Rshare::loadStyleSheet(const QString &sheetName) { QString styleSheet; + /* load the default stylesheet */ + QFile file(":/qss/stylesheet/qss.default"); + if (file.open(QFile::ReadOnly)) { + styleSheet = QLatin1String(file.readAll()) + "\n"; + file.close(); + } + if (!sheetName.isEmpty()) { - /** extern Stylesheets **/ - QFile file(QApplication::applicationDirPath() + "/qss/" + sheetName.toLower() + ".qss"); + QString fileName; + + if (sheetName.left(1) == ":") { + /* internal stylesheet */ + fileName = ":/qss/stylesheet/" + sheetName.mid(1) + ".qss"; + } else { + /* external stylesheet */ + fileName = QApplication::applicationDirPath() + "/qss/" + sheetName + ".qss"; + } + + file.setFileName(fileName); if (file.open(QFile::ReadOnly)) { - styleSheet = QLatin1String(file.readAll()); + styleSheet += QLatin1String(file.readAll()); file.close(); } } qApp->setStyleSheet(styleSheet); } +/** get list of available stylesheets **/ +void Rshare::getAvailableStyleSheets(QMap &styleSheets) +{ + QFileInfoList fileInfoList = QDir(":/qss/stylesheet/").entryInfoList(QStringList("*.qss")); + QFileInfo fileInfo; + foreach (fileInfo, fileInfoList) { + if (fileInfo.isFile()) { + QString name = fileInfo.baseName(); + styleSheets.insert(QString("%1 (%2)").arg(name, tr("built-in")), ":" + name); + } + } + + fileInfoList = QDir(applicationDirPath() + "/qss/").entryInfoList(QStringList("*.qss")); + foreach (fileInfo, fileInfoList) { + if (fileInfo.isFile()) { + QString name = fileInfo.baseName(); + styleSheets.insert(name, name); + } + } +} + void Rshare::refreshStyleSheet(QWidget *widget, bool processChildren) { if (widget != NULL) { diff --git a/retroshare-gui/src/rshare.h b/retroshare-gui/src/rshare.h index d06b195e7..a186dc80c 100644 --- a/retroshare-gui/src/rshare.h +++ b/retroshare-gui/src/rshare.h @@ -79,6 +79,8 @@ public: static bool setSheet(QString sheet = QString()); /** Loads stylesheet from external file **/ static void loadStyleSheet(const QString &sheetName); + /** get list of available stylesheets **/ + static void getAvailableStyleSheets(QMap &styleSheets); /** Recalculates matching stylesheet for widget **/ static void refreshStyleSheet(QWidget *widget, bool processChildren);