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

List:       kde-commits
Subject:    extragear/plasma/applets/frame
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2008-01-30 9:04:27
Message-ID: 1201683867.544660.29419.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 768511 by annma:

Name the Default pic "Default" in order not to have a blank line in the combo box


 M  +1 -3      frame.cpp  
 M  +1 -2      picture.cpp  


--- trunk/extragear/plasma/applets/frame/frame.cpp #768510:768511
@@ -44,8 +44,6 @@
 #include <KUrl>
 #include <KDirSelectDialog>
 
-#include <plasma/theme.h>
-
 #include <math.h>
 #include "picture.h"
 
@@ -73,7 +71,7 @@
     m_slideShow = cg.readEntry("slideshow", false);
     m_slideShowPaths = cg.readEntry("slideshow paths", QStringList());
     m_slideshowTime = cg.readEntry("slideshow time", 10); // default to 10 seconds
-    m_currentUrl = cg.readEntry("url", QString());
+    m_currentUrl = cg.readEntry("url", "Default");
 
     // Frame & Shadow dimensions
     m_frameOutline = 8;
--- trunk/extragear/plasma/applets/frame/picture.cpp #768510:768511
@@ -27,7 +27,6 @@
 #include <KUrl>
 #include <KStandardDirs>
 
-
 Picture::Picture()
 {
 }
@@ -59,7 +58,7 @@
 QImage Picture::setPicture(int pixelSize, const KUrl &currentUrl)
 {
     QImage m_picture;
-    if (currentUrl.url().isEmpty()) {
+    if (currentUrl.path() == "Default") {
 	m_picture = defaultPicture(pixelSize, "Put your photo here\nor drop a folder\nfor \
starting a slideshow");  return m_picture;
     } else {


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