When setting ranges for object-editor size and position spinboxes, allow for plenty...

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

diff --git a/glabels2/src/object-editor-lsize-page.c b/glabels2/src/object-editor-lsize-page.c
index e304f5262c828bfe421c5c46fc573f64a9693919..866cfb8f0898417dea251d504ba42af4d1f16e7e 100644 (file)
--- a/glabels2/src/object-editor-lsize-page.c
+++ b/glabels2/src/object-editor-lsize-page.c
@@ -182,7 +182,7 @@ gl_object_editor_set_max_lsize (glObjectEditor      *editor,
        /* Set widget values */
        tmp = gtk_spin_button_get_value (GTK_SPIN_BUTTON (editor->priv->lsize_r_spin));
        gtk_spin_button_set_range (GTK_SPIN_BUTTON (editor->priv->lsize_r_spin),
-                                  0.0, LENGTH (dx_max, dy_max));
+                                  0.0, 2.0*LENGTH (dx_max, dy_max));
        gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->priv->lsize_r_spin), tmp);
 
        g_signal_handlers_unblock_by_func (G_OBJECT(editor->priv->lsize_r_spin),

diff --git a/glabels2/src/object-editor-position-page.c b/glabels2/src/object-editor-position-page.c
index a79e19e3ec9253fafa683f6ed95146adb74c9990..5e1be495fddd53e35d4839247d54bed50e01e01b 100644 (file)
--- a/glabels2/src/object-editor-position-page.c
+++ b/glabels2/src/object-editor-position-page.c
@@ -178,11 +178,11 @@ gl_object_editor_set_max_position (glObjectEditor      *editor,
        /* Set widget values */
        tmp = gtk_spin_button_get_value (GTK_SPIN_BUTTON (editor->priv->pos_x_spin));
        gtk_spin_button_set_range (GTK_SPIN_BUTTON (editor->priv->pos_x_spin),
-                                  0.0, x_max);
+                                  -x_max, 2.0*x_max);
        gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->priv->pos_x_spin), tmp);
        tmp = gtk_spin_button_get_value (GTK_SPIN_BUTTON (editor->priv->pos_y_spin));
        gtk_spin_button_set_range (GTK_SPIN_BUTTON (editor->priv->pos_y_spin),
-                                  0.0, y_max);
+                                  -y_max, 2.0*y_max);
        gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->priv->pos_y_spin), tmp);
 
        g_signal_handlers_unblock_by_func (G_OBJECT(editor->priv->pos_x_spin),

diff --git a/glabels2/src/object-editor-size-page.c b/glabels2/src/object-editor-size-page.c
index 90db43b8824264ba24fa6a514a3987da03d546e6..83178a4832b8b6bc328c2de69d4f41a57957df6c 100644 (file)
--- a/glabels2/src/object-editor-size-page.c
+++ b/glabels2/src/object-editor-size-page.c
@@ -317,11 +317,11 @@ gl_object_editor_set_max_size (glObjectEditor      *editor,
        /* Set widget values */
        tmp = gtk_spin_button_get_value (GTK_SPIN_BUTTON (editor->priv->size_w_spin));
        gtk_spin_button_set_range (GTK_SPIN_BUTTON (editor->priv->size_w_spin),
-                                  0.0, w_max);
+                                  0.0, 2.0*w_max);
        gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->priv->size_w_spin), tmp);
        tmp = gtk_spin_button_get_value (GTK_SPIN_BUTTON (editor->priv->size_h_spin));
        gtk_spin_button_set_range (GTK_SPIN_BUTTON (editor->priv->size_h_spin),
-                                  0.0, h_max);
+                                  0.0, 2.0*h_max);
        gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->priv->size_h_spin), tmp);
 
        g_signal_handlers_unblock_by_func (G_OBJECT(editor->priv->size_w_spin),

diff --git a/glabels2/src/view-barcode.c b/glabels2/src/view-barcode.c
index a7bbfc60133eb3810e315113e48c0f145e979308..8726eb650722f674bf783591f7d53c63cddd9b76 100644 (file)
--- a/glabels2/src/view-barcode.c
+++ b/glabels2/src/view-barcode.c
@@ -213,9 +213,9 @@ construct_properties_editor (glViewObject *view_object)
                                       0);
 
        /* Update */
