Merge lp:~dcaro/clicompanion/fix-915606 into lp:clicompanion

[David Caro]

Added the reorderable tabs

[lp:~dcaro/clicompanion/fix-915606]

106. By David Caro "<email address hidden>" on 2012-01-12

merged from trunk

[Marek Bardoński (bdfhjk)]

Work fine.

Thank You David!

review: Approve

[David Caro (dcaro)]

You are welcome!

=== modified file 'clicompanionlib/config.py'
--- clicompanionlib/config.py	2012-01-12 08:48:49 +0000
+++ clicompanionlib/config.py	2012-01-12 20:55:28 +0000
@@ -80,6 +80,8 @@
         'close_tab': 'unused',
         'next_tab': 'unused',
         'previous_tab': 'unused',
+        'move_tab_right': 'unused',
+        'move_tab_left': 'unused',
         'toggle_fullscreen': 'F12',
         'toggle_maximize': 'F11',
         'toggle_hide_ui': 'F9',
@@ -100,6 +102,8 @@
         'close_tab': 'Close tab',
         'next_tab': 'Go to the next tab',
         'previous_tab': 'Go to the previous tab',
+        'move_tab_right': 'Move the focused tab to the right',
+        'move_tab_left': 'Move the focused tab to the left',
         'toggle_fullscreen': 'Toggle fullscreen',
         'toggle_maximize': 'Maximize',
         'toggle_hide_ui': 'Hide UI',

=== modified file 'clicompanionlib/tabs.py'
--- clicompanionlib/tabs.py	2012-01-11 20:16:12 +0000
+++ clicompanionlib/tabs.py	2012-01-12 20:55:28 +0000
@@ -326,8 +326,30 @@
         add_tab_button.set_tooltip_text(_("Click to add another tab"))
         ## create first tab
         self.append_page(gtk.Label(""), add_tab_button)
+        self.set_tab_reorderable(add_tab_button, False)
         add_tab_button.connect("clicked", lambda *x: self.add_tab())
         self.set_size_request(700, 120)
+        self.connect('page-reordered', self.check_order)
+
+    def check_order(self, notebook, child, page_num):
+        if page_num == self.get_n_pages() - 1:
+            self.reorder_child(child, self.get_n_pages() - 2)
+
+    def move_tab_right(self):
+        page = self.get_current_page()
+        child = self.get_nth_page(page)
+        if page != self.get_n_pages() - 2:
+            self.reorder_child(child, page + 1)
+        else:
+            self.reorder_child(child, 0)
+
+    def move_tab_left(self):
+        page = self.get_current_page()
+        child = self.get_nth_page(page)
+        if page == 0:
+            self.reorder_child(child, self.get_n_pages() - 2)
+        else:
+            self.reorder_child(child, page - 1)
 
     def focus(self):
         num = self.get_current_page()
@@ -359,6 +381,7 @@
         newtab.connect("preferences", lambda *x: self.emit('preferences'))
         newtab.connect("rename",
                 lambda wg, text: self.rename_tab(newtab, text))
+        self.set_tab_reorderable(newtab, True)
         self.focus()
         return newtab
 

=== modified file 'clicompanionlib/view.py'
--- clicompanionlib/view.py	2012-01-11 20:16:12 +0000
+++ clicompanionlib/view.py	2012-01-12 20:55:28 +0000
@@ -462,6 +462,12 @@
     def previous_tab(self):
         self.term_notebook.prev_tab()
 
+    def move_tab_right(self):
+        self.term_notebook.move_tab_right()
+
+    def move_tab_left(self):
+        self.term_notebook.move_tab_left()
+
     def copy(self):
         self.term_notebook.copy()
 

=== modified file 'plugins/LocalCommandList.py'
--- plugins/LocalCommandList.py	2012-01-10 21:00:04 +0000
+++ plugins/LocalCommandList.py	2012-01-12 20:55:28 +0000
@@ -24,6 +24,7 @@
 import pygtk
 pygtk.require('2.0')
 import gobject
+import collections
 
 try:
     import gtk
@@ -346,7 +347,7 @@
             orig = [fld.strip() for fld in orig]
             # fill the empty fields
             if len(orig) < 3:
-                orig = orig + ('', ) * (3 - len(orig))
+                orig = list(orig) + ['', ] * (3 - len(orig))
             dbg('Got drop of command %s' % '_\t_'.join(orig))
 
             if drop_info:
@@ -359,9 +360,8 @@
                     self.cmnds.drag_n_drop(orig, dest, before=False)
             else:
                 dbg('\t to the end')
-                self.cmnds[len(cmnds)] = orig
-        if context.action == gtk.gdk.ACTION_MOVE:
-            context.finish(True, True, etime)
+                self.cmnds[len(self.cmnds)] = orig
+        context.finish(True, True, time)
         self.sync_cmnds()
 
     def main(self):