Mercurial > repos > IBDev-IBBoard.WarFoundry.GUI.GTK
diff gtk-gui/gui.stetic @ 53:28b242612ad7
Re #60: Add UI to add/remove/edit weapons in GTK
* Use proper method for making dialog appear
Re #306: Combine equipment lists in GTK#
* Populate unit equipment lists on unit display widget
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Wed, 25 Aug 2010 15:21:56 +0000 |
| parents | 4bad8cb3f889 |
| children | f9f6e9db5350 |
line wrap: on
line diff
--- a/gtk-gui/gui.stetic Sun Aug 22 14:32:16 2010 +0000 +++ b/gtk-gui/gui.stetic Wed Aug 25 15:21:56 2010 +0000 @@ -764,103 +764,111 @@ </packing> </child> <child> - <widget class="Gtk.Table" id="table1"> + <widget class="Gtk.HBox" id="hbox2"> <property name="MemberName" /> - <property name="NRows">2</property> - <property name="NColumns">3</property> - <property name="RowSpacing">6</property> - <property name="ColumnSpacing">6</property> + <property name="Spacing">6</property> <child> - <placeholder /> - </child> - <child> - <widget class="Gtk.Label" id="equipmentLabel"> + <widget class="Gtk.Table" id="table1"> <property name="MemberName" /> - <property name="LabelProp" translatable="yes">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.ScrolledWindow" id="GtkScrolledWindow2"> - <property name="MemberName" /> - <property name="ShadowType">In</property> + <property name="NRows">2</property> + <property name="NColumns">2</property> + <property name="RowSpacing">6</property> + <property name="ColumnSpacing">6</property> + <child> + <widget class="Gtk.Label" id="equipmentLabel"> + <property name="MemberName" /> + <property name="LabelProp" translatable="yes">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.NodeView" id="equipmentList"> + <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow2"> + <property name="MemberName" /> + <property name="ShadowType">In</property> + <child> + <widget class="Gtk.NodeView" id="equipmentList"> + <property name="MemberName" /> + <property name="CanFocus">True</property> + <property name="ShowScrollbars">True</property> + <property name="HeadersVisible">False</property> + </widget> + </child> + </widget> + <packing> + <property name="LeftAttach">1</property> + <property name="RightAttach">2</property> + <property name="AutoSize">True</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.ScrolledWindow" id="GtkScrolledWindow3"> <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="ShowScrollbars">True</property> + <property name="ShadowType">In</property> + <child> + <widget class="Gtk.TextView" id="notesView"> + <property name="MemberName" /> + <property name="CanFocus">True</property> + <property name="ShowScrollbars">True</property> + <property name="Editable">False</property> + <property name="Text" translatable="yes" /> + </widget> + </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="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.Label" id="lblNotes"> + <property name="MemberName" /> + <property name="LabelProp" translatable="yes">notes:</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> + <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> </widget> <packing> - <property name="LeftAttach">1</property> - <property name="RightAttach">2</property> + <property name="Position">0</property> <property name="AutoSize">True</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.ScrolledWindow" id="GtkScrolledWindow3"> - <property name="MemberName" /> - <property name="ShadowType">In</property> - <child> - <widget class="Gtk.TextView" id="notesView"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="ShowScrollbars">True</property> - <property name="Editable">False</property> - <property name="Text" translatable="yes" /> - </widget> - </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="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.Label" id="lblNotes"> - <property name="MemberName" /> - <property name="LabelProp" translatable="yes">notes:</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> - <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> @@ -930,17 +938,10 @@ </child> </widget> <packing> - <property name="LeftAttach">2</property> - <property name="RightAttach">3</property> + <property name="Position">1</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> + <property name="Expand">False</property> + <property name="Fill">False</property> </packing> </child> </widget> @@ -954,6 +955,9 @@ <child> <placeholder /> </child> + <child> + <placeholder /> + </child> </widget> </child> </widget> @@ -1268,6 +1272,7 @@ <property name="Type">StockItem</property> <property name="StockId">gtk-cancel</property> <property name="ResponseId">-6</property> + <signal name="Clicked" handler="CancelButtonClicked" /> <property name="label">gtk-cancel</property> </widget> <packing>