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

[David Caro]

Just added the two shorcuts to the list of shorcuts.

[Marek Bardoński (bdfhjk)]

Work fine.

I'm curious why did You deleted some lines regarding drag'n'drop, but it stil work.

Could You, David, look at a bug which I discovered testing d'n'd:

"""
Traceback (most recent call last):
  File "/usr/local/lib/python2.7/dist-packages/plugins/LocalCommandList.py", line 356, in drag_data_received_event
    self.cmnds.drag_n_drop(orig, dest, before=True)
  File "/usr/local/lib/python2.7/dist-packages/plugins/LocalCommandList.py", line 599, in drag_n_drop
    i2 = self.commands.index(cmd2)
ValueError: ['dpkg -l ?', 'package', 'Find version of a package'] is not in list
/usr/local/lib/python2.7/dist-packages/clicompanionlib/view.py:524: GtkWarning: IA__gtk_tree_drag_dest_drag_data_received: assertion `iface->drag_data_received != NULL' failed
  gtk.main()

"""

I will occur when You drop command over the list.

review: Approve

[David Caro (dcaro)]

The lines deleted for the drag and drop where moved before to another module (from view to LocalCommandList), so they were not needed anymore there.

The bug should be fixed now,

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

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

fixed error when dropping text from another program

=== modified file 'clicompanionlib/config.py'
--- clicompanionlib/config.py	2012-01-09 09:17:27 +0000
+++ clicompanionlib/config.py	2012-01-09 10:51:28 +0000
@@ -78,6 +78,8 @@
         'edit_command': 'unused',
         'add_tab': 'F7',
         'close_tab': 'unused',
+        'next_tab': 'unused',
+        'previous_tab': 'unused',
         'toggle_fullscreen': 'F12',
         'toggle_maximize': 'F11',
         'toggle_hide_ui': 'F9',
@@ -94,6 +96,8 @@
         'edit_command': 'Edit command',
         'add_tab': 'Add tab',
         'close_tab': 'Close tab',
+        'next_tab': 'Go to the next tab',
+        'previous_tab': 'Go to the previous tab',
         'toggle_fullscreen': 'Toggle fullscreen',
         'toggle_maximize': 'Maximize',
         'toggle_hide_ui': 'Hide UI',

=== modified file 'clicompanionlib/tabs.py'
--- clicompanionlib/tabs.py	2012-01-08 00:48:43 +0000
+++ clicompanionlib/tabs.py	2012-01-09 10:51:28 +0000
@@ -391,6 +391,18 @@
         if self.get_n_pages() != 1:
             self.focus()
 
+    def next_tab(self):
+        if self.get_current_page() == self.get_n_pages() - 2:
+            self.set_current_page(0)
+        else:
+            self.next_page()
+
+    def prev_tab(self):
+        if self.get_current_page() == 0:
+            self.set_current_page(self.get_n_pages() - 2)
+        else:
+            self.prev_page()
+
     def quit_tab(self, tab=None):
         if not tab:
             tab = self.get_nth_page(self.get_current_page())

=== modified file 'clicompanionlib/view.py'
--- clicompanionlib/view.py	2012-01-08 00:48:43 +0000
+++ clicompanionlib/view.py	2012-01-09 10:51:28 +0000
@@ -332,20 +332,6 @@
                     self.cmd_notebook.get_command()[0]).run())
         self.button_box.connect('add_tab',
                 lambda *x: self.term_notebook.add_tab())
-        ## right click menu event capture
-        # Allow enable drag and drop of rows including row move
-#        self.treeview.enable_model_drag_source( gtk.gdk.BUTTON1_MASK,
-#                                                TARGETS,
-#                                                gtk.gdk.ACTION_DEFAULT |
-#                                                gtk.gdk.ACTION_COPY)
-#        self.treeview.enable_model_drag_dest(TARGETS,
-#                                                gtk.gdk.ACTION_DEFAULT)
-#
-#        self.treeview.connect ("drag_data_get", self.drag_data_get_event)
-#        self.treeview.connect ("drag_data_received",
-#                self.drag_data_received_event)
-#        self.treeview.connect("drag_drop", self.on_drag_drop )
-
         ## show everything
         self.show_all()
         ## set the focus on the terminal
