Updating branch refs/heads/master
to 93df404a27b1fe7e1ea8425d51f49d5c2f4f86dd (commit)
from 8b2040d13bc85459f9ff13421325ff3a4abb3665 (commit)
commit 93df404a27b1fe7e1ea8425d51f49d5c2f4f86dd
Author: juha <juha@debian-testi.domain.invalid>
Date: Mon Feb 4 18:33:38 2013 +0200
4.9.1.1 Fixed bug 9530 Pick the date dialog isn't localized
Moved localized strings from functionc.c to calling files.
Also fixed tooltip hint to NOT show note as bold.
configure.in.in | 2 +-
src/appointment.c | 16 ++++++++++++++--
src/day-view.c | 8 +++++++-
src/event-list.c | 9 ++++++++-
src/functions.c | 8 ++++++--
src/mainbox.c | 6 ++----
6 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 7258324..42ab145 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <j...@xfce.org>
dnl
dnl Version information
-m4_define([orage_version], [4.9.1.0-git])
+m4_define([orage_version], [4.9.1.1-git])
m4_define([gtk_minimum_version], [2.14.0])
m4_define([xfce_minimum_version], [4.8.0])
diff --git a/src/appointment.c b/src/appointment.c
index 1f1be78..e8dcfce 100644
--- a/src/appointment.c
+++ b/src/appointment.c
@@ -1274,8 +1274,14 @@ static void on_appRevert_clicked_cb(GtkWidget *b,
gpointer *user_data)
static void on_Date_button_clicked_cb(GtkWidget *button, gpointer *user_data)
{
appt_win *apptw = (appt_win *)user_data;
+ GtkWidget *selDate_dialog;
- if (orage_date_button_clicked(button, apptw->Window))
+ selDate_dialog = gtk_dialog_new_with_buttons(
+ _("Pick the date"), GTK_WINDOW(apptw->Window),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ _("Today"), 1, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+
+ if (orage_date_button_clicked(button, selDate_dialog))
mark_appointment_changed(apptw);
}
@@ -1283,8 +1289,14 @@ static void on_recur_Date_button_clicked_cb(GtkWidget
*button
, gpointer *user_data)
{
appt_win *apptw = (appt_win *)user_data;
+ GtkWidget *selDate_dialog;
+
+ selDate_dialog = gtk_dialog_new_with_buttons(
+ _("Pick the date"), GTK_WINDOW(apptw->Window),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ _("Today"), 1, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
- if (orage_date_button_clicked(button, apptw->Window))
+ if (orage_date_button_clicked(button, selDate_dialog))
mark_appointment_changed(apptw);
refresh_recur_calendars((appt_win *)user_data);
}
diff --git a/src/day-view.c b/src/day-view.c
index b5f0846..899c225 100644
--- a/src/day-view.c
+++ b/src/day-view.c
@@ -385,8 +385,14 @@ static void on_spin_changed(GtkSpinButton *b, gpointer
*user_data)
static void on_Date_button_clicked_cb(GtkWidget *button, gpointer *user_data)
{
day_win *dw = (day_win *)user_data;
+ GtkWidget *selDate_dialog;
- if (orage_date_button_clicked(button, dw->Window))
+ selDate_dialog = gtk_dialog_new_with_buttons(
+ _("Pick the date"), GTK_WINDOW(dw->Window),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ _("Today"), 1, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+
+ if (orage_date_button_clicked(button, selDate_dialog))
refresh_day_win(dw);
}
diff --git a/src/event-list.c b/src/event-list.c
index 1969bd3..86632c1 100644
--- a/src/event-list.c
+++ b/src/event-list.c
@@ -972,7 +972,14 @@ static void on_journal_start_button_clicked(GtkWidget
*button
, gpointer *user_data)
{
el_win *el = (el_win *)user_data;
- if (orage_date_button_clicked(button, el->Window))
+ GtkWidget *selDate_dialog;
+
+ selDate_dialog = gtk_dialog_new_with_buttons(
+ _("Pick the date"), GTK_WINDOW(el->Window),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ _("Today"), 1, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+
+ if (orage_date_button_clicked(button, selDate_dialog))
refresh_el_win(el);
}
diff --git a/src/functions.c b/src/functions.c
index 12cb014..417ae51 100644
--- a/src/functions.c
+++ b/src/functions.c
@@ -129,15 +129,18 @@ GtkWidget *orage_create_combo_box_with_content(char
*text[], int size)
return(combo_box);
}
-gboolean orage_date_button_clicked(GtkWidget *button, GtkWidget *win)
+gboolean orage_date_button_clicked(GtkWidget *button, GtkWidget
*selDate_dialog)
{
- GtkWidget *selDate_dialog;
+/* GtkWidget *selDate_dialog; */
GtkWidget *selDate_calendar;
gint result;
char *new_date=NULL, *cur_date;
struct tm cur_t;
gboolean changed, allocated=FALSE;
+ /*
+ For some unknown reason NLS does not work in this file, so this
+ has to be done in the main code:
selDate_dialog = gtk_dialog_new_with_buttons(
_("Pick the date"), GTK_WINDOW(win),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -146,6 +149,7 @@ gboolean orage_date_button_clicked(GtkWidget *button,
GtkWidget *win)
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
+ */
selDate_calendar = gtk_calendar_new();
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(selDate_dialog)->vbox)
diff --git a/src/mainbox.c b/src/mainbox.c
index 2e47375..b83659d 100644
--- a/src/mainbox.c
+++ b/src/mainbox.c
@@ -379,7 +379,7 @@ static void add_info_row(xfical_appt *appt, GtkBox
*parentBox, gboolean todo)
#define P_N "add_info_row: "
GtkWidget *ev, *label;
CalWin *cal = (CalWin *)g_par.xfcal;
- gchar *tip, *tmp, *tmp_title, *tmp_note;
+ gchar *tip, *tmp, *tmp_title;
gchar *tip_title, *tip_location, *tip_note;
gchar *format_bold = "<span weight=\"bold\"> %s </span>";
struct tm *t;
@@ -457,11 +457,9 @@ static void add_info_row(xfical_appt *appt, GtkBox
*parentBox, gboolean todo)
tip_location = g_strdup("");
}
if (appt->note) {
- tmp_note = orage_process_text_commands(appt->note);
- tmp = g_markup_printf_escaped(format_bold, tmp_note);
+ tmp = orage_process_text_commands(appt->note);
tip_note = g_strdup_printf(_("\n Note:\n%s"), tmp);
g_free(tmp);
- g_free(tmp_note);
}
else {
tip_note = g_strdup("");
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
