[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-usability
Subject:    [PATCH] Taskmanager popup and desktop items
From:       Nadeem Hasan <nhasan () nadmm ! com>
Date:       2002-06-10 23:17:49
[Download RAW message or body]

Hi,

This patch removes the desktop related items from task menu if there is
only one desktop. 

Ok to commit?

Cheers,
-- 
Nadeem Hasan
nhasan@nadmm.com
http://www.nadmm.com/
["taskmanager1.diff" (text/x-diff)]

? .taskrmbmenu.cpp.swp
Index: taskrmbmenu.cpp
===================================================================
RCS file: /home/kde/kdebase/kicker/taskmanager/taskrmbmenu.cpp,v
retrieving revision 1.6
diff -u -r1.6 taskrmbmenu.cpp
--- taskrmbmenu.cpp	2002/06/04 14:49:53	1.6
+++ taskrmbmenu.cpp	2002/06/10 23:10:57
@@ -71,11 +71,14 @@
 
 	id = insertItem( SmallIcon( "fileclose" ), i18n( "&Close" ), t, SLOT( close() ) );
 
-	insertSeparator();
-
-	id = insertItem( i18n("To &Desktop"), makeDesktopsMenu( t, manager ) );
-	id = insertItem( i18n( "&To Current Desktop" ), t, SLOT( toCurrentDesktop() ) );
-	setItemEnabled( id, !t->isOnCurrentDesktop() );
+	if ( manager->numberOfDesktops() > 1 )
+	{
+		insertSeparator();
+
+		id = insertItem( i18n("To &Desktop"), makeDesktopsMenu( t, manager ) );
+		id = insertItem( i18n( "&To Current Desktop" ), t, SLOT( toCurrentDesktop() ) );
+		setItemEnabled( id, !t->isOnCurrentDesktop() );
+	}
 }
 
 void TaskRMBMenu::fillMenu( TaskList* tasks, TaskManager* manager )
@@ -144,21 +147,24 @@
 	*/
 
 	insertItem( SmallIcon( "remove" ), i18n( "&Close All" ), this, SLOT( slotCloseAll() ) );
-
-	insertSeparator();
-
-	id = insertItem( i18n("All to &Desktop"), makeDesktopsMenu( tasks, manager ) );
 
-	enable = false;
-
-	id = insertItem( i18n( "All &to Current Desktop" ), this, SLOT( slotAllToCurrentDesktop() ) );
-	for( QPtrListIterator<Task> it(*tasks); *it; ++it ) {
-		if( !(*it)->isOnCurrentDesktop() ) {
-			enable = true;
-			break;
+	if ( manager->numberOfDesktops() > 1 )
+	{
+		insertSeparator();
+
+		id = insertItem( i18n("All to &Desktop"), makeDesktopsMenu( tasks, manager ) );
+
+		enable = false;
+
+		id = insertItem( i18n( "All &to Current Desktop" ), this, SLOT( slotAllToCurrentDesktop() ) );
+		for( QPtrListIterator<Task> it(*tasks); *it; ++it ) {
+			if( !(*it)->isOnCurrentDesktop() ) {
+				enable = true;
+				break;
+			}
 		}
+		setItemEnabled( id, enable );
 	}
-	setItemEnabled( id, enable );
 }
 
 QPopupMenu* TaskRMBMenu::makeDesktopsMenu( Task* t, TaskManager* manager )

_______________________________________________
kde-usability mailing list
kde-usability@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-usability

[prev in list] [next in list] [prev in thread] [next in thread]