[gnome-games/applygsoc2009] set_is_important changed to ui



commit 5d6d7ed312cae5bcb093396231c8d931155aa376
Author: Pablo Castellano <pablog src gnome org>
Date:   Wed Sep 8 18:14:18 2010 +0200

    set_is_important changed to ui

 gnome-sudoku/data/main.ui    |  190 ++++++++++++++++++++++--------------------
 gnome-sudoku/src/lib/main.py |    5 -
 2 files changed, 99 insertions(+), 96 deletions(-)
---
diff --git a/gnome-sudoku/data/main.ui b/gnome-sudoku/data/main.ui
index 401f6e1..3e6aadc 100644
--- a/gnome-sudoku/data/main.ui
+++ b/gnome-sudoku/data/main.ui
@@ -1,12 +1,99 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
+  <object class="GtkToggleAction" id="ToggleHighlight">
+    <property name="label">_Highlighter</property>
+    <property name="tooltip">Highlight the current row, column and box</property>
+    <property name="stock_id">gtk-select-color</property>
+  </object>
+  <object class="GtkToggleAction" id="ToggleToolbar">
+    <property name="label">Show _Toolbar</property>
+    <property name="active">True</property>
+  </object>
+  <object class="GtkToggleAction" id="ToggleTracker">
+    <property name="label">_Track additions</property>
+    <property name="tooltip">Mark new additions in a separate color so you can keep track of them</property>
+    <property name="icon_name">trackers</property>
+  </object>
+  <object class="GtkToggleAction" id="ShowImpossibleImplications">
+    <property name="label">Warn about _unfillable squares</property>
+    <property name="tooltip">Warn about squares made unfillable by a move</property>
+    <property name="active">True</property>
+  </object>
+  <object class="GtkToggleAction" id="AlwaysShowPossible">
+    <property name="label">_Always show hint</property>
+    <property name="tooltip">Always show possible numbers in a square</property>
+  </object>
+  <object class="GtkAction" id="Redo">
+    <property name="label">_Redo</property>
+    <property name="tooltip">Redo last action</property>
+    <property name="stock_id">gtk-redo</property>
+  </object>
+  <object class="GtkAction" id="Undo">
+    <property name="label">_Undo</property>
+    <property name="tooltip">Undo last action</property>
+    <property name="stock_id">gtk-undo</property>
+  </object>
+  <object class="GtkAction" id="ShowHelp">
+    <property name="label">_Contents</property>
+    <property name="stock_id">gtk-help</property>
+  </object>
+  <object class="GtkAction" id="About">
+    <property name="label">About</property>
+    <property name="stock_id">gtk-about</property>
+  </object>
+  <object class="GtkAction" id="PuzzleInfo">
+    <property name="label">Puzzle _Statistics</property>
+    <property name="tooltip">Show statistics about current puzzle</property>
+    <property name="stock_id">gtk-about</property>
+  </object>
+  <object class="GtkAction" id="FullScreen">
+    <property name="label">FullScreen</property>
+    <property name="stock_id">gtk-fullscreen</property>
+  </object>
+  <object class="GtkAction" id="ClearBottomNotes">
+    <property name="label">Clear _Bottom Notes</property>
+    <property name="tooltip">Clear all of the bottom notes</property>
+  </object>
+  <object class="GtkAction" id="ClearTopNotes">
+    <property name="label">Clear _Top Notes</property>
+    <property name="tooltip">Clear all of the top notes</property>
+  </object>
+  <object class="GtkAction" id="ShowPossible">
+    <property name="label">Hint</property>
+    <property name="tooltip">Show which numbers could go in the current square</property>
+    <property name="stock_id">gtk-dialog-info</property>
+  </object>
+  <object class="GtkAction" id="Close">
+    <property name="label">Close</property>
+    <property name="tooltip">Close Sudoku</property>
+    <property name="stock_id">gtk-close</property>
+  </object>
+  <object class="GtkAction" id="PrintMany">
+    <property name="label">Print _Multiple Sudokus</property>
+    <property name="tooltip">Print more than one sudoku at a time</property>
+    <property name="stock_id">gtk-print</property>
+  </object>
+  <object class="GtkAction" id="Print">
+    <property name="label">_Print</property>
+    <property name="tooltip">Print current game</property>
+    <property name="stock_id">gtk-print</property>
+  </object>
+  <object class="GtkAction" id="Reset">
+    <property name="label">_Reset</property>
+    <property name="tooltip">Reset current grid(do-over)</property>
+    <property name="stock_id">gtk-clear</property>
+  </object>
+  <object class="GtkAction" id="New">
+    <property name="label">_New</property>
+    <property name="tooltip">New game</property>
+    <property name="stock_id">gtk-new</property>
+  </object>
   <object class="GtkWindow" id="window">
     <child>
       <object class="GtkVBox" id="vbox">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="menubar">
             <property name="visible">True</property>
@@ -243,6 +330,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -265,13 +353,14 @@
                 <property name="visible">True</property>
               </object>
               <packing>
-               <property name="expand">False</property>
+                <property name="expand">False</property>
               </packing>
             </child>
             <child>
               <object class="GtkToolButton" id="tb_undo">
                 <property name="visible">True</property>
                 <property name="related_action">Undo</property>
+                <property name="is_important">True</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -283,6 +372,7 @@
               <object class="GtkToolButton" id="tb_redo">
                 <property name="visible">True</property>
                 <property name="related_action">Redo</property>
