[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Aug 1 09:05:04 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=392f261
The following commit has been merged in the master branch:
commit 392f2618aa7a61a7a1e7c233d94348f897f13774
Author: Jonathan Thomas (The man) <echidnaman at gmail.com>
Date: Fri Feb 20 15:29:53 2009 -0500
* Add kubuntu_01_lancelot_qt45.diff to fix Lancelot glitches with Qt 4.5.
---
debian/changelog | 7 +
debian/patches/kubuntu_01_lancelot_qt45.diff | 277 +++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 285 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index bdea155..973ebb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kdeplasma-addons (4:4.2.0-0ubuntu3) UNRELEASED; urgency=low
+
+ [ Michal Zajac ]
+ * Add kubuntu_01_lancelot_qt45.diff to fix Lancelot glitches with Qt 4.5.
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Fri, 20 Feb 2009 15:26:21 -0500
+
kdeplasma-addons (4:4.2.0-0ubuntu2) jaunty; urgency=low
* Rebuild for boost transition (LP: #297152)
diff --git a/debian/patches/kubuntu_01_lancelot_qt45.diff b/debian/patches/kubuntu_01_lancelot_qt45.diff
new file mode 100644
index 0000000..0b59445
--- /dev/null
+++ b/debian/patches/kubuntu_01_lancelot_qt45.diff
@@ -0,0 +1,277 @@
+Index: kdeplasma-addons-4.2.0/applets/lancelot/app/src/models/ContactsKopete.cpp
+===================================================================
+--- kdeplasma-addons-4.2.0.orig/applets/lancelot/app/src/models/ContactsKopete.cpp 2009-02-20 20:25:37.518200148 +0100
++++ kdeplasma-addons-4.2.0/applets/lancelot/app/src/models/ContactsKopete.cpp 2009-02-20 20:27:20.106197578 +0100
+@@ -22,7 +22,7 @@
+ #include <KStandardDirs>
+ #include <KDebug>
+
+-#define UPDATE_INTERVAL 30000
++#define UPDATE_INTERVAL 15000
+ #define CHECK_RUNNING_INTERVAL 5000
+
+ namespace Models {
+Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/Global.cpp
+===================================================================
+--- kdeplasma-addons-4.2.0.orig/applets/lancelot/libs/lancelot/Global.cpp 2009-02-20 20:25:37.434195296 +0100
++++ kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/Global.cpp 2009-02-20 20:27:20.106197578 +0100
+@@ -326,8 +326,11 @@
+
+ d->confMain = new KConfig("lancelot" + app + "rc");
+
++ Plasma::Theme::defaultTheme()->setUseGlobalSettings(true);
++ qDebug() << "What is the plasma theme: " << Plasma::Theme::defaultTheme()->themeName();
+ QString search = "desktoptheme/" + Plasma::Theme::defaultTheme()->themeName() + "/lancelot/" + app + "theme.config";
+ kDebug() << search;
++ qDebug() << "Trying:" << search;
+
+ QString path = KStandardDirs::locate( "data", search );
+ if (path == "") {
+@@ -338,6 +341,8 @@
+ path = "lancelotrc";
+ }
+ kDebug() << path;
++
++ qDebug() << "Using theme:" << path;
+ d->confTheme = new KConfig(path);
+
+ Instance::Private::activeInstance = this;
+Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/layouts/CardLayout.cpp
+===================================================================
+--- kdeplasma-addons-4.2.0.orig/applets/lancelot/libs/lancelot/layouts/CardLayout.cpp 2009-02-20 20:25:37.550200367 +0100
++++ kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/layouts/CardLayout.cpp 2009-02-20 20:27:20.106197578 +0100
+@@ -31,6 +31,35 @@
+ {
+ }
+
++ void _hide(QGraphicsWidget * widget) {
++ // since Qt has some strange bug (or it
++ // just doesn't behave as it should,
++ // this is a temporary solution
++ // so instead of hiding the item,
++ // we are moving it somewhere
++ // out of bounds
++ // this is a very dirty hack!
++
++ QRectF g = widget->geometry();
++ if (g.left() < 0) {
++ return;
++ }
++ g.moveRight(- g.left());
++ widget->setGeometry(g);
++ }
++
++ void _show(QGraphicsWidget * widget) {
++ // see the comment in _hide
++
++ QRectF g = widget->geometry();
++ if (g.left() >= 0) {
++ return;
++ }
++
++ g.moveLeft(- g.right());
++ widget->setGeometry(g);
++ }
++
+ void relayout()
+ {
+ QRectF g = q->geometry();
+@@ -40,9 +69,11 @@
+ }
+
+ foreach (QGraphicsWidget * l, widgets) {
+- l->show();
++ _show(l);
+ l->setGeometry(g);
+- if (shown != l) l->hide();
++ if (shown != l) {
++ _hide(l);
++ }
+ }
+ }
+
+@@ -107,6 +138,7 @@
+ if (widget) {
+ d->widgets[id] = widget;
+ // widget->hide(); // BUGS in QT
++ d->_hide(widget);
+ } else {
+ d->removeItem(id);
+ }
+@@ -142,17 +174,17 @@
+ if (!d->widgets.contains(id)) return;
+ if (d->shown == d->widgets[id]) return;
+ if (d->shown) {
+- d->shown->hide();
++ d->_hide(d->shown);
+ }
+ d->shown = d->widgets[id];
+ d->shown->setGeometry(geometry());
+- d->shown->show();
++ d->_show(d->shown);
+ }
+
+ void CardLayout::hideAll()
+ {
+ if (!d->shown) return;
+- d->shown->hide();
++ d->_hide(d->shown);
+ d->shown = NULL;
+ }
+
+Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp
+===================================================================
+--- kdeplasma-addons-4.2.0.orig/applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp 2009-02-20 20:25:37.582200751 +0100
++++ kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp 2009-02-20 20:27:20.106197578 +0100
+@@ -41,10 +41,10 @@
+ {
+ }
+
+- QMap< FullBorderLayout::Place, QGraphicsLayoutItem * > itemPositions;
+- QMap< FullBorderLayout::Border, qreal > sizes;
++ QMap < FullBorderLayout::Place, QGraphicsLayoutItem * > itemPositions;
++ QMap < FullBorderLayout::Border, qreal > sizes;
+
+- void calculateBorderSizes(qreal & top, qreal & bottom, qreal & left, qreal & right) const
++ void calculateBorderSizes(qreal & top, qreal & bottom, qreal & left, qreal & right) // const
+ {
+ // top
+ top = sizes[FullBorderLayout::TopBorder];
+@@ -121,7 +121,8 @@
+ void FullBorderLayout::setGeometry(const QRectF & rect)
+ {
+ QGraphicsLayout::setGeometry(rect);
+- kDebug() << rect;
++ // WHATA HELL!?
++ qDebug() << "FullBorderLayout::setGeometry()";
+
+ QRectF effectiveRect = geometry();
+ qreal left = 0, top = 0, right = 0, bottom = 0;
+@@ -158,7 +159,6 @@
+ itemRect.setHeight(effectiveRect.height() - topBorder - bottomBorder);
+
+ if (d->itemPositions[Right]) {
+- kDebug() << "right" << itemRect;
+ d->itemPositions[Right]->setGeometry(itemRect);
+ }
+
+@@ -197,7 +197,6 @@
+ );
+
+ if (d->itemPositions[Center]) {
+- kDebug() << "center" << itemRect;
+ d->itemPositions[Center]->setGeometry(itemRect);
+ }
+ }
+Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/CustomListView.cpp
+===================================================================
+--- kdeplasma-addons-4.2.0.orig/applets/lancelot/libs/lancelot/widgets/CustomListView.cpp 2009-02-20 20:25:37.614199910 +0100
++++ kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/CustomListView.cpp 2009-02-20 20:27:20.106197578 +0100
+@@ -164,9 +164,9 @@
+ QGraphicsWidget * item = itemForIndex(i);
+ QRectF itemGeometry = item->geometry();
+ if (viewport.intersects(itemGeometry)) {
+- if (q->isVisible()) {
++ //if (q->isVisible()) {
+ item->show();
+- }
++ //}
+ transform.reset();
+ if (!viewport.contains(itemGeometry)) {
+ QRectF clip = viewport.intersect(itemGeometry);
+Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp
+===================================================================
+--- kdeplasma-addons-4.2.0.orig/applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp 2009-02-20 20:25:37.486199844 +0100
++++ kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp 2009-02-20 20:27:20.106197578 +0100
+@@ -20,6 +20,10 @@
+ #include "PassagewayView.h"
+
+ #include <QWidget>
++#include <QGraphicsSceneMouseEvent>
++#include <QGraphicsView>
++#include <QApplication>
++#include <climits>
+
+ namespace Lancelot {
+
+@@ -65,6 +69,8 @@
+ : layout(NULL), buttonsLayout(NULL), listsLayout(NULL), parent(p), focusIndex(0)
+ {
+ parent->setLayout(layout = new NodeLayout());
++ layout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
++ layout->setMaximumSize(INT_MAX, INT_MAX);
+
+ layout->addItem(
+ buttonsLayout = new QGraphicsLinearLayout(Qt::Horizontal),
+@@ -72,6 +78,9 @@
+ NodeLayout::NodeCoordinate(1, 0, 0, 32)
+ );
+
++ buttonsLayout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
++ buttonsLayout->setMaximumSize(INT_MAX, INT_MAX);
++
+ ExtenderButton * spacer =
+ new ExtenderButton(parent);
+ spacer->setGroupByName("PassagewayView-Spacer");
+@@ -88,6 +97,9 @@
+
+ listsLayout->setSizer(new PassagewayViewSizer());
+
++ listsLayout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
++ listsLayout->setMaximumSize(INT_MAX, INT_MAX);
++
+ buttonsLayout->setSpacing(0.0);
+
+ next(Step("", QIcon(), entranceModel));
+@@ -161,7 +173,11 @@
+ path.takeLast();
+
+ buttonsLayout->removeItem(button);
+- layout->activate();
++
++ // This really shouldn't be needed :(
++ buttonsLayout->setGeometry(buttonsLayout->geometry());
++
++
+ listsLayout->pop();
+
+ button->deleteLater();
+@@ -196,19 +212,18 @@
+ list->setCategoriesGroupByName("ActionListView-CategoriesPass");
+ list->setCategoriesActivable(true);
+
+- // if (lists.count() > 0) {
+- // lists.last()->clearSelection();
+- // }
+-
+ focusIndex = lists.count();
+ lists.append(list);
+
+- // list->initialSelection();
+ path.append(step);
+
+ buttonsLayout->addItem(button);
+ listsLayout->push(list);
+
++ // This really shouldn't be needed :(
++ buttonsLayout->setGeometry(buttonsLayout->geometry());
++ listsLayout->setGeometry(listsLayout->geometry());
++
+ QObject::connect(
+ list, SIGNAL(activated(int)),
+ parent, SLOT(listItemActivated(int))
+Index: kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp
+===================================================================
+--- kdeplasma-addons-4.2.0.orig/applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp 2009-02-20 20:25:37.646199596 +0100
++++ kdeplasma-addons-4.2.0/applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp 2009-02-20 20:27:20.106197578 +0100
+@@ -227,8 +227,10 @@
+
+ void ScrollPane::setGeometry(const QRectF & rect) //>
+ {
++ QRectF old_geometry = geometry();
+ Widget::setGeometry(rect);
+
++ if (rect == old_geometry) return ;
+ scrollableWidgetSizeUpdateNeeded();
+ } //<
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c8c0388
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_01_lancelot_qt45.diff
--
KDE Plasma Addons module packaging
More information about the pkg-kde-commits
mailing list