rev 14062 - in trunk/packages/kdeplasma-addons/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sat Mar 14 12:55:32 UTC 2009
Author: fabo
Date: 2009-03-14 12:55:31 +0000 (Sat, 14 Mar 2009)
New Revision: 14062
Added:
trunk/packages/kdeplasma-addons/debian/patches/01_lancelot_qt4.5_support.diff
trunk/packages/kdeplasma-addons/debian/patches/series
Modified:
trunk/packages/kdeplasma-addons/debian/changelog
Log:
Add patch to fix lancelot when Qt 4.5 is used.
Modified: trunk/packages/kdeplasma-addons/debian/changelog
===================================================================
--- trunk/packages/kdeplasma-addons/debian/changelog 2009-03-14 12:47:37 UTC (rev 14061)
+++ trunk/packages/kdeplasma-addons/debian/changelog 2009-03-14 12:55:31 UTC (rev 14062)
@@ -1,3 +1,11 @@
+kdeplasma-addons (4:4.2.1-2) UNRELEASED; urgency=low
+
+ +++ Changes by Fathi Boudra:
+
+ * Add patch to fix lancelot when Qt 4.5 is used.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 14 Mar 2009 13:52:37 +0100
+
kdeplasma-addons (4:4.2.1-1) experimental; urgency=low
* New upstream release.
Added: trunk/packages/kdeplasma-addons/debian/patches/01_lancelot_qt4.5_support.diff
===================================================================
--- trunk/packages/kdeplasma-addons/debian/patches/01_lancelot_qt4.5_support.diff (rev 0)
+++ trunk/packages/kdeplasma-addons/debian/patches/01_lancelot_qt4.5_support.diff 2009-03-14 12:55:31 UTC (rev 14062)
@@ -0,0 +1,263 @@
+--- a/applets/lancelot/libs/lancelot/Global.cpp
++++ b/applets/lancelot/libs/lancelot/Global.cpp
+@@ -326,8 +326,11 @@ Instance::Instance()
+
+ 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 @@ Instance::Instance()
+ path = "lancelotrc";
+ }
+ kDebug() << path;
++
++ qDebug() << "Using theme:" << path;
+ d->confTheme = new KConfig(path);
+
+ Instance::Private::activeInstance = this;
+--- a/applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp
++++ b/applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp
+@@ -20,6 +20,10 @@
+ #include "PassagewayView.h"
+
+ #include <QWidget>
++#include <QGraphicsSceneMouseEvent>
++#include <QGraphicsView>
++#include <QApplication>
++#include <climits>
+
+ namespace Lancelot {
+
+@@ -65,6 +69,8 @@ public:
+ : 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 @@ public:
+ 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 @@ public:
+
+ 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 @@ public:
+ 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 @@ public:
+ 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))
+--- a/applets/lancelot/app/src/models/ContactsKopete.cpp
++++ b/applets/lancelot/app/src/models/ContactsKopete.cpp
+@@ -22,7 +22,7 @@
+ #include <KStandardDirs>
+ #include <KDebug>
+
+-#define UPDATE_INTERVAL 30000
++#define UPDATE_INTERVAL 15000
+ #define CHECK_RUNNING_INTERVAL 5000
+
+ namespace Models {
+--- a/applets/lancelot/libs/lancelot/layouts/CardLayout.cpp
++++ b/applets/lancelot/libs/lancelot/layouts/CardLayout.cpp
+@@ -31,6 +31,35 @@ public:
+ {
+ }
+
++ 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 @@ public:
+ }
+
+ 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 @@ void CardLayout::addItem(QGraphicsWidget
+ if (widget) {
+ d->widgets[id] = widget;
+ // widget->hide(); // BUGS in QT
++ d->_hide(widget);
+ } else {
+ d->removeItem(id);
+ }
+@@ -142,17 +174,17 @@ void CardLayout::show(const QString & id
+ 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;
+ }
+
+--- a/applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp
++++ b/applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp
+@@ -41,10 +41,10 @@ public:
+ {
+ }
+
+- 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 @@ FullBorderLayout::~FullBorderLayout()
+ 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 @@ void FullBorderLayout::setGeometry(const
+ itemRect.setHeight(effectiveRect.height() - topBorder - bottomBorder);
+
+ if (d->itemPositions[Right]) {
+- kDebug() << "right" << itemRect;
+ d->itemPositions[Right]->setGeometry(itemRect);
+ }
+
+@@ -197,7 +197,6 @@ void FullBorderLayout::setGeometry(const
+ );
+
+ if (d->itemPositions[Center]) {
+- kDebug() << "center" << itemRect;
+ d->itemPositions[Center]->setGeometry(itemRect);
+ }
+ }
+--- a/applets/lancelot/libs/lancelot/widgets/CustomListView.cpp
++++ b/applets/lancelot/libs/lancelot/widgets/CustomListView.cpp
+@@ -164,9 +164,9 @@ public:
+ 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);
+--- a/applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp
++++ b/applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp
+@@ -227,8 +227,10 @@ void ScrollPane::scrollableWidgetSizeUpd
+
+ void ScrollPane::setGeometry(const QRectF & rect) //>
+ {
++ QRectF old_geometry = geometry();
+ Widget::setGeometry(rect);
+
++ if (rect == old_geometry) return ;
+ scrollableWidgetSizeUpdateNeeded();
+ } //<
+
Added: trunk/packages/kdeplasma-addons/debian/patches/series
===================================================================
--- trunk/packages/kdeplasma-addons/debian/patches/series (rev 0)
+++ trunk/packages/kdeplasma-addons/debian/patches/series 2009-03-14 12:55:31 UTC (rev 14062)
@@ -0,0 +1 @@
+01_lancelot_qt4.5_support.diff
More information about the pkg-kde-commits
mailing list