rpms/kde-plasma-stasks/devel kde-plasma-stasks-4.3.patch, NONE, 1.1 kde-plasma-stasks.spec, 1.2, 1.3 kde-plasma-stasks-spacerfix.patch, 1.1, NONE kde-plasma-stasks-translucent-bg.patch, 1.1, NONE

Sven Lankes slankes at fedoraproject.org
Mon Jul 6 21:18:42 UTC 2009 

Author: slankes

Update of /cvs/pkgs/rpms/kde-plasma-stasks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24160

Modified Files:
	kde-plasma-stasks.spec 
Added Files:
	kde-plasma-stasks-4.3.patch 
Removed Files:
	kde-plasma-stasks-spacerfix.patch 
	kde-plasma-stasks-translucent-bg.patch 
Log Message:
* Mon Jul 26 2009 Sven Lankes <sven at lank.es> 0.5.1-4
- Really fix it for KDE 4.3


kde-plasma-stasks-4.3.patch:

--- NEW FILE kde-plasma-stasks-4.3.patch ---
Only in stasks-0.5.1/applet: stasks_allinone.patch
diff -ur stasks-0.5.1.orig/applet/stasks_applet.cpp stasks-0.5.1/applet/stasks_applet.cpp
--- stasks-0.5.1.orig/applet/stasks_applet.cpp	2009-03-22 01:18:21.000000000 +0100
+++ stasks-0.5.1/applet/stasks_applet.cpp	2009-07-02 02:24:48.000000000 +0200
@@ -73,9 +73,9 @@
     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(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,7 +87,7 @@
     setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
     setMaximumSize(INT_MAX,INT_MAX);
 }
-void STasksApplet::itemAdded(TaskManager::AbstractItemPtr groupableItem)
+void STasksApplet::itemAdded(TaskManager::AbstractGroupableItem * groupableItem)
 {
     STasksItem *item = new STasksItem(groupableItem, this);
     if (m_items.contains(item)) 
@@ -106,7 +106,7 @@
     m_tasksHash[groupableItem] = item;
 
 }
-void STasksApplet::itemRemoved(TaskManager::AbstractItemPtr groupableItem)
+void STasksApplet::itemRemoved(TaskManager::AbstractGroupableItem * groupableItem)
 {
     STasksItem* item = m_tasksHash[groupableItem];
     if(item == 0) 
@@ -120,7 +120,7 @@
     m_layout->activate();
     delete item;
 }
-void STasksApplet::itemPositionChanged(AbstractItemPtr groupableItem)
+void STasksApplet::itemPositionChanged(TaskManager::AbstractGroupableItem * groupableItem)
 {
     STasksItem* item = m_tasksHash[groupableItem];
     if (!m_items.contains(item))
@@ -138,7 +138,7 @@
     m_items.clear();
     m_tasksHash.clear();
     
-    foreach(TaskManager::AbstractItemPtr item,m_groupManager->rootGroup()->members() ) 
+    foreach(AbstractGroupableItem *item, m_groupManager->rootGroup()->members() ) 
     {
 	itemAdded(item);
     }
@@ -153,6 +153,8 @@
     {
         m_layout->setOrientation((formFactor() == Plasma::Vertical)?Qt::Vertical:Qt::Horizontal);
     }
+    
+    setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
 }
 void STasksApplet::updateSize()
 {
@@ -271,7 +273,7 @@
     }
     return count;
 }
-AbstractItemPtr STasksApplet::selectSubTask(int index)
+AbstractGroupableItem * STasksApplet::selectSubTask(int index)
 {
 
     foreach(STasksItem *item, m_items) 
@@ -345,14 +347,13 @@
     }
 
     //kDebug() << "Wheel event m_activeTaskIndex: " << m_activeTaskIndex << " of " << subTasks;
-    AbstractItemPtr taskItem = selectSubTask( m_activeIconIndex);
-    if (taskItem) 
-    {
-	if (!taskItem->isGroupItem())
-	{
+    AbstractGroupableItem *taskItem = selectSubTask( m_activeIconIndex);
+        if (taskItem) {
+        if (!taskItem->isGroupItem())
+        {
 	    TaskManager::TaskItem* task = static_cast<TaskManager::TaskItem*>(taskItem);
-	    if (task->task())
-	    task->task()->activate();
+	    if (task->task()) 
+	    task->task()->activateRaiseOrIconify();
 	}
     }
 }
diff -ur stasks-0.5.1.orig/applet/stasks_applet.h stasks-0.5.1/applet/stasks_applet.h
--- stasks-0.5.1.orig/applet/stasks_applet.h	2009-03-21 23:22:42.000000000 +0100
+++ stasks-0.5.1/applet/stasks_applet.h	2009-07-02 02:19:39.000000000 +0200
@@ -51,7 +51,6 @@
 using TaskManager::TaskPtr;
 using TaskManager::StartupPtr;
 using TaskManager::GroupPtr;
-using TaskManager::AbstractItemPtr;
 using TaskManager::AbstractGroupableItem;
 using TaskManager::GroupManager;
 using TaskManager::TaskItem;
@@ -88,14 +87,14 @@
 	int fps() {return 35;}
     private:
 	QGraphicsLinearLayout *m_layout;
-	QHash<AbstractItemPtr, STasksItem*> m_tasksHash;
+	QHash<AbstractGroupableItem *, STasksItem*> 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);
+	AbstractGroupableItem * selectSubTask(int index);
 	int activeIndex();
 	//task
         TaskManager::GroupManager::TaskGroupingStrategy m_groupingStrategy;
