X-Git-Url: https://harishankar.org/repos/?p=getaclue.git;a=blobdiff_plain;f=playerwindow.glade;h=90e475000475d2fe5314ce3d60c4267a643b3143;hp=f8e9afe2907df98a04d52c7e858963d5315c315a;hb=ccfc49515acfe83e5cab9878d095de25024dab97;hpb=1f9de52c4798a22293aaf2c32611090a099d0ce4

diff --git a/playerwindow.glade b/playerwindow.glade
index f8e9afe..90e4750 100644
--- a/playerwindow.glade
+++ b/playerwindow.glade
@@ -25,7 +25,10 @@
     <property name="title" translatable="yes">GetAClue player</property>
     <property name="default_width">640</property>
     <property name="default_height">480</property>
-    <signal name="destroy" handler="gtk_main_quit"/>
+    <property name="icon">resources/getaclue.svg</property>
+    <signal name="destroy" handler="on_mainwindow_destroy"/>
+    <signal name="key_press_event" handler="on_mainwindow_key_press_event"/>
+    <signal name="delete_event" handler="on_mainwindow_delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -47,6 +50,7 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Open...</property>
                         <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_open_activate"/>
                       </object>
                     </child>
                     <child>
@@ -59,6 +63,7 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Save _As...</property>
                         <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_save_as_activate"/>
                       </object>
                     </child>
                     <child>
@@ -73,6 +78,35 @@
                 </child>
               </object>
             </child>
+            <child>
+              <object class="GtkMenuItem" id="puzzle">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Puzzle</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu4">
+                    <property name="visible">True</property>
+                    <property name="ubuntu_local">True</property>
+                    <child>
+                      <object class="GtkMenuItem" id="verify">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Verify your board...</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_verify_activate"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="cleargrid">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Clear all...</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_cleargrid_activate"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
             <child>
               <object class="GtkMenuItem" id="view">
                 <property name="visible">True</property>
@@ -91,29 +125,24 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkMenuItem" id="revealsolution">
+                      <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Reveal _solution...</property>
-                        <property name="use_underline">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkMenuItem" id="hidesolution">
+                      <object class="GtkMenuItem" id="revealsolution">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Hide solution</property>
+                        <property name="label" translatable="yes">Reveal _solution...</property>
                         <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_revealsolution_activate"/>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkSeparatorMenuItem" id="sep2">
-                        <property name="visible">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="verify">
+                      <object class="GtkMenuItem" id="hidesolution">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Verify your board...</property>
+                        <property name="label" translatable="yes">_Hide solution</property>
                         <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_hidesolution_activate"/>
                       </object>
                     </child>
                   </object>
@@ -134,6 +163,7 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_About</property>
                         <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_about_activate"/>
                       </object>
                     </child>
                   </object>
@@ -168,7 +198,6 @@
                         <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
                         <signal name="expose_event" handler="on_puzzlegrid_expose_event"/>
                         <signal name="button_press_event" handler="on_puzzlegrid_button_press_event"/>
-                        <signal name="key_press_event" handler="on_puzzlegrid_key_press_event"/>
                         <signal name="focus_in_event" handler="on_puzzlegrid_focus_in_event"/>
                         <signal name="focus_out_event" handler="on_puzzlegrid_focus_out_event"/>
                       </object>
@@ -184,13 +213,12 @@
             <child>
               <object class="GtkVPaned" id="vpaned1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
                 <property name="position">180</property>
                 <property name="position_set">True</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can_focus">False</property>
                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <child>
@@ -201,16 +229,17 @@
                         <property name="can_focus">True</property>
                         <property name="model">clues_across</property>
                         <property name="headers_clickable">False</property>
+                        <property name="enable_search">False</property>
                         <property name="search_column">0</property>
                         <signal name="row_activated" handler="on_tree_clues_across_row_activated"/>
                         <child>
                           <object class="GtkTreeViewColumn" id="number">
-                            <property name="title">Number</property>
+                            <property name="title">#</property>
                           </object>
                         </child>
                         <child>
                           <object class="GtkTreeViewColumn" id="clueacross">
-                            <property name="title">Clue Across</property>
+                            <property name="title">Clues Across</property>
                           </object>
                         </child>
                       </object>
@@ -224,7 +253,7 @@
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow2">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can_focus">False</property>
                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <child>
@@ -235,16 +264,17 @@
                         <property name="can_focus">True</property>
                         <property name="model">clues_down</property>
                         <property name="headers_clickable">False</property>
+                        <property name="enable_search">False</property>
                         <property name="search_column">0</property>
                         <signal name="row_activated" handler="on_tree_clues_down_row_activated"/>
                         <child>
                           <object class="GtkTreeViewColumn" id="downnum">
-                            <property name="title">Number</property>
+                            <property name="title">#</property>
                           </object>
                         </child>
                         <child>
                           <object class="GtkTreeViewColumn" id="cluedown">
-                            <property name="title">Clue Down</property>
+                            <property name="title">Clues Down</property>
                           </object>
                         </child>
                       </object>