2005-05-19 Jim Evins <evins@snaught.com>

	* data/glade/merge-properties-dialog.glade:
		Fixed irregular spacing.
	* src/merge-properties-dialog.c: (gl_merge_properties_dialog_init),
	(gl_merge_properties_dialog_construct):
		Set outer padding and remove separator.

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

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index d739599f7b7949ba6167dda72ee9bfcfaee48998..79be45ee09924b9e68b1bb916a943f9dbf295f22 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-19  Jim Evins,,,  <set EMAIL_ADDRESS environment variable>
+
+       reviewed by: <delete if not using a buddy>
+
+       * data/glade/merge-properties-dialog.glade:
+       * src/merge-properties-dialog.c: (gl_merge_properties_dialog_init),
+       (gl_merge_properties_dialog_construct):
+
 2005-05-18  Jim Evins  <evins@snaught.com>
 
        * src/hig.h:

diff --git a/glabels2/data/glade/merge-properties-dialog.glade b/glabels2/data/glade/merge-properties-dialog.glade
index 0571d9f3c56600c315c4fa75296449a6c0534baf..b62dcedf283bcd7a5ed6a6a1ab4a781c83919e75 100644 (file)
--- a/glabels2/data/glade/merge-properties-dialog.glade
+++ b/glabels2/data/glade/merge-properties-dialog.glade
@@ -68,7 +68,7 @@
        <widget class="GtkVBox" id="merge_properties_vbox">
          <property name="visible">True</property>
          <property name="homogeneous">False</property>
-         <property name="spacing">0</property>
+         <property name="spacing">6</property>
 
          <child>
            <widget class="GtkFrame" id="frame1">
@@ -226,7 +226,6 @@
 
          <child>
            <widget class="GtkFrame" id="frame2">
-             <property name="border_width">6</property>
              <property name="visible">True</property>
              <property name="label_xalign">0</property>
              <property name="label_yalign">0.5</property>

diff --git a/glabels2/src/merge-properties-dialog.c b/glabels2/src/merge-properties-dialog.c
index 04c92905bb07a0e0944be1448aa3267ce21cc6f7..10efabd426cdc7ed3f9239b5acd7c9a6083c5d8f 100644 (file)
--- a/glabels2/src/merge-properties-dialog.c
+++ b/glabels2/src/merge-properties-dialog.c
@@ -38,6 +38,7 @@
 #include "label.h"
 #include "merge.h"
 #include "util.h"
+#include "hig.h"
 
 #include "debug.h"
 
@@ -179,6 +180,20 @@ gl_merge_properties_dialog_init (glMergePropertiesDialog *dialog)
                return;
        }
 
+       gtk_container_set_border_width (GTK_CONTAINER(dialog), GL_HIG_PAD2);
+
+       gtk_dialog_set_has_separator (GTK_DIALOG(dialog), FALSE);
+       gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+                               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                               GTK_STOCK_OK, GTK_RESPONSE_OK,
+                               NULL);
+
+       gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+       g_signal_connect(G_OBJECT (dialog), "response",
+                        G_CALLBACK (response_cb), NULL);
+
+
        gl_debug (DEBUG_MERGE, "END");
 }
 
@@ -251,21 +266,11 @@ gl_merge_properties_dialog_construct (glMergePropertiesDialog *dialog,
        g_return_if_fail (GL_IS_MERGE_PROPERTIES_DIALOG (dialog));
        g_return_if_fail (dialog->priv != NULL);
 
-       gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-                               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                               GTK_STOCK_OK, GTK_RESPONSE_OK,
-                               NULL);
-
        if (window) {
                gtk_window_set_transient_for (GTK_WINDOW(dialog), GTK_WINDOW(window));
                gtk_window_set_destroy_with_parent (GTK_WINDOW(dialog), TRUE);
        }
 
-       gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-
-       g_signal_connect(G_OBJECT (dialog), "response",
-                        G_CALLBACK (response_cb), NULL);
-
        vbox = glade_xml_get_widget (dialog->priv->gui,
                                     "merge_properties_vbox");
        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);