Mercurial > repos > IBBoard.WarFoundry.GUI.GTK
changeset 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 | d29ad8445461 |
children | dafbd432ca23 |
files | gtk-gui/IBBoard.WarFoundry.GTK.FrmNewArmy.cs gtk-gui/IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget.cs gtk-gui/gui.stetic |
diffstat | 3 files changed, 91 insertions(+), 233 deletions(-) [+] |
line wrap: on
line diff
--- a/gtk-gui/IBBoard.WarFoundry.GTK.FrmNewArmy.cs Sun Aug 15 15:57:25 2010 +0000 +++ b/gtk-gui/IBBoard.WarFoundry.GTK.FrmNewArmy.cs Sun Aug 15 16:02:49 2010 +0000 @@ -49,6 +49,7 @@ w1.BorderWidth = ((uint)(2)); // Container child dialog_VBox.Gtk.Box+BoxChild this.table1 = new global::Gtk.Table(((uint)(4)), ((uint)(2)), false); + this.table1.Name = "table1"; this.table1.RowSpacing = ((uint)(6)); this.table1.ColumnSpacing = ((uint)(6)); // Container child table1.Gtk.Table+TableChild
--- a/gtk-gui/IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget.cs Sun Aug 15 15:57:25 2010 +0000 +++ b/gtk-gui/IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget.cs Sun Aug 15 16:02:49 2010 +0000 @@ -20,13 +20,11 @@ private global::Gtk.Table table1; - private global::Gtk.ScrolledWindow GtkScrolledWindow1; - - private global::Gtk.NodeView optionalEquipment; + private global::Gtk.Label equipmentLabel; private global::Gtk.ScrolledWindow GtkScrolledWindow2; - private global::Gtk.NodeView requiredEquipment; + private global::Gtk.NodeView equipmentList; private global::Gtk.ScrolledWindow GtkScrolledWindow3; @@ -34,22 +32,14 @@ private global::Gtk.Label lblNotes; - private global::Gtk.Label optionalEquipmentLabel; - - private global::Gtk.Label requiredEquipmentLabel; - - private global::Gtk.VBox vbox2; - - private global::Gtk.Button bttnReplaceRequired; - - private global::Gtk.Button bttnEditRequired; - private global::Gtk.VBox vbox3; private global::Gtk.Button bttnAddOptional; private global::Gtk.Button bttnEditOptional; + private global::Gtk.Button bttnReplace; + private global::Gtk.Button bttnRemove; protected virtual void Build() @@ -114,39 +104,32 @@ w6.Expand = false; w6.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.table1 = new global::Gtk.Table(((uint)(3)), ((uint)(3)), false); + this.table1 = new global::Gtk.Table(((uint)(2)), ((uint)(3)), false); + this.table1.Name = "table1"; this.table1.RowSpacing = ((uint)(6)); this.table1.ColumnSpacing = ((uint)(6)); // Container child table1.Gtk.Table+TableChild - this.GtkScrolledWindow1 = new global::Gtk.ScrolledWindow(); - this.GtkScrolledWindow1.Name = "GtkScrolledWindow1"; - this.GtkScrolledWindow1.ShadowType = ((global::Gtk.ShadowType)(1)); - // Container child GtkScrolledWindow1.Gtk.Container+ContainerChild - this.optionalEquipment = new global::Gtk.NodeView(); - this.optionalEquipment.CanFocus = true; - this.optionalEquipment.Name = "optionalEquipment"; - this.GtkScrolledWindow1.Add(this.optionalEquipment); - this.table1.Add(this.GtkScrolledWindow1); - global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow1])); - w8.TopAttach = ((uint)(1)); - w8.BottomAttach = ((uint)(2)); - w8.LeftAttach = ((uint)(1)); - w8.RightAttach = ((uint)(2)); - w8.YOptions = ((global::Gtk.AttachOptions)(4)); + this.equipmentLabel = new global::Gtk.Label(); + this.equipmentLabel.Name = "equipmentLabel"; + this.equipmentLabel.LabelProp = global::Mono.Unix.Catalog.GetString("equipment:"); + this.table1.Add(this.equipmentLabel); + global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.equipmentLabel])); + w7.XOptions = ((global::Gtk.AttachOptions)(4)); + w7.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.GtkScrolledWindow2 = new global::Gtk.ScrolledWindow(); this.GtkScrolledWindow2.Name = "GtkScrolledWindow2"; this.GtkScrolledWindow2.ShadowType = ((global::Gtk.ShadowType)(1)); // Container child GtkScrolledWindow2.Gtk.Container+ContainerChild - this.requiredEquipment = new global::Gtk.NodeView(); - this.requiredEquipment.CanFocus = true; - this.requiredEquipment.Name = "requiredEquipment"; - this.GtkScrolledWindow2.Add(this.requiredEquipment); + this.equipmentList = new global::Gtk.NodeView(); + this.equipmentList.CanFocus = true; + this.equipmentList.Name = "equipmentList"; + this.GtkScrolledWindow2.Add(this.equipmentList); this.table1.Add(this.GtkScrolledWindow2); - global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow2])); - w10.LeftAttach = ((uint)(1)); - w10.RightAttach = ((uint)(2)); - w10.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow2])); + w9.LeftAttach = ((uint)(1)); + w9.RightAttach = ((uint)(2)); + w9.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.GtkScrolledWindow3 = new global::Gtk.ScrolledWindow(); this.GtkScrolledWindow3.Name = "GtkScrolledWindow3"; @@ -158,72 +141,22 @@ this.notesView.Editable = false; this.GtkScrolledWindow3.Add(this.notesView); this.table1.Add(this.GtkScrolledWindow3); - global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow3])); - w12.TopAttach = ((uint)(2)); - w12.BottomAttach = ((uint)(3)); - w12.LeftAttach = ((uint)(1)); - w12.RightAttach = ((uint)(2)); - w12.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow3])); + w11.TopAttach = ((uint)(1)); + w11.BottomAttach = ((uint)(2)); + w11.LeftAttach = ((uint)(1)); + w11.RightAttach = ((uint)(2)); + w11.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.lblNotes = new global::Gtk.Label(); this.lblNotes.Name = "lblNotes"; this.lblNotes.LabelProp = global::Mono.Unix.Catalog.GetString("notes:"); this.table1.Add(this.lblNotes); - global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.lblNotes])); - w13.TopAttach = ((uint)(2)); - w13.BottomAttach = ((uint)(3)); - w13.XOptions = ((global::Gtk.AttachOptions)(4)); - w13.YOptions = ((global::Gtk.AttachOptions)(4)); - // Container child table1.Gtk.Table+TableChild - this.optionalEquipmentLabel = new global::Gtk.Label(); - this.optionalEquipmentLabel.Name = "optionalEquipmentLabel"; - this.optionalEquipmentLabel.LabelProp = global::Mono.Unix.Catalog.GetString("Optional Equipment:"); - this.table1.Add(this.optionalEquipmentLabel); - global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.optionalEquipmentLabel])); - w14.TopAttach = ((uint)(1)); - w14.BottomAttach = ((uint)(2)); - w14.XOptions = ((global::Gtk.AttachOptions)(4)); - w14.YOptions = ((global::Gtk.AttachOptions)(4)); - // Container child table1.Gtk.Table+TableChild - this.requiredEquipmentLabel = new global::Gtk.Label(); - this.requiredEquipmentLabel.Name = "requiredEquipmentLabel"; - this.requiredEquipmentLabel.LabelProp = global::Mono.Unix.Catalog.GetString("Required Equipment:"); - this.table1.Add(this.requiredEquipmentLabel); - global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1[this.requiredEquipmentLabel])); - w15.XOptions = ((global::Gtk.AttachOptions)(4)); - w15.YOptions = ((global::Gtk.AttachOptions)(4)); - // Container child table1.Gtk.Table+TableChild - this.vbox2 = new global::Gtk.VBox(); - this.vbox2.Name = "vbox2"; - this.vbox2.Spacing = 6; - // Container child vbox2.Gtk.Box+BoxChild - this.bttnReplaceRequired = new global::Gtk.Button(); - this.bttnReplaceRequired.CanFocus = true; - this.bttnReplaceRequired.Name = "bttnReplaceRequired"; - this.bttnReplaceRequired.UseUnderline = true; - this.bttnReplaceRequired.Label = global::Mono.Unix.Catalog.GetString("Replace"); - this.vbox2.Add(this.bttnReplaceRequired); - global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.bttnReplaceRequired])); - w16.Position = 0; - w16.Expand = false; - w16.Fill = false; - // Container child vbox2.Gtk.Box+BoxChild - this.bttnEditRequired = new global::Gtk.Button(); - this.bttnEditRequired.CanFocus = true; - this.bttnEditRequired.Name = "bttnEditRequired"; - this.bttnEditRequired.UseUnderline = true; - this.bttnEditRequired.Label = global::Mono.Unix.Catalog.GetString("Edit"); - this.vbox2.Add(this.bttnEditRequired); - global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.bttnEditRequired])); - w17.Position = 1; - w17.Expand = false; - w17.Fill = false; - this.table1.Add(this.vbox2); - global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table1[this.vbox2])); - w18.LeftAttach = ((uint)(2)); - w18.RightAttach = ((uint)(3)); - w18.XOptions = ((global::Gtk.AttachOptions)(4)); - w18.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.lblNotes])); + w12.TopAttach = ((uint)(1)); + w12.BottomAttach = ((uint)(2)); + w12.XOptions = ((global::Gtk.AttachOptions)(4)); + w12.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.vbox3 = new global::Gtk.VBox(); this.vbox3.Name = "vbox3"; @@ -235,10 +168,10 @@ this.bttnAddOptional.UseUnderline = true; this.bttnAddOptional.Label = global::Mono.Unix.Catalog.GetString("Add"); this.vbox3.Add(this.bttnAddOptional); - global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnAddOptional])); - w19.Position = 0; - w19.Expand = false; - w19.Fill = false; + global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnAddOptional])); + w13.Position = 0; + w13.Expand = false; + w13.Fill = false; // Container child vbox3.Gtk.Box+BoxChild this.bttnEditOptional = new global::Gtk.Button(); this.bttnEditOptional.CanFocus = true; @@ -246,10 +179,21 @@ this.bttnEditOptional.UseUnderline = true; this.bttnEditOptional.Label = global::Mono.Unix.Catalog.GetString("Edit"); this.vbox3.Add(this.bttnEditOptional); - global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnEditOptional])); - w20.Position = 1; - w20.Expand = false; - w20.Fill = false; + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnEditOptional])); + w14.Position = 1; + w14.Expand = false; + w14.Fill = false; + // Container child vbox3.Gtk.Box+BoxChild + this.bttnReplace = new global::Gtk.Button(); + this.bttnReplace.CanFocus = true; + this.bttnReplace.Name = "bttnReplace"; + this.bttnReplace.UseUnderline = true; + this.bttnReplace.Label = global::Mono.Unix.Catalog.GetString("Replace"); + this.vbox3.Add(this.bttnReplace); + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnReplace])); + w15.Position = 2; + w15.Expand = false; + w15.Fill = false; // Container child vbox3.Gtk.Box+BoxChild this.bttnRemove = new global::Gtk.Button(); this.bttnRemove.CanFocus = true; @@ -257,23 +201,21 @@ this.bttnRemove.UseUnderline = true; this.bttnRemove.Label = global::Mono.Unix.Catalog.GetString("Remove"); this.vbox3.Add(this.bttnRemove); - global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnRemove])); - w21.Position = 2; - w21.Expand = false; - w21.Fill = false; + global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnRemove])); + w16.Position = 3; + w16.Expand = false; + w16.Fill = false; this.table1.Add(this.vbox3); - global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table1[this.vbox3])); - w22.TopAttach = ((uint)(1)); - w22.BottomAttach = ((uint)(2)); - w22.LeftAttach = ((uint)(2)); - w22.RightAttach = ((uint)(3)); - w22.XOptions = ((global::Gtk.AttachOptions)(4)); - w22.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1[this.vbox3])); + w17.LeftAttach = ((uint)(2)); + w17.RightAttach = ((uint)(3)); + w17.XOptions = ((global::Gtk.AttachOptions)(4)); + w17.YOptions = ((global::Gtk.AttachOptions)(4)); this.vbox1.Add(this.table1); - global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.table1])); - w23.Position = 3; - w23.Expand = false; - w23.Fill = false; + global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.table1])); + w18.Position = 3; + w18.Expand = false; + w18.Fill = false; this.Add(this.vbox1); if ((this.Child != null)) {
--- 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>