diff options
author | Ken Moore <ken@pcbsd.org> | 2014-10-10 15:10:19 -0400 |
---|---|---|
committer | Ken Moore <ken@pcbsd.org> | 2014-10-10 15:10:19 -0400 |
commit | f936d7d555972bb0f60d4f217356d7e43f231580 (patch) | |
tree | 87b602ce714d18b3230398b28d2f1b8def43512b /lumina-fm | |
parent | Make sure the directory catch for running lumina-fm happens at the end (in ca... (diff) | |
download | lumina-f936d7d555972bb0f60d4f217356d7e43f231580.tar.gz lumina-f936d7d555972bb0f60d4f217356d7e43f231580.tar.bz2 lumina-f936d7d555972bb0f60d4f217356d7e43f231580.zip |
Large update to the Lumina project: provide full theming capabilities.
1) New libLumina classes: LuminaThemes.h
2) Single-line usage to add lumina theme usage to an application (already added to all the Lumina utilities)
3) Include a Lumina-default theme template, as well as a single color scheme (will add more later)
4) Will create a global Qt style for "lumina" so that this theme engine can be automatically applied to all Qt applications at a later date (want to make sure to beat this up and get it working reliably before turning it on for everything).
Major Features:
1) Full Qt theme capabilities through Qt stylesheets (so they can be modified and applied on the fly).
2) Stylesheets are broken into a couple pieces: an "incomplete" stylesheet file (the theme template) with variables in place of colors, font size, and font family. A "color" file which variable->value definitions for the different colors. And a themesettings.cfg files which keeps track of the files/font settings.
3) Along with this, add the ability to specify the icon theme that is used as well, and make that automatically re-loaded as necessary.
4) Add the ability to read/set thes values in lumina-config. The lumina-config usage is still a bit rough: working on cleaning it up right now.
Diffstat (limited to 'lumina-fm')
-rw-r--r-- | lumina-fm/MainUI.h | 4 | ||||
-rw-r--r-- | lumina-fm/main.cpp | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lumina-fm/MainUI.h b/lumina-fm/MainUI.h index 3984e109..fea56549 100644 --- a/lumina-fm/MainUI.h +++ b/lumina-fm/MainUI.h @@ -67,6 +67,9 @@ public: void OpenDirs(QStringList); //called from the main.cpp after initialization +public slots: + void setupIcons(); //used during initialization + private: Ui::MainUI *ui; //Internal non-ui widgets @@ -97,7 +100,6 @@ private: bool isUserWritable, keepFocus; //Simplification Functions - void setupIcons(); //used during initialization void setupConnections(); //used during initialization void loadSettings(); //used during initialization diff --git a/lumina-fm/main.cpp b/lumina-fm/main.cpp index 8d5a3f95..18c75223 100644 --- a/lumina-fm/main.cpp +++ b/lumina-fm/main.cpp @@ -9,7 +9,7 @@ #include "MainUI.h" #include <LuminaOS.h> -//#include <LuminaThemes.h> +#include <LuminaThemes.h> int main(int argc, char ** argv) { @@ -27,8 +27,7 @@ int main(int argc, char ** argv) QApplication a(argc, argv); #endif a.setApplicationName("Insight File Manager"); - //LuminaThemeEngine themes(&a); - //qDebug() << "StyleSheet:\n" << a.styleSheet(); + LuminaThemeEngine themes(&a); //Load current Locale QTranslator translator; QLocale mylocale; @@ -45,6 +44,7 @@ int main(int argc, char ** argv) MainUI w; QObject::connect(&a, SIGNAL(messageReceived(const QString&)), &w, SLOT(slotSingleInstance(const QString&)) ); + QObject::connect(&themes, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) ); w.OpenDirs(in); w.show(); |