aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodney Dawes <dobey@novell.com>2005-01-22 05:53:43 +0800
committerRodney Dawes <dobey@src.gnome.org>2005-01-22 05:53:43 +0800
commitd03a5b84de992ea32e5c71e07c4064552a442954 (patch)
tree7986e84f26a0f7df159e4e87e7f2261562a910f2
parentca1b5bd325a2054597548fda181de793aece23e3 (diff)
downloadgsoc2013-evolution-d03a5b84de992ea32e5c71e07c4064552a442954.tar
gsoc2013-evolution-d03a5b84de992ea32e5c71e07c4064552a442954.tar.gz
gsoc2013-evolution-d03a5b84de992ea32e5c71e07c4064552a442954.tar.bz2
gsoc2013-evolution-d03a5b84de992ea32e5c71e07c4064552a442954.tar.lz
gsoc2013-evolution-d03a5b84de992ea32e5c71e07c4064552a442954.tar.xz
gsoc2013-evolution-d03a5b84de992ea32e5c71e07c4064552a442954.tar.zst
gsoc2013-evolution-d03a5b84de992ea32e5c71e07c4064552a442954.zip
Fix some spacing and remove the separator for HIG compliance Set proper
2005-01-21 Rodney Dawes <dobey@novell.com> * gui/merging/eab-contact-duplicate-detected.glade: Fix some spacing and remove the separator for HIG compliance * gui/merging/eab-contact-merging.c (match_query_callback): Set proper border widths on some dialog containers for the HIG Fixes #41228 svn path=/trunk/; revision=28497
-rw-r--r--addressbook/ChangeLog9
-rw-r--r--addressbook/gui/merging/eab-contact-duplicate-detected.glade20
-rw-r--r--addressbook/gui/merging/eab-contact-merging.c6
3 files changed, 30 insertions, 5 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index cc9a75f940..12259827d0 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-21 Rodney Dawes <dobey@novell.com>
+
+ * gui/merging/eab-contact-duplicate-detected.glade:
+ Fix some spacing and remove the separator for HIG compliance
+ * gui/merging/eab-contact-merging.c (match_query_callback):
+ Set proper border widths on some dialog containers for the HIG
+
+ Fixes #41228
+
2005-01-21 JP Rosevear <jpr@novell.com>
Fixes #46404
diff --git a/addressbook/gui/merging/eab-contact-duplicate-detected.glade b/addressbook/gui/merging/eab-contact-duplicate-detected.glade
index f1095f9db0..0aea834b5c 100644
--- a/addressbook/gui/merging/eab-contact-duplicate-detected.glade
+++ b/addressbook/gui/merging/eab-contact-duplicate-detected.glade
@@ -4,7 +4,6 @@
<glade-interface>
<widget class="GtkDialog" id="dialog-duplicate-contact">
- <property name="border_width">6</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Duplicate Contact Detected</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -12,13 +11,18 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="has_separator">True</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">0</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -33,6 +37,7 @@
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="response_id">1</property>
</widget>
</child>
@@ -45,6 +50,7 @@
<property name="label">gtk-add</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="response_id">0</property>
</widget>
</child>
@@ -59,13 +65,13 @@
<child>
<widget class="GtkTable" id="table1">
- <property name="border_width">6</property>
+ <property name="border_width">12</property>
<property name="visible">True</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<widget class="Custom" id="custom-old-contact">
@@ -177,6 +183,10 @@ in this folder. Would you like to add it anyway?</property>
<property name="yalign">0</property>
<property name="xscale">1</property>
<property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
<child>
<widget class="Custom" id="custom2">
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 685739ed89..a43c56043d 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -15,6 +15,8 @@
#include "eab-contact-compare.h"
#include <glade/glade.h>
#include <gtk/gtksignal.h>
+#include <gtk/gtkdialog.h>
+#include <gtk/gtkcontainer.h>
#include "addressbook/gui/widgets/eab-contact-display.h"
typedef enum {
@@ -175,6 +177,10 @@ match_query_callback (EContact *contact, EContact *match, EABContactMatchType ty
widget = glade_xml_get_widget (ui, "dialog-duplicate-contact");
+ gtk_widget_ensure_style (widget);
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (widget)->vbox), 0);
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (widget)->action_area), 12);
+
g_signal_connect (widget, "response",
G_CALLBACK (response), lookup);