]> saetta.ns0.it Git - reptool/greptool/commitdiff
projects / reptool / greptool / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dbe1016)
Some code adjustments.
authorAndrea Zagli <azagli@libero.it>
Sun, 22 Jul 2007 07:53:09 +0000 (07:53 +0000)
committerAndrea Zagli <azagli@libero.it>
Sun, 22 Jul 2007 07:53:09 +0000 (07:53 +0000)
Added CanvasImage.
Managed ObjectPropoerties.
Continued selection.

git-svn-id: svn+ssh://saetta.homelinux.org/svn/greptool/trunk@11 76169498-11ee-428b-941f-28d7a79d5cb2

15 files changed:
configure.ac patch | blob | history
data/greptool/Makefile.am patch | blob | history
data/greptool/glade/greptool.glade patch | blob | history
src/Makefile.am patch | blob | history
src/canvas.c patch | blob | history
src/canvasellipse.c patch | blob | history
src/canvasimage.c [new file with mode: 0644] patch | blob
src/canvasimage.h [new file with mode: 0644] patch | blob
src/canvasitem.c patch | blob | history
src/main.c patch | blob | history
src/main.h patch | blob | history
src/object_properties.c patch | blob | history
src/object_properties.h patch | blob | history
src/objects_tree.c patch | blob | history
src/objects_tree.h patch | blob | history

diff --git a/configure.ac b/configure.ac
index 6717128dcfcd2d27b60adbc17d9ede9f33837904..469cdee5ce77e62d32c7d2579fe2f36a0638e83e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,7 @@ AC_CONFIG_FILES([
   data/Makefile
   data/greptool/Makefile
   data/greptool/glade/Makefile
+  data/greptool/pixmaps/Makefile
 ])
 
 AC_OUTPUT
diff --git a/data/greptool/Makefile.am b/data/greptool/Makefile.am
index 21cc77bf4bdbec8e66cf5fe1f0cccc82781f610c..d149b7d81e6747301073e37faa00162919231dcf 100644 (file)
--- a/data/greptool/Makefile.am
+++ b/data/greptool/Makefile.am
@@ -1 +1 @@
-SUBDIRS = glade
+SUBDIRS = glade pixmaps
diff --git a/data/greptool/glade/greptool.glade b/data/greptool/glade/greptool.glade
index e74f558e0767d11a6ec92174676f8b7feb7859f8..b8ef728af821e94e85a2a09ba9ea0f108631655d 100644 (file)
--- a/data/greptool/glade/greptool.glade
+++ b/data/greptool/glade/greptool.glade
@@ -334,6 +334,7 @@
                 <child>
                   <widget class="GtkToolButton" id="tbtn_cut">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Cut to clipboard</property>
                     <property name="stock_id">gtk-cut</property>
                   </widget>
                   <packing>
@@ -343,6 +344,7 @@
                 <child>
                   <widget class="GtkToolButton" id="tbtn_copy">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Copy to clipboard</property>
                     <property name="stock_id">gtk-copy</property>
                   </widget>
                   <packing>
@@ -352,6 +354,7 @@
                 <child>
                   <widget class="GtkToolButton" id="tbtn_paste">
                     <property name="visible">True</property>
+                    <property name="tooltip" translatable="yes">Paste from clipboard</property>
                     <property name="stock_id">gtk-paste</property>
                   </widget>
                   <packing>
@@ -536,27 +539,40 @@ You should have received a copy of the GNU General Public License along with Nau
                     <property name="column_spacing">4</property>
                     <property name="row_spacing">3</property>
                     <child>
-                      <widget class="GtkEntry" id="txt_cnc_string">
+                      <widget class="GtkLabel" id="label7">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Provider</property>
+                      </widget>
+                      <packing>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label8">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Connection String</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkComboBox" id="cb_providers">
+                      <widget class="GtkLabel" id="label9">
                         <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">SQL</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
@@ -579,39 +595,26 @@ You should have received a copy of the GNU General Public License along with Nau
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label9">
+                      <widget class="GtkComboBox" id="cb_providers">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">SQL</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label8">
+                      <widget class="GtkEntry" id="txt_cnc_string">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Connection String</property>
+                        <property name="can_focus">True</property>
                       </widget>
                       <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label7">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Provider</property>
-                      </widget>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
@@ -649,19 +652,27 @@ You should have received a copy of the GNU General Public License along with Nau
                     <property name="column_spacing">3</property>
                     <property name="row_spacing">3</property>
                     <child>
-                      <widget class="GtkCheckButton" id="chk_header_new_page_after">
+                      <widget class="GtkLabel" id="label10">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Height</property>
+                      </widget>
+                      <packing>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkSpinButton" id="spn_header_height">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="adjustment">1 1 10000 1 10 10</property>
+                        <property name="climb_rate">1</property>
+                        <property name="digits">2</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
@@ -679,26 +690,18 @@ You should have received a copy of the GNU General Public License along with Nau
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkSpinButton" id="spn_header_height">
+                      <widget class="GtkCheckButton" id="chk_header_new_page_after">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="adjustment">1 1 10000 1 10 10</property>
-                        <property name="climb_rate">1</property>
-                        <property name="digits">2</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label10">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Height</property>
-                      </widget>
-                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
@@ -745,19 +748,27 @@ You should have received a copy of the GNU General Public License along with Nau
                     <property name="column_spacing">3</property>
                     <property name="row_spacing">3</property>
                     <child>
-                      <widget class="GtkCheckButton" id="chk_footer_new_page_before">
+                      <widget class="GtkLabel" id="label12">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Height</property>
+                      </widget>
+                      <packing>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkSpinButton" id="spn_footer_height">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="adjustment">1 1 10000 1 10 10</property>
+                        <property name="climb_rate">1</property>
+                        <property name="digits">2</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
@@ -775,26 +786,18 @@ You should have received a copy of the GNU General Public License along with Nau
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkSpinButton" id="spn_footer_height">
+                      <widget class="GtkCheckButton" id="chk_footer_new_page_before">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="adjustment">1 1 10000 1 10 10</property>
-                        <property name="climb_rate">1</property>
-                        <property name="digits">2</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label12">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Height</property>
-                      </widget>
-                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
@@ -899,32 +902,35 @@ You should have received a copy of the GNU General Public License along with Nau
                     <property name="column_spacing">3</property>
                     <property name="row_spacing">3</property>
                     <child>
-                      <widget class="GtkComboBox" id="cb_size_type">
+                      <widget class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="items" translatable="yes">A4
-Custom</property>
-                        <signal name="changed" handler="page_properties_on_cb_size_type_changed"/>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Width</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label17">
+                      <widget class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Type</property>
+                        <property name="label" translatable="yes">Height</property>
                       </widget>
                       <packing>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkSpinButton" id="spn_height">
+                      <widget class="GtkSpinButton" id="spn_width">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -934,12 +940,11 @@ Custom</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkSpinButton" id="spn_width">
+                      <widget class="GtkSpinButton" id="spn_height">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -949,35 +954,33 @@ Custom</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label5">
+                      <widget class="GtkLabel" id="label17">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Height</property>
+                        <property name="label" translatable="yes">Type</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label3">
+                      <widget class="GtkComboBox" id="cb_size_type">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Width</property>
+                        <property name="items" translatable="yes">A4
+Custom</property>
+                        <signal name="changed" handler="page_properties_on_cb_size_type_changed"/>
                       </widget>
                       <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                       </packing>
                     </child>
                   </widget>
@@ -1020,22 +1023,61 @@ Custom</property>
                     <property name="column_spacing">3</property>
                     <property name="row_spacing">3</property>
                     <child>
-                      <widget class="GtkSpinButton" id="spn_margin_left">
+                      <widget class="GtkLabel" id="label6">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="adjustment">0 0 10000 1 10 10</property>
-                        <property name="digits">2</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Top</property>
+                      </widget>
+                      <packing>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label14">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Right</property>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label15">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Bottom</property>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label16">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Left</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
                         <property name="top_attach">3</property>
                         <property name="bottom_attach">4</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkSpinButton" id="spn_margin_bottom">
+                      <widget class="GtkSpinButton" id="spn_margin_top">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1045,8 +1087,6 @@ Custom</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
                       </packing>
                     </child>
                     <child>
@@ -1065,7 +1105,7 @@ Custom</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkSpinButton" id="spn_margin_top">
+                      <widget class="GtkSpinButton" id="spn_margin_bottom">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1075,60 +1115,23 @@ Custom</property>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label16">
+                      <widget class="GtkSpinButton" id="spn_margin_left">
                         <property name="visible">True</property>
+                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Left</property>
+                        <property name="adjustment">0 0 10000 1 10 10</property>
+                        <property name="digits">2</property>
                       </widget>
                       <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                         <property name="top_attach">3</property>
                         <property name="bottom_attach">4</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label15">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Bottom</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label14">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Right</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label6">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Top</property>
-                      </widget>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
                       </packing>
                     </child>
                   </widget>
@@ -1170,34 +1173,31 @@ Custom</property>
                     <property name="n_rows">2</property>
                     <property name="n_columns">4</property>
                     <child>
-                      <widget class="GtkLabel" id="label18">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Height</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSpinButton" id="spn_header_height">
+                      <widget class="GtkCheckButton" id="chk_header_last_page">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="adjustment">1 1 10000 1 10 10</property>
-                        <property name="digits">2</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
+                        <property name="left_attach">3</property>
                         <property name="right_attach">4</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label19">
+                      <widget class="GtkCheckButton" id="chk_header_first_page">
                         <property name="visible">True</property>
+                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">On First Page</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
                       </packing>
@@ -1217,35 +1217,38 @@ Custom</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="chk_header_first_page">
+                      <widget class="GtkLabel" id="label19">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="response_id">0</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">On First Page</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="chk_header_last_page">
+                      <widget class="GtkSpinButton" id="spn_header_height">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="response_id">0</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="adjustment">1 1 10000 1 10 10</property>
+                        <property name="digits">2</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">3</property>
+                        <property name="left_attach">1</property>
                         <property name="right_attach">4</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkLabel" id="label18">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Height</property>