+       update_editor_from_label_cb (object->parent, GL_OBJECT_EDITOR(editor));
        update_editor_from_object_cb (object, GL_OBJECT_EDITOR(editor));
        update_editor_from_move_cb (object, 0, 0, GL_OBJECT_EDITOR(editor));
-       update_editor_from_label_cb (object->parent, GL_OBJECT_EDITOR(editor));
 
        /* Connect signals. */
        g_signal_connect (G_OBJECT (editor), "changed",

diff --git a/glabels2/src/view-box.c b/glabels2/src/view-box.c
index a2b855748706d3d216282a3188494fbf0bb5cf3e..c9bfb8ebb7c9adca7eeed8c478fc34836c2a1ee7 100644 (file)
--- a/glabels2/src/view-box.c
+++ b/glabels2/src/view-box.c
@@ -227,9 +227,9 @@ construct_properties_editor (glViewObject *view_object)
                                       0);
        
        /* Update */
+       update_editor_from_label_cb (object->parent, GL_OBJECT_EDITOR(editor));
        update_editor_from_object_cb (object, GL_OBJECT_EDITOR(editor));
        update_editor_from_move_cb (object, 0, 0, GL_OBJECT_EDITOR(editor));
-       update_editor_from_label_cb (object->parent, GL_OBJECT_EDITOR(editor));
 
        /* Connect signals. */
        g_signal_connect (G_OBJECT (editor), "changed",

diff --git a/glabels2/src/view-ellipse.c b/glabels2/src/view-ellipse.c
index 37ee8b0c45ae2cb9b2490cef93910936b100644d..fd2689cc6c0fab710c2a9e5bd2550a87e06d16bc 100644 (file)
--- a/glabels2/src/view-ellipse.c
+++ b/glabels2/src/view-ellipse.c
@@ -227,9 +227,9 @@ construct_properties_editor (glViewObject *view_object)
                                       0);
        
        /* Update */
+       update_editor_from_label_cb (object->parent, GL_OBJECT_EDITOR(editor));
        update_editor_from_object_cb (object, GL_OBJECT_EDITOR(editor));
        update_editor_from_move_cb (object, 0, 0, GL_OBJECT_EDITOR(editor));
-       update_editor_from_label_cb (object->parent, GL_OBJECT_EDITOR(editor));
 
        /* Connect signals. */
        g_signal_connect (G_OBJECT (editor), "changed",

diff --git a/glabels2/src/view-image.c b/glabels2/src/view-image.c
index c48f7396016fe57c01434e8a3fee1f4ffca23ad2..287d0e8865f0803ef252edee100e15282b727197 100644 (file)
--- a/glabels2/src/view-image.c
+++ b/glabels2/src/view-image.c
@@ -225,9 +225,9 @@ construct_properties_editor (glViewObject *view_object)
                                       0);
        
        /* Update */
+       update_editor_from_label_cb (object->parent, GL_OBJECT_EDITOR(editor));
        update_editor_from_object_cb (object, GL_OBJECT_EDITOR(editor));
        update_editor_from_move_cb (object, 0, 0, GL_OBJECT_EDITOR(editor));
-       update_editor_from_label_cb (object->parent, GL_OBJECT_EDITOR(editor));
 
        /* Connect signals. */
        g_signal_connect (G_OBJECT (editor), "changed",

diff --git a/glabels2/src/view-line.c b/glabels2/src/view-line.c
index 065a322658c303e0a2056c68344906e582516181..5ab61db3ece161a1c06657bdb44724813b075ebd 100644 (file)
--- a/glabels2/src/view-line.c
+++ b/glabels2/src/view-line.c
@@ -226,9 +226,9 @@ construct_properties_editor (glViewObject *view_object)
                                       0);
        
        /* Update */
+       update_editor_from_label_cb (object->parent, GL_OBJECT_EDITOR(editor));
        update_editor_from_object_cb (object, GL_OBJECT_EDITOR(editor));
        update_editor_from_move_cb (object, 0, 0, GL_OBJECT_EDITOR(editor));
-       update_editor_from_label_cb (object->parent, GL_OBJECT_EDITOR(editor));
 
        /* Connect signals. */
        g_signal_connect (G_OBJECT (editor), "changed",