diff gtk-gui/gui.stetic @ 140:2b9fabd65309

Re #344: Show unit requirement failures * Use status bar properly * Add initial validation label * Make use of new event from Army to see when things changed Also: * Commit some automated changes
author IBBoard <dev@ibboard.co.uk>
date Sat, 15 Oct 2011 16:07:13 +0100
parents 33962c2ef550
children 1ce4fe9ae3c1
line wrap: on
line diff
--- a/gtk-gui/gui.stetic	Wed Oct 12 20:36:02 2011 +0100
+++ b/gtk-gui/gui.stetic	Sat Oct 15 16:07:13 2011 +0100
@@ -186,6 +186,7 @@
     <child>
       <widget class="Gtk.VBox" id="vbox1">
         <property name="MemberName" />
+        <property name="Spacing">0</property>
         <child>
           <widget class="Gtk.MenuBar" id="menubar1">
             <property name="MemberName" />
@@ -250,14 +251,40 @@
           </packing>
         </child>
         <child>
-          <widget class="Gtk.HPaned" id="hpaned2">
+          <widget class="Gtk.Statusbar" id="statusbar">
             <property name="MemberName" />
-            <property name="Visible">False</property>
+            <property name="Spacing">6</property>
+            <property name="BorderWidth">1</property>
+            <child>
+              <widget class="Gtk.Label" id="lblValidationWarning">
+                <property name="MemberName" />
+              </widget>
+              <packing>
+                <property name="PackType">End</property>
+                <property name="Position">1</property>
+                <property name="AutoSize">True</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="PackType">End</property>
+            <property name="Position">2</property>
+            <property name="AutoSize">True</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.HPaned" id="mainContent">
+            <property name="MemberName" />
             <property name="CanFocus">True</property>
-            <property name="Position">178</property>
+            <property name="Position">180</property>
             <child>
               <widget class="Gtk.TreeView" id="treeUnits">
                 <property name="MemberName" />
+                <property name="Visible">False</property>
                 <property name="CanFocus">True</property>
                 <signal name="RowActivated" handler="ArmyRowActivated" />
                 <signal name="PopupMenu" handler="OnTreeUnitsPopupMenu" />
@@ -281,34 +308,9 @@
             </child>
           </widget>
           <packing>
-            <property name="Position">2</property>
-            <property name="AutoSize">True</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="Gtk.Statusbar" id="statusbar1">
-            <property name="MemberName" />
-            <property name="Spacing">2</property>
-            <child>
-              <placeholder />
-            </child>
-            <child>
-              <widget class="Gtk.Label" id="lblTotalPoints">
-                <property name="MemberName" />
-              </widget>
-              <packing>
-                <property name="Position">2</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
+            <property name="PackType">End</property>
             <property name="Position">3</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
+            <property name="AutoSize">False</property>
           </packing>
         </child>
       </widget>
@@ -371,6 +373,7 @@
             <child>
               <widget class="Gtk.HBox" id="hbox2">
                 <property name="MemberName" />
+                <property name="Spacing">0</property>
                 <child>
                   <widget class="Gtk.SpinButton" id="sbPointsValue">
                     <property name="MemberName" />
@@ -2639,6 +2642,7 @@
             <child>
               <widget class="Gtk.HBox" id="hbox2">
                 <property name="MemberName" />
+                <property name="Spacing">0</property>
                 <child>
                   <widget class="Gtk.SpinButton" id="sbPointsValue">
                     <property name="MemberName" />