+                      </widget>
+                    </child>
                   </widget>
                 </child>
               </widget>
@@ -1287,34 +1290,31 @@ Custom</property>
                     <property name="n_rows">2</property>
                     <property name="n_columns">4</property>
                     <child>
-                      <widget class="GtkLabel" id="label24">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Height</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSpinButton" id="spn_footer_height">
+                      <widget class="GtkCheckButton" id="chk_footer_last_page">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="adjustment">1 1 10000 1 10 10</property>
-                        <property name="digits">2</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
+                        <property name="left_attach">3</property>
                         <property name="right_attach">4</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label25">
+                      <widget class="GtkCheckButton" id="chk_footer_first_page">
                         <property name="visible">True</property>
+                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">On First Page</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
                       </packing>
@@ -1334,35 +1334,38 @@ Custom</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="chk_footer_first_page">
+                      <widget class="GtkLabel" id="label25">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="response_id">0</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">On First Page</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkCheckButton" id="chk_footer_last_page">
+                      <widget class="GtkSpinButton" id="spn_footer_height">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="response_id">0</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="adjustment">1 1 10000 1 10 10</property>
+                        <property name="digits">2</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">3</property>
+                        <property name="left_attach">1</property>
                         <property name="right_attach">4</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkLabel" id="label24">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Height</property>
+                      </widget>
+                    </child>
                   </widget>
                 </child>
               </widget>
@@ -1450,6 +1453,7 @@ Custom</property>
             <property name="can_focus">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="headers_clickable">True</property>
+            <signal name="row_activated" handler="grpt_objects_tree_on_tr_objects_tree_row_activated"/>
           </widget>
         </child>
       </widget>
@@ -1502,14 +1506,6 @@ Custom</property>
                             <child>
                               <placeholder/>
                             </child>
-                            <child>
-                              <widget class="GtkLabel" id="label48">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Size</property>
-                              </widget>
-                            </child>
                             <child>
                               <widget class="GtkSpinButton" id="spn_grid_size">
                                 <property name="visible">True</property>
@@ -1522,6 +1518,14 @@ Custom</property>
                                 <property name="right_attach">2</property>
                               </packing>
                             </child>
+                            <child>
+                              <widget class="GtkLabel" id="label48">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Size</property>
+                              </widget>
+                            </child>
                           </widget>
                         </child>
                       </widget>
@@ -1607,31 +1611,35 @@ Custom</property>
                                         <property name="column_spacing">3</property>
                                         <property name="row_spacing">3</property>
                                         <child>
-                                          <widget class="GtkComboBox" id="cb_size_type">
+                                          <widget class="GtkLabel" id="label36">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="items" translatable="yes">A4
-Custom</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Width</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label34">
+                                          <widget class="GtkLabel" id="label35">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Type</property>
+                                            <property name="label" translatable="yes">Height</property>
                                           </widget>
                                           <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
                                             <property name="x_options">GTK_FILL</property>
                                             <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkSpinButton" id="spn_height">
+                                          <widget class="GtkSpinButton" id="spn_width">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1641,12 +1649,12 @@ Custom</property>
                                           <packing>
                                             <property name="left_attach">1</property>
                                             <property name="right_attach">2</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkSpinButton" id="spn_width">
+                                          <widget class="GtkSpinButton" id="spn_height">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1656,36 +1664,32 @@ Custom</property>
                                           <packing>
                                             <property name="left_attach">1</property>
                                             <property name="right_attach">2</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label35">
+                                          <widget class="GtkLabel" id="label34">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Height</property>
+                                            <property name="label" translatable="yes">Type</property>
                                           </widget>
                                           <packing>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
                                             <property name="x_options">GTK_FILL</property>
                                             <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label36">
+                                          <widget class="GtkComboBox" id="cb_size_type">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Width</property>
+                                            <property name="items" translatable="yes">A4
+Custom</property>
                                           </widget>
                                           <packing>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
-                                            <property name="x_options">GTK_FILL</property>
-                                            <property name="y_options"></property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
                                           </packing>
                                         </child>
                                       </widget>
@@ -1728,61 +1732,43 @@ Custom</property>
                                         <property name="column_spacing">3</property>
                                         <property name="row_spacing">3</property>
                                         <child>
-                                          <widget class="GtkSpinButton" id="spn_margin_left">
+                                          <widget class="GtkLabel" id="label46">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="adjustment">0 0 10000 1 10 10</property>
-                                            <property name="digits">2</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Top</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">3</property>
-                                            <property name="bottom_attach">4</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkSpinButton" id="spn_margin_bottom">
+                                          <widget class="GtkLabel" id="label45">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="adjustment">0 0 10000 1 10 10</property>
-                                            <property name="digits">2</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Right</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkSpinButton" id="spn_margin_right">
+                                          <widget class="GtkLabel" id="label44">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="adjustment">0 0 10000 1 10 10</property>
-                                            <property name="digits">2</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Bottom</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkSpinButton" id="spn_margin_top">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="adjustment">0 0 10000 1 10 10</property>
-                                            <property name="digits">2</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
@@ -1800,43 +1786,61 @@ Custom</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label44">
+                                          <widget class="GtkSpinButton" id="spn_margin_top">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Bottom</property>
+                                            <property name="adjustment">0 0 10000 1 10 10</property>
+                                            <property name="digits">2</property>
                                           </widget>
                                           <packing>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                            <property name="x_options">GTK_FILL</property>
-                                            <property name="y_options"></property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label45">
+                                          <widget class="GtkSpinButton" id="spn_margin_right">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Right</property>
+                                            <property name="adjustment">0 0 10000 1 10 10</property>
+                                            <property name="digits">2</property>
                                           </widget>
                                           <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
                                             <property name="top_attach">1</property>
                                             <property name="bottom_attach">2</property>
-                                            <property name="x_options">GTK_FILL</property>
-                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label46">
+                                          <widget class="GtkSpinButton" id="spn_margin_bottom">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Top</property>
+                                            <property name="adjustment">0 0 10000 1 10 10</property>
+                                            <property name="digits">2</property>
                                           </widget>
                                           <packing>
-                                            <property name="x_options">GTK_FILL</property>
-                                            <property name="y_options"></property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkSpinButton" id="spn_margin_left">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="adjustment">0 0 10000 1 10 10</property>
+                                            <property name="digits">2</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
                                           </packing>
                                         </child>
                                       </widget>
@@ -1911,28 +1915,28 @@ Custom</property>
                               <placeholder/>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label28">
+                              <widget class="GtkFontButton" id="fbtn_text_font">
                                 <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Font</property>
+                                <property name="response_id">0</property>
                               </widget>
                               <packing>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkFontButton" id="fbtn_text_font">
+                              <widget class="GtkLabel" id="label28">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="response_id">0</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Font</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
                               </packing>
                             </child>
                           </widget>
@@ -2040,50 +2044,55 @@ Custom</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">3</property>
             <child>
-              <widget class="GtkSpinButton" id="spn_rotation">
+              <widget class="GtkLabel" id="label30">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="adjustment">0 0 360 1 10 10</property>
-                <property name="digits">2</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Name</property>
               </widget>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="x_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label39">
+              <widget class="GtkLabel" id="label31">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Rotation</property>
+                <property name="label" translatable="yes">X</property>
               </widget>
               <packing>
-                <property name="top_attach">5</property>
-                <property name="bottom_attach">6</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
                 <property name="x_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkSpinButton" id="spn_height">
+              <widget class="GtkLabel" id="label32">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Y</property>
+              </widget>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="txt_name">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="adjustment">0 0 10000 1 10 10</property>
-                <property name="digits">2</property>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkSpinButton" id="spn_width">
+              <widget class="GtkSpinButton" id="spn_x">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2093,21 +2102,23 @@ Custom</property>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label38">
+              <widget class="GtkSpinButton" id="spn_y">
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Height</property>
+                <property name="adjustment">0 0 10000 1 10 10</property>
+                <property name="digits">2</property>
               </widget>
               <packing>
-                <property name="top_attach">4</property>
-                <property name="bottom_attach">5</property>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
               </packing>
             </child>
             <child>
@@ -2124,22 +2135,20 @@ Custom</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkSpinButton" id="spn_y">
+              <widget class="GtkLabel" id="label38">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="adjustment">0 0 10000 1 10 10</property>
-                <property name="digits">2</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Height</property>
               </widget>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkSpinButton" id="spn_x">
+              <widget class="GtkSpinButton" id="spn_width">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -2149,56 +2158,51 @@ Custom</property>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkEntry" id="txt_name">
+              <widget class="GtkSpinButton" id="spn_height">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="adjustment">0 0 10000 1 10 10</property>
+                <property name="digits">2</property>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label32">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Y</property>
-              </widget>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label31">
+              <widget class="GtkLabel" id="label39">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">X</property>
+                <property name="label" translatable="yes">Rotation</property>
               </widget>
               <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
                 <property name="x_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label30">
+              <widget class="GtkSpinButton" id="spn_rotation">
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Name</property>
+                <property name="adjustment">0 0 360 1 10 10</property>
+                <property name="digits">2</property>
               </widget>
               <packing>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
               </packing>
             </child>
           </widget>
@@ -2246,55 +2250,43 @@ Custom</property>
                             <property name="n_columns">4</property>
                             <property name="column_spacing">3</property>
                             <child>
-                              <widget class="GtkLabel" id="label53">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Top</property>
-                              </widget>
-                              <packing>
-                                <property name="x_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label54">
+                              <widget class="GtkSpinButton" id="spn_text_border_width_left">
                                 <property name="visible">True</property>
+                                <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Bottom</property>
+                                <property name="adjustment">0 0 100 1 10 10</property>
                               </widget>
                               <packing>
+                                <property name="left_attach">3</property>
+                                <property name="right_attach">4</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label55">
+                              <widget class="GtkSpinButton" id="spn_text_border_width_right">
                                 <property name="visible">True</property>
