[gnome-games/applygsoc2009: 49/76] Use NumberBoxModel again, instead of a list



commit be2cfd96f63f3d737ffa329764cf8de027be9eec
Author: Pablo Castellano <pablog src gnome org>
Date:   Wed Sep 1 04:01:24 2010 +0200

    Use NumberBoxModel again, instead of a list

 gnome-sudoku/src/lib/model.py |    7 +++----
 gnome-sudoku/src/lib/view.py  |    4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/gnome-sudoku/src/lib/model.py b/gnome-sudoku/src/lib/model.py
index 3eddf25..65de735 100644
--- a/gnome-sudoku/src/lib/model.py
+++ b/gnome-sudoku/src/lib/model.py
@@ -232,7 +232,6 @@ class SudokuModel:
             self.__entries__[coord].set_error_highlight(True)
 
     def set_value(self, x, y, value):
-        result = []
         old_conflicts = self._remove_old_conficts (x, y)
         new_conflicts = []
 
@@ -248,7 +247,7 @@ class SudokuModel:
 				new_conflicts = self._find_new_conflicts(x, y, value)
 
         flag = True if new_conflicts else False
-        result.append(NumberBoxModel(x, y, value, conflict=flag))
+        result = [NumberBoxModel(x, y, value=value, conflict=flag)]
         result.extend(old_conflicts)
         result.extend(new_conflicts)
 
@@ -262,7 +261,7 @@ class SudokuModel:
         result = []
         old_conflicts = self._remove_related_conflicts(x, y)
         for entry in old_conflicts:
-            change = NumberBoxModel(x=entry[0], y=entry[1], conflict=False)
+            change = NumberBoxModel(entry[0], entry[1], conflict=False)
             result.append(change)
         return result
 
@@ -272,7 +271,7 @@ class SudokuModel:
         if new_conflicts:
             self.__error_pairs__[(x, y)] = new_conflicts
         for entry in new_conflicts:
-            change = NumberBoxModel(x=entry[0], y=entry[1], conflict=True)
+            change = NumberBoxModel(entry[0], entry[1], conflict=True)
             result.append(change)
         return result
 
diff --git a/gnome-sudoku/src/lib/view.py b/gnome-sudoku/src/lib/view.py
index ec68c32..8d38cf0 100644
--- a/gnome-sudoku/src/lib/view.py
+++ b/gnome-sudoku/src/lib/view.py
@@ -132,8 +132,8 @@ class SudokuView (SudokuNumberGrid, gobject.GObject):
     def puzzle_finished_cb(self):
         self.emit("puzzle-finished")
 
-    def _show_conflict(self, x, y, conflict):
-        self.__entries__[(x, y)].set_error_highlight(conflict)
+    def _show_conflict(self, x, y, flag):
+        self.__entries__[(x, y)].set_error_highlight(flag)
         
     def update_notes(self, notes_list):
         for notes in notes_list:



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