[SCM] plasma-desktop packaging branch, kubuntu_unstable, updated. abdff08016a0321197ebd169956a7c7cf06a5738

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=abdff08

The following commit has been merged in the kubuntu_unstable branch:
commit abdff08016a0321197ebd169956a7c7cf06a5738
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Mar 26 14:25:10 2015 +0100

    drop upstream patch applied to master
---
 debian/patches/series                              |   1 -
 ...ger-when-there-s-only-one-virtual-desktop.patch | 101 ---------------------
 2 files changed, 102 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a685a23..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_Hide-pager-when-there-s-only-one-virtual-desktop.patch
diff --git a/debian/patches/upstream_Hide-pager-when-there-s-only-one-virtual-desktop.patch b/debian/patches/upstream_Hide-pager-when-there-s-only-one-virtual-desktop.patch
deleted file mode 100644
index dd2726c..0000000
--- a/debian/patches/upstream_Hide-pager-when-there-s-only-one-virtual-desktop.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From bdb4702179898f07d4301799b29d104506d6e534 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= <sebas at kde.org>
-Date: Thu, 5 Mar 2015 02:04:47 +0100
-Subject: [PATCH] Hide pager when there's only one virtual desktop
-
-As discussed during the recent papercut session, hide the pager in the
-panel when there's only one virtual desktop configured. This reinstates
-a Plasma 4 feature.
-
-REVIEW:122822
----
- applets/pager/package/contents/ui/main.qml |  2 +-
- applets/pager/plugin/pager.cpp             | 15 +++++++++++++--
- applets/pager/plugin/pager.h               |  4 ++++
- 3 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml
-index e69ab35..51b61b5 100644
---- a/applets/pager/package/contents/ui/main.qml
-+++ b/applets/pager/package/contents/ui/main.qml
-@@ -46,7 +46,7 @@ Item {
-     property int dragSwitchDesktopId: -1
- 
-     anchors.fill: parent
--    //visible: repeater.count > 1 // FIXME: re-enable and fix collapsing
-+    visible: pager.desktopCount > 1
- 
-     property color windowActiveOnActiveDesktopColor: theme.textColor
-     property color windowInactiveOnActiveDesktopColor: theme.textColor
-diff --git a/applets/pager/plugin/pager.cpp b/applets/pager/plugin/pager.cpp
-index 997db2d..22c6ca2 100644
---- a/applets/pager/plugin/pager.cpp
-+++ b/applets/pager/plugin/pager.cpp
-@@ -114,6 +114,10 @@ Pager::~Pager()
- {
- }
- 
-+int Pager::desktopCount() const
-+{
-+    return m_desktopCount;
-+}
- 
- 
- void Pager::setCurrentDesktop(int desktop)
-@@ -327,7 +331,11 @@ void Pager::updateSizes()
-         ph = m_size.height();
-     }
- 
--    m_preferredSize = QSize(pw, ph);
-+    if (m_desktopCount > 1) {
-+        m_preferredSize = QSize(pw, ph);
-+    } else {
-+        m_preferredSize = QSize(1, 1); // 0, 0 doesn't collapse completely, leaves uncanny spacing
-+    }
-     emit preferredSizeChanged();
- 
-     QRectF itemRect(QPointF(leftMargin, topMargin) , QSizeF(itemWidth, itemHeight));
-@@ -437,7 +445,10 @@ void Pager::numberOfDesktopsChanged(int num)
-     NETRootInfo info(QX11Info::connection(), NET::NumberOfDesktops | NET::DesktopNames, NET::WM2DesktopLayout);
-     m_rows = info.desktopLayoutColumnsRows().height();
- 
--    m_desktopCount = num;
-+    if (num != m_desktopCount) {
-+        m_desktopCount = num;
-+        emit desktopCountChanged();
-+    }
- 
-     m_pagerModel->clearDesktopRects();
-     recalculateGridSizes(m_rows);
-diff --git a/applets/pager/plugin/pager.h b/applets/pager/plugin/pager.h
-index 0e471c8..78d461d 100644
---- a/applets/pager/plugin/pager.h
-+++ b/applets/pager/plugin/pager.h
-@@ -45,6 +45,7 @@ class Pager : public QObject
-     Q_OBJECT
-     Q_PROPERTY(QObject* model READ model CONSTANT)
-     Q_PROPERTY(int currentDesktop READ currentDesktop NOTIFY currentDesktopChanged)
-+    Q_PROPERTY(int desktopCount READ desktopCount NOTIFY desktopCountChanged)
-     Q_PROPERTY(bool showWindowIcons READ showWindowIcons WRITE setShowWindowIcons NOTIFY showWindowIconsChanged)
-     Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged)
-     Q_PROPERTY(QSizeF size READ size WRITE setSize NOTIFY sizeChanged)
-@@ -75,6 +76,8 @@ class Pager : public QObject
-         int currentDesktop() const { return m_currentDesktop; }
-         void setCurrentDesktop(int desktop);
- 
-+        int desktopCount() const;
-+
-         bool showWindowIcons() const { return m_showWindowIcons; }
-         void setShowWindowIcons(bool show);
- 
-@@ -97,6 +100,7 @@ class Pager : public QObject
- 
-     Q_SIGNALS:
-         void currentDesktopChanged();
-+        void desktopCountChanged();
-         void showWindowIconsChanged();
-         void orientationChanged();
-         void sizeChanged();
--- 
-2.1.4
-

-- 
plasma-desktop packaging