[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.3/kdeplasma-addons/applets/lancelot/libs/lancelot
From:       Ivan Čukić <ivan.cukic+kde () gmail ! com>
Date:       2009-07-13 9:46:12
Message-ID: 1247478372.210639.21539.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 995742 by ivan:

Theme config file loading fix



 M  +18 -1     Global.cpp  


--- branches/KDE/4.3/kdeplasma-addons/applets/lancelot/libs/lancelot/Global.cpp #995741:995742
@@ -283,12 +283,29 @@
     QString search = "desktoptheme/" +
             Plasma::Theme::defaultTheme()->themeName()
             + "/lancelot/" + app + "theme.config";
+    QString path =  KStandardDirs::locate( "data", search );
+    qDebug() << "Global::Private::createConfTheme: path:" << search << "=" << path;
 
-    QString path =  KStandardDirs::locate( "data", search );
+    // if we didn't find the theme specific for this application
+    // we'll use the main theme file
     if (path.isEmpty()) {
+        search = "desktoptheme/" +
+            Plasma::Theme::defaultTheme()->themeName()
+            + "/lancelot/theme.config";
+        path =  KStandardDirs::locate( "data", search );
+        qDebug() << "Global::Private::createConfTheme: path:" << search << "=" << path;
+    }
+
+    // if the above fails, we are loading the default theme's
+    // file
+    if (path.isEmpty()) {
         search = "desktoptheme/default/lancelot/theme.config";
         path =  KStandardDirs::locate( "data", search );
+        qDebug() << "Global::Private::createConfTheme: path:" << search << "=" << path;
     }
+
+    // this doesn't really do anything useful
+    // TODO: remove later
     if (path.isEmpty()) {
         path = "lancelotrc";
     }
[prev in list] [next in list] [prev in thread] [next in thread]