[Xfce4-commits] <orage:master> 4.9.4.2 Enhancement 6597 Use GtkTooltip and allow for Pango markup
Juha
noreply at xfce.org
Mon Feb 11 11:48:01 CET 2013
Updating branch refs/heads/master
to 88ed9186ea9a35a241ebf068ac953df5e5f8219b (commit)
from 1dc76238cff26cd2d21804f906a9867e867dfa8d (commit)
commit 88ed9186ea9a35a241ebf068ac953df5e5f8219b
Author: Juha <juha at xfce.org>
Date: Mon Feb 11 12:45:20 2013 +0200
4.9.4.2 Enhancement 6597 Use GtkTooltip and allow for Pango markup
Removed deprecated tooltip calls and replaced with new ones.
Tooltips are not configurable though and seldom use markups.
src/appointment.c | 133 +++++++++++++++++--------------------
src/appointment.h | 3 +-
src/day-view.c | 23 +++----
src/day-view.h | 3 +-
src/event-list.c | 27 ++++----
src/event-list.h | 3 +-
src/functions.c | 6 +-
src/functions.h | 3 +-
src/interface.c | 159 ++++++++++----------------------------------
src/interface.h | 1 -
src/mainbox.c | 3 +-
src/mainbox.h | 3 +-
src/parameters.c | 36 ++++------
src/parameters_internal.h | 2 -
src/reminder.c | 4 +-
src/reminder.h | 7 +-
16 files changed, 145 insertions(+), 271 deletions(-)
diff --git a/src/appointment.c b/src/appointment.c
index 7860cae..bdbc14b 100644
--- a/src/appointment.c
+++ b/src/appointment.c
@@ -1,6 +1,6 @@
/* Orage - Calendar and alarm handler
*
- * Copyright (c) 2005-2011 Juha Kautto (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto (juha at xfce.org)
* Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
*
* This program is free software; you can redistribute it and/or modify
@@ -76,7 +76,6 @@ typedef struct _orage_category_win
GtkWidget *cur_frame;
GtkWidget *cur_frame_vbox;
- GtkTooltips *tooltips;
GtkAccelGroup *accelgroup;
gpointer *apptw;
@@ -724,7 +723,6 @@ static void app_free_memory(appt_win *apptw)
((day_win *)apptw->dw)->apptw_list =
g_list_remove(((day_win *)apptw->dw)->apptw_list, apptw);
gtk_widget_destroy(apptw->Window);
- gtk_object_destroy(GTK_OBJECT(apptw->Tooltips));
g_free(apptw->xf_uid);
g_free(apptw->par);
xfical_appt_free((xfical_appt *)apptw->xf_appt);
@@ -1921,7 +1919,6 @@ static void close_cat_window(gpointer user_data)
orage_category_refill_cb((appt_win *)catw->apptw);
gtk_widget_destroy(catw->window);
- gtk_object_destroy(GTK_OBJECT(catw->tooltips));
g_free(catw);
}
@@ -2062,7 +2059,6 @@ static void on_categories_button_clicked_cb(GtkWidget *button
, _("Colors of categories - Orage"));
gtk_window_set_default_size(GTK_WINDOW(catw->window), 390, 360);
- catw->tooltips = gtk_tooltips_new();
catw->accelgroup = gtk_accel_group_new();
gtk_window_add_accel_group(GTK_WINDOW(catw->window), catw->accelgroup);
@@ -2599,25 +2595,24 @@ static void build_toolbar(appt_win *apptw)
apptw->Toolbar = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(apptw->Vbox), apptw->Toolbar, FALSE, FALSE, 0);
- gtk_toolbar_set_tooltips(GTK_TOOLBAR(apptw->Toolbar), TRUE);
/* Add buttons to the toolbar */
apptw->Save = orage_toolbar_append_button(apptw->Toolbar
- , "gtk-save", apptw->Tooltips, _("Save"), i++);
+ , "gtk-save", _("Save"), i++);
apptw->SaveClose = orage_toolbar_append_button(apptw->Toolbar
- , "gtk-close", apptw->Tooltips, _("Save and close"), i++);
+ , "gtk-close", _("Save and close"), i++);
toolbar_separator = orage_toolbar_append_separator(apptw->Toolbar, i++);
apptw->Revert = orage_toolbar_append_button(apptw->Toolbar
- , "gtk-revert-to-saved", apptw->Tooltips, _("Revert"), i++);
+ , "gtk-revert-to-saved", _("Revert"), i++);
apptw->Duplicate = orage_toolbar_append_button(apptw->Toolbar
- , "gtk-copy", apptw->Tooltips, _("Duplicate"), i++);
+ , "gtk-copy", _("Duplicate"), i++);
toolbar_separator = orage_toolbar_append_separator(apptw->Toolbar, i++);
apptw->Delete = orage_toolbar_append_button(apptw->Toolbar
- , "gtk-delete", apptw->Tooltips, _("Delete"), i++);
+ , "gtk-delete", _("Delete"), i++);
g_signal_connect((gpointer)apptw->Save, "clicked"
, G_CALLBACK(on_appSave_clicked_cb), apptw);
@@ -2649,21 +2644,21 @@ static void build_general_page(appt_win *apptw)
hbox = gtk_hbox_new(FALSE, 0);
apptw->Type_event_rb = gtk_radio_button_new_with_label(NULL, _("Event"));
gtk_box_pack_start(GTK_BOX(hbox), apptw->Type_event_rb, FALSE, FALSE, 15);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Type_event_rb
- , _("Event that will happen sometime. For example:\nMeeting or birthday or TV show."), NULL);
+ gtk_widget_set_tooltip_text(apptw->Type_event_rb
+ , _("Event that will happen sometime. For example:\nMeeting or birthday or TV show."));
apptw->Type_todo_rb = gtk_radio_button_new_with_mnemonic_from_widget(
GTK_RADIO_BUTTON(apptw->Type_event_rb) , _("Todo"));
gtk_box_pack_start(GTK_BOX(hbox), apptw->Type_todo_rb, FALSE, FALSE, 15);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Type_todo_rb
- , _("Something that you should do sometime. For example:\nWash your car or test new version of Orage."), NULL);
+ gtk_widget_set_tooltip_text(apptw->Type_todo_rb
+ , _("Something that you should do sometime. For example:\nWash your car or test new version of Orage."));
apptw->Type_journal_rb = gtk_radio_button_new_with_mnemonic_from_widget(
GTK_RADIO_BUTTON(apptw->Type_event_rb) , _("Journal"));
gtk_box_pack_start(GTK_BOX(hbox), apptw->Type_journal_rb
, FALSE, FALSE, 15);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Type_journal_rb
- , _("Make a note that something happened. For example:\nRemark that your mother called or first snow came."), NULL);
+ gtk_widget_set_tooltip_text(apptw->Type_journal_rb
+ , _("Make a note that something happened. For example:\nRemark that your mother called or first snow came."));
orage_table_add_row(apptw->TableGeneral
, apptw->Type_label, hbox
@@ -2795,13 +2790,13 @@ static void build_general_page(appt_win *apptw)
, apptw->Categories_cb);
gtk_box_pack_start(GTK_BOX(apptw->Categories_hbox)
, apptw->Categories_cb_event, FALSE, FALSE, 4);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Categories_cb_event
- , _("This is special category, which can be used to color this appointment in list views."), NULL);
+ gtk_widget_set_tooltip_text(apptw->Categories_cb_event
+ , _("This is special category, which can be used to color this appointment in list views."));
apptw->Categories_button =gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR);
gtk_box_pack_start(GTK_BOX(apptw->Categories_hbox), apptw->Categories_button
, FALSE, FALSE, 0);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Categories_button
- , _("update colors for categories."), NULL);
+ gtk_widget_set_tooltip_text(apptw->Categories_button
+ , _("update colors for categories."));
orage_table_add_row(apptw->TableGeneral
, apptw->Categories_label, apptw->Categories_hbox
, ++row, (GTK_EXPAND | GTK_FILL), (0));
@@ -2837,8 +2832,8 @@ static void build_general_page(appt_win *apptw)
, apptw->Note, event
, ++row, (GTK_EXPAND | GTK_FILL), (GTK_EXPAND | GTK_FILL));
- gtk_tooltips_set_tip(apptw->Tooltips, event
- , _("These shorthand commands take effect immediately:\n <D> inserts current date in local date format\n <T> inserts time and\n <DT> inserts date and time.\n\nThese are converted only later when they are seen:\n <&Ynnnn> is translated to current year minus nnnn.\n(This can be used for example in birthday reminders to tell how old the person will be.)"), NULL);
+ gtk_widget_set_tooltip_text(event
+ , _("These shorthand commands take effect immediately:\n <D> inserts current date in local date format\n <T> inserts time and\n <DT> inserts date and time.\n\nThese are converted only later when they are seen:\n <&Ynnnn> is translated to current year minus nnnn.\n(This can be used for example in birthday reminders to tell how old the person will be.)"));
/* Take care of the title entry to build the appointment window title */
g_signal_connect((gpointer)apptw->Title_entry, "changed"
@@ -2946,15 +2941,15 @@ static void build_alarm_page(appt_win *apptw)
orage_table_add_row(apptw->TableAlarm
, apptw->Alarm_label, apptw->Alarm_hbox
, row = 0, (GTK_FILL), (GTK_FILL));
- gtk_tooltips_set_tip(apptw->Tooltips, event
- , _("Often you want to get alarm:\n 1) before Event start\n 2) before Todo end\n 3) after Todo start"), NULL);
+ gtk_widget_set_tooltip_text(event
+ , _("Often you want to get alarm:\n 1) before Event start\n 2) before Todo end\n 3) after Todo start"));
/***** Persistent Alarm *****/
apptw->Per_hbox = gtk_hbox_new(FALSE, 6);
apptw->Per_checkbutton =
gtk_check_button_new_with_mnemonic(_("Persistent alarm"));
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Per_checkbutton
- , _("Select this if you want Orage to remind you even if it has not been active when the alarm happened."), NULL);
+ gtk_widget_set_tooltip_text(apptw->Per_checkbutton
+ , _("Select this if you want Orage to remind you even if it has not been active when the alarm happened."));
gtk_box_pack_start(GTK_BOX(apptw->Per_hbox), apptw->Per_checkbutton
, FALSE, TRUE, 0);
@@ -2968,8 +2963,8 @@ static void build_alarm_page(appt_win *apptw)
apptw->Sound_hbox = gtk_hbox_new(FALSE, 6);
apptw->Sound_checkbutton =
gtk_check_button_new_with_mnemonic(_("Use"));
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Sound_checkbutton
- , _("Select this if you want audible alarm"), NULL);
+ gtk_widget_set_tooltip_text(apptw->Sound_checkbutton
+ , _("Select this if you want audible alarm"));
gtk_box_pack_start(GTK_BOX(apptw->Sound_hbox), apptw->Sound_checkbutton
, FALSE, TRUE, 0);
@@ -3033,8 +3028,8 @@ static void build_alarm_page(appt_win *apptw)
apptw->Display_hbox_orage = gtk_hbox_new(FALSE, 0);
apptw->Display_checkbutton_orage =
gtk_check_button_new_with_mnemonic(_("Use Orage window"));
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Display_checkbutton_orage
- , _("Select this if you want Orage window alarm"), NULL);
+ gtk_widget_set_tooltip_text(apptw->Display_checkbutton_orage
+ , _("Select this if you want Orage window alarm"));
gtk_box_pack_start(GTK_BOX(apptw->Display_hbox_orage)
, apptw->Display_checkbutton_orage
, FALSE, TRUE, 0);
@@ -3047,18 +3042,17 @@ static void build_alarm_page(appt_win *apptw)
apptw->Display_hbox_notify = gtk_hbox_new(FALSE, 0);
apptw->Display_checkbutton_notify =
gtk_check_button_new_with_mnemonic(_("Use notification"));
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Display_checkbutton_notify
- , _("Select this if you want notification alarm"), NULL);
+ gtk_widget_set_tooltip_text(apptw->Display_checkbutton_notify
+ , _("Select this if you want notification alarm"));
gtk_box_pack_start(GTK_BOX(apptw->Display_hbox_notify)
, apptw->Display_checkbutton_notify
, FALSE, TRUE, 0);
apptw->Display_checkbutton_expire_notify =
gtk_check_button_new_with_mnemonic(_("Set timeout"));
- gtk_tooltips_set_tip(apptw->Tooltips
- , apptw->Display_checkbutton_expire_notify
+ gtk_widget_set_tooltip_text(apptw->Display_checkbutton_expire_notify
, _("Select this if you want notification to expire automatically")
- , NULL);
+ );
gtk_box_pack_start(GTK_BOX(apptw->Display_hbox_notify)
, apptw->Display_checkbutton_expire_notify
, FALSE, TRUE, 10);
@@ -3067,8 +3061,8 @@ static void build_alarm_page(appt_win *apptw)
gtk_spin_button_new_with_range(0, 999, 1);
gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(apptw->Display_spin_expire_notify)
, TRUE);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Display_spin_expire_notify
- , _("0 = system default expiration time"), NULL);
+ gtk_widget_set_tooltip_text(apptw->Display_spin_expire_notify
+ , _("0 = system default expiration time"));
gtk_box_pack_start(GTK_BOX(apptw->Display_hbox_notify)
, apptw->Display_spin_expire_notify
, FALSE, TRUE, 10);
@@ -3089,14 +3083,14 @@ static void build_alarm_page(appt_win *apptw)
apptw->Proc_hbox = gtk_hbox_new(FALSE, 6);
apptw->Proc_checkbutton =
gtk_check_button_new_with_mnemonic(_("Use"));
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Proc_checkbutton
- , _("Select this if you want procedure or script alarm"), NULL);
+ gtk_widget_set_tooltip_text(apptw->Proc_checkbutton
+ , _("Select this if you want procedure or script alarm"));
gtk_box_pack_start(GTK_BOX(apptw->Proc_hbox), apptw->Proc_checkbutton
, FALSE, TRUE, 0);
apptw->Proc_entry = gtk_entry_new();
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Proc_entry
- , _("You must enter all escape etc characters yourself.\nThis string is just given to shell to process.\nThe following special commands are replaced at run time:\n\t<&T> appointment title\n\t<&D> appointment description\n\t<&AT> alarm time\n\t<&ST> appointment start time\n\t<&ET> appointment end time"), NULL);
+ gtk_widget_set_tooltip_text(apptw->Proc_entry
+ , _("You must enter all escape etc characters yourself.\nThis string is just given to shell to process.\nThe following special commands are replaced at run time:\n\t<&T> appointment title\n\t<&D> appointment description\n\t<&AT> alarm time\n\t<&ST> appointment start time\n\t<&ET> appointment end time"));
gtk_box_pack_start(GTK_BOX(apptw->Proc_hbox), apptw->Proc_entry
, TRUE, TRUE, 0);
@@ -3107,8 +3101,8 @@ static void build_alarm_page(appt_win *apptw)
/***** Test Alarm *****/
gtk_box_pack_start(GTK_BOX(vbox), gtk_hseparator_new(), FALSE, FALSE, 3);
apptw->Test_button = gtk_button_new_from_stock("gtk-execute");
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Test_button
- , _("Test this alarm by raising it now"), NULL);
+ gtk_widget_set_tooltip_text(apptw->Test_button
+ , _("Test this alarm by raising it now"));
gtk_box_pack_start(GTK_BOX(vbox), apptw->Test_button, FALSE, FALSE, 0);
/***** Default Alarm Settings *****/
@@ -3122,13 +3116,13 @@ static void build_alarm_page(appt_win *apptw)
apptw->Default_savebutton = gtk_button_new_from_stock("gtk-save");
gtk_box_pack_start(GTK_BOX(apptw->Default_hbox), apptw->Default_savebutton
, TRUE, TRUE, 0);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Default_savebutton
- , _("Store current settings as default alarm"), NULL);
+ gtk_widget_set_tooltip_text(apptw->Default_savebutton
+ , _("Store current settings as default alarm"));
apptw->Default_readbutton =gtk_button_new_from_stock("gtk-revert-to-saved");
gtk_box_pack_start(GTK_BOX(apptw->Default_hbox), apptw->Default_readbutton
, TRUE, TRUE, 0);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Default_readbutton
- , _("Set current settings from default alarm"), NULL);
+ gtk_widget_set_tooltip_text(apptw->Default_readbutton
+ , _("Set current settings from default alarm"));
gtk_box_pack_end(GTK_BOX(vbox), apptw->Default_hbox, FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(vbox), gtk_hseparator_new(), FALSE, FALSE, 3);
@@ -3212,14 +3206,13 @@ static void build_recurrence_page(appt_win *apptw)
apptw->Recur_feature_advanced_rb =
gtk_radio_button_new_with_mnemonic_from_widget(
GTK_RADIO_BUTTON(apptw->Recur_feature_normal_rb)
- , _("Advanced"));
+ , _("Advanced"));
gtk_box_pack_start(GTK_BOX(apptw->Recur_feature_hbox)
, apptw->Recur_feature_advanced_rb, FALSE, FALSE, 20);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_feature_normal_rb
- , _("Use this if you want regular repeating event"), NULL);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_feature_advanced_rb
- , _("Use this if you need complex times like:\n Every Saturday and Sunday or \n First Tuesday every month")
- , NULL);
+ gtk_widget_set_tooltip_text(apptw->Recur_feature_normal_rb
+ , _("Use this if you want regular repeating event"));
+ gtk_widget_set_tooltip_text(apptw->Recur_feature_advanced_rb
+ , _("Use this if you need complex times like:\n Every Saturday and Sunday or \n First Tuesday every month"));
orage_table_add_row(apptw->TableRecur
, apptw->Recur_feature_label, apptw->Recur_feature_hbox
, row = 0, (GTK_EXPAND | GTK_FILL), (0));
@@ -3241,9 +3234,8 @@ static void build_recurrence_page(appt_win *apptw)
apptw->Recur_int_spin_label2 = gtk_label_new(_("occurrence"));
gtk_box_pack_start(GTK_BOX(apptw->Recur_freq_hbox)
, apptw->Recur_int_spin_label2, FALSE, FALSE, 5);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_int_spin
- , _("Limit frequency to certain interval.\n For example: Every third day:\n Frequency = Daily and Interval = 3")
- , NULL);
+ gtk_widget_set_tooltip_text(apptw->Recur_int_spin
+ , _("Limit frequency to certain interval.\n For example: Every third day:\n Frequency = Daily and Interval = 3"));
orage_table_add_row(apptw->TableRecur
, apptw->Recur_freq_label, apptw->Recur_freq_hbox
, ++row, (GTK_EXPAND | GTK_FILL), (GTK_FILL));
@@ -3344,9 +3336,8 @@ static void build_recurrence_page(appt_win *apptw)
gtk_spin_button_new_with_range(-9, 9, 1);
gtk_box_pack_start(GTK_BOX(apptw->Recur_byday_spin_hbox)
, apptw->Recur_byday_spin[i], FALSE, FALSE, 0);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_byday_spin[i]
- , _("Specify which weekday for monthly and yearly events.\n For example:\n Second Wednesday each month:\n\tFrequency = Monthly,\n\tWeekdays = check only Wednesday,\n\tWhich day = select 2 from the number below Wednesday")
- , NULL);
+ gtk_widget_set_tooltip_text(apptw->Recur_byday_spin[i]
+ , _("Specify which weekday for monthly and yearly events.\n For example:\n Second Wednesday each month:\n\tFrequency = Monthly,\n\tWeekdays = check only Wednesday,\n\tWhich day = select 2 from the number below Wednesday"));
}
orage_table_add_row(apptw->TableRecur
, apptw->Recur_byday_spin_label, apptw->Recur_byday_spin_hbox
@@ -3365,11 +3356,10 @@ static void build_recurrence_page(appt_win *apptw)
, _("Completed"));
gtk_box_pack_start(GTK_BOX(apptw->Recur_todo_base_hbox)
, apptw->Recur_todo_base_done_rb, FALSE, FALSE, 15);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_todo_base_start_rb
- , _("TODO reoccurs regularly starting on start time and repeating after each interval no matter when it was last completed"), NULL);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_todo_base_done_rb
- , _("TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)")
- , NULL);
+ gtk_widget_set_tooltip_text(apptw->Recur_todo_base_start_rb
+ , _("TODO reoccurs regularly starting on start time and repeating after each interval no matter when it was last completed"));
+ gtk_widget_set_tooltip_text(apptw->Recur_todo_base_done_rb
+ , _("TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"));
orage_table_add_row(apptw->TableRecur
, apptw->Recur_todo_base_label, apptw->Recur_todo_base_hbox
, ++row ,(GTK_EXPAND | GTK_FILL), (0));
@@ -3387,23 +3377,23 @@ static void build_recurrence_page(appt_win *apptw)
gtk_scrolled_window_add_with_viewport(
GTK_SCROLLED_WINDOW(apptw->Recur_exception_scroll_win)
, apptw->Recur_exception_rows_vbox);
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_exception_scroll_win
- , _("Add more exception dates by clicking the calendar days below.\nException is either exclusion(-) or inclusion(+) depending on the selection.\nRemove by clicking the data."), NULL);
+ gtk_widget_set_tooltip_text(apptw->Recur_exception_scroll_win
+ , _("Add more exception dates by clicking the calendar days below.\nException is either exclusion(-) or inclusion(+) depending on the selection.\nRemove by clicking the data."));
apptw->Recur_exception_type_vbox = gtk_vbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(apptw->Recur_exception_hbox)
, apptw->Recur_exception_type_vbox, TRUE, TRUE, 5);
apptw->Recur_exception_excl_rb = gtk_radio_button_new_with_label(NULL
, _("Add excluded date (-)"));
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_exception_excl_rb
- , _("Excluded days are full days where this appointment is not happening"), NULL);
+ gtk_widget_set_tooltip_text(apptw->Recur_exception_excl_rb
+ , _("Excluded days are full days where this appointment is not happening"));
gtk_box_pack_start(GTK_BOX(apptw->Recur_exception_type_vbox)
, apptw->Recur_exception_excl_rb, FALSE, FALSE, 0);
apptw->Recur_exception_incl_rb =
gtk_radio_button_new_with_mnemonic_from_widget(
GTK_RADIO_BUTTON(apptw->Recur_exception_excl_rb)
, _("Add included time (+)"));
- gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_exception_incl_rb
- , _("Included times have same timezone than start time, but they may have different time"), NULL);
+ gtk_widget_set_tooltip_text(apptw->Recur_exception_incl_rb
+ , _("Included times have same timezone than start time, but they may have different time"));
apptw->Recur_exception_incl_spin_hh =
gtk_spin_button_new_with_range(0, 23, 1);
apptw->Recur_exception_incl_spin_mm =
@@ -3521,7 +3511,6 @@ appt_win *create_appt_win(char *action, char *par)
apptw->el = NULL;
apptw->dw = NULL;
apptw->appointment_changed = FALSE;
- apptw->Tooltips = gtk_tooltips_new();
apptw->accel_group = gtk_accel_group_new();
apptw->Window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
diff --git a/src/appointment.h b/src/appointment.h
index ee33d89..7f0a1f2 100644
--- a/src/appointment.h
+++ b/src/appointment.h
@@ -1,6 +1,6 @@
/* Orage - Calendar and alarm handler
*
- * Copyright (c) 2005-2011 Juha Kautto (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto (juha at xfce.org)
* Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
*
* This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,6 @@
typedef struct _appt_win
{
GtkAccelGroup *accel_group;
- GtkTooltips *Tooltips;
GtkWidget *Window;
GtkWidget *Vbox;
diff --git a/src/day-view.c b/src/day-view.c
index ba612a2..46ae886 100644
--- a/src/day-view.c
+++ b/src/day-view.c
@@ -1,6 +1,6 @@
/* Orage - Calendar and alarm handler
*
- * Copyright (c) 2007-2011 Juha Kautto (juha at xfce.org)
+ * Copyright (c) 2007-2013 Juha Kautto (juha at xfce.org)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -148,7 +148,6 @@ static void close_window(day_win *dw)
g_list_free(dw->apptw_list);
gtk_widget_destroy(dw->Window);
- gtk_object_destroy(GTK_OBJECT(dw->Tooltips));
g_free(dw);
dw = NULL;
}
@@ -373,33 +372,32 @@ static void build_toolbar(day_win *dw)
dw->Toolbar = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(dw->Vbox), dw->Toolbar, FALSE, FALSE, 0);
- gtk_toolbar_set_tooltips(GTK_TOOLBAR(dw->Toolbar), TRUE);
dw->Create_toolbutton = orage_toolbar_append_button(dw->Toolbar
- , "gtk-new", dw->Tooltips, _("New"), i++);
+ , "gtk-new", _("New"), i++);
toolbar_separator = orage_toolbar_append_separator(dw->Toolbar, i++);
dw->Previous_week_toolbutton = orage_toolbar_append_button(dw->Toolbar
- , "gtk-go-up", dw->Tooltips, _("Back one week"), i++);
+ , "gtk-go-up", _("Back one week"), i++);
dw->Previous_day_toolbutton = orage_toolbar_append_button(dw->Toolbar
- , "gtk-go-back", dw->Tooltips, _("Back one day"), i++);
+ , "gtk-go-back", _("Back one day"), i++);
dw->Today_toolbutton = orage_toolbar_append_button(dw->Toolbar
- , "gtk-home", dw->Tooltips, _("Today"), i++);
+ , "gtk-home", _("Today"), i++);
dw->Next_day_toolbutton = orage_toolbar_append_button(dw->Toolbar
- , "gtk-go-forward", dw->Tooltips, _("Forward one day"), i++);
+ , "gtk-go-forward", _("Forward one day"), i++);
dw->Next_week_toolbutton = orage_toolbar_append_button(dw->Toolbar
- , "gtk-go-down", dw->Tooltips, _("Forward one week"), i++);
+ , "gtk-go-down", _("Forward one week"), i++);
toolbar_separator = orage_toolbar_append_separator(dw->Toolbar, i++);
dw->Refresh_toolbutton = orage_toolbar_append_button(dw->Toolbar
- , "gtk-refresh", dw->Tooltips, _("Refresh"), i++);
+ , "gtk-refresh", _("Refresh"), i++);
toolbar_separator = orage_toolbar_append_separator(dw->Toolbar, i++);
dw->Close_toolbutton = orage_toolbar_append_button(dw->Toolbar
- , "gtk-close", dw->Tooltips, _("Close"), i++);
+ , "gtk-close", _("Close"), i++);
g_signal_connect((gpointer)dw->Create_toolbutton, "clicked"
, G_CALLBACK(on_Create_toolbutton_clicked_cb), dw);
@@ -616,7 +614,7 @@ static void add_row(day_win *dw, xfical_appt *appt)
g_free(end_date);
}
}
- gtk_tooltips_set_tip(dw->Tooltips, ev, tip, NULL);
+ gtk_widget_set_tooltip_text(ev, tip);
/*
gtk_box_pack_start(GTK_BOX(hb2), ev, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hb), hb2, TRUE, TRUE, 0);
@@ -1056,7 +1054,6 @@ day_win *create_day_win(char *start_date)
/* initialisation + main window + base vbox */
dw = g_new0(day_win, 1);
dw->scroll_pos = -1; /* not set */
- dw->Tooltips = gtk_tooltips_new();
dw->accel_group = gtk_accel_group_new();
dw->Window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
diff --git a/src/day-view.h b/src/day-view.h
index 7b713e4..a8afcaa 100644
--- a/src/day-view.h
+++ b/src/day-view.h
@@ -1,6 +1,6 @@
/* Orage - Calendar and alarm handler
*
- * Copyright (c) 2005-2011 Juha Kautto (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto (juha at xfce.org)
* Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
*
* This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,6 @@
typedef struct _day_win
{
GtkAccelGroup *accel_group;
- GtkTooltips *Tooltips;
GtkWidget *Window;
GtkWidget *Vbox;
diff --git a/src/event-list.c b/src/event-list.c
index fc67019..ed91181 100644
--- a/src/event-list.c
+++ b/src/event-list.c
@@ -1,6 +1,6 @@
/* Orage - Calendar and alarm handler
*
- * Copyright (c) 2005-2011 Juha Kautto (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto (juha at xfce.org)
* Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
*
* This program is free software; you can redistribute it and/or modify
@@ -792,7 +792,6 @@ static void close_window(el_win *el)
g_list_free(el->apptw_list);
gtk_widget_destroy(el->Window); /* destroy the eventlist window */
- gtk_object_destroy(GTK_OBJECT(el->Tooltips));
g_free(el);
el = NULL;
}
@@ -1117,37 +1116,36 @@ static void build_toolbar(el_win *el)
el->Toolbar = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(el->Vbox), el->Toolbar, FALSE, FALSE, 0);
- gtk_toolbar_set_tooltips(GTK_TOOLBAR(el->Toolbar), TRUE);
el->Create_toolbutton = orage_toolbar_append_button(el->Toolbar
- , "gtk-new", el->Tooltips, _("New"), i++);
+ , "gtk-new", _("New"), i++);
el->Copy_toolbutton = orage_toolbar_append_button(el->Toolbar
- , "gtk-copy", el->Tooltips, _("Duplicate"), i++);
+ , "gtk-copy", _("Duplicate"), i++);
el->Delete_toolbutton = orage_toolbar_append_button(el->Toolbar
- , "gtk-delete", el->Tooltips, _("Delete"), i++);
+ , "gtk-delete", _("Delete"), i++);
toolbar_separator = orage_toolbar_append_separator(el->Toolbar, i++);
el->Previous_toolbutton = orage_toolbar_append_button(el->Toolbar
- , "gtk-go-back", el->Tooltips, _("Back"), i++);
+ , "gtk-go-back", _("Back"), i++);
el->Today_toolbutton = orage_toolbar_append_button(el->Toolbar
- , "gtk-home", el->Tooltips, _("Today"), i++);
+ , "gtk-home", _("Today"), i++);
el->Next_toolbutton = orage_toolbar_append_button(el->Toolbar
- , "gtk-go-forward", el->Tooltips, _("Forward"), i++);
+ , "gtk-go-forward", _("Forward"), i++);
toolbar_separator = orage_toolbar_append_separator(el->Toolbar, i++);
el->Refresh_toolbutton = orage_toolbar_append_button(el->Toolbar
- , "gtk-refresh", el->Tooltips, _("Refresh"), i++);
+ , "gtk-refresh", _("Refresh"), i++);
el->Search_toolbutton = orage_toolbar_append_button(el->Toolbar
- , "gtk-find", el->Tooltips, _("Find"), i++);
+ , "gtk-find", _("Find"), i++);
toolbar_separator = orage_toolbar_append_separator(el->Toolbar, i++);
el->Close_toolbutton = orage_toolbar_append_button(el->Toolbar
- , "gtk-close", el->Tooltips, _("Close"), i++);
+ , "gtk-close", _("Close"), i++);
el->Dayview_toolbutton = orage_toolbar_append_button(el->Toolbar
- , "gtk-zoom-in", el->Tooltips, _("Dayview"), i++);
+ , "gtk-zoom-in", _("Dayview"), i++);
g_signal_connect((gpointer)el->Create_toolbutton, "clicked"
, G_CALLBACK(on_Create_toolbutton_clicked_cb), el);
@@ -1333,7 +1331,7 @@ static void build_event_list(el_win *el)
gtk_tree_view_append_column(GTK_TREE_VIEW(el->TreeView), col);
gtk_tree_view_column_set_visible(col, FALSE);
- gtk_tooltips_set_tip(el->Tooltips, el->TreeView, _("Double click line to edit it.\n\nFlags in order:\n\t 1. Alarm: n=no alarm\n\t\t A=Alarm is set P=Persistent alarm is set\n\t 2. Recurrence: n=no recurrence\n\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n\t 3. Type: f=free B=Busy\n\t 4. Located in file:\n\t\tO=Orage A=Archive F=Foreign\n\t 5. Appointment type:\n\t\tE=Event T=Todo J=Journal"), NULL);
+ gtk_widget_set_tooltip_text(el->TreeView, _("Double click line to edit it.\n\nFlags in order:\n\t 1. Alarm: n=no alarm\n\t\t A=Alarm is set P=Persistent alarm is set\n\t 2. Recurrence: n=no recurrence\n\t\t H=Hourly D=Daily W=Weekly M=Monthly Y=Yearly\n\t 3. Type: f=free B=Busy\n\t 4. Located in file:\n\t\tO=Orage A=Archive F=Foreign\n\t 5. Appointment type:\n\t\tE=Event T=Todo J=Journal"));
g_signal_connect(el->TreeView, "row-activated",
G_CALLBACK(editEvent), el);
@@ -1350,7 +1348,6 @@ el_win *create_el_win(char *start_date)
el->days = g_par.el_days;
el->time_now[0] = 0;
el->apptw_list = NULL;
- el->Tooltips = gtk_tooltips_new();
el->accel_group = gtk_accel_group_new();
el->Window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
diff --git a/src/event-list.h b/src/event-list.h
index 95486df..093efc8 100644
--- a/src/event-list.h
+++ b/src/event-list.h
@@ -1,6 +1,6 @@
/* Orage - Calendar and alarm handler
*
- * Copyright (c) 2005-2011 Juha Kautto (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto (juha at xfce.org)
* Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
*
* This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,6 @@ typedef enum
typedef struct _el_win
{
GtkAccelGroup *accel_group;
- GtkTooltips *Tooltips;
GtkWidget *Window;
GtkWidget *Vbox;
diff --git a/src/functions.c b/src/functions.c
index f0f401e..b70e7e3 100644
--- a/src/functions.c
+++ b/src/functions.c
@@ -232,14 +232,12 @@ gboolean orage_exec(const char *cmd, gboolean *cmd_active, GError **error)
}
GtkWidget *orage_toolbar_append_button(GtkWidget *toolbar
- , const gchar *stock_id, GtkTooltips *tooltips, const char *tooltip_text
- , gint pos)
+ , const gchar *stock_id, const char *tooltip_text, gint pos)
{
GtkWidget *button;
button = (GtkWidget *)gtk_tool_button_new_from_stock(stock_id);
- gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(button), tooltips
- , (const gchar *) tooltip_text, NULL);
+ gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(button), tooltip_text);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(button), pos);
return button;
}
diff --git a/src/functions.h b/src/functions.h
index edeffe8..fe59350 100644
--- a/src/functions.h
+++ b/src/functions.h
@@ -70,8 +70,7 @@ gboolean orage_date_button_clicked(GtkWidget *button, GtkWidget *win);
gboolean orage_exec(const char *cmd, gboolean *cmd_active, GError **error);
GtkWidget *orage_toolbar_append_button(GtkWidget *toolbar
- , const gchar *stock_id, GtkTooltips *tooltips
- , const char *tooltip_text, gint pos);
+ , const gchar *stock_id, const char *tooltip_text, gint pos);
GtkWidget *orage_toolbar_append_separator(GtkWidget *toolbar, gint pos);
GtkWidget *orage_table_new(guint rows, guint border);
diff --git a/src/interface.c b/src/interface.c
index e2b742d..72107e3 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -1,6 +1,6 @@
/* Orage - Calendar and alarm handler
*
- * Copyright (c) 2005-2011 Juha Kautto (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto (juha at xfce.org)
* Copyright (c) 2003-2005 Mickael Graf (korbinus at xfce.org)
*
* This program is free software; you can redistribute it and/or modify
@@ -119,32 +119,6 @@ static void orage_file_entry_changed(GtkWidget *dialog, gpointer user_data)
}
}
-/* FIXME: This is now available in functions.c as orage_copy_file */
-static gboolean copy_file(gchar *source, gchar *target)
-{
- gchar *text;
- gsize text_len;
- GError *error = NULL;
- gboolean ok = TRUE;
-
- /* read file */
- if (!g_file_get_contents(source, &text, &text_len, &error)) {
- g_warning("file save: Could not open ical file (%s) error:%s"
- , source, error->message);
- g_error_free(error);
- ok = FALSE;
- }
- /* write file */
- if (!g_file_set_contents(target, text, -1, &error)) {
- g_warning("file save: Could not write ical file (%s) error:%s"
- , target, error->message);
- g_error_free(error);
- ok = FALSE;
- }
- g_free(text);
- return(ok);
-}
-
static void orage_file_save_button_clicked(GtkButton *button
, gpointer user_data)
{
@@ -166,13 +140,13 @@ static void orage_file_save_button_clicked(GtkButton *button
}
else if (gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(intf_w->orage_file_copy_rb))) {
- ok = copy_file(g_par.orage_file, s);
+ ok = orage_copy_file(g_par.orage_file, s);
}
else if (gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(intf_w->orage_file_move_rb))) {
if (g_rename(g_par.orage_file, s)) { /* failed */
g_warning("rename failed. trying manual copy");
- ok = copy_file(g_par.orage_file, s);
+ ok = orage_copy_file(g_par.orage_file, s);
if (ok) { /* this is move. so let's remove the orig */
if (g_remove(g_par.orage_file))
g_warning("file remove failed %s", g_par.orage_file);
@@ -234,13 +208,13 @@ static void archive_file_save_button_clicked(GtkButton *button
}
else if (gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(intf_w->archive_file_copy_rb))) {
- ok = copy_file(g_par.archive_file, s);
+ ok = orage_copy_file(g_par.archive_file, s);
}
else if (gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(intf_w->archive_file_move_rb))) {
if (g_rename(g_par.archive_file, s)) { /* failed */
g_warning("rename failed. trying manual copy");
- ok = copy_file(g_par.archive_file, s);
+ ok = orage_copy_file(g_par.archive_file, s);
if (ok) { /* this is move. so let's remove the orig */
if (g_remove(g_par.archive_file))
g_warning("file remove failed %s", g_par.archive_file);
@@ -730,7 +704,6 @@ static void close_intf_w(gpointer user_data)
intf_win *intf_w = (intf_win *)user_data;
gtk_widget_destroy(intf_w->main_window);
- gtk_object_destroy(GTK_OBJECT(intf_w->tooltips));
g_free(intf_w);
interface_lock = FALSE;
}
@@ -754,10 +727,6 @@ static gboolean on_Window_delete_event(GtkWidget *w, GdkEvent *e
static void create_menu(intf_win *intf_w)
{
- /*
- GtkWidget *menu_separator;
- */
-
/* Menu bar */
intf_w->menubar = gtk_menu_bar_new();
gtk_box_pack_start(GTK_BOX(intf_w->main_vbox), intf_w->menubar
@@ -766,22 +735,10 @@ static void create_menu(intf_win *intf_w)
/* File menu */
intf_w->filemenu = orage_menu_new(_("_File"), intf_w->menubar);
- /*
- intf_w->filemenu_save =
- orage_image_menu_item_new_from_stock("gtk-save"
- , intf_w->filemenu, intf_w->accelgroup);
-
- menu_separator = orage_separator_menu_item_new( intf_w->filemenu);
- */
-
intf_w->filemenu_close =
orage_image_menu_item_new_from_stock("gtk-close"
, intf_w->filemenu, intf_w->accelgroup);
- /*
- g_signal_connect((gpointer)intf_w->filemenu_save, "activate"
- , G_CALLBACK(filemenu_save_activated), intf_w);
- */
g_signal_connect((gpointer)intf_w->filemenu_close, "activate"
, G_CALLBACK(filemenu_close_activated), intf_w);
}
@@ -794,24 +751,11 @@ static void create_toolbar(intf_win *intf_w)
intf_w->toolbar = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(intf_w->main_vbox), intf_w->toolbar
, FALSE, FALSE, 0);
- gtk_toolbar_set_tooltips(GTK_TOOLBAR(intf_w->toolbar), TRUE);
/* Buttons */
- /*
- intf_w->save_button = orage_toolbar_append_button(intf_w->toolbar
- , "gtk-save", intf_w->tooltips, _("Save"), i++);
-
- toolbar_separator = orage_toolbar_append_separator(intf_w->toolbar
- , i++);
- */
-
intf_w->close_button = orage_toolbar_append_button(intf_w->toolbar
- , "gtk-close", intf_w->tooltips, _("Close"), i++);
+ , "gtk-close", _("Close"), i++);
- /*
- g_signal_connect((gpointer)intf_w->save_button, "clicked"
- , G_CALLBACK(save_button_clicked), intf_w);
- */
g_signal_connect((gpointer)intf_w->close_button, "clicked"
, G_CALLBACK(close_button_clicked), intf_w);
}
@@ -857,14 +801,16 @@ static void handle_file_drag_data(GtkWidget *widget, GdkDragContext *context
gtk_drag_finish(context, TRUE, FALSE, d_time);
}
-static void imp_file_drag_data_received(GtkWidget *widget, GdkDragContext *context
- , gint x, gint y, GtkSelectionData *data, guint info, guint d_time)
+static void imp_file_drag_data_received(GtkWidget *widget
+ , GdkDragContext *context, gint x, gint y, GtkSelectionData *data
+ , guint info, guint d_time)
{
handle_file_drag_data(widget, context, data, d_time, TRUE);
}
-static void exp_file_drag_data_received(GtkWidget *widget, GdkDragContext *context
- , gint x, gint y, GtkSelectionData *data, guint info, guint d_time)
+static void exp_file_drag_data_received(GtkWidget *widget
+ , GdkDragContext *context, gint x, gint y, GtkSelectionData *data
+ , guint info, guint d_time)
{
handle_file_drag_data(widget, context, data, d_time, FALSE);
}
@@ -880,32 +826,6 @@ static void uid_drag_data_received(GtkWidget *widget, GdkDragContext *context
gtk_drag_finish(context, TRUE, FALSE, d_time);
}
-/*
-gboolean drag_motion(GtkWidget *widget, GdkDragContext *context
- , gint x, gint y, guint d_time)
-{
-g_print ("drag_motion\n");
-
- if (context->actions & GDK_ACTION_COPY) {
-g_print ("drag_motion: accept\n");
- gdk_drag_status(context, GDK_ACTION_COPY, d_time);
- gtk_drag_highlight(widget);
- return(TRUE);
- }
- else {
-g_print ("drag_motion: fail\n");
- gdk_drag_status(context, 0, d_time);
- return(FALSE);
- }
-}
-
-void drag_leave(GtkWidget *widget, GdkDragContext *context, guint d_time)
-{
-g_print ("drag_leave\n");
- gtk_drag_unhighlight(widget);
-}
-*/
-
static gboolean drag_drop(GtkWidget *widget, GdkDragContext *context
, gint x, gint y, guint d_time)
{
@@ -917,12 +837,6 @@ static gboolean drag_drop(GtkWidget *widget, GdkDragContext *context
static void drag_and_drop_init(intf_win *intf_w)
{
- /*
- g_signal_connect(intf_w->iea_imp_entry, "drag_motion"
- , G_CALLBACK(drag_motion), NULL);
- g_signal_connect(intf_w->iea_imp_entry, "drag_leave"
- , G_CALLBACK(drag_leave), NULL);
- */
gtk_drag_dest_set(intf_w->iea_imp_entry
, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT
, file_drag_targets, file_drag_target_count, GDK_ACTION_COPY);
@@ -969,8 +883,8 @@ static void create_import_export_tab(intf_win *intf_w)
gchar *str;
m_vbox = gtk_vbox_new(FALSE, 0);
- /* FIXME: this could be simpler than framebox */
- intf_w->iea_notebook_page = orage_create_framebox_with_content(NULL, m_vbox);
+ intf_w->iea_notebook_page = orage_create_framebox_with_content(
+ NULL, m_vbox);
intf_w->iea_tab_label = gtk_label_new(_("Import/export"));
gtk_notebook_append_page(GTK_NOTEBOOK(intf_w->notebook)
, intf_w->iea_notebook_page, intf_w->iea_tab_label);
@@ -999,8 +913,8 @@ static void create_import_export_tab(intf_win *intf_w)
, G_CALLBACK(imp_open_button_clicked), intf_w);
g_signal_connect((gpointer)intf_w->iea_imp_save_button, "clicked"
, G_CALLBACK(imp_save_button_clicked), intf_w);
- gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_imp_entry
- , _("Separate filenames with comma(,).\n NOTE: comma is not valid character in filenames for Orage."), NULL);
+ gtk_widget_set_tooltip_text(intf_w->iea_imp_entry
+ , _("Separate filenames with comma(,).\n NOTE: comma is not valid character in filenames for Orage."));
/***** export *****/
vbox = gtk_vbox_new(FALSE, 0);
@@ -1058,16 +972,16 @@ static void create_import_export_tab(intf_win *intf_w)
g_signal_connect((gpointer)intf_w->iea_exp_add_id_rb, "clicked"
, G_CALLBACK(exp_add_id_rb_clicked), intf_w);
#ifdef HAVE_ARCHIVE
- gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_exp_add_all_rb
- , _("Note that only main file appointments are read.\nArchived and Foreign events are not exported."), NULL);
+ gtk_widget_set_tooltip_text(intf_w->iea_exp_add_all_rb
+ , _("Note that only main file appointments are read.\nArchived and Foreign events are not exported."));
#else
- gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_exp_add_all_rb
- , _("Note that only main file appointments are read.\nForeign events are not exported."), NULL);
+ gtk_widget_set_tooltip_text(intf_w->iea_exp_add_all_rb
+ , _("Note that only main file appointments are read.\nForeign events are not exported."));
#endif
- gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_exp_add_id_rb
- , _("You can easily drag these from event-list window."), NULL);
- gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_exp_id_entry
- , _("Orage appointment UIDs separated by commas."), NULL);
+ gtk_widget_set_tooltip_text(intf_w->iea_exp_add_id_rb
+ , _("You can easily drag these from event-list window."));
+ gtk_widget_set_tooltip_text(intf_w->iea_exp_id_entry
+ , _("Orage appointment UIDs separated by commas."));
#ifdef HAVE_ARCHIVE
/***** archive *****/
@@ -1090,8 +1004,8 @@ static void create_import_export_tab(intf_win *intf_w)
g_signal_connect((gpointer)intf_w->iea_arc_button1, "clicked"
, G_CALLBACK(on_archive_button_clicked_cb), intf_w);
- gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_arc_button1
- , _("You can change archive threshold in parameters"), NULL);
+ gtk_widget_set_tooltip_text(intf_w->iea_arc_button1
+ , _("You can change archive threshold in parameters"));
hbox = gtk_hbox_new(FALSE, 0);
intf_w->iea_arc_button2 = gtk_button_new_from_stock("gtk-execute");
@@ -1103,8 +1017,8 @@ static void create_import_export_tab(intf_win *intf_w)
g_signal_connect((gpointer)intf_w->iea_arc_button2, "clicked"
, G_CALLBACK(on_unarchive_button_clicked_cb), intf_w);
- gtk_tooltips_set_tip(intf_w->tooltips, intf_w->iea_arc_button2
- , _("Return all archived events into main orage file and remove arch file.\nThis is useful for example when doing export and moving orage\nappointments to another system."), NULL);
+ gtk_widget_set_tooltip_text(intf_w->iea_arc_button2
+ , _("Return all archived events into main orage file and remove arch file.\nThis is useful for example when doing export and moving orage\nappointments to another system."));
#endif
}
@@ -1156,24 +1070,24 @@ static void create_orage_file_tab(intf_win *intf_w)
gtk_radio_button_new_with_label(NULL, _("Rename"));
gtk_box_pack_start(GTK_BOX(hbox)
, intf_w->orage_file_rename_rb, FALSE, FALSE, 5);
- gtk_tooltips_set_tip(intf_w->tooltips, intf_w->orage_file_rename_rb
- , _("Orage internal file rename only.\nDoes not touch external filesystem at all.\nNew file must exist."), NULL);
+ gtk_widget_set_tooltip_text(intf_w->orage_file_rename_rb
+ , _("Orage internal file rename only.\nDoes not touch external filesystem at all.\nNew file must exist."));
intf_w->orage_file_copy_rb =
gtk_radio_button_new_with_mnemonic_from_widget(
GTK_RADIO_BUTTON(intf_w->orage_file_rename_rb), _("Copy"));
gtk_box_pack_start(GTK_BOX(hbox)
, intf_w->orage_file_copy_rb, FALSE, FALSE, 5);
- gtk_tooltips_set_tip(intf_w->tooltips, intf_w->orage_file_copy_rb
- , _("Current file is copied and stays unmodified in the old place."), NULL);
+ gtk_widget_set_tooltip_text(intf_w->orage_file_copy_rb
+ , _("Current file is copied and stays unmodified in the old place."));
intf_w->orage_file_move_rb =
gtk_radio_button_new_with_mnemonic_from_widget(
GTK_RADIO_BUTTON(intf_w->orage_file_rename_rb), _("Move"));
gtk_box_pack_start(GTK_BOX(hbox)
, intf_w->orage_file_move_rb, FALSE, FALSE, 5);
- gtk_tooltips_set_tip(intf_w->tooltips, intf_w->orage_file_move_rb
- , _("Current file is moved and vanishes from the old place."), NULL);
+ gtk_widget_set_tooltip_text(intf_w->orage_file_move_rb
+ , _("Current file is moved and vanishes from the old place."));
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
g_signal_connect(G_OBJECT(intf_w->orage_file_open_button), "clicked"
@@ -1290,8 +1204,8 @@ static void create_foreign_file_tab(intf_win *intf_w)
, FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
- gtk_tooltips_set_tip(intf_w->tooltips, intf_w->for_new_read_only
- , _("Set this if you want to make sure that this file is never modified by Orage.\nNote that modifying foreign files may make them incompatible with the original tool, where they came from!"), NULL);
+ gtk_widget_set_tooltip_text(intf_w->for_new_read_only
+ , _("Set this if you want to make sure that this file is never modified by Orage.\nNote that modifying foreign files may make them incompatible with the original tool, where they came from!"));
/***** Current files *****/
refresh_foreign_files(intf_w, TRUE);
@@ -1308,7 +1222,6 @@ void orage_external_interface(CalWin *xfcal)
, _("Exchange data - Orage"));
gtk_window_set_default_size(GTK_WINDOW(intf_w->main_window), 300, 200);
- intf_w->tooltips = gtk_tooltips_new();
intf_w->accelgroup = gtk_accel_group_new();
gtk_window_add_accel_group(GTK_WINDOW(intf_w->main_window)
, intf_w->accelgroup);
diff --git a/src/interface.h b/src/interface.h
index e9494c8..dc42b15 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -91,7 +91,6 @@ typedef struct _intf_win
GtkWidget *for_cur_frame;
GtkWidget *for_cur_table;
- GtkTooltips *tooltips;
GtkAccelGroup *accelgroup;
} intf_win; /* interface = export/import window */
diff --git a/src/mainbox.c b/src/mainbox.c
index 1c44e01..85ca122 100644
--- a/src/mainbox.c
+++ b/src/mainbox.c
@@ -1,6 +1,6 @@
/* Orage - Calendar and alarm handler
*
- * Copyright (c) 2005-2011 Juha Kautto (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto (juha at xfce.org)
* Copyright (c) 2004-2005 Mickael Graf (korbinus at xfce.org)
*
* This program is free software; you can redistribute it and/or modify
@@ -826,7 +826,6 @@ void build_mainWin(void)
gdk_colormap_alloc_color(pic1_cmap, &cal->mBlue, FALSE, TRUE);
cal->mAccel_group = gtk_accel_group_new();
- cal->Tooltips = gtk_tooltips_new();
gtk_window_set_title(GTK_WINDOW(cal->mWindow), _("Orage"));
gtk_window_set_position(GTK_WINDOW(cal->mWindow), GTK_WIN_POS_NONE);
diff --git a/src/mainbox.h b/src/mainbox.h
index cc05fc7..56fbbbe 100644
--- a/src/mainbox.h
+++ b/src/mainbox.h
@@ -1,6 +1,6 @@
/* Orage - Calendar and alarm handler
*
- * Copyright (c) 2005-2011 Juha Kautto (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto (juha at xfce.org)
* Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
*
* This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,6 @@
typedef struct _CalWin
{
GtkAccelGroup *mAccel_group;
- GtkTooltips *Tooltips;
GtkWidget *mWindow;
GtkWidget *mVbox;
diff --git a/src/parameters.c b/src/parameters.c
index 1950543..a4e5cc6 100644
--- a/src/parameters.c
+++ b/src/parameters.c
@@ -111,7 +111,6 @@ static void dialog_response(GtkWidget *dialog, gint response_id
write_parameters();
is_running = FALSE;
gtk_widget_destroy(dialog);
- gtk_object_destroy(GTK_OBJECT(itf->Tooltips));
g_free(itf);
}
}
@@ -477,9 +476,8 @@ static void create_parameter_dialog_main_setup_tab(Itf *dialog)
, _(g_par.local_timezone));
gtk_box_pack_start(GTK_BOX(vbox)
, dialog->timezone_button, FALSE, FALSE, 5);
- gtk_tooltips_set_tip(dialog->Tooltips, dialog->timezone_button
- , _("You should always define your local timezone.")
- , NULL);
+ gtk_widget_set_tooltip_text(dialog->timezone_button
+ , _("You should always define your local timezone."));
g_signal_connect(G_OBJECT(dialog->timezone_button), "clicked"
, G_CALLBACK(timezone_button_clicked), dialog);
@@ -499,9 +497,8 @@ static void create_parameter_dialog_main_setup_tab(Itf *dialog)
, dialog->archive_threshold_spin, FALSE, FALSE, 5);
label = gtk_label_new(_("(0 = no archiving)"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
- gtk_tooltips_set_tip(dialog->Tooltips, dialog->archive_threshold_spin
- , _("Archiving is used to save time and space when handling events.")
- , NULL);
+ gtk_widget_set_tooltip_text(dialog->archive_threshold_spin
+ , _("Archiving is used to save time and space when handling events."));
g_signal_connect(G_OBJECT(dialog->archive_threshold_spin), "value-changed"
, G_CALLBACK(archive_threshold_spin_changed), dialog);
#endif
@@ -523,9 +520,8 @@ static void create_parameter_dialog_main_setup_tab(Itf *dialog)
gtk_box_pack_start(GTK_BOX(hbox)
, dialog->sound_application_open_button, FALSE, FALSE, 5);
- gtk_tooltips_set_tip(dialog->Tooltips, dialog->sound_application_entry
- , _("This command is given to shell to make sound in alarms.")
- , NULL);
+ gtk_widget_set_tooltip_text(dialog->sound_application_entry
+ , _("This command is given to shell to make sound in alarms."));
g_signal_connect(G_OBJECT(dialog->sound_application_open_button), "clicked"
, G_CALLBACK(sound_application_open_button_clicked), dialog);
g_signal_connect(G_OBJECT(dialog->sound_application_entry), "changed"
@@ -691,8 +687,8 @@ static void create_parameter_dialog_calendar_setup_tab(Itf *dialog)
dialog->show_events_spin = gtk_spin_button_new_with_range(0, 31, 1);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->show_events_spin)
, g_par.show_event_days);
- gtk_tooltips_set_tip(dialog->Tooltips, dialog->show_events_spin
- , _("0 = do not show event list at all"), NULL);
+ gtk_widget_set_tooltip_text(dialog->show_events_spin
+ , _("0 = do not show event list at all"));
gtk_box_pack_start(GTK_BOX(hbox)
, dialog->show_events_spin, FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
@@ -849,9 +845,8 @@ static void create_parameter_dialog_extra_setup_tab(Itf *dialog)
, dialog->el_extra_days_spin, FALSE, FALSE, 5);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->el_extra_days_spin)
, g_par.el_days);
- gtk_tooltips_set_tip(dialog->Tooltips, dialog->el_extra_days_spin
- , _("This is just the default value, you can change it in the actual eventlist window.")
- , NULL);
+ gtk_widget_set_tooltip_text(dialog->el_extra_days_spin
+ , _("This is just the default value, you can change it in the actual eventlist window."));
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(dialog->el_extra_days_spin), "value-changed"
, G_CALLBACK(el_extra_days_spin_changed), dialog);
@@ -906,9 +901,8 @@ static void create_parameter_dialog_extra_setup_tab(Itf *dialog)
, dialog->use_dynamic_icon_checkbutton, FALSE, FALSE, 5);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
dialog->use_dynamic_icon_checkbutton), g_par.use_dynamic_icon);
- gtk_tooltips_set_tip(dialog->Tooltips, dialog->use_dynamic_icon_checkbutton
- , _("Dynamic icon shows current month and day of the month.")
- , NULL);
+ gtk_widget_set_tooltip_text(dialog->use_dynamic_icon_checkbutton
+ , _("Dynamic icon shows current month and day of the month."));
g_signal_connect(G_OBJECT(dialog->use_dynamic_icon_checkbutton), "toggled"
, G_CALLBACK(use_dynamic_icon_changed), dialog);
@@ -925,9 +919,8 @@ static void create_parameter_dialog_extra_setup_tab(Itf *dialog)
, dialog->use_wakeup_timer_checkbutton, FALSE, FALSE, 5);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
dialog->use_wakeup_timer_checkbutton), g_par.use_wakeup_timer);
- gtk_tooltips_set_tip(dialog->Tooltips, dialog->use_wakeup_timer_checkbutton
- , _("Use this timer if Orage has problems waking up properly after suspend or hibernate. (For example tray icon not refreshed or alarms not firing.)")
- , NULL);
+ gtk_widget_set_tooltip_text(dialog->use_wakeup_timer_checkbutton
+ , _("Use this timer if Orage has problems waking up properly after suspend or hibernate. (For example tray icon not refreshed or alarms not firing.)"));
g_signal_connect(G_OBJECT(dialog->use_wakeup_timer_checkbutton), "toggled"
, G_CALLBACK(use_wakeup_timer_changed), dialog);
@@ -975,7 +968,6 @@ static Itf *create_parameter_dialog(void)
GdkPixbuf *orage_logo;
dialog = g_new(Itf, 1);
- dialog->Tooltips = gtk_tooltips_new();
dialog->orage_dialog = gtk_dialog_new();
gtk_window_set_default_size(GTK_WINDOW(dialog->orage_dialog), 300, 350);
diff --git a/src/parameters_internal.h b/src/parameters_internal.h
index 47e1a13..b09614f 100644
--- a/src/parameters_internal.h
+++ b/src/parameters_internal.h
@@ -25,8 +25,6 @@
typedef struct _Itf
{
- GtkTooltips *Tooltips;
-
GtkWidget *orage_dialog;
GtkWidget *dialog_vbox1;
GtkWidget *notebook;
diff --git a/src/reminder.c b/src/reminder.c
index 0bc4b03..eeb6934 100644
--- a/src/reminder.c
+++ b/src/reminder.c
@@ -1,6 +1,6 @@
/* Orage - Calendar and alarm handler
*
- * Copyright (c) 2005-2011 Juha Kautto (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto (juha at xfce.org)
* Copyright (c) 2003-2006 Mickael Graf (korbinus at xfce.org)
*
* This program is free software; you can redistribute it and/or modify
@@ -1148,8 +1148,6 @@ static gboolean orage_tooltip_update(gpointer user_data)
}
if (alarm_cnt == 0)
g_string_append_printf(tooltip, _("\nNo active alarms found"));
- /* deprecated since version 2.16 */
- /* after 2.16 use gtk_status_icon_set_tooltip_markup to get nicer text */
gtk_status_icon_set_tooltip_markup((GtkStatusIcon *)g_par.trayIcon, tooltip->str);
g_string_free(tooltip, TRUE);
return(TRUE);
diff --git a/src/reminder.h b/src/reminder.h
index b6fbe59..b3ed12e 100644
--- a/src/reminder.h
+++ b/src/reminder.h
@@ -1,6 +1,6 @@
/* Orage - Calendar and alarm handler
*
- * Copyright (c) 2005-2011 Juha Kautto (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto (juha at xfce.org)
* Copyright (c) 2004-2006 Mickael Graf (korbinus at xfce.org)
*
* This program is free software; you can redistribute it and/or modify
@@ -60,9 +60,8 @@ typedef struct _alarm_struct
gboolean procedure;
gchar *cmd;
- /*
- gboolean email;
- */
+/* gboolean email; */
+
/* this is used to control active alarms */
active_alarm_struct *active_alarm;
/* pointer to special data needed for orage window alarm */
More information about the Xfce4-commits
mailing list