← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kde-workspace/trusty

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_kdewallpapers_install.diff

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2014-01-09 10:16:29 UTC
  • mfrom: (1.6.4)
  • Revision ID: package-import@ubuntu.com-20140109101629-i07ge8av1l6wrbci
Tags: 4:4.11.5-0ubuntu1
* New upstream release 
  - refresh kubuntu_kdewallpapers_install.diff 
  - drop upstream_Fix-traceback-in-Python-runner-plugins.patch and
    upstream_Do-not-crash-when-failing-to-load-a-theme-but-instea.patch,
    fixed upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_kdewallpapers_install.diff
1
 
Index: b/plasma/generic/wallpapers/image/image.cpp
 
1
Index: kde-workspace-4.11.5/plasma/generic/wallpapers/image/image.cpp
2
2
===================================================================
3
 
--- a/plasma/generic/wallpapers/image/image.cpp
4
 
+++ b/plasma/generic/wallpapers/image/image.cpp
 
3
--- kde-workspace-4.11.5.orig/plasma/generic/wallpapers/image/image.cpp 2014-01-06 00:58:08.886058136 +0100
 
4
+++ kde-workspace-4.11.5/plasma/generic/wallpapers/image/image.cpp      2014-01-06 00:58:08.878058136 +0100
5
5
@@ -35,6 +35,9 @@
6
6
 #include "removebuttonmanager.h"
7
7
 #include "ksmserver_interface.h"
12
12
 K_EXPORT_PLASMA_WALLPAPER(image, Image)
13
13
 
14
14
 Image::Image(QObject *parent, const QVariantList &args)
15
 
@@ -49,7 +52,8 @@ Image::Image(QObject *parent, const QVar
 
15
@@ -50,7 +53,8 @@
16
16
       m_model(0),
17
17
       m_dialog(0),
18
18
       m_nextWallpaperAction(0),
20
20
+      m_openImageAction(0),
21
21
+      m_configWindow(0)
22
22
 {
23
 
     connect(this, SIGNAL(renderCompleted(QImage)), this, SLOT(updateBackground(QImage)));
24
 
     connect(&m_timer, SIGNAL(timeout()), this, SLOT(nextSlide()));
25
 
@@ -171,6 +175,16 @@ QWidget* Image::createConfigurationInter
 
23
     connect(this, SIGNAL(renderCompleted(QImage)), this, SLOT(wallpaperRenderComplete(QImage)));
 
24
     connect(this, SIGNAL(renderHintsChanged()), this, SLOT(checkSize()));
 
25
@@ -164,6 +168,16 @@
26
26
         RemoveButtonManager *rmManager = new RemoveButtonManager(m_uiImage.m_view, &m_usersWallpapers);
27
27
         connect(rmManager, SIGNAL(removeClicked(QString)), this, SLOT(removeWallpaper(QString)));
28
28
 
39
39
         m_uiImage.m_pictureUrlButton->setIcon(KIcon("document-open"));
40
40
         connect(m_uiImage.m_pictureUrlButton, SIGNAL(clicked()), this, SLOT(showFileDialog()));
41
41
 
42
 
@@ -903,4 +917,32 @@ void Image::removeWallpaper(QString name
43
 
     }
 
42
@@ -932,4 +946,32 @@
 
43
     return true;
44
44
 }
45
45
 
46
46
+void Image::installDefaultWallpapers()
72
72
+}
73
73
+
74
74
 #include "image.moc"
75
 
Index: b/plasma/generic/wallpapers/image/image.h
 
75
Index: kde-workspace-4.11.5/plasma/generic/wallpapers/image/image.h
76
76
===================================================================
77
 
--- a/plasma/generic/wallpapers/image/image.h
78
 
+++ b/plasma/generic/wallpapers/image/image.h
79
 
@@ -134,6 +134,14 @@ class Image : public Plasma::Wallpaper
 
77
--- kde-workspace-4.11.5.orig/plasma/generic/wallpapers/image/image.h   2014-01-06 00:58:08.886058136 +0100
 
78
+++ kde-workspace-4.11.5/plasma/generic/wallpapers/image/image.h        2014-01-06 00:58:08.878058136 +0100
 
79
@@ -137,6 +137,14 @@
80
80
 
81
81
         QAction* m_nextWallpaperAction;
82
82
         QAction* m_openImageAction;