X-Git-Url: https://harishankar.org/repos/?p=getaclue.git;a=blobdiff_plain;f=playerwindow.glade;h=32dc7507daf47a2b44041a9e632be86ef27180f5;hp=a52e5ef1ac3ae7b82c802c54ee87cb972c0c5685;hb=8e96d1e907d35e47615ff1fe610bca7c88f392cd;hpb=8178235fb21779eed3615e502f2c4fdebd42150e

diff --git a/playerwindow.glade b/playerwindow.glade
index a52e5ef..32dc750 100644
--- a/playerwindow.glade
+++ b/playerwindow.glade
@@ -19,11 +19,14 @@
     </columns>
   </object>
   <object class="GtkWindow" id="mainwindow">
-    <property name="width_request">480</property>
-    <property name="height_request">360</property>
+    <property name="width_request">720</property>
+    <property name="height_request">500</property>
     <property name="visible">True</property>
     <property name="title" translatable="yes">GetAClue player</property>
-    <signal name="destroy" handler="gtk_main_quit"/>
+    <property name="default_width">640</property>
+    <property name="default_height">480</property>
+    <signal name="destroy" handler="on_mainwindow_destroy"/>
+    <signal name="delete_event" handler="on_mainwindow_delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -45,6 +48,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>
@@ -57,6 +61,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>
@@ -64,6 +69,36 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Quit</property>
                         <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_quit_activate"/>
+                      </object>
+                    </child>
+                  </object>
+                </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>
@@ -84,6 +119,12 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Reveal _word...</property>
                         <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_revealword_activate"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
+                        <property name="visible">True</property>
                       </object>
                     </child>
                     <child>
@@ -91,6 +132,15 @@
                         <property name="visible">True</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="GtkMenuItem" id="hidesolution">
+                        <property name="visible">True</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>
@@ -124,37 +174,72 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox1">
+          <object class="GtkHPaned" id="hpaned1">
             <property name="visible">True</property>
+            <property name="can_focus">True</property>
             <child>
-              <object class="GtkDrawingArea" id="puzzlegrid">
-                <property name="width_request">120</property>
-                <property name="height_request">120</property>
+              <object class="GtkScrolledWindow" id="scrolledwindow3">
+                <property name="width_request">420</property>
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <object class="GtkViewport" id="viewport1">
+                    <property name="visible">True</property>
+                    <property name="resize_mode">queue</property>
+                    <child>
+                      <object class="GtkDrawingArea" id="puzzlegrid">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <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>
+                    </child>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="position">0</property>
+                <property name="resize">False</property>
+                <property name="shrink">True</property>
               </packing>
             </child>
             <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="GtkTreeView" id="tree_clues_across">
-                    <property name="width_request">80</property>
-                    <property name="height_request">150</property>
+                  <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="model">clues_across</property>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="number">
-                        <property name="title">Number</property>
-                      </object>
-                    </child>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
-                      <object class="GtkTreeViewColumn" id="clueacross">
-                        <property name="title">Clue Across</property>
+                      <object class="GtkTreeView" id="tree_clues_across">
+                        <property name="width_request">80</property>
+                        <property name="height_request">250</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="model">clues_across</property>
+                        <property name="headers_clickable">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>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="clueacross">
+                            <property name="title">Clue Across</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -164,20 +249,31 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkTreeView" id="tree_clues_down">
-                    <property name="width_request">80</property>
-                    <property name="height_request">150</property>
+                  <object class="GtkScrolledWindow" id="scrolledwindow2">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="model">clues_down</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
-                      <object class="GtkTreeViewColumn" id="downnum">
-                        <property name="title">Number</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="cluedown">
-                        <property name="title">Clue Down</property>
+                      <object class="GtkTreeView" id="tree_clues_down">
+                        <property name="width_request">80</property>
+                        <property name="height_request">250</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="model">clues_down</property>
+                        <property name="headers_clickable">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>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="cluedown">
+                            <property name="title">Clue Down</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -188,7 +284,8 @@
                 </child>
               </object>
               <packing>
-                <property name="position">1</property>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
               </packing>
             </child>
           </object>