From 29ed4cee95d2be3e65dedcb4022c7a8bf4785932 Mon Sep 17 00:00:00 2001 From: mar637 Date: Sat, 7 May 2011 21:26:17 +1000 Subject: [PATCH] Restored overwriting paintEvent. Fixed postint in case symlink exists already. --- debian/changelog | 18 ++++++++++++++++++ debian/control | 2 +- debian/postinst | 8 ++++---- quickwidget.cpp | 7 ++++++- quickwidget.hpp | 1 + 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2336139..bc9ab19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +quick-widgets (0.3.3) unstable; urgency=low + + * fixed postinst script for existing symlink + + -- Malte Marquarding Sat, 7 May 2011 15:58:38 +1000 + +quick-widgets (0.3.2) unstable; urgency=low + + * reverted back to overwrite paintEvent to allow fully transparent widgets + + -- Malte Marquarding Sat, 7 May 2011 12:28:25 +1000 + +quick-widgets (0.3.1) unstable; urgency=low + + * added mce-dev to build dependencies + + -- Malte Marquarding Tue, 26 Apr 2011 21:12:35 +1000 + quick-widgets (0.3.0) unstable; urgency=low * added auto-rotation of widgets (configurable) diff --git a/debian/control b/debian/control index 4924c67..c160b4d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: quick-widgets Section: user/desktop Priority: extra Maintainer: Malte Marquarding -Build-Depends: debhelper (>= 5), libqt4-dev, libhildon-extras1-dev (>=0.9.5), q-extras-dev (>=1.0.5) +Build-Depends: debhelper (>= 5), libqt4-dev, libhildon-extras1-dev (>=0.9.5), q-extras-dev (>=1.0.5), mce-dev Standards-Version: 3.7.3 Homepage: http://quick-widgets.garage.maemo.org/ diff --git a/debian/postinst b/debian/postinst index d36db05..ef55292 100644 --- a/debian/postinst +++ b/debian/postinst @@ -2,10 +2,10 @@ set -e chmod +x /opt/quick-widgets/quick-widgets -ln -s /opt/quick-widgets/quick-widgets /usr/bin +if [ ! -f /usr/bin/quick-widgets ] +then + ln -fs /opt/quick-widgets/quick-widgets /usr/bin/quick-widgets +fi echo "Quick Widgets install done" echo "Starting Quick Widgets..." start --quiet quick-widgets - - - diff --git a/quickwidget.cpp b/quickwidget.cpp index 4f3f307..2c72a3b 100644 --- a/quickwidget.cpp +++ b/quickwidget.cpp @@ -145,6 +145,12 @@ endl; size_ = QSize(errwdgt->width(), errwdgt->height()); } +//disable base class widget's paint method +void QuickWidget::paintEvent(QPaintEvent *event) +{ + QWidget::paintEvent(event); +} + void QuickWidget::resizer(const QSize& size) { if (size_.isValid()) @@ -152,4 +158,3 @@ void QuickWidget::resizer(const QSize& size) resize(size); } } - diff --git a/quickwidget.hpp b/quickwidget.hpp index 20d70d1..7f974fe 100644 --- a/quickwidget.hpp +++ b/quickwidget.hpp @@ -25,6 +25,7 @@ protected: // void showSettingsDialog(); bool restoreWidgetState(); void errorWidget(); + void paintEvent(QPaintEvent *event); public slots: void resizer(const QSize& size); -- 1.7.9.5