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

List:       kde-commits
Subject:    KDE/kdeplasma-addons/applets/lancelot
From:       Ivan Čukić <ivan.cukic+kde () gmail ! com>
Date:       2009-09-12 15:14:32
Message-ID: 1252768472.282627.26387.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1022792 by ivan:

- Fixed air theme
- Added some SVG checking to Global



 M             app/themes/air/inner-background.svgz  
 M  +5 -2      app/themes/air/theme.config  
 M  +23 -8     libs/lancelot/Global.cpp  


--- trunk/KDE/kdeplasma-addons/applets/lancelot/app/themes/air/theme.config \
#1022791:1022792 @@ -134,8 +134,11 @@
 background.svg=dialogs/background
 
 [Group-InnerPanel] # del
-background.type=svg
-background.svg=lancelot/inner-background
+background.type=color
+background.svg=widgets/tooltip
+background.color.normal=255,255,255,128
+background.color.active=255,255,255,128
+#background.svg=lancelot/inner-background
 
 [Group-PassagewayView] # del
 parent=InnerPanel
--- trunk/KDE/kdeplasma-addons/applets/lancelot/libs/lancelot/Global.cpp \
#1022791:1022792 @@ -38,8 +38,10 @@
       ownsBackgroundSvg(false), loaded(false)
        // TODO : Add caching?
        //cachedBackgroundNormal(NULL), cachedBackgroundActive(NULL), \
                cachedBackgroundDisabled(NULL)
-{}
+{
+}
 
+
 Group::Private::~Private()
 {
     if (ownsBackgroundSvg) {
@@ -241,17 +243,30 @@
         d->backgroundColor.active   = \
                confGroupTheme.readEntry("background.color.active",   \
                d->backgroundColor.active);
         d->backgroundColor.disabled = \
confGroupTheme.readEntry("background.color.disabled", d->backgroundColor.disabled);  \
                } else if (type == "svg") {
-        if (d->ownsBackgroundSvg) {
-            delete d->backgroundSvg;
-        }
+        // we have already deleted the backgroundSvg
+        // if (d->ownsBackgroundSvg) {
+        //     delete d->backgroundSvg;
+        // }
 
-        setProperty("SvgBackground", 1, false);
         d->backgroundSvg = new Plasma::FrameSvg(NULL);
-        d->backgroundSvg->setImagePath(
-            Plasma::Theme::defaultTheme()->imagePath(
-                confGroupTheme.readEntry("background.svg")));
+        QString imagePath = Plasma::Theme::defaultTheme()->imagePath(
+                confGroupTheme.readEntry("background.svg"));
+
+        d->backgroundSvg->setImagePath(imagePath);
+        qDebug() << "Background is: " <<
+            d->backgroundSvg->imagePath();
         d->backgroundSvg->setCacheAllRenderedFrames(true);
         d->ownsBackgroundSvg = true;
+
+        if (!d->backgroundSvg->isValid()) {
+            qDebug() << "Background is not valid: " <<
+                d->backgroundSvg->imagePath();
+            delete d->backgroundSvg;
+            d->backgroundSvg = NULL;
+            d->ownsBackgroundSvg = false;
+        } else {
+            setProperty("SvgBackground", 1, false);
+        }
     }
 
     if (!confGroupTheme.readEntry(


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