Add menu items to rearrange taskbar entries

Make taskbar drag and drop moving more robust
This resolves Bug 1103

1 files changed, 10 insertions, 1 deletions

diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp
index c910c5f9d..f92719f47 100644
--- a/kicker/taskmanager/taskrmbmenu.cpp
+++ b/kicker/taskmanager/taskrmbmenu.cpp
@@ -38,10 +38,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "taskrmbmenu.h"
 #include "taskrmbmenu.moc"
 
-TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, TQWidget *parent, const char *name)
+TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, TQPopupMenu* moveMenu, TQWidget *parent, const char *name)
 	: TQPopupMenu( parent, name )
 	, tasks( theTasks )
 	, showAll( show )
+	, taskMoveMenu( moveMenu )
 {
     assert(tasks.count() > 0);
     if (tasks.count() == 1)
@@ -57,6 +58,7 @@ TaskRMBMenu::TaskRMBMenu(const Task::List& theTasks, bool show, TQWidget *parent
 TaskRMBMenu::TaskRMBMenu(Task::Ptr task, bool show, TQWidget *parent, const char *name)
 	: TQPopupMenu( parent, name )
 	, showAll( show )
+	, taskMoveMenu( NULL )
 {
 	fillMenu(task);
 }
@@ -106,6 +108,13 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
 
     insertSeparator();
 
+    if (taskMoveMenu) {
+        taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), FALSE);
+        insertItem(i18n("Move Task Button"), taskMoveMenu);
+
+        insertSeparator();
+    }
+
     id = insertItem(SmallIcon("fileclose"), i18n("&Close"), t, TQT_SLOT(close()));
     setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionClose));
 }