+                                <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Right</property>
+                                <property name="adjustment">0 0 100 1 10 10</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
+                                <property name="left_attach">3</property>
+                                <property name="right_attach">4</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label56">
+                              <widget class="GtkSpinButton" id="spn_text_border_width_bottom">
                                 <property name="visible">True</property>
+                                <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Left</property>
+                                <property name="adjustment">0 0 100 1 10 10</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
@@ -2310,43 +2302,55 @@ Custom</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkSpinButton" id="spn_text_border_width_bottom">
+                              <widget class="GtkLabel" id="label56">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="adjustment">0 0 100 1 10 10</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Left</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
+                                <property name="left_attach">2</property>
+                                <property name="right_attach">3</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkSpinButton" id="spn_text_border_width_right">
+                              <widget class="GtkLabel" id="label55">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="adjustment">0 0 100 1 10 10</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Right</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">3</property>
-                                <property name="right_attach">4</property>
+                                <property name="left_attach">2</property>
+                                <property name="right_attach">3</property>
+                                <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkSpinButton" id="spn_text_border_width_left">
+                              <widget class="GtkLabel" id="label54">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="adjustment">0 0 100 1 10 10</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Bottom</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">3</property>
-                                <property name="right_attach">4</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label53">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Top</property>
+                              </widget>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                           </widget>
@@ -2388,59 +2392,24 @@ Custom</property>
                             <property name="n_columns">4</property>
                             <property name="column_spacing">3</property>
                             <child>
-                              <widget class="GtkLabel" id="label60">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Top</property>
-                              </widget>
-                              <packing>
-                                <property name="x_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label64">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Right</property>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label62">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Bottom</property>
-                              </widget>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label66">
+                              <widget class="GtkColorButton" id="cbtn_text_border_color_left">
                                 <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Left</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="response_id">0</property>
+                                <property name="color">#000000000000</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
+                                <property name="left_attach">3</property>
+                                <property name="right_attach">4</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkColorButton" id="cbtn_text_border_color_top">
+                              <widget class="GtkColorButton" id="cbtn_text_border_color_right">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -2449,8 +2418,8 @@ Custom</property>
                                 <property name="color">#000000000000</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
+                                <property name="left_attach">3</property>
+                                <property name="right_attach">4</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
@@ -2472,7 +2441,7 @@ Custom</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkColorButton" id="cbtn_text_border_color_right">
+                              <widget class="GtkColorButton" id="cbtn_text_border_color_top">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -2481,26 +2450,61 @@ Custom</property>
                                 <property name="color">#000000000000</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">3</property>
-                                <property name="right_attach">4</property>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkColorButton" id="cbtn_text_border_color_left">
+                              <widget class="GtkLabel" id="label66">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="response_id">0</property>
-                                <property name="color">#000000000000</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Left</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">3</property>
-                                <property name="right_attach">4</property>
+                                <property name="left_attach">2</property>
+                                <property name="right_attach">3</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="y_options">GTK_FILL</property>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label62">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Bottom</property>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label64">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Right</property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">2</property>
+                                <property name="right_attach">3</property>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label60">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Top</property>
+                              </widget>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                           </widget>
@@ -2555,54 +2559,54 @@ Custom</property>
                               <placeholder/>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label68">
+                              <widget class="GtkLabel" id="label74">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Top</property>
+                                <property name="label" translatable="yes">Left</property>
                               </widget>
                               <packing>
+                                <property name="left_attach">2</property>
+                                <property name="right_attach">3</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label70">
+                              <widget class="GtkLabel" id="label72">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Bottom</property>
+                                <property name="label" translatable="yes">Right</property>
                               </widget>
                               <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
+                                <property name="left_attach">2</property>
+                                <property name="right_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label72">
+                              <widget class="GtkLabel" id="label70">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Right</property>
+                                <property name="label" translatable="yes">Bottom</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label74">
+                              <widget class="GtkLabel" id="label68">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Left</property>
+                                <property name="label" translatable="yes">Top</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
@@ -2653,42 +2657,35 @@ Custom</property>
                 <property name="column_spacing">3</property>
                 <property name="row_spacing">3</property>
                 <child>
-                  <widget class="GtkLabel" id="label76">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Font</property>
-                  </widget>
-                  <packing>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkFontButton" id="fbtn_text_font">
+                  <widget class="GtkColorButton" id="cbtn_text_font_color">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="response_id">0</property>
+                    <property name="color">#000000000000</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label77">
+                  <widget class="GtkCheckButton" id="chk_text_font_strike">
                     <property name="visible">True</property>
+                    <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Strike</property>
+                    <property name="response_id">0</property>
+                    <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
@@ -2707,35 +2704,42 @@ Custom</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="chk_text_font_strike">
+                  <widget class="GtkLabel" id="label77">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="response_id">0</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Strike</property>
                   </widget>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
+                    <property name="x_options">GTK_FILL</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkColorButton" id="cbtn_text_font_color">
+                  <widget class="GtkFontButton" id="fbtn_text_font">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="response_id">0</property>
-                    <property name="color">#000000000000</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
+                    <property name="y_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label76">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Font</property>
+                  </widget>
+                  <packing>
+                    <property name="x_options">GTK_FILL</property>
                     <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
@@ -2781,52 +2785,52 @@ Custom</property>
                             <property name="n_columns">2</property>
                             <property name="column_spacing">3</property>
                             <child>
-                              <widget class="GtkLabel" id="label81">
+                              <widget class="GtkComboBox" id="cb_text_alignment_v">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Horizontal</property>
                               </widget>
                               <packing>
-                                <property name="x_options">GTK_FILL</property>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label82">
+                              <widget class="GtkComboBox" id="cb_text_alignment_h">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Vertical</property>
                               </widget>
                               <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkComboBox" id="cb_text_alignment_h">
+                              <widget class="GtkLabel" id="label82">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Vertical</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkComboBox" id="cb_text_alignment_v">
+                              <widget class="GtkLabel" id="label81">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Horizontal</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
@@ -2868,17 +2872,6 @@ Custom</property>
                             <property name="n_rows">1</property>
                             <property name="n_columns">2</property>
                             <property name="column_spacing">3</property>
-                            <child>
-                              <widget class="GtkLabel" id="label84">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Source</property>
-                              </widget>
-                              <packing>
-                                <property name="x_options">GTK_FILL</property>
-                              </packing>
-                            </child>
                             <child>
                               <widget class="GtkScrolledWindow" id="scrolledwindow3">
                                 <property name="visible">True</property>
@@ -2899,6 +2892,17 @@ Custom</property>
                                 <property name="right_attach">2</property>
                               </packing>
                             </child>
+                            <child>
+                              <widget class="GtkLabel" id="label84">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Source</property>
+                              </widget>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
                           </widget>
                         </child>
                       </widget>
@@ -2938,33 +2942,6 @@ Custom</property>
                             <property name="n_rows">2</property>
                             <property name="n_columns">2</property>
                             <property name="column_spacing">3</property>
-                            <child>
-                              <widget class="GtkLabel" id="label86">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Background Color</property>
-                              </widget>
-                              <packing>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkColorButton" id="cbtn_text_back_color">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="response_id">0</property>
-                                <property name="color">#000000000000</property>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="y_options">GTK_FILL</property>
-                              </packing>
-                            </child>
                             <child>
                               <widget class="GtkFrame" id="frame19">
                                 <property name="visible">True</property>
@@ -2984,114 +2961,114 @@ Custom</property>
                                         <property name="n_columns">4</property>
                                         <property name="column_spacing">2</property>
                                         <child>
-                                          <widget class="GtkLabel" id="label88">
+                                          <widget class="GtkSpinButton" id="spn_text_padd_left">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Top</property>
+                                            <property name="adjustment">0 0 100 1 10 10</property>
                                           </widget>
                                           <packing>
-                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="left_attach">3</property>
+                                            <property name="right_attach">4</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
                                             <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label89">
+                                          <widget class="GtkSpinButton" id="spn_text_padd_right">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Right</property>
+                                            <property name="adjustment">0 0 100 1 10 10</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="right_attach">3</property>
-                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="left_attach">3</property>
+                                            <property name="right_attach">4</property>
                                             <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label90">
+                                          <widget class="GtkSpinButton" id="spn_text_padd_bottom">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Bottom</property>
+                                            <property name="adjustment">0 0 100 1 10 10</property>
                                           </widget>
                                           <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
                                             <property name="top_attach">1</property>
                                             <property name="bottom_attach">2</property>
-                                            <property name="x_options">GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label91">
+                                          <widget class="GtkSpinButton" id="spn_text_padd_top">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Left</property>
+                                            <property name="adjustment">0 0 100 1 10 10</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="right_attach">3</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
-                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
                                             <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkSpinButton" id="spn_text_padd_top">
+                                          <widget class="GtkLabel" id="label91">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="adjustment">0 0 100 1 10 10</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Left</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkSpinButton" id="spn_text_padd_bottom">
+                                          <widget class="GtkLabel" id="label90">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="adjustment">0 0 100 1 10 10</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Bottom</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
                                             <property name="top_attach">1</property>
                                             <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkSpinButton" id="spn_text_padd_right">
+                                          <widget class="GtkLabel" id="label89">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="adjustment">0 0 100 1 10 10</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Right</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">3</property>
-                                            <property name="right_attach">4</property>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkSpinButton" id="spn_text_padd_left">
+                                          <widget class="GtkLabel" id="label88">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="adjustment">0 0 100 1 10 10</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Top</property>
                                           </widget>
                                           <packing>
-                                            <property name="left_attach">3</property>
-                                            <property name="right_attach">4</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
                                             <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
@@ -3118,6 +3095,33 @@ Custom</property>
                                 <property name="y_options">GTK_FILL</property>
                               </packing>
                             </child>
+                            <child>
+                              <widget class="GtkColorButton" id="cbtn_text_back_color">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="response_id">0</property>
+                                <property name="color">#000000000000</property>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label86">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Background Color</property>
+                              </widget>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
                           </widget>
                         </child>
                       </widget>
