GNOME.org
 

[evolution-patches] fix for timezone selector (bug 62970)

Hi,

This should fix it and improve the UI.

Breaks UI freeze.  Look ok?

Jon

? e-timezone-dialog/e-timezone-dialog.gladep
? misc/ChangeLog.toplevel
? misc/e-error.c.toplevel
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/ChangeLog,v
retrieving revision 1.121
diff -p -u -r1.121 ChangeLog
--- ChangeLog	22 Jun 2004 19:12:13 -0000	1.121
+++ ChangeLog	12 Aug 2004 20:19:05 -0000
@@ -1,3 +1,13 @@
+2004-08-12  William Jon McCann  <mccann jhu edu>
+
+	* e-timezone-dialog/e-timezone-dialog.glade: Add hover label.
+	* e-timezone-dialog/e-timezone-dialog.c
+	(e_timezone_dialog_construct): Revert to use changed signal.
+	(get_widgets): Get hover label.
+	(on_map_motion, on_map_leave): Set hover label instead of Combo.
+
+	Fixes #62970.
+
 2004-06-22  Hans Petter Jansson  <hpj ximian com>
 
 	* misc/e-source-selector.c (e_source_selector_peek_primary_selection):
Index: e-timezone-dialog/e-timezone-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/e-timezone-dialog/e-timezone-dialog.c,v
retrieving revision 1.13
diff -p -u -r1.13 e-timezone-dialog.c
--- e-timezone-dialog/e-timezone-dialog.c	20 May 2004 20:13:12 -0000	1.13
+++ e-timezone-dialog/e-timezone-dialog.c	12 Aug 2004 20:19:05 -0000
@@ -59,6 +59,7 @@ struct _ETimezoneDialogPrivate {
 	GtkWidget *table;
 	GtkWidget *map_window;
 	GtkWidget *timezone_combo;
+	GtkWidget *hover_label;
 };
 
 
@@ -269,7 +270,7 @@ e_timezone_dialog_construct (ETimezoneDi
         g_signal_connect (map, "visibility-notify-event", G_CALLBACK (on_map_visibility_changed), etd);
 	g_signal_connect (map, "button-press-event", G_CALLBACK (on_map_button_pressed), etd);
 
-	g_signal_connect (GTK_COMBO (priv->timezone_combo)->entry, "activate", G_CALLBACK (on_combo_changed), etd);
+	g_signal_connect (GTK_COMBO (priv->timezone_combo)->entry, "changed", G_CALLBACK (on_combo_changed), etd);
 
 	return etd;
 
@@ -295,11 +296,13 @@ get_widgets (ETimezoneDialog *etd)
 	priv->app		= GW ("timezone-dialog");
 	priv->map_window	= GW ("map-window");
 	priv->timezone_combo	= GW ("timezone-combo");
+	priv->hover_label	= GW ("timezone-hover-label");
 	priv->table             = GW ("timezone-table");
 
 	return (priv->app
 		&& priv->map_window
 		&& priv->timezone_combo
+		&& priv->hover_label
 		&& priv->table);
 }
 
@@ -387,7 +390,7 @@ on_map_motion (GtkWidget *widget, GdkEve
 
 	new_zone = get_zone_from_point (etd, priv->point_hover);
 
-	gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->timezone_combo)->entry),
+	gtk_label_set_text (GTK_LABEL (priv->hover_label),
 			    zone_display_name (new_zone));
 
 	return TRUE;
@@ -413,8 +416,7 @@ on_map_leave (GtkWidget *widget, GdkEven
 	        e_map_point_set_color_rgba (priv->map, priv->point_hover,
 					    E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA);
 
-	gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->timezone_combo)->entry),
-			    zone_display_name (priv->zone));
+	gtk_label_set_text (GTK_LABEL (priv->hover_label), "");
 
 	priv->point_hover = NULL;
 
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.6
diff -p -u -r1.6 e-timezone-dialog.glade
--- e-timezone-dialog/e-timezone-dialog.glade	14 Apr 2004 21:30:54 -0000	1.6
+++ e-timezone-dialog/e-timezone-dialog.glade	12 Aug 2004 20:19:05 -0000
@@ -13,6 +13,11 @@
   <property name="default_height">400</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</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_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -34,6 +39,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">-2</property>
 	    </widget>
 	  </child>
@@ -47,6 +53,7 @@
 	      <property name="label">gtk-ok</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">-3</property>
 	    </widget>
 	  </child>
@@ -190,6 +197,61 @@ Use the right mouse button to zoom out.<
 	      <property name="padding">0</property>
 	      <property name="expand">True</property>
 	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkHBox" id="hbox4">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">12</property>
+
+	      <child>
+		<widget class="GtkLabel" id="label7">
+		  <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_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="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="timezone-hover-label">
+		  <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">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
 	    </packing>
 	  </child>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]