aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--widgets/ChangeLog10
-rw-r--r--widgets/e-timezone-dialog/e-timezone-dialog.c11
-rw-r--r--widgets/e-timezone-dialog/e-timezone-dialog.glade55
3 files changed, 66 insertions, 10 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 7dd3523524..3154caedba 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,13 @@
+2004-09-13 Rodney Dawes <dobey@novell.com>
+
+ * e-timezone-dialog/e-timezone-dialog.c (get_widgets):
+ (on_map_motion, on_map_leave, e_timezone_dialog_set_timezone):
+ * e-timezone-dialog/e-timezone-dialog.glade:
+ Add the label back for previewing the timezone name, and set the
+ label appropriately
+
+ Fixes #64800
+
2004-08-17 Rodney Dawes <dobey@novell.com>
* e-timezone-dialog/e-timezone-dialog.c (e_timezone_dialog_construct):
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index 2a179dc465..19a5685b38 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -59,6 +59,7 @@ struct _ETimezoneDialogPrivate {
GtkWidget *table;
GtkWidget *map_window;
GtkWidget *timezone_combo;
+ GtkWidget *preview_label;
};
@@ -296,11 +297,13 @@ get_widgets (ETimezoneDialog *etd)
priv->map_window = GW ("map-window");
priv->timezone_combo = GW ("timezone-combo");
priv->table = GW ("timezone-table");
+ priv->preview_label = GW ("preview-label");
return (priv->app
&& priv->map_window
&& priv->timezone_combo
- && priv->table);
+ && priv->table
+ && priv->preview_label);
}
@@ -321,7 +324,6 @@ e_timezone_dialog_new (void)
return e_timezone_dialog_construct (E_TIMEZONE_DIALOG (etd));
}
-
static const char *
zone_display_name (icaltimezone *zone)
{
@@ -387,7 +389,7 @@ on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data)
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->preview_label),
zone_display_name (new_zone));
return TRUE;
@@ -415,6 +417,7 @@ on_map_leave (GtkWidget *widget, GdkEventCrossing *event, gpointer data)
gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->timezone_combo)->entry),
zone_display_name (priv->zone));
+ gtk_label_set_text (GTK_LABEL (priv->preview_label), "");
priv->point_hover = NULL;
@@ -568,6 +571,8 @@ e_timezone_dialog_set_timezone (ETimezoneDialog *etd,
priv->zone = zone;
+ gtk_label_set_text (GTK_LABEL (priv->preview_label),
+ zone ? zone_display_name (zone) : "");
gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->timezone_combo)->entry),
zone ? zone_display_name (zone) : "");
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.glade b/widgets/e-timezone-dialog/e-timezone-dialog.glade
index 3bcc8df73c..2f7bb95a0b 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.glade
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.glade
@@ -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_DIALOG</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>
@@ -167,16 +174,50 @@ Use the right mouse button to zoom out.</property>
</child>
<child>
- <widget class="GtkScrolledWindow" id="map-window">
+ <widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
<child>
- <placeholder/>
+ <widget class="GtkScrolledWindow" id="map-window">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="preview-label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">America/New_York</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>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
</widget>
<packing>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 05:35:45 +0800