@@ -3191,28 +3195,32 @@ Custom</property>
                       <placeholder/>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label93">
+                      <widget class="GtkColorButton" id="cbtn_line_stroke_color">
                         <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Width</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="response_id">0</property>
+                        <property name="color">#000000000000</property>
                       </widget>
                       <packing>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label94">
+                      <widget class="GtkSpinButton" id="spn_line_stroke_width">
                         <property name="visible">True</property>
+                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Color</property>
+                        <property name="adjustment">0 0 100 1 10 10</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
@@ -3231,32 +3239,28 @@ Custom</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkSpinButton" id="spn_line_stroke_width">
+                      <widget class="GtkLabel" id="label94">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="adjustment">0 0 100 1 10 10</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Color</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkColorButton" id="cbtn_line_stroke_color">
+                      <widget class="GtkLabel" id="label93">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="response_id">0</property>
-                        <property name="color">#000000000000</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Width</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
@@ -3308,28 +3312,32 @@ Custom</property>
                       <placeholder/>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label100">
+                      <widget class="GtkColorButton" id="ctbn_rect_stroke_color">
                         <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Width</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="response_id">0</property>
+                        <property name="color">#000000000000</property>
                       </widget>
                       <packing>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label101">
+                      <widget class="GtkSpinButton" id="spn_rect_stroke_width">
                         <property name="visible">True</property>
+                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Color</property>
+                        <property name="adjustment">0 0 100 1 10 10</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
@@ -3348,32 +3356,28 @@ Custom</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkSpinButton" id="spn_rect_stroke_width">
+                      <widget class="GtkLabel" id="label101">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="adjustment">0 0 100 1 10 10</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Color</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkColorButton" id="ctbn_rect_stroke_color">
+                      <widget class="GtkLabel" id="label100">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="response_id">0</property>
-                        <property name="color">#000000000000</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Width</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
@@ -3404,18 +3408,6 @@ Custom</property>
             <property name="n_rows">1</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">3</property>
-            <child>
-              <widget class="GtkLabel" id="label104">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Fill Color</property>
-              </widget>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
             <child>
               <widget class="GtkColorButton" id="cbtn_rect_fill_color">
                 <property name="visible">True</property>
@@ -3431,6 +3423,18 @@ Custom</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkLabel" id="label104">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Fill Color</property>
+              </widget>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
           </widget>
           <packing>
             <property name="position">1</property>
@@ -3467,28 +3471,32 @@ Custom</property>
                       <placeholder/>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label110">
+                      <widget class="GtkColorButton" id="cbtn_ellipse_stroke_color">
                         <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Width</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="response_id">0</property>
+                        <property name="color">#000000000000</property>
                       </widget>
                       <packing>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label111">
+                      <widget class="GtkSpinButton" id="spn_ellipse_stroke_width">
                         <property name="visible">True</property>
+                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Color</property>
+                        <property name="adjustment">0 0 100 1 10 10</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
@@ -3507,32 +3515,28 @@ Custom</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkSpinButton" id="spn_ellipse_stroke_width">
+                      <widget class="GtkLabel" id="label111">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="adjustment">0 0 100 1 10 10</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Color</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkColorButton" id="cbtn_ellipse_stroke_color">
+                      <widget class="GtkLabel" id="label110">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="response_id">0</property>
-                        <property name="color">#000000000000</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Width</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
@@ -3563,18 +3567,6 @@ Custom</property>
             <property name="n_rows">1</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">3</property>
-            <child>
-              <widget class="GtkLabel" id="label114">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Fill Color</property>
-              </widget>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
             <child>
               <widget class="GtkColorButton" id="cbtn_ellipse_fill_color">
                 <property name="visible">True</property>
@@ -3590,6 +3582,18 @@ Custom</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkLabel" id="label114">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Fill Color</property>
+              </widget>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
           </widget>
           <packing>
             <property name="position">1</property>
@@ -3638,55 +3642,43 @@ Custom</property>
                                 <property name="n_columns">4</property>
                                 <property name="column_spacing">3</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label131">
-                                    <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Top</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label132">
+                                  <widget class="GtkSpinButton" id="spn_image_border_width_left">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Bottom</property>
+                                    <property name="adjustment">0 0 100 1 10 10</property>
                                   </widget>
                                   <packing>
+                                    <property name="left_attach">3</property>
+                                    <property name="right_attach">4</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label133">
+                                  <widget class="GtkSpinButton" id="spn_image_border_width_right">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Right</property>
+                                    <property name="adjustment">0 0 100 1 10 10</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="left_attach">3</property>
+                                    <property name="right_attach">4</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label134">
+                                  <widget class="GtkSpinButton" id="spn_image_border_width_bottom">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Left</property>
+                                    <property name="adjustment">0 0 100 1 10 10</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -3702,43 +3694,55 @@ Custom</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkSpinButton" id="spn_image_border_width_bottom">
+                                  <widget class="GtkLabel" id="label134">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="adjustment">0 0 100 1 10 10</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Left</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkSpinButton" id="spn_image_border_width_right">
+                                  <widget class="GtkLabel" id="label133">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="adjustment">0 0 100 1 10 10</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Right</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkSpinButton" id="spn_image_border_width_left">
+                                  <widget class="GtkLabel" id="label132">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="adjustment">0 0 100 1 10 10</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Bottom</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label131">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Top</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                               </widget>
@@ -3780,42 +3784,66 @@ Custom</property>
                                 <property name="n_columns">4</property>
                                 <property name="column_spacing">3</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label136">
+                                  <widget class="GtkColorButton" id="cbtn_image_border_color_left">
                                     <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Top</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="response_id">0</property>
+                                    <property name="color">#000000000000</property>
                                   </widget>
                                   <packing>
-                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="left_attach">3</property>
+                                    <property name="right_attach">4</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
                                     <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label137">
+                                  <widget class="GtkColorButton" id="cbtn_image_border_color_right">
                                     <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Right</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="response_id">0</property>
+                                    <property name="color">#000000000000</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="left_attach">3</property>
+                                    <property name="right_attach">4</property>
                                     <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label138">
+                                  <widget class="GtkColorButton" id="cbtn_image_border_color_bottom">
                                     <property name="visible">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Bottom</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="response_id">0</property>
+                                    <property name="color">#000000000000</property>
                                   </widget>
                                   <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkColorButton" id="cbtn_image_border_color_top">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="response_id">0</property>
+                                    <property name="color">#000000000000</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
                                     <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
@@ -3836,66 +3864,42 @@ Custom</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkColorButton" id="cbtn_image_border_color_top">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="response_id">0</property>
-                                    <property name="color">#000000000000</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkColorButton" id="cbtn_image_border_color_bottom">
+                                  <widget class="GtkLabel" id="label138">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="response_id">0</property>
-                                    <property name="color">#000000000000</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Bottom</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
                                     <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkColorButton" id="cbtn_image_border_color_right">
+                                  <widget class="GtkLabel" id="label137">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="response_id">0</property>
-                                    <property name="color">#000000000000</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Right</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
                                     <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkColorButton" id="cbtn_image_border_color_left">
+                                  <widget class="GtkLabel" id="label136">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="response_id">0</property>
-                                    <property name="color">#000000000000</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Top</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">3</property>
-                                    <property name="right_attach">4</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
                                     <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
@@ -3951,54 +3955,54 @@ Custom</property>
                                   <placeholder/>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label141">
+                                  <widget class="GtkLabel" id="label144">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Top</property>
+                                    <property name="label" translatable="yes">Left</property>
                                   </widget>
                                   <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label142">
+                                  <widget class="GtkLabel" id="label143">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Bottom</property>
+                                    <property name="label" translatable="yes">Right</property>
                                   </widget>
                                   <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label143">
+                                  <widget class="GtkLabel" id="label142">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Right</property>
+                                    <property name="label" translatable="yes">Bottom</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label144">
+                                  <widget class="GtkLabel" id="label141">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Left</property>
+                                    <property name="label" translatable="yes">Top</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
@@ -4061,18 +4065,6 @@ Custom</property>
                     <property name="n_rows">1</property>
                     <property name="n_columns">2</property>
                     <property name="column_spacing">3</property>
-                    <child>
-                      <widget class="GtkLabel" id="label147">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Source</property>
-                      </widget>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
                     <child>
                       <widget class="GtkScrolledWindow" id="scrolledwindow4">
                         <property name="visible">True</property>
@@ -4093,6 +4085,18 @@ Custom</property>
                         <property name="right_attach">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkLabel" id="label147">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Source</property>
+                      </widget>
+                      <packing>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
                   </widget>
                 </child>
               </widget>
@@ -4121,25 +4125,25 @@ Custom</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">3</property>
             <child>
-              <widget class="GtkLabel" id="label148">
+              <widget class="GtkComboBox" id="cb_image_adapt">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Adapt</property>
               </widget>
               <packing>
-                <property name="x_options">GTK_FILL</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkComboBox" id="cb_image_adapt">
+              <widget class="GtkLabel" id="label148">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Adapt</property>
               </widget>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
diff --git a/src/Makefile.am b/src/Makefile.am
index 9262deae58c15845e17d890dba31a8c89594f445..bfb0300b307110f02164dc301f2edf81a25b3b13 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,9 @@
 gladedir = $(datadir)/greptool/glade
+iconsdir = $(datadir)/greptool/pixmaps
 
 AM_CPPFLAGS = $(GREPTOOL_CFLAGS) \
-              -DGLADEDIR=\""$(gladedir)"\"
+              -DGLADEDIR=\""$(gladedir)"\" \
+              -DICONSDIR=\""$(iconsdir)"\"
 
 LIBS = $(GREPTOOL_LIBS) \
        -export-dynamic
@@ -10,13 +12,24 @@ bin_PROGRAMS = greptool
 
 greptool_SOURCES = \
                    main.c \
+                   main.h \
                    report_properties.c \
                    page_properties.c \
                    object_properties.c \
+                   object_properties.h \
                    objects_tree.c \
+                   objects_tree.h \
                    canvas.c \
+                   canvas.h \
                    canvasitem.c \
+                   canvasitem.h \
                    canvastext.c \
+                   canvastext.h \
                    canvasline.c \
+                   canvasline.h \
                    canvasrect.c \
-                   canvasellipse.c
+                   canvasrect.h \
+                   canvasellipse.c \
+                   canvasimage.c \
+                   canvasimage.h \
+                   canvasellipse.h
diff --git a/src/canvas.c b/src/canvas.c
index 760053b4191fc5e9a970168dac99fb982365db00..7b9067b7d70e4440a6b2503d8368e18fd9b04d20 100644 (file)
--- a/src/canvas.c
+++ b/src/canvas.c
@@ -27,6 +27,7 @@
 #include "canvasline.h"
 #include "canvasrect.h"
 #include "canvasellipse.h"
+#include "canvasimage.h"
 
 static void grpt_canvas_class_init (GRptCanvasClass *klass);
 static void grpt_canvas_init (GRptCanvas *canvas);
@@ -59,6 +60,8 @@ struct _GRptCanvasPrivate
                gdouble sel_y_start;
 
                Tool tool;
+
+               gboolean stop_signal_changed_selection;
        };
 
 GType
@@ -134,6 +137,7 @@ grpt_canvas_init (GRptCanvas *grpt_canvas)
        GRptCanvasPrivate *priv = GRPT_CANVAS_GET_PRIVATE (grpt_canvas);
 
        priv->in_selection = FALSE;
+       priv->stop_signal_changed_selection = FALSE;
 }
 
 static void
@@ -177,6 +181,14 @@ grpt_canvas_add_item (GRptCanvas *grpt_canvas, RptReportSection section, RptObje
                                                                                 RPT_OBJ_LINE (rpt_object),
                                                                                 NULL);
                }
+       else if (IS_RPT_OBJ_IMAGE (rpt_object))
+               {
+                       item = grpt_canvas_image_new (priv->root,
+                                                                                 x, y,
+                                                                                 width, height,
+                                                                                 RPT_OBJ_IMAGE (rpt_object),
+                                                                                 NULL);
+               }
        else
                {
                        return;
@@ -215,15 +227,10 @@ grpt_canvas_on_button_press_event (GtkWidget *widget,
                                                {
                                                        if (!grpt_canvas_item_is_selected (GRPT_CANVAS_ITEM (item)))
                                                                {
-                                                                       GList *sel = NULL;
-                                                               
                                                                        grpt_canvas_item_set_selected (GRPT_CANVAS_ITEM (item), TRUE);
 
-                                                                       sel = g_list_append (sel, item);
                                                                        g_signal_emit (grpt_canvas, klass->selection_changed_signal_id, 0,
-                                                                                      sel);
-
-                                                                       g_list_free (sel);
+                                                                                      grpt_canvas_get_selected_items (grpt_canvas));
                                                                }
 
                                                        priv->in_selection = FALSE;
@@ -334,6 +341,10 @@ grpt_canvas_on_button_release_event (GtkWidget *widget,
                                                                        case TOOL_ELLIPSE:
                                                                                rpt_object = rpt_obj_ellipse_new (get_new_object_name (priv->tool), position);
                                                                                break;
+
+                                                                       case TOOL_IMAGE:
+                                                                               rpt_object = rpt_obj_image_new (get_new_object_name (priv->tool), position);
+                                                                               break;
                                                                }
                                                        if (rpt_object != NULL)
                                                                {
@@ -359,22 +370,21 @@ grpt_canvas_on_button_release_event (GtkWidget *widget,
 
                                        if (objects != NULL)
                                                {
-                                                       objects = g_list_first (objects);
-                                                       while (objects != NULL)
+                                                       GList *list_item = g_list_first (objects);
+                                                       while (list_item != NULL)
                                                                {
-                                                                       item = (GooCanvasItem *)objects->data;
-               
+                                                                       item = (GooCanvasItem *)list_item->data;
+
                                                                        if (item != priv->selection)
                                                                                {
                                                                                        grpt_canvas_item_set_selected (GRPT_CANVAS_ITEM (item), TRUE);
                                                                                }
                
-                                                                       objects = g_list_next (objects);
+                                                                       list_item = g_list_next (list_item);
                                                                }
 
-                                                       objects = g_list_first (objects);
                                                        g_signal_emit (grpt_canvas, klass->selection_changed_signal_id, 0,
-                                                                      objects);
+                                                                      g_list_first (objects));
 
                                                        g_list_free (objects);
                                                }
@@ -630,21 +640,37 @@ grpt_canvas_set_item_selected (GRptCanvas *grpt_canvas, GRptCanvasItem *grpt_can
 void
 grpt_canvas_select_all (GRptCanvas *grpt_canvas)
 {
+       GRptCanvasPrivate *priv = GRPT_CANVAS_GET_PRIVATE (grpt_canvas);
+       GRptCanvasClass *klass = GRPT_CANVAS_GET_CLASS (grpt_canvas);
+
+       priv->stop_signal_changed_selection = TRUE;
        grpt_canvas_select_section_all (grpt_canvas, RPTREPORT_SECTION_REPORT_HEADER, FALSE);
        grpt_canvas_select_section_all (grpt_canvas, RPTREPORT_SECTION_PAGE_HEADER, TRUE);
        grpt_canvas_select_section_all (grpt_canvas, RPTREPORT_SECTION_BODY, TRUE);
        grpt_canvas_select_section_all (grpt_canvas, RPTREPORT_SECTION_REPORT_FOOTER, TRUE);
        grpt_canvas_select_section_all (grpt_canvas, RPTREPORT_SECTION_REPORT_HEADER, TRUE);
+       priv->stop_signal_changed_selection = FALSE;
+
+       g_signal_emit (grpt_canvas, klass->selection_changed_signal_id, 0,
+                                  grpt_canvas_get_selected_items (grpt_canvas));
 }
 
 void
 grpt_canvas_select_none (GRptCanvas *grpt_canvas)
 {
+       GRptCanvasPrivate *priv = GRPT_CANVAS_GET_PRIVATE (grpt_canvas);
+       GRptCanvasClass *klass = GRPT_CANVAS_GET_CLASS (grpt_canvas);
+
+       priv->stop_signal_changed_selection = TRUE;
        grpt_canvas_select_section_none (grpt_canvas, RPTREPORT_SECTION_REPORT_HEADER);
        grpt_canvas_select_section_none (grpt_canvas, RPTREPORT_SECTION_PAGE_HEADER);
        grpt_canvas_select_section_none (grpt_canvas, RPTREPORT_SECTION_BODY);
        grpt_canvas_select_section_none (grpt_canvas, RPTREPORT_SECTION_REPORT_FOOTER);
        grpt_canvas_select_section_none (grpt_canvas, RPTREPORT_SECTION_REPORT_HEADER);
+       priv->stop_signal_changed_selection = FALSE;
+
+       g_signal_emit (grpt_canvas, klass->selection_changed_signal_id, 0,
+                                  NULL);
 }
 
 void
@@ -654,10 +680,15 @@ grpt_canvas_select_section_all (GRptCanvas *grpt_canvas, RptReportSection sectio
        GList *objects = NULL;
 
        GRptCanvasPrivate *priv = GRPT_CANVAS_GET_PRIVATE (grpt_canvas);
+       GRptCanvasClass *klass = GRPT_CANVAS_GET_CLASS (grpt_canvas);
 
        if (!add_to_selection)
                {
+                       gboolean prev_stop = priv->stop_signal_changed_selection;
+
+                       priv->stop_signal_changed_selection = TRUE;
                        grpt_canvas_select_section_none (grpt_canvas, section);
+                       priv->stop_signal_changed_selection = prev_stop;
                }
 
        switch (section)
@@ -692,6 +723,13 @@ grpt_canvas_select_section_all (GRptCanvas *grpt_canvas, RptReportSection sectio
                        grpt_canvas_item_set_selected ((GRptCanvasItem *)objects->data, TRUE);
                        objects = g_list_next (objects);
                }
+
+       if (!priv->stop_signal_changed_selection)
+               {
+                       objects = g_list_first (objects);
+                       g_signal_emit (grpt_canvas, klass->selection_changed_signal_id, 0,
+                                      objects);
+               }
 }
 
 void
@@ -700,6 +738,7 @@ grpt_canvas_select_section_none (GRptCanvas *grpt_canvas, RptReportSection secti
        GList *objects = NULL;
 
        GRptCanvasPrivate *priv = GRPT_CANVAS_GET_PRIVATE (grpt_canvas);
+       GRptCanvasClass *klass = GRPT_CANVAS_GET_CLASS (grpt_canvas);
 
        switch (section)
                {
@@ -733,6 +772,12 @@ grpt_canvas_select_section_none (GRptCanvas *grpt_canvas, RptReportSection secti
                        grpt_canvas_item_set_selected ((GRptCanvasItem *)objects->data, FALSE);
                        objects = g_list_next (objects);
                }
+
+       if (!priv->stop_signal_changed_selection)
+               {
+                       g_signal_emit (grpt_canvas, klass->selection_changed_signal_id, 0,
+                                      NULL);
+               }
 }
 
 GList
diff --git a/src/canvasellipse.c b/src/canvasellipse.c
index 7e10459a5c19f712b43d05430d14acad3373695a..df39bb01639f31b2dac98ba5218e834d0400b56a 100644 (file)
--- a/src/canvasellipse.c
+++ b/src/canvasellipse.c
@@ -16,6 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <math.h>
+
 #include "canvasellipse.h"
 
 
@@ -166,30 +168,21 @@ grpt_canvas_ellipse_paint (GooCanvasItemSimple *simple, cairo_t *cr, const GooCa
                        stroke->style = NULL;
                }
 
-       if (rotation != NULL)
-               {
-                       /* TO DO */
-                       /*rpt_print_rotate (rpt_print, position, size, rotation->angle);*/
-               }
-
-       /* TO DO */
-       /*cairo_set_line_width (priv->cr, stroke.width);*/
-       cairo_rectangle (cr, position->x, position->y, size->width, size->height);
-
+       cairo_save (cr);
+       cairo_translate (cr, position->x + size->width / 2., position->y + size->height / 2.);
+       cairo_scale (cr, size->width / 2., size->height / 2.);
+       cairo_arc (cr, 0., 0., 1., 0., 2. * M_PI);
+       cairo_restore (cr);
+       
        if (fill_color != NULL)
                {
                        cairo_set_source_rgba (cr, fill_color->r, fill_color->g, fill_color->b, fill_color->a);
                        cairo_fill_preserve (cr);
                }
 
-       if (stroke->style != NULL)
-               {
-                       gdouble *dash = rpt_common_style_to_array (stroke->style);
-                       cairo_set_dash (cr, dash, stroke->style->len, 0.0);
-               }
-
        cairo_set_source_rgba (cr, stroke->color->r, stroke->color->g, stroke->color->b, stroke->color->a);
        cairo_stroke (cr);
+       cairo_new_path (cr);
 }
 
 static RptObject
diff --git a/src/canvasimage.c b/src/canvasimage.c
new file mode 100644 (file)
index 0000000..208915c
--- /dev/null
+++ b/src/canvasimage.c
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2007 Andrea Zagli <azagli@inwind.it>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "canvasimage.h"
+
+
+static void grpt_canvas_image_class_init (GRptCanvasImageClass *klass);
+static void grpt_canvas_image_init (GRptCanvasImage *grpt_canvas_image);
+
+
+static void grpt_canvas_image_paint (GooCanvasItemSimple *simple,
+                                    cairo_t *cr,
+                                                               const GooCanvasBounds *bounds);
+
+static RptObject *grpt_canvas_image_get_rpt_object (GRptCanvasItem *grpt_canvas_item);
+
+
+#define GRPT_CANVAS_IMAGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GRPT_TYPE_CANVAS_IMAGE, GRptCanvasImagePrivate))
+
+
+typedef struct _GRptCanvasImagePrivate GRptCanvasImagePrivate;
+struct _GRptCanvasImagePrivate
+       {
+               RptObjImage *rpt_object_image;
+       };
+
+GType
+grpt_canvas_image_get_type (void)
+{
+       static GType grpt_canvas_image_type = 0;
+
+       if (!grpt_canvas_image_type)
+               {
+                       static const GTypeInfo grpt_canvas_image_info =
+                       {
+                               sizeof (GRptCanvasImageClass),
+                               NULL,   /* base_init */
+                               NULL,   /* base_finalize */
+                               (GClassInitFunc) grpt_canvas_image_class_init,
+                               NULL,   /* class_finalize */
+                               NULL,   /* class_data */
+                               sizeof (GRptCanvasImage),
+                               0,      /* n_preallocs */
+                               (GInstanceInitFunc) grpt_canvas_image_init,
+                               NULL
+                       };
+
+                       grpt_canvas_image_type = g_type_register_static (GRPT_TYPE_CANVAS_ITEM, "GRptCanvasImage",
+                                                                       &grpt_canvas_image_info, 0);
+               }
+
+       return grpt_canvas_image_type;
+}
+
+static void
+grpt_canvas_image_class_init (GRptCanvasImageClass *klass)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (klass);
+       GRptCanvasItemClass *canvas_item_class = GRPT_CANVAS_ITEM_CLASS (klass);
+       GooCanvasItemSimpleClass *simple_class = (GooCanvasItemSimpleClass *)klass;
+
+       g_type_class_add_private (object_class, sizeof (GRptCanvasImagePrivate));
+
+       canvas_item_class->paint = grpt_canvas_image_paint;
+       canvas_item_class->get_rpt_object = grpt_canvas_image_get_rpt_object;
+}
+
+static void
+grpt_canvas_image_init (GRptCanvasImage *grpt_canvas_image)
+{
+}
+
+GRptCanvasItem
+*grpt_canvas_image_new (GooCanvasItem *parent, gdouble x, gdouble y, gdouble width, gdouble height, RptObjImage *rpt_object_image, ...)
+{
+       GRptCanvasItem *item;
+       GRptCanvasImage *grpt_canvas_image;
+
+       RptPoint position;
+       RptSize size;
+
+       const char *first_property;
+       va_list var_args;
+       GRptCanvasImagePrivate *priv;
+
+       item = g_object_new (GRPT_TYPE_CANVAS_IMAGE, NULL);
+
+       grpt_canvas_image = (GRptCanvasImage *)item;
+
+       priv = GRPT_CANVAS_IMAGE_GET_PRIVATE (grpt_canvas_image);
+       priv->rpt_object_image = g_object_ref (rpt_object_image);
+
+       va_start (var_args, rpt_object_image);
+       first_property = va_arg (var_args, char*);
+       if (first_property)
+               {
+                       g_object_set_valist ((GObject *)item, first_property, var_args);
+               }
+       va_end (var_args);
+
+       if (parent)
+               {
+                       goo_canvas_item_add_child (parent, GOO_CANVAS_ITEM (item), -1);
+                       g_object_unref (item);
+               }
+
+       position.x = x;
+       position.y = y;
+       grpt_canvas_item_set_position (item, position);
+
+       size.width = width;
+       size.height = height;
+       grpt_canvas_item_set_size (item, size);
+
+       return item;
+}
+
+static void
+grpt_canvas_image_paint (GooCanvasItemSimple *simple, cairo_t *cr, const GooCanvasBounds *bounds)
+{
+       RptPoint *from_p;
+       RptPoint *to_p = (RptPoint *)g_new (RptPoint, 1);
+       RptSize *size;
+       RptRotation *rotation = NULL;
+
+       GRptCanvasImage *grpt_canvas_image = (GRptCanvasImage *)simple;
+
+       GRptCanvasItem *grpt_canvas_item = (GRptCanvasItem *)simple;
+
+       GRptCanvasImagePrivate *priv = GRPT_CANVAS_IMAGE_GET_PRIVATE (grpt_canvas_image);
+
+       g_object_get (G_OBJECT (priv->rpt_object_image),
+                     "position", &from_p,
+                     "size", &size,
+                     "rotation", &rotation,
+                     NULL);
+
+       to_p->x = from_p->x + size->width;
+       to_p->y = from_p->y + size->height;
+
+       cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0);
+
+       if (rotation != NULL)
+               {
+                       /*RptSize size;
+
+                       size.width = to_p->x - from_p->x;
+                       size.height = to_p->y - from_p->y;
+
+                       rpt_print_rotate (rpt_print, from_p, &size, rotation->angle);*/
+               }
+
+       cairo_move_to (cr, from_p->x, from_p->y);
+       cairo_line_to (cr, to_p->x, to_p->y);
+       cairo_stroke (cr);
+}
+
+static RptObject
+*grpt_canvas_image_get_rpt_object (GRptCanvasItem *grpt_canvas_item)
+{
+       GRptCanvasImagePrivate *priv = GRPT_CANVAS_IMAGE_GET_PRIVATE (GRPT_CANVAS_IMAGE (grpt_canvas_item));
+
+       return RPT_OBJECT (priv->rpt_object_image);
+}
diff --git a/src/canvasimage.h b/src/canvasimage.h
new file mode 100644 (file)
index 0000000..d8c762d
--- /dev/null
+++ b/src/canvasimage.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2007 Andrea Zagli <azagli@inwind.it>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GRPT_CANVAS_IMAGE_H__
+#define __GRPT_CANVAS_IMAGE_H__
+
+#include <gtk/gtk.h>
+#include <libreptool.h>
+
+#include "canvasitem.h"
+
+
+G_BEGIN_DECLS
+
+
+#define GRPT_TYPE_CANVAS_IMAGE            (grpt_canvas_image_get_type ())
+#define GRPT_CANVAS_IMAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GRPT_TYPE_CANVAS_IMAGE, GRptCanvasImage))
+#define GRPT_CANVAS_IMAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GRPT_TYPE_CANVAS_IMAGE, GRptCanvasImageClass))
+#define GRPT_IS_CANVAS_IMAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GRPT_TYPE_CANVAS_IMAGE))
+#define GRPT_IS_CANVAS_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GRPT_TYPE_CANVAS_IMAGE))
+#define GRPT_CANVAS_IMAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GRPT_TYPE_CANVAS_IMAGE, GRptCanvasLineClass))
+
+
+typedef struct _GRptCanvasImage GRptCanvasImage;
+typedef struct _GRptCanvasImageClass GRptCanvasImageClass;
+  
+struct _GRptCanvasImage
+{
+       GRptCanvasItem parent;
+};
+
+struct _GRptCanvasImageClass
+{
+       GRptCanvasItemClass parent_class;
+};
+
+GType grpt_canvas_image_get_type (void) G_GNUC_CONST;
+
+GRptCanvasItem *grpt_canvas_image_new (GooCanvasItem *parent,
+                                       gdouble x,
+                                       gdouble y,
+                                       gdouble width,
+                                       gdouble height,
+                                       RptObjImage *rpt_object_image,
+                                       ...);
+
+
+G_END_DECLS
+
+
+#endif /* __GRPT_CANVAS_IMAGE_H__ */
diff --git a/src/canvasitem.c b/src/canvasitem.c
index 862f143bad925fadd5a31c81c822ff62bef3f8ff..7270876989576647fc06541a136cbdd480464797 100644 (file)
--- a/src/canvasitem.c
+++ b/src/canvasitem.c
@@ -293,6 +293,15 @@ grpt_canvas_item_paint (GooCanvasItemSimple *simple,
 
        if (priv->selected)
                {
+                       /*cairo_new_path (cr);
+                       cairo_set_line_width (cr, 1.0);
+                       cairo_rectangle (cr, bounds->x1 + 5, bounds->y1 + 5, 5.0, 5.0);
+
+                       cairo_set_source_rgba (cr, 1.0, 0.0, 0.0, 1.0);
+                       cairo_fill_preserve (cr);
+
+                       cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0);
+                       cairo_stroke (cr);*/
                }
 }
 
diff --git a/src/main.c b/src/main.c
index b14ac28667fd5e76f9d1caf8569bbfec3f06ddc5..0f166f2ffd545abec8442b78517aa00b82710d82 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -74,6 +74,8 @@ static GRptCanvas *grpt_canvas;
 
 static GRptObjectsTree *objects_tree;
 
+static GRptObjectProperties *object_properties;
+
 /* PRIVATE */
 static void
 report_reset_counters ()
@@ -85,6 +87,12 @@ report_reset_counters ()
        image_counter = 0;
 }
 
+static void
+report_find_counters ()
+{
+       /* TO DO */
+}
+
 static void
 menu_toolbar_sensitivity ()
 {
@@ -326,14 +334,14 @@ void
 on_mnu_edit_select_all_activate (GtkMenuItem *menuitem,
                                  gpointer user_data)
 {
-       grpt_canvas_select_section_all (grpt_canvas, RPTREPORT_SECTION_BODY, FALSE);
+       grpt_canvas_select_all (grpt_canvas);
 }
 
 void
 on_mnu_edit_select_none_activate (GtkMenuItem *menuitem,
                                   gpointer user_data)
 {
-       grpt_canvas_select_section_none (grpt_canvas, RPTREPORT_SECTION_BODY);
+       grpt_canvas_select_none (grpt_canvas);
 }
 
 void
@@ -431,7 +439,7 @@ report_on_canvas_selection_changed (GRptCanvas *grpt_canvas,
                                     GList *items,
                                     gpointer user_data)
 {
-       g_fprintf(stderr,"selection changed\n");
+       grpt_objects_tree_select (objects_tree, items);
 }
 
 /* PUBLIC */
@@ -495,10 +503,22 @@ const gchar
        return ret;
 }
 
+GRptObjectProperties
+*get_grpt_object_properties (void)
+{
+       if (object_properties == NULL)
+               {
+                       object_properties = grpt_object_properties_new ();
+               }
+       
+       return object_properties;
+}
+
 int
 main (int argc, char **argv)
 {
        GladeXML *glaMain;
+       GtkWidget *image;
 
        gtk_init (&argc, &argv);
 
@@ -528,9 +548,31 @@ main (int argc, char **argv)
        rtbtn_ellipse = glade_xml_get_widget (glaMain, "rtbtn_ellipse");
        rtbtn_image = glade_xml_get_widget (glaMain, "rtbtn_image");
 
+       image = gtk_image_new_from_file (ICONSDIR "/selector.png");
+       gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (rtbtn_select), image);
+       gtk_widget_show (image);
+       image = gtk_image_new_from_file (ICONSDIR "/text.png");
+       gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (rtbtn_text), image);
+       gtk_widget_show (image);
+       image = gtk_image_new_from_file (ICONSDIR "/line.png");
+       gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (rtbtn_line), image);
+       gtk_widget_show (image);
+       image = gtk_image_new_from_file (ICONSDIR "/rectangle.png");
+       gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (rtbtn_rect), image);
+       gtk_widget_show (image);
+       image = gtk_image_new_from_file (ICONSDIR "/ellipse.png");
+       gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (rtbtn_ellipse), image);
+       gtk_widget_show (image);
+       image = gtk_image_new_from_file (ICONSDIR "/image.png");
+       gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (rtbtn_image), image);
+       gtk_widget_show (image);
+
        report_filename = NULL;
        rpt_report = NULL;
 
