From bdd5a2d104f4dea0e36b24389fcd42b7f5c464e3 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 17 Dec 2015 16:22:39 -0500 Subject: Fix up the loading of theme colors on first-run. Also find/fix a typo in the default luminaDesktop.conf file. --- lumina-desktop/defaults/luminaDesktop.conf | 2 +- lumina-desktop/main.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'lumina-desktop') diff --git a/lumina-desktop/defaults/luminaDesktop.conf b/lumina-desktop/defaults/luminaDesktop.conf index f2632e0e..2c973adb 100644 --- a/lumina-desktop/defaults/luminaDesktop.conf +++ b/lumina-desktop/defaults/luminaDesktop.conf @@ -29,7 +29,7 @@ session_playlogoutaudio=true #[true/false] Play the audio chimes on log out #THEME SETTINGS #theme.themefile= #Absolute path to the theme template file to use (disable for Lumina-Default) -theme.colorfile=Black #Name of the color spec file to use for theming +theme_colorfile=Black #Name of the color spec file to use for theming theme_iconset=oxygen #Name of the icon theme to use theme_font=Arial #Name of the font family to use theme_fontsize=10pt #Default size of the fonts to use on the desktop (can also use a percentage of the screen height (%) ) diff --git a/lumina-desktop/main.cpp b/lumina-desktop/main.cpp index 3602c10e..50ad7ef4 100644 --- a/lumina-desktop/main.cpp +++ b/lumina-desktop/main.cpp @@ -70,8 +70,7 @@ int main(int argc, char ** argv) setenv("DESKTOP_SESSION","Lumina",1); setenv("XDG_CURRENT_DESKTOP","Lumina",1); unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... - //Startup the Application - if(DEBUG){ qDebug() << "Session Init:";} + //Startup the session LSession a(argc, argv); if(!a.isPrimaryProcess()){ return 0; } //Setup the log file @@ -95,7 +94,7 @@ int main(int argc, char ** argv) //LUtils::LoadTranslation(&a, "lumina-desktop"); if(DEBUG){ qDebug() << "Session Setup:" << timer->elapsed(); } a.setupSession(); - + theme.refresh(); if(DEBUG){ qDebug() << "Exec Time:" << timer->elapsed(); delete timer;} int retCode = a.exec(); //qDebug() << "Stopping the window manager"; -- cgit