@@ -468,6 +454,12 @@
     def close_tab(self):
         self.term_notebook.quit_tab()
 
+    def next_tab(self):
+        self.term_notebook.next_tab()
+
+    def previous_tab(self):
+        self.term_notebook.prev_tab()
+
     def toggle_hide_ui(self):
         if self.hiddenui:
             self.show_ui()
@@ -478,15 +470,19 @@
         if self.hiddenui:
             return
         dbg('Hide UI')
+        self.set_border_width(0)
         self.l_vbox.remove(self.term_notebook)
         self.remove(self.vpane)
         self.add(self.term_notebook)
         self.hiddenui = True
+        ## set the focus on the terminal
+        self.term_notebook.focus()
 
     def show_ui(self):
         if not self.hiddenui:
             return
         dbg('Show UI')
+        self.set_border_width(5)
         self.remove(self.term_notebook)
         btns = self.l_vbox.get_children()[0]
         self.l_vbox.remove(btns)
@@ -494,12 +490,16 @@
         self.l_vbox.pack_start(btns, False, False, 0)
         self.add(self.vpane)
         self.hiddenui = False
+        ## set the focus on the terminal
+        self.term_notebook.focus()
 
     def toggle_maximize(self):
         if not self.maximized:
             self.maximize()
         else:
             self.unmaximize()
+        ## set the focus on the terminal
+        self.term_notebook.focus()
         self.maximized = not self.maximized
 
     def toggle_fullscreen(self):
@@ -516,70 +516,8 @@
             self.unfullscreen()
             self.set_border_width(5)
         self.fullscr = not self.fullscr
-
-    ### TODO: pass these functions to the LocalCommandList class
-    def on_drag_drop(self, treeview, *x):
-        '''
-        Stop the signal when in search mode
-        '''
-        if self.FILTER:
-            treeview.stop_emission('drag_drop')
-
-    def drag_data_get_event(self, treeview, context, selection, target_id,
-                            etime):
-        """
-        Executed on dragging
-        """
-        treeselection = treeview.get_selection()
-        model, iter = treeselection.get_selected()
-        data = model.get(iter, 0, 1, 2)
-        selection.set(selection.target, 8, '\t'.join(data))
-
-    def drag_data_received_event(self, treeview, context, x, y, selection,
-            info, etime):
-        """
-        Executed when dropping.
-        """
-        global CMNDS
-        ## if we are in a search, do nothing
-        if self.FILTER == 1:
-            return
-        model = treeview.get_model()
-        ## get the destination
-        drop_info = treeview.get_dest_row_at_pos(x, y)
-        if drop_info:
-            path, position = drop_info
-            iter = model.get_iter(path)
-            dest = list(model.get(iter, 0, 1, 2))
-
-        ## parse all the incoming commands
-        for data in selection.data.split('\n'):
-            # if we got an empty line skip it
-            if not data.replace('\r', ''):
-                continue
-            # format the incoming string
-            orig = data.replace('\r', '').split('\t', 2)
-            orig = [fld.strip() for fld in orig]
-            # fill the empty fields
-            if len(orig) < 3:
-                orig = orig + ('', ) * (3 - len(orig))
-            dbg('Got drop of command %s' % '_\t_'.join(orig))
-
-            if drop_info:
-                if (position == gtk.TREE_VIEW_DROP_BEFORE
-                        or position == gtk.TREE_VIEW_DROP_INTO_OR_BEFORE):
-                    dbg('\t to before dest %s' % '_\t_'.join(dest))
-                    CMNDS.drag_n_drop(orig, dest, before=True)
-                else:
-                    dbg('\t to after dest %s' % '_\t_'.join(dest))
-                    CMNDS.drag_n_drop(orig, dest, before=False)
-            else:
-                dbg('\t to the end')
-                CMNDS[len(CMNDS)] = orig
-        if context.action == gtk.gdk.ACTION_MOVE:
-            context.finish(True, True, etime)
-        self.sync_cmnds()
-        CMNDS.save()
+        ## set the focus on the terminal
+        self.term_notebook.focus()
 
     def main(self):
         try: