diff --git a/stickynotes/stickynotes.ui b/stickynotes/stickynotes.ui
index f98dc78..bddbb01 100644
--- a/stickynotes/stickynotes.ui
+++ b/stickynotes/stickynotes.ui
@@ -111,109 +111,77 @@
12
6
-
-
+
True
- 16
-
-
- True
- 0
- _Font:
- True
- default_font
-
-
+ 0
+ H_eight:
+ True
+ height_spin
- 6
- 7
+ 1
+ 2
GTK_FILL
+
-
+
True
True
- Use fo_nt from the system theme
- True
- True
+ Specify the default width (in pixels) of new notes
+ adjustment1
+ 1
+ True
+ 1
2
- 5
- 6
- GTK_FILL
-
- True
- 16
-
-
- True
- 0
- Note C_olor:
- True
- default_color
-
-
-
-
- 4
- 5
- GTK_FILL
- GTK_FILL
-
-
-
-
+
True
- 16
-
-
- True
- 0
- Font Co_lor:
- True
- font_color
-
-
+ True
+ Specify the default height (in pixels) of new notes
+ adjustment2
+ 1
+ True
- 3
- 4
- GTK_FILL
- GTK_FILL
+ 1
+ 2
+ 1
+ 2
+
-
+
True
True
+ Use co_lor from the system theme
+ True
+ True
- 1
2
- 3
- 4
+ 2
+ 3
GTK_FILL
@@ -234,77 +202,109 @@
-
+
True
True
- Use co_lor from the system theme
- True
- True
+ 1
2
- 2
- 3
+ 3
+ 4
GTK_FILL
-
+
True
- True
- Specify the default height (in pixels) of new notes
- adjustment1
- 1
- True
+ 16
+
+
+ True
+ 0
+ Font Co_lor:
+ True
+ font_color
+
+
- 1
- 2
- 1
- 2
-
+ 3
+ 4
+ GTK_FILL
+ GTK_FILL
-
+
+ True
+ 16
+
+
+ True
+ 0
+ Note C_olor:
+ True
+ default_color
+
+
+
+
+ 4
+ 5
+ GTK_FILL
+ GTK_FILL
+
+
+
+
True
True
- Specify the default width (in pixels) of new notes
- adjustment2
- 1
- True
+ Use fo_nt from the system theme
+ True
+ True
- 1
2
+ 5
+ 6
+ GTK_FILL
-
+
True
- 0
- H_eight:
- True
- height_spin
+ 16
+
+
+ True
+ 0
+ _Font:
+ True
+ default_font
+
+
- 1
- 2
+ 6
+ 7
GTK_FILL
-
-
+
True
- 0
- _Width:
- True
- width_spin
+ True
+ Choose a font to use for all sticky notes
+ Pick a default sticky note font
+ 1
+ 2
+ 6
+ 7
GTK_FILL
@@ -368,34 +368,34 @@
-
+
True
True
- Choose if the default style is forced on all notes
- Force _default color and font on notes
+ Choose if notes are visible on all workspaces
+ _Put notes on all workspaces
True
True
2
- 2
- 3
+ 1
+ 2
-
+
True
True
- Choose if notes are visible on all workspaces
- _Put notes on all workspaces
+ Choose if the default style is forced on all notes
+ Force _default color and font on notes
True
True
2
- 1
- 2
+ 2
+ 3
@@ -435,6 +435,10 @@
gtk-help
True
+
+ False
+ False
+
@@ -445,6 +449,8 @@
True
+ False
+ False
1
@@ -457,13 +463,13 @@
- default_font
- sys_font_check
- font_color
- default_color
sys_color_check
- force_default_check
+ default_color
+ font_color
+ sys_font_check
+ default_font
sticky_check
+ force_default_check
helpbutton1
closebutton1
@@ -525,6 +531,10 @@ This cannot be undone.
gtk-cancel
True
+
+ False
+ False
+
@@ -535,6 +545,8 @@ This cannot be undone.
True
+ False
+ False
1
@@ -611,6 +623,10 @@ This cannot be undone.
gtk-cancel
True
+
+ False
+ False
+
@@ -654,6 +670,8 @@ This cannot be undone.
+ False
+ False
1
@@ -853,95 +871,67 @@ This cannot be undone.
12
6
-
+
True
- True
- Choose a font for the note
- Pick a font for the sticky note
+ 0
+ _Title:
+ True
+ title_entry
- 1
- 2
- 5
- 6
GTK_FILL
-
- True
- 16
-
-
- True
- 0
- _Font:
- True
- note_color
-
-
-
-
- 5
- 6
- GTK_FILL
-
-
-
-
+
True
True
- Use default fo_nt
- True
- True
+ Specify a title for the note
+ 1
2
- 4
- 5
- GTK_FILL
-
+
True
True
- Choose a color for the note
- Pick a color for the sticky note
+ Use default co_lor
+ True
+ True
- 1
2
- 3
- 4
- GTK_FILL
+ 1
+ 2
-
+
True
16
-
+
True
0
- Note _Color:
+ Font C_olor:
True
- note_color
+ font_color
- 3
- 4
+ 2
+ 3
GTK_FILL
-
+
True
True
@@ -955,62 +945,89 @@ This cannot be undone.
-
+
True
16
-
+
True
0
- Font C_olor:
+ Note _Color:
True
- font_color
+ note_color
- 2
- 3
+ 3
+ 4
GTK_FILL
-
+
True
True
- Use default co_lor
- True
- True
+ Choose a color for the note
+ Pick a color for the sticky note
+ 1
2
- 1
- 2
+ 3
+ 4
+ GTK_FILL
-
+
True
True
- Specify a title for the note
- *
+ Use default fo_nt
+ True
+ True
- 1
2
+ 4
+ 5
+ GTK_FILL
-
+
True
- 0
- _Title:
- True
- title_entry
+ 16
+
+
+ True
+ 0
+ _Font:
+ True
+ note_color
+
+
+
+
+ 5
+ 6
+ GTK_FILL
+
+
+
+
+ True
+ True
+ Choose a font for the note
+ Pick a font for the sticky note
+ 1
+ 2
+ 5
+ 6
GTK_FILL
@@ -1050,6 +1067,10 @@ This cannot be undone.
gtk-help
True
+
+ False
+ False
+
@@ -1060,6 +1081,8 @@ This cannot be undone.
True
+ False
+ False
1
@@ -1072,11 +1095,11 @@ This cannot be undone.
- note_font
- def_font_check
- note_color
- font_color
def_color_check
+ font_color1
+ note_color
+ def_font_check
+ note_font
helpbutton2
closebutton2