From ce535c4f9c26247e2b3ac48888c8f13f98059c21 Mon Sep 17 00:00:00 2001 From: sam Date: Mon, 13 Oct 2008 21:17:48 +0000 Subject: [PATCH] ThePimp: reorganise "New Image" dialog. git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@2948 92316355-f0b4-4df1-b90c-862c8a59935f --- ThePimp/gtk-gui/ThePimp.NewFile.cs | 210 +++++++++++------ ThePimp/gtk-gui/gui.stetic | 364 ++++++++++++++++++----------- 2 files changed, 374 insertions(+), 200 deletions(-) diff --git a/ThePimp/gtk-gui/ThePimp.NewFile.cs b/ThePimp/gtk-gui/ThePimp.NewFile.cs index ed920d7..8393cd1 100644 --- a/ThePimp/gtk-gui/ThePimp.NewFile.cs +++ b/ThePimp/gtk-gui/ThePimp.NewFile.cs @@ -15,7 +15,11 @@ namespace ThePimp { private Gtk.VBox vbox2; - private Gtk.ComboBox combobox1; + private Gtk.Frame frame1; + + private Gtk.Alignment GtkAlignment3; + + private Gtk.VBox vbox3; private Gtk.Table table1; @@ -31,6 +35,20 @@ namespace ThePimp { private Gtk.Label label4; + private Gtk.Label GtkLabel3; + + private Gtk.Frame frame2; + + private Gtk.Alignment GtkAlignment; + + private Gtk.Table table2; + + private Gtk.ComboBox combobox1; + + private Gtk.Label label5; + + private Gtk.Label GtkLabel; + private Gtk.Button buttonCancel; private Gtk.Button buttonOk; @@ -51,19 +69,20 @@ namespace ThePimp { this.vbox2 = new Gtk.VBox(); this.vbox2.Name = "vbox2"; this.vbox2.Spacing = 6; - this.vbox2.BorderWidth = ((uint)(5)); - // Container child vbox2.Gtk.Box+BoxChild - this.combobox1 = Gtk.ComboBox.NewText(); - this.combobox1.AppendText(Mono.Unix.Catalog.GetString("Random Noise")); - this.combobox1.AppendText(Mono.Unix.Catalog.GetString("Bayer Dithering Pattern")); - this.combobox1.Name = "combobox1"; - this.combobox1.Active = 0; - this.vbox2.Add(this.combobox1); - Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox2[this.combobox1])); - w2.Position = 0; - w2.Expand = false; - w2.Fill = false; // Container child vbox2.Gtk.Box+BoxChild + this.frame1 = new Gtk.Frame(); + this.frame1.Name = "frame1"; + this.frame1.ShadowType = ((Gtk.ShadowType)(0)); + // Container child frame1.Gtk.Container+ContainerChild + this.GtkAlignment3 = new Gtk.Alignment(0F, 0F, 1F, 1F); + this.GtkAlignment3.Name = "GtkAlignment3"; + this.GtkAlignment3.LeftPadding = ((uint)(12)); + // Container child GtkAlignment3.Gtk.Container+ContainerChild + this.vbox3 = new Gtk.VBox(); + this.vbox3.Name = "vbox3"; + this.vbox3.Spacing = 6; + this.vbox3.BorderWidth = ((uint)(5)); + // Container child vbox3.Gtk.Box+BoxChild this.table1 = new Gtk.Table(((uint)(2)), ((uint)(3)), false); this.table1.Name = "table1"; this.table1.RowSpacing = ((uint)(6)); @@ -78,11 +97,11 @@ namespace ThePimp { this.entry1.InvisibleChar = '●'; this.entry1.Xalign = 1F; this.table1.Add(this.entry1); - Gtk.Table.TableChild w3 = ((Gtk.Table.TableChild)(this.table1[this.entry1])); - w3.LeftAttach = ((uint)(1)); - w3.RightAttach = ((uint)(2)); - w3.XOptions = ((Gtk.AttachOptions)(4)); - w3.YOptions = ((Gtk.AttachOptions)(4)); + Gtk.Table.TableChild w2 = ((Gtk.Table.TableChild)(this.table1[this.entry1])); + w2.LeftAttach = ((uint)(1)); + w2.RightAttach = ((uint)(2)); + w2.XOptions = ((Gtk.AttachOptions)(4)); + w2.YOptions = ((Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.entry2 = new Gtk.Entry(); this.entry2.CanFocus = true; @@ -93,71 +112,126 @@ namespace ThePimp { this.entry2.InvisibleChar = '●'; this.entry2.Xalign = 1F; this.table1.Add(this.entry2); - Gtk.Table.TableChild w4 = ((Gtk.Table.TableChild)(this.table1[this.entry2])); - w4.TopAttach = ((uint)(1)); - w4.BottomAttach = ((uint)(2)); - w4.LeftAttach = ((uint)(1)); - w4.RightAttach = ((uint)(2)); - w4.XOptions = ((Gtk.AttachOptions)(4)); - w4.YOptions = ((Gtk.AttachOptions)(4)); + Gtk.Table.TableChild w3 = ((Gtk.Table.TableChild)(this.table1[this.entry2])); + w3.TopAttach = ((uint)(1)); + w3.BottomAttach = ((uint)(2)); + w3.LeftAttach = ((uint)(1)); + w3.RightAttach = ((uint)(2)); + w3.XOptions = ((Gtk.AttachOptions)(4)); + w3.YOptions = ((Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.label1 = new Gtk.Label(); this.label1.Name = "label1"; this.label1.LabelProp = Mono.Unix.Catalog.GetString("px"); this.table1.Add(this.label1); - Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.table1[this.label1])); - w5.LeftAttach = ((uint)(2)); - w5.RightAttach = ((uint)(3)); - w5.XOptions = ((Gtk.AttachOptions)(4)); - w5.YOptions = ((Gtk.AttachOptions)(4)); + Gtk.Table.TableChild w4 = ((Gtk.Table.TableChild)(this.table1[this.label1])); + w4.LeftAttach = ((uint)(2)); + w4.RightAttach = ((uint)(3)); + w4.XOptions = ((Gtk.AttachOptions)(4)); + w4.YOptions = ((Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.label2 = new Gtk.Label(); this.label2.Name = "label2"; this.label2.LabelProp = Mono.Unix.Catalog.GetString("px"); this.table1.Add(this.label2); - Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table1[this.label2])); - w6.TopAttach = ((uint)(1)); - w6.BottomAttach = ((uint)(2)); - w6.LeftAttach = ((uint)(2)); - w6.RightAttach = ((uint)(3)); - w6.XOptions = ((Gtk.AttachOptions)(4)); - w6.YOptions = ((Gtk.AttachOptions)(4)); + Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.table1[this.label2])); + w5.TopAttach = ((uint)(1)); + w5.BottomAttach = ((uint)(2)); + w5.LeftAttach = ((uint)(2)); + w5.RightAttach = ((uint)(3)); + w5.XOptions = ((Gtk.AttachOptions)(4)); + w5.YOptions = ((Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.label3 = new Gtk.Label(); this.label3.Name = "label3"; this.label3.LabelProp = Mono.Unix.Catalog.GetString("Width"); this.label3.Justify = ((Gtk.Justification)(1)); this.table1.Add(this.label3); - Gtk.Table.TableChild w7 = ((Gtk.Table.TableChild)(this.table1[this.label3])); - w7.XOptions = ((Gtk.AttachOptions)(0)); - w7.YOptions = ((Gtk.AttachOptions)(4)); + Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table1[this.label3])); + w6.XOptions = ((Gtk.AttachOptions)(0)); + w6.YOptions = ((Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.label4 = new Gtk.Label(); this.label4.Name = "label4"; this.label4.LabelProp = Mono.Unix.Catalog.GetString("Height"); this.label4.Justify = ((Gtk.Justification)(1)); this.table1.Add(this.label4); - Gtk.Table.TableChild w8 = ((Gtk.Table.TableChild)(this.table1[this.label4])); - w8.TopAttach = ((uint)(1)); - w8.BottomAttach = ((uint)(2)); - w8.XOptions = ((Gtk.AttachOptions)(0)); - w8.YOptions = ((Gtk.AttachOptions)(4)); - this.vbox2.Add(this.table1); - Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox2[this.table1])); - w9.Position = 1; - w9.Expand = false; - w9.Fill = false; + Gtk.Table.TableChild w7 = ((Gtk.Table.TableChild)(this.table1[this.label4])); + w7.TopAttach = ((uint)(1)); + w7.BottomAttach = ((uint)(2)); + w7.XOptions = ((Gtk.AttachOptions)(0)); + w7.YOptions = ((Gtk.AttachOptions)(4)); + this.vbox3.Add(this.table1); + Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.vbox3[this.table1])); + w8.Position = 0; + w8.Expand = false; + w8.Fill = false; + this.GtkAlignment3.Add(this.vbox3); + this.frame1.Add(this.GtkAlignment3); + this.GtkLabel3 = new Gtk.Label(); + this.GtkLabel3.Name = "GtkLabel3"; + this.GtkLabel3.LabelProp = Mono.Unix.Catalog.GetString("Image Size"); + this.GtkLabel3.UseMarkup = true; + this.frame1.LabelWidget = this.GtkLabel3; + this.vbox2.Add(this.frame1); + Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox2[this.frame1])); + w11.Position = 0; + w11.Expand = false; + w11.Fill = false; + // Container child vbox2.Gtk.Box+BoxChild + this.frame2 = new Gtk.Frame(); + this.frame2.Name = "frame2"; + this.frame2.ShadowType = ((Gtk.ShadowType)(0)); + // Container child frame2.Gtk.Container+ContainerChild + this.GtkAlignment = new Gtk.Alignment(0F, 0F, 1F, 1F); + this.GtkAlignment.Name = "GtkAlignment"; + this.GtkAlignment.LeftPadding = ((uint)(12)); + // Container child GtkAlignment.Gtk.Container+ContainerChild + this.table2 = new Gtk.Table(((uint)(1)), ((uint)(2)), false); + this.table2.Name = "table2"; + this.table2.RowSpacing = ((uint)(6)); + this.table2.ColumnSpacing = ((uint)(6)); + // Container child table2.Gtk.Table+TableChild + this.combobox1 = Gtk.ComboBox.NewText(); + this.combobox1.AppendText(Mono.Unix.Catalog.GetString("Random Noise")); + this.combobox1.AppendText(Mono.Unix.Catalog.GetString("Bayer Dithering Pattern")); + this.combobox1.Name = "combobox1"; + this.combobox1.Active = 0; + this.table2.Add(this.combobox1); + Gtk.Table.TableChild w12 = ((Gtk.Table.TableChild)(this.table2[this.combobox1])); + w12.LeftAttach = ((uint)(1)); + w12.RightAttach = ((uint)(2)); + w12.XOptions = ((Gtk.AttachOptions)(4)); + w12.YOptions = ((Gtk.AttachOptions)(4)); + // Container child table2.Gtk.Table+TableChild + this.label5 = new Gtk.Label(); + this.label5.Name = "label5"; + this.label5.LabelProp = Mono.Unix.Catalog.GetString("Fill with"); + this.table2.Add(this.label5); + Gtk.Table.TableChild w13 = ((Gtk.Table.TableChild)(this.table2[this.label5])); + w13.XOptions = ((Gtk.AttachOptions)(4)); + w13.YOptions = ((Gtk.AttachOptions)(4)); + this.GtkAlignment.Add(this.table2); + this.frame2.Add(this.GtkAlignment); + this.GtkLabel = new Gtk.Label(); + this.GtkLabel.Name = "GtkLabel"; + this.GtkLabel.LabelProp = Mono.Unix.Catalog.GetString("Advanced"); + this.GtkLabel.UseMarkup = true; + this.frame2.LabelWidget = this.GtkLabel; + this.vbox2.Add(this.frame2); + Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.vbox2[this.frame2])); + w16.Position = 1; + w16.Expand = false; + w16.Fill = false; w1.Add(this.vbox2); - Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(w1[this.vbox2])); - w10.Position = 0; - w10.Expand = false; - w10.Fill = false; + Gtk.Box.BoxChild w17 = ((Gtk.Box.BoxChild)(w1[this.vbox2])); + w17.Position = 0; // Internal child ThePimp.NewFile.ActionArea - Gtk.HButtonBox w11 = this.ActionArea; - w11.Name = "dialog1_ActionArea"; - w11.Spacing = 6; - w11.BorderWidth = ((uint)(5)); - w11.LayoutStyle = ((Gtk.ButtonBoxStyle)(4)); + Gtk.HButtonBox w18 = this.ActionArea; + w18.Name = "dialog1_ActionArea"; + w18.Spacing = 6; + w18.BorderWidth = ((uint)(5)); + w18.LayoutStyle = ((Gtk.ButtonBoxStyle)(4)); // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild this.buttonCancel = new Gtk.Button(); this.buttonCancel.CanDefault = true; @@ -167,9 +241,9 @@ namespace ThePimp { this.buttonCancel.UseUnderline = true; this.buttonCancel.Label = "gtk-cancel"; this.AddActionWidget(this.buttonCancel, -6); - Gtk.ButtonBox.ButtonBoxChild w12 = ((Gtk.ButtonBox.ButtonBoxChild)(w11[this.buttonCancel])); - w12.Expand = false; - w12.Fill = false; + Gtk.ButtonBox.ButtonBoxChild w19 = ((Gtk.ButtonBox.ButtonBoxChild)(w18[this.buttonCancel])); + w19.Expand = false; + w19.Fill = false; // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild this.buttonOk = new Gtk.Button(); this.buttonOk.CanDefault = true; @@ -179,15 +253,15 @@ namespace ThePimp { this.buttonOk.UseUnderline = true; this.buttonOk.Label = "gtk-ok"; this.AddActionWidget(this.buttonOk, -5); - Gtk.ButtonBox.ButtonBoxChild w13 = ((Gtk.ButtonBox.ButtonBoxChild)(w11[this.buttonOk])); - w13.Position = 1; - w13.Expand = false; - w13.Fill = false; + Gtk.ButtonBox.ButtonBoxChild w20 = ((Gtk.ButtonBox.ButtonBoxChild)(w18[this.buttonOk])); + w20.Position = 1; + w20.Expand = false; + w20.Fill = false; if ((this.Child != null)) { this.Child.ShowAll(); } - this.DefaultWidth = 400; - this.DefaultHeight = 300; + this.DefaultWidth = 240; + this.DefaultHeight = 202; this.Show(); } } diff --git a/ThePimp/gtk-gui/gui.stetic b/ThePimp/gtk-gui/gui.stetic index 0273604..eec13d8 100644 --- a/ThePimp/gtk-gui/gui.stetic +++ b/ThePimp/gtk-gui/gui.stetic @@ -755,7 +755,7 @@ - + New Image stock:gtk-new Menu @@ -771,155 +771,254 @@ 6 - 5 - + - True - Random Noise -Bayer Dithering Pattern - 0 - - - 0 - True - False - False - - - - - - 2 - 3 - 6 - 6 - - - - True - 1024 - True - 6 - ● - 1 - - - 1 - 2 - False - Fill - Fill - False - True - False - False - True - False - - - - - - True - 768 - True - 6 - ● - 1 - - - 1 - 2 - 1 - 2 - False - Fill - Fill - False - True - False - False - True - False - - + None - + - px + 0 + 0 + 12 + + + + 6 + 5 + + + + 2 + 3 + 6 + 6 + + + + True + 1024 + True + 6 + ● + 1 + + + 1 + 2 + False + Fill + Fill + False + True + False + False + True + False + + + + + + True + 768 + True + 6 + ● + 1 + + + 1 + 2 + 1 + 2 + False + Fill + Fill + False + True + False + False + True + False + + + + + + px + + + 2 + 3 + True + Fill + Fill + False + True + False + False + True + False + + + + + + px + + + 1 + 2 + 2 + 3 + True + Fill + Fill + False + True + False + False + True + False + + + + + + Width + Right + + + False + 0 + Fill + False + False + False + False + True + False + + + + + + Height + Right + + + 1 + 2 + False + 0 + Fill + False + False + False + False + True + False + + + + + 0 + True + False + False + + + + - - 2 - 3 - True - Fill - Fill - False - True - False - False - True - False - - + - px + <b>Image Size</b> + True - 1 - 2 - 2 - 3 - True - Fill - Fill - False - True - False - False - True - False + label_item + + + 0 + True + False + False + + + + + + None - + - Width - Right + 0 + 0 + 12 + + + + 1 + 2 + 6 + 6 + + + + True + Random Noise +Bayer Dithering Pattern + 0 + + + 1 + 2 + True + Fill + Fill + False + True + False + False + True + False + + + + + + Fill with + + + True + Fill + Fill + False + True + False + False + True + False + + + + - - False - 0 - Fill - False - False - False - False - True - False - - + - Height - Right + <b>Advanced</b> + True - 1 - 2 - False - 0 - Fill - False - False - False - False - True - False + label_item @@ -930,12 +1029,13 @@ Bayer Dithering Pattern False + + + 0 True - False - False