[evolution-patches] gal patch for 41217
- From: Anna Marie Dirks <anna ximian com>
- To: evolution-patches ximian com
- Subject: [evolution-patches] gal patch for 41217
- Date: 16 May 2003 15:48:33 -0400
This patch HIG-ifies the spacing/padding of the "edit master category
list" and "edit categories" dialogs. This fixes bug #41217.
Thanks!
-Anna
--
Anna Marie Dirks <anna ximian com>
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/ChangeLog,v
retrieving revision 1.775
diff -u -u -w -r1.775 ChangeLog
--- ChangeLog 16 May 2003 17:19:31 -0000 1.775
+++ ChangeLog 16 May 2003 19:45:12 -0000
@@ -1,3 +1,14 @@
+2003-05-16 Anna Marie Dirks <anna ximian com>
+
+ * gal/widgets/e-categories.c: Added appropriate padding/spacing
+ to the categories list dialog. Fixes the rest of #41217.
+
+ * gal/widgets/e-categories-master-list-dialog.glade: HIG-ified
+ this dialog.
+
+ * gal/widgets/gal-categories.glade: HIG-ified this dialog
+ (in terms of spacing/padding). Fixes most of bug #41217
+
2003-05-16 Mike Kestner <mkestner ximian com>
For Rui Miguel Silva Seabra <rms 1407 org>
Index: gal/widgets/gal-categories.glade
===================================================================
RCS file: /cvs/gnome/gal/gal/widgets/gal-categories.glade,v
retrieving revision 1.4
diff -u -u -w -r1.4 gal-categories.glade
--- gal/widgets/gal-categories.glade 17 Nov 2002 05:40:18 -0000 1.4
+++ gal/widgets/gal-categories.glade 16 May 2003 19:45:13 -0000
@@ -2,107 +2,111 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"; >
<glade-interface>
+
<widget class="GtkDialog" id="categories">
- <property name="visible">no</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">categories</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="modal">no</property>
- <property name="allow_shrink">no</property>
- <property name="allow_grow">yes</property>
- <property name="window-position">GTK_WIN_POS_NONE</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="has_separator">True</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
- <property name="homogeneous">no</property>
- <property name="spacing">8</property>
- <property name="visible">yes</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">8</property>
- <property name="visible">yes</property>
<child>
<widget class="GtkButton" id="button3">
- <property name="can_default">yes</property>
- <property name="can_focus">yes</property>
- <property name="visible">yes</property>
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
<property name="label">gtk-ok</property>
- <property name="use_stock">yes</property>
- <property name="use_underline">yes</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">0</property>
</widget>
</child>
<child>
<widget class="GtkButton" id="button4">
- <property name="can_default">yes</property>
- <property name="can_focus">yes</property>
- <property name="visible">yes</property>
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
<property name="label">gtk-cancel</property>
- <property name="use_stock">yes</property>
- <property name="use_underline">yes</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">0</property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">no</property>
- <property name="fill">yes</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
<child>
<widget class="GtkTable" id="table-categories">
- <property name="homogeneous">no</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">0</property>
- <property name="n-rows">5</property>
- <property name="n-columns">1</property>
- <property name="visible">yes</property>
+ <property name="border_width">6</property>
+ <property name="visible">True</property>
+ <property name="n_rows">5</property>
+ <property name="n_columns">1</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<widget class="GtkEntry" id="entry-categories">
- <property name="can_focus">yes</property>
- <property name="editable">yes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
<property name="text" translatable="yes"></property>
- <property name="max-length">0</property>
- <property name="visibility">yes</property>
- <property name="visible">yes</property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_padding">0</property>
- <property name="y_padding">0</property>
- <property name="x_options">expand|fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label-header">
+ <property name="visible">True</property>
<property name="label" translatable="yes">Item(s) belong to these _categories:</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">no</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">entry-categories</property>
- <property name="visible">yes</property>
- <property name="use_underline">yes</property>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
- <property name="x_padding">0</property>
- <property name="y_padding">0</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -110,23 +114,23 @@
<child>
<widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
<property name="label" translatable="yes">_Available Categories:</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">no</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="visible">yes</property>
- <property name="use_underline">yes</property>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_padding">0</property>
- <property name="y_padding">0</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -134,35 +138,29 @@
<child>
<widget class="GtkButton" id="button-ecmld">
- <property name="can_focus">yes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">Edit Master Category List...</property>
+ <property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="visible">yes</property>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
- <property name="x_padding">0</property>
- <property name="y_padding">0</property>
- <property name="x_options">expand|fill</property>
<property name="y_options">fill</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
- <packing>
- <property name="padding">4</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
- </packing>
</child>
</widget>
+
</glade-interface>
Index: gal/widgets/e-categories.c
===================================================================
RCS file: /cvs/gnome/gal/gal/widgets/e-categories.c,v
retrieving revision 1.31
diff -u -u -w -r1.31 e-categories.c
--- gal/widgets/e-categories.c 12 May 2003 21:55:16 -0000 1.31
+++ gal/widgets/e-categories.c 16 May 2003 19:45:13 -0000
@@ -555,7 +555,9 @@
table = glade_xml_get_widget(gui, "table-categories");
gtk_widget_ref(table);
gtk_container_remove(GTK_CONTAINER(table->parent), table);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (categories)->vbox), table, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (categories)->vbox), table, TRUE, TRUE, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (categories)->vbox), 6);
+
gtk_widget_unref(table);
categories->priv->entry = glade_xml_get_widget(gui, "entry-categories");
Index: gal/widgets/e-categories-master-list-dialog.glade
===================================================================
RCS file: /cvs/gnome/gal/gal/widgets/e-categories-master-list-dialog.glade,v
retrieving revision 1.5
diff -u -u -w -r1.5 e-categories-master-list-dialog.glade
--- gal/widgets/e-categories-master-list-dialog.glade 17 Nov 2002 05:40:18 -0000 1.5
+++ gal/widgets/e-categories-master-list-dialog.glade 16 May 2003 19:45:13 -0000
@@ -4,6 +4,7 @@
<glade-interface>
<widget class="GtkDialog" id="dialog-ecmld">
+ <property name="border_width">6</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Edit Global Category List</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -17,7 +18,7 @@
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">6</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -29,8 +30,8 @@
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Remove</property>
- <property name="use_underline">True</property>
+ <property name="label">gtk-remove</property>
+ <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="response_id">0</property>
</widget>
@@ -65,7 +66,7 @@
<property name="last_modification_time">Sun, 29 Apr 2001 03:41:43 GMT</property>
</widget>
<packing>
- <property name="padding">0</property>
+ <property name="padding">6</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
@@ -75,7 +76,8 @@
</widget>
<widget class="GtkDialog" id="dialog-add">
- <property name="title" translatable="yes">Add a category</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Add Category</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -87,7 +89,7 @@
<widget class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">6</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area2">
@@ -128,38 +130,18 @@
<child>
<widget class="GtkTable" id="table1">
+ <property name="border_width">4</property>
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">1</property>
+ <property name="n_rows">1</property>
+ <property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
- <widget class="GtkEntry" id="entry-add">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Category to Add:</property>
+ <property name="label" translatable="yes">_New category:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -169,6 +151,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">entry-add</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -179,6 +162,27 @@
<property name="y_options"></property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkEntry" id="entry-add">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -191,7 +195,8 @@
</widget>
<widget class="GtkDialog" id="dialog-modify">
- <property name="title" translatable="yes">Modify a Category</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Edit Category</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -203,7 +208,7 @@
<widget class="GtkVBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">6</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area3">
@@ -244,38 +249,18 @@
<child>
<widget class="GtkTable" id="table2">
+ <property name="border_width">3</property>
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">1</property>
+ <property name="n_rows">1</property>
+ <property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
- <widget class="GtkEntry" id="entry-modify">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Category to Modify:</property>
+ <property name="label" translatable="yes">_Edit category:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -285,6 +270,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">entry-modify</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -292,6 +278,27 @@
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="entry-modify">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
<property name="y_options"></property>
</packing>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
