Mercurial > repos > IBDev-IBBoard.WarFoundry.GUI.GTK

diff gtk-gui/gui.stetic @ 36:d68992a831df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes #182: Make GTK# more like WinForms UI * Remove "Change Game System" option * Delete "Change Game System" dialogs * Add game system selection to army creation
author IBBoard <dev@ibboard.co.uk>
date Sat, 16 Jan 2010 16:36:12 +0000
parents eab45344cd56
children 8bc24ef82258
line wrap: on
line diff
--- a/gtk-gui/gui.stetic	Sat Jan 16 11:07:15 2010 +0000
+++ b/gtk-gui/gui.stetic	Sat Jan 16 16:36:12 2010 +0000
@@ -18,7 +18,6 @@
       <action id="miCreateArmy">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes">Create army</property>
-        <property name="Sensitive">False</property>
         <property name="ShortLabel" translatable="yes">Create army</property>
         <property name="StockId">gtk-new</property>
         <signal name="Activated" handler="OnCreateArmyActivated" />
@@ -54,12 +53,6 @@
         <property name="StockId">gtk-close</property>
         <signal name="Activated" handler="OnCloseArmyActivated" />
       </action>
-      <action id="miChangeGameSystem">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Change game system</property>
-        <property name="ShortLabel" translatable="yes">Change game system</property>
-        <signal name="Activated" handler="OnChangeGameSystemActivated" after="yes" />
-      </action>
       <action id="miReloadFiles">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes">Reload files</property>
@@ -113,7 +106,6 @@
       <action id="newArmyButton">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes" />
-        <property name="Sensitive">False</property>
         <property name="StockId">gtk-new</property>
         <signal name="Activated" handler="newTBButtonActivated" />
       </action>
@@ -187,8 +179,6 @@
                 </node>
                 <node type="Menuitem" action="miCloseArmy" />
                 <node type="Separator" />
-                <node type="Menuitem" action="miChangeGameSystem" />
-                <node type="Separator" />
                 <node type="Menuitem" action="miReloadFiles" />
                 <node type="Separator" />
                 <node type="Menuitem" action="miExit" />
@@ -216,6 +206,7 @@
             <property name="HeightRequest">36</property>
             <property name="ShowArrow">False</property>
             <property name="ButtonStyle">Icons</property>
+            <property name="IconSize">LargeToolbar</property>
             <node name="toolbar" type="Toolbar">
               <node type="Toolitem" action="newArmyButton" />
               <node type="Toolitem" action="openArmyButton" />
@@ -284,7 +275,7 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Dialog" id="IBBoard.WarFoundry.GTK.FrmNewArmy" design-size="400 322">
+  <widget class="Gtk.Dialog" id="IBBoard.WarFoundry.GTK.FrmNewArmy" design-size="370 348">
     <property name="MemberName" />
     <property name="Events">ButtonPressMask</property>
     <property name="Title" translatable="yes">Create new army</property>
@@ -303,7 +294,7 @@
         <child>
           <widget class="Gtk.Table" id="table1">
             <property name="MemberName" />
-            <property name="NRows">3</property>
+            <property name="NRows">4</property>
             <property name="NColumns">2</property>
             <property name="RowSpacing">6</property>
             <property name="ColumnSpacing">6</property>
@@ -323,11 +314,14 @@
                 </child>
               </widget>
               <packing>
+                <property name="TopAttach">1</property>
+                <property name="BottomAttach">2</property>
                 <property name="LeftAttach">1</property>
                 <property name="RightAttach">2</property>
                 <property name="AutoSize">True</property>
+                <property name="XOptions">Fill</property>
                 <property name="YOptions">Fill</property>
-                <property name="XExpand">True</property>
+                <property name="XExpand">False</property>
                 <property name="XFill">True</property>
                 <property name="XShrink">False</property>
                 <property name="YExpand">False</property>
@@ -365,13 +359,14 @@
                 </child>
               </widget>
               <packing>
