2007-01-25 Jim Evins <evins@snaught.com>

	* data/glade/object-editor.glade:
		Added dummy page to notebook, to prevent shadow page from
		becoming the default current page at creation.
	* src/view-box.c: (construct_properties_editor):
	* src/view-ellipse.c: (construct_properties_editor):
	* src/view-line.c: (construct_properties_editor):
	* src/view-text.c: (construct_properties_editor):
		Reconciled order of params.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@609 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index c2e8f648011e9bfe5c2d6b3c8b5a2b52f3a643e0..94bd2357691ea7c581a5aae138817d3f82d31915 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,14 @@
+2007-01-25  Jim Evins  <evins@snaught.com>
+
+       * data/glade/object-editor.glade:
+               Added dummy page to notebook, to prevent shadow page from
+               becoming the default current page at creation.
+       * src/view-box.c: (construct_properties_editor):
+       * src/view-ellipse.c: (construct_properties_editor):
+       * src/view-line.c: (construct_properties_editor):
+       * src/view-text.c: (construct_properties_editor):
+               Reconciled order of params.
+
 2007-01-19  Jim Evins  <evins@snaught.com>
 
        * src/label-barcode.h:

diff --git a/glabels2/data/glade/object-editor.glade b/glabels2/data/glade/object-editor.glade
index 2939374825d8c447ad6cca63e147cc1e33bb6477..46b7cbb63ddef8720a0d0cf08ba5070c27f339f3 100644 (file)
--- a/glabels2/data/glade/object-editor.glade
+++ b/glabels2/data/glade/object-editor.glade
@@ -19,6 +19,7 @@
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -1508,6 +1509,7 @@
                          <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
                          <property name="local_only">True</property>
                          <property name="show_hidden">False</property>
+                         <property name="do_overwrite_confirmation">False</property>
                          <property name="width_chars">-1</property>
                        </widget>
                        <packing>
@@ -3393,6 +3395,45 @@
                  <property name="type">tab</property>
                </packing>
              </child>
+
+             <child>
+               <widget class="GtkVBox" id="dummy_vbox">
+                 <property name="visible">True</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">0</property>
+
+                 <child>
+                   <placeholder/>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="tab_expand">False</property>
+                 <property name="tab_fill">True</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkLabel" id="dummy_page">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">label48</property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0.5</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
+               </widget>
+               <packing>
+                 <property name="type">tab</property>
+               </packing>
+             </child>
            </widget>
            <packing>
              <property name="padding">0</property>

diff --git a/glabels2/src/view-box.c b/glabels2/src/view-box.c
index 35245a6a2c9969ee84a4c9fa5acb0ec34caf71f8..e8b50b5749f128accf374576bf8735c79238a01b 100644 (file)
--- a/glabels2/src/view-box.c
+++ b/glabels2/src/view-box.c
@@ -215,11 +215,11 @@ construct_properties_editor (glViewObject *view_object)
 
        /* Build editor. */
        editor = gl_object_editor_new (GL_STOCK_BOX, _("Box object properties"),
+                                      GL_OBJECT_EDITOR_SHADOW_PAGE,
                                       GL_OBJECT_EDITOR_POSITION_PAGE,
                                       GL_OBJECT_EDITOR_SIZE_PAGE,
                                       GL_OBJECT_EDITOR_FILL_PAGE,
                                       GL_OBJECT_EDITOR_LINE_PAGE,
-                                      GL_OBJECT_EDITOR_SHADOW_PAGE,
                                       0);
        
        /* Update */

diff --git a/glabels2/src/view-ellipse.c b/glabels2/src/view-ellipse.c
index bcbfef33cb79b34b2881d656b7c33f96055885ee..0c3fe94215da686096f9dcb87cf79578f3b32f21 100644 (file)
--- a/glabels2/src/view-ellipse.c
+++ b/glabels2/src/view-ellipse.c
@@ -215,11 +215,11 @@ construct_properties_editor (glViewObject *view_object)
 
        /* Build editor. */
        editor = gl_object_editor_new (GL_STOCK_ELLIPSE, _("Ellipse object properties"),
+                                      GL_OBJECT_EDITOR_SHADOW_PAGE,
                                       GL_OBJECT_EDITOR_POSITION_PAGE,
                                       GL_OBJECT_EDITOR_SIZE_PAGE,
                                       GL_OBJECT_EDITOR_FILL_PAGE,
                                       GL_OBJECT_EDITOR_LINE_PAGE,
-                                      GL_OBJECT_EDITOR_SHADOW_PAGE,
                                       0);
        
        /* Update */

diff --git a/glabels2/src/view-line.c b/glabels2/src/view-line.c
index 02895fd3bd28354d57556851fd35e5a8e2706dee..a025c8c83810a1443e18d96db686ca179e762474 100644 (file)
--- a/glabels2/src/view-line.c
+++ b/glabels2/src/view-line.c
@@ -213,10 +213,10 @@ construct_properties_editor (glViewObject *view_object)
 
        /* Build editor. */
        editor = gl_object_editor_new (GL_STOCK_LINE, _("Line object properties"),
+                                      GL_OBJECT_EDITOR_SHADOW_PAGE,
                                       GL_OBJECT_EDITOR_POSITION_PAGE,
                                       GL_OBJECT_EDITOR_SIZE_LINE_PAGE,
                                       GL_OBJECT_EDITOR_LINE_PAGE,
-                                      GL_OBJECT_EDITOR_SHADOW_PAGE,
                                       0);
        
        /* Update */

diff --git a/glabels2/src/view-text.c b/glabels2/src/view-text.c
index d18ae6862e6a2edcf8ab006c3f13112a304ade21..516d0c7f5cb4c8ff1403b1ec053daf66ffcea802 100644 (file)
--- a/glabels2/src/view-text.c
+++ b/glabels2/src/view-text.c
@@ -260,11 +260,11 @@ construct_properties_editor (glViewObject *view_object)
 
        /* Build editor. */
        editor = gl_object_editor_new (GL_STOCK_TEXT, _("Text object properties"),
+                                      GL_OBJECT_EDITOR_SHADOW_PAGE,
                                       GL_OBJECT_EDITOR_POSITION_PAGE,
                                       GL_OBJECT_EDITOR_SIZE_PAGE,
                                       GL_OBJECT_EDITOR_TEXT_PAGE,
                                       GL_OBJECT_EDITOR_EDIT_PAGE,
-                                      GL_OBJECT_EDITOR_SHADOW_PAGE,
                                       0);
 
        buffer = gl_label_text_get_buffer (GL_LABEL_TEXT(object));