diff --git a/ThePimp/ThePimp.mdp b/ThePimp/ThePimp.mdp
index 1d06215..75b3e7e 100644
--- a/ThePimp/ThePimp.mdp
+++ b/ThePimp/ThePimp.mdp
@@ -66,4 +66,4 @@
ThePimp.ToolBox
-
+
\ No newline at end of file
diff --git a/ThePimp/gtk-gui/ThePimp.AboutWindow.cs b/ThePimp/gtk-gui/ThePimp.AboutWindow.cs
index 03f423d..91dc316 100644
--- a/ThePimp/gtk-gui/ThePimp.AboutWindow.cs
+++ b/ThePimp/gtk-gui/ThePimp.AboutWindow.cs
@@ -32,10 +32,11 @@ namespace ThePimp {
this.Title = Mono.Unix.Catalog.GetString("About The Pimp");
this.Icon = Stetic.IconLoader.LoadIcon(this, "gtk-about", Gtk.IconSize.Menu, 16);
this.TypeHint = ((Gdk.WindowTypeHint)(1));
- this.WindowPosition = ((Gtk.WindowPosition)(4));
+ this.WindowPosition = ((Gtk.WindowPosition)(3));
this.Modal = true;
this.DefaultWidth = 450;
this.DefaultHeight = 300;
+ this.Gravity = ((Gdk.Gravity)(5));
// Container child ThePimp.AboutWindow.Gtk.Container+ContainerChild
this.vbox2 = new Gtk.VBox();
this.vbox2.Name = "vbox2";
diff --git a/ThePimp/gtk-gui/ThePimp.NewFile.cs b/ThePimp/gtk-gui/ThePimp.NewFile.cs
index 8393cd1..5ff9466 100644
--- a/ThePimp/gtk-gui/ThePimp.NewFile.cs
+++ b/ThePimp/gtk-gui/ThePimp.NewFile.cs
@@ -23,10 +23,6 @@ namespace ThePimp {
private Gtk.Table table1;
- private Gtk.Entry entry1;
-
- private Gtk.Entry entry2;
-
private Gtk.Label label1;
private Gtk.Label label2;
@@ -35,6 +31,10 @@ namespace ThePimp {
private Gtk.Label label4;
+ private Gtk.SpinButton spinbutton1;
+
+ private Gtk.SpinButton spinbutton2;
+
private Gtk.Label GtkLabel3;
private Gtk.Frame frame2;
@@ -59,7 +59,9 @@ namespace ThePimp {
this.Name = "ThePimp.NewFile";
this.Title = Mono.Unix.Catalog.GetString("New Image");
this.Icon = Stetic.IconLoader.LoadIcon(this, "gtk-new", Gtk.IconSize.Menu, 16);
+ this.TypeHint = ((Gdk.WindowTypeHint)(1));
this.WindowPosition = ((Gtk.WindowPosition)(4));
+ this.Modal = true;
this.HasSeparator = false;
// Internal child ThePimp.NewFile.VBox
Gtk.VBox w1 = this.VBox;
@@ -88,78 +90,76 @@ namespace ThePimp {
this.table1.RowSpacing = ((uint)(6));
this.table1.ColumnSpacing = ((uint)(6));
// Container child table1.Gtk.Table+TableChild
- this.entry1 = new Gtk.Entry();
- this.entry1.CanFocus = true;
- this.entry1.Name = "entry1";
- this.entry1.Text = Mono.Unix.Catalog.GetString("1024");
- this.entry1.IsEditable = true;
- this.entry1.WidthChars = 6;
- this.entry1.InvisibleChar = '●';
- this.entry1.Xalign = 1F;
- this.table1.Add(this.entry1);
- 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;
- this.entry2.Name = "entry2";
- this.entry2.Text = Mono.Unix.Catalog.GetString("768");
- this.entry2.IsEditable = true;
- this.entry2.WidthChars = 6;
- this.entry2.InvisibleChar = '●';
- this.entry2.Xalign = 1F;
- this.table1.Add(this.entry2);
- 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 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));
+ Gtk.Table.TableChild w2 = ((Gtk.Table.TableChild)(this.table1[this.label1]));
+ w2.LeftAttach = ((uint)(2));
+ w2.RightAttach = ((uint)(3));
+ w2.XOptions = ((Gtk.AttachOptions)(4));
+ w2.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 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));
+ Gtk.Table.TableChild w3 = ((Gtk.Table.TableChild)(this.table1[this.label2]));
+ w3.TopAttach = ((uint)(1));
+ w3.BottomAttach = ((uint)(2));
+ w3.LeftAttach = ((uint)(2));
+ w3.RightAttach = ((uint)(3));
+ w3.XOptions = ((Gtk.AttachOptions)(4));
+ w3.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 w6 = ((Gtk.Table.TableChild)(this.table1[this.label3]));
- w6.XOptions = ((Gtk.AttachOptions)(0));
- w6.YOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w4 = ((Gtk.Table.TableChild)(this.table1[this.label3]));
+ w4.XOptions = ((Gtk.AttachOptions)(0));
+ w4.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 w7 = ((Gtk.Table.TableChild)(this.table1[this.label4]));
+ Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.table1[this.label4]));
+ w5.TopAttach = ((uint)(1));
+ w5.BottomAttach = ((uint)(2));
+ w5.XOptions = ((Gtk.AttachOptions)(0));
+ w5.YOptions = ((Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.spinbutton1 = new Gtk.SpinButton(1, 1000000, 1);
+ this.spinbutton1.CanFocus = true;
+ this.spinbutton1.Name = "spinbutton1";
+ this.spinbutton1.Adjustment.PageIncrement = 10;
+ this.spinbutton1.ClimbRate = 1;
+ this.spinbutton1.Numeric = true;
+ this.spinbutton1.Value = 1600;
+ this.table1.Add(this.spinbutton1);
+ Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table1[this.spinbutton1]));
+ w6.LeftAttach = ((uint)(1));
+ w6.RightAttach = ((uint)(2));
+ w6.XOptions = ((Gtk.AttachOptions)(4));
+ w6.YOptions = ((Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.spinbutton2 = new Gtk.SpinButton(1, 1000000, 1);
+ this.spinbutton2.CanFocus = true;
+ this.spinbutton2.Name = "spinbutton2";
+ this.spinbutton2.Adjustment.PageIncrement = 10;
+ this.spinbutton2.ClimbRate = 1;
+ this.spinbutton2.Numeric = true;
+ this.spinbutton2.Value = 1200;
+ this.table1.Add(this.spinbutton2);
+ Gtk.Table.TableChild w7 = ((Gtk.Table.TableChild)(this.table1[this.spinbutton2]));
w7.TopAttach = ((uint)(1));
w7.BottomAttach = ((uint)(2));
- w7.XOptions = ((Gtk.AttachOptions)(0));
+ w7.LeftAttach = ((uint)(1));
+ w7.RightAttach = ((uint)(2));
+ w7.XOptions = ((Gtk.AttachOptions)(4));
w7.YOptions = ((Gtk.AttachOptions)(4));
this.vbox3.Add(this.table1);
Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.vbox3[this.table1]));
@@ -261,7 +261,7 @@ namespace ThePimp {
this.Child.ShowAll();
}
this.DefaultWidth = 240;
- this.DefaultHeight = 202;
+ this.DefaultHeight = 221;
this.Show();
}
}
diff --git a/ThePimp/gtk-gui/gui.stetic b/ThePimp/gtk-gui/gui.stetic
index 3e07412..b974778 100644
--- a/ThePimp/gtk-gui/gui.stetic
+++ b/ThePimp/gtk-gui/gui.stetic
@@ -677,10 +677,11 @@
About The Pimp
stock:gtk-about Menu
Dialog
- CenterOnParent
+ CenterAlways
True
450
300
+ Center
@@ -761,11 +762,13 @@
-
+
New Image
stock:gtk-new Menu
+ Dialog
CenterOnParent
+ True
2
False
False
@@ -800,19 +803,14 @@
6
6
-
+
- True
- 1024
- True
- 6
- ●
- 1
+ px
- 1
- 2
- False
+ 2
+ 3
+ True
Fill
Fill
False
@@ -824,21 +822,16 @@
-
+
- True
- 768
- True
- 6
- ●
- 1
+ px
1
2
- 1
- 2
- False
+ 2
+ 3
+ True
Fill
Fill
False
@@ -850,18 +843,17 @@
-
+
- px
+ Width
+ Right
- 2
- 3
- True
- Fill
+ False
+ 0
Fill
False
- True
+ False
False
False
True
@@ -869,20 +861,19 @@
-
+
- px
+ Height
+ Right
1
2
- 2
- 3
- True
- Fill
+ False
+ 0
Fill
False
- True
+ False
False
False
True
@@ -890,17 +881,25 @@
-
+
- Width
- Right
+ True
+ 1
+ 1000000
+ 10
+ 1
+ 1
+ True
+ 1600
- False
- 0
+ 1
+ 2
+ True
+ Fill
Fill
False
- False
+ True
False
False
True
@@ -908,19 +907,27 @@
-
+
- Height
- Right
+ True
+ 1
+ 1000000
+ 10
+ 1
+ 1
+ True
+ 1200
1
2
- False
- 0
+ 1
+ 2
+ True
+ Fill
Fill
False
- False
+ True
False
False
True
diff --git a/ThePimp/src/AboutWindow.cs b/ThePimp/src/AboutWindow.cs
index 3aa295b..94e1ab2 100644
--- a/ThePimp/src/AboutWindow.cs
+++ b/ThePimp/src/AboutWindow.cs
@@ -16,6 +16,7 @@ using System;
namespace ThePimp
{
+ [Gtk.Binding(Gdk.Key.Escape, "Destroy")]
public partial class AboutWindow : Gtk.Window
{
public AboutWindow() : base(Gtk.WindowType.Toplevel)
diff --git a/ThePimp/src/NewFile.cs b/ThePimp/src/NewFile.cs
index 24ecd94..86b9626 100644
--- a/ThePimp/src/NewFile.cs
+++ b/ThePimp/src/NewFile.cs
@@ -42,7 +42,7 @@ namespace ThePimp
break;
}
- return type + ":" + entry1.Text + "x" + entry2.Text;
+ return type + ":" + spinbutton1.Text + "x" + spinbutton2.Text;
}
}
}