+       objects_tree = NULL;
+       object_properties = NULL;
+
        menu_toolbar_sensitivity ();
 
        gtk_main ();
diff --git a/src/main.h b/src/main.h
index 722bdfb2232d38e8dfbcb6d3bcf479fae49b970a..a6592ba3146d02dd73136ddb8f7d3440a5456fd6 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -19,6 +19,8 @@
 #ifndef __MAIN_H__
 #define __MAIN_H__
 
+#include "object_properties.h"
+
 
 G_BEGIN_DECLS
 
@@ -37,6 +39,8 @@ Tool get_current_tool ();
 
 const gchar *get_new_object_name (Tool tool);
 
+GRptObjectProperties *get_grpt_object_properties (void);
+
 
 G_END_DECLS
 
diff --git a/src/object_properties.c b/src/object_properties.c
index 298d63b5a405eae01a3d6e2921265b74ad46ec72..3999f018056e21c1d7231d4d0de02f9ebcf88906 100644 (file)
--- a/src/object_properties.c
+++ b/src/object_properties.c
@@ -19,6 +19,8 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
+#include <libreptool.h>
+
 #include "object_properties.h"
 
 static void grpt_object_properties_class_init (GRptObjectPropertiesClass *klass);
@@ -118,12 +120,21 @@ GRptObjectProperties
 }
 
 void
-grpt_object_properties_set_rpt_object (GRptObjectProperties *grpt_object_properties,
-                                       RptObject *rpt_object)
+grpt_object_properties_set_canvas_item (GRptObjectProperties *grpt_object_properties,
+                                        GRptCanvasItem *grpt_canvas_item)
 {
+       if (!GRPT_IS_OBJECT_PROPERTIES (grpt_object_properties)) return;
+       
        GRptObjectPropertiesPrivate *priv = GRPT_OBJECT_PROPERTIES_GET_PRIVATE (grpt_object_properties);
 
-       priv->rpt_obj = g_object_ref (rpt_object);
+       if (GRPT_IS_CANVAS_ITEM (grpt_canvas_item))
+               {
+                       priv->rpt_obj = grpt_canvas_item_get_rpt_object (grpt_canvas_item);
+               }
+       else
+               {
+                       priv->rpt_obj = NULL;
+               }
 
        grpt_object_properties_load_common (grpt_object_properties);
 
@@ -157,6 +168,19 @@ grpt_object_properties_destroy (GRptObjectProperties *grpt_object_properties)
        gtk_widget_destroy (priv->w);
 }
 