@@ -119,13 +118,13 @@
     public slots:
 	void updateSize();
 	void updateActiveIconIndex(STasksItem *item);
-	void itemPositionChanged(AbstractItemPtr groupableItem);
+	void itemPositionChanged(AbstractGroupableItem *);
 	void expandTasksChanged(int state);
 	void lightColorChanged(int state);
     private slots:
 	void configuration();
-	void itemAdded(AbstractItemPtr groupableItem);
-	void itemRemoved(AbstractItemPtr groupableItem);
+	void itemAdded(AbstractGroupableItem *);
+	void itemRemoved(AbstractGroupableItem *);
     protected slots:
         void configAccepted();
     signals:
diff -ur stasks-0.5.1.orig/applet/stasks_task.cpp stasks-0.5.1/applet/stasks_task.cpp
--- stasks-0.5.1.orig/applet/stasks_task.cpp	2009-03-21 22:51:03.000000000 +0100
+++ stasks-0.5.1/applet/stasks_task.cpp	2009-07-02 02:20:44.000000000 +0200
@@ -155,7 +155,7 @@
 {
     return m_task->task();
 }
-TaskManager::AbstractItemPtr STasksTask::abstractItem()
+TaskManager::AbstractGroupableItem* STasksTask::abstractItem()
 {
     return m_abstractItem;
 }
diff -ur stasks-0.5.1.orig/applet/stasks_task.h stasks-0.5.1/applet/stasks_task.h
--- stasks-0.5.1.orig/applet/stasks_task.h	2009-03-21 22:50:37.000000000 +0100
+++ stasks-0.5.1/applet/stasks_task.h	2009-07-02 02:21:53.000000000 +0200
@@ -43,7 +43,6 @@
 using TaskManager::TaskPtr;
 using TaskManager::StartupPtr;
 using TaskManager::GroupPtr;
-using TaskManager::AbstractItemPtr;
 using TaskManager::AbstractGroupableItem;
 using TaskManager::GroupManager;
 using TaskManager::TaskItem;
@@ -78,7 +77,7 @@
 	QString description();
 	int desktop();
 	TaskPtr task();
-	TaskManager::AbstractItemPtr abstractItem();
+	TaskManager::AbstractGroupableItem * abstractItem();
 	GroupPtr group();
 	TaskManager::TaskItem* taskItem();
 	StartupPtr startup();
@@ -92,7 +91,7 @@
 	TaskManager::TaskGroup* m_group;
 	STasksApplet *m_applet;
 
-	TaskManager::AbstractItemPtr m_abstractItem;
+	TaskManager::AbstractGroupableItem * m_abstractItem;
 	TaskFlags m_flags;
         ItemType m_type;
     private slots:
diff -ur stasks-0.5.1.orig/applet/stasks_tooltip.cpp stasks-0.5.1/applet/stasks_tooltip.cpp
--- stasks-0.5.1.orig/applet/stasks_tooltip.cpp	2009-03-21 22:37:38.000000000 +0100
+++ stasks-0.5.1/applet/stasks_tooltip.cpp	2009-07-02 02:22:43.000000000 +0200
@@ -75,6 +75,7 @@
 
 STasksToolTip::STasksToolTip(int size, QWidget *parent) : QWidget(parent)
 {
+    setAttribute(Qt::WA_TranslucentBackground);
     setWindowFlags(Qt::ToolTip);
 
     m_size = size;


Index: kde-plasma-stasks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-stasks/devel/kde-plasma-stasks.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kde-plasma-stasks.spec	29 Jun 2009 20:59:48 -0000	1.2
+++ kde-plasma-stasks.spec	6 Jul 2009 21:18:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kde-plasma-stasks
 Version:        0.5.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Alternate Task-Switcher plasma applet
 
 Group:          User Interface/Desktops
@@ -8,8 +8,7 @@ License:        GPLv2+
 URL:            http://www.kde-look.org/content/show.php/STasks?content=99739
 
 Source0:        http://www.kde-look.org/CONTENT/content-files/99739-stasks-%{version}.tar.gz
-Patch0:         kde-plasma-stasks-spacerfix.patch
-Patch1:         kde-plasma-stasks-translucent-bg.patch
+Patch0:         kde-plasma-stasks-4.3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,8 +19,7 @@ A plasmoid offering an alternate task-sw
 
 %prep
 %setup -qn stasks-%{version}
-%patch0 -p0
-%patch1 -p0
+%patch0 -p1
 find \( -name "*.cpp" -o -name "*.h" -o -name "README" -o -name "COPYING" \) -exec chmod -x {} \;
 
 %build
@@ -46,6 +44,9 @@ rm -rf %{buildroot}
 %doc COPYING README
 
 %changelog
+* Mon Jul 26 2009 Sven Lankes <sven at lank.es> 0.5.1-4
+- Really fix it for KDE 4.3
+
 * Mon Jun 29 2009 Sven Lankes <sven at lank.es> 0.5.1-3
 - Add two patches for KDE 4.3 plasma
 


--- kde-plasma-stasks-spacerfix.patch DELETED ---


--- kde-plasma-stasks-translucent-bg.patch DELETED ---

More information about the fedora-extras-commits mailing list