From 724b51b4ffaf280517052d7a2cbf51c31889aa20 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Fri, 11 Apr 2003 19:11:50 +0000
Subject: Fixes for bugs: #41149, #41150, #41151, #41152, #41153, #41155 and
 #41156.

2003-04-11  Jeffrey Stedfast  <fejj@ximian.com>

	Fixes for bugs: #41149, #41150, #41151, #41152, #41153, #41155 and
	#41156.

	* filter-filter.c (get_widget): Same as with filter-rule.

	* filter-rule.c (get_widget): Changed border widths of frame
	vboxes and other padding to comply with the HIG.

	* rule-editor.c (rule_add): Change window border and padding
	around the 'rules' widget to comply with the HIG.
	(rule_edit): Same.
	(rule_editor_construct): Same here as well.

	* filter.glade: Many HIG compliance fixes.

svn path=/trunk/; revision=20823
---
 filter/filter.glade | 71 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 31 deletions(-)

(limited to 'filter/filter.glade')

diff --git a/filter/filter.glade b/filter/filter.glade
index a5fa0f5ad1..973c7ea33c 100644
--- a/filter/filter.glade
+++ b/filter/filter.glade
@@ -4,6 +4,7 @@
 <glade-interface>
 
 <widget class="GtkDialog" id="filter-editor">
+  <property name="border_width">6</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Edit Filters</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">
@@ -100,9 +101,10 @@
 
 	  <child>
 	    <widget class="GtkHBox" id="hbox1">
+	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="spacing">6</property>
 
 	      <child>
 		<widget class="GtkScrolledWindow" id="scrolledwindow1">
@@ -146,15 +148,15 @@
 		    <widget class="GtkVButtonBox" id="vbuttonbox1">
 		      <property name="visible">True</property>
 		      <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
 
 		      <child>
 			<widget class="GtkButton" id="rule_add">
 			  <property name="visible">True</property>
 			  <property name="can_default">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Add</property>
-			  <property name="use_underline">True</property>
+			  <property name="label">gtk-add</property>
+			  <property name="use_stock">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			</widget>
 		      </child>
@@ -175,8 +177,8 @@
 			  <property name="visible">True</property>
 			  <property name="can_default">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Delete</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>
 			</widget>
 		      </child>
@@ -249,6 +251,7 @@
 </widget>
 
 <widget class="GtkDialog" id="vfolder-editor">
+  <property name="border_width">6</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Edit VFolders</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -310,9 +313,10 @@
 
 	  <child>
 	    <widget class="GtkHBox" id="hbox2">
+	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="spacing">6</property>
 
 	      <child>
 		<widget class="GtkScrolledWindow" id="scrolledwindow2">
@@ -356,15 +360,15 @@
 		    <widget class="GtkVButtonBox" id="vbuttonbox2">
 		      <property name="visible">True</property>
 		      <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
 
 		      <child>
 			<widget class="GtkButton" id="rule_add">
 			  <property name="visible">True</property>
 			  <property name="can_default">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Add</property>
-			  <property name="use_underline">True</property>
+			  <property name="label">gtk-add</property>
+			  <property name="use_stock">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			</widget>
 		      </child>
@@ -385,8 +389,8 @@
 			  <property name="visible">True</property>
 			  <property name="can_default">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Delete</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>
 			</widget>
 		      </child>
@@ -459,6 +463,7 @@
 </widget>
 
 <widget class="GtkDialog" id="vfolder-source">
+  <property name="border_width">6</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes"></property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -532,9 +537,10 @@
 
 	  <child>
 	    <widget class="GtkVBox" id="vbox3">
+	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="spacing">6</property>
 
 	      <child>
 		<widget class="GtkOptionMenu" id="source_option">
@@ -591,7 +597,7 @@
 		<widget class="GtkHBox" id="hbox3">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
+		  <property name="spacing">6</property>
 
 		  <child>
 		    <widget class="GtkScrolledWindow" id="scrolledwindow3">
@@ -629,21 +635,21 @@
 		    <widget class="GtkVBox" id="vbox3">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">1</property>
 
 		      <child>
 			<widget class="GtkVButtonBox" id="vbuttonbox3">
 			  <property name="visible">True</property>
 			  <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-			  <property name="spacing">0</property>
+			  <property name="spacing">6</property>
 
 			  <child>
 			    <widget class="GtkButton" id="source_add">
 			      <property name="visible">True</property>
 			      <property name="can_default">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Add</property>
-			      <property name="use_underline">True</property>
+			      <property name="label">gtk-add</property>
+			      <property name="use_stock">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			    </widget>
 			  </child>
@@ -653,8 +659,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>
 			    </widget>
 			  </child>
@@ -712,6 +718,7 @@
 </widget>
 
 <widget class="GtkWindow" id="rule-editor">
+  <property name="border_width">6</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">window1</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -724,7 +731,7 @@
     <widget class="GtkVBox" id="rule_editor">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">6</property>
 
       <child>
 	<widget class="GtkOptionMenu" id="filter_source">
@@ -761,9 +768,10 @@
 
 	  <child>
 	    <widget class="GtkHBox" id="hbox4">
+	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="spacing">6</property>
 
 	      <child>
 		<widget class="GtkScrolledWindow" id="scrolledwindow4">
@@ -807,15 +815,15 @@
 		    <widget class="GtkVButtonBox" id="vbuttonbox4">
 		      <property name="visible">True</property>
 		      <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
 
 		      <child>
 			<widget class="GtkButton" id="rule_add">
 			  <property name="visible">True</property>
 			  <property name="can_default">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Add</property>
-			  <property name="use_underline">True</property>
+			  <property name="label">gtk-add</property>
+			  <property name="use_stock">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			</widget>
 		      </child>
@@ -836,8 +844,8 @@
 			  <property name="visible">True</property>
 			  <property name="can_default">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Delete</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>
 			</widget>
 		      </child>
@@ -910,6 +918,7 @@
 </widget>
 
 <widget class="GtkWindow" id="filter_datespec_win">
+  <property name="border_width">6</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">window1</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -922,14 +931,14 @@
     <widget class="GtkVBox" id="filter_datespec">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">3</property>
+      <property name="spacing">6</property>
 
       <child>
 	<widget class="GtkHBox" id="hbox5">
 	  <property name="border_width">4</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">3</property>
+	  <property name="spacing">6</property>
 
 	  <child>
 	    <widget class="GtkLabel" id="label4">
@@ -1052,7 +1061,7 @@ the current time when filtering occurs.</property>
 	    </widget>
 	    <packing>
 	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
+	      <property name="tab_fill">False</property>
 	    </packing>
 	  </child>
 
-- 
cgit