[gnome-games/applygsoc2009: 31/76] Trying to separate out the user-input related code

[Pablo Castellano <pablog src gnome org>]

commit 474a8ef1e4c76b1390940b8f94a4c233c27bd61d
Author: Pablo Castellano <pablog src gnome org>
Date:   Thu Aug 26 13:22:58 2010 +0200

    Trying to separate out the user-input related code
    
    * NumberSelector shouldn't keep data (View shouldn't know about data)
    * delete no-so-needed signal, thus **undo is broken**
    * rename signal
    * NumberBox shouldn't keep data neither, so i make all the signals have
       additional data. When the user makes change, simply emit a signal with the
       change.  Signal handler is free to update the View accordingly or not.
    * NumberBox only keeps self.value and self{top,bottom}_note_text.
    * only emit notes-changed signal when user presses Enter

 gnome-sudoku/src/lib/gsudoku.py    |   19 +++---
 gnome-sudoku/src/lib/main.py       |    2 +
 gnome-sudoku/src/lib/number_box.py |  110 +++++++++++++++--------------------
 3 files changed, 58 insertions(+), 73 deletions(-)
---
diff --git a/gnome-sudoku/src/lib/gsudoku.py b/gnome-sudoku/src/lib/gsudoku.py
index cbe9529..dba341b 100644
--- a/gnome-sudoku/src/lib/gsudoku.py
+++ b/gnome-sudoku/src/lib/gsudoku.py
@@ -96,12 +96,15 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
         self._setup_grid(grid, group_size)
         for e in self.__entries__.values():
             e.show()
-            e.connect('undo-change', self._entry_callback, 'undo-change')
-            e.connect('changed', self._entry_callback)
+            e.connect('number-changed', self._number_changed_cb)
+            e.connect('notes-changed', self._notes_changed_cb)
             e.connect('focus-in-event', self._focus_callback)
             e.connect('key-press-event', self._key_press_cb)
         self.connect('focus-changed', self._highlight_cells)
 
+    def _notes_changed_cb(self, box, top_note, bottom_note):
+        box.set_notes((top_note, bottom_note))
+
     def _key_press_cb (self, widget, event):
         key = gtk.gdk.keyval_name(event.keyval)
         dest = self._go_around(widget.x, widget.y, key)
@@ -418,14 +421,10 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
                     self.add_value(x, y, val)
         self.doing_initial_setup = False
 
-    def _entry_callback (self, widget, *args):
-        if not widget.get_text():
-            self.remove(widget.x, widget.y, *args)
-            # Trackers need to be redisplayed on an undo
-            if args and args[0] == 'undo-change':
-                self.show_track()
-        else:
-            self._entry_validate(widget, *args)
+    def _number_changed_cb(self, widget, new_value):
+        # TODO
+        widget.set_value(new_value)
+        self._entry_validate(widget)
 
     def update_all_hints (self):
         for x in range(self.group_size):
diff --git a/gnome-sudoku/src/lib/main.py b/gnome-sudoku/src/lib/main.py
index 8c0d41f..3a5f0b1 100644
--- a/gnome-sudoku/src/lib/main.py
+++ b/gnome-sudoku/src/lib/main.py
@@ -234,6 +234,8 @@ class UI (gconf_wrapper.GConfWrapper):
             action.connect("activate", callback)
 
     def setup_undo (self):
+	    #TODO
+		return
         self.cleared = [] # used for Undo memory
         self.cleared_notes = [] # used for Undo memory
         # Set up our UNDO stuff
diff --git a/gnome-sudoku/src/lib/number_box.py b/gnome-sudoku/src/lib/number_box.py
index 629902c..99e409f 100644
--- a/gnome-sudoku/src/lib/number_box.py
+++ b/gnome-sudoku/src/lib/number_box.py
@@ -24,11 +24,10 @@ NORMAL_LINE_WIDTH = 1 # The size of the line we draw around a box
 class _NumberSelector (gtk.EventBox):
 
     __gsignals__ = {
-        'number-selected':(gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
+        'number-selected': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (int,))
         }
 
-    def __init__ (self, default = None, upper = 9):
-        self.value = default
+    def __init__ (self, initial_value=0, upper=9):
         gtk.EventBox.__init__(self)
         self.table = gtk.Table()
         self.add(self.table)