-                <property name="TopAttach">2</property>
-                <property name="BottomAttach">3</property>
+                <property name="TopAttach">3</property>
+                <property name="BottomAttach">4</property>
                 <property name="LeftAttach">1</property>
                 <property name="RightAttach">2</property>
                 <property name="AutoSize">True</property>
+                <property name="XOptions">Fill</property>
                 <property name="YOptions">Fill</property>
-                <property name="XExpand">True</property>
+                <property name="XExpand">False</property>
                 <property name="XFill">True</property>
                 <property name="XShrink">False</property>
                 <property name="YExpand">False</property>
@@ -385,6 +380,8 @@
                 <property name="LabelProp" translatable="yes">Race</property>
               </widget>
               <packing>
+                <property name="TopAttach">1</property>
+                <property name="BottomAttach">2</property>
                 <property name="AutoSize">True</property>
                 <property name="XOptions">Fill</property>
                 <property name="YOptions">Fill</property>
@@ -402,8 +399,8 @@
                 <property name="LabelProp" translatable="yes">Army name</property>
               </widget>
               <packing>
-                <property name="TopAttach">1</property>
-                <property name="BottomAttach">2</property>
+                <property name="TopAttach">2</property>
+                <property name="BottomAttach">3</property>
                 <property name="AutoSize">True</property>
                 <property name="XOptions">Fill</property>
                 <property name="YOptions">Fill</property>
@@ -421,8 +418,8 @@
                 <property name="LabelProp" translatable="yes">Points value</property>
               </widget>
               <packing>
-                <property name="TopAttach">2</property>
-                <property name="BottomAttach">3</property>
+                <property name="TopAttach">3</property>
+                <property name="BottomAttach">4</property>
                 <property name="AutoSize">True</property>
                 <property name="XOptions">Fill</property>
                 <property name="YOptions">Fill</property>
@@ -435,6 +432,43 @@
               </packing>
             </child>
             <child>
+              <widget class="Gtk.Label" id="label4">
+                <property name="MemberName" />
+                <property name="LabelProp" translatable="yes">game system</property>
+              </widget>
+              <packing>
+                <property name="AutoSize">True</property>
+                <property name="XOptions">Fill</property>
+                <property name="YOptions">Fill</property>
+                <property name="XExpand">False</property>
+                <property name="XFill">True</property>
+                <property name="XShrink">False</property>
+                <property name="YExpand">False</property>
+                <property name="YFill">True</property>
+                <property name="YShrink">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.ComboBoxEntry" id="systemCombo">
+                <property name="MemberName" />
+                <property name="IsTextCombo">True</property>
+                <property name="Items" translatable="yes" />
+                <signal name="Changed" handler="OnSystemComboChanged" />
+              </widget>
+              <packing>
+                <property name="LeftAttach">1</property>
+                <property name="RightAttach">2</property>
+                <property name="AutoSize">False</property>
+                <property name="YOptions">Fill</property>
+                <property name="XExpand">True</property>
+                <property name="XFill">True</property>
+                <property name="XShrink">False</property>
+                <property name="YExpand">False</property>
+                <property name="YFill">True</property>
+                <property name="YShrink">False</property>
+              </packing>
+            </child>
+            <child>
               <widget class="Gtk.Entry" id="txtArmyName">
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
@@ -443,13 +477,14 @@
                 <signal name="Changed" handler="OnTextChanged" />
               </widget>
               <packing>
-                <property name="TopAttach">1</property>
-                <property name="BottomAttach">2</property>
+                <property name="TopAttach">2</property>
+                <property name="BottomAttach">3</property>
                 <property name="LeftAttach">1</property>
                 <property name="RightAttach">2</property>
                 <property name="AutoSize">True</property>
+                <property name="XOptions">Fill</property>
                 <property name="YOptions">Fill</property>
-                <property name="XExpand">True</property>
+                <property name="XExpand">False</property>
                 <property name="XFill">True</property>
                 <property name="XShrink">False</property>
                 <property name="YExpand">False</property>