+                <property name="is_important">True</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -302,6 +392,7 @@
               <object class="GtkToolButton" id="tb_show_possible">
                 <property name="visible">True</property>
                 <property name="related_action">ShowPossible</property>
+                <property name="is_important">True</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -321,6 +412,7 @@
               <object class="GtkToggleToolButton" id="tb_toggle_tracker">
                 <property name="visible">True</property>
                 <property name="related_action">ToggleTracker</property>
+                <property name="is_important">True</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -331,6 +423,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -348,6 +441,8 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
@@ -358,98 +453,11 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">3</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkAction" id="New">
-    <property name="label">_New</property>
-    <property name="tooltip">New game</property>
-    <property name="stock_id">gtk-new</property>
-  </object>
-  <object class="GtkAction" id="Reset">
-    <property name="label">_Reset</property>
-    <property name="tooltip">Reset current grid(do-over)</property>
-    <property name="stock_id">gtk-clear</property>
-  </object>
-  <object class="GtkAction" id="Print">
-    <property name="label">_Print</property>
-    <property name="tooltip">Print current game</property>
-    <property name="stock_id">gtk-print</property>
-  </object>
-  <object class="GtkAction" id="PrintMany">
-    <property name="label">Print _Multiple Sudokus</property>
-    <property name="tooltip">Print more than one sudoku at a time</property>
-    <property name="stock_id">gtk-print</property>
-  </object>
-  <object class="GtkAction" id="Close">
-    <property name="label">Close</property>
-    <property name="tooltip">Close Sudoku</property>
-    <property name="stock_id">gtk-close</property>
-  </object>
-  <object class="GtkAction" id="ShowPossible">
-    <property name="label">Hint</property>
-    <property name="tooltip">Show which numbers could go in the current square</property>
-    <property name="stock_id">gtk-dialog-info</property>
-  </object>
-  <object class="GtkAction" id="ClearTopNotes">
-    <property name="label">Clear _Top Notes</property>
-    <property name="tooltip">Clear all of the top notes</property>
-  </object>
-  <object class="GtkAction" id="ClearBottomNotes">
-    <property name="label">Clear _Bottom Notes</property>
-    <property name="tooltip">Clear all of the bottom notes</property>
-  </object>
-  <object class="GtkAction" id="FullScreen">
-    <property name="label">FullScreen</property>
-    <property name="stock_id">gtk-fullscreen</property>
-  </object>
-  <object class="GtkAction" id="PuzzleInfo">
-    <property name="label">Puzzle _Statistics</property>
-    <property name="tooltip">Show statistics about current puzzle</property>
-    <property name="stock_id">gtk-about</property>
-  </object>
-  <object class="GtkAction" id="About">
-    <property name="label">About</property>
-    <property name="stock_id">gtk-about</property>
-  </object>
-  <object class="GtkAction" id="ShowHelp">
-    <property name="label">_Contents</property>
-    <property name="stock_id">gtk-help</property>
-  </object>
-  <object class="GtkAction" id="Undo">
-    <property name="label">_Undo</property>
-    <property name="tooltip">Undo last action</property>
-    <property name="stock_id">gtk-undo</property>
-  </object>
-  <object class="GtkAction" id="Redo">
-    <property name="label">_Redo</property>
-    <property name="tooltip">Redo last action</property>
-    <property name="stock_id">gtk-redo</property>
-  </object>
-  <object class="GtkToggleAction" id="AlwaysShowPossible">
-    <property name="label">_Always show hint</property>
-    <property name="tooltip">Always show possible numbers in a square</property>
-  </object>
-  <object class="GtkToggleAction" id="ShowImpossibleImplications">
-    <property name="label">Warn about _unfillable squares</property>
-    <property name="tooltip">Warn about squares made unfillable by a move</property>
-    <property name="active">True</property>
-  </object>
-  <object class="GtkToggleAction" id="ToggleTracker">
-    <property name="label">_Track additions</property>
-    <property name="tooltip">Mark new additions in a separate color so you can keep track of them</property>
-    <property name="icon_name">trackers</property>
-  </object>
-  <object class="GtkToggleAction" id="ToggleToolbar">
-    <property name="label">Show _Toolbar</property>
-    <property name="active">True</property>
-  </object>
-  <object class="GtkToggleAction" id="ToggleHighlight">
-    <property name="label">_Highlighter</property>
-    <property name="tooltip">Highlight the current row, column and box</property>
-    <property name="stock_id">gtk-select-color</property>
-  </object>
 </interface>
diff --git a/gnome-sudoku/src/lib/main.py b/gnome-sudoku/src/lib/main.py
index d354487..454f917 100644
--- a/gnome-sudoku/src/lib/main.py
+++ b/gnome-sudoku/src/lib/main.py
@@ -286,11 +286,6 @@ class SudokuGame (gconf_wrapper.GConfWrapper):
             action = self.builder.get_object(action_name)
             action.connect("activate", callback)
 
-        self.builder.get_object("Undo").set_is_important(True)
-        self.builder.get_object("Redo").set_is_important(True)
-        self.builder.get_object("ShowPossible").set_is_important(True)
-        self.builder.get_object("ToggleTracker").set_is_important(True)
-
     def clear_cb (self, action):
         self._main_grid_vew.do_clear()
 



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