@@ -38,7 +37,7 @@ class _NumberSelector (gtk.EventBox):
             for x in range(side):
                 b = gtk.Button()
                 l = gtk.Label()
-                if n == self.value:
+                if n == initial_value:
                     l.set_markup('<b><span size="x-small">%s</span></b>'%n)
                 else:
                     l.set_markup('<span size="x-small">%s</span>'%n)
@@ -51,7 +50,7 @@ class _NumberSelector (gtk.EventBox):
                 b.connect('clicked', self._number_clicked, n)
                 self.table.attach(b, x, x+1, y, y+1)
                 n += 1
-        if self.value:
+        if initial_value:
             clear_button = gtk.Button()
             label = gtk.Label()
             label.set_markup_with_mnemonic('<span size="x-small">'+_('_Clear')+'</span>')
@@ -62,18 +61,12 @@ class _NumberSelector (gtk.EventBox):
         self.show_all()
 
     def _number_clicked (self, button, n):
-        self.value = n
-        self.emit('number-selected')
+        self.emit('number-selected', n)
 
-    def get_value (self):
-        return self.value
-
-    def set_value (self, n):
-        self.value = n
 
 class _NumberBox (gtk.Widget):
 
-    text = ''
+    value = ''
     top_note_text = ''
     bottom_note_text = ''
     read_only = False
