--- plasma-widget-stasks-0.5.1.orig/applet/plasma-applet-stasks.desktop +++ plasma-widget-stasks-0.5.1/applet/plasma-applet-stasks.desktop @@ -15,4 +15,3 @@ X-KDE-PluginInfo-Category=Windows and Tasks X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPL -X-KDE-PluginInfo-EnabledByDefault=true \ No newline at end of file --- plasma-widget-stasks-0.5.1.orig/debian/compat +++ plasma-widget-stasks-0.5.1/debian/compat @@ -0,0 +1 @@ +5 --- plasma-widget-stasks-0.5.1.orig/debian/changelog +++ plasma-widget-stasks-0.5.1/debian/changelog @@ -0,0 +1,36 @@ +plasma-widget-stasks (0.5.1-0ubuntu3~ppa4) karmic; urgency=low + + * mv debian/patches/00list debian/patches/series + + -- Khashayar Naderehvandi Fri, 14 Aug 2009 13:10:50 +0200 + +plasma-widget-stasks (0.5.1-0ubuntu3~ppa3) karmic; urgency=low + + * Add quilt to debian/control + + -- Khashayar Naderehvandi Mon, 03 Aug 2009 21:14:01 +0200 + +plasma-widget-stasks (0.5.1-0ubuntu3~ppa2) karmic; urgency=low + + * Add two patches + + -- Khashayar Naderehvandi Mon, 03 Aug 2009 19:59:01 +0200 + +plasma-widget-stasks (0.5.1-0ubuntu2) karmic; urgency=low + + [ Christian Mangold ] + * Bumped Standards-Version to 3.8.1 + * Switched to pkg-kde-tools. instead of cdbs kde4.mk (LP: #371906) + * Added build dep on pkg-kde-tools + + [ James Westby ] + * Build-Depend on kdelibs5-dev instead of libplasma-dev as the former now + provides the headers. + + -- Christian Mangold Mon, 04 May 2009 23:06:19 +0200 + +plasma-widget-stasks (0.5.1-0ubuntu1) karmic; urgency=low + + * Initial release + + -- Christian Mangold Wed, 22 Apr 2009 23:21:04 +0200 --- plasma-widget-stasks-0.5.1.orig/debian/control +++ plasma-widget-stasks-0.5.1/debian/control @@ -0,0 +1,17 @@ +Source: plasma-widget-stasks +Section: kde +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Christian Mangold +Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-kde-tools, + kdelibs5-dev (>=4:4.2.2-2ubuntu1), kdebase-workspace-dev (>= 4:4.2.2) +Standards-Version: 3.8.1 +Homepage: http://www.kde-look.org/content/show.php/STasks?content=99739 + +Package: plasma-widget-stasks +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: a task manager replacement + stasks is a space saving replacement for the standard task manager. It shows + information about open programs in a hover image on mouseover and is + customizable. --- plasma-widget-stasks-0.5.1.orig/debian/copyright +++ plasma-widget-stasks-0.5.1/debian/copyright @@ -0,0 +1,36 @@ +This package was debianized by Christian Mangold on +Wed, 22 Apr 2009 23:21:04 +0200. + +It was downloaded from + + http://www.kde-look.org/content/show.php/STasks?content=99739 + +Upstream Author: + + Marcin Baszczewski + +Copyright: + + Copyright (C) 2009 Marcin Baszczewski + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + +The Debian packaging is copyright 2009, Christian Mangold and +is licensed under the GPL, see above. --- plasma-widget-stasks-0.5.1.orig/debian/rules +++ plasma-widget-stasks-0.5.1/debian/rules @@ -0,0 +1,2 @@ +#!/usr/bin/make -f +include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk --- plasma-widget-stasks-0.5.1.orig/debian/patches/stasks-0.5.1-peek.patch +++ plasma-widget-stasks-0.5.1/debian/patches/stasks-0.5.1-peek.patch @@ -0,0 +1,171 @@ +Only in applet: stasks_tooltip.cpp~ +diff -c stasks-0.5.1/applet/stasks_windowpreview.cpp applet/stasks_windowpreview.cpp +*** stasks-0.5.1/applet/stasks_windowpreview.cpp 2009-03-20 19:03:29.000000000 -0400 +--- applet/stasks_windowpreview.cpp 2009-07-06 14:23:52.288524055 -0400 +*************** +*** 21,29 **** +--- 21,37 ---- + #include "stasks_windowpreview.h" + + #include ++ #include + + #include + ++ #ifdef Q_WS_X11 ++ #include ++ ++ #include ++ #include ++ #endif ++ + //OTHER + #include + #include +*************** +*** 32,44 **** + #include + #include + +! STasksWindowPreview::STasksWindowPreview(QPixmap pixmap, QWidget *parent) : QWidget(parent) + { + m_pixmap = pixmap; + + m_window = 0; + +! m_opacity = 0.75; + + m_background = new Plasma::FrameSvg(this); + m_background->setImagePath("widgets/frame"); +--- 40,55 ---- + #include + #include + +! static const int HOVER_EFFECT_TIMEOUT = 10; +! +! STasksWindowPreview::STasksWindowPreview(QPixmap pixmap, QWidget *parent) : QWidget(parent), +! m_tooltipWId(parent->winId()) + { + m_pixmap = pixmap; + + m_window = 0; + +! m_opacity = 0.50; + + m_background = new Plasma::FrameSvg(this); + m_background->setImagePath("widgets/frame"); +*************** +*** 85,91 **** + Q_UNUSED(event) + + m_opacity = 1; +! + update(); + } + +--- 96,104 ---- + Q_UNUSED(event) + + m_opacity = 1; +! +! m_hoverEffectTimerId = startTimer(HOVER_EFFECT_TIMEOUT); +! + update(); + } + +*************** +*** 93,100 **** + { + Q_UNUSED(event) + +! m_opacity = 0.75; +! + update(); + } + +--- 106,124 ---- + { + Q_UNUSED(event) + +! m_opacity = 0.50; +! +! if (m_hoverEffectTimerId) { +! killTimer(m_hoverEffectTimerId); +! m_hoverEffectTimerId = 0; +! } +! +! #ifdef Q_WS_X11 +! Display *display = QX11Info::display(); +! Atom atom = XInternAtom(display, "_KDE_WINDOW_HIGHLIGHT", False); +! XDeleteProperty(display, m_tooltipWId, atom); +! #endif +! + update(); + } + +*************** +*** 102,107 **** +--- 126,137 ---- + { + KWindowSystem::forceActiveWindow(m_window); + ++ #ifdef Q_WS_X11 ++ Display *display = QX11Info::display(); ++ Atom atom = XInternAtom(display, "_KDE_WINDOW_HIGHLIGHT", False); ++ XDeleteProperty(display, m_tooltipWId, atom); ++ #endif ++ + m_opacity = 1; + event->ignore(); + } +*************** +*** 117,119 **** +--- 147,166 ---- + + update(); + } ++ ++ void STasksWindowPreview::timerEvent(QTimerEvent *event) ++ { ++ killTimer(m_hoverEffectTimerId); ++ m_hoverEffectTimerId = 0; ++ ++ #ifdef Q_WS_X11 ++ ++ WId data [] = { m_window, m_tooltipWId }; ++ ++ Display *display = QX11Info::display(); ++ Atom atom = XInternAtom(display, "_KDE_WINDOW_HIGHLIGHT", False); ++ XChangeProperty(display, m_tooltipWId, atom, atom, 32, PropModeReplace, ++ reinterpret_cast(data), 2); ++ ++ #endif ++ } +Only in applet: stasks_windowpreview.cpp~ +diff -c stasks-0.5.1/applet/stasks_windowpreview.h applet/stasks_windowpreview.h +*** stasks-0.5.1/applet/stasks_windowpreview.h 2009-03-18 19:03:03.000000000 -0400 +--- applet/stasks_windowpreview.h 2009-07-06 13:52:43.624523065 -0400 +*************** +*** 44,49 **** +--- 44,51 ---- + void enterEvent(QEvent *event); + void leaveEvent(QEvent *event); + void mousePressEvent(QMouseEvent *event); ++ void timerEvent(QTimerEvent *event); ++ int m_hoverEffectTimerId; + + public slots: + void updateTheme(); +*************** +*** 52,57 **** +--- 54,61 ---- + Plasma::FrameSvg *m_background; + QPixmap m_pixmap; + WId m_window; ++ WId m_tooltipWId; ++ + qreal m_opacity; + }; + +Only in applet: stasks_windowpreview.h~ +Common subdirectories: stasks-0.5.1/applet/ui and applet/ui --- plasma-widget-stasks-0.5.1.orig/debian/patches/series +++ plasma-widget-stasks-0.5.1/debian/patches/series @@ -0,0 +1,2 @@ +stasks-0.5.1-kde43.patch +stasks-0.5.1-peek.patch --- plasma-widget-stasks-0.5.1.orig/debian/patches/stasks-0.5.1-kde43.patch +++ plasma-widget-stasks-0.5.1/debian/patches/stasks-0.5.1-kde43.patch @@ -0,0 +1,304 @@ +Only in stasks-0.5.1-new/applet: stasks_allinone.patch +diff -crB stasks-0.5.1/applet/stasks_applet.cpp stasks-0.5.1-new/applet/stasks_applet.cpp +*** stasks-0.5.1/applet/stasks_applet.cpp 2009-03-22 02:18:21.000000000 +0200 +--- stasks-0.5.1-new/applet/stasks_applet.cpp 2009-07-02 03:24:48.000000000 +0300 +*************** +*** 73,81 **** + if (appletContainment) m_groupManager->setScreen(appletContainment->screen()); + + connect(this, SIGNAL(settingsChanged()), m_groupManager, SLOT(reconnect())); +! connect(m_groupManager->rootGroup(), SIGNAL(itemAdded(AbstractItemPtr)), this, SLOT(itemAdded(AbstractItemPtr))); +! connect(m_groupManager->rootGroup(), SIGNAL(itemRemoved(AbstractItemPtr)), this, SLOT(itemRemoved(AbstractItemPtr))); +! connect(m_groupManager->rootGroup(), SIGNAL(itemPositionChanged(AbstractItemPtr)), SLOT(itemPositionChanged(AbstractItemPtr))); + connect(this, SIGNAL(settingsChanged()), this, SLOT(configuration())); + + m_layout = new QGraphicsLinearLayout(this); +--- 73,81 ---- + if (appletContainment) m_groupManager->setScreen(appletContainment->screen()); + + connect(this, SIGNAL(settingsChanged()), m_groupManager, SLOT(reconnect())); +! connect(m_groupManager->rootGroup(), SIGNAL(itemAdded(AbstractGroupableItem *)), this, SLOT(itemAdded(AbstractGroupableItem *))); +! connect(m_groupManager->rootGroup(), SIGNAL(itemRemoved(AbstractGroupableItem *)), this, SLOT(itemRemoved(AbstractGroupableItem *))); +! connect(m_groupManager->rootGroup(), SIGNAL(itemPositionChanged(AbstractGroupableItem *)), SLOT(itemPositionChanged(AbstractGroupableItem *))); + connect(this, SIGNAL(settingsChanged()), this, SLOT(configuration())); + + m_layout = new QGraphicsLinearLayout(this); +*************** +*** 87,93 **** + setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding)); + setMaximumSize(INT_MAX,INT_MAX); + } +! void STasksApplet::itemAdded(TaskManager::AbstractItemPtr groupableItem) + { + STasksItem *item = new STasksItem(groupableItem, this); + if (m_items.contains(item)) +--- 87,93 ---- + setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding)); + setMaximumSize(INT_MAX,INT_MAX); + } +! void STasksApplet::itemAdded(TaskManager::AbstractGroupableItem * groupableItem) + { + STasksItem *item = new STasksItem(groupableItem, this); + if (m_items.contains(item)) +*************** +*** 106,112 **** + m_tasksHash[groupableItem] = item; + + } +! void STasksApplet::itemRemoved(TaskManager::AbstractItemPtr groupableItem) + { + STasksItem* item = m_tasksHash[groupableItem]; + if(item == 0) +--- 106,112 ---- + m_tasksHash[groupableItem] = item; + + } +! void STasksApplet::itemRemoved(TaskManager::AbstractGroupableItem * groupableItem) + { + STasksItem* item = m_tasksHash[groupableItem]; + if(item == 0) +*************** +*** 120,126 **** + m_layout->activate(); + delete item; + } +! void STasksApplet::itemPositionChanged(AbstractItemPtr groupableItem) + { + STasksItem* item = m_tasksHash[groupableItem]; + if (!m_items.contains(item)) +--- 120,126 ---- + m_layout->activate(); + delete item; + } +! void STasksApplet::itemPositionChanged(TaskManager::AbstractGroupableItem * groupableItem) + { + STasksItem* item = m_tasksHash[groupableItem]; + if (!m_items.contains(item)) +*************** +*** 138,144 **** + m_items.clear(); + m_tasksHash.clear(); + +! foreach(TaskManager::AbstractItemPtr item,m_groupManager->rootGroup()->members() ) + { + itemAdded(item); + } +--- 138,144 ---- + m_items.clear(); + m_tasksHash.clear(); + +! foreach(AbstractGroupableItem *item, m_groupManager->rootGroup()->members() ) + { + itemAdded(item); + } +*************** +*** 153,158 **** +--- 153,160 ---- + { + m_layout->setOrientation((formFactor() == Plasma::Vertical)?Qt::Vertical:Qt::Horizontal); + } ++ ++ setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); + } + void STasksApplet::updateSize() + { +*************** +*** 271,277 **** + } + return count; + } +! AbstractItemPtr STasksApplet::selectSubTask(int index) + { + + foreach(STasksItem *item, m_items) +--- 273,279 ---- + } + return count; + } +! AbstractGroupableItem * STasksApplet::selectSubTask(int index) + { + + foreach(STasksItem *item, m_items) +*************** +*** 345,358 **** + } + + //kDebug() << "Wheel event m_activeTaskIndex: " << m_activeTaskIndex << " of " << subTasks; +! AbstractItemPtr taskItem = selectSubTask( m_activeIconIndex); +! if (taskItem) +! { +! if (!taskItem->isGroupItem()) +! { + TaskManager::TaskItem* task = static_cast(taskItem); +! if (task->task()) +! task->task()->activate(); + } + } + } +--- 347,359 ---- + } + + //kDebug() << "Wheel event m_activeTaskIndex: " << m_activeTaskIndex << " of " << subTasks; +! AbstractGroupableItem *taskItem = selectSubTask( m_activeIconIndex); +! if (taskItem) { +! if (!taskItem->isGroupItem()) +! { + TaskManager::TaskItem* task = static_cast(taskItem); +! if (task->task()) +! task->task()->activateRaiseOrIconify(); + } + } + } +diff -crB stasks-0.5.1/applet/stasks_applet.h stasks-0.5.1-new/applet/stasks_applet.h +*** stasks-0.5.1/applet/stasks_applet.h 2009-03-22 00:22:42.000000000 +0200 +--- stasks-0.5.1-new/applet/stasks_applet.h 2009-07-02 03:19:39.000000000 +0300 +*************** +*** 51,57 **** + using TaskManager::TaskPtr; + using TaskManager::StartupPtr; + using TaskManager::GroupPtr; +- using TaskManager::AbstractItemPtr; + using TaskManager::AbstractGroupableItem; + using TaskManager::GroupManager; + using TaskManager::TaskItem; +--- 51,56 ---- +*************** +*** 88,101 **** + int fps() {return 35;} + private: + QGraphicsLinearLayout *m_layout; +! QHash m_tasksHash; + qreal m_iconSize; + Ui::stasksConfigG m_configG; + Ui::stasksConfigA m_configA; + void reload(); + void constraintsEvent(Plasma::Constraints constraints); + int totalSubTasks(); +! AbstractItemPtr selectSubTask(int index); + int activeIndex(); + //task + TaskManager::GroupManager::TaskGroupingStrategy m_groupingStrategy; +--- 87,100 ---- + int fps() {return 35;} + private: + QGraphicsLinearLayout *m_layout; +! QHash m_tasksHash; + qreal m_iconSize; + Ui::stasksConfigG m_configG; + Ui::stasksConfigA m_configA; + void reload(); + void constraintsEvent(Plasma::Constraints constraints); + int totalSubTasks(); +! AbstractGroupableItem * selectSubTask(int index); + int activeIndex(); + //task + TaskManager::GroupManager::TaskGroupingStrategy m_groupingStrategy; +*************** +*** 119,131 **** + public slots: + void updateSize(); + void updateActiveIconIndex(STasksItem *item); +! void itemPositionChanged(AbstractItemPtr groupableItem); + void expandTasksChanged(int state); + void lightColorChanged(int state); + private slots: + void configuration(); +! void itemAdded(AbstractItemPtr groupableItem); +! void itemRemoved(AbstractItemPtr groupableItem); + protected slots: + void configAccepted(); + signals: +--- 118,130 ---- + public slots: + void updateSize(); + void updateActiveIconIndex(STasksItem *item); +! void itemPositionChanged(AbstractGroupableItem *); + void expandTasksChanged(int state); + void lightColorChanged(int state); + private slots: + void configuration(); +! void itemAdded(AbstractGroupableItem *); +! void itemRemoved(AbstractGroupableItem *); + protected slots: + void configAccepted(); + signals: +diff -crB stasks-0.5.1/applet/stasks_task.cpp stasks-0.5.1-new/applet/stasks_task.cpp +*** stasks-0.5.1/applet/stasks_task.cpp 2009-03-21 23:51:03.000000000 +0200 +--- stasks-0.5.1-new/applet/stasks_task.cpp 2009-07-02 03:20:44.000000000 +0300 +*************** +*** 155,161 **** + { + return m_task->task(); + } +! TaskManager::AbstractItemPtr STasksTask::abstractItem() + { + return m_abstractItem; + } +--- 155,161 ---- + { + return m_task->task(); + } +! TaskManager::AbstractGroupableItem* STasksTask::abstractItem() + { + return m_abstractItem; + } +diff -crB stasks-0.5.1/applet/stasks_task.h stasks-0.5.1-new/applet/stasks_task.h +*** stasks-0.5.1/applet/stasks_task.h 2009-03-21 23:50:37.000000000 +0200 +--- stasks-0.5.1-new/applet/stasks_task.h 2009-07-02 03:21:53.000000000 +0300 +*************** +*** 43,49 **** + using TaskManager::TaskPtr; + using TaskManager::StartupPtr; + using TaskManager::GroupPtr; +- using TaskManager::AbstractItemPtr; + using TaskManager::AbstractGroupableItem; + using TaskManager::GroupManager; + using TaskManager::TaskItem; +--- 43,48 ---- +*************** +*** 78,84 **** + QString description(); + int desktop(); + TaskPtr task(); +! TaskManager::AbstractItemPtr abstractItem(); + GroupPtr group(); + TaskManager::TaskItem* taskItem(); + StartupPtr startup(); +--- 77,83 ---- + QString description(); + int desktop(); + TaskPtr task(); +! TaskManager::AbstractGroupableItem * abstractItem(); + GroupPtr group(); + TaskManager::TaskItem* taskItem(); + StartupPtr startup(); +*************** +*** 92,98 **** + TaskManager::TaskGroup* m_group; + STasksApplet *m_applet; + +! TaskManager::AbstractItemPtr m_abstractItem; + TaskFlags m_flags; + ItemType m_type; + private slots: +--- 91,97 ---- + TaskManager::TaskGroup* m_group; + STasksApplet *m_applet; + +! TaskManager::AbstractGroupableItem * m_abstractItem; + TaskFlags m_flags; + ItemType m_type; + private slots: +diff -crB stasks-0.5.1/applet/stasks_tooltip.cpp stasks-0.5.1-new/applet/stasks_tooltip.cpp +*** stasks-0.5.1/applet/stasks_tooltip.cpp 2009-03-21 23:37:38.000000000 +0200 +--- stasks-0.5.1-new/applet/stasks_tooltip.cpp 2009-07-02 03:22:43.000000000 +0300 +*************** +*** 75,80 **** +--- 75,81 ---- + + STasksToolTip::STasksToolTip(int size, QWidget *parent) : QWidget(parent) + { ++ setAttribute(Qt::WA_TranslucentBackground); + setWindowFlags(Qt::ToolTip); + + m_size = size;