+static void
+grpt_object_properties_empty_properties (GRptObjectProperties *grpt_object_properties)
+{
+       GRptObjectPropertiesPrivate *priv = GRPT_OBJECT_PROPERTIES_GET_PRIVATE (grpt_object_properties);
+
+       gtk_entry_set_text (GTK_ENTRY (priv->txt_name), "");
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->spn_x), 0.0);
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->spn_y), 0.0);
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->spn_width), 0.0);
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->spn_height), 0.0);
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->spn_rotation), 0.0);
+}
+
 static void
 grpt_object_properties_load_common (GRptObjectProperties *grpt_object_properties)
 {
@@ -167,6 +191,10 @@ grpt_object_properties_load_common (GRptObjectProperties *grpt_object_properties
 
        GRptObjectPropertiesPrivate *priv = GRPT_OBJECT_PROPERTIES_GET_PRIVATE (grpt_object_properties);
 
+       grpt_object_properties_empty_properties (grpt_object_properties);
+
+       if (!IS_RPT_OBJECT (priv->rpt_obj)) return;
+       
        g_object_get (G_OBJECT (priv->rpt_obj),
                      "name", &name,
                      "position", &position,
@@ -223,19 +251,55 @@ grpt_object_properties_load_text (GRptObjectProperties *grpt_object_properties)
 static void
 grpt_object_properties_load_line (GRptObjectProperties *grpt_object_properties)
 {
+       RptStroke *stroke;
+
+       GRptObjectPropertiesPrivate *priv = GRPT_OBJECT_PROPERTIES_GET_PRIVATE (grpt_object_properties);
+
+       g_object_get (G_OBJECT (priv->rpt_obj),
+                     "stroke", &stroke,
+                     NULL);
 }
 
 static void
 grpt_object_properties_load_rect (GRptObjectProperties *grpt_object_properties)
 {
+       RptStroke *stroke;
+       RptColor *fill_color;
+
+       GRptObjectPropertiesPrivate *priv = GRPT_OBJECT_PROPERTIES_GET_PRIVATE (grpt_object_properties);
+
+       g_object_get (G_OBJECT (priv->rpt_obj),
+                     "stroke", &stroke,
+                                 "fill-color", &fill_color,
+                     NULL);
 }
 
 static void
 grpt_object_properties_load_ellipse (GRptObjectProperties *grpt_object_properties)
 {
+       RptStroke *stroke;
+       RptColor *fill_color;
+
+       GRptObjectPropertiesPrivate *priv = GRPT_OBJECT_PROPERTIES_GET_PRIVATE (grpt_object_properties);
+
+       g_object_get (G_OBJECT (priv->rpt_obj),
+                     "stroke", &stroke,
+                                 "fill-color", &fill_color,
+                     NULL);
 }
 
 static void
 grpt_object_properties_load_image (GRptObjectProperties *grpt_object_properties)
 {
+       RptBorder *border;
+       gchar *source;
+       guint adapt;
+
+       GRptObjectPropertiesPrivate *priv = GRPT_OBJECT_PROPERTIES_GET_PRIVATE (grpt_object_properties);
+
+       g_object_get (G_OBJECT (priv->rpt_obj),
+                     "border", &border,
+                                 "source", &source,
+                                 "adapt", &adapt,
+                     NULL);
 }
diff --git a/src/object_properties.h b/src/object_properties.h
index 37d0b8b7a934cc74336773d605a77210567241ed..3d8e0c061fbc8d0c44cb9f3413d38e8de03d8060 100644 (file)
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -20,7 +20,8 @@
 #define __GRPT_OBJECT_PROPERTIES_H__
 
 #include <glib-object.h>
-#include <libreptool.h>
+
+#include "canvasitem.h"
 
 
 G_BEGIN_DECLS
@@ -51,8 +52,8 @@ GType grpt_object_properties_get_type (void) G_GNUC_CONST;
 
 GRptObjectProperties *grpt_object_properties_new (void);
 
-void grpt_object_properties_set_rpt_object (GRptObjectProperties *grpt_object_properties,
-                                            RptObject *rpt_object);
+void grpt_object_properties_set_canvas_item (GRptObjectProperties *grpt_object_properties,
+                                             GRptCanvasItem *grpt_canvas_item);
 
 void grpt_object_properties_destroy (GRptObjectProperties *grpt_object_properties);
 
diff --git a/src/objects_tree.c b/src/objects_tree.c
index 0069e4839c540ade1f08386ed6a854e34a77425e..b2cd275202f2e604fe5db9df4df214731e72a8bd 100644 (file)
--- a/src/objects_tree.c
+++ b/src/objects_tree.c
@@ -19,7 +19,9 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
+#include "main.h"
 #include "objects_tree.h"
+#include "object_properties.h"
 
 enum
 {
@@ -41,7 +43,7 @@ static void grpt_objects_tree_init (GRptObjectsTree *grpt_objects_tree);
 typedef struct _GRptObjectsTreePrivate GRptObjectsTreePrivate;
 struct _GRptObjectsTreePrivate
        {
-               GRptCanvas *canvas;
+               GRptCanvas *grpt_canvas;
 
                GtkWidget *w_tree;
                GtkWidget *tr_objects;
@@ -56,6 +58,8 @@ struct _GRptObjectsTreePrivate
                GtkTreeRowReference *trr_page_footer;
        };
 
+static GRptObjectProperties *object_properties;
+
 GType
 grpt_objects_tree_get_type (void)
 {
@@ -281,6 +285,87 @@ grpt_objects_tree_find_item_in_section (GRptObjectsTree *grpt_objects_tree,
        return ret;
 }
 
+static gboolean
+grpt_objects_tree_find_item (GRptObjectsTree *grpt_objects_tree,
+                             GRptCanvasItem *grpt_canvas_item,
+                             GtkTreeIter *iter)
+{
+       if (grpt_objects_tree_find_item_in_section (grpt_objects_tree, RPTREPORT_SECTION_REPORT_HEADER,
+                                                   grpt_canvas_item, iter))
+               {
+               }
+       else if (grpt_objects_tree_find_item_in_section (grpt_objects_tree, RPTREPORT_SECTION_PAGE_HEADER,
+                                                                                                        grpt_canvas_item, iter))
+               {
+               }
+       else if (grpt_objects_tree_find_item_in_section (grpt_objects_tree, RPTREPORT_SECTION_BODY,
+                                                        grpt_canvas_item, iter))
+               {
+               }
+       else if (grpt_objects_tree_find_item_in_section (grpt_objects_tree, RPTREPORT_SECTION_REPORT_FOOTER,
+                                                        grpt_canvas_item, iter))
+               {
+               }
+       else if (grpt_objects_tree_find_item_in_section (grpt_objects_tree, RPTREPORT_SECTION_PAGE_FOOTER,
+                                                        grpt_canvas_item, iter))
+               {
+               }
+}
+
+/* CALLBACKS */
+void
+grpt_objects_tree_on_tr_objects_tree_row_activated (GtkTreeView *treeview,
+                                                    GtkTreePath *path,
+                                                    GtkTreeViewColumn *col,
+                                                    gpointer userdata)
+{
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+
+       if (object_properties != NULL) return;
+       
+       object_properties = get_grpt_object_properties ();
+
+       model = gtk_tree_view_get_model (treeview);
+
+       if (gtk_tree_model_get_iter (model, &iter, path))
+               {
+                       GRptCanvasItem *canvas_item;
+                       
+                       gtk_tree_model_get (model, &iter,
+                                                               OBJS_TREE_COL_GRPT_CANVAS_ITEM, &canvas_item,
+                                                               -1);
+
+                       grpt_object_properties_set_canvas_item (object_properties, canvas_item);
+               }
+}
+
+static void
+grpt_objects_tree_on_selection_changed (GtkTreeSelection *treeselection,
+                                        gpointer user_data)
+{
+       GRptCanvasItem *canvas_item = NULL;
+
+       GRptObjectsTreePrivate *priv = GRPT_OBJECTS_TREE_GET_PRIVATE ((GRptObjectsTree *)user_data);
+
+       if (gtk_tree_selection_count_selected_rows (priv->selection) == 1)
+               {
+                       GtkTreeIter iter;
+
+                       GList *rows = gtk_tree_selection_get_selected_rows (priv->selection, NULL);
+
+                       if (gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->tr_store), &iter, (GtkTreePath *)rows->data))
+                               {
+                                       gtk_tree_model_get (GTK_TREE_MODEL (priv->tr_store), &iter,
+                                                                               OBJS_TREE_COL_GRPT_CANVAS_ITEM, &canvas_item,
+                                                                               -1);
+                               }
+               }
+
+       grpt_object_properties_set_canvas_item (object_properties, canvas_item);
+}
+
+/* PUBLIC */
 GRptObjectsTree
 *grpt_objects_tree_new (GRptCanvas *canvas)
 {
@@ -313,7 +398,11 @@ GRptObjectsTree
        gtk_tree_view_append_column (GTK_TREE_VIEW (priv->tr_objects), column);
 
        priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tr_objects));
+       gtk_tree_selection_set_mode (priv->selection, GTK_SELECTION_MULTIPLE);
 
+       g_signal_connect (G_OBJECT (priv->selection), "changed",
+                         G_CALLBACK (grpt_objects_tree_on_selection_changed), (gpointer)obj_tree);
+       
        grpt_objects_tree_set_canvas (obj_tree, canvas);
 
        gtk_widget_show_all (priv->w_tree);
@@ -333,36 +422,38 @@ grpt_objects_tree_set_canvas (GRptObjectsTree *grpt_objects_tree, GRptCanvas *ca
 
        if (priv->w_tree == NULL) return;
 
-       priv->canvas = canvas;
+       priv->grpt_canvas = canvas;
 
        gtk_tree_store_clear (priv->tr_store);
 
-       objects = grpt_canvas_section_get_items (priv->canvas, RPTREPORT_SECTION_REPORT_HEADER);
+       objects = grpt_canvas_section_get_items (priv->grpt_canvas, RPTREPORT_SECTION_REPORT_HEADER);
        if (objects != NULL)
                {
                        grpt_objects_tree_fill_tree_section (grpt_objects_tree, RPTREPORT_SECTION_REPORT_HEADER, objects);
                }
-       objects = grpt_canvas_section_get_items (priv->canvas, RPTREPORT_SECTION_PAGE_HEADER);
+       objects = grpt_canvas_section_get_items (priv->grpt_canvas, RPTREPORT_SECTION_PAGE_HEADER);
        if (objects != NULL)
                {
                        grpt_objects_tree_fill_tree_section (grpt_objects_tree, RPTREPORT_SECTION_PAGE_HEADER, objects);
                }
-       objects = grpt_canvas_section_get_items (priv->canvas, RPTREPORT_SECTION_BODY);
+       objects = grpt_canvas_section_get_items (priv->grpt_canvas, RPTREPORT_SECTION_BODY);
        if (objects != NULL)
                {
                        grpt_objects_tree_fill_tree_section (grpt_objects_tree, RPTREPORT_SECTION_BODY, objects);
                }
-       objects = grpt_canvas_section_get_items (priv->canvas, RPTREPORT_SECTION_REPORT_FOOTER);
+       objects = grpt_canvas_section_get_items (priv->grpt_canvas, RPTREPORT_SECTION_REPORT_FOOTER);
        if (objects != NULL)
                {
                        grpt_objects_tree_fill_tree_section (grpt_objects_tree, RPTREPORT_SECTION_REPORT_FOOTER, objects);
                }
-       objects = grpt_canvas_section_get_items (priv->canvas, RPTREPORT_SECTION_PAGE_FOOTER);
+       objects = grpt_canvas_section_get_items (priv->grpt_canvas, RPTREPORT_SECTION_PAGE_FOOTER);
        if (objects != NULL)
                {
                        grpt_objects_tree_fill_tree_section (grpt_objects_tree, RPTREPORT_SECTION_PAGE_FOOTER, objects);
                }
        g_list_free (objects);
+
+       grpt_objects_tree_select (grpt_objects_tree, grpt_canvas_get_selected_items (priv->grpt_canvas));
 }
 
 void
@@ -456,6 +547,37 @@ grpt_objects_tree_remove_item (GRptObjectsTree *grpt_objects_tree,
                }
 }
 
+void
+grpt_objects_tree_select (GRptObjectsTree *grpt_objects_tree,
+                          GList *objects)
+{
+       GtkTreeIter iter;
+       GRptCanvasItem *canvas_item;
+
+       if (!GRPT_IS_OBJECTS_TREE (grpt_objects_tree)) return;
+
+       GRptObjectsTreePrivate *priv = GRPT_OBJECTS_TREE_GET_PRIVATE (grpt_objects_tree);
+
+       gtk_tree_selection_unselect_all (priv->selection);
+
+       if (objects != NULL)
+               {
+                       objects = g_list_first (objects);
+                       while (objects != NULL)
+                               {
+                                       canvas_item = (GRptCanvasItem *)objects->data;
+
+                                       if (grpt_objects_tree_find_item (grpt_objects_tree,
+                                                                        canvas_item, &iter))
+                                               {
+                                                       gtk_tree_selection_select_iter (priv->selection, &iter);
+                                               }
+
+                                       objects = g_list_next (objects);
+                               }
+               }
+}
+
 void
 grpt_objects_tree_destroy (GRptObjectsTree *grpt_objects_tree)
 {
diff --git a/src/objects_tree.h b/src/objects_tree.h
index cace0de3577f98997ed54590a63836b426cc6a5b..9760544cf7195a7ccf91079e0e4403d542b71090 100644 (file)
--- a/src/objects_tree.h
+++ b/src/objects_tree.h
@@ -63,6 +63,9 @@ void grpt_objects_tree_add_item_to_section (GRptObjectsTree *grpt_objects_tree,
 void grpt_objects_tree_remove_item (GRptObjectsTree *grpt_objects_tree,
                                     GRptCanvasItem *canvas_item);
 
+void grpt_objects_tree_select (GRptObjectsTree *grpt_objects_tree,
+                               GList *objects);
+
 void grpt_objects_tree_destroy (GRptObjectsTree *grpt_objects_tree);
 
 
Unnamed repository; edit this file to name it for gitweb.