@@ -87,21 +80,15 @@ class _NumberBox (gtk.Widget):
     border_color = None
 
     __gsignals__ = {
-        'value-about-to-change':(gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
-        'notes-about-to-change':(gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
-        'changed':(gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
-        # undo-change - A hacky way to handle the fact that we want to
-        # respond to undo's changes but we don't want undo to respond
-        # to itself...
-        'undo-change':(gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
-        'notes-changed':(gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
+        'number-changed':(gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (int,)),
+        'notes-changed':(gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (str, str))
         }
 
     base_state = gtk.STATE_NORMAL
     npicker = None
     draw_boxes = False
 
-    def __init__ (self, upper = 9, text = ''):
+    def __init__ (self, upper=9, value=''):
         gtk.Widget.__init__(self)
         self.upper = upper
         self.parent_win = None
@@ -126,7 +113,7 @@ class _NumberBox (gtk.Widget):
         self.connect('focus-in-event', self.focus_in_cb)
         self.connect('focus-out-event', self.focus_out_cb)
         self.connect('motion-notify-event', self.motion_notify_cb)
-        self.set_text(text)
+        self.set_value(value)
 
     def set_parent_win(self, new_parent):
         self.parent_win = new_parent
@@ -221,7 +208,7 @@ class _NumberBox (gtk.Widget):
                 # change)
                 self.set_text_interactive(txt)
         elif txt in ['0', 'Delete', 'BackSpace']:
-            self.set_text_interactive('')
+            self._emit_number_changed_signal(0)
         elif txt in ['n', 'N']:
             if e.state & gtk.gdk.MOD1_MASK:
                 self.set_note_text_interactive(top_text = '')
@@ -274,6 +261,15 @@ class _NumberBox (gtk.Widget):
         if (self.timer):
             self.timer.pause_timing()
 
+    def note_changed_cb(self, entry, top, window):
+        new_text = entry.get_text()
+        window.destroy()
+        if top:
+            self.top_note_text = new_text
+        else:
+            self.bottom_note_text = new_text
+        self._emit_note_changed_signal(self.top_note_text, self.bottom_note_text)
+
     def show_note_editor (self, top = True):
         alloc = self.get_allocation()
         w = gtk.Window()
@@ -292,11 +288,10 @@ class _NumberBox (gtk.Widget):
         else:
             e.set_text(self.bottom_note_text)
         w.add(f)
-        e.connect('changed', self.note_changed_cb, top)
         e.connect('focus-in-event', self.note_focus_in)
         e.connect('focus-out-event', lambda e, ev, w: w.destroy(), w)
         e.connect('focus-out-event', self.note_focus_out)
-        e.connect('activate', lambda e, w: w.destroy(), w)
+        e.connect('activate', self.note_changed_cb, top, w)
         x, y = self.window.get_origin()
         if top:
             w.move(x, y)
@@ -305,18 +300,14 @@ class _NumberBox (gtk.Widget):
         w.show_all()
         e.grab_focus()
 
-    def number_changed_cb (self, num_selector):
+    def _number_changed_cb (self, num_selector, new_number):
         self.destroy_npicker()
-        newval = num_selector.get_value()
-        if newval:
-            self.set_text_interactive(str(newval))
-        else:
-            self.set_text_interactive('')            
+		self._emit_number_changed_signal(new_number)
 
     def show_number_picker (self):
         w = gtk.Window(type = gtk.WINDOW_POPUP)
-        ns = _NumberSelector(upper = self.upper, default = self.get_value())
-        ns.connect('number-selected', self.number_changed_cb)
+        ns = _NumberSelector(upper=self.upper, initial_value=self.get_value())
+        ns.connect('number-selected', self._number_changed_cb)
         w.grab_focus()
         w.add(ns)
         r = w.get_allocation()
@@ -329,18 +320,12 @@ class _NumberBox (gtk.Widget):
         w.show()
         self.npicker = w
 
-    def set_text_interactive (self, text):
-        self.emit('value-about-to-change')
-        self.set_text(text)
-        self.queue_draw()
-        self.emit('changed')
-
     def set_font (self, font):
         if type(font) == str:
             font = pango.FontDescription(font)
         self.font = font
-        if self.text:
-            self.set_text(self.text)
+        if self.value:
+            self.set_text(str(self.value))
         self.queue_draw()
 
     def set_note_font (self, font):
@@ -352,7 +337,6 @@ class _NumberBox (gtk.Widget):
         self.queue_draw()
 
     def set_text (self, text):
-        self.text = text
         self._layout = self.create_pango_layout(text)
         self._layout.set_font_description(self.font)
 
@@ -374,10 +358,11 @@ class _NumberBox (gtk.Widget):
             self.update_notelist(self.bottom_note_list, bottom_text, for_hint)
         self.show_note_text()
 
-    def set_note_text_interactive (self, *args, **kwargs):
-        self.emit('notes-about-to-change')
-        self.set_note_text(*args, **kwargs)
-        self.emit('notes-changed')
+    def _emit_number_changed_signal(self, new_number):
+        self.emit('number-changed', new_number)
+
+    def _emit_note_changed_signal(self, top_note, bottom_note):
+        self.emit('notes-changed', top_note, bottom_note)
 
     def set_notelist(self, top_notelist, bottom_notelist):
         '''Assign new note lists
@@ -711,13 +696,8 @@ class _NumberBox (gtk.Widget):
         self.border_color = color
         self.queue_draw()
 
-    def hide_notes (self):
-        pass
-
-    def show_notes (self):
-        pass
-
     def set_value (self, v):
+        self.value = v
         if 0 < v <= self.upper:
             self.set_text(str(v))
         else:
@@ -725,13 +705,7 @@ class _NumberBox (gtk.Widget):
         self.queue_draw()
 
     def get_value (self):
-        try:
-            return int(self.text)
-        except:
-            return None
-
-    def get_text (self):
-        return self.text
+        return self.value
 
     def get_note_text (self):
         return self.top_note_text, self.bottom_note_text
@@ -805,15 +779,25 @@ if __name__ == '__main__':
     window.connect('delete-event', gtk.main_quit)
 
     def test_number_selector ():
-        nselector = _NumberSelector(default = 3)
-        def tell_me (b):
-            print 'value->', b.get_value()
+        def tell_me (widget, new_value):
+            print 'value selected', new_value
+
+        nselector = _NumberSelector(initial_value=3)
         nselector.connect('number-selected', tell_me)
         window.add(nselector)
 
     def test_number_box ():
+        def number_changed_cb(widget, new_value):
+            print 'new-value:', new_value
+            widget.set_value(new_value)
+        def notes_changed_cb(widget, top_note, bottom_note):
+            print 'new-notes:', (top_note, bottom_note)
+            widget.set_notes((top_note, bottom_note))
+
         window.set_size_request(100, 100)
         nbox = _NumberBox()
+        nbox.connect('number-changed', number_changed_cb)
+        nbox.connect('notes-changed', notes_changed_cb)
         window.add(nbox)
 
 #    test_number_selector()