aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Petter Jansson <hpj@ximian.com>2003-01-25 06:02:49 +0800
committerHans Petter <hansp@src.gnome.org>2003-01-25 06:02:49 +0800
commit0d838a10a2e8eb6a5c99637a037b34b31a00cdf8 (patch)
tree64eaa789ebd8968f9d76cf3f3067f2297f4521c3
parent1591861a2c3e856551b388c3de1a4da1d7f0fcd8 (diff)
downloadgsoc2013-evolution-0d838a10a2e8eb6a5c99637a037b34b31a00cdf8.tar
gsoc2013-evolution-0d838a10a2e8eb6a5c99637a037b34b31a00cdf8.tar.gz
gsoc2013-evolution-0d838a10a2e8eb6a5c99637a037b34b31a00cdf8.tar.bz2
gsoc2013-evolution-0d838a10a2e8eb6a5c99637a037b34b31a00cdf8.tar.lz
gsoc2013-evolution-0d838a10a2e8eb6a5c99637a037b34b31a00cdf8.tar.xz
gsoc2013-evolution-0d838a10a2e8eb6a5c99637a037b34b31a00cdf8.tar.zst
gsoc2013-evolution-0d838a10a2e8eb6a5c99637a037b34b31a00cdf8.zip
Don't insist appointment is updated if both old and new summary are blank.
2003-01-24 Hans Petter Jansson <hpj@ximian.com> * gui/e-day-view.c (e_day_view_on_editing_stopped): Don't insist appointment is updated if both old and new summary are blank. * gui/e-week-view.c (e_week_view_on_editing_stopped): Ditto. * gui/e-timezone-entry.c (on_button_clicked): Timezone dialog is now a GtkDialog. Treat it as such. * gui/goto.c (ecal_event): Goto dialog is now a GtkDialog. Treat it as such. (goto_dialog): Ditto. * gui/goto-dialog.glade: Set the return IDs from the dialog buttons. * gui/dialogs/meeting-page.c (popup_delegate_cb): Enable the delegate dialog. It's now a GtkDialog, so treat it like one. (right_click_cb): Use GTK stock item, not GNOME (that doesn't work anymore). * gui/e-delegate-dialog.glade: Set the return IDs from dialog buttons. * gui/print.c (print_calendar): Correct the print dialog init. Code is still not enabled, though. * gui/tasks-control.c (print_tasks): Add a warning about printing being disabled. svn path=/trunk/; revision=19624
-rw-r--r--calendar/ChangeLog29
-rw-r--r--calendar/gui/dialogs/e-delegate-dialog.glade199
-rw-r--r--calendar/gui/dialogs/meeting-page.c15
-rw-r--r--calendar/gui/e-day-view.c2
-rw-r--r--calendar/gui/e-timezone-entry.c2
-rw-r--r--calendar/gui/e-week-view.c2
-rw-r--r--calendar/gui/goto-dialog.glade430
-rw-r--r--calendar/gui/goto.c12
-rw-r--r--calendar/gui/print.c5
-rw-r--r--calendar/gui/tasks-control.c1
10 files changed, 373 insertions, 324 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b88865d257..3667c6a1c5 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,32 @@
+2003-01-24 Hans Petter Jansson <hpj@ximian.com>
+
+ * gui/e-day-view.c (e_day_view_on_editing_stopped): Don't insist
+ appointment is updated if both old and new summary are blank.
+
+ * gui/e-week-view.c (e_week_view_on_editing_stopped): Ditto.
+
+ * gui/e-timezone-entry.c (on_button_clicked): Timezone dialog is now
+ a GtkDialog. Treat it as such.
+
+ * gui/goto.c (ecal_event): Goto dialog is now a GtkDialog. Treat it
+ as such.
+ (goto_dialog): Ditto.
+
+ * gui/goto-dialog.glade: Set the return IDs from the dialog buttons.
+
+ * gui/dialogs/meeting-page.c (popup_delegate_cb): Enable the delegate
+ dialog. It's now a GtkDialog, so treat it like one.
+ (right_click_cb): Use GTK stock item, not GNOME (that doesn't work
+ anymore).
+
+ * gui/e-delegate-dialog.glade: Set the return IDs from dialog buttons.
+
+ * gui/print.c (print_calendar): Correct the print dialog init. Code
+ is still not enabled, though.
+
+ * gui/tasks-control.c (print_tasks): Add a warning about printing
+ being disabled.
+
2003-01-24 Ettore Perazzoli <ettore@ximian.com>
* gui/dialogs/Makefile.am (iconsdir): Remove, this is now defined
diff --git a/calendar/gui/dialogs/e-delegate-dialog.glade b/calendar/gui/dialogs/e-delegate-dialog.glade
index 8745153ddb..4e26e2d6e7 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.glade
+++ b/calendar/gui/dialogs/e-delegate-dialog.glade
@@ -1,109 +1,112 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd" >
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface>
- <widget class="GtkDialog" id="delegate-dialog">
- <property name="visible">no</property>
- <property name="title" translatable="yes">Enter Delegate</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>
- <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>
+<widget class="GtkDialog" id="delegate-dialog">
+ <property name="title" translatable="yes">Enter Delegate</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</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="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">8</property>
- <property name="visible">yes</property>
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</property>
- <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="label">gtk-ok</property>
- <property name="use_stock">yes</property>
- <property name="use_underline">yes</property>
- </widget>
- </child>
+ <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>
- <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="label">gtk-cancel</property>
- <property name="use_stock">yes</property>
- <property name="use_underline">yes</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">no</property>
- <property name="fill">yes</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkButton" id="ok-button">
+ <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">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-5</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkHBox" id="delegate-hbox">
- <property name="homogeneous">no</property>
- <property name="spacing">4</property>
- <property name="visible">yes</property>
+ <child>
+ <widget class="GtkButton" id="cancel-button">
+ <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">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-6</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="label" translatable="yes">Delegate To:</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">no</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>
- </packing>
- </child>
+ <child>
+ <widget class="GtkHBox" id="delegate-hbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">4</property>
+
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Delegate To:</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.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="GtkButton" id="addressbook">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Addressbook...</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
- <child>
- <widget class="GtkButton" id="addressbook">
- <property name="can_focus">yes</property>
- <property name="label" translatable="yes">Addressbook...</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="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">no</property>
- <property name="fill">no</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>
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index 36baf84ca7..3917ef18bd 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -542,7 +542,6 @@ init_widgets (MeetingPage *mpage)
G_CALLBACK (invite_cb), mpage);
}
-#if 0
static void
popup_delegate_cb (GtkWidget *widget, gpointer data)
{
@@ -561,7 +560,7 @@ popup_delegate_cb (GtkWidget *widget, gpointer data)
edd = e_delegate_dialog_new (NULL, itip_strip_mailto (e_meeting_attendee_get_delto (ia)));
dialog = e_delegate_dialog_get_toplevel (edd);
- if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == 0){
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK){
EMeetingAttendee *ic;
name = e_delegate_dialog_get_delegate_name (edd);
@@ -601,7 +600,6 @@ popup_delegate_cb (GtkWidget *widget, gpointer data)
g_free (address);
g_object_unref((edd));
}
-#endif
static void
popup_delete_cb (GtkWidget *widget, gpointer data)
@@ -644,11 +642,9 @@ enum {
};
static EPopupMenu context_menu[] = {
-#if 0
E_POPUP_ITEM (N_("_Delegate To..."), G_CALLBACK (popup_delegate_cb), CAN_DELEGATE),
E_POPUP_SEPARATOR,
-#endif
E_POPUP_ITEM (N_("_Delete"), G_CALLBACK (popup_delete_cb), CAN_DELETE),
@@ -669,10 +665,11 @@ right_click_cb (ETable *etable, gint row, gint col, GdkEvent *event, gpointer da
view_row = e_table_model_to_view_row (etable, row);
priv->row = e_meeting_model_etable_view_to_model_row (etable, priv->model, view_row);
- /* FIXME: if you enable Delegate, then change index to '1' */
-#if 0
- context_menu[0].pixmap_widget = gnome_stock_new_with_icon (GNOME_STOCK_MENU_TRASH);
-#endif
+ /* FIXME: if you enable Delegate, then change index to '1'.
+ * (This has now been enabled). */
+ /* context_menu[1].pixmap_widget = gnome_stock_new_with_icon (GNOME_STOCK_MENU_TRASH); */
+ context_menu[1].pixmap_widget =
+ gtk_image_new_from_stock (GTK_STOCK_DELETE, GTK_ICON_SIZE_MENU);
menu = e_popup_menu_create (context_menu, enable_mask, hide_mask, data);
e_auto_kill_popup_menu_on_hide (menu);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index f0ece52c84..82097fc87d 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -6213,7 +6213,7 @@ e_day_view_on_editing_stopped (EDayView *day_view,
else
e_day_view_update_event_label (day_view, day,
event_num);
- } else {
+ } else if (summary.value || !string_is_empty (text)) {
summary.value = text;
summary.altrep = NULL;
cal_component_set_summary (event->comp, &summary);
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 8f85cbff2e..7f5c36600b 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -216,7 +216,7 @@ on_button_clicked (GtkWidget *widget,
dialog = e_timezone_dialog_get_toplevel (timezone_dialog);
- if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == 0) {
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
tzid = e_timezone_dialog_get_timezone (E_TIMEZONE_DIALOG (timezone_dialog), &display_name);
old_display_name = gtk_entry_get_text (GTK_ENTRY (priv->entry));
/* See if the timezone has been changed. It can only have been
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 51b01eb9d4..aa8a2727d6 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -3212,7 +3212,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
if (!e_week_view_is_one_day_event (week_view, event_num))
e_week_view_reshape_event_span (week_view, event_num,
span_num);
- } else {
+ } else if (summary.value || !string_is_empty (text)) {
summary.value = text;
summary.altrep = NULL;
cal_component_set_summary (event->comp, &summary);
diff --git a/calendar/gui/goto-dialog.glade b/calendar/gui/goto-dialog.glade
index 02fb71718d..b268e03294 100644
--- a/calendar/gui/goto-dialog.glade
+++ b/calendar/gui/goto-dialog.glade
@@ -1,213 +1,225 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd" >
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface>
- <widget class="GtkDialog" id="goto-dialog">
- <property name="visible">no</property>
- <property name="title" translatable="yes">Go To Date</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="modal">no</property>
- <property name="allow_shrink">no</property>
- <property name="allow_grow">no</property>
- <property name="window-position">GTK_WIN_POS_NONE</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>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">8</property>
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkButton" id="button4">
- <property name="can_default">yes</property>
- <property name="can_focus">yes</property>
- <property name="label" translatable="yes">Go To Today</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button5">
- <property name="can_default">yes</property>
- <property name="can_focus">yes</property>
- <property name="visible">yes</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">yes</property>
- <property name="use_underline">yes</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">no</property>
- <property name="fill">yes</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox">
- <property name="homogeneous">no</property>
- <property name="spacing">4</property>
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkHBox" id="hbox12">
- <property name="homogeneous">yes</property>
- <property name="spacing">4</property>
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkOptionMenu" id="month">
- <property name="can_focus">yes</property>
- <property name="history">0</property>
- <property name="visible">yes</property>
-
- <child internal-child="menu">
- <widget class="GtkMenu" id="convertwidget1">
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget2">
- <property name="label" translatable="yes">January</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget3">
- <property name="label" translatable="yes">February</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget4">
- <property name="label" translatable="yes">March</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget5">
- <property name="label" translatable="yes">April</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget6">
- <property name="label" translatable="yes">May</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget7">
- <property name="label" translatable="yes">June</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget8">
- <property name="label" translatable="yes">July</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget9">
- <property name="label" translatable="yes">August</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget10">
- <property name="label" translatable="yes">September</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget11">
- <property name="label" translatable="yes">October</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget12">
- <property name="label" translatable="yes">November</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget13">
- <property name="label" translatable="yes">December</property>
- <property name="visible">yes</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">no</property>
- <property name="fill">no</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="year">
- <property name="can_focus">yes</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">yes</property>
- <property name="update_policy">GTK_UPDATE_IF_VALID</property>
- <property name="wrap">no</property>
- <property name="snap_to_ticks">no</property>
- <property name="visible">yes</property>
- <property name="adjustment">1969 1969 2038 1 5 10</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
- </packing>
- </child>
-
- <child>
- <placeholder />
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">4</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
- </packing>
- </child>
- </widget>
+
+<widget class="GtkDialog" id="goto-dialog">
+ <property name="title" translatable="yes">Go To Date</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</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="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</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>
+
+ <child>
+ <widget class="GtkButton" id="button4">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Go To Today</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">0</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button5">
+ <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">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-6</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">4</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox12">
+ <property name="visible">True</property>
+ <property name="homogeneous">True</property>
+ <property name="spacing">4</property>
+
+ <child>
+ <widget class="GtkOptionMenu" id="month">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="history">0</property>
+
+ <child internal-child="menu">
+ <widget class="GtkMenu" id="convertwidget1">
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">January</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">February</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget4">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">March</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">April</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">May</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget7">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">June</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget8">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">July</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget9">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">August</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget10">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">September</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget11">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">October</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget12">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">November</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget13">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">December</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="year">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">1969 1969 2038 1 5 10</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">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index 32aa48a37e..2ce74507d5 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -15,6 +15,7 @@
#include <gtk/gtkspinbutton.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkwindow.h>
+#include <gtk/gtkdialog.h>
#include <libgnomeui/gnome-dialog.h>
#include <glade/glade.h>
#include "calendar-commands.h"
@@ -97,7 +98,8 @@ ecal_event (ECalendarItem *calitem, gpointer user_data)
gnome_calendar_goto (dlg->gcal, et);
- gnome_dialog_close (GNOME_DIALOG (dlg->dialog));
+ gtk_dialog_response (GTK_DIALOG (dlg->dialog), GTK_RESPONSE_NONE);
+ /* gnome_dialog_close (GNOME_DIALOG (dlg->dialog)); */
}
/* Returns the current time, for the ECalendarItem. */
@@ -236,10 +238,12 @@ goto_dialog (GnomeCalendar *gcal)
goto_dialog_init_widgets (dlg);
- gnome_dialog_set_parent (GNOME_DIALOG (dlg->dialog),
- GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
+ gtk_window_set_transient_for (GTK_WINDOW (dlg->dialog),
+ GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
+
+ b = gtk_dialog_run (GTK_DIALOG (dlg->dialog));
+ gtk_widget_destroy (dlg->dialog);
- b = gnome_dialog_run_and_close (GNOME_DIALOG (dlg->dialog));
if (b == 0)
goto_today (dlg);
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 4d46b83c9c..e21e77c6bf 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -2407,6 +2407,7 @@ void
print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,
PrintView default_view)
{
+#warning "Re-implement printing."
#if 0
GnomePrintConfig *config;
GnomePrintJob *gpm;
@@ -2426,7 +2427,9 @@ print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,
GtkWidget *range;
int view;
- gpd = gnome_print_dialog_new_default ();
+ gpd = gnome_print_dialog_new (NULL, _("Print"), 0);
+
+ /* FIXME: THe rest of this func needs to be converted */
view = (int) default_view;
range = range_selector_new (gpd, date, &view);
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index e5d4b5b153..2cb45c180c 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -524,6 +524,7 @@ static void
print_tasks (ETasks *tasks, gboolean preview, gboolean landscape,
int copies, gboolean collate)
{
+#warning "Re-implement printing."
#if 0
ECalendarTable *cal_table;
EPrintable *printable;