X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk-interface.xml;h=45d509d459ae5d14428272b4b318af6a644804c3;hb=3990747f9bf2f88dba5071eecadac28474edd293;hp=fd90471954bfe1a0b9c90cddbc1cfc102eab0c42;hpb=3f80235a86adc78d425d3f230bcfab590e22fa46;p=xboard.git

diff --git a/gtk-interface.xml b/gtk-interface.xml
index fd90471..45d509d 100644
--- a/gtk-interface.xml
+++ b/gtk-interface.xml
@@ -2,18 +2,126 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
+  <object class="GtkListStore" id="MoveHistoryStore">
+    <columns>
+      <!-- column-name Move -->
+      <column type="gint"/>
+      <!-- column-name White -->
+      <column type="gchararray"/>
+      <!-- column-name Black -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkDialog" id="MoveHistory">
+    <property name="border_width">5</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <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="GtkTreeView" id="MoveHistoryView">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="model">MoveHistoryStore</property>
+                <property name="headers_clickable">False</property>
+                <property name="enable_search">False</property>
+                <property name="search_column">0</property>
+                <child>
+                  <object class="GtkTreeViewColumn" id="Move">
+                    <property name="title">Move</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="MoveNumberRenderer"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="White">
+                    <property name="title">White</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="MoveWhiteRenderer"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="Black">
+                    <property name="title">Black</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="MoveBlackRenderer"/>
+                      <attributes>
+                        <attribute name="text">2</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="CloseButton">
+                <property name="label" translatable="yes">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="released" handler="HistoryPopDown"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">CloseButton</action-widget>
+    </action-widgets>
+  </object>
   <object class="GtkWindow" id="MainWindow">
+    <property name="events">GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK</property>
     <property name="title" translatable="yes">XBoard</property>
     <signal name="destroy" handler="QuitProc"/>
+    <signal name="expose_event" handler="ExposeProc"/>
     <child>
       <object class="GtkAspectFrame" id="Aspectframe">
         <property name="visible">True</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
-        <property name="ratio">0.80000001192092896</property>
+        <property name="xalign">0</property>
+        <property name="yalign">0</property>
         <property name="obey_child">False</property>
         <child>
-          <object class="GtkVBox" id="VBox">
+          <object class="GtkVBox" id="MenuBox">
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
@@ -73,10 +181,12 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkMenuItem" id="menuFile.Save Game">
-                            <property name="visible">True</property>
+                          <object class="GtkImageMenuItem" id="menuFile.Save Game">
                             <property name="label" translatable="yes">Save Game</property>
-                            <property name="use_underline">True</property>
+                            <property name="visible">True</property>
+                            <property name="image">image2</property>
+                            <property name="use_stock">False</property>
+                            <signal name="activate" handler="SaveGameProc"/>
                           </object>
                         </child>
                         <child>
@@ -136,6 +246,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Save Position</property>
                             <property name="use_underline">True</property>
+                            <signal name="activate" handler="SavePositionProc"/>
                           </object>
                         </child>
                         <child>
@@ -248,6 +359,7 @@
                             <property name="use_underline">True</property>
                             <property name="draw_as_radio">True</property>
                             <property name="group">menuMode.Machine White</property>
+                            <signal name="toggled" handler="AnalyzeFileProc"/>
                           </object>
                         </child>
                         <child>
@@ -562,6 +674,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Always Queen</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="AlwaysQueenProc"/>
                           </object>
                         </child>
                         <child>
@@ -569,6 +682,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Animate Dragging</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="AnimateDraggingProc"/>
                           </object>
                         </child>
                         <child>
@@ -576,6 +690,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Animate Moving</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="AnimateMovingProc"/>
                           </object>
                         </child>
                         <child>
@@ -604,6 +719,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Auto Observe</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="AutobsProc"/>
                           </object>
                         </child>
                         <child>
@@ -611,6 +727,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Auto Raise Board</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="AutoraiseProc"/>
                           </object>
                         </child>
                         <child>
@@ -618,6 +735,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Auto Save</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="AutosaveProc"/>
                           </object>
                         </child>
                         <child>
@@ -625,6 +743,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Blindfold</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="BlindfoldProc"/>
                           </object>
                         </child>
                         <child>
@@ -632,6 +751,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Flash Moves</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="FlashMovesProc"/>
                           </object>
                         </child>
                         <child>
@@ -655,6 +775,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Highlight Last Move</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="HighlightLastMoveProc"/>
                           </object>
                         </child>
                         <child>
@@ -662,6 +783,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Move Sound</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="MoveSoundProc"/>
                           </object>
                         </child>
                         <child>
@@ -669,6 +791,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">ICS Alarm</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="IcsAlarmProc"/>
                           </object>
                         </child>
                         <child>
@@ -676,6 +799,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Old Save Style</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="OldSaveStyleProc"/>
                           </object>
                         </child>
                         <child>
@@ -683,6 +807,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Periodic Updates</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="PeriodicUpdatesProc"/>
                           </object>
                         </child>
                         <child>
@@ -741,6 +866,7 @@
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Test Legality</property>
                             <property name="use_underline">True</property>
+                            <signal name="toggled" handler="TestLegalityProc"/>
                           </object>
                         </child>
                       </object>
@@ -846,6 +972,7 @@
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -855,6 +982,7 @@
                 <child>
                   <object class="GtkLabel" id="Messages">
                     <property name="visible">True</property>
+                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">not your turn</property>
                     <property name="single_line_mode">True</property>
                   </object>
@@ -946,6 +1074,7 @@
                 <signal name="button_release_event" handler="UserMoveProc"/>
               </object>
               <packing>
+                <property name="fill">False</property>
                 <property name="position">3</property>
               </packing>
             </child>
@@ -959,109 +1088,9 @@
     <property name="xalign">0.40000000596046448</property>
     <property name="stock">gtk-open</property>
   </object>
-  <object class="GtkListStore" id="MoveHistoryStore">
-    <columns>
-      <!-- column-name Move -->
-      <column type="gint"/>
-      <!-- column-name White -->
-      <column type="gchararray"/>
-      <!-- column-name Black -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkDialog" id="MoveHistory">
-    <property name="border_width">5</property>
-    <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <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="GtkTreeView" id="MoveHistoryView">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="model">MoveHistoryStore</property>
-                <property name="headers_clickable">False</property>
-                <property name="enable_search">False</property>
-                <property name="search_column">0</property>
-                <child>
-                  <object class="GtkTreeViewColumn" id="Move">
-                    <property name="title">Move</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="MoveNumberRenderer"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" id="White">
-                    <property name="title">White</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="MoveWhiteRenderer"/>
-                      <attributes>
-                        <attribute name="text">1</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn" id="Black">
-                    <property name="title">Black</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="MoveBlackRenderer"/>
-                      <attributes>
-                        <attribute name="text">2</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="CloseButton">
-                <property name="label" translatable="yes">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <signal name="released" handler="HistoryPopDown"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">CloseButton</action-widget>
-    </action-widgets>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-save</property>
+    <property name="icon-size">1</property>
   </object>
 </interface>