Ticket #3105: spin-undo-list-test.patch

Area.py

@@ -796 +796 @@
         logging.debug('Area.undo(self)')
         width, height = self.window.get_size()
 
+        logging.debug('self._undo_list: (%s) %s',
+                      len(self._undo_list),
+                      self._undo_list)
+        logging.debug('self._undo_index: %s', self._undo_index)
+
         if self.selmove:
             self.getout(undo=True)
 
@@ -814 +819 @@
         if self.tool['name'] == 'freeform':
                 self.polygon_start = True  # start the polygon again
 
+        logging.debug('self._undo_list: (%s) %s',
+                      len(self._undo_list),
+                      self._undo_list)
+        logging.debug('self._undo_index: %s', self._undo_index)
+
         self.emit('undo')
 
     def redo(self):
@@ -824 +834 @@
         logging.debug('Area.redo(self)')
         width, height = self.window.get_size()
 
+        logging.debug('self._undo_list: (%s) %s',
+                      len(self._undo_list),
+                      self._undo_list)
+        logging.debug('self._undo_index: %s', self._undo_index)
+
         if self.selmove:
             self.getout()
 
         if self._undo_index < len(self._undo_list) - 1:
+        # if self._undo_index < MAX_UNDO_STEPS:
             self._undo_index += 1
 
         undo_pix = self._undo_list[self._undo_index]
         self.pixmap.draw_drawable(self.gc, undo_pix, 0, 0, 0, 0, -1, -1)
         self.queue_draw()
 
+        logging.debug('self._undo_list: (%s) %s',
+                      len(self._undo_list),
+                      self._undo_list)
+        logging.debug('self._undo_index: %s', self._undo_index)
+
         self.emit('redo')
 
     def enableUndo(self, widget, size=None, overrite=False):
@@ -845 +866 @@
         """
         #logging.debug('Area.enableUndo(self,widget)')
 
+        logging.debug('self._undo_list: (%s) %s',
+                      len(self._undo_list),
+                      self._undo_list)
+        logging.debug('self._undo_index: %s', self._undo_index)
+
         width, height = self.window.get_size()
         # We need to pass explicitly the size on set up, because the
         # window size is not allocated yet.
@@ -854 +880 @@
         if len(self._undo_list) == 0:
             # first undo pix, start index:
             self._undo_index = 0
+            logging.debug('self._undo_list: empty')
         elif len(self._undo_list) == MAX_UNDO_STEPS:
             # drop the oldest undo pix:
             self._undo_list.pop(0)
 
+            logging.debug('self._undo_list: MAX_UNDO_STEPS')
+
             # it could be at the middle of the list (clicked many
             # times undo) and after that draw anything, so we should
             # discart the next redos because they are obsolete now.
             self._undo_list = self._undo_list[:self._undo_index]
         else:
             self._undo_index += 1
+
+            logging.debug('self._undo_list: common case')
+
             # Forget the redos after this one:
             self._undo_list = self._undo_list[:self._undo_index]
 
@@ -879 +911 @@
 
         self._undo_list.append(undo_pix)
 
+        logging.debug('self._undo_list: (%s) %s',
+                      len(self._undo_list),
+                      self._undo_list)
+        logging.debug('self._undo_index: %s', self._undo_index)
+
         self.emit('action-saved')
 
+    def spin_undo(self, value):
+        logging.debug('VALUE: %s', value)
+        undo_pix = self._undo_list[value]
+        self.pixmap.draw_drawable(self.gc, undo_pix, 0, 0, 0, 0, -1, -1)
+        self.queue_draw()
+
     def copy(self):
         """ Copy Image.
             When the tool selection is working make the change

toolbox.py

@@ -168 +168 @@
         self._clear_all.set_tooltip(_('Clear'))
         self._clear_all.show()
 
+        self._spin_undo_list = gtk.SpinButton()
+        adj = gtk.Adjustment(0, 0, 11, 1)
+        self._spin_undo_list.set_adjustment(adj)
+        self._spin_undo_list.set_numeric(True)
+        self._spin_undo_list.connect('notify::value',
+                                     self._spin_undo_changed_cb)
+        self._spin_undo_list.show()
+
+        item = gtk.ToolItem()
+        item.add(self._spin_undo_list)
+        item.show()
+
+        self.insert(item, -1)
+
         self.undo.connect('clicked', self._undo_cb)
         self.redo.connect('clicked', self._redo_cb)
 
@@ -181 +195 @@
         self._activity.area.connect('action-saved',
             self._on_signal_action_saved_cb)
 
+    def _spin_undo_changed_cb(self, *args, **kwargs):
+        self._activity.area.spin_undo(self._spin_undo_list.get_value_as_int())
+
     def _undo_cb(self, widget, data=None):
         self._activity.area.undo()