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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/generic/wallpapers/image
From:       Davide Bettio <davide.bettio () kdemail ! net>
Date:       2010-07-06 8:23:12
Message-ID: 20100706082312.93846AC8A8 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1146612 by bettio:

Now it's possible to remove user added wallpapers from the wallpaper list. (We have \
                this bug since KDE 4.0)
BUG: 187967


 M  +2 -0      CMakeLists.txt  
 M  +14 -0     image.cpp  
 M  +1 -0      image.h  
 A             removebutton.cpp   \
trunk/KDE/kdebase/apps/dolphin/src/selectiontoggle.cpp#1145532 [License: GPL (v2+)]  \
A             removebutton.h   \
trunk/KDE/kdebase/apps/dolphin/src/selectiontoggle.h#1145532 [License: GPL (v2+)]  A  \
removebuttonmanager.cpp   \
trunk/KDE/kdebase/apps/dolphin/src/selectionmanager.cpp#1145532 [License: GPL (v2+)]  \
A             removebuttonmanager.h   \
trunk/KDE/kdebase/apps/dolphin/src/selectionmanager.h#1145532 [License: GPL (v2+)]


--- trunk/KDE/kdebase/workspace/plasma/generic/wallpapers/image/CMakeLists.txt \
#1146611:1146612 @@ -4,6 +4,8 @@
     image.cpp
     backgrounddelegate.cpp
     backgroundlistmodel.cpp
+    removebuttonmanager.cpp
+    removebutton.cpp
 )
 kde4_add_ui_files(image_SRCS imageconfig.ui slideshowconfig.ui)
 
--- trunk/KDE/kdebase/workspace/plasma/generic/wallpapers/image/image.cpp \
#1146611:1146612 @@ -31,6 +31,7 @@
 #include <Plasma/Theme>
 #include "backgroundlistmodel.h"
 #include "backgrounddelegate.h"
+#include "removebuttonmanager.h"
 #include "ksmserver_interface.h"
 
 K_EXPORT_PLASMA_WALLPAPER(image, Image)
@@ -148,6 +149,9 @@
                                            \
                QApplication::style()->pixelMetric(QStyle::PM_DefaultFrameWidth) * 2 \
                + 7);
         m_uiImage.m_view->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
 
+        RemoveButtonManager *rmManager = new RemoveButtonManager(m_uiImage.m_view, \
&m_usersWallpapers); +        connect(rmManager, SIGNAL(removeClicked(QString)), \
this, SLOT(removeWallpaper(QString))); +
         m_uiImage.m_pictureUrlButton->setIcon(KIcon("document-open"));
         connect(m_uiImage.m_pictureUrlButton, SIGNAL(clicked()), this, \
SLOT(showFileDialog()));  
@@ -659,4 +663,14 @@
     emit update(boundingRect());
 }
 
+void Image::removeWallpaper(QString name)
+{
+    int wallpaperIndex = m_usersWallpapers.indexOf(name);
+    if (wallpaperIndex >= 0){
+        m_usersWallpapers.removeAt(wallpaperIndex);
+        m_model->reload(m_usersWallpapers);
+        emit settingsChanged(true);
+    }
+}
+
 #include "image.moc"
--- trunk/KDE/kdebase/workspace/plasma/generic/wallpapers/image/image.h \
#1146611:1146612 @@ -51,6 +51,7 @@
         void settingsChanged(bool);
 
     protected slots:
+        void removeWallpaper(QString name);
         void timeChanged(const QTime& time);
         void positioningChanged(int index);
         void slotAddDir();


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