Mercurial > repos > IBDev-IBBoard.WarFoundry.GUI.GTK
diff gtk-gui/gui.stetic @ 50:d2f4fcc28254
Re #306: Combine equipment lists in GTK#
* Initial UI rearranging
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sun, 15 Aug 2010 16:02:49 +0000 |
| parents | 23238d998535 |
| children | dafbd432ca23 |
line wrap: on
line diff
--- a/gtk-gui/gui.stetic Sun Aug 15 15:57:25 2010 +0000 +++ b/gtk-gui/gui.stetic Sun Aug 15 16:02:49 2010 +0000 @@ -683,7 +683,7 @@ </widget> </child> </widget> - <widget class="Gtk.Bin" id="IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget" design-size="649 425"> + <widget class="Gtk.Bin" id="IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget" design-size="649 458"> <property name="MemberName" /> <child> <widget class="Gtk.VBox" id="vbox1"> @@ -766,7 +766,7 @@ <child> <widget class="Gtk.Table" id="table1"> <property name="MemberName" /> - <property name="NRows">3</property> + <property name="NRows">2</property> <property name="NColumns">3</property> <property name="RowSpacing">6</property> <property name="ColumnSpacing">6</property> @@ -774,25 +774,15 @@ <placeholder /> </child> <child> - <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow1"> + <widget class="Gtk.Label" id="equipmentLabel"> <property name="MemberName" /> - <property name="ShadowType">In</property> - <child> - <widget class="Gtk.NodeView" id="optionalEquipment"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="ShowScrollbars">True</property> - </widget> - </child> + <property name="LabelProp" translatable="yes">equipment:</property> </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> @@ -805,7 +795,7 @@ <property name="MemberName" /> <property name="ShadowType">In</property> <child> - <widget class="Gtk.NodeView" id="requiredEquipment"> + <widget class="Gtk.NodeView" id="equipmentList"> <property name="MemberName" /> <property name="CanFocus">True</property> <property name="ShowScrollbars">True</property> @@ -840,8 +830,8 @@ </child> </widget> <packing> - <property name="TopAttach">2</property> - <property name="BottomAttach">3</property> + <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> @@ -860,25 +850,6 @@ <property name="LabelProp" translatable="yes">notes:</property> </widget> <packing> - <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> - <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.Label" id="optionalEquipmentLabel"> - <property name="MemberName" /> - <property name="LabelProp" translatable="yes">Optional Equipment:</property> - </widget> - <packing> <property name="TopAttach">1</property> <property name="BottomAttach">2</property> <property name="AutoSize">True</property> @@ -893,75 +864,6 @@ </packing> </child> <child> - <widget class="Gtk.Label" id="requiredEquipmentLabel"> - <property name="MemberName" /> - <property name="LabelProp" translatable="yes">Required Equipment:</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.VBox" id="vbox2"> - <property name="MemberName" /> - <property name="Spacing">6</property> - <child> - <widget class="Gtk.Button" id="bttnReplaceRequired"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="Type">TextOnly</property> - <property name="Label" translatable="yes">Replace</property> - <property name="UseUnderline">True</property> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.Button" id="bttnEditRequired"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="Type">TextOnly</property> - <property name="Label" translatable="yes">Edit</property> - <property name="UseUnderline">True</property> - </widget> - <packing> - <property name="Position">1</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <placeholder /> - </child> - </widget> - <packing> - <property name="LeftAttach">2</property> - <property name="RightAttach">3</property> - <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.VBox" id="vbox3"> <property name="MemberName" /> <property name="Spacing">6</property> @@ -996,11 +898,11 @@ </packing> </child> <child> - <widget class="Gtk.Button" id="bttnRemove"> + <widget class="Gtk.Button" id="bttnReplace"> <property name="MemberName" /> <property name="CanFocus">True</property> <property name="Type">TextOnly</property> - <property name="Label" translatable="yes">Remove</property> + <property name="Label" translatable="yes">Replace</property> <property name="UseUnderline">True</property> </widget> <packing> @@ -1010,10 +912,23 @@ <property name="Fill">False</property> </packing> </child> + <child> + <widget class="Gtk.Button" id="bttnRemove"> + <property name="MemberName" /> + <property name="CanFocus">True</property> + <property name="Type">TextOnly</property> + <property name="Label" translatable="yes">Remove</property> + <property name="UseUnderline">True</property> + </widget> + <packing> + <property name="Position">3</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> </widget> <packing> - <property name="TopAttach">1</property> - <property name="BottomAttach">2</property> <property name="LeftAttach">2</property> <property name="RightAttach">3</property> <property name="AutoSize">True</property>