TCC khotkeys: added 'move up' and 'move down' buttons to 'Actions' and 'Conditions' listviews for input actions.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 5e4ca4df9b)

khotkeys/kcontrol/action_list_widget.cpp

@@ -62,16 +62,13 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P )
              this, TQT_SLOT( modify_pressed() ) );
 
     // KHotKeys::Module::changed()
-    connect( new_button, TQT_SIGNAL( clicked()),
+    connect(new_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-        module, TQT_SLOT( changed()));
+    connect(copy_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect( copy_button, TQT_SIGNAL( clicked()),
+    connect(modify_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-        module, TQT_SLOT( changed()));
+    connect(delete_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect( modify_button, TQT_SIGNAL( clicked()),
+    connect(move_up_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-        module, TQT_SLOT( changed()));
+    connect(move_down_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect( delete_button, TQT_SIGNAL( clicked()),
+    connect(comment_lineedit, TQT_SIGNAL(textChanged(const TQString&)), module, TQT_SLOT(changed()));
-        module, TQT_SLOT( changed()));
-    connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
     }
 
 Action_list_widget::~Action_list_widget()
@@ -189,6 +186,42 @@ void Action_list_widget::modify_pressed()
     edit_listview_item( selected_item );
     }
 
+void Action_list_widget::move_up_pressed()
+    {
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Action_list_item *prevItem = nullptr;
+    TQListViewItem *currItem = actions_listview->firstChild();
+    while (currItem != selected_item)
+        {
+        prevItem = static_cast< Action_list_item* >(currItem);
+        currItem = currItem->nextSibling();
+        }
+    if (prevItem)
+        {
+        prevItem->moveItem(selected_item);
+        current_changed(selected_item);
+        }
+    }
+
+void Action_list_widget::move_down_pressed()
+    {
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Action_list_item *nextItem = static_cast< Action_list_item* >(selected_item->nextSibling());
+    if (nextItem)
+        {
+        selected_item->moveItem(nextItem);
+        current_changed(selected_item);
+        }
+    }
+
 void Action_list_widget::current_changed( TQListViewItem* item_P )
     {
 //    if( item_P == selected_item )
@@ -198,6 +231,8 @@ void Action_list_widget::current_changed( TQListViewItem* item_P )
     copy_button->setEnabled( item_P != NULL );
     modify_button->setEnabled( item_P != NULL );
     delete_button->setEnabled( item_P != NULL );
+    move_up_button->setEnabled(selected_item != actions_listview->firstChild());
+    move_down_button->setEnabled(selected_item != actions_listview->lastChild());
     }
 
 Action_list_item* Action_list_widget::create_listview_item( Action* action_P,

khotkeys/kcontrol/action_list_widget.h

@@ -53,6 +53,8 @@ class Action_list_widget
         virtual void copy_pressed();
         virtual void delete_pressed();
         virtual void modify_pressed();
+        virtual void move_up_pressed();
+        virtual void move_down_pressed();
         virtual void current_changed( TQListViewItem* item_P );
     protected:
         Action_list_item* selected_item;

khotkeys/kcontrol/condition_list_widget.cpp

@@ -62,18 +62,18 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na
     copy_button->setEnabled( false );
     modify_button->setEnabled( false );
     delete_button->setEnabled( false );
+    move_up_button->setEnabled( false );
+    move_down_button->setEnabled( false );
     clear_data();
     // KHotKeys::Module::changed()
-    connect( new_button, TQT_SIGNAL( clicked()),
+    connect(new_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-        module, TQT_SLOT( changed()));
+    connect(copy_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect( copy_button, TQT_SIGNAL( clicked()),
+    connect(modify_button, TQT_SIGNAL(clicked()), module, TQT_SLOT( changed()));
-        module, TQT_SLOT( changed()));
+    connect(delete_button, TQT_SIGNAL(clicked()), module, TQT_SLOT( changed()));
-    connect( modify_button, TQT_SIGNAL( clicked()),
+    connect(move_up_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-        module, TQT_SLOT( changed()));
+    connect(move_down_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed()));
-    connect( delete_button, TQT_SIGNAL( clicked()),
+    connect(comment_lineedit, TQT_SIGNAL(textChanged(const TQString&)),
-        module, TQT_SLOT( changed()));
+            module, TQT_SLOT(changed()));
-    connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )),
-        module, TQT_SLOT( changed()));
     }
 
 Condition_list_widget::~Condition_list_widget()
@@ -256,6 +256,42 @@ void Condition_list_widget::modify_pressed()
     edit_listview_item( selected_item );
     }
 
+void Condition_list_widget::move_up_pressed()
+    {
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Condition_list_item *prevItem = nullptr;
+    TQListViewItem *currItem = conditions_listview->firstChild();
+    while (currItem != selected_item)
+        {
+        prevItem = static_cast< Condition_list_item* >(currItem);
+        currItem = currItem->nextSibling();
+        }
+    if (prevItem)
+        {
+        prevItem->moveItem(selected_item);
+        current_changed(selected_item);
+        }
+    }
+
+void Condition_list_widget::move_down_pressed()
+    {
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Condition_list_item *nextItem = static_cast< Condition_list_item* >(selected_item->nextSibling());
+    if (nextItem)
+        {
+        selected_item->moveItem(nextItem);
+        current_changed(selected_item);
+        }
+    }
+
 void Condition_list_widget::current_changed( TQListViewItem* item_P )
     {
 //    if( item_P == selected_item )
@@ -277,6 +313,8 @@ void Condition_list_widget::current_changed( TQListViewItem* item_P )
         }
     else
         modify_button->setEnabled( false );
+    move_up_button->setEnabled(selected_item != conditions_listview->firstChild());
+    move_down_button->setEnabled(selected_item != conditions_listview->lastChild());
     }
 
 Condition_list_item* Condition_list_widget::create_listview_item( Condition* condition_P,

khotkeys/kcontrol/condition_list_widget.h

@@ -48,6 +48,8 @@ class Condition_list_widget
         virtual void copy_pressed();
         virtual void delete_pressed();
         virtual void modify_pressed();
+        virtual void move_up_pressed();
+        virtual void move_down_pressed();
         virtual void current_changed( TQListViewItem* item_P );
     private:
         void insert_listview_items( const Condition_list_base* parent_P,

khotkeys/kcontrol/ui/action_list_widget_ui.ui

@@ -97,6 +97,22 @@
                                 <string>Delete</string>
                             </property>
                         </widget>
+                        <widget class="TQPushButton">
+                            <property name="name">
+                                <cstring>move_up_button</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Move &amp;up</string>
+                            </property>
+                        </widget>
+                        <widget class="TQPushButton">
+                            <property name="name">
+                                <cstring>move_down_button</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Move &amp;down</string>
+                            </property>
+                        </widget>
                     </vbox>
                 </widget>
             </hbox>
@@ -147,6 +163,18 @@
         <receiver>Action_list_widget_ui</receiver>
         <slot>delete_pressed()</slot>
     </connection>
+    <connection>
+        <sender>move_up_button</sender>
+        <signal>clicked()</signal>
+        <receiver>Action_list_widget_ui</receiver>
+        <slot>move_up_pressed()</slot>
+    </connection>
+    <connection>
+        <sender>move_down_button</sender>
+        <signal>clicked()</signal>
+        <receiver>Action_list_widget_ui</receiver>
+        <slot>move_down_pressed()</slot>
+    </connection>
     <connection>
         <sender>actions_listview</sender>
         <signal>current_changed(TQListViewItem*)</signal>
@@ -162,6 +190,8 @@
     <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
+    <slot access="protected" specifier="pure virtual">move_up_pressed()</slot>
+    <slot access="protected" specifier="pure virtual">move_down_pressed()</slot>
 </Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>

khotkeys/kcontrol/ui/condition_list_widget_ui.ui

@@ -94,7 +94,23 @@
                                 <cstring>delete_button</cstring>
                             </property>
                             <property name="text">
-                                <string>Delete</string>
+                                <string>D&amp;elete</string>
+                            </property>
+                        </widget>
+                        <widget class="TQPushButton">
+                            <property name="name">
+                                <cstring>move_up_button</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Move &amp;up</string>
+                            </property>
+                        </widget>
+                        <widget class="TQPushButton">
+                            <property name="name">
+                                <cstring>move_down_button</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Move &amp;down</string>
                             </property>
                         </widget>
                     </vbox>
@@ -146,6 +162,18 @@
         <receiver>Condition_list_widget_ui</receiver>
         <slot>delete_pressed()</slot>
     </connection>
+    <connection>
+        <sender>move_up_button</sender>
+        <signal>clicked()</signal>
+        <receiver>Condition_list_widget_ui</receiver>
+        <slot>move_up_pressed()</slot>
+    </connection>
+    <connection>
+        <sender>move_down_button</sender>
+        <signal>clicked()</signal>
+        <receiver>Condition_list_widget_ui</receiver>
+        <slot>move_down_pressed()</slot>
+    </connection>
     <connection>
         <sender>conditions_listview</sender>
         <signal>current_changed(TQListViewItem*)</signal>
@@ -161,6 +189,8 @@
     <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
+    <slot access="protected" specifier="pure virtual">move_up_pressed()</slot>
+    <slot access="protected" specifier="pure virtual">move_down_pressed()</slot>
 </Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>