[evolution-patches] calendar patch for #41148



This patch HIG-ifies the timezone dialog, and fixes #41148.

Have a nice day.

-- 
Anna Marie Dirks <anna ximian com>
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/ChangeLog,v
retrieving revision 1.102
diff -u -u -w -r1.102 ChangeLog
--- ChangeLog	14 May 2003 18:42:37 -0000	1.102
+++ ChangeLog	16 May 2003 20:28:59 -0000
@@ -1,3 +1,8 @@
+2003-05-16  Anna Marie Dirks  <anna ximian com>
+
+	* e-timezone-dialog/e-timezone-dialog.glade: HIG-ified the
+	spacing, padding, alignment of this dialog. Fixes bug #41148
+
 2003-05-14  JP Rosevear  <jpr ximian com>
 
 	* menus/gal-view-menus.c (gvm_finalize): unref the component
Index: e-timezone-dialog/e-timezone-dialog.glade
===================================================================
RCS file: /cvs/gnome/evolution/widgets/e-timezone-dialog/e-timezone-dialog.glade,v
retrieving revision 1.4
diff -u -u -w -r1.4 e-timezone-dialog.glade
--- e-timezone-dialog/e-timezone-dialog.glade	18 Mar 2003 17:16:20 -0000	1.4
+++ e-timezone-dialog/e-timezone-dialog.glade	16 May 2003 20:29:00 -0000
@@ -2,89 +2,93 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"; >
 
 <glade-interface>
+
   <widget class="GtkDialog" id="timezone-dialog">
-    <property name="visible">no</property>
+  <property name="border_width">6</property>
     <property name="title" translatable="yes">Select a Time Zone</property>
     <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="modal">no</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
     <property name="default_width">500</property>
     <property name="default_height">400</property>
-    <property name="allow_shrink">no</property>
-    <property name="allow_grow">yes</property>
-    <property name="window-position">GTK_WIN_POS_NONE</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="cancel-button">
-                <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">-2</property>
               </widget>
             </child>
 
 	    <child>
               <widget class="GtkButton" id="ok-button">
-                <property name="can_default">yes</property>
-                <property name="has_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="has_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">-3</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="table1">
-            <property name="homogeneous">no</property>
-            <property name="row_spacing">4</property>
-            <property name="column_spacing">0</property>
-            <property name="n-rows">3</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">3</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="GtkLabel" id="label1">
+	      <property name="visible">True</property>
                 <property name="label" translatable="yes">Use the left mouse button to zoom in on an area of the map and select a time zone.
  Use the right mouse button to zoom out.</property>
-                <property name="justify">GTK_JUSTIFY_CENTER</property>
-                <property name="wrap">no</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</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>
               </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">2</property>
                 <property name="x_options">expand</property>
                 <property name="y_options"></property>
@@ -93,151 +97,174 @@
 
             <child>
               <widget class="GtkFrame" id="frame1">
-                <property name="label" translatable="yes">Time Zones</property>
+	      <property name="visible">True</property>
                 <property name="label_xalign">0</property>
-                <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-                <property name="visible">yes</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 
                 <child>
                   <widget class="GtkVBox" id="vbox1">
-                    <property name="border_width">4</property>
-                    <property name="homogeneous">no</property>
-                    <property name="spacing">4</property>
-                    <property name="visible">yes</property>
+		  <property name="border_width">6</property>
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
 
                     <child>
                       <widget class="GtkScrolledWindow" id="map-window">
+		      <property name="visible">True</property>
                         <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
                         <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                        <property name="visible">yes</property>
+		      <property name="shadow_type">GTK_SHADOW_IN</property>
+		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
                         <child>
                           <placeholder />
                         </child>
-
-                        <child internal-child="hscrollbar">
-                          <widget class="GtkHScrollbar" id="convertwidget1">
-                            <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                        </child>
-
-                        <child internal-child="vscrollbar">
-                          <widget class="GtkVScrollbar" id="convertwidget2">
-                            <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                        </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>
 
                     <child>
                       <widget class="GtkVBox" id="vbox2">
-                        <property name="homogeneous">no</property>
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
                         <property name="spacing">0</property>
-                        <property name="visible">yes</property>
 
                         <child>
                           <widget class="GtkLabel" id="timezone-preview">
+			  <property name="visible">True</property>
                             <property name="label" translatable="yes"></property>
+			  <property name="use_underline">False</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.5</property>
                             <property name="yalign">0.5</property>
                             <property name="xpad">0</property>
                             <property name="ypad">0</property>
-                            <property name="visible">yes</property>
                           </widget>
                           <packing>
                             <property name="padding">0</property>
-                            <property name="expand">no</property>
-                            <property name="fill">no</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
                           </packing>
                         </child>
                       </widget>
                       <packing>
                         <property name="padding">0</property>
-                        <property name="expand">no</property>
-                        <property name="fill">no</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
                       </packing>
                     </child>
                   </widget>
                 </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label2">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Time Zones</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="type">label_item</property>
+		</packing>
+	      </child>
               </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">fill</property>
-                <property name="y_options">expand|fill</property>
               </packing>
             </child>
 
             <child>
               <widget class="GtkHBox" id="hbox1">
-                <property name="homogeneous">no</property>
-                <property name="spacing">4</property>
-                <property name="visible">yes</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">6</property>
 
                 <child>
                   <widget class="GtkLabel" id="label3">
-                    <property name="label" translatable="yes">Selection:</property>
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">_Selection:</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.5</property>
                     <property name="yalign">0.5</property>
                     <property name="xpad">0</property>
                     <property name="ypad">0</property>
-                    <property name="visible">yes</property>
+		  <property name="mnemonic_widget">combo-entry1</property>
                   </widget>
                   <packing>
                     <property name="padding">0</property>
-                    <property name="expand">no</property>
-                    <property name="fill">no</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
                   </packing>
                 </child>
 
                 <child>
                   <widget class="GtkCombo" id="timezone-combo">
-                    <property name="value_in_list">no</property>
-                    <property name="case_sensitive">no</property>
-                    <property name="enable_arrow_keys">yes</property>
-                    <property name="enable_arrows_always">no</property>
-                    <property name="allow_empty">yes</property>
-                    <property name="visible">yes</property>
+		  <property name="visible">True</property>
+		  <property name="value_in_list">False</property>
+		  <property name="allow_empty">True</property>
+		  <property name="case_sensitive">False</property>
+		  <property name="enable_arrow_keys">True</property>
+		  <property name="enable_arrows_always">False</property>
 
                     <child internal-child="entry">
                       <widget class="GtkEntry" id="combo-entry1">
-                        <property name="can_focus">yes</property>
-                        <property name="editable">no</property>
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="editable">False</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>
                     </child>
 
                     <child internal-child="list">
                       <widget class="GtkList" id="convertwidget3">
-                        <property name="visible">yes</property>
+		      <property name="visible">True</property>
+		      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
 
                         <child>
                           <widget class="GtkListItem" id="convertwidget4">
-                            <property name="visible">yes</property>
+			  <property name="visible">True</property>
 
                             <child>
                               <widget class="GtkLabel" id="convertwidget5">
+			      <property name="visible">True</property>
                                 <property name="label" translatable="yes"></property>
-                                <property name="xalign">0.0</property>
-                                <property name="visible">yes</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</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>
                               </widget>
                             </child>
                           </widget>
@@ -247,8 +274,8 @@
                   </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>
@@ -257,8 +284,6 @@
                 <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">fill</property>
               </packing>
@@ -266,16 +291,12 @@
           </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>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]