diff options
| author | Ken Moore <ken@pcbsd.org> | 2014-10-06 09:55:02 -0400 |
|---|---|---|
| committer | Ken Moore <ken@pcbsd.org> | 2014-10-06 09:55:02 -0400 |
| commit | d0371bef82a055b52a71706c13c3fab196510354 (patch) | |
| tree | 228da7d2fb8c15ffcfb09e3499661d3471ad2d26 /lumina-config/mainUI.h | |
| parent | Merge pull request #14 from Nanolx/master (diff) | |
| download | lumina-d0371bef82a055b52a71706c13c3fab196510354.tar.gz lumina-d0371bef82a055b52a71706c13c3fab196510354.tar.bz2 lumina-d0371bef82a055b52a71706c13c3fab196510354.zip | |
Clean up the new global.h usage in all the Lumina subprojects.
1) Move the global.h file usage into libLumina exclusively
2) Define a new "LuminaOS::LuminaShare()" function for retrieving the install directory for Lumina (based on the PREFIX/global.h)
3) Change all the other lumina sub directories/projects to use the new LuminaShare() function when necessary.
4) This also fixes up the loading of translations in many of the subprojects (found a bug in the path used in a number of them).
Reason:
Previous implementation *only* worked if you built lumina from the base directory, causing problems with rebuilding individual pieces of Lumina. This also cleans up the general lumina projects as they only need the LuminaOS class loaded instead of knowing about this other possible OS implementation.
Diffstat (limited to 'lumina-config/mainUI.h')
| -rw-r--r-- | lumina-config/mainUI.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lumina-config/mainUI.h b/lumina-config/mainUI.h index 28e38984..565a3c61 100644 --- a/lumina-config/mainUI.h +++ b/lumina-config/mainUI.h @@ -26,9 +26,6 @@ #include "LPlugins.h" #include "KeyCatch.h" #include "AppDialog.h" -#include "../global.h" - -#define DEFAULTBG QString(PREFIX + "/share/Lumina-DE/desktop-background.jpg") //namespace for using the *.ui file namespace Ui{ @@ -48,6 +45,7 @@ private: LPlugins *PINFO; QMenu *ppmenu, *mpmenu; QString panelcolor; + QString DEFAULTBG; QList<XDGDesktop> sysApps; bool loading; bool moddesk, modpan, modmenu, modshort, moddef, modses; //page modified flags |