[gnome-games/applygsoc2009: 47/76] XXX: Refactor trackerbox a little



commit a8a97e55b1ce1fd985c6c0b4263aa25382ab0d77
Author: Pablo Castellano <pablog src gnome org>
Date:   Thu Aug 26 16:34:45 2010 +0200

    XXX: Refactor trackerbox a little

 gnome-sudoku/src/lib/main.py        |    6 +++---
 gnome-sudoku/src/lib/tracker_box.py |   17 ++++++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/gnome-sudoku/src/lib/main.py b/gnome-sudoku/src/lib/main.py
index a83322b..cb95593 100644
--- a/gnome-sudoku/src/lib/main.py
+++ b/gnome-sudoku/src/lib/main.py
@@ -553,11 +553,11 @@ class UI (gconf_wrapper.GConfWrapper):
                 self.tinfo.set_tracker_view(self.old_tracker_view)
                 self.tracker_ui.select_tracker(self.tinfo.current_tracker)
                 self.gsd.show_track()
-            self.tracker_ui.show_all()
+            self._tracker.show()
         else:
             self.old_tracker_view = self.tinfo.get_tracker_view()
-            self.tracker_ui.hide_tracker_cb(None)
-            self.tracker_ui.hide()
+            self._tracker.hide_tracker_cb(None)
+            self._tracker.hide()
 
     def toggle_toolbar_cb (self, widg):
         if widg.get_active():
diff --git a/gnome-sudoku/src/lib/tracker_box.py b/gnome-sudoku/src/lib/tracker_box.py
index a4fbd4b..36c6543 100644
--- a/gnome-sudoku/src/lib/tracker_box.py
+++ b/gnome-sudoku/src/lib/tracker_box.py
@@ -45,15 +45,16 @@ def _pixbuf_transform_color(pixbuf, color):
 
 class TrackerBox (gtk.VBox):
 
-    def __init__ (self, main_ui):
+    def __init__ (self, controller):
 
         gtk.VBox.__init__(self)
         self.builder = gtk.Builder()
         self.builder.set_translation_domain(DOMAIN)
         self.builder.add_from_file(os.path.join(UI_DIR, 'tracker.ui'))
-        self._tracker_model = TrackerModel(main_ui)
+        self._tracker_model = TrackerModel(main_ui) ##???
         self.tinfo = tracker_info.TrackerInfo()
         self.tinfo.ui = self
+        self._view_controller = controller
         self.vb = self.builder.get_object('vbox1')
         self.vb.unparent()
         self.pack_start(self.vb, expand = True, fill = True)
@@ -308,7 +309,8 @@ class TrackerModel:
         self._sudoku_view = sudoku_view
         self._trackers = {}
         self.__trackers_tracking__ = {}
-
+        self._tracker_box_view = TrackerBox(self)
+        
         sudoku_view.connect("view-updated", self._view_updated_cb)
 
     def _view_updated_cb(self, view, x, y, value):
@@ -361,3 +363,12 @@ class TrackerModel:
         entries = self._trackers[identifier][:]
         for (x, y) in entries:
             self._sudoku_view.update_model(x, y, 0)
+            
+    def get_view(self):
+        return self._tracker_box_view
+
+    def hide(self):
+        self._tracker_box_view.hide()
+
+    def show(self):
+        self._tracker_box_view.show_all()



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]