Work on puzzle grid in player

[wordblah.git] / wordblox_player.glade

diff --git a/wordblox_player.glade b/wordblox_player.glade
index 428cb8a..bc9f27a 100644 (file)
--- a/wordblox_player.glade
+++ b/wordblox_player.glade
@@ -56,12 +56,12 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkMenuItem" id="menu_save">
+                      <object class="GtkMenuItem" id="menu_save_grid_state">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_Save Grid State...</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_menu_save_activate" swapped="no"/>
+                        <signal name="activate" handler="on_menu_save_grid_state_activate" swapped="no"/>
                       </object>
                     </child>
                     <child>
@@ -94,12 +94,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkMenuItem" id="menu_view_answers">
+                      <object class="GtkMenuItem" id="menu_reveal_solution">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_Reveal Solution...</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_menu_view_answers_activate" swapped="no"/>
+                        <signal name="activate" handler="on_menu_reveal_solution_activate" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -156,8 +156,12 @@
                     <child>
                       <object class="GtkDrawingArea" id="puzzle_area">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="has_focus">True</property>
+                        <property name="can_default">True</property>
+                        <property name="has_default">True</property>
                         <signal name="draw" handler="on_puzzle_area_draw" swapped="no"/>
+                        <signal name="key-press-event" handler="on_puzzle_area_key_press_event" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -171,17 +175,17 @@
             <child>
               <object class="GtkPaned">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkScrolledWindow">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can_focus">False</property>
                     <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTreeView" id="list_across_clues">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">store_across_clues</property>
                         <property name="enable_search">False</property>
                         <property name="search_column">0</property>
@@ -189,6 +193,31 @@
                         <child internal-child="selection">
                           <object class="GtkTreeSelection"/>
                         </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="id">
+                            <property name="resizable">True</property>
+                            <property name="title" translatable="yes">Id</property>
+                            <child>
+                              <object class="GtkCellRendererText"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="ClueAcross">
+                            <property name="resizable">True</property>
+                            <property name="title" translatable="yes">Clues Across</property>
+                            <child>
+                              <object class="GtkCellRendererText"/>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                                <attribute name="placeholder-text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -200,17 +229,43 @@
                 <child>
                   <object class="GtkScrolledWindow">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can_focus">False</property>
                     <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTreeView" id="list_down_clues">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can_focus">False</property>
                         <property name="model">store_down_clues</property>
+                        <property name="enable_search">False</property>
                         <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection"/>
                         </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="ID">
+                            <property name="resizable">True</property>
+                            <property name="title" translatable="yes">Id</property>
+                            <child>
+                              <object class="GtkCellRendererText"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="ClueDown">
+                            <property name="resizable">True</property>
+                            <property name="title" translatable="yes">Clues Down</property>
+                            <child>
+                              <object class="GtkCellRendererText"/>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>