[gnome-games/applygsoc2009] fixes..

[Pablo Castellano <pablog src gnome org>]

commit f93cfcd5f243f00151234dafc14943343a45b392
Author: Pablo Castellano <pablog src gnome org>
Date:   Wed Sep 8 18:05:53 2010 +0200

    fixes..

 gnome-sudoku/src/lib/main.py |   33 ++++++++-------------------------
 1 files changed, 8 insertions(+), 25 deletions(-)
---
diff --git a/gnome-sudoku/src/lib/main.py b/gnome-sudoku/src/lib/main.py
index 30e211e..d354487 100644
--- a/gnome-sudoku/src/lib/main.py
+++ b/gnome-sudoku/src/lib/main.py
@@ -164,7 +164,7 @@ class SudokuGame (gconf_wrapper.GConfWrapper):
         """Properly do the setup after entering game
 
         Like show highlight, update hints, start timer, etc."""
-#        self._main_grid_vew.connect_to_notes_model(self._notes_model) #FIXME
+        self._main_grid_vew.connect_to_notes_model(self._notes_model)
         self._main_model.connect('puzzle-finished', self._puzzle_finished_cb)
         self.timer.start_timing()
 #        self.update_statusbar() #FIXME
@@ -208,17 +208,15 @@ class SudokuGame (gconf_wrapper.GConfWrapper):
         self.initialize_prefs()
         self.setup_main_window()
         self.setup_undo()
-        self.gsd = gsudoku.SudokuGameDisplay() #?
-        self.gsd.set_parent_for(self.w) #?
-#        self.gsd.connect('puzzle-finished', self.you_win_callback) #?
+        self._setup_main_boxes()
+
+        self.setup_tracker_interface() #?
+
         self.setup_color()
         self._setup_actions()
-        return
         self.setup_autosave()
+        return
 #        self.w.add_accel_group(self.uimanager.get_accel_group())
-        self._setup_main_boxes()
-        self.setup_tracker_interface()
-        self.setup_toggles()
 
     def initialize_prefs (self):
         for k, v in self.initial_prefs.items():
@@ -253,8 +251,8 @@ class SudokuGame (gconf_wrapper.GConfWrapper):
     def setup_color (self):
         # setup background colors
         bgcol = self.gconf['bg_color']
-        #if bgcol != '':
-        #    self._main_grid_vew.set_bg_color(bgcol) #FIXME
+        if bgcol != '':
+            self._main_grid_vew.set_bg_color (bgcol)
 
     def _setup_actions (self):
         toggle_actions = [
@@ -312,21 +310,6 @@ class SudokuGame (gconf_wrapper.GConfWrapper):
         gobject.timeout_add_seconds(self.gconf['auto_save_interval'] or 60, # in seconds...
                             self.autosave)
 
-    def setup_toggles (self):
-        # sync up toggles with gconf values...
-        map(lambda tpl: self.gconf_wrap_toggle(*tpl),
-            [('always_show_hints',
-              self.builder.get_object('AlwaysShowPossible')),
-             ('show_impossible_implications',
-              self.builder.get_object('ShowImpossibleImplications')),
-             ('show_toolbar',
-              self.builder.get_object('ToggleToolbar')),
-             ('highlight',
-              self.builder.get_object('ToggleHighlight')),
-             ('show_tracker',
-              self.builder.get_object('ToggleTracker')),
-             ])
-
     def start_worker_thread (self):
         n_new_puzzles = self.sudoku_maker.n_puzzles(new = True)
         try: