[Xfce4-commits] orage:master 4.8.3.2: Enhancement 8231: alarm type selectable for foreign ics files
Updating branch refs/heads/master
to 1aac08d0c480ea3f2904c31c170f8184810f3133 (commit)
from 989abdb15e3e06eee5876d702587ca24456779c7 (commit)
commit 1aac08d0c480ea3f2904c31c170f8184810f3133
Author: juha juha@t400.domain.invalid
Date: Mon Jan 28 11:08:17 2013 +0200
4.8.3.2: Enhancement 8231: alarm type selectable for foreign ics files
It is now possible to set default alarm type for foreign file alarms.
Note that this is done via parameter Use notify foreign alarm and it is
not documented and not available in menus and forms.
configure.in.in |2 +-
src/ical-code.c |8 ++--
src/parameters.c |4
src/parameters.h |1 +
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 061f7c4..abc72b5 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.8.3.1-git])
+m4_define([orage_version], [4.8.3.2-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/src/ical-code.c b/src/ical-code.c
index 95fce2a..cf88623 100644
--- a/src/ical-code.c
+++ b/src/ical-code.c
@@ -1675,8 +1675,12 @@ static void get_alarm_data(icalcomponent *ca,
xfical_appt *appt)
appt-note = (char *)icalproperty_get_description(p);
*/
/* default display alarm is orage if none is set */
-if (!appt-display_alarm_orage !appt-display_alarm_notify)
-appt-display_alarm_orage = TRUE;
+if (!appt-display_alarm_orage !appt-display_alarm_notify) {
+if (g_par.use_foreign_display_alarm_notify)
+appt-display_alarm_notify = TRUE;
+else
+appt-display_alarm_orage = TRUE;
+}
}
else if (act == ICAL_ACTION_AUDIO) {
get_alarm_data_x(ca, appt);
diff --git a/src/parameters.c b/src/parameters.c
index c4b564d..4e55434 100644
--- a/src/parameters.c
+++ b/src/parameters.c
@@ -1162,6 +1162,8 @@ void read_parameters(void)
g_sprintf(f_par, Foreign file %02d read-only, i);
g_par.foreign_data[i].read_only = orage_rc_get_bool(orc, f_par, TRUE);
}
+g_par.use_foreign_display_alarm_notify = orage_rc_get_bool(orc
+, Use notify foreign alarm, FALSE);
g_log_level = orage_rc_get_int(orc, Logging level, 0);
g_par.priority_list_limit = orage_rc_get_int(orc, Priority list limit,
8);
g_par.use_wakeup_timer = orage_rc_get_bool(orc, Use wakeup timer, TRUE);
@@ -1256,6 +1258,8 @@ void write_parameters(void)
g_sprintf(f_par, Foreign file %02d read-only, i);
orage_rc_del_item(orc, f_par);
}
+orage_rc_put_bool(orc, Use notify foreign alarm
+, g_par.use_foreign_display_alarm_notify);
orage_rc_put_int(orc, Logging level, g_log_level);
orage_rc_put_int(orc, Priority list limit, g_par.priority_list_limit);
orage_rc_put_bool(orc, Use wakeup timer, g_par.use_wakeup_timer);
diff --git a/src/parameters.h b/src/parameters.h
index 208efd3..724e40e 100644
--- a/src/parameters.h
+++ b/src/parameters.h
@@ -65,6 +65,7 @@ typedef struct _parameters
/* foreign files */
int foreign_count;
foreign_file foreign_data[10];
+gboolean use_foreign_display_alarm_notify; /* changes alarm to notify */
/* other */
char *orage_file;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.8.3.3 Fixed Bug 4817 Orage escapes anchor (#) in help links
Updating branch refs/heads/master
to 0d1f8b80eea19934e0a5f10e51be2536683a9a21 (commit)
from 543b1f2d13412bec26cbb1152624ba565aa3ddbe (commit)
commit 0d1f8b80eea19934e0a5f10e51be2536683a9a21
Author: Juha j...@xfce.org
Date: Mon Jan 28 12:34:24 2013 +0200
4.8.3.3 Fixed Bug 4817 Orage escapes anchor (#) in help links
Need to use full names to keep # in the URL. Added file:// in the
beginning of the URL
configure.in.in |2 +-
src/parameters.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index abc72b5..3f6df0e 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.8.3.2-git])
+m4_define([orage_version], [4.8.3.3-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/src/parameters.c b/src/parameters.c
index 4e55434..737aa44 100644
--- a/src/parameters.c
+++ b/src/parameters.c
@@ -176,7 +176,7 @@ static void dialog_response(GtkWidget *dialog, gint
response_id
if (response_id == GTK_RESPONSE_HELP) {
/* Needs to be in to keep # */
-helpdoc = g_strconcat(firefox \, PACKAGE_DATA_DIR
+helpdoc = g_strconcat(firefox \file://, PACKAGE_DATA_DIR
, G_DIR_SEPARATOR_S, orage
, G_DIR_SEPARATOR_S, doc
, G_DIR_SEPARATOR_S, C
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.8.3.4 Fixed Bug 9243 strptime() needs _XOPEN_SOURCE_EXTENDED to be defined
Updating branch refs/heads/master to e27bff4d26d8a60f8f415d0a96be581bbb816860 (commit) from 0d1f8b80eea19934e0a5f10e51be2536683a9a21 (commit) commit e27bff4d26d8a60f8f415d0a96be581bbb816860 Author: Juha j...@xfce.org Date: Mon Jan 28 13:33:52 2013 +0200 4.8.3.4 Fixed Bug 9243 strptime() needs _XOPEN_SOURCE_EXTENDED to be defined Added the define to satisfy posix requirements. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 3f6df0e..7d8824d 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.8.3.3-git]) +m4_define([orage_version], [4.8.3.4-git]) m4_define([gtk_minimum_version], [2.10.0]) m4_define([xfce_minimum_version], [4.6.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.8.3.4 Fixed bug 9243 missing files
Updating branch refs/heads/master to 02558f98881c8d526c92beedde466be7ba9aa25b (commit) from e27bff4d26d8a60f8f415d0a96be581bbb816860 (commit) commit 02558f98881c8d526c92beedde466be7ba9aa25b Author: Juha j...@xfce.org Date: Mon Jan 28 13:35:59 2013 +0200 4.8.3.4 Fixed bug 9243 missing files Forgot to add those files. src/appointment.c |1 + src/functions.c |1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/appointment.c b/src/appointment.c index 6b15405..2751aff 100644 --- a/src/appointment.c +++ b/src/appointment.c @@ -26,6 +26,7 @@ #endif #define _XOPEN_SOURCE /* glibc2 needs this */ +#define _XOPEN_SOURCE_EXTENDED 1 /* strptime needs this in posix systems */ #include sys/types.h #include sys/stat.h diff --git a/src/functions.c b/src/functions.c index c53dd6d..12cb014 100644 --- a/src/functions.c +++ b/src/functions.c @@ -22,6 +22,7 @@ */ #define _XOPEN_SOURCE /* glibc2 needs this */ +#define _XOPEN_SOURCE_EXTENDED 1 /* strptime needs this in posix systems */ #include stdio.h #include stdlib.h ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.8.3.5 Fixed Bug 9248 provided libical bugs SSPM_UNKNOWN_MINOR_TYPE
Updating branch refs/heads/master
to 6b2bf978cb111b8702abf17c099d195afb13544a (commit)
from 02558f98881c8d526c92beedde466be7ba9aa25b (commit)
commit 6b2bf978cb111b8702abf17c099d195afb13544a
Author: Juha j...@xfce.org
Date: Mon Jan 28 13:46:10 2013 +0200
4.8.3.5 Fixed Bug 9248 provided libical bugs SSPM_UNKNOWN_MINOR_TYPE
Should use SSPM_UNKNOWN_MAJOR_TYPE instead of SSPM_UNKNOWN_MINOR_TYPE.
configure.in.in|2 +-
libical/src/libical/sspm.c |8
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 7d8824d..36b9a3e 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.8.3.4-git])
+m4_define([orage_version], [4.8.3.5-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/libical/src/libical/sspm.c b/libical/src/libical/sspm.c
index 571e596..9455499 100644
--- a/libical/src/libical/sspm.c
+++ b/libical/src/libical/sspm.c
@@ -443,7 +443,7 @@ enum sspm_major_type sspm_find_major_content_type(char*
type)
char* ltype = sspm_lowercase(type);
-for (i=0; major_content_type_map[i].type != SSPM_UNKNOWN_MINOR_TYPE; i++){
+for (i=0; major_content_type_map[i].type != SSPM_UNKNOWN_MAJOR_TYPE; i++){
if(strncmp(ltype, major_content_type_map[i].str,
strlen(major_content_type_map[i].str))==0){
free(ltype);
@@ -451,7 +451,7 @@ enum sspm_major_type sspm_find_major_content_type(char*
type)
}
}
free(ltype);
-return major_content_type_map[i].type; /* Should return
SSPM_UNKNOWN_MINOR_TYPE */
+return major_content_type_map[i].type; /* Should return
SSPM_UNKNOWN_MAJOR_TYPE */
}
enum sspm_minor_type sspm_find_minor_content_type(char* type)
@@ -483,7 +483,7 @@ char* sspm_major_type_string(enum sspm_major_type type)
{
int i;
-for (i=0; major_content_type_map[i].type != SSPM_UNKNOWN_MINOR_TYPE;
+for (i=0; major_content_type_map[i].type != SSPM_UNKNOWN_MAJOR_TYPE;
i++){
if(type == major_content_type_map[i].type){
@@ -491,7 +491,7 @@ char* sspm_major_type_string(enum sspm_major_type type)
}
}
-return major_content_type_map[i].str; /* Should return
SSPM_UNKNOWN_MINOR_TYPE */
+return major_content_type_map[i].str; /* Should return
SSPM_UNKNOWN_MAJOR_TYPE */
}
char* sspm_minor_type_string(enum sspm_minor_type type)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.8.3.6 Fixed Bug 9739 TODOs should start not completed
Updating branch refs/heads/master to 9b157a7511f3007ba188bb576621f95729728c6c (commit) from 6b2bf978cb111b8702abf17c099d195afb13544a (commit) commit 9b157a7511f3007ba188bb576621f95729728c6c Author: Juha j...@xfce.org Date: Mon Jan 28 13:56:10 2013 +0200 4.8.3.6 Fixed Bug 9739 TODOs should start not completed Thanks to patch for Lee Thomas! Changed default to be not completed for new TODOs. Makes very much sense. configure.in.in |2 +- src/appointment.c |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in.in b/configure.in.in index 36b9a3e..71efeea 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.8.3.5-git]) +m4_define([orage_version], [4.8.3.6-git]) m4_define([gtk_minimum_version], [2.10.0]) m4_define([xfce_minimum_version], [4.6.0]) diff --git a/src/appointment.c b/src/appointment.c index 2751aff..1f1be78 100644 --- a/src/appointment.c +++ b/src/appointment.c @@ -1670,8 +1670,8 @@ static xfical_appt *fill_appt_window_get_appt(appt_win *apptw appt-start_tz_loc = g_strdup(floating); appt-end_tz_loc = g_strdup(appt-start_tz_loc); appt-duration = 30*60; -/* use completed by default for new TODO */ -appt-completed = TRUE; +/* use NOT completed by default for new TODO */ +appt-completed = FALSE; /* use duration by default for new appointments */ appt-use_duration = TRUE; g_sprintf(appt-completedtime,%sT%02d%02d00 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.8.3.7 Enhancement 9738 Main window should sort TODOs by due-date
Updating branch refs/heads/master
to 436c095d46dbcefd95f99a7e50cf7b155c3e2ac8 (commit)
from 9b157a7511f3007ba188bb576621f95729728c6c (commit)
commit 436c095d46dbcefd95f99a7e50cf7b155c3e2ac8
Author: Juha j...@xfce.org
Date: Mon Jan 28 15:47:39 2013 +0200
4.8.3.7 Enhancement 9738 Main window should sort TODOs by due-date
Changed main calendar to sort TODOs based on due-date (those without due
date come last).
configure.in.in |2 +-
src/mainbox.c | 28
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 71efeea..6f41362 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.8.3.6-git])
+m4_define([orage_version], [4.8.3.7-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/src/mainbox.c b/src/mainbox.c
index 96296f7..48cf5ae 100644
--- a/src/mainbox.c
+++ b/src/mainbox.c
@@ -487,10 +487,10 @@ static void insert_rows(GList **list, char *a_day,
xfical_type ical_type
}
}
-static gint list_order(gconstpointer a, gconstpointer b)
+static gint event_order(gconstpointer a, gconstpointer b)
{
#undef P_N
-#define P_N list_order:
+#define P_N event_order:
xfical_appt *appt1, *appt2;
#ifdef ORAGE_DEBUG
@@ -502,6 +502,26 @@ static gint list_order(gconstpointer a, gconstpointer b)
return(strcmp(appt1-starttimecur, appt2-starttimecur));
}
+static gint todo_order(gconstpointer a, gconstpointer b)
+{
+#undef P_N
+#define P_N todo_order:
+xfical_appt *appt1, *appt2;
+
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
+appt1 = (xfical_appt *)a;
+appt2 = (xfical_appt *)b;
+
+if (appt1-use_due_time !appt2-use_due_time)
+return(-1);
+if (!appt1-use_due_time appt2-use_due_time)
+return(1);
+
+return(strcmp(appt1-endtimecur, appt2-endtimecur));
+}
+
static void info_process(gpointer a, gpointer pbox)
{
#undef P_N
@@ -649,7 +669,7 @@ static void build_mainbox_todo_info(void)
if (todo_list) {
gtk_widget_destroy(cal-mTodo_vbox);
create_mainbox_todo_info();
-todo_list = g_list_sort(todo_list, list_order);
+todo_list = g_list_sort(todo_list, todo_order);
g_list_foreach(todo_list, (GFunc)info_process
, cal-mTodo_rows_vbox);
g_list_free(todo_list);
@@ -706,7 +726,7 @@ static void build_mainbox_event_info(void)
if (event_list) {
gtk_widget_destroy(cal-mEvent_vbox);
create_mainbox_event_info_box();
-event_list = g_list_sort(event_list, list_order);
+event_list = g_list_sort(event_list, event_order);
g_list_foreach(event_list, (GFunc)info_process
, cal-mEvent_rows_vbox);
g_list_free(event_list);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.8.3.8 Enhancement 9598 use bold for 'title' and 'location' in tooltips
Updating branch refs/heads/master
to e85ab252befb9897c6bbfb90f553bf241aa4ea63 (commit)
from 436c095d46dbcefd95f99a7e50cf7b155c3e2ac8 (commit)
commit e85ab252befb9897c6bbfb90f553bf241aa4ea63
Author: Juha j...@xfce.org
Date: Tue Jan 29 14:48:16 2013 +0200
4.8.3.8 Enhancement 9598 use bold for 'title' and 'location' in tooltips
Added bold to tooltip if gtk version is good enough to do it.
configure.in.in |2 +-
src/mainbox.c | 29 -
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 6f41362..34415ae 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.8.3.7-git])
+m4_define([orage_version], [4.8.3.8-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/src/mainbox.c b/src/mainbox.c
index 48cf5ae..91538b5 100644
--- a/src/mainbox.c
+++ b/src/mainbox.c
@@ -380,6 +380,9 @@ static void add_info_row(xfical_appt *appt, GtkBox
*parentBox, gboolean todo)
GtkWidget *ev, *label;
CalWin *cal = (CalWin *)g_par.xfcal;
gchar *tip, *tmp, *tmp_title, *tmp_note;
+#if GTK_CHECK_VERSION(2,16,0)
+gchar *tip_title, *tip_location;
+#endif
struct tm *t;
char *l_time, *s_time, *s_timeonly, *e_time, *c_time, *na, *today;
gint len;
@@ -442,7 +445,7 @@ static void add_info_row(xfical_appt *appt, GtkBox
*parentBox, gboolean todo)
g_free(e_time);
}
-/* set hint */
+/* set tooltip hint */
tmp_note = orage_process_text_commands(appt-note);
if (todo) {
na = _(Never);
@@ -450,17 +453,41 @@ static void add_info_row(xfical_appt *appt, GtkBox
*parentBox, gboolean todo)
? orage_icaltime_to_i18_time(appt-endtimecur) : na);
c_time = g_strdup(appt-completed
? orage_icaltime_to_i18_time(appt-completedtime) : na);
+#if GTK_CHECK_VERSION(2,16,0)
+tip_title = g_strdup_printf(span weight=\bold\ %s /span
+, tmp_title);
+tip_location = g_strdup_printf(span weight=\bold\ %s /span
+, appt-location);
+tip = g_strdup_printf(_(Title: %s\n Location: %s\n Start:\t%s\n
Due:\t%s\n Done:\t%s\n Note:\n%s)
+, tip_title, tip_location, s_time, e_time, c_time, tmp_note);
+#else
tip = g_strdup_printf(_(Title: %s\n Location: %s\n Start:\t%s\n
Due:\t%s\n Done:\t%s\n Note:\n%s)
, tmp_title, appt-location, s_time, e_time, c_time, tmp_note);
+#endif
g_free(c_time);
}
else { /* it is event */
e_time = g_strdup(orage_icaltime_to_i18_time(appt-endtimecur));
+#if GTK_CHECK_VERSION(2,16,0)
+tip_title = g_strdup_printf(span weight=\bold\ %s /span
+, tmp_title);
+tip_location = g_strdup_printf(span weight=\bold\ %s /span
+, appt-location);
+tip = g_strdup_printf(_(Title: %s\n Location: %s\n Start:\t%s\n
End:\t%s\n Note:\n%s)
+, tip_title, tip_location, s_time, e_time, tmp_note);
+#else
tip = g_strdup_printf(_(Title: %s\n Location: %s\n Start:\t%s\n
End:\t%s\n Note:\n%s)
, tmp_title, appt-location, s_time, e_time, tmp_note);
+#endif
}
+#if GTK_CHECK_VERSION(2,16,0)
+gtk_widget_set_tooltip_markup(ev, tip);
+g_free(tip_title);
+g_free(tip_location);
+#else
gtk_tooltips_set_tip(cal-Tooltips, ev, tip, NULL);
+#endif
g_free(tmp_title);
g_free(tmp_note);
g_free(s_time);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.8.3.9 Fixes for bold title
Updating branch refs/heads/master
to 2f3fa41eb3eb823e432c5bbb9a1e10112b5043e2 (commit)
from e85ab252befb9897c6bbfb90f553bf241aa4ea63 (commit)
commit 2f3fa41eb3eb823e432c5bbb9a1e10112b5043e2
Author: Juha j...@xfce.org
Date: Wed Jan 30 15:38:43 2013 +0200
4.8.3.9 Fixes for bold title
Needed to escape strings because bold is using markups.
configure.in.in |2 +-
src/mainbox.c | 43 ++-
2 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 34415ae..fb4b37a 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.8.3.8-git])
+m4_define([orage_version], [4.8.3.9-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/src/mainbox.c b/src/mainbox.c
index 91538b5..be17c9d 100644
--- a/src/mainbox.c
+++ b/src/mainbox.c
@@ -381,7 +381,8 @@ static void add_info_row(xfical_appt *appt, GtkBox
*parentBox, gboolean todo)
CalWin *cal = (CalWin *)g_par.xfcal;
gchar *tip, *tmp, *tmp_title, *tmp_note;
#if GTK_CHECK_VERSION(2,16,0)
-gchar *tip_title, *tip_location;
+gchar *tip_title = NULL, *tip_location = NULL, *tip_note = NULL;
+gchar *format_bold = span weight=\bold\ %s /span;
#endif
struct tm *t;
char *l_time, *s_time, *s_timeonly, *e_time, *c_time, *na, *today;
@@ -454,12 +455,18 @@ static void add_info_row(xfical_appt *appt, GtkBox
*parentBox, gboolean todo)
c_time = g_strdup(appt-completed
? orage_icaltime_to_i18_time(appt-completedtime) : na);
#if GTK_CHECK_VERSION(2,16,0)
-tip_title = g_strdup_printf(span weight=\bold\ %s /span
-, tmp_title);
-tip_location = g_strdup_printf(span weight=\bold\ %s /span
-, appt-location);
+if (tmp_title) {
+tip_title = g_markup_printf_escaped(format_bold, tmp_title);
+}
+if (appt-location) {
+tip_location = g_markup_printf_escaped(format_bold,
appt-location);
+}
+if (tmp_note) {
+tip_note = g_markup_escape_text(tmp_note, strlen(tmp_note));
+}
+
tip = g_strdup_printf(_(Title: %s\n Location: %s\n Start:\t%s\n
Due:\t%s\n Done:\t%s\n Note:\n%s)
-, tip_title, tip_location, s_time, e_time, c_time, tmp_note);
+, tip_title, tip_location, s_time, e_time, c_time, tip_note);
#else
tip = g_strdup_printf(_(Title: %s\n Location: %s\n Start:\t%s\n
Due:\t%s\n Done:\t%s\n Note:\n%s)
, tmp_title, appt-location, s_time, e_time, c_time, tmp_note);
@@ -470,12 +477,18 @@ static void add_info_row(xfical_appt *appt, GtkBox
*parentBox, gboolean todo)
else { /* it is event */
e_time = g_strdup(orage_icaltime_to_i18_time(appt-endtimecur));
#if GTK_CHECK_VERSION(2,16,0)
-tip_title = g_strdup_printf(span weight=\bold\ %s /span
-, tmp_title);
-tip_location = g_strdup_printf(span weight=\bold\ %s /span
-, appt-location);
+if (tmp_title) {
+tip_title = g_markup_printf_escaped(format_bold, tmp_title);
+}
+if (appt-location) {
+tip_location = g_markup_printf_escaped(format_bold,
appt-location);
+}
+if (tmp_note) {
+tip_note = g_markup_escape_text(tmp_note, strlen(tmp_note));
+}
+
tip = g_strdup_printf(_(Title: %s\n Location: %s\n Start:\t%s\n
End:\t%s\n Note:\n%s)
-, tip_title, tip_location, s_time, e_time, tmp_note);
+, tip_title, tip_location, s_time, e_time, tip_note);
#else
tip = g_strdup_printf(_(Title: %s\n Location: %s\n Start:\t%s\n
End:\t%s\n Note:\n%s)
, tmp_title, appt-location, s_time, e_time, tmp_note);
@@ -483,8 +496,12 @@ static void add_info_row(xfical_appt *appt, GtkBox
*parentBox, gboolean todo)
}
#if GTK_CHECK_VERSION(2,16,0)
gtk_widget_set_tooltip_markup(ev, tip);
-g_free(tip_title);
-g_free(tip_location);
+if (tip_title)
+g_free(tip_title);
+if (tip_location)
+g_free(tip_location);
+if (tip_note)
+g_free(tip_note);
#else
gtk_tooltips_set_tip(cal-Tooltips, ev, tip, NULL);
#endif
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage|orage-4.8.4 Creating annotated tag orage-4.8.4
Updating annotated tag refs/tags/orage-4.8.4 as new annotated tag to 06768510471128efd77fdd15c5cb067df660d510 (tag) succeeds orage-4.8.3-145-g2f3fa41 tagged by Juha j...@xfce.org on 2013-02-01 11:07 +0100 Juha (1): Release 4.8.4! ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.8.4.0 After release version reset
Updating branch refs/heads/master to bf7da8662252521f2dcd60dc7d9baa615379917d (commit) from 94cc6faf80df8e017567a2b67710d92dac9c4050 (commit) commit bf7da8662252521f2dcd60dc7d9baa615379917d Author: Juha j...@xfce.org Date: Fri Feb 1 12:14:48 2013 +0200 4.8.4.0 After release version reset Release done. Resetting version back to git type. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index ba4a2c2..7f8f730 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.8.4]) +m4_define([orage_version], [4.8.4.0-git]) m4_define([gtk_minimum_version], [2.10.0]) m4_define([xfce_minimum_version], [4.6.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.9.0.0: Fixed Bug 9249 1 Flag show wrong for hourly recurrence
Updating branch refs/heads/master to 63f351bc49a58dd3c18aa1399279a3db9690b889 (commit) from bf7da8662252521f2dcd60dc7d9baa615379917d (commit) commit 63f351bc49a58dd3c18aa1399279a3db9690b889 Author: Juha j...@xfce.org Date: Fri Feb 1 15:36:58 2013 +0200 4.9.0.0: Fixed Bug 9249 1 Flag show wrong for hourly recurrence Added hourly recurrency to the flags and to the tooltip. Also fixed alarm to correctly show if it is set and if it is persistent. configure.in.in |8 src/event-list.c | 13 - 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/configure.in.in b/configure.in.in index 7f8f730..5ea2e00 100644 --- a/configure.in.in +++ b/configure.in.in @@ -9,11 +9,11 @@ dnl Written for Xfce by Juha Kautto j...@xfce.org dnl dnl Version information -m4_define([orage_version], [4.8.4.0-git]) +m4_define([orage_version], [4.9.0.0-git]) -m4_define([gtk_minimum_version], [2.10.0]) -m4_define([xfce_minimum_version], [4.6.0]) -m4_define([dbus_minimum_version], [0.34]) +m4_define([gtk_minimum_version], [2.14.0]) +m4_define([xfce_minimum_version], [4.8.0]) +m4_define([dbus_minimum_version], [0.1]) m4_define([notify_minimum_version], [0.3.2]) m4_define([intltool_minimum_version], [0.31]) m4_define([libical_minimum_version], [0.43]) diff --git a/src/event-list.c b/src/event-list.c index b63c66a..1969bd3 100644 --- a/src/event-list.c +++ b/src/event-list.c @@ -373,9 +373,10 @@ static void add_el_row(el_win *el, xfical_appt *appt, char *par) guint len = 50; stime = format_time(el, appt, par); -if (appt-alarmtime != 0) -if (appt-sound != NULL) -flags[0] = 'S'; +if (appt-display_alarm_orage || appt-display_alarm_notify +|| appt-sound_alarm || appt-procedure_alarm) +if (appt-alarm_persistent) +flags[0] = 'P'; else flags[0] = 'A'; else @@ -391,8 +392,10 @@ static void add_el_row(el_win *el, xfical_appt *appt, char *par) flags[1] = 'M'; else if (appt-freq == XFICAL_FREQ_YEARLY) flags[1] = 'Y'; +else if (appt-freq == XFICAL_FREQ_HOURLY) +flags[1] = 'H'; else -flags[1] = 'n'; +flags[1] = '?'; if (appt-availability != 0) flags[2] = 'B'; @@ -1320,7 +1323,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=visual Alarm S=also Sound alarm\n\t 2. Recurrence: n=no recurrence\n\t\t 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_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); g_signal_connect(el-TreeView, row-activated, G_CALLBACK(editEvent), el); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.9.1.0 Enhancement 9810 tooltips should not display Location: (null)
Updating branch refs/heads/master
to ed8e48c6e21cdaf8b0f78529563b73c1cd58f22d (commit)
from 63f351bc49a58dd3c18aa1399279a3db9690b889 (commit)
commit ed8e48c6e21cdaf8b0f78529563b73c1cd58f22d
Author: Juha j...@xfce.org
Date: Mon Feb 4 13:55:15 2013 +0200
4.9.1.0 Enhancement 9810 tooltips should not display Location: (null)
Removed location and note totally if they are null instead of showing
(null). Thanks to Lee Thomas for the patch!
Also removed gtk check 2.16 and changed gtk requirement to be 2.16.
configure.in.in |2 +-
src/ical-code.h |2 +-
src/mainbox.c | 77 ++
src/reminder.c | 21 ---
4 files changed, 33 insertions(+), 69 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 5ea2e00..7258324 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.0.0-git])
+m4_define([orage_version], [4.9.1.0-git])
m4_define([gtk_minimum_version], [2.14.0])
m4_define([xfce_minimum_version], [4.8.0])
diff --git a/src/ical-code.h b/src/ical-code.h
index c412f9d..f479c85 100644
--- a/src/ical-code.h
+++ b/src/ical-code.h
@@ -89,7 +89,7 @@ typedef struct _xfical_appt
gchar *note;
/* alarm */
-gint alarmtime; /* 0 means no alarms */
+gint alarmtime;
gboolean alarm_before; /* TRUE = before FALSE = after */
/* TRUE = related to start FALSE= related to end */
gboolean alarm_related_start;
diff --git a/src/mainbox.c b/src/mainbox.c
index be17c9d..2e47375 100644
--- a/src/mainbox.c
+++ b/src/mainbox.c
@@ -380,10 +380,8 @@ static void add_info_row(xfical_appt *appt, GtkBox
*parentBox, gboolean todo)
GtkWidget *ev, *label;
CalWin *cal = (CalWin *)g_par.xfcal;
gchar *tip, *tmp, *tmp_title, *tmp_note;
-#if GTK_CHECK_VERSION(2,16,0)
-gchar *tip_title = NULL, *tip_location = NULL, *tip_note = NULL;
+gchar *tip_title, *tip_location, *tip_note;
gchar *format_bold = span weight=\bold\ %s /span;
-#endif
struct tm *t;
char *l_time, *s_time, *s_timeonly, *e_time, *c_time, *na, *today;
gint len;
@@ -393,7 +391,9 @@ static void add_info_row(xfical_appt *appt, GtkBox
*parentBox, gboolean todo)
#endif
/* add data into the vbox */
ev = gtk_event_box_new();
-tmp_title = orage_process_text_commands(appt-title);
+tmp_title = appt-title
+? orage_process_text_commands(appt-title)
+: g_strdup(_(No title defined));
s_time = g_strdup(orage_icaltime_to_i18_time(appt-starttimecur));
if (todo) {
e_time = g_strdup(appt-use_due_time
@@ -447,66 +447,51 @@ static void add_info_row(xfical_appt *appt, GtkBox
*parentBox, gboolean todo)
}
/* set tooltip hint */
-tmp_note = orage_process_text_commands(appt-note);
+tip_title = g_markup_printf_escaped(format_bold, tmp_title);
+if (appt-location) {
+tmp = g_markup_printf_escaped(format_bold, appt-location);
+tip_location = g_strdup_printf(_( Location: %s\n), tmp);
+g_free(tmp);
+}
+else {
+tip_location = g_strdup();
+}
+if (appt-note) {
+tmp_note = orage_process_text_commands(appt-note);
+tmp = g_markup_printf_escaped(format_bold, tmp_note);
+tip_note = g_strdup_printf(_(\n Note:\n%s), tmp);
+g_free(tmp);
+g_free(tmp_note);
+}
+else {
+tip_note = g_strdup();
+}
+
if (todo) {
na = _(Never);
e_time = g_strdup(appt-use_due_time
? orage_icaltime_to_i18_time(appt-endtimecur) : na);
c_time = g_strdup(appt-completed
? orage_icaltime_to_i18_time(appt-completedtime) : na);
-#if GTK_CHECK_VERSION(2,16,0)
-if (tmp_title) {
-tip_title = g_markup_printf_escaped(format_bold, tmp_title);
-}
-if (appt-location) {
-tip_location = g_markup_printf_escaped(format_bold,
appt-location);
-}
-if (tmp_note) {
-tip_note = g_markup_escape_text(tmp_note, strlen(tmp_note));
-}
-tip = g_strdup_printf(_(Title: %s\n Location: %s\n Start:\t%s\n
Due:\t%s\n Done:\t%s\n Note:\n%s)
+tip = g_strdup_printf(_(Title: %s\n%s Start:\t%s\n Due:\t%s\n
Done:\t%s%s)
, tip_title, tip_location, s_time, e_time, c_time, tip_note);
-#else
-tip = g_strdup_printf(_(Title: %s\n Location: %s\n Start:\t%s\n
Due:\t%s\n Done:\t%s\n Note:\n%s)
-, tmp_title, appt-location, s_time, e_time, c_time, tmp_note);
-#endif
g_free(c_time);
}
else { /* it is event */
e_time = g_strdup(orage_icaltime_to_i18_time(appt-endtimecur));
-#if GTK_CHECK_VERSION(2,16,0)
-if (tmp_title) {
-tip_title = g_markup_printf_escaped(format_bold, tmp_title);
-}
-if (appt
[Xfce4-commits] orage:master 4.9.1.1 Fixed bug 9530 Pick the date dialog isn't localized
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
[Xfce4-commits] orage:master 4.9.1.2 Enhancement 8231 alarm type selectable for foreign files
Updating branch refs/heads/master
to 2e88ef13dafb15f49b55e6564872a5f2efbad2d0 (commit)
from 93df404a27b1fe7e1ea8425d51f49d5c2f4f86dd (commit)
commit 2e88ef13dafb15f49b55e6564872a5f2efbad2d0
Author: Juha j...@xfce.org
Date: Tue Feb 5 13:11:32 2013 +0200
4.9.1.2 Enhancement 8231 alarm type selectable for foreign files
Made the selection visible and user configurable from parameters menu.
Also fixed tooltip as note needs to be escaped.
src/mainbox.c|5 ++-
src/parameters.c | 64 --
2 files changed, 60 insertions(+), 9 deletions(-)
diff --git a/src/mainbox.c b/src/mainbox.c
index b83659d..1c44e01 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;
+gchar *tip, *tmp, *tmp_title, *tmp_note;
gchar *tip_title, *tip_location, *tip_note;
gchar *format_bold = span weight=\bold\ %s /span;
struct tm *t;
@@ -457,7 +457,8 @@ static void add_info_row(xfical_appt *appt, GtkBox
*parentBox, gboolean todo)
tip_location = g_strdup();
}
if (appt-note) {
-tmp = orage_process_text_commands(appt-note);
+tmp_note = orage_process_text_commands(appt-note);
+tmp = g_markup_escape_text(tmp_note, strlen(tmp_note));
tip_note = g_strdup_printf(_(\n Note:\n%s), tmp);
g_free(tmp);
}
diff --git a/src/parameters.c b/src/parameters.c
index 737aa44..0138501 100644
--- a/src/parameters.c
+++ b/src/parameters.c
@@ -113,11 +113,10 @@ typedef struct _Itf
GtkWidget *extra_vbox;
/* select_always_today */
GtkWidget *select_day_frame;
-/* GtkWidget *always_today_checkbutton; */
GSList*select_day_radiobutton_group;
GtkWidget *select_day_today_radiobutton;
GtkWidget *select_day_old_radiobutton;
-/* icon size */
+/* Dynamic icon */
GtkWidget *use_dynamic_icon_frame;
GtkWidget *use_dynamic_icon_checkbutton;
/* show event/days window from main calendar */
@@ -128,13 +127,18 @@ typedef struct _Itf
/* eventlist window number of extra days to show */
GtkWidget *el_extra_days_frame;
GtkWidget *el_extra_days_spin;
-/* the rest */
-GtkWidget *close_button;
-GtkWidget *help_button;
-GtkWidget *dialog_action_area1;
-/* icon size */
+/* Use wakeup timer for suspend */
GtkWidget *use_wakeup_timer_frame;
GtkWidget *use_wakeup_timer_checkbutton;
+/* default foreign file display alarm */
+GtkWidget *foreign_alarm_frame;
+GSList*foreign_alarm_radiobutton_group;
+GtkWidget *foreign_alarm_orage_radiobutton;
+GtkWidget *foreign_alarm_notification_radiobutton;
+
+/* the rest in all tabs */
+GtkWidget *close_button;
+GtkWidget *help_button;
} Itf;
/* Return the first day of the week, where 0=monday, 6=sunday.
@@ -405,6 +409,15 @@ static void show_changed(GtkWidget *dialog, gpointer
user_data)
itf-click_to_show_days_radiobutton));
}
+static void foreign_alarm_changed(GtkWidget *dialog, gpointer user_data)
+{
+Itf *itf = (Itf *)user_data;
+
+g_par.use_foreign_display_alarm_notify =
+gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+itf-foreign_alarm_notification_radiobutton));
+}
+
static void sound_application_open_button_clicked(GtkButton *button
, gpointer user_data)
{
@@ -922,6 +935,43 @@ static void create_parameter_dialog_extra_setup_tab(Itf
*dialog)
, NULL);
g_signal_connect(G_OBJECT(dialog-use_wakeup_timer_checkbutton), toggled
, G_CALLBACK(use_wakeup_timer_changed), dialog);
+
+/* Default Display alarm for Foreign files */
+dialog-foreign_alarm_radiobutton_group = NULL;
+vbox = gtk_vbox_new(FALSE, 0);
+dialog-foreign_alarm_frame = orage_create_framebox_with_content(
+_(Foreign file default visual alarm), vbox);
+gtk_box_pack_start(GTK_BOX(dialog-extra_vbox)
+, dialog-foreign_alarm_frame, FALSE, FALSE, 5);
+
+dialog-foreign_alarm_orage_radiobutton =
+gtk_radio_button_new_with_mnemonic(NULL, _(Orage window));
+gtk_box_pack_start(GTK_BOX(vbox)
+, dialog-foreign_alarm_orage_radiobutton, FALSE, FALSE, 0);
+gtk_radio_button_set_group(
+GTK_RADIO_BUTTON(dialog-foreign_alarm_orage_radiobutton)
+, dialog-foreign_alarm_radiobutton_group);
+dialog-foreign_alarm_radiobutton_group = gtk_radio_button_get_group(
+GTK_RADIO_BUTTON(dialog-foreign_alarm_orage_radiobutton));
+gtk_toggle_button_set_active(
+GTK_TOGGLE_BUTTON(dialog-foreign_alarm_orage_radiobutton)
+, !g_par.use_foreign_display_alarm_notify);
+
+dialog-foreign_alarm_notification_radiobutton
[Xfce4-commits] orage:master 4.9.1.2 version change
Updating branch refs/heads/master to 9d38d9b574780e7aa6b8f869c62869b011040260 (commit) from 2e88ef13dafb15f49b55e6564872a5f2efbad2d0 (commit) commit 9d38d9b574780e7aa6b8f869c62869b011040260 Author: Juha j...@xfce.org Date: Tue Feb 5 13:13:43 2013 +0200 4.9.1.2 version change configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 42ab145..c77584a 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.1-git]) +m4_define([orage_version], [4.9.1.2-git]) m4_define([gtk_minimum_version], [2.14.0]) m4_define([xfce_minimum_version], [4.8.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.9.2.0 Enhancement 8383 option to day view start on first day of week
Updating branch refs/heads/master
to f452d76e6cbf4c378d74f3130be88323a26a5494 (commit)
from 881df443fc37b8371e08e4b8711eabf95b70a2e2 (commit)
commit f452d76e6cbf4c378d74f3130be88323a26a5494
Author: Juha j...@xfce.org
Date: Thu Feb 7 11:10:08 2013 +0200
4.9.2.0 Enhancement 8383 option to day view start on first day of week
Added visible parameter to start day view on first day of week. Also
changed small arrows to move 7 days when weekmode is selected. Also
added week movement buttons.
Now also remember day view size and location.
Also fixed rare problem with start and end dates due to timezone
changing date.
configure.in.in |2 +-
src/day-view.c | 187 +-
src/day-view.h | 12 ++-
src/functions.c | 29 +
src/parameters.c | 63 ++-
src/parameters.h |5 ++
6 files changed, 235 insertions(+), 63 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index c77584a..2574b41 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.2-git])
+m4_define([orage_version], [4.9.2.0-git])
m4_define([gtk_minimum_version], [2.14.0])
m4_define([xfce_minimum_version], [4.8.0])
diff --git a/src/day-view.c b/src/day-view.c
index 899c225..ba612a2 100644
--- a/src/day-view.c
+++ b/src/day-view.c
@@ -127,6 +127,12 @@ static void close_window(day_win *dw)
appt_win *apptw;
GList *apptw_list;
+gtk_window_get_size(GTK_WINDOW(dw-Window)
+, g_par.dw_size_x, g_par.dw_size_y);
+gtk_window_get_position(GTK_WINDOW(dw-Window)
+, g_par.dw_pos_x, g_par.dw_pos_y);
+write_parameters();
+
/* need to clean the appointment list and inform all appointments that
* we are not interested anymore (= should not get updated) */
apptw_list = dw-apptw_list;
@@ -223,26 +229,46 @@ static void on_Go_today_activate_cb(GtkMenuItem *mi,
gpointer user_data)
go_to_today((day_win *)user_data);
}
-static void on_Go_previous_activate_cb(GtkMenuItem *mi, gpointer user_data)
+static void on_Go_previous_week_activate_cb(GtkMenuItem *mi, gpointer
user_data)
+{
+changeSelectedDate((day_win *)user_data, -7);
+}
+
+static void on_Go_previous_day_activate_cb(GtkMenuItem *mi, gpointer user_data)
{
changeSelectedDate((day_win *)user_data, -1);
}
-static void on_Previous_clicked(GtkButton *b, gpointer user_data)
+static void on_Previous_day_clicked(GtkButton *b, gpointer user_data)
{
changeSelectedDate((day_win *)user_data, -1);
}
-static void on_Go_next_activate_cb(GtkMenuItem *mi, gpointer user_data)
+static void on_Previous_week_clicked(GtkButton *b, gpointer user_data)
+{
+changeSelectedDate((day_win *)user_data, -7);
+}
+
+static void on_Go_next_day_activate_cb(GtkMenuItem *mi, gpointer user_data)
{
changeSelectedDate((day_win *)user_data, 1);
}
-static void on_Next_clicked(GtkButton *b, gpointer user_data)
+static void on_Go_next_week_activate_cb(GtkMenuItem *mi, gpointer user_data)
+{
+changeSelectedDate((day_win *)user_data, 7);
+}
+
+static void on_Next_day_clicked(GtkButton *b, gpointer user_data)
{
changeSelectedDate((day_win *)user_data, 1);
}
+static void on_Next_week_clicked(GtkButton *b, gpointer user_data)
+{
+changeSelectedDate((day_win *)user_data, 7);
+}
+
static void build_menu(day_win *dw)
{
GtkWidget *menu_separator;
@@ -276,21 +302,51 @@ static void build_menu(day_win *dw)
/** Go menu **/
dw-Go_menu = orage_menu_new(_(_Go), dw-Menubar);
+
dw-Go_menu_today = orage_image_menu_item_new_from_stock(gtk-home
, dw-Go_menu, dw-accel_group);
gtk_widget_add_accelerator(dw-Go_menu_today
, activate, dw-accel_group
, GDK_Home, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
-dw-Go_menu_prev = orage_image_menu_item_new_from_stock(gtk-go-back
+gtk_widget_add_accelerator(dw-Go_menu_today
+, activate, dw-accel_group
+, GDK_KP_Home, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
+
+dw-Go_menu_prev_week = orage_image_menu_item_new_from_stock(gtk-go-up
+, dw-Go_menu, dw-accel_group);
+gtk_widget_add_accelerator(dw-Go_menu_prev_week
+, activate, dw-accel_group
+, GDK_Page_Up, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
+gtk_widget_add_accelerator(dw-Go_menu_prev_week
+, activate, dw-accel_group
+, GDK_KP_Page_Up, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
+
+dw-Go_menu_prev_day = orage_image_menu_item_new_from_stock(gtk-go-back
, dw-Go_menu, dw-accel_group);
-gtk_widget_add_accelerator(dw-Go_menu_prev
+gtk_widget_add_accelerator(dw-Go_menu_prev_day
, activate, dw-accel_group
, GDK_Left, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE);
-dw-Go_menu_next
[Xfce4-commits] orage:master 4.9.3.0 Fixed bug 9014 rename 'Execute' to 'Postpone'
Updating branch refs/heads/master
to 9cd5285a18a68edf68e76992fcb13fa8a8d67dbb (commit)
from f452d76e6cbf4c378d74f3130be88323a26a5494 (commit)
commit 9cd5285a18a68edf68e76992fcb13fa8a8d67dbb
Author: Juha j...@xfce.org
Date: Thu Feb 7 13:03:55 2013 +0200
4.9.3.0 Fixed bug 9014 rename 'Execute' to 'Postpone'
Thanks to Øyvind Ingvaldsen for this fix.
configure.in.in |2 +-
src/functions.c | 12
src/functions.h |2 ++
src/reminder.c |3 ++-
4 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 2574b41..d88c37b 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.2.0-git])
+m4_define([orage_version], [4.9.3.0-git])
m4_define([gtk_minimum_version], [2.14.0])
m4_define([xfce_minimum_version], [4.8.0])
diff --git a/src/functions.c b/src/functions.c
index 823a60b..bc06c37 100644
--- a/src/functions.c
+++ b/src/functions.c
@@ -524,6 +524,18 @@ GtkWidget *orage_create_framebox_with_content(const gchar
*title
return(framebox);
}
+GtkWidget *orage_create_custom_stock_button(const gchar *stock_id
+, const gchar *label_text) {
+GtkWidget *button;
+GtkWidget *image;
+
+image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_BUTTON);
+button = gtk_button_new_with_label(label_text);
+gtk_button_set_image((GtkButton*)button, image);
+
+return(button);
+}
+
/***
* time convert and manipulation functions
***/
diff --git a/src/functions.h b/src/functions.h
index 727dfb8..73d707e 100644
--- a/src/functions.h
+++ b/src/functions.h
@@ -139,6 +139,8 @@ gint orage_error_dialog(GtkWindow *parent
, char *primary_text, char *secondary_text);
GtkWidget *orage_create_framebox_with_content(const gchar *title
, GtkWidget *content);
+GtkWidget *orage_create_custom_stock_button(const gchar *stock_id
+, const gchar *label_text);
/* NOTE: the following is in main.c */
void orage_toggle_visible(void);
diff --git a/src/reminder.c b/src/reminder.c
index 0dbc916..0bc4b03 100644
--- a/src/reminder.c
+++ b/src/reminder.c
@@ -799,7 +799,8 @@ static void create_orage_reminder(alarm_struct *l_alarm)
G_CALLBACK(on_btStopNoiseReminder_clicked), l_alarm);
}
-btRecreateReminder = gtk_button_new_from_stock(gtk-execute);
+btRecreateReminder = orage_create_custom_stock_button(gtk-ok
+, _(Postpone));
gtk_widget_set_tooltip_text(btRecreateReminder
, _(Remind me again after the specified time));
gtk_dialog_add_action_widget(GTK_DIALOG(wReminder)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.9.4.0 Fixed bug 9017 improve 'delete' confirmation message
Updating branch refs/heads/master
to e9af2cb15ff2f02ea282e3df75148e515c6bc040 (commit)
from 9cd5285a18a68edf68e76992fcb13fa8a8d67dbb (commit)
commit e9af2cb15ff2f02ea282e3df75148e515c6bc040
Author: Juha j...@xfce.org
Date: Thu Feb 7 14:14:03 2013 +0200
4.9.4.0 Fixed bug 9017 improve 'delete' confirmation message
Changed warning dialog to use customer buttons. Added more text to
buttons hoping that they are clearer now.
src/appointment.c |8 ++--
src/event-list.c |5 -
src/functions.c |7 +--
src/functions.h |3 ++-
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/appointment.c b/src/appointment.c
index e8dcfce..7860cae 100644
--- a/src/appointment.c
+++ b/src/appointment.c
@@ -738,7 +738,9 @@ static gboolean appWindow_check_and_close(appt_win *apptw)
if (apptw-appointment_changed == TRUE) {
result = orage_warning_dialog(GTK_WINDOW(apptw-Window)
, _(The appointment information has been modified.)
-, _(Do you want to continue?));
+, _(Do you want to continue?)
+, _(No, do not leave)
+, _(Yes, ignore modifications and leave));
if (result == GTK_RESPONSE_YES) {
app_free_memory(apptw);
@@ -1192,7 +1194,9 @@ static void delete_xfical_from_appt_win(appt_win *apptw)
result = orage_warning_dialog(GTK_WINDOW(apptw-Window)
, _(This appointment will be permanently removed.)
-, _(Do you want to continue?));
+, _(Do you want to continue?)
+, _(No, cancel the removal)
+, _(Yes, remove it));
if (result == GTK_RESPONSE_YES) {
if (!apptw-appointment_add) {
diff --git a/src/event-list.c b/src/event-list.c
index 86632c1..fc67019 100644
--- a/src/event-list.c
+++ b/src/event-list.c
@@ -919,7 +919,10 @@ static void delete_appointment(el_win *el)
result = orage_warning_dialog(GTK_WINDOW(el-Window)
, _(You will permanently remove all\nselected appointments.)
-, _(Do you want to continue?));
+, _(Do you want to continue?)
+, _(No, cancel the removal)
+, _(Yes, remove them));
+
if (result == GTK_RESPONSE_YES) {
if (!xfical_file_open(TRUE))
return;
diff --git a/src/functions.c b/src/functions.c
index bc06c37..f0f401e 100644
--- a/src/functions.c
+++ b/src/functions.c
@@ -1119,7 +1119,8 @@ gint orage_info_dialog(GtkWindow *parent
}
gint orage_warning_dialog(GtkWindow *parent
-, char *primary_text, char *secondary_text)
+, char *primary_text, char *secondary_text
+, char *no_text, char *yes_text)
{
GtkWidget *dialog;
gint result;
@@ -1127,11 +1128,13 @@ gint orage_warning_dialog(GtkWindow *parent
dialog = gtk_message_dialog_new(parent
, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT
, GTK_MESSAGE_WARNING
-, GTK_BUTTONS_YES_NO
+, GTK_BUTTONS_NONE
, %s, primary_text);
if (secondary_text)
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog)
, %s, secondary_text);
+gtk_dialog_add_buttons(GTK_DIALOG(dialog)
+, no_text, GTK_RESPONSE_NO, yes_text, GTK_RESPONSE_YES, NULL);
result = gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
return(result);
diff --git a/src/functions.h b/src/functions.h
index 73d707e..edeffe8 100644
--- a/src/functions.h
+++ b/src/functions.h
@@ -134,7 +134,8 @@ void orage_rc_del_item(OrageRc *orc, char *key);
gint orage_info_dialog(GtkWindow *parent
, char *primary_text, char *secondary_text);
gint orage_warning_dialog(GtkWindow *parent
-, char *primary_text, char *secondary_text);
+, char *primary_text, char *secondary_text
+, char *no_text, char *yes_text);
gint orage_error_dialog(GtkWindow *parent
, char *primary_text, char *secondary_text);
GtkWidget *orage_create_framebox_with_content(const gchar *title
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master 4.9.4.1 Internal changes to parameter window and c and h files
Updating branch refs/heads/master
to 1dc76238cff26cd2d21804f906a9867e867dfa8d (commit)
from e9af2cb15ff2f02ea282e3df75148e515c6bc040 (commit)
commit 1dc76238cff26cd2d21804f906a9867e867dfa8d
Author: Juha j...@xfce.org
Date: Sun Feb 10 13:02:43 2013 +0200
4.9.4.1 Internal changes to parameter window and c and h files
Restructured parameter window. Put all main calendar settings to same
page and all the rest to the extra page. And also move sepections to
same line instead of top and below. Also added new internal parameter
h file.
configure.in.in |2 +-
src/parameters.c | 468 -
src/parameters.h |3 +-
src/parameters_internal.h | 121
4 files changed, 329 insertions(+), 265 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index d88c37b..d314ba0 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.3.0-git])
+m4_define([orage_version], [4.9.4.1-git])
m4_define([gtk_minimum_version], [2.14.0])
m4_define([xfce_minimum_version], [4.8.0])
diff --git a/src/parameters.c b/src/parameters.c
index c5845ff..1950543 100644
--- a/src/parameters.c
+++ b/src/parameters.c
@@ -47,104 +47,16 @@
#include ical-code.h
#include timezone_selection.h
#include parameters.h
+#include parameters_internal.h
#include mainbox.h
+
extern int g_log_level; /* in function.c */
gboolean check_wakeup(gpointer user_data); /* in main.c*/
static gboolean is_running = FALSE;
-typedef struct _Itf
-{
-GtkTooltips *Tooltips;
-
-GtkWidget *orage_dialog;
-GtkWidget *dialog_vbox1;
-GtkWidget *notebook;
-
-/* Tabs */
-/* Main Tab */
-GtkWidget *setup_tab;
-GtkWidget *setup_tab_label;
-GtkWidget *setup_vbox;
-/* Choose the timezone for appointments */
-GtkWidget *timezone_frame;
-GtkWidget *timezone_button;
-/* Archive period */
-#ifdef HAVE_ARCHIVE
-GtkWidget *archive_threshold_frame;
-GtkWidget *archive_threshold_spin;
-#endif
-/* Choose the sound application for reminders */
-GtkWidget *sound_application_frame;
-GtkWidget *sound_application_entry;
-GtkWidget *sound_application_open_button;
-
-/* Display Tab */
-GtkWidget *display_tab;
-GtkWidget *display_tab_label;
-GtkWidget *display_vbox;
-/* Show border, menu and set stick, ontop */
-GtkWidget *mode_frame;
-GtkWidget *show_borders_checkbutton;
-GtkWidget *show_menu_checkbutton;
-GtkWidget *show_heading_checkbutton;
-GtkWidget *show_day_names_checkbutton;
-GtkWidget *show_weeks_checkbutton;
-GtkWidget *set_stick_checkbutton;
-GtkWidget *set_ontop_checkbutton;
-/* Show in... taskbar pager systray */
-GtkWidget *show_taskbar_checkbutton;
-GtkWidget *show_pager_checkbutton;
-GtkWidget *show_systray_checkbutton;
-GtkWidget *show_todos_checkbutton;
-GtkWidget *show_events_spin;
-/* Start visibity show or hide */
-GtkWidget *visibility_frame;
-GSList*visibility_radiobutton_group;
-GtkWidget *visibility_show_radiobutton;
-GtkWidget *visibility_hide_radiobutton;
-GtkWidget *visibility_minimized_radiobutton;
-
-/* Extra Tab */
-GtkWidget *extra_tab;
-GtkWidget *extra_tab_label;
-GtkWidget *extra_vbox;
-/* select_always_today */
-GtkWidget *select_day_frame;
-GSList*select_day_radiobutton_group;
-GtkWidget *select_day_today_radiobutton;
-GtkWidget *select_day_old_radiobutton;
-/* Dynamic icon */
-GtkWidget *use_dynamic_icon_frame;
-GtkWidget *use_dynamic_icon_checkbutton;
-/* show event/days window from main calendar */
-GtkWidget *click_to_show_frame;
-GSList*click_to_show_radiobutton_group;
-GtkWidget *click_to_show_days_radiobutton;
-GtkWidget *click_to_show_events_radiobutton;
-/* eventlist window number of extra days to show */
-GtkWidget *el_extra_days_frame;
-GtkWidget *el_extra_days_spin;
-/* Use wakeup timer for suspend */
-GtkWidget *use_wakeup_timer_frame;
-GtkWidget *use_wakeup_timer_checkbutton;
-/* default foreign file display alarm */
-GtkWidget *foreign_alarm_frame;
-GSList*foreign_alarm_radiobutton_group;
-GtkWidget *foreign_alarm_orage_radiobutton;
-GtkWidget *foreign_alarm_notification_radiobutton;
-/* day view week mode */
-GtkWidget *dw_week_mode_frame;
-GSList*dw_week_mode_radiobutton_group;
-GtkWidget *dw_week_mode_week_radiobutton;
-GtkWidget *dw_week_mode_day_radiobutton;
-
-/* the rest in all tabs */
-GtkWidget *close_button;
-GtkWidget *help_button;
-} Itf;
/* Return the first day of the week, where 0=monday, 6=sunday.
* Borrowed from GTK+:s Calendar Widget, but modified
@@ -543,7 +455,6 @@ static void
[Xfce4-commits] orage:master 4.9.5.0 Enhancement 9011 improve tooltip behaviour
Updating branch refs/heads/master
to bd4d460ed7ecf50362696ac9b723ad880a1d52cd (commit)
from 88ed9186ea9a35a241ebf068ac953df5e5f8219b (commit)
commit bd4d460ed7ecf50362696ac9b723ad880a1d52cd
Author: Juha j...@xfce.org
Date: Tue Feb 12 14:58:52 2013 +0200
4.9.5.0 Enhancement 9011 improve tooltip behaviour
Limited note text tooltip size to fixed 50 x 10 chars (= 10 lines max
and each line max length is 50).
Also changed orage_message timestamp location. And added formatted
tooltip to day view.
configure.in.in |2 +-
src/day-view.c | 30 +++--
src/functions.c | 94 +-
src/functions.h |5 ++-
src/mainbox.c |3 +-
src/reminder.c |7 +++-
6 files changed, 116 insertions(+), 25 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index d314ba0..95683c4 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.4.1-git])
+m4_define([orage_version], [4.9.5.0-git])
m4_define([gtk_minimum_version], [2.14.0])
m4_define([xfce_minimum_version], [4.8.0])
diff --git a/src/day-view.c b/src/day-view.c
index 46ae886..5cd2f03 100644
--- a/src/day-view.c
+++ b/src/day-view.c
@@ -511,10 +511,12 @@ static void add_row(day_win *dw, xfical_appt *appt)
gint row, start_row, end_row, days;
gint col, start_col, end_col, first_col, last_col;
gint height, start_height, end_height;
-gchar *tip, *start_date, *end_date, *tmp_title, *tmp_note;
+gchar *tip, *start_date, *end_date, *tmp_title, *tip_title;
+gchar *tmp_note, *tip_note;
GtkWidget *ev, *lab, *hb;
struct tm tm_start, tm_end, tm_first;
GdkColor *color;
+gchar *format_bold = b %s /b;
/* First clarify timings */
tm_start = orage_icaltime_to_tm_time(appt-starttimecur, FALSE);
@@ -545,7 +547,12 @@ static void add_row(day_win *dw, xfical_appt *appt)
/* then add the appointment */
tmp_title = orage_process_text_commands(
appt-title ? appt-title : _(Unknown));
-tmp_note = orage_process_text_commands(appt-note);
+tip_title = g_markup_printf_escaped(format_bold, tmp_title);
+tmp_note = orage_process_text_commands(
+appt-note ? appt-note : );
+tmp_note = orage_limit_text(tmp_note, 50, 10);
+tip_note = g_markup_escape_text(tmp_note, strlen(tmp_note));
+g_free(tmp_note);
ev = gtk_event_box_new();
lab = gtk_label_new(tmp_title);
gtk_container_add(GTK_CONTAINER(ev), lab);
@@ -568,13 +575,13 @@ static void add_row(day_win *dw, xfical_appt *appt)
start_date = g_strdup(orage_tm_date_to_i18_date(tm_start));
if (days == 0)
tip = g_strdup_printf(%s\n%s\n%s
-, tmp_title, start_date, tmp_note);
+, tip_title, start_date, tip_note);
else {
tm_end.tm_year -= 1900;
tm_end.tm_mon -= 1;
end_date = g_strdup(orage_tm_date_to_i18_date(tm_end));
tip = g_strdup_printf(%s\n%s - %s\n%s
-, tmp_title, start_date, end_date, tmp_note);
+, tip_title, start_date, end_date, tip_note);
g_free(end_date);
}
g_free(start_date);
@@ -596,8 +603,8 @@ static void add_row(day_win *dw, xfical_appt *appt)
}
if (days == 0)
tip = g_strdup_printf(%s\n%02d:%02d-%02d:%02d\n%s
-, tmp_title, tm_start.tm_hour, tm_start.tm_min
-, tm_end.tm_hour, tm_end.tm_min, tmp_note);
+, tip_title, tm_start.tm_hour, tm_start.tm_min
+, tm_end.tm_hour, tm_end.tm_min, tip_note);
else {
/* we took the date in unnormalized format, so we need to do that now */
tm_start.tm_year -= 1900;
@@ -607,14 +614,14 @@ static void add_row(day_win *dw, xfical_appt *appt)
start_date = g_strdup(orage_tm_date_to_i18_date(tm_start));
end_date = g_strdup(orage_tm_date_to_i18_date(tm_end));
tip = g_strdup_printf(%s\n%s %02d:%02d - %s %02d:%02d\n%s
-, tmp_title
+, tip_title
, start_date, tm_start.tm_hour, tm_start.tm_min
-, end_date, tm_end.tm_hour, tm_end.tm_min, tmp_note);
+, end_date, tm_end.tm_hour, tm_end.tm_min, tip_note);
g_free(start_date);
g_free(end_date);
}
}
-gtk_widget_set_tooltip_text(ev, tip);
+gtk_widget_set_tooltip_markup(ev, tip);
/*
gtk_box_pack_start(GTK_BOX(hb2), ev, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hb), hb2, TRUE, TRUE, 0);
@@ -623,9 +630,10 @@ static void add_row(day_win *dw, xfical_appt *appt)
g_object_set_data_full(G_OBJECT(ev), UID, g_strdup(appt-uid), g_free);
g_signal_connect((gpointer)ev, button-press
[Xfce4-commits] orage:master 4.9.6.0 Fixed bug 9024 Removing Elements Does Not Reduce Window Size
Updating branch refs/heads/master
to 7edbd569e0fcbdb69ed3ea12ef57971b25a60237 (commit)
from bd4d460ed7ecf50362696ac9b723ad880a1d52cd (commit)
commit 7edbd569e0fcbdb69ed3ea12ef57971b25a60237
Author: Juha j...@xfce.org
Date: Wed Feb 13 14:54:02 2013 +0200
4.9.6.0 Fixed bug 9024 Removing Elements Does Not Reduce Window Size
Fixed parameters so that that removing both event and todo box also
causes the space they take to vanish.
Also fixed a bug where adding todo box after start did not actually
add it.
Also added code to save main calendar window size and location always
when ending Orage (unless killed).
Also changed parameter order a little to be more consistent.
configure.in.in |2 +-
src/main.c |3 +-
src/mainbox.c| 13
src/mainbox.h|1 +
src/parameters.c | 87 -
src/tray_icon.c |6 ++--
6 files changed, 66 insertions(+), 46 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 95683c4..459d305 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.5.0-git])
+m4_define([orage_version], [4.9.6.0-git])
m4_define([gtk_minimum_version], [2.14.0])
m4_define([xfce_minimum_version], [4.8.0])
diff --git a/src/main.c b/src/main.c
index d2e87ad..1c17d5a 100644
--- a/src/main.c
+++ b/src/main.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
@@ -234,6 +234,7 @@ static gboolean keep_tidy(void)
calendar file smaller and faster */
xfical_archive();
#endif
+write_parameters();
return(TRUE);
}
diff --git a/src/mainbox.c b/src/mainbox.c
index ca82d5b..c63ec68 100644
--- a/src/mainbox.c
+++ b/src/mainbox.c
@@ -792,6 +792,19 @@ void build_mainbox_event_box(void)
xfical_file_close(TRUE);
}
+void build_mainbox_todo_box(void)
+{
+#undef P_N
+#define P_N build_mainbox_todo_box:
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
+if (!xfical_file_open(TRUE))
+return;
+build_mainbox_todo_info();
+xfical_file_close(TRUE);
+}
+
/**
* This routine is called from ical-code xfical_alarm_build_list_internal
* and ical files are already open at that time. So make sure ical files
diff --git a/src/mainbox.h b/src/mainbox.h
index 56fbbbe..e69fbed 100644
--- a/src/mainbox.h
+++ b/src/mainbox.h
@@ -66,6 +66,7 @@ void build_mainWin();
gboolean orage_mark_appointments();
void build_mainbox_info();
void build_mainbox_event_box();
+void build_mainbox_todo_box();
void mCalendar_month_changed_cb(GtkCalendar *calendar, gpointer user_data);
#endif /* !__MAINBOX_H__ */
diff --git a/src/parameters.c b/src/parameters.c
index a4e5cc6..6c30ffd 100644
--- a/src/parameters.c
+++ b/src/parameters.c
@@ -193,21 +193,21 @@ static void weeks_changed(GtkWidget *dialog, gpointer
user_data)
set_calendar();
}
-static void set_todos(void)
-{
-if (g_par.show_todos)
-gtk_widget_show_all(((CalWin *)g_par.xfcal)-mTodo_vbox);
-else
-gtk_widget_hide_all(((CalWin *)g_par.xfcal)-mTodo_vbox);
-}
-
static void todos_changed(GtkWidget *dialog, gpointer user_data)
{
Itf *itf = (Itf *)user_data;
g_par.show_todos = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
itf-show_todos_checkbutton));
-set_todos();
+if (g_par.show_todos)
+build_mainbox_todo_box();
+else {
+gtk_widget_hide_all(((CalWin *)g_par.xfcal)-mTodo_vbox);
+/* hide the whole area if also event box does not exist */
+if (!g_par.show_event_days)
+gtk_window_resize(GTK_WINDOW(((CalWin *)g_par.xfcal)-mWindow)
+, g_par.size_x, 1);
+}
}
static void show_events_spin_changed(GtkSpinButton *sb, gpointer user_data)
@@ -215,8 +215,13 @@ static void show_events_spin_changed(GtkSpinButton *sb,
gpointer user_data)
g_par.show_event_days = gtk_spin_button_get_value(sb);
if (g_par.show_event_days)
build_mainbox_event_box();
-else
+else {
gtk_widget_hide_all(((CalWin *)g_par.xfcal)-mEvent_vbox);
+/* hide the whole area if also todo box does not exist */
+if (!g_par.show_todos)
+gtk_window_resize(GTK_WINDOW(((CalWin *)g_par.xfcal)-mWindow)
+, g_par.size_x, 1);
+}
}
static void set_stick(void)
@@ -616,6 +621,37 @@ static void create_parameter_dialog_calendar_setup_tab(Itf
*dialog)
g_signal_connect(G_OBJECT(dialog-show_weeks_checkbutton), toggled
, G_CALLBACK(weeks_changed
[Xfce4-commits] r22744 - xfcalendar/trunk/src
Author: juha
Date: 2006-08-13 14:27:01 + (Sun, 13 Aug 2006)
New Revision: 22744
Modified:
xfcalendar/trunk/src/main.c
xfcalendar/trunk/src/mainbox.c
xfcalendar/trunk/src/xfce_trayicon.c
Log:
fix for bug 2157:
own (default) timezone was read only after marking calendar with appointments,
so
it was possible to mark wrong days.
Modified: xfcalendar/trunk/src/main.c
===
--- xfcalendar/trunk/src/main.c 2006-08-13 10:39:46 UTC (rev 22743)
+++ xfcalendar/trunk/src/main.c 2006-08-13 14:27:01 UTC (rev 22744)
@@ -283,6 +283,8 @@
xfical_set_local_timezone(setting-data.v_string);
else
xfical_set_local_timezone(NULL);
+xfcalendar_mark_appointments();
+
}
}
break;
@@ -480,7 +482,7 @@
ensure_basedir_spec();
/* Test */
-set_default_ical_path();
+ set_default_ical_path();
/*
* Create the orage.
Modified: xfcalendar/trunk/src/mainbox.c
===
--- xfcalendar/trunk/src/mainbox.c 2006-08-13 10:39:46 UTC (rev 22743)
+++ xfcalendar/trunk/src/mainbox.c 2006-08-13 14:27:01 UTC (rev 22744)
@@ -509,6 +509,4 @@
if (pos_x || pos_y)
gtk_window_move(GTK_WINDOW(xfcal-mWindow), pos_x, pos_y);
gtk_window_stick(GTK_WINDOW(xfcal-mWindow));
-
-xfcalendar_mark_appointments();
}
Modified: xfcalendar/trunk/src/xfce_trayicon.c
===
--- xfcalendar/trunk/src/xfce_trayicon.c2006-08-13 10:39:46 UTC (rev
22743)
+++ xfcalendar/trunk/src/xfce_trayicon.c2006-08-13 14:27:01 UTC (rev
22744)
@@ -39,7 +39,7 @@
enum
{
CLICKED,/* user single-clicked the icon */
- DBL_CLICKED,/* user double-clicked the icon */
+ DBL_CLICKED,/* user double-clicked the icon */
LAST_SIGNAL
};
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22745 - in xfcalendar/trunk: libical/src/libical libical/src/libicalss src
Author: juha
Date: 2006-08-13 15:32:21 + (Sun, 13 Aug 2006)
New Revision: 22745
Modified:
xfcalendar/trunk/libical/src/libical/icalcomponent.c
xfcalendar/trunk/libical/src/libicalss/icalmessage.c
xfcalendar/trunk/src/ical-code.c
Log:
fix for bug 1900:
More 64 bit 0/NULL usage issues.
Modified: xfcalendar/trunk/libical/src/libical/icalcomponent.c
===
--- xfcalendar/trunk/libical/src/libical/icalcomponent.c2006-08-13
14:27:01 UTC (rev 22744)
+++ xfcalendar/trunk/libical/src/libical/icalcomponent.c2006-08-13
15:32:21 UTC (rev 22745)
@@ -96,7 +96,7 @@
{
void* vp;
-while((vp = va_arg(args, void*)) != 0) {
+while((vp = va_arg(args, void*)) != NULL) {
assert (icalcomponent_isa_component(vp) != 0 ||
icalproperty_isa_property(vp) != 0 ) ;
@@ -155,8 +155,8 @@
icalcomponent *impl = icalcomponent_new_impl(kind);
-if (impl == 0){
- return 0;
+if (impl == NULL){
+ return NULL;
}
va_start(args,kind);
@@ -377,7 +377,7 @@
int
-icalcomponent_isa_component (void* component)
+icalcomponent_isa_component (icalcomponent* component)
{
icalcomponent *impl = component;
Modified: xfcalendar/trunk/libical/src/libicalss/icalmessage.c
===
--- xfcalendar/trunk/libical/src/libicalss/icalmessage.c2006-08-13
14:27:01 UTC (rev 22744)
+++ xfcalendar/trunk/libical/src/libicalss/icalmessage.c2006-08-13
15:32:21 UTC (rev 22745)
@@ -123,8 +123,8 @@
icalcomponent_vanew(
ICAL_VEVENT_COMPONENT,
icalproperty_new_dtstamp(icaltime_from_timet(time(0),0)),
- 0),
- 0);
+ NULL),
+ NULL);
icalcomponent *inner = icalmessage_get_inner(reply);
Modified: xfcalendar/trunk/src/ical-code.c
===
--- xfcalendar/trunk/src/ical-code.c2006-08-13 14:27:01 UTC (rev 22744)
+++ xfcalendar/trunk/src/ical-code.c2006-08-13 15:32:21 UTC (rev 22745)
@@ -629,7 +629,7 @@
*p_ical = icalcomponent_vanew(ICAL_VCALENDAR_COMPONENT
, icalproperty_new_version(2.0)
, icalproperty_new_prodid(-//Xfce//Orage//EN)
- , 0);
+ , NULL);
xfical_add_timezone(*p_ical, *p_fical,
local_icaltimezone_location);
icalset_add_component(*p_fical, *p_ical);
/*
@@ -1182,7 +1182,7 @@
ialarm = icalcomponent_vanew(ICAL_VALARM_COMPONENT
, icalproperty_new_action(ICAL_ACTION_DISPLAY)
, icalproperty_new_trigger(trg)
-, 0);
+, NULL);
if XFICAL_STR_EXISTS(appt-note)
icalcomponent_add_property(ialarm
, icalproperty_new_description(appt-note));
@@ -1198,7 +1198,7 @@
ialarm = icalcomponent_vanew(ICAL_VALARM_COMPONENT
, icalproperty_new_action(ICAL_ACTION_AUDIO)
, icalproperty_new_trigger(trg)
-, 0);
+, NULL);
attach = icalattach_new_from_url(appt-sound);
icalcomponent_add_property(ialarm
, icalproperty_new_attach(attach));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22746 - xfcalendar/trunk/libical/src/libical
Author: juha
Date: 2006-08-13 15:58:00 + (Sun, 13 Aug 2006)
New Revision: 22746
Modified:
xfcalendar/trunk/libical/src/libical/icalcomponent.c
Log:
fixing compatibility error in paramaters
Modified: xfcalendar/trunk/libical/src/libical/icalcomponent.c
===
--- xfcalendar/trunk/libical/src/libical/icalcomponent.c2006-08-13
15:32:21 UTC (rev 22745)
+++ xfcalendar/trunk/libical/src/libical/icalcomponent.c2006-08-13
15:58:00 UTC (rev 22746)
@@ -377,7 +377,7 @@
int
-icalcomponent_isa_component (icalcomponent* component)
+icalcomponent_isa_component (void* component)
{
icalcomponent *impl = component;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22774 - xfcalendar/trunk/plugin
Author: juha
Date: 2006-08-15 13:25:00 + (Tue, 15 Aug 2006)
New Revision: 22774
Modified:
xfcalendar/trunk/plugin/xfcalendar_plugin.c
Log:
Finally managed to fix timezone parameter handling bug, which caused timezone
to get corrupted if set more than once without restarting mcs.
Modified: xfcalendar/trunk/plugin/xfcalendar_plugin.c
===
--- xfcalendar/trunk/plugin/xfcalendar_plugin.c 2006-08-15 08:50:50 UTC (rev
22773)
+++ xfcalendar/trunk/plugin/xfcalendar_plugin.c 2006-08-15 13:25:00 UTC (rev
22774)
@@ -364,7 +364,7 @@
GtkWidget *sw;
int j, result, latitude, longitude;
char area_old[MAX_AREA_LENGTH], tz[MAX_BUFF_LENGTH], buf[MAX_BUFF_LENGTH]
-, *loc, *loc_eng, *loc_int;
+, *loc, *loc_eng;
GtkTreeSelection *sel;
GtkTreeModel *model;
GtkTreeIter iter;
@@ -450,11 +450,13 @@
result = 0;
else {
gtk_tree_model_get(model, iter, LOCATION, loc, -1);
-gtk_tree_model_get(model, iter, LOCATION_ENG,
loc_eng, -1);
+gtk_tree_model_get(model, iter, LOCATION_ENG, loc_eng
+, -1);
}
else {
loc = g_strdup(gtk_button_get_label(GTK_BUTTON(button)));
-loc_eng = g_object_get_data(G_OBJECT(button),
LOCATION_ENG);
+loc_eng = g_object_get_data(G_OBJECT(button)
+, LOCATION_ENG);
}
break;
case 1:
@@ -473,12 +475,13 @@
} while (result == 0) ;
gtk_button_set_label(GTK_BUTTON(button), loc);
-if ((loc_int = g_object_get_data(G_OBJECT(button), LOCATION_ENG)))
-g_free(loc_int);
-loc_int = g_strdup(loc_eng);
-g_object_set_data(G_OBJECT(button), LOCATION_ENG, loc_int);
+if ((local_timezone = g_object_get_data(G_OBJECT(button), LOCATION_ENG)))
+g_free(local_timezone);
+local_timezone = g_strdup(loc_eng);
+g_object_set_data(G_OBJECT(button), LOCATION_ENG, loc_eng);
-mcs_manager_set_string(mcs_plugin-manager, orage/Timezone, CHANNEL,
loc_eng);
+mcs_manager_set_string(mcs_plugin-manager, orage/Timezone, CHANNEL
+, loc_eng);
post_to_mcs(mcs_plugin);
g_free(loc);
@@ -729,23 +732,27 @@
GTK_CONTAINER(dialog-timezone_table), 10);
gtk_table_set_row_spacings(GTK_TABLE(dialog-timezone_table), 6);
gtk_table_set_col_spacings(GTK_TABLE(dialog-timezone_table), 6);
-dialog-timezone_frame =
-xfce_create_framebox_with_content(_(Timezone)
-, dialog-timezone_table);
+dialog-timezone_frame = xfce_create_framebox_with_content(_(Timezone)
+, dialog-timezone_table);
gtk_box_pack_start(GTK_BOX(dialog-timezone_vbox)
, dialog-timezone_frame, TRUE, TRUE, 5);
dialog-timezone_button = gtk_button_new();
if (local_timezone) {
-gtk_button_set_label(GTK_BUTTON(dialog-timezone_button),
_(local_timezone));
-g_object_set_data(G_OBJECT(dialog-timezone_button), LOCATION_ENG,
local_timezone);
+gtk_button_set_label(GTK_BUTTON(dialog-timezone_button)
+, _(local_timezone));
+g_object_set_data(G_OBJECT(dialog-timezone_button), LOCATION_ENG
+, local_timezone);
}
else {
-gtk_button_set_label(GTK_BUTTON(dialog-timezone_button),
_(floating));
-g_object_set_data(G_OBJECT(dialog-timezone_button), LOCATION_ENG,
floating);
+gtk_button_set_label(GTK_BUTTON(dialog-timezone_button)
+, _(floating));
+g_object_set_data(G_OBJECT(dialog-timezone_button), LOCATION_ENG
+, floating);
}
-gtk_table_attach (GTK_TABLE (dialog-timezone_table),
dialog-timezone_button, 0, 1, 0, 1,
+gtk_table_attach (GTK_TABLE (dialog-timezone_table)
+, dialog-timezone_button, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22781 - xfcalendar/trunk/panel-plugin
Author: juha
Date: 2006-08-15 19:47:40 + (Tue, 15 Aug 2006)
New Revision: 22781
Modified:
xfcalendar/trunk/panel-plugin/oc_config.c
xfcalendar/trunk/panel-plugin/orageclock.c
Log:
aligned parameters using table instead of vbox/hbox.
Modified: xfcalendar/trunk/panel-plugin/oc_config.c
===
--- xfcalendar/trunk/panel-plugin/oc_config.c 2006-08-15 19:21:07 UTC (rev
22780)
+++ xfcalendar/trunk/panel-plugin/oc_config.c 2006-08-15 19:47:40 UTC (rev
22781)
@@ -177,21 +177,32 @@
oc_line_font_set(clock, 2);
}
+static void oc_table_add(GtkWidget *table, GtkWidget *widget, int col, int row)
+{
+gtk_table_attach(GTK_TABLE(table), widget, col, col+1, row, row+1
+, GTK_FILL, GTK_FILL, 0, 0);
+}
+
static void oc_properties_appearance(GtkWidget *dlg, Clock *clock)
{
-GtkWidget *frame, *bin, *vbox, *cb, *hbox, *color, *sb;
+GtkWidget *frame, *bin, *cb, *color, *sb;
GdkColor def_fg, def_bg;
GtkStyle *def_style;
+GtkWidget *table;
frame = xfce_create_framebox(_(Appearance), bin);
gtk_container_set_border_width(GTK_CONTAINER(frame), 6);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)-vbox), frame, FALSE, FALSE, 0);
-vbox = gtk_vbox_new(FALSE, 8);
-gtk_container_add(GTK_CONTAINER(bin), vbox);
+table = gtk_table_new(5, 2, FALSE);
+gtk_container_set_border_width(GTK_CONTAINER(table), 10);
+gtk_table_set_row_spacings(GTK_TABLE(table), 6);
+gtk_table_set_col_spacings(GTK_TABLE(table), 6);
+gtk_container_add(GTK_CONTAINER(bin), table);
+/* show frame */
cb = gtk_check_button_new_with_mnemonic(_(Show _frame));
-gtk_box_pack_start(GTK_BOX(vbox), cb, FALSE, FALSE, 0);
+oc_table_add(table, cb, 0, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb), clock-show_frame);
g_signal_connect(cb, toggled, G_CALLBACK(oc_show_frame_toggled), clock);
@@ -200,11 +211,8 @@
def_bg = def_style-bg[GTK_STATE_NORMAL];
/* foreground color */
-hbox = gtk_hbox_new(FALSE, 0);
-gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
cb = gtk_check_button_new_with_mnemonic(_(set foreground _color:));
-gtk_box_pack_start(GTK_BOX(hbox), cb, FALSE, FALSE, 0);
+oc_table_add(table, cb, 0, 1);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb), clock-fg_set);
g_signal_connect(cb, toggled, G_CALLBACK(oc_set_fg_toggled), clock);
@@ -212,16 +220,13 @@
clock-fg = def_fg;
}
color = gtk_color_button_new_with_color(clock-fg);
-gtk_box_pack_start(GTK_BOX(hbox), color, FALSE, FALSE, 0);
+oc_table_add(table, color, 1, 1);
g_signal_connect(G_OBJECT(color), color-set
, G_CALLBACK(oc_fg_color_changed), clock);
/* background color */
-hbox = gtk_hbox_new(FALSE, 0);
-gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
cb = gtk_check_button_new_with_mnemonic(_(set _background color:));
-gtk_box_pack_start(GTK_BOX(hbox), cb, FALSE, FALSE, 0);
+oc_table_add(table, cb, 0, 2);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb), clock-bg_set);
g_signal_connect(cb, toggled, G_CALLBACK(oc_set_bg_toggled), clock);
@@ -229,36 +234,30 @@
clock-bg = def_bg;
}
color = gtk_color_button_new_with_color(clock-bg);
-gtk_box_pack_start(GTK_BOX(hbox), color, FALSE, FALSE, 0);
+oc_table_add(table, color, 1, 2);
g_signal_connect(G_OBJECT(color), color-set
, G_CALLBACK(oc_bg_color_changed), clock);
/* clock size (=vbox size): height and width */
-hbox = gtk_hbox_new(FALSE, 0);
-gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
cb = gtk_check_button_new_with_mnemonic(_(set _height:));
-gtk_box_pack_start(GTK_BOX(hbox), cb, FALSE, FALSE, 0);
+oc_table_add(table, cb, 0, 3);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb), clock-height_set);
g_signal_connect(cb, toggled, G_CALLBACK(oc_set_height_toggled), clock);
sb = gtk_spin_button_new_with_range(10, 200, 1);
-gtk_box_pack_start(GTK_BOX(hbox), sb, FALSE, FALSE, 0);
+oc_table_add(table, sb, 1, 3);
if (!clock-height_set)
clock-height = 32;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(sb), (gdouble)clock-height);
g_signal_connect((gpointer) sb, value-changed,
G_CALLBACK(oc_set_height_changed), clock);
-
-hbox = gtk_hbox_new(FALSE, 0);
-gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
cb = gtk_check_button_new_with_mnemonic(_(set _width:));
-gtk_box_pack_start(GTK_BOX(hbox), cb, FALSE, FALSE, 0);
+oc_table_add(table, cb, 0, 4);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb), clock-width_set);
g_signal_connect(cb, toggled, G_CALLBACK(oc_set_width_toggled), clock);
sb = gtk_spin_button_new_with_range(10, 400, 1);
-gtk_box_pack_start(GTK_BOX(hbox), sb, FALSE, FALSE, 0);
+oc_table_add(table, sb, 1, 4
[Xfce4-commits] r22801 - xfcalendar/trunk/po
Author: juha Date: 2006-08-16 17:12:18 + (Wed, 16 Aug 2006) New Revision: 22801 Modified: xfcalendar/trunk/po/fi.po Log: uppercase Modified: xfcalendar/trunk/po/fi.po === --- xfcalendar/trunk/po/fi.po 2006-08-16 16:56:43 UTC (rev 22800) +++ xfcalendar/trunk/po/fi.po 2006-08-16 17:12:18 UTC (rev 22801) @@ -42,11 +42,11 @@ #. clock size (=vbox size): height and width #: ../panel-plugin/oc_config.c:242 msgid set _height: -msgstr _korkeus +msgstr K_orkeus #: ../panel-plugin/oc_config.c:254 msgid set _width: -msgstr _leveys +msgstr _Leveys #: ../panel-plugin/oc_config.c:275 msgid Clock Options ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22883 - xfcalendar/trunk/panel-plugin
Author: juha
Date: 2006-08-26 12:17:08 + (Sat, 26 Aug 2006)
New Revision: 22883
Modified:
xfcalendar/trunk/panel-plugin/orageclock.c
xfcalendar/trunk/panel-plugin/orageclock.h
Log:
fixed bug 2208:
strftime to utf8 conversion needed also in lines.
Modified: xfcalendar/trunk/panel-plugin/orageclock.c
===
--- xfcalendar/trunk/panel-plugin/orageclock.c 2006-08-25 23:33:35 UTC (rev
22882)
+++ xfcalendar/trunk/panel-plugin/orageclock.c 2006-08-26 12:17:08 UTC (rev
22883)
@@ -81,23 +81,32 @@
static gboolean oc_get_time(Clock *clock)
{
time_t t;
-chartmp[OC_MAX_LINE_LENGTH];
+chartime_s[OC_MAX_LINE_LENGTH-1];
+char*utf8time_s = NULL;
int i;
static gint mday = -1;
+ClockLine *line;
time(t);
localtime_r(t, clock-now);
for (i = 0; i OC_MAX_LINES; i++) {
-if (clock-line[i].show) {
-strftime(tmp, OC_MAX_LINE_LENGTH-1, clock-line[i].data-str
-, clock-now);
+line = clock-line[i];
+if (line-show) {
+strftime(time_s, sizeof(time_s), line-data-str, clock-now);
+if (!g_utf8_validate(time_s, -1, NULL)) {
+utf8time_s = g_locale_to_utf8(time_s, -1, NULL, NULL, NULL);
+if (utf8time_s) {
+g_strlcpy(time_s, utf8time_s, sizeof(time_s));
+g_free(utf8time_s);
+}
+}
/* gtk_label_set_text call takes almost
* 100 % of the time wasted in this procedure
* */
-if (strcmp(tmp, clock-line[i].prev)) {
-gtk_label_set_text(GTK_LABEL(clock-line[i].label), tmp);
-strcpy(clock-line[i].prev, tmp);
+if (strcmp(time_s, line-prev)) {
+gtk_label_set_text(GTK_LABEL(line-label), time_s);
+strcpy(line-prev, time_s);
}
}
}
Modified: xfcalendar/trunk/panel-plugin/orageclock.h
===
--- xfcalendar/trunk/panel-plugin/orageclock.h 2006-08-25 23:33:35 UTC (rev
22882)
+++ xfcalendar/trunk/panel-plugin/orageclock.h 2006-08-26 12:17:08 UTC (rev
22883)
@@ -28,8 +28,8 @@
gboolean show;
GString *data; /* the time formatting data */
GString *font;
-gchar prev[OC_MAX_LINE_LENGTH];
-} Line;
+gchar prev[OC_MAX_LINE_LENGTH+1];
+} ClockLine;
typedef struct
{
@@ -50,7 +50,7 @@
GString *timezone;
gchar *TZ_orig;
GtkWidget *tz_entry;
-Line line[OC_MAX_LINES];
+ClockLine line[OC_MAX_LINES];
GtkTooltips *tips;
int timeout_id;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22906 - xfcalendar/trunk/src
Author: juha
Date: 2006-08-27 19:04:35 + (Sun, 27 Aug 2006)
New Revision: 22906
Modified:
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/appointment.h
xfcalendar/trunk/src/event-list.c
xfcalendar/trunk/src/ical-code.c
xfcalendar/trunk/src/ical-code.h
Log:
Added complex recurring. Now it is possible to recur based on weekday and
interval.
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2006-08-27 14:15:30 UTC (rev 22905)
+++ xfcalendar/trunk/src/appointment.c 2006-08-27 19:04:35 UTC (rev 22906)
@@ -211,7 +211,7 @@
void
set_repeat_sensitivity(appt_win *apptw)
{
-gint freq;
+gint freq, i;
freq = gtk_combo_box_get_active((GtkComboBox *)apptw-appRecur_freq_cb);
if (freq == XFICAL_FREQ_NONE) {
@@ -221,6 +221,13 @@
gtk_widget_set_sensitive(apptw-appRecur_count_label, FALSE);
gtk_widget_set_sensitive(apptw-appRecur_until_rb, FALSE);
gtk_widget_set_sensitive(apptw-appRecur_until_button, FALSE);
+for (i=0; i = 6; i++) {
+gtk_widget_set_sensitive(apptw-appRecur_byday_cb[i], FALSE);
+gtk_widget_set_sensitive(apptw-appRecur_byday_spin[i], FALSE);
+}
+gtk_widget_set_sensitive(apptw-appRecur_int_spin, FALSE);
+gtk_widget_set_sensitive(apptw-appRecur_int_spin_label1, FALSE);
+gtk_widget_set_sensitive(apptw-appRecur_int_spin_label2, FALSE);
}
else {
gtk_widget_set_sensitive(apptw-appRecur_limit_rb, TRUE);
@@ -236,12 +243,28 @@
}
gtk_widget_set_sensitive(apptw-appRecur_until_rb, TRUE);
if (gtk_toggle_button_get_active(
-GTK_TOGGLE_BUTTON(apptw-appRecur_until_rb))) {
+GTK_TOGGLE_BUTTON(apptw-appRecur_until_rb))) {
gtk_widget_set_sensitive(apptw-appRecur_until_button, TRUE);
}
else {
gtk_widget_set_sensitive(apptw-appRecur_until_button, FALSE);
}
+for (i=0; i = 6; i++) {
+gtk_widget_set_sensitive(apptw-appRecur_byday_cb[i], TRUE);
+}
+if (freq == XFICAL_FREQ_MONTHLY || freq == XFICAL_FREQ_YEARLY) {
+for (i=0; i = 6; i++) {
+gtk_widget_set_sensitive(apptw-appRecur_byday_spin[i], TRUE);
+}
+}
+else {
+for (i=0; i = 6; i++) {
+gtk_widget_set_sensitive(apptw-appRecur_byday_spin[i], FALSE);
+}
+}
+gtk_widget_set_sensitive(apptw-appRecur_int_spin, TRUE);
+gtk_widget_set_sensitive(apptw-appRecur_int_spin_label1, TRUE);
+gtk_widget_set_sensitive(apptw-appRecur_int_spin_label2, TRUE);
}
}
@@ -282,6 +305,32 @@
}
void
+app_recur_feature_checkbutton_clicked_cb(GtkCheckButton *checkbutton
+, gpointer user_data)
+{
+appt_win *apptw=(appt_win *)user_data;
+
+mark_appointment_changed((appt_win *)user_data);
+if (gtk_toggle_button_get_active(
+GTK_TOGGLE_BUTTON(apptw-appRecur_feature_normal_rb))) {
+gtk_widget_hide(apptw-appRecur_int_label);
+gtk_widget_hide(apptw-appRecur_int_hbox);
+gtk_widget_hide(apptw-appRecur_byday_label);
+gtk_widget_hide(apptw-appRecur_byday_hbox);
+gtk_widget_hide(apptw-appRecur_byday_spin_label);
+gtk_widget_hide(apptw-appRecur_byday_spin_hbox);
+}
+else {
+gtk_widget_show(apptw-appRecur_int_label);
+gtk_widget_show(apptw-appRecur_int_hbox);
+gtk_widget_show(apptw-appRecur_byday_label);
+gtk_widget_show(apptw-appRecur_byday_hbox);
+gtk_widget_show(apptw-appRecur_byday_spin_label);
+gtk_widget_show(apptw-appRecur_byday_spin_hbox);
+}
+}
+
+void
app_checkbutton_clicked_cb(GtkCheckButton *checkbutton, gpointer user_data)
{
mark_appointment_changed((appt_win *)user_data);
@@ -447,6 +496,7 @@
const char *time_format=%H:%M;
struct tm current_t;
gchar starttime[6], endtime[6];
+gint i;
/*Get the title */
appt-title = g_strdup(gtk_entry_get_text(
@@ -534,6 +584,10 @@
appt-freq = gtk_combo_box_get_active(
(GtkComboBox *)apptw-appRecur_freq_cb);
+/* Get the recurrence interval */
+appt-interval = gtk_spin_button_get_value_as_int(
+GTK_SPIN_BUTTON(apptw-appRecur_int_spin));
+
/* Get the recurrence ending */
if (gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(apptw-appRecur_limit_rb))) {
@@ -562,6 +616,15 @@
else
g_warning(fill_appt_from_apptw: coding error, illegal recurrence);
+/* Get the recurrence weekdays */
+for (i=0; i = 6; i++) {
+appt-recur_byday[i] = gtk_toggle_button_get_active(
+GTK_TOGGLE_BUTTON(apptw-appRecur_byday_cb[i]));
+/* Get the recurrence weekday selection for month/yearly case */
+appt-recur_byday_cnt[i] = gtk_spin_button_get_value_as_int
[Xfce4-commits] r22907 - xfcalendar/trunk/src
Author: juha
Date: 2006-08-27 19:18:01 + (Sun, 27 Aug 2006)
New Revision: 22907
Modified:
xfcalendar/trunk/src/appointment.c
Log:
minor visual tuning to recurrence weekdays.
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2006-08-27 19:04:35 UTC (rev 22906)
+++ xfcalendar/trunk/src/appointment.c 2006-08-27 19:18:01 UTC (rev 22907)
@@ -1718,12 +1718,12 @@
, (GtkAttachOptions) (0));
apptw-appRecur_byday_label = gtk_label_new(_(Weekdays));
-apptw-appRecur_byday_hbox = gtk_hbox_new(FALSE, 0);
+apptw-appRecur_byday_hbox = gtk_hbox_new(FALSE, 5);
for (i=0; i = 6; i++) {
apptw-appRecur_byday_cb[i] =
gtk_check_button_new_with_mnemonic(weekday_array[i]);
gtk_box_pack_start(GTK_BOX(apptw-appRecur_byday_hbox)
-, apptw-appRecur_byday_cb[i], FALSE, FALSE, i ? 5 : 0);
+, apptw-appRecur_byday_cb[i], FALSE, FALSE, 0);
}
xfcalendar_table_add_row(apptw-appTableRecur
, apptw-appRecur_byday_label, apptw-appRecur_byday_hbox, row++
@@ -1731,12 +1731,12 @@
, (GtkAttachOptions) (0));
apptw-appRecur_byday_spin_label = gtk_label_new(_(Which day));
-apptw-appRecur_byday_spin_hbox = gtk_hbox_new(FALSE, 0);
+apptw-appRecur_byday_spin_hbox = gtk_hbox_new(FALSE, 2);
for (i=0; i = 6; i++) {
apptw-appRecur_byday_spin[i] =
gtk_spin_button_new_with_range(-9, 9, 1);
gtk_box_pack_start(GTK_BOX(apptw-appRecur_byday_spin_hbox)
-, apptw-appRecur_byday_spin[i], FALSE, FALSE, i ? 2 : 0);
+, apptw-appRecur_byday_spin[i], FALSE, FALSE, 0);
gtk_tooltips_set_tip(apptw-appTooltips, apptw-appRecur_byday_spin[i]
, _(Specify which weekday for monthly and yearly events.\n
For example:\n Every second Wednesday each month:\n\tFrequency =
Monthly,\n\tWeekdays = cross only Wednesday,\n\tWhich day = select 2 from the
number below Wednesday)
, NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22908 - xfcalendar/trunk/src
Author: juha
Date: 2006-08-27 19:31:19 + (Sun, 27 Aug 2006)
New Revision: 22908
Modified:
xfcalendar/trunk/src/appointment.c
Log:
another fix for formatting. now it should be fine.
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2006-08-27 19:18:01 UTC (rev 22907)
+++ xfcalendar/trunk/src/appointment.c 2006-08-27 19:31:19 UTC (rev 22908)
@@ -1718,7 +1718,7 @@
, (GtkAttachOptions) (0));
apptw-appRecur_byday_label = gtk_label_new(_(Weekdays));
-apptw-appRecur_byday_hbox = gtk_hbox_new(FALSE, 5);
+apptw-appRecur_byday_hbox = gtk_hbox_new(TRUE, 0);
for (i=0; i = 6; i++) {
apptw-appRecur_byday_cb[i] =
gtk_check_button_new_with_mnemonic(weekday_array[i]);
@@ -1731,7 +1731,7 @@
, (GtkAttachOptions) (0));
apptw-appRecur_byday_spin_label = gtk_label_new(_(Which day));
-apptw-appRecur_byday_spin_hbox = gtk_hbox_new(FALSE, 2);
+apptw-appRecur_byday_spin_hbox = gtk_hbox_new(TRUE, 0);
for (i=0; i = 6; i++) {
apptw-appRecur_byday_spin[i] =
gtk_spin_button_new_with_range(-9, 9, 1);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22909 - xfcalendar/trunk/src
Author: juha
Date: 2006-08-27 19:57:14 + (Sun, 27 Aug 2006)
New Revision: 22909
Modified:
xfcalendar/trunk/src/reminder.c
xfcalendar/trunk/src/reminder.h
xfcalendar/trunk/src/xfce_trayicon.c
Log:
added two minor enhancements into reminder:
1) wait until audio alarm has ended before starting next repeat sound
2) show active alarm list in trayicon tooltip
Modified: xfcalendar/trunk/src/reminder.c
===
--- xfcalendar/trunk/src/reminder.c 2006-08-27 19:31:19 UTC (rev 22908)
+++ xfcalendar/trunk/src/reminder.c 2006-08-27 19:57:14 UTC (rev 22909)
@@ -1,7 +1,7 @@
/* reminder.c
*
- * (C) 2003-2005 Mickaël Graf
- * (C) 2005 Juha Kautto
+ * (C) 2003-2006 Mickaël Graf
+ * (C) 2005-2006 Juha Kautto
*
* 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
@@ -21,6 +21,9 @@
#ifdef HAVE_CONFIG_H
# include config.h
#endif
+#ifdef HAVE_SYS_WAIT_H
+#include sys/wait.h
+#endif
#include sys/types.h
#include sys/stat.h
@@ -29,6 +32,8 @@
#include stdio.h
#include time.h
+#include glib.h
+#include glib/gprintf.h
#include gdk/gdkkeysyms.h
#include gtk/gtk.h
#include libxfce4util/libxfce4util.h
@@ -47,7 +52,6 @@
extern GList *alarm_list;
extern XfceTrayIcon *trayIcon;
-
static gchar *play_cmd = NULL;
void set_play_command(gchar *cmd)
@@ -57,6 +61,48 @@
play_cmd = g_strdup(cmd);
}
+static void
+child_setup_async(gpointer user_data)
+{
+#if defined(HAVE_SETSID) !defined(G_OS_WIN32)
+setsid();
+#endif
+}
+
+static void
+child_watch_cb(GPid pid, gint status, gpointer data)
+{
+gboolean *sound_active = (gboolean *)data;
+
+waitpid(pid, NULL, 0);
+g_spawn_close_pid(pid);
+*sound_active = FALSE;
+}
+
+gboolean
+orage_exec(const char *cmd, gboolean *sound_active, GError **error)
+{
+char **argv;
+gboolean success;
+int spawn_flags = G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD;
+GPid pid;
+
+if (!g_shell_parse_argv(cmd, NULL, argv, error))
+return FALSE;
+
+if (!argv || !argv[0])
+return FALSE;
+
+success = g_spawn_async(NULL, argv, NULL, spawn_flags
+, child_setup_async, NULL, pid, error);
+if (success)
+*sound_active = TRUE;
+g_child_watch_add(pid, child_watch_cb, sound_active);
+g_strfreev(argv);
+
+return success;
+}
+
gboolean
orage_sound_alarm(gpointer data)
{
@@ -68,7 +114,14 @@
/* note: -1 loops forever */
if (audio_alarm-cnt != 0) {
+/*
status = xfce_exec(audio_alarm-play_cmd, FALSE, FALSE, error);
+*/
+if (audio_alarm-sound_active) {
+return(TRUE);
+}
+status = orage_exec(audio_alarm-play_cmd, audio_alarm-sound_active
+, error);
if (!status) {
g_warning(reminder: play failed (%si), audio_alarm-play_cmd);
audio_alarm-cnt = 0; /* one warning is enough */
@@ -98,6 +151,7 @@
audio_alarm = g_new(xfce_audio_alarm_type, 1);
audio_alarm-play_cmd = g_strconcat(play_cmd, \, alarm-sound-str,
\, NULL);
audio_alarm-delay = alarm-repeat_delay;
+audio_alarm-sound_active = FALSE;
if ((audio_alarm-cnt = alarm-repeat_cnt) == 0) {
audio_alarm-cnt++;
audio_alarm-wReminder = NULL;
@@ -249,6 +303,44 @@
gtk_widget_show(wReminder);
}
+void
+build_tray_tooltip()
+{
+gint alarm_cnt=0;
+gint tooltip_alarm_limit=5;
+gint dd, hh, min;
+GString *tooltip=NULL;
+GList *alarm_l;
+alarm_struct *cur_alarm;
+/* GtkTooltipsData *cur_tooltip; */
+
+tooltip = g_string_new(_(Next active alarms:));
+alarm_l = alarm_list;
+for (alarm_l = g_list_first(alarm_l);
+ alarm_l != NULL (alarm_cnt tooltip_alarm_limit);
+ alarm_l = g_list_next(alarm_l)) {
+cur_alarm = (alarm_struct *)alarm_l-data;
+if (xfical_duration(cur_alarm-alarm_time-str, dd, hh, min)) {
+g_string_append_printf(tooltip,
+_(\n%02d d %02d h %02d min to: %s),
+dd, hh, min, cur_alarm-title-str);
+alarm_cnt++;
+}
+}
+if (alarm_cnt == 0)
+g_string_append_printf(tooltip, _(\nNo active alarms found));
+
+/* would this check save CPU or not??
+cur_tooltip = gtk_tooltips_data_get(trayIcon-tray);
+if (cur_tooltip == NULL)
+|| (strcmp(tooltip-str, cur_tooltip-tip_text) != 0) {
+xfce_tray_icon_set_tooltip(trayIcon, tooltip-str, NULL);
+}
+*/
+xfce_tray_icon_set_tooltip(trayIcon, tooltip-str, NULL);
+g_string_free(tooltip, TRUE);
+}
+
gboolean
orage_alarm_clock(gpointer user_data)
{
@@ -276,13 +368,15 @@
selected_day == previous_day) {
/* previous day was indeed selected,
keep it current automatically */
-xfcalendar_select_date(GTK_CALENDAR (xfcal-mCalendar
[Xfce4-commits] r22910 - xfcalendar/trunk/sounds
Author: juha Date: 2006-08-27 20:02:22 + (Sun, 27 Aug 2006) New Revision: 22910 Modified: xfcalendar/trunk/sounds/Makefile.am Log: Added few more sounds Made every effort to make sure those are licensefree. Modified: xfcalendar/trunk/sounds/Makefile.am === --- xfcalendar/trunk/sounds/Makefile.am 2006-08-27 19:57:14 UTC (rev 22909) +++ xfcalendar/trunk/sounds/Makefile.am 2006-08-27 20:02:22 UTC (rev 22910) @@ -2,4 +2,10 @@ soundsdir=$(datadir)/$(PACKAGE)/sounds sounds_DATA=\ KDE_Beep_Digital_1.ogg \ - KDE_Beep_Digital_2.ogg + KDE_Beep_Digital_2.ogg \ + Boiling.wav \ + Knock.wav \ + Phone.wav \ + Spo.wav \ + Tear.wav \ + Wall_c.wav ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22911 - xfcalendar/trunk/sounds
Author: juha Date: 2006-08-27 20:03:55 + (Sun, 27 Aug 2006) New Revision: 22911 Added: xfcalendar/trunk/sounds/Boiling.wav xfcalendar/trunk/sounds/Knock.wav xfcalendar/trunk/sounds/Phone.wav xfcalendar/trunk/sounds/Spo.wav xfcalendar/trunk/sounds/Tear.wav xfcalendar/trunk/sounds/Wall_c.wav Log: need to add those sound files also. Added: xfcalendar/trunk/sounds/Boiling.wav === (Binary files differ) Property changes on: xfcalendar/trunk/sounds/Boiling.wav ___ Name: svn:mime-type + application/octet-stream Added: xfcalendar/trunk/sounds/Knock.wav === (Binary files differ) Property changes on: xfcalendar/trunk/sounds/Knock.wav ___ Name: svn:mime-type + application/octet-stream Added: xfcalendar/trunk/sounds/Phone.wav === (Binary files differ) Property changes on: xfcalendar/trunk/sounds/Phone.wav ___ Name: svn:mime-type + application/octet-stream Added: xfcalendar/trunk/sounds/Spo.wav === (Binary files differ) Property changes on: xfcalendar/trunk/sounds/Spo.wav ___ Name: svn:mime-type + application/octet-stream Added: xfcalendar/trunk/sounds/Tear.wav === (Binary files differ) Property changes on: xfcalendar/trunk/sounds/Tear.wav ___ Name: svn:mime-type + application/octet-stream Added: xfcalendar/trunk/sounds/Wall_c.wav === (Binary files differ) Property changes on: xfcalendar/trunk/sounds/Wall_c.wav ___ Name: svn:mime-type + application/octet-stream ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22984 - xfcalendar/trunk/po
Author: juha Date: 2006-09-02 07:31:06 + (Sat, 02 Sep 2006) New Revision: 22984 Modified: xfcalendar/trunk/po/sv.po Log: fixing swedish translation Modified: xfcalendar/trunk/po/sv.po === --- xfcalendar/trunk/po/sv.po 2006-09-02 05:49:23 UTC (rev 22983) +++ xfcalendar/trunk/po/sv.po 2006-09-02 07:31:06 UTC (rev 22984) @@ -2206,7 +2206,9 @@ msgid \n No active alarms found -msgstr Upprepa alarm +msgstr +\n +Inga aktiva alarmer #: ../src/tray_icon.c:316 msgid New appointment ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22986 - xfcalendar/trunk/po
Author: juha Date: 2006-09-02 09:25:47 + (Sat, 02 Sep 2006) New Revision: 22986 Modified: xfcalendar/trunk/po/nl.po xfcalendar/trunk/po/pt_BR.po xfcalendar/trunk/po/ru.po xfcalendar/trunk/po/sk.po xfcalendar/trunk/po/vi.po xfcalendar/trunk/po/zh_CN.po Log: more po fixes Modified: xfcalendar/trunk/po/nl.po === --- xfcalendar/trunk/po/nl.po 2006-09-02 08:57:20 UTC (rev 22985) +++ xfcalendar/trunk/po/nl.po 2006-09-02 09:25:47 UTC (rev 22986) @@ -2306,7 +2306,9 @@ msgid \n No active alarms found -msgstr Alarmgeluid herhalen +msgstr +\n +Alarmgeluid herhalen #: ../src/tray_icon.c:316 msgid New appointment Modified: xfcalendar/trunk/po/pt_BR.po === --- xfcalendar/trunk/po/pt_BR.po2006-09-02 08:57:20 UTC (rev 22985) +++ xfcalendar/trunk/po/pt_BR.po2006-09-02 09:25:47 UTC (rev 22986) @@ -2230,7 +2230,9 @@ msgid \n No active alarms found -msgstr Repetir som do alarme +msgstr +\n +Repetir som do alarme #: ../src/tray_icon.c:316 msgid New appointment Modified: xfcalendar/trunk/po/ru.po === --- xfcalendar/trunk/po/ru.po 2006-09-02 08:57:20 UTC (rev 22985) +++ xfcalendar/trunk/po/ru.po 2006-09-02 09:25:47 UTC (rev 22986) @@ -2218,7 +2218,9 @@ msgid \n No active alarms found -msgstr Повторять звук сигнала +msgstr +\n +Повторять звук сигнала #: ../src/tray_icon.c:316 msgid New appointment Modified: xfcalendar/trunk/po/sk.po === --- xfcalendar/trunk/po/sk.po 2006-09-02 08:57:20 UTC (rev 22985) +++ xfcalendar/trunk/po/sk.po 2006-09-02 09:25:47 UTC (rev 22986) @@ -2223,7 +2223,9 @@ msgid \n No active alarms found -msgstr Opakovať zvukový alarm +msgstr +\n +Opakovať zvukový alarm #: ../src/tray_icon.c:316 msgid New appointment Modified: xfcalendar/trunk/po/vi.po === --- xfcalendar/trunk/po/vi.po 2006-09-02 08:57:20 UTC (rev 22985) +++ xfcalendar/trunk/po/vi.po 2006-09-02 09:25:47 UTC (rev 22986) @@ -2220,7 +2220,9 @@ msgid \n No active alarms found -msgstr Lặp lại âm thanh báo thức +msgstr +\n +Lặp lại âm thanh báo thức #: ../src/tray_icon.c:316 msgid New appointment Modified: xfcalendar/trunk/po/zh_CN.po === --- xfcalendar/trunk/po/zh_CN.po2006-09-02 08:57:20 UTC (rev 22985) +++ xfcalendar/trunk/po/zh_CN.po2006-09-02 09:25:47 UTC (rev 22986) @@ -2212,7 +2212,9 @@ msgid \n No active alarms found -msgstr 重复报警声音 +msgstr +\n +重复报警声音 #: ../src/tray_icon.c:316 #, fuzzy ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22989 - xfcalendar/trunk/po
Author: juha Date: 2006-09-02 10:19:54 + (Sat, 02 Sep 2006) New Revision: 22989 Modified: xfcalendar/trunk/po/es.po xfcalendar/trunk/po/hy.po xfcalendar/trunk/po/ko.po Log: more po fixes Modified: xfcalendar/trunk/po/es.po === --- xfcalendar/trunk/po/es.po 2006-09-02 09:36:12 UTC (rev 22988) +++ xfcalendar/trunk/po/es.po 2006-09-02 10:19:54 UTC (rev 22989) @@ -278,7 +278,7 @@ msgid The appointment information has been modified. msgstr La información ha sido modificada.\n -¿Desea usted continuar?\n +¿Desea usted continuar? #: ../src/appointment.c:442 ../src/appointment.c:722 ../src/event-list.c:589 msgid Do you want to continue? Modified: xfcalendar/trunk/po/hy.po === --- xfcalendar/trunk/po/hy.po 2006-09-02 09:36:12 UTC (rev 22988) +++ xfcalendar/trunk/po/hy.po 2006-09-02 10:19:54 UTC (rev 22989) @@ -283,7 +283,7 @@ msgid The appointment information has been modified. msgstr Տեղեկությունները փոփոխվել են։\n - Ցանկանու՞մ եք շարունակել\n + Ցանկանու՞մ եք շարունակել #: ../src/appointment.c:442 ../src/appointment.c:722 ../src/event-list.c:589 msgid Do you want to continue? Modified: xfcalendar/trunk/po/ko.po === --- xfcalendar/trunk/po/ko.po 2006-09-02 09:36:12 UTC (rev 22988) +++ xfcalendar/trunk/po/ko.po 2006-09-02 10:19:54 UTC (rev 22989) @@ -279,7 +279,7 @@ msgid The appointment information has been modified. msgstr 정보를 변경하셨습니다.\n - 계속 진행하실렵니까?\n + 계속 진행하실렵니까? #: ../src/appointment.c:442 ../src/appointment.c:722 ../src/event-list.c:589 msgid Do you want to continue? ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23080 - xfcalendar/trunk/libical/src/libical
Author: juha
Date: 2006-09-04 19:19:40 + (Mon, 04 Sep 2006)
New Revision: 23080
Modified:
xfcalendar/trunk/libical/src/libical/icalduration.c
xfcalendar/trunk/libical/src/libical/icalmime.c
xfcalendar/trunk/libical/src/libical/icalrecur.c
xfcalendar/trunk/libical/src/libical/icalrecur.h
xfcalendar/trunk/libical/src/libical/icaltime.c
xfcalendar/trunk/libical/src/libical/icaltime.h
Log:
Fixes to libical:
1) start of weekday fix. Monday is now default (like the standard says) instead
of Sunday and it can be defined as any day (=WKST now works).
2) minor fixes for string handling here and there
3) monthday processing fix (although orage does not (yet?) allow to define it.
These fixes came from libical SVN, but they were modified a little since we had
some fixes already, which are not in SVN.
Modified: xfcalendar/trunk/libical/src/libical/icalduration.c
===
--- xfcalendar/trunk/libical/src/libical/icalduration.c 2006-09-04 19:18:10 UTC
(rev 23079)
+++ xfcalendar/trunk/libical/src/libical/icalduration.c 2006-09-04 19:19:40 UTC
(rev 23080)
@@ -40,9 +40,11 @@
#include icalmemory.h
#include icalvalue.h
+#ifdef WIN32
+#define snprintf _snprintf
+#endif
-
/* From Seth Alves, [EMAIL PROTECTED] */
struct icaldurationtype icaldurationtype_from_int(int t)
{
@@ -183,14 +185,13 @@
return icaldurationtype_bad_duration();
}
-#define TMP_BUF_SIZE 1024
static
void append_duration_segment(char** buf, char** buf_ptr, size_t* buf_size,
char* sep, unsigned int value) {
-char temp[TMP_BUF_SIZE];
+char temp[32];
-sprintf(temp,%d,value);
+snprintf(temp,sizeof(temp),%d,value);
icalmemory_append_string(buf, buf_ptr, buf_size, temp);
icalmemory_append_string(buf, buf_ptr, buf_size, sep);
Modified: xfcalendar/trunk/libical/src/libical/icalmime.c
===
--- xfcalendar/trunk/libical/src/libical/icalmime.c 2006-09-04 19:18:10 UTC
(rev 23079)
+++ xfcalendar/trunk/libical/src/libical/icalmime.c 2006-09-04 19:19:40 UTC
(rev 23080)
@@ -199,7 +199,7 @@
minor = parts[i].header.minor_text;
}
- sprintf(mimetype,%s/%s,major,minor);
+ snprintf(mimetype,sizeof(mimetype),%s/%s,major,minor);
comp = icalcomponent_new(ICAL_XLICMIMEPART_COMPONENT);
@@ -209,9 +209,13 @@
}
if(parts[i].header.error!=SSPM_NO_ERROR){
- char *str = NULL;
- char* temp[256];
+ char *str = Unknown error;
+ char temp[256];
+ if(parts[i].header.error==SSPM_MALFORMED_HEADER_ERROR){
+ str = Malformed header, possibly due to input not in MIME
format;
+ }
+
if(parts[i].header.error==SSPM_UNEXPECTED_BOUNDARY_ERROR){
str = Got an unexpected boundary, possibly due to a MIME
header for a MULTIPART part that is missing the Content-Type line;
}
@@ -231,16 +235,16 @@
}
if(parts[i].header.error_text != 0){
- snprintf((char*)temp,256,
+ snprintf(temp,sizeof(temp),
%s: %s,str,parts[i].header.error_text);
} else {
- strcpy((char*)temp,str);
+ strcpy(temp,str);
}
icalcomponent_add_property
(comp,
icalproperty_vanew_xlicerror(
-(char*)temp,
+temp,
icalparameter_new_xlicerrortype(
ICAL_XLICERRORTYPE_MIMEPARSEERROR),
0));
Modified: xfcalendar/trunk/libical/src/libical/icalrecur.c
===
--- xfcalendar/trunk/libical/src/libical/icalrecur.c2006-09-04 19:18:10 UTC
(rev 23079)
+++ xfcalendar/trunk/libical/src/libical/icalrecur.c2006-09-04 19:19:40 UTC
(rev 23080)
@@ -4,7 +4,7 @@
CREATOR: eric 16 May 2000
$Id$
- $Locker$
+ $Locker: $
(C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -19,6 +19,9 @@
The Mozilla Public License Version 1.0. You may obtain a copy of
the License at http://www.mozilla.org/MPL/
+
+2006-09-04 week start day fixes **Juha
+based on CVS code
*/
/**
@@ -138,6 +141,12 @@
#include stdint.h
#endif
+#ifndef HAVE_INTPTR_T
+#ifdef WIN32
+typedef long intptr_t;
+#endif
+#endif
+
#include icalrecur.h
#include icalerror.h
@@ -149,6 +158,10 @@
#include assert.h
#include stddef.h /* For offsetof() macro */
+#ifdef WIN32
+#define snprintf _snprintf
+#endif
+
#include pvl.h
/** This is the last year we will go up to, since 32-bit time_t values
@@ -300,6 +313,38 @@
}
+/*
+ * Days in the BYDAY rule are expected by the code to be sorted, and while
+ * this may be the common case, the RFC doesn't actually mandate
[Xfce4-commits] r23096 - in xfcalendar/trunk: po src
Author: juha
Date: 2006-09-06 20:44:07 + (Wed, 06 Sep 2006)
New Revision: 23096
Modified:
xfcalendar/trunk/po/fi.po
xfcalendar/trunk/src/ical-code.c
xfcalendar/trunk/src/main.c
xfcalendar/trunk/src/mainbox.c
Log:
1) fixed typo in fi translation
2) removed some noisy messages
3) added week start day handling
Modified: xfcalendar/trunk/po/fi.po
===
--- xfcalendar/trunk/po/fi.po 2006-09-06 17:08:58 UTC (rev 23095)
+++ xfcalendar/trunk/po/fi.po 2006-09-06 20:44:07 UTC (rev 23096)
@@ -550,7 +550,7 @@
Joka kuukauden toinen keskiviikko:\n
\tToisto = Kuukausittain,\n
\tViikonpäivät = valitse vain keskiviikko,\n
-\tmonesko päivä = valitse 2 keskiviikon alapuolella olevast laatikosta
+\tmonesko päivä = valitse 2 keskiviikon alapuolella olevasta laatikosta
#. date only appointment
#: ../src/event-list.c:199
Modified: xfcalendar/trunk/src/ical-code.c
===
--- xfcalendar/trunk/src/ical-code.c2006-09-06 17:08:58 UTC (rev 23095)
+++ xfcalendar/trunk/src/ical-code.c2006-09-06 20:44:07 UTC (rev 23096)
@@ -89,9 +89,8 @@
extern gboolean local_icaltimezone_utc;
static int lookback = 0;
-
extern GList *alarm_list;
-
+extern gint ical_weekstartday;
/* Remember to keep this string table in sync with zones.tab
* This is used only for translations purposes. It makes
@@ -1158,8 +1157,9 @@
} /* trg_found */
} /* EVENTS */
alarm_list = g_list_sort(alarm_list, alarm_order);
-g_message(Orage **: Build alarm list: Processed %d events.\n\tFound %d
alarms of which %d are active. (Searched %d recurring alarms.)
-, cnt_event, cnt_alarm, cnt_act_alarm, cnt_repeat);
+if (first_list_today)
+g_message(Orage **: Build alarm list: Processed %d events.\n\tFound
%d alarms of which %d are active. (Searched %d recurring alarms.)
+, cnt_event, cnt_alarm, cnt_act_alarm, cnt_repeat);
}
void xfical_alarm_build_list(gboolean first_list_today)
@@ -1371,6 +1371,9 @@
g_warning(appt_add_internal: Unsupported freq);
icalrecurrencetype_clear(rrule);
}
+if (appt-interval 1) { /* not default, need to insert it */
+recur_p += g_sprintf(recur_p, ;INTERVAL=%d, appt-interval);
+}
if (appt-recur_limit == 1) {
recur_p += g_sprintf(recur_p, ;COUNT=%d, appt-recur_count);
}
@@ -1397,8 +1400,17 @@
*recur_p2 = *recur_p; /* ...reset to null... */
recur_p = recur_p2; /* ...no need for BYDAY then */
}
-if (appt-interval 1) { /* not default, need to insert it */
-recur_p += g_sprintf(recur_p, ;INTERVAL=%d, appt-interval);
+else if (appt-interval 1 appt-freq == XFICAL_FREQ_WEEKLY) {
+/* we have BYDAY rule, let's check week starting date:
+ * WKST has meaning only in two cases:
+ * 1) WEEKLY rule interval 1 BYDAY rule is in use
+ * 2) YEARLY rule BYWEEKNO rule is in use
+ * BUT Orage is not using BYWEEKNO rule, so we only check 1)
+ * Monday is default, so we can skip that, too
+ * */
+if (ical_weekstartday)
+recur_p += g_sprintf(recur_p, ;WKST=%s
+, byday_a[ical_weekstartday]);
}
rrule = icalrecurrencetype_from_string(recur_str);
icalcomponent_add_property(ievent, icalproperty_new_rrule(rrule));
Modified: xfcalendar/trunk/src/main.c
===
--- xfcalendar/trunk/src/main.c 2006-09-06 17:08:58 UTC (rev 23095)
+++ xfcalendar/trunk/src/main.c 2006-09-06 20:44:07 UTC (rev 23096)
@@ -78,9 +78,13 @@
/* main calendar window position */
gint pos_x = 0, pos_y = 0;
+
/* latest event-list window size */
gint event_win_size_x = 400, event_win_size_y = 200;
+/* Ical week start day (0 = Monday, 1 = Tuesday,... 6 = Sunday) */
+gint ical_weekstartday = 0;
+
/* List of active alarms */
GList *alarm_list = NULL;
@@ -130,6 +134,8 @@
{
gchar *fpath;
FILE *fp;
+char *weekday[10] = { MONDAY, TUESDAY, WEDNESDAY, THURSDAY
+, FRIDAY, SATURDAY, SUNDAY };
xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, UTF-8);
/* Save settings here */
@@ -157,6 +163,8 @@
fprintf(fp, 0\n);
fprintf(fp, [Use Dynamic Icon]\n);
fprintf(fp, X=%i, Y=%i\n, icon_size_x, icon_size_y);
+fprintf(fp, [Ical Week Start Day]\n);
+fprintf(fp, %s\n, weekday[ical_weekstartday]);
fclose(fp);
}
g_free(fpath);
Modified: xfcalendar/trunk/src/mainbox.c
===
--- xfcalendar/trunk/src/mainbox.c 2006-09-06 17:08:58 UTC (rev 23095
[Xfce4-commits] r23098 - xfcalendar/trunk/src
Author: juha Date: 2006-09-07 11:26:37 + (Thu, 07 Sep 2006) New Revision: 23098 Modified: xfcalendar/trunk/src/ical-code.c Log: correcting wrong interval for non repeating appointments Modified: xfcalendar/trunk/src/ical-code.c === --- xfcalendar/trunk/src/ical-code.c2006-09-07 09:51:19 UTC (rev 23097) +++ xfcalendar/trunk/src/ical-code.c2006-09-07 11:26:37 UTC (rev 23098) @@ -1537,6 +1537,7 @@ appt.starttimecur[0] = '\0'; appt.endtimecur[0] = '\0'; appt.freq = XFICAL_FREQ_NONE; +appt.interval = 1; appt.recur_limit = 0; appt.recur_count = 0; appt.recur_until[0] = '\0'; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23100 - in xfcalendar/trunk: doc/C src
Author: juha Date: 2006-09-07 19:46:26 + (Thu, 07 Sep 2006) New Revision: 23100 Modified: xfcalendar/trunk/doc/C/orage.html xfcalendar/trunk/doc/C/orage.xml xfcalendar/trunk/src/about-xfcalendar.c Log: Added documentation for week first day parameter Modified: xfcalendar/trunk/doc/C/orage.html === --- xfcalendar/trunk/doc/C/orage.html 2006-09-07 18:58:32 UTC (rev 23099) +++ xfcalendar/trunk/doc/C/orage.html 2006-09-07 19:46:26 UTC (rev 23100) @@ -483,16 +483,20 @@ bottom texts can be omitted. Finally strong class=applicationcodeorage/code/strong switches to static icon if not even the number fits into the icon. Good values to test with are 32 (like X=32 Y=32). +/lili + Ical Week Start Day: tells what is the first day of week. But note, that + it is span class=emphasisemonly/em/span used in weekly repeating appointments. + It will not change the calendar view anyway. /li/ul/div/divdiv class=sect1 lang=endiv class=titlepagedivdivh2 class=title style=clear: botha name=orage-faq/aFrequently Asked Questions/h2/div/div/divp Some common questions and answers. - /ptr class=qandadivtd align=left valign=top colspan=2a name=id2514998/ah4 class=titlea name=id2514998/a1. Frequently Asked Questions/h4/td/trtr class=toc colspan=2td align=left valign=top colspan=2dldt1.1. a href=#id2515003 + /ptr class=qandadivtd align=left valign=top colspan=2a name=id2515008/ah4 class=titlea name=id2515008/a1. Frequently Asked Questions/h4/td/trtr class=toc colspan=2td align=left valign=top colspan=2dldt1.1. a href=#id2515013 Why does my week start on Saturday? -/a/dtdt1.2. a href=#id2515101 +/a/dtdt1.2. a href=#id2515112 How can I insert my ical file into orage? -/a/dtdt1.3. a href=#id2515126 +/a/dtdt1.3. a href=#id2515136 I have found a bug in orage or would like to see a new feature. How can I inform that to the developers? -/a/dt/dl/td/trtr class=questiontd align=left valign=topa name=id2515003/aa name=id2515005/ab1.1./b/tdtd align=left valign=topp +/a/dt/dl/td/trtr class=questiontd align=left valign=topa name=id2515013/aa name=id2515015/ab1.1./b/tdtd align=left valign=topp Why does my week start on Saturday? /p/td/trtr class=answertd align=left valign=topb/b/tdtd align=left valign=topp This really is a problem in your distro. You can check how your @@ -518,11 +522,11 @@ After that you can check what the setting is: spanstrong class=commandgrep first_weekday fi_FI/strong/span and change that if it is wrong and after that you need to recompile your locale database. -/p/td/trtr class=questiontd align=left valign=topa name=id2515101/aa name=id2515104/ab1.2./b/tdtd align=left valign=topp +/p/td/trtr class=questiontd align=left valign=topa name=id2515112/aa name=id2515114/ab1.2./b/tdtd align=left valign=topp How can I insert my ical file into strong class=applicationcodeorage/code/strong? /p/td/trtr class=answertd align=left valign=topb/b/tdtd align=left valign=topp This is not currently possible. It is planned in future versions. -/p/td/trtr class=questiontd align=left valign=topa name=id2515126/aa name=id2515128/ab1.3./b/tdtd align=left valign=topp +/p/td/trtr class=questiontd align=left valign=topa name=id2515136/aa name=id2515138/ab1.3./b/tdtd align=left valign=topp I have found a bug in strong class=applicationcodeorage/code/strong or would like to see a new feature. How can I inform that to the developers? /p/td/trtr class=answertd align=left valign=topb/b/tdtd align=left valign=topp Modified: xfcalendar/trunk/doc/C/orage.xml === --- xfcalendar/trunk/doc/C/orage.xml2006-09-07 18:58:32 UTC (rev 23099) +++ xfcalendar/trunk/doc/C/orage.xml2006-09-07 19:46:26 UTC (rev 23100) @@ -1149,6 +1149,11 @@ not even the number fits into the icon. Good values to test with are 32 (like X=32 Y=32). /listitem +listitem + Ical Week Start Day: tells what is the first day of week. But note, that + it is emphasisonly/emphasis used in weekly repeating appointments. + It will not change the calendar view anyway. +/listitem /itemizedlist /sect1 Modified: xfcalendar/trunk/src/about-xfcalendar.c === --- xfcalendar/trunk/src/about-xfcalendar.c 2006-09-07 18:58:32 UTC (rev 23099) +++ xfcalendar/trunk/src/about-xfcalendar.c 2006-09-07 19:46:26 UTC (rev 23100) @@ -1,6 +1,7 @@ /* about-xfcalendar.c * - * (C) 2004 Micka�l Graf + * (C) 2004-2006 Micka�l Graf + * (C) 2004-2006 Juha Kautto * * This program is free software; you can redistribute
[Xfce4-commits] r23316 - xfcalendar/trunk/po
Author: juha Date: 2006-10-08 13:25:32 + (Sun, 08 Oct 2006) New Revision: 23316 Added: xfcalendar/trunk/po/en_AU.po Log: need that po file, too naturally Added: xfcalendar/trunk/po/en_AU.po === --- xfcalendar/trunk/po/en_AU.po(rev 0) +++ xfcalendar/trunk/po/en_AU.po2006-10-08 13:25:32 UTC (rev 23316) @@ -0,0 +1,2236 @@ +# British English translations for orage package. +# Copyright (C) 2003-2006 The Xfce development team. +# This file is distributed under the same license as the orage package. +# Zuza Software Foundation (Translate.org.za), 2004. +# +msgid +msgstr +Project-Id-Version: xfcalendar 4.3.99.1\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2006-10-08 20:03+0300\n +PO-Revision-Date: 2006-10-08 17:20+0900\n +Last-Translator: Juha Kautto [EMAIL PROTECTED]\n +Language-Team: Australian English [EMAIL PROTECTED]\n +MIME-Version: 1.0\n +Content-Type: text/plain; charset=UTF-8\n +Content-Transfer-Encoding: 8bit\n +Plural-Forms: nplurals=2; plural=(n != 1);\n + +#: ../panel-plugin/oc_config.c:114 +msgid Select timezone +msgstr + +#: ../panel-plugin/oc_config.c:193 +msgid Appearance +msgstr + +#. show frame +#: ../panel-plugin/oc_config.c:204 +msgid Show _frame +msgstr + +#. foreground color +#: ../panel-plugin/oc_config.c:214 +msgid set foreground _color: +msgstr + +#. background color +#: ../panel-plugin/oc_config.c:228 +msgid set _background color: +msgstr + +#. clock size (=vbox size): height and width +#: ../panel-plugin/oc_config.c:242 +msgid set _height: +msgstr + +#: ../panel-plugin/oc_config.c:254 +msgid set _width: +msgstr + +#: ../panel-plugin/oc_config.c:275 +msgid Clock Options +msgstr + +#. timezone +#: ../panel-plugin/oc_config.c:286 +msgid set timezone to: +msgstr + +#: ../panel-plugin/oc_config.c:295 +msgid Set any valid timezone (=TZ) value or pick one from the list. +msgstr + +#. line 1 +#: ../panel-plugin/oc_config.c:304 +msgid show line _1: +msgstr + +#: ../panel-plugin/oc_config.c:315 +msgid Enter any valid strftime function parameter. +msgstr + +#. line 2 +#: ../panel-plugin/oc_config.c:331 +msgid show line _2: +msgstr + +#. line 3 +#: ../panel-plugin/oc_config.c:353 +msgid show line _3: +msgstr + +#: ../panel-plugin/oc_config.c:382 +msgid +This program uses strftime function to get time.\n +Use any valid code to get time in the format you prefer.\n +Some common codes are:\n +\t%A = weekday\t\t\t%B = month\n +\t%c = date time\t\t%R = hour minute\n +\t%V = week number\t\t%Z = timezone in use\n +\t%H = hours \t\t\t\t%M = minute\n +\t%X = local time\t\t\t%x = local date +msgstr + +#: ../panel-plugin/oc_config.c:401 +msgid Properties +msgstr + +#: ../panel-plugin/oc_config.c:416 +msgid Orage clock +msgstr + +#: ../panel-plugin/orageclock.c:63 +msgid %A %d %B %Y/%V +msgstr + +#. to avoid timing problems when updating entry +#. Create file chooser +#: ../plugin/xfcalendar_plugin.c:263 ../plugin/xfcalendar_plugin.c:321 +#: ../src/appointment.c:383 ../src/mainbox.c:113 +msgid Select a file... +msgstr + +#: ../plugin/xfcalendar_plugin.c:271 ../src/mainbox.c:121 +msgid Calendar files +msgstr + +#: ../plugin/xfcalendar_plugin.c:276 ../src/appointment.c:398 +#: ../src/mainbox.c:126 +msgid All Files +msgstr + +#: ../plugin/xfcalendar_plugin.c:419 ../plugin/xfcalendar_plugin.c:424 +#: ../src/appointment.c:920 ../src/appointment.c:925 ../src/appointment.c:1441 +msgid Location +msgstr + +#. show it +#: ../plugin/xfcalendar_plugin.c:430 +msgid Pick local timezone +msgstr + +#: ../plugin/xfcalendar_plugin.c:433 ../plugin/xfcalendar_plugin.c:463 +#: ../src/appointment.c:934 ../src/appointment.c:964 +msgid UTC +msgstr + +#: ../plugin/xfcalendar_plugin.c:434 ../plugin/xfcalendar_plugin.c:467 +#: ../plugin/xfcalendar_plugin.c:749 ../src/appointment.c:935 +#: ../src/appointment.c:968 ../src/appointment.c:1004 +#: ../src/appointment.c:1012 +msgid floating +msgstr + +#: ../plugin/xfcalendar_plugin.c:528 +msgid Orage Preferences +msgstr + +#: ../plugin/xfcalendar_plugin.c:546 +msgid Display +msgstr + +#: ../plugin/xfcalendar_plugin.c:553 +msgid Calendar borders +msgstr + +#: ../plugin/xfcalendar_plugin.c:558 +msgid Displayed +msgstr + +#: ../plugin/xfcalendar_plugin.c:564 +msgid Hidden +msgstr + +#: ../plugin/xfcalendar_plugin.c:573 +msgid Calendar window +msgstr + +#: ../plugin/xfcalendar_plugin.c:578 +msgid Show in taskbar +msgstr + +#: ../plugin/xfcalendar_plugin.c:582 +msgid Show in pager +msgstr + +#: ../plugin/xfcalendar_plugin.c:586 +msgid Show in systray +msgstr + +#: ../plugin/xfcalendar_plugin.c:593 +msgid Calendar start +msgstr + +#: ../plugin/xfcalendar_plugin.c:598 +msgid Show +msgstr + +#: ../plugin/xfcalendar_plugin.c:604 +msgid Hide +msgstr + +#: ../plugin/xfcalendar_plugin.c:610 +msgid Minimized +msgstr + +#: ../plugin/xfcalendar_plugin.c:620 +msgid Archives +msgstr + +#: ../plugin/xfcalendar_plugin.c:631 +msgid Archive file +msgstr
[Xfce4-commits] r23317 - xfcalendar/trunk/po
Author: juha Date: 2006-10-08 13:39:13 + (Sun, 08 Oct 2006) New Revision: 23317 Modified: xfcalendar/trunk/po/en_AU.po Log: fixing typo Modified: xfcalendar/trunk/po/en_AU.po === --- xfcalendar/trunk/po/en_AU.po2006-10-08 13:25:32 UTC (rev 23316) +++ xfcalendar/trunk/po/en_AU.po2006-10-08 13:39:13 UTC (rev 23317) @@ -254,7 +254,7 @@ #: ../src/appointment.c:99 ../src/appointment.c:116 msgid %m/%d/%Y -msgstr %d/%m/y +msgstr %d/%m/%y #: ../src/appointment.c:279 ../src/mainbox.c:380 ../xfcalendar.desktop.in.h:3 msgid Orage ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23318 - xfcalendar/trunk/src
Author: juha
Date: 2006-10-08 16:11:42 + (Sun, 08 Oct 2006)
New Revision: 23318
Modified:
xfcalendar/trunk/src/ical-code.c
Log:
fixed error in showing more than 1 day in even list window.
after ical fixes, icaltime_add does not work with dates anymore.
Modified: xfcalendar/trunk/src/ical-code.c
===
--- xfcalendar/trunk/src/ical-code.c2006-10-08 13:39:13 UTC (rev 23317)
+++ xfcalendar/trunk/src/ical-code.c2006-10-08 16:11:42 UTC (rev 23318)
@@ -1847,7 +1847,6 @@
struct icaltimetype
asdate, aedate/* period to check */
, nsdate, nedate; /* repeating event occurrency start and end */
-struct icaldurationtype aduration;
xfical_period per; /* event start and end times with duration */
icalcomponent *c=NULL;
icalproperty *p = NULL;
@@ -1861,13 +1860,9 @@
/* setup period to test */
asdate = icaltime_from_string(a_day);
-if (days) { /* more than one day to check */
-aduration = icaldurationtype_null_duration();
-aduration.days = days;
-aedate = icaltime_add(asdate, aduration);
-}
-else /* only one day */
-aedate = asdate;
+aedate = asdate;
+if (days) /* more than one day to check */
+icaltime_adjust(aedate, days, 0, 0, 0);
if (first)
ci = icalcomponent_begin_component(ical, ICAL_VEVENT_COMPONENT);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23531 - xfcalendar/trunk/src
Author: juha Date: 2006-10-27 14:46:23 + (Fri, 27 Oct 2006) New Revision: 23531 Modified: xfcalendar/trunk/src/tray_icon.c Log: GTk 2.10 needs colormap specification for all pixmaps. Added it to be compatible. Modified: xfcalendar/trunk/src/tray_icon.c === --- xfcalendar/trunk/src/tray_icon.c2006-10-27 00:08:28 UTC (rev 23530) +++ xfcalendar/trunk/src/tray_icon.c2006-10-27 14:46:23 UTC (rev 23531) @@ -104,6 +104,7 @@ GdkGC *pic1_gc1, *pic1_gc2; GdkColormap *pic1_cmap; GdkColor color; + GdkVisual *pic1_vis; PangoLayout *pl_day, *pl_head, *pl_month; gint width = 0, height = 0, depth = 16; gint red = 239, green = 235, blue = 230; @@ -133,9 +134,11 @@ t = orage_localtime(); width = x; height = y; - depth = gdk_visual_get_best_depth(); + pic1_cmap = gdk_colormap_get_system(); + pic1_vis = gdk_colormap_get_visual(pic1_cmap); + depth = pic1_vis-depth; pic1 = gdk_pixmap_new(NULL, width, height, depth); - pic1_cmap = gdk_screen_get_default_colormap(gdk_screen_get_default()); + gdk_drawable_set_colormap(pic1, pic1_cmap); /* pic1_cmap = gtk_widget_get_colormap(xfcal-mWindow); */ pic1_gc1 = gdk_gc_new(pic1); pic1_gc2 = gdk_gc_new(pic1); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23586 - in xfcalendar/trunk: . src
Author: juha Date: 2006-11-01 20:17:11 + (Wed, 01 Nov 2006) New Revision: 23586 Modified: xfcalendar/trunk/AUTHORS xfcalendar/trunk/src/about-xfcalendar.c Log: Maintainer change: Mickael Graf retiring - Juha Kautto new maintainer Modified: xfcalendar/trunk/AUTHORS === --- xfcalendar/trunk/AUTHORS2006-11-01 18:06:35 UTC (rev 23585) +++ xfcalendar/trunk/AUTHORS2006-11-01 20:17:11 UTC (rev 23586) @@ -1,4 +1,11 @@ Mickael Graf [EMAIL PROTECTED] +- Projet creator former maintainer + +Juha Kautto [EMAIL PROTECTED] +- maintainer + Benedikt Meurer [EMAIL PROTECTED] +- contributor + Edscott Wilson Garcia [EMAIL PROTECTED] -Juha Kautto [EMAIL PROTECTED] +- contributor Modified: xfcalendar/trunk/src/about-xfcalendar.c === --- xfcalendar/trunk/src/about-xfcalendar.c 2006-11-01 18:06:35 UTC (rev 23585) +++ xfcalendar/trunk/src/about-xfcalendar.c 2006-11-01 20:17:11 UTC (rev 23586) @@ -38,7 +38,7 @@ about = xfce_about_info_new(Orage, VERSION , _(Manage your time with Xfce4) - , XFCE_COPYRIGHT_TEXT(2003-2006, Mickael 'Korbinus' Graf) + , XFCE_COPYRIGHT_TEXT(2003-2006, Mickael 'Korbinus' Graf Juha Kautto) , XFCE_LICENSE_GPL); /* xfcalendar_logo = xfce_themed_icon_load(xfcalendar, 48); */ xfcalendar_logo = create_icon(xfcal, 48, 48); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23769 - xfcalendar/trunk/src
Author: juha
Date: 2006-11-07 08:02:57 + (Tue, 07 Nov 2006)
New Revision: 23769
Modified:
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/event-list.c
xfcalendar/trunk/src/event-list.h
xfcalendar/trunk/src/mainbox.c
xfcalendar/trunk/src/tray_icon.c
Log:
Recoded event-list window creation and callback method.
Fixed problem reported by Mike Massonnet: event-list date changed according
to main calendar window. This caused surprises and was not intuitive nor
intended.
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2006-11-06 22:37:47 UTC (rev 23768)
+++ xfcalendar/trunk/src/appointment.c 2006-11-07 08:02:57 UTC (rev 23769)
@@ -671,7 +671,7 @@
apptw-appointment_new = FALSE;
mark_appointment_unchanged(apptw);
if (apptw-eventlist != NULL)
-recreate_eventlist_win((eventlist_win *)apptw-eventlist);
+refresh_eventlist_win((eventlist_win *)apptw-eventlist);
xfcalendar_mark_appointments();
}
}
@@ -741,7 +741,7 @@
}
if (apptw-eventlist != NULL)
-recreate_eventlist_win((eventlist_win *)apptw-eventlist);
+refresh_eventlist_win((eventlist_win *)apptw-eventlist);
xfcalendar_mark_appointments();
gtk_widget_destroy(apptw-appWindow);
Modified: xfcalendar/trunk/src/event-list.c
===
--- xfcalendar/trunk/src/event-list.c 2006-11-06 22:37:47 UTC (rev 23768)
+++ xfcalendar/trunk/src/event-list.c 2006-11-07 08:02:57 UTC (rev 23769)
@@ -259,29 +259,6 @@
}
}
-void
-recreate_eventlist_win (eventlist_win *el)
-{
-GtkCellRenderer *rend;
-GtkTreeViewColumn *col;
-
-if (el-elWindow != NULL
- el-elListStore != NULL
- el-elTreeView != NULL) {
-gtk_list_store_clear(el-elListStore);
-col = gtk_tree_view_get_column(GTK_TREE_VIEW(el-elTreeView), 0);
-gtk_tree_view_remove_column(GTK_TREE_VIEW(el-elTreeView), col);
-rend = gtk_cell_renderer_text_new();
-col = gtk_tree_view_column_new_with_attributes( _(Time), rend
-, text, COL_TIME
-, NULL);
-gtk_tree_view_column_set_cell_data_func(col, rend, start_time_data_func
-, el, NULL);
-gtk_tree_view_insert_column(GTK_TREE_VIEW(el-elTreeView), col, 0);
-manage_eventlist_win(GTK_CALENDAR(xfcal-mCalendar), el);
-}
-}
-
void addEvent(GtkListStore *list1, appt_data *appt, char *header, gint days)
{
GtkTreeIter iter1;
@@ -375,6 +352,84 @@
}
void
+recreate_eventlist_win (eventlist_win *el)
+{
+GtkCellRenderer *rend;
+GtkTreeViewColumn *col;
+
+if (el-elWindow != NULL
+ el-elListStore != NULL
+ el-elTreeView != NULL) {
+gtk_list_store_clear(el-elListStore);
+col = gtk_tree_view_get_column(GTK_TREE_VIEW(el-elTreeView), 0);
+gtk_tree_view_remove_column(GTK_TREE_VIEW(el-elTreeView), col);
+rend = gtk_cell_renderer_text_new();
+col = gtk_tree_view_column_new_with_attributes( _(Time), rend
+, text, COL_TIME
+, NULL);
+gtk_tree_view_column_set_cell_data_func(col, rend, start_time_data_func
+, el, NULL);
+gtk_tree_view_insert_column(GTK_TREE_VIEW(el-elTreeView), col, 0);
+manage_eventlist_win(GTK_CALENDAR(xfcal-mCalendar), el);
+}
+}
+
+void refresh_eventlist_data(eventlist_win *el)
+{
+guint year, month, day;
+char *title;
+char a_day[9]; /* mmdd */
+appt_data *appt;
+struct tm *t;
+gint days = 0;
+
+title = (char*)gtk_window_get_title(GTK_WINDOW(el-elWindow));
+if (sscanf(title, %d-%d-%d, year, month, day) != 3)
+g_warning(refresh_eventlist_data: title conversion error\n);
+days = gtk_spin_button_get_value(GTK_SPIN_BUTTON(el-elSpin1));
+
+if (xfical_file_open()) {
+g_sprintf(a_day, XFICAL_APPT_DATE_FORMAT, year, month, day);
+if ((appt = xfical_appt_get_next_on_day(a_day, TRUE, days))) {
+t = orage_localtime();
+if ( year == t-tm_year + 1900
+ month == t-tm_mon + 1
+ day == t-tm_mday)
+el-elToday = TRUE;
+else
+el-elToday = FALSE;
+
+do {
+addEvent(el-elListStore, appt, title, days);
+} while ((appt = xfical_appt_get_next_on_day(a_day, FALSE, days)));
+}
+xfical_file_close();
+}
+}
+
+void refresh_eventlist_win(eventlist_win *el)
+{
+GtkCellRenderer *rend;
+GtkTreeViewColumn
[Xfce4-commits] r24045 - xfcalendar/trunk/src
Author: juha
Date: 2006-12-04 19:10:35 + (Mon, 04 Dec 2006)
New Revision: 24045
Modified:
xfcalendar/trunk/src/appointment.c
Log:
added missing revert/duplicate menuitem sensitiviness settings.
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2006-12-04 16:28:14 UTC (rev 24044)
+++ xfcalendar/trunk/src/appointment.c 2006-12-04 19:10:35 UTC (rev 24045)
@@ -135,6 +135,7 @@
if (!apptw-appointment_changed) {
apptw-appointment_changed = TRUE;
gtk_widget_set_sensitive(apptw-appRevert, TRUE);
+gtk_widget_set_sensitive(apptw-appFileRevert_menuitem, TRUE);
}
}
@@ -144,6 +145,7 @@
if (apptw-appointment_changed) {
apptw-appointment_changed = FALSE;
gtk_widget_set_sensitive(apptw-appRevert, FALSE);
+gtk_widget_set_sensitive(apptw-appFileRevert_menuitem, FALSE);
}
}
@@ -652,6 +654,8 @@
if (ok) {
apptw-appointment_add = FALSE;
gtk_widget_set_sensitive(apptw-appDuplicate, TRUE);
+gtk_widget_set_sensitive(apptw-appFileDuplicate_menuitem
+, TRUE);
g_message(Orage **: Added: %s, apptw-xf_uid);
}
else
@@ -1191,6 +1195,8 @@
/* we only want to enable duplication if we are working with an old
* existing app (=not adding new) */
gtk_widget_set_sensitive(apptw-appDuplicate, !apptw-appointment_add);
+gtk_widget_set_sensitive(apptw-appFileDuplicate_menuitem
+, !apptw-appointment_add);
/* window title */
gtk_window_set_title(GTK_WINDOW(apptw-appWindow)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26382 - in xfcalendar/trunk: . po src
Author: juha
Date: 2007-11-20 23:04:15 + (Tue, 20 Nov 2007)
New Revision: 26382
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/po/fi.po
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/event-list.c
xfcalendar/trunk/src/functions.c
xfcalendar/trunk/src/functions.h
xfcalendar/trunk/src/ical-code.c
xfcalendar/trunk/src/ical-code.h
xfcalendar/trunk/src/mainbox.c
xfcalendar/trunk/src/mainbox.h
xfcalendar/trunk/src/reminder.c
Log:
Bug 3601: part 2. Add VTODO as bold in the main window
and fix the vtodo implementation overall.
version bumped to 4.5.11.1
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2007-11-19 14:44:28 UTC (rev 26381)
+++ xfcalendar/trunk/configure.in.in2007-11-20 23:04:15 UTC (rev 26382)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.10.3-svn])
+m4_define([orage_version], [4.5.11.1-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/po/fi.po
===
--- xfcalendar/trunk/po/fi.po 2007-11-19 14:44:28 UTC (rev 26381)
+++ xfcalendar/trunk/po/fi.po 2007-11-20 23:04:15 UTC (rev 26382)
@@ -2865,11 +2865,11 @@
#: ../src/main.c:284
msgid --version (-v) \t\tshow version of orage\n
-msgstr --version (-) \t\tnäytä Oragen versio\n
+msgstr --version (-v) \t\tnäytä Oragen versio\n
#: ../src/main.c:285
msgid --help (-h) \t\tprint this text\n
-msgstr --help (.h) \t\tkirjoita tämä teksti\n
+msgstr --help (-h) \t\tkirjoita tämä teksti\n
#: ../src/main.c:286
msgid --preferences (-p) \tshow preferences form\n
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2007-11-19 14:44:28 UTC (rev 26381)
+++ xfcalendar/trunk/src/appointment.c 2007-11-20 23:04:15 UTC (rev 26382)
@@ -734,6 +734,9 @@
{
gint result;
+/* Journal does not have end time so no need to check */
+if (appt-type == XFICAL_TYPE_JOURNAL)
+return(TRUE);
if (xfical_compare_times(appt) 0) {
result = xfce_message_dialog(GTK_WINDOW(apptw-Window),
_(Warning),
@@ -743,10 +746,10 @@
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
-return FALSE;
+return(FALSE);
}
else {
-return TRUE;
+return(TRUE);
}
}
@@ -835,17 +838,19 @@
/* duration */
appt-use_duration = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(apptw-Dur_checkbutton));
-appt-duration = gtk_spin_button_get_value_as_int(
-GTK_SPIN_BUTTON(apptw-Dur_spin_dd)) * 24*60*60
-+ gtk_spin_button_get_value_as_int(
-GTK_SPIN_BUTTON(apptw-Dur_spin_hh)) *60*60
-+ gtk_spin_button_get_value_as_int(
-GTK_SPIN_BUTTON(apptw-Dur_spin_mm)) * 60;
+if (appt-allDay)
+appt-duration = gtk_spin_button_get_value_as_int(
+GTK_SPIN_BUTTON(apptw-Dur_spin_dd)) * 24*60*60;
+else
+appt-duration = gtk_spin_button_get_value_as_int(
+GTK_SPIN_BUTTON(apptw-Dur_spin_dd)) * 24*60*60
++ gtk_spin_button_get_value_as_int(
+GTK_SPIN_BUTTON(apptw-Dur_spin_hh)) *60*60
++ gtk_spin_button_get_value_as_int(
+GTK_SPIN_BUTTON(apptw-Dur_spin_mm)) * 60;
-/* Check that end time is after start time.
- * Journal does not have end time so no need to check */
-if (appt-type != XFICAL_TYPE_JOURNAL
- !orage_validate_datetime(apptw, appt))
+/* Check that end time is after start time. */
+if (!orage_validate_datetime(apptw, appt))
return(FALSE);
/* completed date and time.
@@ -1325,7 +1330,7 @@
, (gdouble)tm_date.tm_hour);
gtk_spin_button_set_value(
GTK_SPIN_BUTTON(apptw-CompletedTime_spin_mm)
-, (gdouble)tm_date.tm_hour);
+, (gdouble)tm_date.tm_min);
if (appt-completed_tz_loc) {
gtk_button_set_label(GTK_BUTTON(apptw-CompletedTimezone_button)
, _(appt-completed_tz_loc));
@@ -1801,6 +1806,7 @@
gtk_notebook_append_page(GTK_NOTEBOOK(apptw-Notebook)
, apptw-General_notebook_page, apptw-General_tab_label);
+/* type */
apptw-Type_label = gtk_label_new(_(Type ));
hbox = gtk_hbox_new(FALSE, 0);
apptw-Type_event_rb = gtk_radio_button_new_with_label(NULL, _(Event));
@@ -1825,24 +1831,28 @@
, apptw-Type_label, hbox
, row = 0, (GTK_EXPAND | GTK_FILL), (0));
+/* title */
apptw-Title_label = gtk_label_new(_(Title ));
apptw-Title_entry = gtk_entry_new
[Xfce4-commits] r26390 - xfcalendar/trunk/src
Author: juha
Date: 2007-11-24 23:03:43 + (Sat, 24 Nov 2007)
New Revision: 26390
Modified:
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/appointment.h
xfcalendar/trunk/src/ical-code.c
xfcalendar/trunk/src/ical-code.h
xfcalendar/trunk/src/reminder.c
xfcalendar/trunk/src/reminder.h
Log:
1) fix alarms based on end time of event
2) fix core dump with libnotify type alarms
3) start persistent alarm enhancement
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2007-11-21 16:21:16 UTC (rev 26389)
+++ xfcalendar/trunk/src/appointment.c 2007-11-24 23:03:43 UTC (rev 26390)
@@ -2056,12 +2056,26 @@
gtk_container_add(GTK_CONTAINER(event), apptw-Alarm_when_cb);
gtk_box_pack_start(GTK_BOX(apptw-Alarm_hbox)
, event, FALSE, FALSE, 0);
+
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);
+/* 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_box_pack_start(GTK_BOX(apptw-Per_hbox), apptw-Per_checkbutton
+, FALSE, TRUE, 0);
+
+orage_table_add_row(apptw-TableAlarm
+, NULL, apptw-Per_hbox
+, ++row, (GTK_FILL), (GTK_FILL));
+
/* Audio Alarm */
apptw-Sound_label = gtk_label_new(_(Sound));
Modified: xfcalendar/trunk/src/appointment.h
===
--- xfcalendar/trunk/src/appointment.h 2007-11-21 16:21:16 UTC (rev 26389)
+++ xfcalendar/trunk/src/appointment.h 2007-11-24 23:03:43 UTC (rev 26390)
@@ -136,6 +136,8 @@
GtkWidget *Proc_hbox;
GtkWidget *Proc_checkbutton;
GtkWidget *Proc_entry;
+GtkWidget *Per_hbox;
+GtkWidget *Per_checkbutton;
GtkWidget *Recur_notebook_page;
GtkWidget *Recur_tab_label;
Modified: xfcalendar/trunk/src/ical-code.c
===
--- xfcalendar/trunk/src/ical-code.c2007-11-21 16:21:16 UTC (rev 26389)
+++ xfcalendar/trunk/src/ical-code.c2007-11-24 23:03:43 UTC (rev 26390)
@@ -2750,13 +2750,24 @@
if (icaltime_is_date(per.stime)) {
/* HACK: convert to local time so that we can use time arithmetic
* when counting alarm time. */
-per.stime.is_date = 0;
-per.stime.is_utc= cur_time.is_utc;
-per.stime.is_daylight = cur_time.is_daylight;
-per.stime.zone = cur_time.zone;
-per.stime.hour = 0;
-per.stime.minute= 0;
-per.stime.second= 0;
+if (rel == ICAL_RELATED_START) {
+per.stime.is_date = 0;
+per.stime.is_utc= cur_time.is_utc;
+per.stime.is_daylight = cur_time.is_daylight;
+per.stime.zone = cur_time.zone;
+per.stime.hour = 0;
+per.stime.minute= 0;
+per.stime.second= 0;
+}
+else {
+per.etime.is_date = 0;
+per.etime.is_utc= cur_time.is_utc;
+per.etime.is_daylight = cur_time.is_daylight;
+per.etime.zone = cur_time.zone;
+per.etime.hour = 0;
+per.etime.minute= 0;
+per.etime.second= 0;
+}
}
if (rel == ICAL_RELATED_END)
alarm_time = icaltime_add(per.etime, trg.duration);
@@ -2796,7 +2807,7 @@
#define P_N process_alarm_data:
xfical_appt *appt;
/*
-icalproperty *p;
+icalproperty *p;:
enum icalproperty_action act;
icalattach *attach = NULL;
struct icaldurationtype duration;
Modified: xfcalendar/trunk/src/ical-code.h
===
--- xfcalendar/trunk/src/ical-code.h2007-11-21 16:21:16 UTC (rev 26389)
+++ xfcalendar/trunk/src/ical-code.h2007-11-24 23:03:43 UTC (rev 26390)
@@ -83,6 +83,7 @@
gboolean alarm_before; /* TRUE = before FALSE = after */
/* TRUE = related to start FALSE= related to end */
gboolean alarm_related_start;
+gboolean alarm_persistent; /* do this alarm even if orage has been down */
gboolean sound_alarm;
gchar *sound;
Modified: xfcalendar/trunk/src/reminder.c
===
--- xfcalendar/trunk/src/reminder.c 2007-11-21 16:21:16 UTC (rev 26389
[Xfce4-commits] r26429 - in xfcalendar/trunk: . src
Author: juha
Date: 2007-12-02 21:27:59 + (Sun, 02 Dec 2007)
New Revision: 26429
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/appointment.h
xfcalendar/trunk/src/ical-code.c
xfcalendar/trunk/src/ical-code.h
xfcalendar/trunk/src/interface.c
xfcalendar/trunk/src/interface.h
xfcalendar/trunk/src/main.c
xfcalendar/trunk/src/mainbox.c
xfcalendar/trunk/src/reminder.c
xfcalendar/trunk/src/reminder.h
Log:
Bug 3643: implemented persistent alarms.
It is now possible to define alarms which are raised after Orage is started
even if they were timed to happen while Orage was not running.
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2007-12-02 16:49:00 UTC (rev 26428)
+++ xfcalendar/trunk/configure.in.in2007-12-02 21:27:59 UTC (rev 26429)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.11.1-svn])
+m4_define([orage_version], [4.5.11.2-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2007-12-02 16:49:00 UTC (rev 26428)
+++ xfcalendar/trunk/src/appointment.c 2007-12-02 21:27:59 UTC (rev 26429)
@@ -61,6 +61,10 @@
static void fill_appt_window(appt_win *apptw, char *action, char *par);
+/*
+ * the previous and the following are the main functions in this file
+static gboolean fill_appt_from_apptw(xfical_appt *appt, appt_win *apptw)
+*/
static void combo_box_append_array(GtkWidget *combo_box, char *text[], int
size)
@@ -920,6 +924,10 @@
break;
}
+/* Do we use persistent alarm */
+appt-alarm_persistent = gtk_toggle_button_get_active(
+GTK_TOGGLE_BUTTON(apptw-Per_checkbutton));
+
/* Do we use audio alarm */
appt-sound_alarm = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(apptw-Sound_checkbutton));
@@ -1533,7 +1541,7 @@
/*
char *when_array[4] = {
_(Before Start), _(Before End), _(After Start), _(After End)};
-*/
+*/
if (appt-alarm_before)
if (appt-alarm_related_start)
gtk_combo_box_set_active(GTK_COMBO_BOX(apptw-Alarm_when_cb), 0);
@@ -1545,6 +1553,11 @@
else
gtk_combo_box_set_active(GTK_COMBO_BOX(apptw-Alarm_when_cb), 3);
+/* persistent */
+gtk_toggle_button_set_active(
+GTK_TOGGLE_BUTTON(apptw-Per_checkbutton)
+, appt-alarm_persistent);
+
/* sound */
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(apptw-Sound_checkbutton)
Modified: xfcalendar/trunk/src/appointment.h
===
--- xfcalendar/trunk/src/appointment.h 2007-12-02 16:49:00 UTC (rev 26428)
+++ xfcalendar/trunk/src/appointment.h 2007-12-02 21:27:59 UTC (rev 26429)
@@ -111,6 +111,8 @@
GtkWidget *Alarm_spin_mm;
GtkWidget *Alarm_spin_mm_label;
GtkWidget *Alarm_when_cb;
+GtkWidget *Per_hbox;
+GtkWidget *Per_checkbutton;
GtkWidget *Sound_label;
GtkWidget *Sound_hbox;
GtkWidget *Sound_checkbutton;
@@ -136,8 +138,6 @@
GtkWidget *Proc_hbox;
GtkWidget *Proc_checkbutton;
GtkWidget *Proc_entry;
-GtkWidget *Per_hbox;
-GtkWidget *Per_checkbutton;
GtkWidget *Recur_notebook_page;
GtkWidget *Recur_tab_label;
Modified: xfcalendar/trunk/src/ical-code.c
===
--- xfcalendar/trunk/src/ical-code.c2007-12-02 16:49:00 UTC (rev 26428)
+++ xfcalendar/trunk/src/ical-code.c2007-12-02 21:27:59 UTC (rev 26429)
@@ -62,6 +62,7 @@
#include event-list.h
#include appointment.h
#include parameters.h
+#include interface.h
static void xfical_alarm_build_list_internal(gboolean first_list_today);
@@ -1419,6 +1420,9 @@
, icalproperty_vanew_trigger(trg
, icalparameter_new_related(ICAL_RELATED_END)
, 0));
+if (appt-alarm_persistent)
+icalcomponent_add_property(ialarm
+,
icalproperty_new_from_string(X-ORAGE-PERSISTENT-ALARM:YES));
return(ialarm);
}
@@ -1751,13 +1755,13 @@
, icalproperty_new_completed(wtime));
}
}
-if (appt-freq != XFICAL_FREQ_NONE) { /* journal has no recurrency. */
+if (appt-freq != XFICAL_FREQ_NONE) {
/* NOTE: according to standard VJOURNAL _has_ recurrency,
* but I can't understand how it coud be usefull,
* so Orage takes it away */
appt_add_recur_internal(appt, icmp);
}
-if (appt-alarmtime != 0) { /* journal has no alarms */
+if (appt-alarmtime != 0) {
appt_add_alarm_internal(appt
[Xfce4-commits] r26430 - xfcalendar/trunk/src
Author: juha
Date: 2007-12-02 22:56:02 + (Sun, 02 Dec 2007)
New Revision: 26430
Modified:
xfcalendar/trunk/src/reminder.c
Log:
Bug 3711 - Compilation error without libnotify
Fixed by adding missing #ifdef.
Modified: xfcalendar/trunk/src/reminder.c
===
--- xfcalendar/trunk/src/reminder.c 2007-12-02 21:27:59 UTC (rev 26429)
+++ xfcalendar/trunk/src/reminder.c 2007-12-02 22:56:02 UTC (rev 26430)
@@ -54,7 +54,7 @@
#include tray_icon.h
#include parameters.h
-void create_notify_reminder(alarm_struct *alarm);
+static void create_notify_reminder(alarm_struct *alarm);
gboolean orage_alarm_clock(gpointer user_data);
gboolean orage_tooltip_update(gpointer user_data);
void create_reminders(alarm_struct *alarm);
@@ -86,28 +86,16 @@
/*
g_print(alarm_free_memory: start %d %d\n, alarm-audio,
alarm-display_notify);
*/
-if (!alarm-display_orage !alarm-display_notify)
+if (!alarm-display_orage !alarm-display_notify !alarm-audio)
+/* all gone, need to clean memory */
+alarm_free(alarm);
+else if (!alarm-display_orage !alarm-display_notify)
/* if both visuals are gone we can't stop audio anymore, so stop it
* now before it is too late */
alarm-repeat_cnt = 0;
-if (!alarm-display_orage !alarm-display_notify !alarm-audio) {
-/* all gone, need to clean memory */
-alarm_free(alarm);
-/*
-g_free(alarm-uid);
-if (alarm-title != NULL)
-g_free(alarm-title);
-if (alarm-description != NULL)
-g_free(alarm-description);
-if (alarm-sound != NULL)
-g_free(alarm-sound);
-g_free(alarm-active_alarm);
-g_free(alarm);
-*/
/*
g_print(alarm_free_memory: freed %d %d\n, alarm-audio,
alarm-display_notify);
*/
-}
}
static gboolean alarm_read_next_value(int p_file, char *buf)
@@ -174,6 +162,7 @@
alarm_read_next_value(p_file, buf);
new_alarm-display_orage = alarm_read_boolean(buf);
+#ifdef HAVE_NOTIFY
alarm_read_next_value(p_file, buf);
new_alarm-display_notify = alarm_read_boolean(buf);
@@ -182,6 +171,7 @@
alarm_read_next_value(p_file, buf);
new_alarm-notify_timeout = atoi(buf);
+#endif
alarm_read_next_value(p_file, buf);
new_alarm-audio = alarm_read_boolean(buf);
@@ -276,6 +266,7 @@
g_sprintf(buf, %03dDISPLAY_ORAGE=%s\n, strlen(s_boolean), s_boolean);
write(file, buf, strlen(buf));
+#ifdef HAVE_NOTIFY
s_boolean = alarm-display_notify ? TRUE : FALSE;
g_sprintf(buf, %03dDISPLAY_NOTIFY=%s\n, strlen(s_boolean), s_boolean);
write(file, buf, strlen(buf));
@@ -287,6 +278,7 @@
g_sprintf(s_num, %d, alarm-notify_timeout);
g_sprintf(buf, %03dNOTIFY_TIMEOUT=%s\n, strlen(s_num), s_num);
write(file, buf, strlen(buf));
+#endif
s_boolean = alarm-audio ? TRUE : FALSE;
g_sprintf(buf, %03dAUDIO=%s\n, strlen(s_boolean), s_boolean);
@@ -334,6 +326,7 @@
close(p_file);
}
+#ifdef HAVE_NOTIFY
static void notify_action_open(NotifyNotification *n, const char *action
, gpointer par)
{
@@ -348,6 +341,7 @@
*/
create_appt_win(UPDATE, alarm-uid, NULL);
}
+#endif
static gboolean sound_alarm(gpointer data)
{
@@ -448,7 +442,7 @@
}
#endif
-void create_notify_reminder(alarm_struct *alarm)
+static void create_notify_reminder(alarm_struct *alarm)
{
#ifdef HAVE_NOTIFY
char heading[250];
@@ -616,16 +610,14 @@
n_alarm-uid = g_strdup(alarm-uid);
n_alarm-title = g_strdup(alarm-title);
n_alarm-description = g_strdup(alarm-description);
-n_alarm-notify_timeout = alarm-notify_timeout;
n_alarm-display_orage = alarm-display_orage;
n_alarm-display_notify = alarm-display_notify;
+n_alarm-notify_refresh = alarm-notify_refresh;
n_alarm-notify_timeout = alarm-notify_timeout;
n_alarm-audio = alarm-audio;
if (alarm-sound != NULL)
/* note that this changes here !*/
-/*
-n_alarm-sound = g_string_new(alarm-sound-str);
-*/
+/* n_alarm-sound = g_string_new(alarm-sound-str); */
n_alarm-sound = g_strconcat(g_par.sound_application, \
, alarm-sound, \, NULL);
n_alarm-repeat_cnt = alarm-repeat_cnt;
@@ -643,19 +635,6 @@
create_notify_reminder(n_alarm);
if (n_alarm-procedure)
create_procedure_reminder(n_alarm);
-/*
-if (alarm-display
- (!alarm-display_orage !alarm-display_notify))
-alarm-display_orage = TRUE;
-alarm-active_alarm = g_new0(active_alarm_struct, 1);
-
-if (alarm-audio)
-create_sound_reminder(alarm);
-if (alarm-display_orage)
-create_orage_reminder(alarm);
-if (alarm-display_notify)
-create_notify_reminder(alarm);
-*/
}
gboolean reset_orage_day_change(gboolean changed)
___
Xfce4-commits mailing list
Xfce4
[Xfce4-commits] r26458 - in xfcalendar/trunk: . src
Author: juha
Date: 2007-12-11 21:58:58 + (Tue, 11 Dec 2007)
New Revision: 26458
Modified:
xfcalendar/trunk/NEWS
xfcalendar/trunk/TODO
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/src/event-list.c
xfcalendar/trunk/src/ical-code.c
xfcalendar/trunk/src/ical-code.h
xfcalendar/trunk/src/interface.c
xfcalendar/trunk/src/interface.h
xfcalendar/trunk/src/main.c
xfcalendar/trunk/src/parameters.c
xfcalendar/trunk/src/parameters.h
Log:
made archiving a compile time option
Modified: xfcalendar/trunk/NEWS
===
--- xfcalendar/trunk/NEWS 2007-12-11 19:30:45 UTC (rev 26457)
+++ xfcalendar/trunk/NEWS 2007-12-11 21:58:58 UTC (rev 26458)
@@ -1,13 +1,3 @@
-20071002:
--
-* Orage version 4.5.9.7 released
-* Day view added.
-
-20070519:
--
-* Orage version 4.5.9.5 released
-* libnotify support added.
-
20070104:
-
* Orage version 4.5.9 released
Modified: xfcalendar/trunk/TODO
===
--- xfcalendar/trunk/TODO 2007-12-11 19:30:45 UTC (rev 26457)
+++ xfcalendar/trunk/TODO 2007-12-11 21:58:58 UTC (rev 26458)
@@ -40,10 +40,10 @@
*** DONE 4.5 ***
10) more alarm possibilities (like libnotify BUG 2831 and email)
-*** DONE 4.5 ***
+*** Partly DONE 4.5 ***
11) Day, Week, Month view
-*** DONE 4.5 for day and week view ***
+*** Partly DONE 4.5 ***
12) Exclude possiblity in repeating rule
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2007-12-11 19:30:45 UTC (rev 26457)
+++ xfcalendar/trunk/configure.in.in2007-12-11 21:58:58 UTC (rev 26458)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.11.2-svn])
+m4_define([orage_version], [4.5.11.3-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
@@ -194,6 +194,20 @@
[notify_minimum_version], [libnotify],
[LIBNOTIFY support])
+dnl
+dnl *** Optional support for automatic archiving ***
+dnl
+have_archive=no
+AC_ARG_ENABLE([archive],
+AC_HELP_STRING([--enable-archive], [use automatic archiving (defaut=yes)])
+AC_HELP_STRING([--disable-archive], [don't use automatic archiving]),
+ [], [enable_archive=yes])
+if test x$enable_archive = xyes; then
+AC_DEFINE([HAVE_ARCHIVE], [1], [Define to enable archiving])
+have_archive=yes
+fi
+
+
dnl Check for debugging support
dnl BM_DEBUG_SUPPORT()
XDT_FEATURE_DEBUG
@@ -240,4 +254,5 @@
else
echo * LIBNOTIFY support: no
fi
+echo * Automatic archiving: $have_archive
echo
Modified: xfcalendar/trunk/src/event-list.c
===
--- xfcalendar/trunk/src/event-list.c 2007-12-11 19:30:45 UTC (rev 26457)
+++ xfcalendar/trunk/src/event-list.c 2007-12-11 21:58:58 UTC (rev 26458)
@@ -90,29 +90,59 @@
{ STRING, 0, DRAG_TARGET_STRING }
};
+static void start_appt_win(char *mode, el_win *el
+, GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path)
+{
+gchar *uid = NULL, *flags = NULL;
+appt_win *apptw;
+
+if (gtk_tree_model_get_iter(model, iter, path)) {
+gtk_tree_model_get(model, iter, COL_UID, uid, -1);
+#ifdef HAVE_ARCHIVE
+gtk_tree_model_get(model, iter, COL_FLAGS, flags, -1);
+if (flags flags[3] == 'A') {
+xfical_unarchive_uid(uid);
+/* note that file id changes after archive */
+uid[0]='O';
+refresh_el_win(el);
+}
+g_free(flags);
+#endif
+apptw = create_appt_win(mode, uid, el);
+g_free(uid);
+}
+}
+
static void editEvent(GtkTreeView *view, GtkTreePath *path
, GtkTreeViewColumn *col, gpointer user_data)
{
el_win *el = (el_win *)user_data;
-appt_win *apptw;
GtkTreeModel *model;
GtkTreeIter iter;
+/*
gchar *uid = NULL, *flags = NULL;
+appt_win *apptw;
+*/
model = gtk_tree_view_get_model(view);
+start_appt_win(UPDATE, el, model, iter, path);
+/*
if (gtk_tree_model_get_iter(model, iter, path)) {
-gtk_tree_model_get(model, iter
-, COL_UID, uid, COL_FLAGS, flags, -1);
+gtk_tree_model_get(model, iter, COL_UID, uid, -1);
+#ifdef HAVE_ARCHIVE
+gtk_tree_model_get(model, iter, COL_FLAGS, flags, -1);
if (flags flags[3] == 'A') {
xfical_unarchive_uid(uid);
-/* note that file id changes after archive */
+/ * note that file id changes after archive * /
uid[0]='O';
refresh_el_win(el);
}
+#endif
apptw = create_appt_win(UPDATE, uid, el);
g_free(uid
[Xfce4-commits] r26472 - xfcalendar/trunk/src
Author: juha
Date: 2007-12-13 23:24:18 + (Thu, 13 Dec 2007)
New Revision: 26472
Modified:
xfcalendar/trunk/src/about-xfcalendar.c
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/event-list.c
xfcalendar/trunk/src/functions.c
xfcalendar/trunk/src/functions.h
xfcalendar/trunk/src/ical-code.c
xfcalendar/trunk/src/interface.c
xfcalendar/trunk/src/main.c
xfcalendar/trunk/src/mainbox.c
xfcalendar/trunk/src/parameters.c
xfcalendar/trunk/src/reminder.c
xfcalendar/trunk/src/reminder.h
xfcalendar/trunk/src/tray_icon.c
Log:
fixing few core dumps and tuning memory leaks and cpu usage.
Also making initial startup faster.
Cleaning and formatting base code: event_list, appointment, main window
Modified: xfcalendar/trunk/src/about-xfcalendar.c
===
--- xfcalendar/trunk/src/about-xfcalendar.c 2007-12-13 10:58:18 UTC (rev
26471)
+++ xfcalendar/trunk/src/about-xfcalendar.c 2007-12-13 23:24:18 UTC (rev
26472)
@@ -42,7 +42,6 @@
, _(Manage your time with Xfce4)
, XFCE_COPYRIGHT_TEXT(2003-2007, Juha Kautto)
, XFCE_LICENSE_GPL);
- /* orage_logo = xfce_themed_icon_load(xfcalendar, 48); */
orage_logo = orage_create_icon(xfcal, FALSE, 48, 48);
xfce_about_info_set_homepage(about, http://www.xfce.org;);
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2007-12-13 10:58:18 UTC (rev 26471)
+++ xfcalendar/trunk/src/appointment.c 2007-12-13 23:24:18 UTC (rev 26472)
@@ -43,8 +43,6 @@
#include gdk/gdk.h
#include glib/gprintf.h
-#include libxfce4util/libxfce4util.h
-#include libxfcegui4/netk-trayicon.h
#include libxfcegui4/libxfcegui4.h
#include functions.h
@@ -54,8 +52,6 @@
#include appointment.h
#include parameters.h
-#define AVAILABILITY_ARRAY_DIM 2
-#define RECUR_ARRAY_DIM 5
#define BORDER_SIZE 20
#define FILETYPE_SIZE 38
@@ -67,16 +63,6 @@
*/
-static void combo_box_append_array(GtkWidget *combo_box, char *text[], int
size)
-{
-register int i;
-
-for (i = 0; i size; i++) {
-gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box)
-, (const gchar *)text[i]);
-}
-}
-
static GtkWidget *datetime_hbox_new(GtkWidget *date_button
, GtkWidget *spin_hh, GtkWidget *spin_mm
, GtkWidget *timezone_button)
@@ -106,7 +92,7 @@
gtk_box_pack_start(GTK_BOX(hbox), timezone_button, TRUE, TRUE, 0);
-return hbox;
+return(hbox);
}
static GtkWidget *period_hbox_new(gboolean head_space, gboolean tail_space
@@ -261,7 +247,7 @@
{
gint freq, i;
-freq = gtk_combo_box_get_active((GtkComboBox *)apptw-Recur_freq_cb);
+freq = gtk_combo_box_get_active(GTK_COMBO_BOX(apptw-Recur_freq_cb));
if (freq == XFICAL_FREQ_NONE) {
gtk_widget_set_sensitive(apptw-Recur_limit_rb, FALSE);
gtk_widget_set_sensitive(apptw-Recur_count_rb, FALSE);
@@ -516,38 +502,38 @@
static void app_recur_checkbutton_clicked_cb(GtkCheckButton *checkbutton
, gpointer user_data)
{
-mark_appointment_changed((appt_win *)user_data);
set_repeat_sensitivity((appt_win *)user_data);
+mark_appointment_changed((appt_win *)user_data);
}
static void app_recur_feature_checkbutton_clicked_cb(GtkCheckButton *cb
, gpointer user_data)
{
-mark_appointment_changed((appt_win *)user_data);
recur_hide_show((appt_win *)user_data);
+mark_appointment_changed((appt_win *)user_data);
}
static void app_sound_checkbutton_clicked_cb(GtkCheckButton *cb
, gpointer user_data)
{
-mark_appointment_changed((appt_win *)user_data);
set_sound_sensitivity((appt_win *)user_data);
+mark_appointment_changed((appt_win *)user_data);
}
#ifdef HAVE_NOTIFY
static void app_notify_checkbutton_clicked_cb(GtkCheckButton *cb
, gpointer user_data)
{
-mark_appointment_changed((appt_win *)user_data);
set_notify_sensitivity((appt_win *)user_data);
+mark_appointment_changed((appt_win *)user_data);
}
#endif
static void app_proc_checkbutton_clicked_cb(GtkCheckButton *cb
, gpointer user_data)
{
-mark_appointment_changed((appt_win *)user_data);
set_proc_sensitivity((appt_win *)user_data);
+mark_appointment_changed((appt_win *)user_data);
}
static void app_checkbutton_clicked_cb(GtkCheckButton *cb, gpointer user_data)
@@ -611,8 +597,7 @@
mark_appointment_changed((appt_win *)user_data);
}
-static void on_app_spin_button_changed_cb(GtkSpinButton *sb
-, gpointer user_data)
+static void on_app_spin_button_changed_cb(GtkSpinButton *sb, gpointer
user_data)
{
mark_appointment_changed((appt_win *)user_data);
}
@@ -698,40 +683,29 @@
gint result;
if (apptw-appointment_changed == TRUE) {
-result = xfce_message_dialog(GTK_WINDOW(apptw-Window),
- _(Warning
[Xfce4-commits] r26494 - xfcalendar/trunk/src
Author: juha
Date: 2007-12-18 23:31:14 + (Tue, 18 Dec 2007)
New Revision: 26494
Modified:
xfcalendar/trunk/src/appointment.h
xfcalendar/trunk/src/day-view.c
xfcalendar/trunk/src/day-view.h
xfcalendar/trunk/src/event-list.c
xfcalendar/trunk/src/event-list.h
xfcalendar/trunk/src/functions.c
xfcalendar/trunk/src/functions.h
Log:
day view improvments: added menus and toolbuttons
and made scrollbar to remember the position when changing day
Modified: xfcalendar/trunk/src/appointment.h
===
--- xfcalendar/trunk/src/appointment.h 2007-12-18 06:05:15 UTC (rev 26493)
+++ xfcalendar/trunk/src/appointment.h 2007-12-18 23:31:14 UTC (rev 26494)
@@ -29,16 +29,13 @@
typedef struct _appt_win
{
+GtkAccelGroup *accel_group;
+GtkTooltips *Tooltips;
+
GtkWidget *Window;
GtkWidget *Vbox;
GtkWidget *Menubar;
-GtkWidget *Revert;
-GtkWidget *Delete;
-GtkWidget *Duplicate;
-GtkWidget *Save;
-GtkWidget *SaveClose;
-
GtkWidget *File_menu;
GtkWidget *File_menu_save;
GtkWidget *File_menu_saveclose;
@@ -48,6 +45,11 @@
GtkWidget *File_menu_close;
GtkWidget *Toolbar;
+GtkWidget *Revert;
+GtkWidget *Delete;
+GtkWidget *Duplicate;
+GtkWidget *Save;
+GtkWidget *SaveClose;
GtkWidget *Notebook;
GtkWidget *General_notebook_page;
@@ -168,9 +170,6 @@
GtkWidget *Recur_byday_spin_hbox;
GtkWidget *Recur_byday_spin[7]; /* 0=Mo, 1=Tu ... 6=Su */
-GtkAccelGroup *accel_group;
-GtkTooltips *Tooltips;
-
xfical_appt *appt;
gchar *xf_uid;
gchar *par;
Modified: xfcalendar/trunk/src/day-view.c
===
--- xfcalendar/trunk/src/day-view.c 2007-12-18 06:05:15 UTC (rev 26493)
+++ xfcalendar/trunk/src/day-view.c 2007-12-18 23:31:14 UTC (rev 26494)
@@ -28,6 +28,7 @@
#include glib.h
#include glib/gprintf.h
+#include gdk/gdkkeysyms.h
#include gdk/gdk.h
#include gtk/gtk.h
@@ -39,9 +40,37 @@
#include event-list.h
#include appointment.h
-void program_log (const char *format, ...);
+
static void refresh_day_view_table(day_win *dw);
+static void set_scroll_position(day_win *dw)
+{
+GtkAdjustment *v_adj;
+
+v_adj = gtk_scrolled_window_get_vadjustment(
+GTK_SCROLLED_WINDOW(dw-scroll_win));
+if (dw-scroll_pos 0) /* we have old value */
+gtk_adjustment_set_value(v_adj, dw-scroll_pos);
+else if (dw-scroll_pos 0)
+/* default: let's try to start roughly from line 8 = 8 o'clock */
+gtk_adjustment_set_value(v_adj, v_adj-upper/3);
+}
+
+static gboolean scroll_position_timer(gpointer user_data)
+{
+set_scroll_position((day_win *)user_data);
+return(FALSE); /* only once */
+}
+
+static void get_scroll_position(day_win *dw)
+{
+GtkAdjustment *v_adj;
+
+v_adj = gtk_scrolled_window_get_vadjustment(
+GTK_SCROLLED_WINDOW(dw-scroll_win));
+dw-scroll_pos = gtk_adjustment_get_value(v_adj);
+}
+
static GtkWidget *build_line(day_win *dw, gint left_x, gint top_y
, gint width, gint height, GtkWidget *hour_line)
{
@@ -103,36 +132,194 @@
close_window((day_win *)user_data);
}
+static void on_Close_clicked(GtkButton *b, gpointer user_data)
+{
+close_window((day_win *)user_data);
+}
+
+static void create_new_appointment(day_win *dw)
+{
+char *s_date, a_day[10];
+
+s_date = (char *)gtk_button_get_label(GTK_BUTTON(dw-StartDate_button));
+strcpy(a_day, orage_i18_date_to_icaltime(s_date));
+
+create_appt_win(NEW, a_day, NULL);
+}
+
+static void on_File_newApp_activate_cb(GtkMenuItem *mi, gpointer user_data)
+{
+create_new_appointment((day_win *)user_data);
+}
+
+static void on_Create_toolbutton_clicked_cb(GtkButton *mi, gpointer user_data)
+{
+create_new_appointment((day_win *)user_data);
+}
+
+static void on_View_refresh_activate_cb(GtkMenuItem *mi, gpointer user_data)
+{
+refresh_day_view_table((day_win *)user_data);
+}
+
+static void on_Refresh_clicked(GtkButton *b, gpointer user_data)
+{
+refresh_day_view_table((day_win *)user_data);
+}
+
+static void changeSelectedDate(day_win *dw, gint day)
+{
+struct tm tm_date;
+
+tm_date = orage_i18_date_to_tm_date(
+gtk_button_get_label(GTK_BUTTON(dw-StartDate_button)));
+orage_move_day(tm_date, day);
+gtk_button_set_label(GTK_BUTTON(dw-StartDate_button)
+, orage_tm_date_to_i18_date(tm_date));
+refresh_day_view_table(dw);
+}
+
+static void go_to_today(day_win *dw)
+{
+gtk_button_set_label(GTK_BUTTON(dw-StartDate_button)
+, orage_localdate_i18());
+refresh_day_view_table(dw);
+}
+
+static void on_Today_clicked(GtkButton *b, gpointer user_data)
+{
+go_to_today((day_win *)user_data);
+}
+
+static void on_Go_today_activate_cb(GtkMenuItem *mi, gpointer user_data)
+{
+go_to_today((day_win *)user_data);
+}
+
+static void
[Xfce4-commits] r26496 - xfcalendar/trunk/src
Author: juha
Date: 2007-12-20 22:03:37 + (Thu, 20 Dec 2007)
New Revision: 26496
Modified:
xfcalendar/trunk/src/day-view.c
xfcalendar/trunk/src/functions.c
Log:
removed debug code from day_view
Modified: xfcalendar/trunk/src/day-view.c
===
--- xfcalendar/trunk/src/day-view.c 2007-12-19 22:48:12 UTC (rev 26495)
+++ xfcalendar/trunk/src/day-view.c 2007-12-20 22:03:37 UTC (rev 26496)
@@ -513,7 +513,6 @@
xfical_appt *appt;
int days = 1;
-program_log(\tapp_rows start);
days = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(dw-day_spin));
/* xfical_appt_get_next_on_day uses extra days so to show 7 days we need
* to pass days=6, which means 6 days in addition to the one */
@@ -525,7 +524,6 @@
add_row(dw, appt, a_day, days);
xfical_appt_free(appt);
}
-program_log(\tapp_rows end);
}
static void app_data(day_win *dw)
@@ -535,16 +533,13 @@
gint i;
gchar a_day[9]; /* mmdd */
-program_log(\tapp_data start);
ical_type = XFICAL_TYPE_EVENT;
strcpy(a_day, orage_i18_date_to_icaltime(gtk_button_get_label(
GTK_BUTTON(dw-StartDate_button;
/* first search base orage file */
-program_log(\tapp_data before open);
if (!xfical_file_open(TRUE))
return;
-program_log(\tapp_data after open);
strcpy(file_type, O00.);
app_rows(dw, a_day, ical_type, file_type);
/* then process all foreign files */
@@ -552,7 +547,6 @@
app_rows(dw, a_day, ical_type, file_type);
}
xfical_file_close(TRUE);
-program_log(\tapp_data done);
}
@@ -562,7 +556,6 @@
GtkWidget *ev, *hb;
GtkWidget *marker;
-program_log(fill_days started);
height = dw-StartDate_button_req.height;
width = dw-StartDate_button_req.width;
@@ -617,7 +610,6 @@
, (GTK_FILL), (0), 0, 0);
}
}
-program_log(fill_days done);
}
static void build_day_view_header(day_win *dw, char *start_date)
@@ -834,26 +826,19 @@
static void refresh_day_view_table(day_win *dw)
{
-program_log(* refresh_day_view_table started);
get_scroll_position(dw);
gtk_widget_destroy(dw-scroll_win_h);
-program_log(* refresh_day_view_table destroyed);
build_day_view_table(dw);
-program_log(* refresh_day_view_table built);
gtk_widget_show_all(dw-scroll_win_h);
-gtk_widget_show_now(dw-scroll_win_h);
-program_log(* refresh_day_view_table showed);
/* I was not able to get this work without the timer. Ugly yes, but
* it works and does not hurt - much */
g_timeout_add(100, (GtkFunction)scroll_position_timer, (gpointer)dw);
-program_log(* refresh_day_view_table done);
}
day_win *create_day_win(char *start_date)
{
day_win *dw;
-program_log(create_day_win started);
/* initialisation + main window + base vbox */
dw = g_new0(day_win, 1);
dw-scroll_pos = -1; /* not set */
@@ -872,16 +857,11 @@
build_menu(dw);
build_toolbar(dw);
-program_log(create_day_win toolbar done);
build_day_view_colours(dw);
build_day_view_header(dw, start_date);
-program_log(create_day_win header done);
build_day_view_table(dw);
-program_log(create_day_win table done);
gtk_widget_show_all(dw-Window);
-program_log(create_day_win show done);
set_scroll_position(dw);
-program_log(create_day_win done);
return(dw);
}
Modified: xfcalendar/trunk/src/functions.c
===
--- xfcalendar/trunk/src/functions.c2007-12-19 22:48:12 UTC (rev 26495)
+++ xfcalendar/trunk/src/functions.c2007-12-20 22:03:37 UTC (rev 26496)
@@ -52,6 +52,7 @@
* grep MARK /tmp/logfile.strace
* grep MARK /tmp/logfile.strace|sed s/, F_OK) = -1 ENOENT (No such file or
directory)//
* */
+/*
void program_log (const char *format, ...)
{
va_list args;
@@ -67,8 +68,8 @@
access (str, F_OK);
g_free (str);
}
+*/
-
GtkWidget *orage_create_combo_box_with_content(char *text[], int size)
{
register int i;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26497 - xfcalendar/trunk/src
Author: juha
Date: 2007-12-20 23:49:14 + (Thu, 20 Dec 2007)
New Revision: 26497
Modified:
xfcalendar/trunk/src/interface.c
xfcalendar/trunk/src/parameters.c
Log:
Fixed two small memory leaks.
libical file open still leaks, but that is hard to fix.
Modified: xfcalendar/trunk/src/interface.c
===
--- xfcalendar/trunk/src/interface.c2007-12-20 22:03:37 UTC (rev 26496)
+++ xfcalendar/trunk/src/interface.c2007-12-20 23:49:14 UTC (rev 26497)
@@ -106,11 +106,6 @@
return(FALSE);
}
-static void on_destroy(GtkWidget *window, gpointer user_data)
-{
- interface_lock = FALSE;
-}
-
void static orage_file_entry_changed(GtkWidget *dialog, gpointer user_data)
{
intf_win *intf_w = (intf_win *)user_data;
@@ -729,7 +724,9 @@
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;
}
void close_button_clicked(GtkButton *button, gpointer user_data)
@@ -742,6 +739,13 @@
close_intf_w(user_data);
}
+static gboolean on_Window_delete_event(GtkWidget *w, GdkEvent *e
+, gpointer user_data)
+{
+close_intf_w(user_data);
+return(FALSE);
+}
+
void create_menu(intf_win *intf_w)
{
/*
@@ -1315,8 +1319,8 @@
create_orage_file_tab(intf_w);
create_foreign_file_tab(intf_w);
- g_signal_connect(G_OBJECT(intf_w-main_window), destroy,
- G_CALLBACK(on_destroy), NULL);
+ g_signal_connect((gpointer)intf_w-main_window, delete_event,
+ G_CALLBACK(on_Window_delete_event), intf_w);
gtk_widget_show_all(intf_w-main_window);
drag_and_drop_init(intf_w);
Modified: xfcalendar/trunk/src/parameters.c
===
--- xfcalendar/trunk/src/parameters.c 2007-12-20 22:03:37 UTC (rev 26496)
+++ xfcalendar/trunk/src/parameters.c 2007-12-20 23:49:14 UTC (rev 26497)
@@ -820,7 +820,7 @@
void read_parameters(void)
{
-gchar *fpath;
+gchar *fpath, *fpath2;
XfceRc *rc;
gint i;
gchar f_par[100];
@@ -841,11 +841,14 @@
g_strdup(xfce_rc_read_entry(rc, Timezone, floating));
#ifdef HAVE_ARCHIVE
g_par.archive_limit = xfce_rc_read_int_entry(rc, Archive limit, 0);
-g_par.archive_file = g_strdup(xfce_rc_read_entry(rc, Archive file
-, orage_resource_file_location(ORAGE_DIR ARCFILE)));
+fpath2 = orage_resource_file_location(ORAGE_DIR ARCFILE);
+g_par.archive_file =
+g_strdup(xfce_rc_read_entry(rc, Archive file, fpath2));
+g_free(fpath2);
#endif
-g_par.orage_file = g_strdup(xfce_rc_read_entry(rc, Orage file
-, orage_resource_file_location(ORAGE_DIR APPFILE)));
+fpath2 = orage_resource_file_location(ORAGE_DIR APPFILE);
+g_par.orage_file = g_strdup(xfce_rc_read_entry(rc, Orage file, fpath2));
+g_free(fpath2);
g_par.sound_application =
g_strdup(xfce_rc_read_entry(rc, Sound application, play));
g_par.pos_x = xfce_rc_read_int_entry(rc, Main window X, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26517 - xfcalendar/trunk/src
Author: juha
Date: 2007-12-30 00:44:35 + (Sun, 30 Dec 2007)
New Revision: 26517
Modified:
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/event-list.c
xfcalendar/trunk/src/ical-code.c
Log:
1) Fix time initialization with new appointments.
2) Use upper case only search in event list when possible
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2007-12-29 01:32:03 UTC (rev 26516)
+++ xfcalendar/trunk/src/appointment.c 2007-12-30 00:44:35 UTC (rev 26517)
@@ -1346,7 +1346,7 @@
else
appt-start_tz_loc = g_strdup(floating);
appt-end_tz_loc = g_strdup(appt-start_tz_loc);
-appt-duration = 30;
+appt-duration = 30*60;
g_sprintf(appt-completedtime,%sT%02d%02d00
, today, t-tm_hour, t-tm_min);
appt-completed_tz_loc = g_strdup(appt-start_tz_loc);
Modified: xfcalendar/trunk/src/event-list.c
===
--- xfcalendar/trunk/src/event-list.c 2007-12-29 01:32:03 UTC (rev 26516)
+++ xfcalendar/trunk/src/event-list.c 2007-12-30 00:44:35 UTC (rev 26517)
@@ -408,7 +408,8 @@
gchar *search_string = NULL, file_type[8];
gint i;
-search_string = g_strdup(gtk_entry_get_text((GtkEntry *)el-search_entry));
+search_string = g_utf8_strup(gtk_entry_get_text(
+(GtkEntry *)el-search_entry),-1);
/* first search base orage file */
if (!xfical_file_open(TRUE))
return;
Modified: xfcalendar/trunk/src/ical-code.c
===
--- xfcalendar/trunk/src/ical-code.c2007-12-29 01:32:03 UTC (rev 26516)
+++ xfcalendar/trunk/src/ical-code.c2007-12-30 00:44:35 UTC (rev 26517)
@@ -4163,9 +4163,10 @@
{
#undef P_N
#define P_N xfical_appt_get_next_with_string_internal:
-static gchar *text, *beg, *end;
+static gchar *text_upper, *text, *beg, *end;
+static upper_text;
gchar *cur, *tmp, mem;
-gsize text_len;
+gsize text_len, len;
char *uid, ical_uid[XFICAL_UID_LEN+1];
xfical_appt *appt;
gboolean found_valid, search_done = FALSE;
@@ -4180,16 +4181,33 @@
if (first) {
/* FIXME: it would be good idea to convert to upper case.
* then we should not need to care about case and search would
- * be more user friendly
+ * be more user friendly.
+ * Note: This is not easy since UID must not be converted upper case
+ * or it will not be found.
*/
if (!g_file_get_contents(search_file, text, text_len, NULL)) {
g_warning(P_N Could not open Orage ical file (%s), search_file);
return(NULL);
}
+text_upper = g_utf8_strup(text, -1);
+if (text_len == strlen(text_upper)) {
+/* we can do upper case search since uppercase and original
+ * string have same format. In other words we can find UID since
+ * it starts in the same place in both strings (not 100 % sure,
+ * but works reliable enough until somebody files a bug...) */
+end = text_upper+text_len;
+beg = find_next(text_upper, end, \nBEGIN:);
+upper_text = TRUE;
+}
+else { /* sorry, has to settle for normal comparison */
/* let's find first BEGIN:VEVENT or BEGIN:VTODO or BEGIN:VJOURNAL
* to start our search */
-end = text+text_len;
-beg = find_next(text, end, \nBEGIN:);
+end = text+text_len;
+beg = find_next(text, end, \nBEGIN:);
+upper_text = FALSE;
+g_warning(P_N Can not do case independent comparison (%d/%d)
+, text_len, strlen(text_upper));
+}
if (!beg) {
g_warning(P_N Could not find initial BEGIN:V-type from Orage ical
file (%s)
, search_file);
@@ -4248,7 +4266,15 @@
search_done = TRUE;
}
else {
-sscanf(uid, UID:%sXFICAL_UID_LEN, ical_uid);
+if (upper_text) {
+/* we need to take UID from the original text, which
+ * has not been converted to upper case */
+len = uid-text_upper;
+tmp = text+len;
+sscanf(tmp, UID:%sXFICAL_UID_LEN, ical_uid);
+}
+else
+sscanf(uid, UID:%sXFICAL_UID_LEN, ical_uid);
if (strlen(ical_uid) XFICAL_UID_LEN-2) {
g_warning(P_N too long UID %s, ical_uid);
return(NULL);
@@ -4292,6 +4318,7 @@
}
g_free(text);
+g_free(text_upper);
if (!search_done) {
g_warning(P_N illegal ending %s, str
[Xfce4-commits] r26522 - in xfcalendar/trunk: . src
Author: juha Date: 2008-01-01 22:45:58 + (Tue, 01 Jan 2008) New Revision: 26522 Modified: xfcalendar/trunk/configure.in.in xfcalendar/trunk/src/about-xfcalendar.c xfcalendar/trunk/src/about-xfcalendar.h xfcalendar/trunk/src/appointment.c xfcalendar/trunk/src/appointment.h xfcalendar/trunk/src/day-view.c xfcalendar/trunk/src/day-view.h xfcalendar/trunk/src/event-list.c xfcalendar/trunk/src/event-list.h xfcalendar/trunk/src/functions.c xfcalendar/trunk/src/functions.h xfcalendar/trunk/src/ical-code.c xfcalendar/trunk/src/ical-code.h xfcalendar/trunk/src/interface.c xfcalendar/trunk/src/interface.h xfcalendar/trunk/src/main.c xfcalendar/trunk/src/mainbox.c xfcalendar/trunk/src/mainbox.h xfcalendar/trunk/src/orage-dbus-client.c xfcalendar/trunk/src/orage-dbus-object.c xfcalendar/trunk/src/orage-dbus-object.h xfcalendar/trunk/src/orage-dbus.h xfcalendar/trunk/src/orage-i18n.h xfcalendar/trunk/src/parameters.c xfcalendar/trunk/src/parameters.h xfcalendar/trunk/src/reminder.c xfcalendar/trunk/src/reminder.h xfcalendar/trunk/src/tray_icon.c xfcalendar/trunk/src/tray_icon.h Log: 1) fixed few memory leaks 2) finalized texts 3) update copyright to include new year 2008 Modified: xfcalendar/trunk/configure.in.in === --- xfcalendar/trunk/configure.in.in2008-01-01 22:29:56 UTC (rev 26521) +++ xfcalendar/trunk/configure.in.in2008-01-01 22:45:58 UTC (rev 26522) @@ -9,7 +9,7 @@ dnl dnl Version information -m4_define([orage_version], [4.5.11.3-svn]) +m4_define([orage_version], [4.5.12.0-svn]) m4_define([gtk_minimum_version], [2.6.0]) m4_define([xfce_minimum_version], [4.4.0]) Modified: xfcalendar/trunk/src/about-xfcalendar.c === --- xfcalendar/trunk/src/about-xfcalendar.c 2008-01-01 22:29:56 UTC (rev 26521) +++ xfcalendar/trunk/src/about-xfcalendar.c 2008-01-01 22:45:58 UTC (rev 26522) @@ -1,6 +1,6 @@ /* Orage - Calendar and alarm handler * - * Copyright (c) 2005-2007 Juha Kautto (juha at xfce.org) + * Copyright (c) 2005-2008 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 @@ -40,7 +40,7 @@ about = xfce_about_info_new(Orage, VERSION , _(Manage your time with Xfce4) - , XFCE_COPYRIGHT_TEXT(2003-2007, Juha Kautto) + , XFCE_COPYRIGHT_TEXT(2003-2008, Juha Kautto) , XFCE_LICENSE_GPL); orage_logo = orage_create_icon(xfcal, FALSE, 48, 48); xfce_about_info_set_homepage(about, http://www.xfce.org;); Modified: xfcalendar/trunk/src/about-xfcalendar.h === --- xfcalendar/trunk/src/about-xfcalendar.h 2008-01-01 22:29:56 UTC (rev 26521) +++ xfcalendar/trunk/src/about-xfcalendar.h 2008-01-01 22:45:58 UTC (rev 26522) @@ -1,6 +1,6 @@ /* Orage - Calendar and alarm handler * - * Copyright (c) 2006-2007 Juha Kautto (juha at xfce.org) + * Copyright (c) 2006-2008 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 Modified: xfcalendar/trunk/src/appointment.c === --- xfcalendar/trunk/src/appointment.c 2008-01-01 22:29:56 UTC (rev 26521) +++ xfcalendar/trunk/src/appointment.c 2008-01-01 22:45:58 UTC (rev 26522) @@ -1,6 +1,6 @@ /* Orage - Calendar and alarm handler * - * Copyright (c) 2005-2007 Juha Kautto (juha at xfce.org) + * Copyright (c) 2005-2008 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 Modified: xfcalendar/trunk/src/appointment.h === --- xfcalendar/trunk/src/appointment.h 2008-01-01 22:29:56 UTC (rev 26521) +++ xfcalendar/trunk/src/appointment.h 2008-01-01 22:45:58 UTC (rev 26522) @@ -1,6 +1,6 @@ /* Orage - Calendar and alarm handler * - * Copyright (c) 2005-2007 Juha Kautto (juha at xfce.org) + * Copyright (c) 2005-2008 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 Modified: xfcalendar/trunk/src/day-view.c === --- xfcalendar/trunk/src/day-view.c 2008-01-01 22:29:56 UTC (rev 26521) +++ xfcalendar/trunk/src/day-view.c 2008-01-01 22:45:58 UTC (rev 26522) @@ -1,6 +1,6 @@ /* Orage - Calendar and alarm handler * - * Copyright (c) 2007 Juha Kautto (juha at xfce.org) + * Copyright (c) 2007-2008 Juha Kautto (juha at xfce.org
[Xfce4-commits] r26583 - xfcalendar/branches/xfce_4_4
Author: juha Date: 2008-01-21 21:23:02 + (Mon, 21 Jan 2008) New Revision: 26583 Modified: xfcalendar/branches/xfce_4_4/xfcalendar.desktop.in Log: fixed Bug 3758 - Orage doesn't run in non Xfce sessions It still does not run, but now it is not visible either. Modified: xfcalendar/branches/xfce_4_4/xfcalendar.desktop.in === --- xfcalendar/branches/xfce_4_4/xfcalendar.desktop.in 2008-01-20 21:58:49 UTC (rev 26582) +++ xfcalendar/branches/xfce_4_4/xfcalendar.desktop.in 2008-01-21 21:23:02 UTC (rev 26583) @@ -9,4 +9,5 @@ Terminal=false Type=Application Categories=X-XFCE;Calendar;GTK; +OnlyShowIn=XFCE; _GenericName=Calendar ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26591 - xfcalendar/branches
Author: juha Date: 2008-02-01 13:41:32 + (Fri, 01 Feb 2008) New Revision: 26591 Added: xfcalendar/branches/orage_4_5/ Log: Branch Orage release 4.5 Copied: xfcalendar/branches/orage_4_5 (from rev 26590, xfcalendar/trunk) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26592 - xfcalendar/tags
Author: juha Date: 2008-02-01 13:46:37 + (Fri, 01 Feb 2008) New Revision: 26592 Added: xfcalendar/tags/orage_4_5_12/ Log: Tag for Orage release 4.5.12 Copied: xfcalendar/tags/orage_4_5_12 (from rev 26591, xfcalendar/branches/orage_4_5) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26593 - in xfcalendar/trunk: . panel-plugin src
Author: juha
Date: 2008-02-02 00:42:52 + (Sat, 02 Feb 2008)
New Revision: 26593
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/panel-plugin/orageclock.c
xfcalendar/trunk/src/mainbox.c
Log:
Fixed Bug 3829 - GLib-Critical on g_source_remove in orageclock
Fixed also
Gtk-CRITICAL **: calendar_invalidate_day_num: assertion `row != -1' failed
which could happen when changing month in Orage main window.
Release 4.5.12.3
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-02-01 13:46:37 UTC (rev 26592)
+++ xfcalendar/trunk/configure.in.in2008-02-02 00:42:52 UTC (rev 26593)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.12.2-svn])
+m4_define([orage_version], [4.5.12.3-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/panel-plugin/orageclock.c
===
--- xfcalendar/trunk/panel-plugin/orageclock.c 2008-02-01 13:46:37 UTC (rev
26592)
+++ xfcalendar/trunk/panel-plugin/orageclock.c 2008-02-02 00:42:52 UTC (rev
26593)
@@ -386,7 +386,9 @@
if (dlg)
gtk_widget_destroy(dlg);
-g_source_remove(clock-timeout_id);
+if (clock-timeout_id) {
+g_source_remove(clock-timeout_id);
+}
g_object_unref(clock-tips);
g_object_unref(clock-line[0].label);
g_object_unref(clock-line[1].label);
Modified: xfcalendar/trunk/src/mainbox.c
===
--- xfcalendar/trunk/src/mainbox.c 2008-02-01 13:46:37 UTC (rev 26592)
+++ xfcalendar/trunk/src/mainbox.c 2008-02-02 00:42:52 UTC (rev 26593)
@@ -51,9 +51,18 @@
#include tray_icon.h
#include day-view.h
+/*
+#define ORAGE_DEBUG 1
+*/
+
gboolean orage_mark_appointments()
{
+#undef P_N
+#define P_N orage_mark_appointments:
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
if (!xfical_file_open(TRUE))
return(FALSE);
xfical_mark_calendar(GTK_CALENDAR(g_par.xfcal-mCalendar));
@@ -63,9 +72,14 @@
static void mFile_newApp_activate_cb(GtkMenuItem *menuitem, gpointer user_data)
{
+#undef P_N
+#define P_N mFile_newApp_activate_cb:
struct tm *t;
char cur_date[9];
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
t = orage_localtime();
g_snprintf(cur_date, 9, %04d%02d%02d, t-tm_year+1900
, t-tm_mon+1, t-tm_mday);
@@ -75,55 +89,95 @@
static void mFile_interface_activate_cb(GtkMenuItem *menuitem
, gpointer user_data)
{
+#undef P_N
+#define P_N mFile_interface_activate_cb:
CalWin *cal = (CalWin *)user_data;
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
orage_external_interface(cal);
}
static void mFile_close_activate_cb(GtkMenuItem *menuitem, gpointer user_data)
{
+#undef P_N
+#define P_N mFile_close_activate_cb:
CalWin *cal = (CalWin *)user_data;
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
gtk_widget_hide(cal-mWindow);
}
static void mFile_quit_activate_cb(GtkMenuItem *menuitem, gpointer user_data)
{
+#undef P_N
+#define P_N mFile_quit_activate_cb:
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
gtk_main_quit();
}
static void mEdit_preferences_activate_cb(GtkMenuItem *menuitem
, gpointer user_data)
{
+#undef P_N
+#define P_N mEdit_preferences_activate_cb:
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
show_parameters();
}
static void mView_ViewSelectedDate_activate_cb(GtkMenuItem *menuitem
, gpointer user_data)
{
+#undef P_N
+#define P_N mView_ViewSelectedDate_activate_cb:
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
create_el_win(NULL);
}
static void mView_ViewSelectedWeek_activate_cb(GtkMenuItem *menuitem
, gpointer user_data)
{
+#undef P_N
+#define P_N mView_ViewSelectedWeek_activate_cb:
CalWin *cal = (CalWin *)user_data;
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
create_day_win(orage_cal_to_i18_date(GTK_CALENDAR(cal-mCalendar)));
}
static void mView_selectToday_activate_cb(GtkMenuItem *menuitem
, gpointer user_data)
{
+#undef P_N
+#define P_N mView_selectToday_activate_cb:
CalWin *cal = (CalWin *)user_data;
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
orage_select_today(GTK_CALENDAR(cal-mCalendar));
}
static void mHelp_help_activate_cb(GtkMenuItem *menuitem, gpointer user_data)
{
+#undef P_N
+#define P_N mHelp_help_activate_cb:
gchar *helpdoc;
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
helpdoc = g_strconcat(xfbrowser4 , PACKAGE_DATA_DIR
, G_DIR_SEPARATOR_S, orage
, G_DIR_SEPARATOR_S, doc
@@ -134,38 +188,22 @@
static void mHelp_about_activate_cb(GtkMenuItem *menuitem, gpointer user_data)
{
+#undef P_N
[Xfce4-commits] r26600 - in xfcalendar/trunk: . src
Author: juha
Date: 2008-02-07 20:51:01 + (Thu, 07 Feb 2008)
New Revision: 26600
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/appointment.h
xfcalendar/trunk/src/day-view.c
xfcalendar/trunk/src/day-view.h
xfcalendar/trunk/src/event-list.c
xfcalendar/trunk/src/event-list.h
xfcalendar/trunk/src/mainbox.c
xfcalendar/trunk/src/reminder.c
xfcalendar/trunk/src/tray_icon.c
Log:
1) Fixing BUG 3835 - No visual confirmation of setting
now it works similarly than Orage 4.4 but correctly
2) Fixed error in day view when showing reserved time for
appointments crossing day change.
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-02-07 08:04:21 UTC (rev 26599)
+++ xfcalendar/trunk/configure.in.in2008-02-07 20:51:01 UTC (rev 26600)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.12.3-svn])
+m4_define([orage_version], [4.5.12.4-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2008-02-07 08:04:21 UTC (rev 26599)
+++ xfcalendar/trunk/src/appointment.c 2008-02-07 20:51:01 UTC (rev 26600)
@@ -670,6 +670,10 @@
static void app_free_memory(appt_win *apptw)
{
+/* remove myself from event list appointment monitoring list */
+if (apptw-el)
+((el_win *)apptw-el)-apptw_list =
+g_list_remove(((el_win *)apptw-el)-apptw_list, apptw);
gtk_widget_destroy(apptw-Window);
gtk_object_destroy(GTK_OBJECT(apptw-Tooltips));
g_free(apptw-xf_uid);
@@ -1044,11 +1048,8 @@
if (ok) {
apptw-appointment_new = FALSE;
mark_appointment_unchanged(apptw);
-/* FIXME: Removed since it fails if event_list window has been removed.
- * We should check that it really still exists, before calling this.
if (apptw-el != NULL)
refresh_el_win((el_win *)apptw-el);
-*/
orage_mark_appointments();
}
}
@@ -1108,11 +1109,8 @@
xfical_file_close(TRUE);
}
-/* FIXME: This fails if event_list window has been removed.
- * We should check that it really still exists, before calling this.
if (apptw-el != NULL)
refresh_el_win((el_win *)apptw-el);
-*/
orage_mark_appointments();
app_free_memory(apptw);
@@ -1135,7 +1133,8 @@
gint x, y;
appt_win *apptw2;
-apptw2 = create_appt_win(COPY, apptw-xf_uid, apptw-el);
+/* do not keep track of appointments created here */
+apptw2 = create_appt_win(COPY, apptw-xf_uid);
gtk_window_get_position(GTK_WINDOW(apptw-Window), x, y);
gtk_window_move(GTK_WINDOW(apptw2-Window), x+20, y+20);
}
@@ -2343,7 +2342,7 @@
}
}
-appt_win *create_appt_win(char *action, char *par, el_win *event_list)
+appt_win *create_appt_win(char *action, char *par)
{
appt_win *apptw;
GdkWindow *window;
@@ -2353,7 +2352,7 @@
apptw-xf_uid = NULL;
apptw-par = NULL;
apptw-appt = NULL;
-apptw-el = event_list;/* Keep track of the parent, if any */
+apptw-el = NULL;
apptw-appointment_changed = FALSE;
apptw-Tooltips = gtk_tooltips_new();
apptw-accel_group = gtk_accel_group_new();
@@ -2395,6 +2394,7 @@
}
else { /* failed to get data */
app_free_memory(apptw);
+apptw = NULL;
}
return(apptw);
Modified: xfcalendar/trunk/src/appointment.h
===
--- xfcalendar/trunk/src/appointment.h 2008-02-07 08:04:21 UTC (rev 26599)
+++ xfcalendar/trunk/src/appointment.h 2008-02-07 20:51:01 UTC (rev 26600)
@@ -25,7 +25,6 @@
#define __APPOINTMENT_H__
#include ical-code.h
-#include event-list.h
typedef struct _appt_win
{
@@ -173,7 +172,7 @@
xfical_appt *appt;
gchar *xf_uid;
gchar *par;
-el_win *el;
+void *el; /* used to refresh calling event list */
gboolean appointment_add; /* are we adding app */
gboolean appointment_changed; /* has this app been modified now */
gboolean appointment_new; /* is this new = no uid yet */
@@ -181,6 +180,6 @@
* add == TRUE new == FALSE */
} appt_win;
-appt_win *create_appt_win(char *action, char *par, el_win *el);
+appt_win *create_appt_win(char *action, char *par);
#endif /* !__APPOINTMENT_H__ */
Modified: xfcalendar/trunk/src/day-view.c
===
--- xfcalendar/trunk/src/day-view.c 2008-02-07 08:04:21 UTC (rev 26599)
+++ xfcalendar/trunk/src/day-view.c 2008-02-07 20:51:01 UTC (rev 26600)
@@ -144,7 +144,7 @@
s_date = (char *)gtk_button_get_label
[Xfce4-commits] r26601 - xfcalendar/trunk/src
Author: juha
Date: 2008-02-07 21:49:38 + (Thu, 07 Feb 2008)
New Revision: 26601
Modified:
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/appointment.h
xfcalendar/trunk/src/day-view.c
xfcalendar/trunk/src/event-list.c
xfcalendar/trunk/src/parameters.c
Log:
Refreshing day list similarly to event list
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2008-02-07 20:51:01 UTC (rev 26600)
+++ xfcalendar/trunk/src/appointment.c 2008-02-07 21:49:38 UTC (rev 26601)
@@ -49,6 +49,7 @@
#include mainbox.h
#include ical-code.h
#include event-list.h
+#include day-view.h
#include appointment.h
#include parameters.h
@@ -674,6 +675,10 @@
if (apptw-el)
((el_win *)apptw-el)-apptw_list =
g_list_remove(((el_win *)apptw-el)-apptw_list, apptw);
+/* remove myself from day list appointment monitoring list */
+else if (apptw-dw)
+((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);
@@ -1016,6 +1021,15 @@
appWindow_check_and_close((appt_win *)user_data);
}
+static void refresh_dependent_data(appt_win *apptw)
+{
+if (apptw-el != NULL)
+refresh_el_win((el_win *)apptw-el);
+if (apptw-dw != NULL)
+refresh_day_win((day_win *)apptw-dw);
+orage_mark_appointments();
+}
+
static gboolean save_xfical_from_appt_win(appt_win *apptw)
{
gboolean ok = FALSE;
@@ -1048,9 +1062,7 @@
if (ok) {
apptw-appointment_new = FALSE;
mark_appointment_unchanged(apptw);
-if (apptw-el != NULL)
-refresh_el_win((el_win *)apptw-el);
-orage_mark_appointments();
+refresh_dependent_data(apptw);
}
}
return(ok);
@@ -1109,10 +1121,7 @@
xfical_file_close(TRUE);
}
-if (apptw-el != NULL)
-refresh_el_win((el_win *)apptw-el);
-orage_mark_appointments();
-
+refresh_dependent_data(apptw);
app_free_memory(apptw);
}
}
@@ -2353,6 +2362,7 @@
apptw-par = NULL;
apptw-appt = NULL;
apptw-el = NULL;
+apptw-dw = NULL;
apptw-appointment_changed = FALSE;
apptw-Tooltips = gtk_tooltips_new();
apptw-accel_group = gtk_accel_group_new();
Modified: xfcalendar/trunk/src/appointment.h
===
--- xfcalendar/trunk/src/appointment.h 2008-02-07 20:51:01 UTC (rev 26600)
+++ xfcalendar/trunk/src/appointment.h 2008-02-07 21:49:38 UTC (rev 26601)
@@ -173,6 +173,7 @@
gchar *xf_uid;
gchar *par;
void *el; /* used to refresh calling event list */
+void *dw; /* used to refresh calling day list */
gboolean appointment_add; /* are we adding app */
gboolean appointment_changed; /* has this app been modified now */
gboolean appointment_new; /* is this new = no uid yet */
Modified: xfcalendar/trunk/src/day-view.c
===
--- xfcalendar/trunk/src/day-view.c 2008-02-07 20:51:01 UTC (rev 26600)
+++ xfcalendar/trunk/src/day-view.c 2008-02-07 21:49:38 UTC (rev 26601)
@@ -40,8 +40,18 @@
#include event-list.h
#include appointment.h
+static void do_appt_win(char *mode, char *uid, day_win *dw)
+{
+appt_win *apptw;
-static void refresh_day_view_table(day_win *dw);
+apptw = create_appt_win(mode, uid);
+if (apptw) {
+/* we started this, so keep track of it */
+dw-apptw_list = g_list_prepend(dw-apptw_list, apptw);
+/* inform the appointment that we are interested in it */
+apptw-dw = dw;
+}
+};
static void set_scroll_position(day_win *dw)
{
@@ -114,6 +124,23 @@
static void close_window(day_win *dw)
{
+appt_win *apptw;
+GList *apptw_list;
+
+/* need to clean the appointment list and inform all appointments that
+ * we are not interested anymore (= should not get updated) */
+apptw_list = dw-apptw_list;
+for (apptw_list = g_list_first(apptw_list);
+ apptw_list != NULL;
+ apptw_list = g_list_next(apptw_list)) {
+apptw = (appt_win *)apptw_list-data;
+if (apptw) /* appointment window is still alive */
+apptw-dw = NULL; /* not interested anymore */
+else
+orage_message(110, close_window: not null appt window);
+}
+g_list_free(dw-apptw_list);
+
gtk_widget_destroy(dw-Window);
gtk_object_destroy(GTK_OBJECT(dw-Tooltips));
g_free(dw);
@@ -144,7 +171,7 @@
s_date = (char *)gtk_button_get_label(GTK_BUTTON(dw-StartDate_button));
strcpy(a_day, orage_i18_date_to_icaltime(s_date));
-create_appt_win(NEW, a_day);
+do_appt_win(NEW, a_day, dw
[Xfce4-commits] r26602 - in xfcalendar/trunk: . src
Author: juha
Date: 2008-02-07 22:42:22 + (Thu, 07 Feb 2008)
New Revision: 26602
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/src/day-view.h
xfcalendar/trunk/src/mainbox.c
Log:
made todo box under the main window invisible when it is empty
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-02-07 21:49:38 UTC (rev 26601)
+++ xfcalendar/trunk/configure.in.in2008-02-07 22:42:22 UTC (rev 26602)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.12.4-svn])
+m4_define([orage_version], [4.5.12.5-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/src/day-view.h
===
--- xfcalendar/trunk/src/day-view.h 2008-02-07 21:49:38 UTC (rev 26601)
+++ xfcalendar/trunk/src/day-view.h 2008-02-07 22:42:22 UTC (rev 26602)
@@ -72,8 +72,10 @@
gdouble scroll_pos; /* remember the scroll position */
GdkColor bg1, bg2, line_color, bg_today, fg_sunday;
+GList*apptw_list; /* keep track of appointments being updated */
} day_win;
day_win *create_day_win(char *start_date);
+void refresh_day_win(day_win *dw);
#endif /* !__DAY_VIEW_H__ */
Modified: xfcalendar/trunk/src/mainbox.c
===
--- xfcalendar/trunk/src/mainbox.c 2008-02-07 21:49:38 UTC (rev 26601)
+++ xfcalendar/trunk/src/mainbox.c 2008-02-07 22:42:22 UTC (rev 26602)
@@ -480,8 +480,6 @@
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
-gtk_widget_destroy(cal-mInfo_scrolledWin);
-create_mainbox_info();
t = orage_localtime();
s_time = orage_tm_time_to_icaltime(t);
@@ -507,12 +505,17 @@
xfical_file_close(TRUE);
*/
if (todo_list) {
+gtk_widget_destroy(cal-mInfo_scrolledWin);
+create_mainbox_info();
todo_list = g_list_sort(todo_list, todo_order);
g_list_foreach(todo_list, (GFunc)todo_process, NULL);
g_list_free(todo_list);
todo_list = NULL;
+gtk_widget_show_all(cal-mInfo_scrolledWin);
}
-gtk_widget_show_all(cal-mInfo_scrolledWin);
+else {
+gtk_widget_hide_all(cal-mInfo_scrolledWin);
+}
}
void build_mainWin()
@@ -568,7 +571,9 @@
/* Build the Info box */
create_mainbox_info();
+/*
gtk_widget_show_all(cal-mInfo_scrolledWin);
+*/
/* Signals */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26603 - xfcalendar/trunk/src
Author: juha Date: 2008-02-09 16:22:39 + (Sat, 09 Feb 2008) New Revision: 26603 Modified: xfcalendar/trunk/src/parameters.c Log: Fixed problem in preferences when setting stick or on top properties. Modified: xfcalendar/trunk/src/parameters.c === --- xfcalendar/trunk/src/parameters.c 2008-02-07 22:42:22 UTC (rev 26602) +++ xfcalendar/trunk/src/parameters.c 2008-02-09 16:22:39 UTC (rev 26603) @@ -205,7 +205,7 @@ g_par.set_stick = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( itf-set_stick_checkbutton)); -set_menu(); +set_stick(); } static void set_ontop() @@ -220,7 +220,7 @@ g_par.set_ontop = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( itf-set_ontop_checkbutton)); -set_menu(); +set_ontop(); } static void set_taskbar() ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26609 - in xfcalendar/trunk: . src
Author: juha Date: 2008-02-14 10:43:01 + (Thu, 14 Feb 2008) New Revision: 26609 Modified: xfcalendar/trunk/configure.in.in xfcalendar/trunk/src/functions.c Log: Fixed Bug 3851 - strptime implicitly converted to pointer - in theory this could have caused segfault on ia64/amd64. - fix provided by Debian development team Modified: xfcalendar/trunk/configure.in.in === --- xfcalendar/trunk/configure.in.in2008-02-13 22:33:04 UTC (rev 26608) +++ xfcalendar/trunk/configure.in.in2008-02-14 10:43:01 UTC (rev 26609) @@ -9,7 +9,7 @@ dnl dnl Version information -m4_define([orage_version], [4.5.12.5-svn]) +m4_define([orage_version], [4.5.12.6-svn]) m4_define([gtk_minimum_version], [2.6.0]) m4_define([xfce_minimum_version], [4.4.0]) Modified: xfcalendar/trunk/src/functions.c === --- xfcalendar/trunk/src/functions.c2008-02-13 22:33:04 UTC (rev 26608) +++ xfcalendar/trunk/src/functions.c2008-02-14 10:43:01 UTC (rev 26609) @@ -21,16 +21,18 @@ */ +#define _XOPEN_SOURCE /* glibc2 needs this */ + #include stdio.h #include stdlib.h #include unistd.h -#define _XOPEN_SOURCE /* glibc2 needs this */ #include time.h #include string.h #include sys/types.h #include sys/wait.h #include glib.h +#include glib/gprintf.h #include gtk/gtk.h #include gdk/gdk.h ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26610 - in xfcalendar/trunk: . src
Author: juha
Date: 2008-02-14 11:25:56 + (Thu, 14 Feb 2008)
New Revision: 26610
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/src/appointment.c
Log:
Fixed Bug 3841 - Appointment end time not updated when start time is changed
By default Orage now uses duration, which eliminates this problem.
End date is still not update automatically.
Also added sound to be default alarm in addition to visible alarm.
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-02-14 10:43:01 UTC (rev 26609)
+++ xfcalendar/trunk/configure.in.in2008-02-14 11:25:56 UTC (rev 26610)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.12.6-svn])
+m4_define([orage_version], [4.5.12.7-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2008-02-14 10:43:01 UTC (rev 26609)
+++ xfcalendar/trunk/src/appointment.c 2008-02-14 11:25:56 UTC (rev 26610)
@@ -1355,6 +1355,8 @@
appt-start_tz_loc = g_strdup(floating);
appt-end_tz_loc = g_strdup(appt-start_tz_loc);
appt-duration = 30*60;
+/* use duration by default for new appointments */
+appt-use_duration = TRUE;
g_sprintf(appt-completedtime,%sT%02d%02d00
, today, t-tm_hour, t-tm_min);
appt-completed_tz_loc = g_strdup(appt-start_tz_loc);
@@ -1366,8 +1368,10 @@
appt-soundrepeat_cnt = 500;
appt-soundrepeat_len = 2;
-/* default alarm type is orage window */
+/* default alarm type is orage window and sound */
appt-display_alarm_orage = TRUE;
+appt-sound_alarm = TRUE;
+/* default sound file is set in fill_appt_window */
}
else if ((strcmp(action, UPDATE) == 0) || (strcmp(action, COPY) == 0))
{
/* par contains ical uid */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26611 - in xfcalendar/trunk: . plugin
Author: juha
Date: 2008-02-14 20:06:31 + (Thu, 14 Feb 2008)
New Revision: 26611
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/plugin/Makefile.am
xfcalendar/trunk/plugin/xfcalendar_plugin.c
Log:
Fixed possible problem in searching the icon.
Now using full path as last effort.
Patch provided by MaLiK
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-02-14 11:25:56 UTC (rev 26610)
+++ xfcalendar/trunk/configure.in.in2008-02-14 20:06:31 UTC (rev 26611)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.12.7-svn])
+m4_define([orage_version], [4.5.12.8-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/plugin/Makefile.am
===
--- xfcalendar/trunk/plugin/Makefile.am 2008-02-14 11:25:56 UTC (rev 26610)
+++ xfcalendar/trunk/plugin/Makefile.am 2008-02-14 20:06:31 UTC (rev 26611)
@@ -3,17 +3,18 @@
orage_plugin_LTLIBRARIES = orage_plugin.la
-orage_plugin_la_LDFLAGS = \
+orage_plugin_la_LDFLAGS = \
-avoid-version \
-module
-orage_plugin_la_SOURCES = \
+orage_plugin_la_SOURCES = \
xfcalendar_plugin.c
-orage_plugin_la_CFLAGS = \
- $(XFCE_MCS_MANAGER_CFLAGS) \
- -DPACKAGE_LOCALE_DIR=\$(localedir)\ \
- -DSYSCONFDIR=\$(sysconfdir)\ \
+orage_plugin_la_CFLAGS = \
+ $(XFCE_MCS_MANAGER_CFLAGS) \
+ -DBINDIR=\$(bindir)\ \
+ -DPACKAGE_LOCALE_DIR=\$(localedir)\ \
+ -DSYSCONFDIR=\$(sysconfdir)\ \
-DDATADIR=\$(pkgdatadir)\
desktopdir = $(datadir)/applications
Modified: xfcalendar/trunk/plugin/xfcalendar_plugin.c
===
--- xfcalendar/trunk/plugin/xfcalendar_plugin.c 2008-02-14 11:25:56 UTC (rev
26610)
+++ xfcalendar/trunk/plugin/xfcalendar_plugin.c 2008-02-14 20:06:31 UTC (rev
26611)
@@ -34,11 +34,25 @@
static void run_dialog(McsPlugin *mcs_plugin)
{
-g_spawn_command_line_async(orage -p, NULL);
+GtkWidget *message;
+GError*error = NULL;
+
+if (!g_spawn_command_line_async(BINDIR G_DIR_SEPARATOR_S orage -p
+, error)) {
+message = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR
+, GTK_BUTTONS_OK, %s., _(Failed to launch 'orage -p'));
+gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG (message)
+, %s., error-message);
+gtk_dialog_run(GTK_DIALOG(message));
+gtk_widget_destroy(message);
+g_error_free(error);
+}
}
McsPluginInitResult mcs_plugin_init(McsPlugin *mcs_plugin)
{
+GtkIconTheme *icon_theme;
+
/* This is required for UTF-8 at least - Please don't remove it */
xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, UTF-8);
@@ -46,7 +60,23 @@
/* the button label in the xfce-mcs-manager dialog */
mcs_plugin-caption = g_strdup(_(Orage - Calendar));
mcs_plugin-run_dialog = run_dialog;
-mcs_plugin-icon = xfce_themed_icon_load(xfcalendar, 48);
+/* search the icon */
+/* mcs_plugin-icon = xfce_themed_icon_load(xfcalendar, 48); */
+icon_theme = gtk_icon_theme_get_default();
+mcs_plugin-icon = gtk_icon_theme_load_icon(icon_theme, xfcalendar
+, 48, 0, NULL);
+/* if that didn't work, we know where we installed the icon,
+ * so load it directly */
+if (mcs_plugin-icon == NULL)
+mcs_plugin-icon = gdk_pixbuf_new_from_file(DATADIR
+/icons/hicolor/48x48/apps/xfcalendar.png, NULL);
+
+/* attach icon name to the plugin icon (if any) */
+if (mcs_plugin-icon != NULL)
+g_object_set_data_full(G_OBJECT(mcs_plugin-icon)
+, mcs-plugin-icon-name, g_strdup(xfcalendar), g_free);
+
+
return(MCS_PLUGIN_INIT_OK);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26613 - in xfcalendar/trunk: . libical/zoneinfo libical/zoneinfo/America libical/zoneinfo/America/Argentina src
Author: juha Date: 2008-02-14 23:47:29 + (Thu, 14 Feb 2008) New Revision: 26613 Added: xfcalendar/trunk/libical/zoneinfo/America/Argentina/ xfcalendar/trunk/libical/zoneinfo/America/Argentina/Buenos_Aires.ics xfcalendar/trunk/libical/zoneinfo/America/Argentina/Catamarca.ics xfcalendar/trunk/libical/zoneinfo/America/Argentina/Cordoba.ics xfcalendar/trunk/libical/zoneinfo/America/Argentina/Jujuy.ics xfcalendar/trunk/libical/zoneinfo/America/Argentina/Mendoza.ics Modified: xfcalendar/trunk/configure.in.in xfcalendar/trunk/libical/zoneinfo/Makefile.am xfcalendar/trunk/libical/zoneinfo/zones.tab xfcalendar/trunk/src/ical-code.c Log: Fixed Bug 3834 - Time zone database incorrect Argentina changed its timezone and timezone names. Updated Orage to utilise the new ones (left also old) Modified: xfcalendar/trunk/configure.in.in === --- xfcalendar/trunk/configure.in.in2008-02-14 22:55:10 UTC (rev 26612) +++ xfcalendar/trunk/configure.in.in2008-02-14 23:47:29 UTC (rev 26613) @@ -9,7 +9,7 @@ dnl dnl Version information -m4_define([orage_version], [4.5.12.8-svn]) +m4_define([orage_version], [4.5.12.9-svn]) m4_define([gtk_minimum_version], [2.6.0]) m4_define([xfce_minimum_version], [4.4.0]) Added: xfcalendar/trunk/libical/zoneinfo/America/Argentina/Buenos_Aires.ics === --- xfcalendar/trunk/libical/zoneinfo/America/Argentina/Buenos_Aires.ics (rev 0) +++ xfcalendar/trunk/libical/zoneinfo/America/Argentina/Buenos_Aires.ics 2008-02-14 23:47:29 UTC (rev 26613) @@ -0,0 +1,14 @@ +BEGIN:VCALENDAR +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN +VERSION:2.0 +BEGIN:VTIMEZONE +TZID:/softwarestudio.org/Olson_20011030_5/America/Argentina/Buenos_Aires +X-LIC-LOCATION:America/Argentina/Buenos_Aires +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0200 +TZNAME:ART +DTSTART:19700101T00 +END:STANDARD +END:VTIMEZONE +END:VCALENDAR Added: xfcalendar/trunk/libical/zoneinfo/America/Argentina/Catamarca.ics === --- xfcalendar/trunk/libical/zoneinfo/America/Argentina/Catamarca.ics (rev 0) +++ xfcalendar/trunk/libical/zoneinfo/America/Argentina/Catamarca.ics 2008-02-14 23:47:29 UTC (rev 26613) @@ -0,0 +1,14 @@ +BEGIN:VCALENDAR +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN +VERSION:2.0 +BEGIN:VTIMEZONE +TZID:/softwarestudio.org/Olson_20011030_5/America/Argentina/Catamarca +X-LIC-LOCATION:America/Argentina/Catamarca +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0200 +TZNAME:ART +DTSTART:19700101T00 +END:STANDARD +END:VTIMEZONE +END:VCALENDAR Added: xfcalendar/trunk/libical/zoneinfo/America/Argentina/Cordoba.ics === --- xfcalendar/trunk/libical/zoneinfo/America/Argentina/Cordoba.ics (rev 0) +++ xfcalendar/trunk/libical/zoneinfo/America/Argentina/Cordoba.ics 2008-02-14 23:47:29 UTC (rev 26613) @@ -0,0 +1,14 @@ +BEGIN:VCALENDAR +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN +VERSION:2.0 +BEGIN:VTIMEZONE +TZID:/softwarestudio.org/Olson_20011030_5/America/Argentina/Cordoba +X-LIC-LOCATION:America/Argentina/Cordoba +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0200 +TZNAME:ART +DTSTART:19700101T00 +END:STANDARD +END:VTIMEZONE +END:VCALENDAR Added: xfcalendar/trunk/libical/zoneinfo/America/Argentina/Jujuy.ics === --- xfcalendar/trunk/libical/zoneinfo/America/Argentina/Jujuy.ics (rev 0) +++ xfcalendar/trunk/libical/zoneinfo/America/Argentina/Jujuy.ics 2008-02-14 23:47:29 UTC (rev 26613) @@ -0,0 +1,14 @@ +BEGIN:VCALENDAR +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN +VERSION:2.0 +BEGIN:VTIMEZONE +TZID:/softwarestudio.org/Olson_20011030_5/America/Argentina/Jujuy +X-LIC-LOCATION:America/Argentina/Jujuy +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0200 +TZNAME:ART +DTSTART:19700101T00 +END:STANDARD +END:VTIMEZONE +END:VCALENDAR Added: xfcalendar/trunk/libical/zoneinfo/America/Argentina/Mendoza.ics === --- xfcalendar/trunk/libical/zoneinfo/America/Argentina/Mendoza.ics (rev 0) +++ xfcalendar/trunk/libical/zoneinfo/America/Argentina/Mendoza.ics 2008-02-14 23:47:29 UTC (rev 26613) @@ -0,0 +1,14 @@ +BEGIN:VCALENDAR +PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN +VERSION:2.0 +BEGIN:VTIMEZONE +TZID:/softwarestudio.org/Olson_20011030_5/America/Argentina/Mendoza +X-LIC-LOCATION:America/Argentina/Mendoza +BEGIN:STANDARD +TZOFFSETFROM:-0200 +TZOFFSETTO:-0200 +TZNAME:ART +DTSTART:19700101T00 +END:STANDARD +END:VTIMEZONE +END:VCALENDAR
[Xfce4-commits] r26643 - in xfcalendar/trunk: . panel-plugin
Author: juha
Date: 2008-02-26 14:24:13 + (Tue, 26 Feb 2008)
New Revision: 26643
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/panel-plugin/oc_config.c
Log:
Partial fix of Bug 3876
Changed default timezone selection directory to be /usr/share/zoneinfo
instead of old /usr/local/etc/zoneinfo which is not much in use anymore.
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-02-26 09:31:40 UTC (rev 26642)
+++ xfcalendar/trunk/configure.in.in2008-02-26 14:24:13 UTC (rev 26643)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.12.9-svn])
+m4_define([orage_version], [4.5.12.10-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/panel-plugin/oc_config.c
===
--- xfcalendar/trunk/panel-plugin/oc_config.c 2008-02-26 09:31:40 UTC (rev
26642)
+++ xfcalendar/trunk/panel-plugin/oc_config.c 2008-02-26 14:24:13 UTC (rev
26643)
@@ -117,9 +117,9 @@
, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
/* let's try to start on few standard positions */
if (gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog)
-, /usr/local/etc/zoneinfo/GMT) == FALSE)
+, /usr/share/zoneinfo/GMT) == FALSE)
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog)
-, /usr/share/zoneinfo/GMT);
+, /usr/lib/zoneinfo/GMT);
if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
gtk_entry_set_text(GTK_ENTRY(clock-tz_entry), filename);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26644 - xfcalendar/trunk/doc/C
Author: juha Date: 2008-02-26 15:16:10 + (Tue, 26 Feb 2008) New Revision: 26644 Modified: xfcalendar/trunk/doc/C/orage.html xfcalendar/trunk/doc/C/orage.xml Log: added info for new file location Modified: xfcalendar/trunk/doc/C/orage.html === --- xfcalendar/trunk/doc/C/orage.html 2008-02-26 14:24:13 UTC (rev 26643) +++ xfcalendar/trunk/doc/C/orage.html 2008-02-26 15:16:10 UTC (rev 26644) @@ -1,4 +1,4 @@ -htmlheadmeta http-equiv=Content-Type content=text/html; charset=ISO-8859-1titleOrage/titlelink rel=stylesheet href=../xfce.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.68.1link rel=start href=#orage title=Oragelink rel=next href=#orage-intro title=Introduction/headbody bgcolor=white text=black link=#FF vlink=#840084 alink=#FFdiv class=article lang=endiv class=titlepagedivdivh1 class=titlea name=orage/aOrage/h1/divdivdiv class=authorgroupdiv class=authorh3 class=authorspan class=firstnameJuha/span span class=surnameKautto/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameMickael/span span class=surnameGraf/span/h3div class=affiliationdiv class= addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameBenedikt/span span class=surnameMeurer/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/div/div/divdivspan xmlns=http://www.w3.org/TR/xhtml1/transitional; class=releaseinfoThis manual describes strong xmlns= class=applicationcodeorage/code/strong version 4.5.12. +htmlheadmeta http-equiv=Content-Type content=text/html; charset=ISO-8859-1titleOrage/titlelink rel=stylesheet href=../xfce.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.72.0link rel=start href=#orage title=Oragelink rel=next href=#orage-intro title=Introduction/headbody bgcolor=white text=black link=#FF vlink=#840084 alink=#FFdiv class=article lang=endiv class=titlepagedivdivh1 class=titlea name=orage/aOrage/h1/divdivdiv class=authorgroupdiv class=authorh3 class=authorspan class=firstnameJuha/span span class=surnameKautto/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameMickael/span span class=surnameGraf/span/h3div class=affiliationdiv class= addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameBenedikt/span span class=surnameMeurer/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/div/div/divdivspan xmlns=http://www.w3.org/TR/xhtml1/transitional; class=releaseinfoThis manual describes strong xmlns= class=applicationcodeorage/code/strong version 4.5.12. Last updated: January 2008 br/br/span/divdivp class=copyrightCopyright � 2006-2008 Juha Kautto/p/div/divhr/divdiv class=tocpbTable of Contents/b/pdldtspan class=sect1a href=#orage-introIntroduction/a/span/dtdtspan class=sect1a href=#orage-getting-startedGetting started/a/span/dtdtspan class=sect1a href=#orage-calendar-windowThe calendar window/a/span/dtdddldtspan class=sect2a href=#calendar-menu-barThe menu bar/a/span/dtdtspan class=sect2a href=#calendar-windowThe calendar/a/span/dtdtspan class=sect2a href=#calendar-todo-windowThe TODO list/a/span/dt/dl/dddtspan class=sect1a href=#orage-eventlist-windowThe event list window/a/span/dtdddldtspan class=sect2a href=#event%20list-action-barThe button bar/a/span/dtdtspan class=sect2a href=#eventlist-tabsThe tabs/a/span/dtdtspan class=sect2a href=#eventlist- appointmentsThe appointment list/a/span/dt/dl/dddtspan class=sect1a href=#orage-daylist-windowThe day list window/a/span/dtdddldtspan class=sect2a href=#daylist-action-barThe button bar/a/span/dtdtspan class=sect2a href=#daylist-parametersThe parameters/a/span/dtdtspan class=sect2a href=#daylist-listThe day list/a/span/dt/dl/dddtspan class=sect1a href=#orage-appointment-windowThe appointment window/a/span/dtdddldtspan class=sect2a href=#appointment-action-barThe button bar/a/span/dtdtspan class=sect2a href=#appointment-general-tabThe general tab/a/span/dtdtspan class=sect2a href=#appointment-alarm-tabThe alarm tab/a/span/dtdtspan class=sect2a href=#appointment-recurrence-tabThe recurrence tab/a/span/dt/dl/dddtspan class=sect1a href=#orage-exchangedata-windowThe exchange data window/a/span/dt dddldtspan class=sect2a href=#exchange-impexp-tabThe import export tab/a/span/dtdtspan class=sect2a href=#exchange-oragefiles-tabThe orage files tab
[Xfce4-commits] r26655 - xfcalendar/trunk/po
Author: juha Date: 2008-03-02 10:37:59 + (Sun, 02 Mar 2008) New Revision: 26655 Modified: xfcalendar/trunk/po/de.po Log: 1) fixed bug 3894 - typo in orage de translation There were more similar errors; I fixed them all. Modified: xfcalendar/trunk/po/de.po === --- xfcalendar/trunk/po/de.po 2008-03-01 14:41:50 UTC (rev 26654) +++ xfcalendar/trunk/po/de.po 2008-03-02 10:37:59 UTC (rev 26655) @@ -431,7 +431,7 @@ #. the button label in the xfce-mcs-manager dialog #: ../plugin/xfcalendar_plugin.c:47 msgid Orage - Calendar -msgstr Orange-Kalender +msgstr Orage-Kalender #: ../src/about-xfcalendar.c:42 msgid Manage your time with Xfce4 @@ -987,7 +987,7 @@ #: ../src/day-view.c:853 msgid Orage - day view -msgstr Orange - Tagesansicht +msgstr Orage - Tagesansicht #. date only appointment #: ../src/event-list.c:175 @@ -2799,7 +2799,7 @@ #: ../src/interface.c:1063 msgid Orage appointment UIDs separated by commas. -msgstr Orange-Termin-UIDs durch Kommas getrennt. +msgstr Orage-Termin-UIDs durch Kommas getrennt. #: ../src/interface.c:1069 msgid Archive @@ -2825,7 +2825,7 @@ appointments to another system. msgstr Alle archivierten Termine in die Haupt-Oragedatei kopieren und das Archiv\n -entfernen. Dies ist nützlich, wenn z. B. Orange-Termine auf ein anderes\n +entfernen. Dies ist nützlich, wenn z. B. Orage-Termine auf ein anderes\n System kopiert werden sollen. #: ../src/interface.c:1110 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26657 - in xfcalendar/trunk: . src
Author: juha
Date: 2008-03-02 23:25:52 + (Sun, 02 Mar 2008)
New Revision: 26657
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/ical-code.c
Log:
1) fixed Bug 3885 - add support for evolution ics files
2) Fixed categories handling issue when having only the special
colour category. It caused an empty gategory added.
version 4.5.13.1
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-03-02 13:51:40 UTC (rev 26656)
+++ xfcalendar/trunk/configure.in.in2008-03-02 23:25:52 UTC (rev 26657)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.13.0-svn])
+m4_define([orage_version], [4.5.13.1-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2008-03-02 13:51:40 UTC (rev 26656)
+++ xfcalendar/trunk/src/appointment.c 2008-03-02 23:25:52 UTC (rev 26657)
@@ -891,12 +891,12 @@
g_free(tmp2);
tmp2 = NULL;
}
-if (tmp) {
+if (ORAGE_STR_EXISTS(tmp)) {
appt-categories = g_strjoin(,, tmp, tmp2, NULL);
g_free(tmp);
g_free(tmp2);
}
-else
+else
appt-categories = tmp2;
/* notes */
Modified: xfcalendar/trunk/src/ical-code.c
===
--- xfcalendar/trunk/src/ical-code.c2008-03-02 13:51:40 UTC (rev 26656)
+++ xfcalendar/trunk/src/ical-code.c2008-03-02 23:25:52 UTC (rev 26657)
@@ -543,7 +543,7 @@
utc_icaltimezone = icaltimezone_get_utc_timezone();
if (!ORAGE_STR_EXISTS(g_par.local_timezone)) {
-orage_message(150, P_N empty timezone\n);
+orage_message(150, P_N empty timezone);
g_par.local_timezone = g_strdup(floating);
}
@@ -643,10 +643,10 @@
}
if ((*p_fical = icalset_new_file(file_icalpath)) == NULL) {
if (test)
-orage_message(150, P_N Could not open ical file (%s) %s\n
+orage_message(150, P_N Could not open ical file (%s) %s
, file_icalpath, icalerror_strerror(icalerrno));
else
-orage_message(350, P_N Could not open ical file (%s) %s\n
+orage_message(350, P_N Could not open ical file (%s) %s
, file_icalpath, icalerror_strerror(icalerrno));
return(FALSE);
}
@@ -894,6 +894,27 @@
return(ctime);
}
+static icaltimezone *get_builtin_timezone(gchar *tz_loc)
+{
+ /* This probably is evolution format,
+ * which has /xxx/xxx/timezone and we should remove the
+ * extra /xxx/xxx/ from it */
+char **new_str;
+icaltimezone *l_icaltimezone = NULL;
+
+if (tz_loc[0] == '/') {
+orage_message(-20, P_N evolution timezone fix %s, tz_loc);
+new_str = g_strsplit(tz_loc, /, 4);
+if (new_str[0] != NULL new_str[1] != NULL new_str[2] != NULL
+ new_str[3] != NULL)
+l_icaltimezone = icaltimezone_get_builtin_timezone(new_str[3]);
+g_strfreev(new_str);
+}
+else
+l_icaltimezone = icaltimezone_get_builtin_timezone(tz_loc);
+return(l_icaltimezone);
+}
+
static struct icaltimetype convert_to_timezone(struct icaltimetype t
, icalproperty *p)
{
@@ -910,22 +931,9 @@
itime_tz = icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER);
if (itime_tz) {
tz_loc = (char *)icalparameter_get_tzid(itime_tz);
-if (tz_loc[0] == '/') {
- /* FIXME: this should be in import and in get data
- * This probably is evolution format,
- * which has /xxx/xxx/timezone and we should remove the
- * extra /xxx/xxx/ from it */
-char **new_str;
-
-orage_message(-20, P_N evolution timezone fix %s, tz_loc);
-new_str = g_strsplit(tz_loc, /, 4);
-if (new_str[0] != NULL new_str[1] != NULL new_str[2] != NULL
- new_str[3] != NULL)
-l_icaltimezone = icaltimezone_get_builtin_timezone(new_str[3]);
-g_strfreev(new_str);
-}
-else
-l_icaltimezone = icaltimezone_get_builtin_timezone(tz_loc);
+/* FIXME: could we now call convert_to_zone or is it a problem
+ * if we always move to zone format ? */
+l_icaltimezone = get_builtin_timezone(tz_loc);
if (!l_icaltimezone) {
orage_message(250, P_N builtin timezone %s not found, conversion
failed., tz_loc);
}
@@ -986,8 +994,9 @@
p = icalcomponent_get_first_property(c, ICAL_DUE_PROPERTY);
p2 = icalcomponent_get_first_property(c, ICAL_COMPLETED_PROPERTY);
}
-else if (per.ikind == ICAL_VJOURNAL_COMPONENT)
-p = NULL; /* does not exist
[Xfce4-commits] r26658 - xfcalendar/trunk/src
Author: juha
Date: 2008-03-02 23:36:26 + (Sun, 02 Mar 2008)
New Revision: 26658
Modified:
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/event-list.c
Log:
1) fixed Bug 3904 - Button layout in confirmation dialog swapped
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2008-03-02 23:25:52 UTC (rev 26657)
+++ xfcalendar/trunk/src/appointment.c 2008-03-02 23:36:26 UTC (rev 26658)
@@ -722,8 +722,8 @@
, GTK_STOCK_DIALOG_WARNING
, _(The appointment information has been modified.)
, _(Do you want to continue?)
+, GTK_STOCK_NO, GTK_RESPONSE_CANCEL
, GTK_STOCK_YES, GTK_RESPONSE_ACCEPT
-, GTK_STOCK_NO, GTK_RESPONSE_CANCEL
, NULL);
if (result == GTK_RESPONSE_ACCEPT) {
@@ -1145,8 +1145,8 @@
, GTK_STOCK_DIALOG_WARNING
, _(This appointment will be permanently removed.)
, _(Do you want to continue?)
+, GTK_STOCK_NO, GTK_RESPONSE_REJECT
, GTK_STOCK_YES, GTK_RESPONSE_ACCEPT
-, GTK_STOCK_NO, GTK_RESPONSE_REJECT
, NULL);
if (result == GTK_RESPONSE_ACCEPT) {
Modified: xfcalendar/trunk/src/event-list.c
===
--- xfcalendar/trunk/src/event-list.c 2008-03-02 23:25:52 UTC (rev 26657)
+++ xfcalendar/trunk/src/event-list.c 2008-03-02 23:36:26 UTC (rev 26658)
@@ -881,8 +881,8 @@
, GTK_STOCK_DIALOG_WARNING
, _(You will permanently remove all\nselected appointments.)
, _(Do you want to continue?)
+, GTK_STOCK_NO, GTK_RESPONSE_CANCEL
, GTK_STOCK_YES, GTK_RESPONSE_ACCEPT
-, GTK_STOCK_NO, GTK_RESPONSE_CANCEL
, NULL);
if (result == GTK_RESPONSE_ACCEPT) {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26659 - in xfcalendar/trunk: . po src
Author: juha
Date: 2008-03-03 23:33:14 + (Mon, 03 Mar 2008)
New Revision: 26659
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/po/fi.po
xfcalendar/trunk/src/mainbox.c
xfcalendar/trunk/src/mainbox.h
xfcalendar/trunk/src/parameters.c
xfcalendar/trunk/src/parameters.h
Log:
1) fixed typo in Finnish translation
2) implemented Enhancement Bug 3900 - Add list of today's events in the mainbox
version 4.5.13.2
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-03-02 23:36:26 UTC (rev 26658)
+++ xfcalendar/trunk/configure.in.in2008-03-03 23:33:14 UTC (rev 26659)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.13.1-svn])
+m4_define([orage_version], [4.5.13.2-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/po/fi.po
===
--- xfcalendar/trunk/po/fi.po 2008-03-02 23:36:26 UTC (rev 26658)
+++ xfcalendar/trunk/po/fi.po 2008-03-03 23:33:14 UTC (rev 26659)
@@ -3053,8 +3053,8 @@
%s
msgstr
Otsikko: %s\n
- Alkaa:\t%s\n
- Märäaika:\t%s\n
+ Alkaa:\t %s\n
+ Määräaika:%s\n
Tehty:\t%s\n
Huomautukset:\n
%s
Modified: xfcalendar/trunk/src/mainbox.c
===
--- xfcalendar/trunk/src/mainbox.c 2008-03-02 23:36:26 UTC (rev 26658)
+++ xfcalendar/trunk/src/mainbox.c 2008-03-03 23:33:14 UTC (rev 26659)
@@ -210,6 +210,26 @@
create_el_win(NULL);
}
+void orage_show_events_for_selected_date(void)
+{
+/* rebuild the info for the selected date */
+if (!xfical_file_open(TRUE))
+return;
+build_mainbox_info();
+xfical_file_close(TRUE);
+}
+
+static void mCalendar_day_selected_cb(GtkCalendar *calendar
+, gpointer user_data)
+{
+#undef P_N
+#define P_N mCalendar_day_selected_cb:
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
+orage_show_events_for_selected_date();
+}
+
static gboolean upd_calendar(GtkCalendar *calendar)
{
#undef P_N
@@ -349,13 +369,13 @@
}
}
-static void add_info_row(xfical_appt *appt)
+static void add_info_row(xfical_appt *appt, GtkBox *parentBox, gboolean todo)
{
#undef P_N
#define P_N add_info_row:
GtkWidget *ev, *label;
CalWin *cal = g_par.xfcal;
-gchar *tip;
+gchar *tip, *tmp;
struct tm *t;
char *l_time, *s_time, *e_time, *c_time, *na;
gint len;
@@ -363,38 +383,54 @@
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
+/* add data into the vbox */
ev = gtk_event_box_new();
-label = gtk_label_new(appt-title);
+tmp = g_strdup_printf( %s, appt-title);
+label = gtk_label_new(tmp);
+g_free(tmp);
gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);
-t = orage_localtime();
-l_time = orage_tm_time_to_icaltime(t);
-if (appt-starttimecur[8] == 'T') /* date+time */
-len = 15;
-else /* date only */
-len = 8;
-if (strncmp(appt-endtimecur, l_time, len) 0) /* gone */
-gtk_widget_modify_fg(label, GTK_STATE_NORMAL, cal-mRed);
-else if (strncmp(appt-starttimecur, l_time, len) = 0
- strncmp(appt-endtimecur, l_time, len) = 0)
-gtk_widget_modify_fg(label, GTK_STATE_NORMAL, cal-mBlue);
+gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+gtk_misc_set_padding(GTK_MISC(label), 5, 0);
gtk_container_add(GTK_CONTAINER(ev), label);
-gtk_box_pack_start(GTK_BOX(cal-mInfo_vbox), ev, FALSE, FALSE, 0);
-na = _(Not defined);
+gtk_box_pack_start(parentBox, ev, FALSE, FALSE, 0);
+g_object_set_data_full(G_OBJECT(ev), UID, g_strdup(appt-uid), g_free);
+g_signal_connect((gpointer)ev, button-press-event
+, G_CALLBACK(todo_clicked), cal);
+
+/* set color */
+if (todo) {
+t = orage_localtime();
+l_time = orage_tm_time_to_icaltime(t);
+if (appt-starttimecur[8] == 'T') /* date+time */
+len = 15;
+else /* date only */
+len = 8;
+if (strncmp(appt-endtimecur, l_time, len) 0) /* gone */
+gtk_widget_modify_fg(label, GTK_STATE_NORMAL, cal-mRed);
+else if (strncmp(appt-starttimecur, l_time, len) = 0
+ strncmp(appt-endtimecur, l_time, len) = 0)
+gtk_widget_modify_fg(label, GTK_STATE_NORMAL, cal-mBlue);
+}
+
+/* set hint */
s_time = g_strdup(orage_icaltime_to_i18_time(appt-starttimecur));
e_time = g_strdup(orage_icaltime_to_i18_time(appt-endtimecur));
-c_time = g_strdup(appt-completed
-? orage_icaltime_to_i18_time(appt-completedtime) : na);
-tip = g_strdup_printf(_(Title: %s\n Start:\t%s\n Due:\t%s\n
Done:\t%s\nNote:\n%s)
-, appt-title, s_time, e_time, c_time, appt-note);
+if (todo) {
+na = _(Never
[Xfce4-commits] r26660 - xfcalendar/trunk/src
Author: juha
Date: 2008-03-04 07:51:40 + (Tue, 04 Mar 2008)
New Revision: 26660
Modified:
xfcalendar/trunk/src/interface.c
Log:
added warning for updating foreign files and fixed formatting a little
Modified: xfcalendar/trunk/src/interface.c
===
--- xfcalendar/trunk/src/interface.c2008-03-03 23:33:14 UTC (rev 26659)
+++ xfcalendar/trunk/src/interface.c2008-03-04 07:51:40 UTC (rev 26660)
@@ -632,6 +632,7 @@
for (i = 0; i g_par.foreign_count; i++) {
hbox = gtk_hbox_new(FALSE, 0);
label = gtk_label_new(g_par.foreign_data[i].file);
+gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 5);
if (g_par.foreign_data[i].read_only)
label = gtk_label_new(_(READ ONLY));
@@ -1282,7 +1283,7 @@
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.), NULL);
+, _(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);
/* Current files */
refresh_foreign_files(intf_w, TRUE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26662 - in xfcalendar/trunk: . src
Author: juha
Date: 2008-03-04 17:01:09 + (Tue, 04 Mar 2008)
New Revision: 26662
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/src/mainbox.c
xfcalendar/trunk/src/parameters.c
Log:
1) removed libical week start day setting and replaced that by reading
first week day from locale. There is still undocumented parameter
in case locael setting is wrong. (Bug 3898)
2) Fixed Bug 3913 - Phantom marks in calendar when switching month
version 4.5.13.3
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-03-04 08:46:57 UTC (rev 26661)
+++ xfcalendar/trunk/configure.in.in2008-03-04 17:01:09 UTC (rev 26662)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.13.2-svn])
+m4_define([orage_version], [4.5.13.3-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/src/mainbox.c
===
--- xfcalendar/trunk/src/mainbox.c 2008-03-04 08:46:57 UTC (rev 26661)
+++ xfcalendar/trunk/src/mainbox.c 2008-03-04 17:01:09 UTC (rev 26662)
@@ -234,21 +234,11 @@
{
#undef P_N
#define P_N upd_calendar:
-static guint year=-1, month=-1;
-guint year_n, month_n, day_n;
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
-/* we only need to do this if it is really a new month. We may get
- * many of these while calender is changing months and it is enough
- * to show only the last one, which is visible */
-gtk_calendar_get_date(calendar, year_n, month_n, day_n);
-if (month != month_n || year != year_n) { /* need really do it */
-orage_mark_appointments();
-year = year_n;
-month = month_n;
-}
+orage_mark_appointments();
return(FALSE); /* we do this only once */
}
@@ -256,14 +246,22 @@
{
#undef P_N
#define P_N mCalendar_month_changed_cb:
+static guint timer=0;
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
/* orage_mark_appointments is rather heavy (=slow), so doing
* it here is not a good idea. We can't keep up with the autorepeat
- * speed if we do the whole thing here. bug 2080 proofs it. so let's
- * throw it to background and do it later */
-g_timeout_add(500, (GtkFunction)upd_calendar, calendar);
+ * speed if we do the whole thing here. Bug 2080 prooves it. So let's
+ * throw it to background and do it later. We stop previously
+ * running updates since this new one will overwrite them anyway.
+ * Let's clear still the view to fix bug 3913 (only needed
+ * if there are changes in the calendar) */
+if (timer)
+g_source_remove(timer);
+if (calendar-num_marked_dates) /* undocumented, internal field; ugly */
+gtk_calendar_clear_marks(calendar);
+timer = g_timeout_add(500, (GtkFunction)upd_calendar, calendar);
}
static void build_menu(void)
Modified: xfcalendar/trunk/src/parameters.c
===
--- xfcalendar/trunk/src/parameters.c 2008-03-04 08:46:57 UTC (rev 26661)
+++ xfcalendar/trunk/src/parameters.c 2008-03-04 17:01:09 UTC (rev 26662)
@@ -28,6 +28,10 @@
#include string.h
#endif
+#include stdio.h
+#include locale.h
+#include langinfo.h
+
#include glib.h
#include glib/gprintf.h
#include gtk/gtk.h
@@ -97,9 +101,13 @@
/* select_always_today */
GtkWidget *always_today_frame;
GtkWidget *always_today_checkbutton;
-/* ical week start day (0 = Monday, 1 = Tuesday,... 6 = Sunday) */
-GtkWidget *ical_weekstartday_frame;
-GtkWidget *ical_weekstartday_combobox;
+
+/* code removed. relying in get_first_weekday_from_locale now
+/ * ical week start day (0 = Monday, 1 = Tuesday,... 6 = Sunday) * /
+GtkWidget *ical_weekstartday_frame;
+GtkWidget *ical_weekstartday_combobox;
+*/
+
/* icon size */
GtkWidget *icon_size_frame;
GtkWidget *icon_size_x_spin;
@@ -116,7 +124,31 @@
GtkWidget *dialog_action_area1;
} Itf;
+/* Return the first day of the week, where 0=monday, 6=sunday.
+ * Borrowed from GTK+:s Calendar Widget, but modified
+ * to return 0..6 mon..sun, which is what libical uses */
+int get_first_weekday_from_locale()
+{
+union { unsigned int word; char *string; } langinfo;
+int week_1stday = 0;
+int first_weekday = 1;
+unsigned int week_origin;
+setlocale(LC_TIME, );
+langinfo.string = nl_langinfo(_NL_TIME_FIRST_WEEKDAY);
+first_weekday = langinfo.string[0];
+langinfo.string = nl_langinfo(_NL_TIME_WEEK_1STDAY);
+week_origin = langinfo.word;
+if (week_origin == 19971130) /* Sunday */
+week_1stday = 0;
+else if (week_origin == 19971201) /* Monday */
+week_1stday = 1;
+else
+orage_message(150, get_first_weekday: unknown value of
_NL_TIME_WEEK_1STDAY.);
+
+return((week_1stday
[Xfce4-commits] r26663 - in xfcalendar/trunk: . src
Author: juha
Date: 2008-03-04 23:09:40 + (Tue, 04 Mar 2008)
New Revision: 26663
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/src/functions.c
xfcalendar/trunk/src/ical-code.c
xfcalendar/trunk/src/mainbox.c
Log:
Fixes to mainwindow handling
4.5.13.4
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-03-04 17:01:09 UTC (rev 26662)
+++ xfcalendar/trunk/configure.in.in2008-03-04 23:09:40 UTC (rev 26663)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.13.3-svn])
+m4_define([orage_version], [4.5.13.4-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/src/functions.c
===
--- xfcalendar/trunk/src/functions.c2008-03-04 17:01:09 UTC (rev 26662)
+++ xfcalendar/trunk/src/functions.c2008-03-04 23:09:40 UTC (rev 26663)
@@ -475,9 +475,17 @@
void orage_select_date(GtkCalendar *cal
, guint year, guint month, guint day)
{
-gtk_calendar_select_day(cal, 0); /* needed to avoid illegal day/month */
-gtk_calendar_select_month(cal, month, year);
-gtk_calendar_select_day(cal, day);
+guint cur_year, cur_month, cur_mday;
+
+gtk_calendar_get_date(cal, cur_year, cur_month, cur_mday);
+
+if (cur_year == year cur_month == month)
+gtk_calendar_select_day(cal, day);
+else {
+gtk_calendar_select_day(cal, 0); /* needed to avoid illegal day/month
*/
+gtk_calendar_select_month(cal, month, year);
+gtk_calendar_select_day(cal, day);
+}
}
void orage_select_today(GtkCalendar *cal)
Modified: xfcalendar/trunk/src/ical-code.c
===
--- xfcalendar/trunk/src/ical-code.c2008-03-04 17:01:09 UTC (rev 26662)
+++ xfcalendar/trunk/src/ical-code.c2008-03-04 23:09:40 UTC (rev 26663)
@@ -3040,7 +3040,7 @@
/* order list */
g_par.alarm_list = g_list_sort(g_par.alarm_list, alarm_order);
setup_orage_alarm_clock(); /* keep reminders upto date */
-build_mainbox_info(); /* refresh main calendar window todo list */
+build_mainbox_info(); /* refresh main calendar window lists */
/* moved to reminder in setup_orage_alarm_clock
store_persistent_alarms(); / * keep track of alarms when orage is down * /
*/
Modified: xfcalendar/trunk/src/mainbox.c
===
--- xfcalendar/trunk/src/mainbox.c 2008-03-04 17:01:09 UTC (rev 26662)
+++ xfcalendar/trunk/src/mainbox.c 2008-03-04 23:09:40 UTC (rev 26663)
@@ -210,26 +210,6 @@
create_el_win(NULL);
}
-void orage_show_events_for_selected_date(void)
-{
-/* rebuild the info for the selected date */
-if (!xfical_file_open(TRUE))
-return;
-build_mainbox_info();
-xfical_file_close(TRUE);
-}
-
-static void mCalendar_day_selected_cb(GtkCalendar *calendar
-, gpointer user_data)
-{
-#undef P_N
-#define P_N mCalendar_day_selected_cb:
-#ifdef ORAGE_DEBUG
-orage_message(-100, P_N);
-#endif
-orage_show_events_for_selected_date();
-}
-
static gboolean upd_calendar(GtkCalendar *calendar)
{
#undef P_N
@@ -485,7 +465,7 @@
xfical_appt_free(appt);
}
-void create_mainbox_todo_info(void)
+static void create_mainbox_todo_info(void)
{
#undef P_N
#define P_N create_mainbox_todo_info:
@@ -513,7 +493,7 @@
GTK_SCROLLED_WINDOW(cal-mTodo_scrolledWin), cal-mTodo_rows_vbox);
}
-void create_mainbox_event_info(void)
+static void create_mainbox_event_info(void)
{
#undef P_N
#define P_N create_mainbox_event_info:
@@ -546,29 +526,22 @@
GTK_SCROLLED_WINDOW(cal-mEvent_scrolledWin),
cal-mEvent_rows_vbox);
}
-/**
- * This routine is called from ical-code xfical_alarm_build_list_internal
- * and ical files are already open at that time. So make sure ical files
- * are opened before and closed after this call.
- **/
-void build_mainbox_info(void)
+static void build_mainbox_todo_info(void)
{
#undef P_N
-#define P_N build_mainbox_info:
+#define P_N build_mainbox_todo_info:
CalWin *cal = g_par.xfcal;
char *s_time;
char a_day[9]; /* mmdd */
-struct tm *t, tt;
+struct tm *t;
xfical_type ical_type;
gchar file_type[8];
gint i;
GList *todo_list=NULL;
-GList *event_list=NULL;
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
-
if (g_par.show_todos) {
t = orage_localtime();
s_time = orage_tm_time_to_icaltime(t);
@@ -585,9 +558,42 @@
insert_rows(todo_list, a_day, ical_type, file_type);
}
}
+if (todo_list) {
+gtk_widget_destroy(cal
[Xfce4-commits] r26668 - xfcalendar/trunk/src
Author: juha
Date: 2008-03-06 14:44:26 + (Thu, 06 Mar 2008)
New Revision: 26668
Modified:
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/functions.c
xfcalendar/trunk/src/functions.h
xfcalendar/trunk/src/interface.c
xfcalendar/trunk/src/main.c
xfcalendar/trunk/src/parameters.c
xfcalendar/trunk/src/reminder.c
xfcalendar/trunk/src/tray_icon.c
Log:
1) internal code cleanouts.
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2008-03-05 04:47:56 UTC (rev 26667)
+++ xfcalendar/trunk/src/appointment.c 2008-03-06 14:44:26 UTC (rev 26668)
@@ -47,7 +47,6 @@
#include glib/gstdio.h
#include libxfcegui4/libxfcegui4.h
-#include libxfce4util/libxfce4util.h
#include functions.h
#include mainbox.h
@@ -1437,39 +1436,21 @@
}
//
-/* categories start. this will go to functions.c when ready */
+/* categories start.*/
//
-#define ORAGE_CATEGORIES orage_categories.txt
-#define ORAGE_COLOR_FORMAT %uR %uG %uB
-
-XfceRc *orage_category_file_open(gboolean read_only)
+static OrageRc *orage_category_file_open(gboolean read_only)
{
gchar *fpath;
-XfceRc *rc;
+OrageRc *orc;
-fpath = orage_data_file_location(ORAGE_CATEGORIES);
-if (!fpath) {
-g_warning(orage_category_file_open: category filename build failed
(%s)\n, fpath);
-return(NULL);
+fpath = orage_data_file_location(ORAGE_CATEGORIES_FILE);
+if ((orc = (OrageRc *)orage_rc_file_open(fpath, read_only)) == NULL) {
+orage_message(150, orage_category_file_open: category file open
failed.);
}
-if ((rc = xfce_rc_simple_open(fpath, read_only)) == NULL) {
-g_warning(Unable to open RC file.);
-/* let's try to build it if we opened in read mode */
-if (read_only (rc = xfce_rc_simple_open(fpath, FALSE)) == NULL) {
-/* still failed, can't do more */
-g_warning(Unable to open (write) RC file.);
-return(NULL);
-}
-}
-
g_free(fpath);
-return(rc);
-}
-void orage_category_file_close(XfceRc *rc)
-{
-xfce_rc_close(rc);
+return(orc);
}
typedef struct _orage_category
@@ -1501,7 +1482,7 @@
return(NULL);
}
-void orage_category_free(gpointer gcat, gpointer dummy)
+static void orage_category_free(gpointer gcat, gpointer dummy)
{
orage_category_struct *cat = (orage_category_struct *)gcat;
@@ -1518,7 +1499,7 @@
void orage_category_get_list()
{
-XfceRc *rc;
+OrageRc *orc;
gchar **cat_groups, *color;
gint i;
orage_category_struct *cat;
@@ -1527,34 +1508,35 @@
if (orage_category_list != NULL)
orage_category_free_list();
pic1_cmap = gdk_colormap_get_system();
-rc = orage_category_file_open(TRUE);
-cat_groups = xfce_rc_get_groups(rc);
+orc = orage_category_file_open(TRUE);
+cat_groups = orage_rc_get_groups(orc);
for (i=1; cat_groups[i] != NULL; i++) {
-xfce_rc_set_group(rc, cat_groups[i]);
-color = (char *)xfce_rc_read_entry(rc, Color, NULL);
+orage_rc_set_group(orc, cat_groups[i]);
+color = orage_rc_get_str(orc, Color, NULL);
if (color) {
-cat= g_new(orage_category_struct, 1);
+cat = g_new(orage_category_struct, 1);
cat-category = g_strdup(cat_groups[i]);
sscanf(color, ORAGE_COLOR_FORMAT, (cat-color.red)
, (cat-color.green), (cat-color.blue));
gdk_colormap_alloc_color(pic1_cmap, cat-color, FALSE, TRUE);
orage_category_list = g_list_prepend(orage_category_list, cat);
+g_free(color);
}
}
g_strfreev(cat_groups);
-orage_category_file_close(rc);
+orage_rc_file_close(orc);
}
gboolean category_fill_cb(GtkComboBox *cb, char *select)
{
-XfceRc *rc;
+OrageRc *orc;
gchar **cat_gourps;
gint i;
gboolean found=FALSE;
-rc = orage_category_file_open(TRUE);
-cat_gourps = xfce_rc_get_groups(rc);
-/* cat_gourps[0] is special [NULL] entry always */
+orc = orage_category_file_open(TRUE);
+cat_gourps = orage_rc_get_groups(orc);
+/* cat_groups[0] is special [NULL] entry always */
gtk_combo_box_append_text(cb, _(Not set));
gtk_combo_box_set_active(cb, 0);
for (i=1; cat_gourps[i] != NULL; i++) {
@@ -1565,7 +1547,7 @@
}
}
g_strfreev(cat_gourps);
-orage_category_file_close(rc);
+orage_rc_file_close(orc);
return(found);
}
@@ -1614,7 +1596,7 @@
void orage_category_write_entry(gchar *category, GdkColor *color)
{
-XfceRc *rc;
+OrageRc *orc;
char *color_str;
if (!ORAGE_STR_EXISTS(category)) {
@@ -1623,24 +1605,24 @@
}
color_str = g_strdup_printf(ORAGE_COLOR_FORMAT
[Xfce4-commits] r26673 - in xfcalendar/trunk: . doc globaltime
Author: juha
Date: 2008-03-10 12:34:26 + (Mon, 10 Mar 2008)
New Revision: 26673
Added:
xfcalendar/trunk/doc/orage.1
xfcalendar/trunk/doc/orage.xml
xfcalendar/trunk/globaltime/globaltime.1
xfcalendar/trunk/globaltime/globaltime.xml
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/doc/Makefile.am
xfcalendar/trunk/globaltime/Makefile.am
Log:
Man pages for both Orage and globaltime.
Fixes Bug 3848 - globaltime doesn't have manpage
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-03-09 19:51:09 UTC (rev 26672)
+++ xfcalendar/trunk/configure.in.in2008-03-10 12:34:26 UTC (rev 26673)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.13.4-svn])
+m4_define([orage_version], [4.5.13.5-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/doc/Makefile.am
===
--- xfcalendar/trunk/doc/Makefile.am2008-03-09 19:51:09 UTC (rev 26672)
+++ xfcalendar/trunk/doc/Makefile.am2008-03-10 12:34:26 UTC (rev 26673)
@@ -4,7 +4,20 @@
noinst_DATA = \
xfce-nochunk.xsl
-EXTRA_DIST = $(noinst_DATA)
+man_MANS = \
+ orage.1
+mandir = ${prefix}/man
+
+if MAINTAINER_MODE
+%.1: %.xml
+ xsltproc -nonet
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $
+endif
+
+EXTRA_DIST = \
+ $(noinst_DATA) \
+ $(man_MANS) \
+ orage.xml
+
html: Makefile
make -C C html
Added: xfcalendar/trunk/doc/orage.1
===
--- xfcalendar/trunk/doc/orage.1(rev 0)
+++ xfcalendar/trunk/doc/orage.12008-03-10 12:34:26 UTC (rev 26673)
@@ -0,0 +1,95 @@
+.\ Title: orage
+.\Author:
+.\ Generator: DocBook XSL Stylesheets v1.72.0 http://docbook.sf.net/
+.\ Date: 03/10/2008
+.\Manual:
+.\Source:
+.\
+.TH ORAGE 1 03/10/2008
+.\ disable hyphenation
+.nh
+.\ disable justification (adjust text to left margin only)
+.ad l
+.SH NAME
+orage \- Calendar for the Xfce Desktop Environment
+.SH SYNOPSIS
+.HP 6
+\fBorage\fR [options] [[FILE]...]
+.SH DESCRIPTION
+.PP
+
+\fBorage\fR
+is a fast and easy to use graphical calendar for the Xfce Desktop Environment.
It uses portable ical format and includes common calendar features like
repeating appointments and multiple alarming possibilities.
+\fBorage\fR
+does not have group calendar features, but can only be used for single user.
+.PP
+
+\fBorage\fR
+takes a list of
+\fIFILE\fRs for ical files that should be imported. Contents of those files
are read and converted into
+\fBorage\fR, but those files are left untouched.
+.PP
+For a more detailed explanation of
+\fBorage\fR, please see the Help menu.
+.SH OPTIONS
+.PP
+\fB\-v\fR, \fB\-\-version\fR
+.RS 4
+Print version information and exit.
+.RE
+.PP
+\fB\-?\fR, \fB\-\-help\fR
+.RS 4
+Print brief help and exit.
+.RE
+.PP
+\fB\-p\fR, \fB\-\-\-\-preferences\fR
+.RS 4
+Open the preferences setting window.
+.RE
+.PP
+\fB\-t\fR, \fB\-\-toggle\fR
+.RS 4
+Hide
+\fBorage\fR
+if it is visible and show it if it is hidden.
+.RE
+.PP
+\fB\-a\fR, \fB\-\-\-\-add\-foreign file [RW]\fR
+.RS 4
+Add a foreign file into
+\fBorage\fR. By default this file is read\-only but adding RW after the
filename makes it writeable.
+.RE
+.PP
+\fB\-r\fR, \fB\-\-\-\-remove\-foreign file\fR
+.RS 4
+Remove foreign file from
+\fBorage\fR. The file itself is not removed or modified. If you want to remove
it, you need to do that separately using proper operating system command.
+.RE
+.SH FILES
+.PP
+All
+\fBorage\fR
+datafiles are by default in
+\fI~/.local/share/orage\fR
+and all configuration files are in
+\fI~/.config/orage\fR. (Note that you can change these locations, so if you do
not find them, check from the UI.)
+.SH BUGS
+.PP
+Please report any bugs and enhancement requests to
+\fIhttp://bugzilla.xfce.org/\fR. Usage related questions can be sent to
[EMAIL PROTECTED]
+email list.
+.SH HOMEPAGE
+.PP
+
+\fIhttp://www.xfce.org/projects/orage/\fR
+.SH AUTHOR
+.PP
+
+\fBorage\fR
+was originally written by Mickael Graf and is now being maintained by Juha
Kautto
+[EMAIL PROTECTED].
+.PP
+This manual page was written by Juha Kautto
+[EMAIL PROTECTED].
Added: xfcalendar/trunk/doc/orage.xml
===
--- xfcalendar/trunk/doc/orage.xml (rev 0)
+++ xfcalendar/trunk/doc/orage.xml 2008-03-10 12:34:26 UTC (rev 26673)
@@ -0,0 +1,147 @@
+!--
+ $Id: orage.xml 22971 2008-03-06 23:14:10Z juha $
+
+ Copyright (c) 2008 Juha Kautto [EMAIL PROTECTED]
+--
+
+refentry id=Orage
+ refmeta
+refentrytitleorage/refentrytitle
+manvolnum1/manvolnum
+ /refmeta
+
+ refnamediv
+refnameorage/refname
+refpurposeCalendar
[Xfce4-commits] r26675 - in xfcalendar/trunk: . globaltime src
Author: juha
Date: 2008-03-10 21:41:48 + (Mon, 10 Mar 2008)
New Revision: 26675
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/globaltime/gt_prefs.c
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/appointment.h
xfcalendar/trunk/src/day-view.c
xfcalendar/trunk/src/functions.h
xfcalendar/trunk/src/ical-code.c
xfcalendar/trunk/src/reminder.c
Log:
4.5.13.6:
fixed globaltime timezone selection to start from correct place
added small arrows into day view to help scrolling
fixed Bug 3842 - Event Alarm Settings - Add ability to set/save defaults
Added possibility to modify default alarms
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-03-10 19:52:22 UTC (rev 26674)
+++ xfcalendar/trunk/configure.in.in2008-03-10 21:41:48 UTC (rev 26675)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.13.5-svn])
+m4_define([orage_version], [4.5.13.6-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/globaltime/gt_prefs.c
===
--- xfcalendar/trunk/globaltime/gt_prefs.c 2008-03-10 19:52:22 UTC (rev
26674)
+++ xfcalendar/trunk/globaltime/gt_prefs.c 2008-03-10 21:41:48 UTC (rev
26675)
@@ -370,9 +370,9 @@
, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
/* let's try to start on few standard positions */
if (gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog)
-, /usr/local/etc/zoneinfo/GMT) == FALSE)
+, /usr/share/zoneinfo/GMT) == FALSE)
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog)
-, /usr/share/zoneinfo/GMT);
+, /usr/lib/zoneinfo/GMT);
if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
gtk_entry_set_text(GTK_ENTRY(modify_clock-tz_entry), filename);
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2008-03-10 19:52:22 UTC (rev 26674)
+++ xfcalendar/trunk/src/appointment.c 2008-03-10 21:41:48 UTC (rev 26675)
@@ -80,6 +80,7 @@
} category_win_struct;
static void refresh_categories(category_win_struct *catw);
+static void read_default_alarm(xfical_appt *appt);
static void fill_appt_window(appt_win *apptw, char *action, char *par);
/*
@@ -566,6 +567,15 @@
mark_appointment_changed((appt_win *)user_data);
}
+static void refresh_dependent_data(appt_win *apptw)
+{
+if (apptw-el != NULL)
+refresh_el_win((el_win *)apptw-el);
+if (apptw-dw != NULL)
+refresh_day_win((day_win *)apptw-dw);
+orage_mark_appointments();
+}
+
static void on_appNote_buffer_changed_cb(GtkTextBuffer *b, gpointer user_data)
{
appt_win *apptw = (appt_win *)user_data;
@@ -763,6 +773,125 @@
}
}
+static gboolean fill_appt_from_apptw_alarm(xfical_appt *appt, appt_win *apptw)
+{
+gint i, j, k;
+gchar *tmp;
+
+/* reminder time */
+appt-alarmtime = gtk_spin_button_get_value_as_int(
+GTK_SPIN_BUTTON(apptw-Alarm_spin_dd)) * 24*60*60
++ gtk_spin_button_get_value_as_int(
+GTK_SPIN_BUTTON(apptw-Alarm_spin_hh)) *60*60
++ gtk_spin_button_get_value_as_int(
+GTK_SPIN_BUTTON(apptw-Alarm_spin_mm)) * 60
+;
+appt-display_alarm_orage = appt-alarmtime ? TRUE : FALSE;
+
+/* reminder before/after related to start/end */
+/*
+char *when_array[4] = {_(Before Start), _(Before End)
+, _(After Start), _(After End)};
+*/
+switch (gtk_combo_box_get_active(GTK_COMBO_BOX(apptw-Alarm_when_cb))) {
+case 0:
+appt-alarm_before = TRUE;
+appt-alarm_related_start = TRUE;
+break;
+case 1:
+appt-alarm_before = TRUE;
+appt-alarm_related_start = FALSE;
+break;
+case 2:
+appt-alarm_before = FALSE;
+appt-alarm_related_start = TRUE;
+break;
+case 3:
+appt-alarm_before = FALSE;
+appt-alarm_related_start = FALSE;
+break;
+default:
+appt-alarm_before = TRUE;
+appt-alarm_related_start = TRUE;
+break;
+}
+
+/* Do we use persistent alarm */
+appt-alarm_persistent = gtk_toggle_button_get_active(
+GTK_TOGGLE_BUTTON(apptw-Per_checkbutton));
+
+/* Do we use audio alarm */
+appt-sound_alarm = gtk_toggle_button_get_active(
+GTK_TOGGLE_BUTTON(apptw-Sound_checkbutton));
+
+/* Which sound file will be played */
+if (appt-sound) {
+g_free(appt-sound);
+appt-sound = NULL;
+}
+appt-sound
[Xfce4-commits] r26678 - in xfcalendar/trunk: . src
Author: juha
Date: 2008-03-12 21:35:19 + (Wed, 12 Mar 2008)
New Revision: 26678
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/appointment.h
xfcalendar/trunk/src/event-list.c
xfcalendar/trunk/src/ical-code.c
xfcalendar/trunk/src/ical-code.h
xfcalendar/trunk/src/mainbox.c
Log:
4.5.13.7
Bug 3917 - Todo without due date
Made it possible to have todo without due date
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-03-12 10:19:10 UTC (rev 26677)
+++ xfcalendar/trunk/configure.in.in2008-03-12 21:35:19 UTC (rev 26678)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.13.6-svn])
+m4_define([orage_version], [4.5.13.7-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2008-03-12 10:19:10 UTC (rev 26677)
+++ xfcalendar/trunk/src/appointment.c 2008-03-12 21:35:19 UTC (rev 26678)
@@ -186,15 +186,24 @@
static void set_time_sensitivity(appt_win *apptw)
{
-gboolean dur_act, allDay_act, completed_act;
+gboolean dur_act, allDay_act, comp_act, due_act;
dur_act = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(apptw-Dur_checkbutton));
+GTK_TOGGLE_BUTTON(apptw-Dur_checkbutton));
allDay_act = gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(apptw-AllDay_checkbutton));
-completed_act = gtk_toggle_button_get_active(
+GTK_TOGGLE_BUTTON(apptw-AllDay_checkbutton));
+comp_act = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(apptw-Completed_checkbutton));
+/* todo can be without due date, but event always has end date.
+ * Journal has none, but we show it similarly than event */
+if (gtk_toggle_button_get_active(
+GTK_TOGGLE_BUTTON(apptw-Type_todo_rb)))
+due_act = gtk_toggle_button_get_active(
+GTK_TOGGLE_BUTTON(apptw-End_checkbutton));
+else
+due_act = TRUE;
+gtk_widget_set_sensitive(apptw-Dur_checkbutton, due_act);
if (allDay_act) {
gtk_widget_set_sensitive(apptw-StartTime_spin_hh, FALSE);
gtk_widget_set_sensitive(apptw-StartTime_spin_mm, FALSE);
@@ -209,22 +218,17 @@
gtk_widget_set_sensitive(apptw-CompletedTime_spin_hh, FALSE);
gtk_widget_set_sensitive(apptw-CompletedTime_spin_mm, FALSE);
gtk_widget_set_sensitive(apptw-CompletedTimezone_button, FALSE);
+gtk_widget_set_sensitive(apptw-CompletedDate_button, comp_act);
if (dur_act) {
gtk_widget_set_sensitive(apptw-EndDate_button, FALSE);
-gtk_widget_set_sensitive(apptw-Dur_spin_dd, TRUE);
-gtk_widget_set_sensitive(apptw-Dur_spin_dd_label, TRUE);
+gtk_widget_set_sensitive(apptw-Dur_spin_dd, due_act);
+gtk_widget_set_sensitive(apptw-Dur_spin_dd_label, due_act);
}
else {
-gtk_widget_set_sensitive(apptw-EndDate_button, TRUE);
+gtk_widget_set_sensitive(apptw-EndDate_button, due_act);
gtk_widget_set_sensitive(apptw-Dur_spin_dd, FALSE);
gtk_widget_set_sensitive(apptw-Dur_spin_dd_label, FALSE);
}
-if (completed_act) {
-gtk_widget_set_sensitive(apptw-CompletedDate_button, TRUE);
-}
-else {
-gtk_widget_set_sensitive(apptw-CompletedDate_button, FALSE);
-}
}
else {
gtk_widget_set_sensitive(apptw-StartTime_spin_hh, TRUE);
@@ -235,18 +239,18 @@
gtk_widget_set_sensitive(apptw-EndTime_spin_hh, FALSE);
gtk_widget_set_sensitive(apptw-EndTime_spin_mm, FALSE);
gtk_widget_set_sensitive(apptw-EndTimezone_button, FALSE);
-gtk_widget_set_sensitive(apptw-Dur_spin_dd, TRUE);
-gtk_widget_set_sensitive(apptw-Dur_spin_dd_label, TRUE);
-gtk_widget_set_sensitive(apptw-Dur_spin_hh, TRUE);
-gtk_widget_set_sensitive(apptw-Dur_spin_hh_label, TRUE);
-gtk_widget_set_sensitive(apptw-Dur_spin_mm, TRUE);
-gtk_widget_set_sensitive(apptw-Dur_spin_mm_label, TRUE);
+gtk_widget_set_sensitive(apptw-Dur_spin_dd, due_act);
+gtk_widget_set_sensitive(apptw-Dur_spin_dd_label, due_act);
+gtk_widget_set_sensitive(apptw-Dur_spin_hh, due_act);
+gtk_widget_set_sensitive(apptw-Dur_spin_hh_label, due_act);
+gtk_widget_set_sensitive(apptw-Dur_spin_mm, due_act);
+gtk_widget_set_sensitive(apptw-Dur_spin_mm_label, due_act);
}
else {
-gtk_widget_set_sensitive(apptw-EndDate_button, TRUE);
-gtk_widget_set_sensitive(apptw-EndTime_spin_hh, TRUE
[Xfce4-commits] r26681 - xfcalendar/trunk/src
Author: juha
Date: 2008-03-17 18:12:48 + (Mon, 17 Mar 2008)
New Revision: 26681
Modified:
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/ical-code.c
xfcalendar/trunk/src/main.c
xfcalendar/trunk/src/reminder.c
Log:
Minor changes to help to support the code.
Added tracing and changed tracing levels.
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2008-03-15 00:45:00 UTC (rev 26680)
+++ xfcalendar/trunk/src/appointment.c 2008-03-17 18:12:48 UTC (rev 26681)
@@ -1087,17 +1087,17 @@
apptw-appointment_add = FALSE;
gtk_widget_set_sensitive(apptw-Duplicate, TRUE);
gtk_widget_set_sensitive(apptw-File_menu_duplicate, TRUE);
-orage_message(30, Added: %s, apptw-xf_uid);
+orage_message(10, Added: %s, apptw-xf_uid);
}
else
-g_warning(Addition failed: %s, apptw-xf_uid);
+orage_message(150, Addition failed: %s, apptw-xf_uid);
}
else {
ok = xfical_appt_mod(apptw-xf_uid, appt);
if (ok)
-orage_message(30, Modified: %s, apptw-xf_uid);
+orage_message(10, Modified: %s, apptw-xf_uid);
else
-g_warning(Modification failed: %s, apptw-xf_uid);
+orage_message(150, Modification failed: %s, apptw-xf_uid);
}
xfical_file_close(TRUE);
if (ok) {
@@ -1156,7 +1156,7 @@
return;
result = xfical_appt_del(apptw-xf_uid);
if (result)
-orage_message(30, Removed: %s, apptw-xf_uid);
+orage_message(10, Removed: %s, apptw-xf_uid);
else
g_warning(Removal failed: %s, apptw-xf_uid);
xfical_file_close(TRUE);
@@ -1417,7 +1417,6 @@
if (!xfical_file_open(TRUE))
return(NULL);
if ((appt = xfical_appt_get(par)) == NULL) {
-orage_message(120, appointment not found: %s, par);
xfce_message_dialog(GTK_WINDOW(apptw-Window)
, _(Info)
, GTK_STOCK_DIALOG_INFO
@@ -1887,7 +1886,7 @@
char *untildate_to_display;
int i;
-orage_message(30, %s appointment: %s, action, par);
+orage_message(10, %s appointment: %s, action, par);
if ((appt = fill_appt_window_get_appt(apptw, action, par)) == NULL) {
apptw-appt = NULL;
return;
Modified: xfcalendar/trunk/src/ical-code.c
===
--- xfcalendar/trunk/src/ical-code.c2008-03-15 00:45:00 UTC (rev 26680)
+++ xfcalendar/trunk/src/ical-code.c2008-03-17 18:12:48 UTC (rev 26681)
@@ -894,16 +894,38 @@
return(ctime);
}
+static char *get_char_timezone(icalproperty *p)
+{
+#undef P_N
+#define P_N get_char_timezone:
+icalparameter *itime_tz;
+gchar *tz_loc = NULL;
+
+#ifdef ORAGE_DEBUG
+orage_message(-300, P_N);
+#endif
+if (itime_tz = icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER))
+tz_loc = (char *)icalparameter_get_tzid(itime_tz);
+return(tz_loc);
+}
+
static icaltimezone *get_builtin_timezone(gchar *tz_loc)
{
+#undef P_N
+#define P_N get_builtin_timezone:
/* This probably is evolution format,
* which has /xxx/xxx/timezone and we should remove the
* extra /xxx/xxx/ from it */
char **new_str;
icaltimezone *l_icaltimezone = NULL;
+#ifdef ORAGE_DEBUG
+orage_message(-300, P_N);
+#endif
if (tz_loc[0] == '/') {
+#ifdef ORAGE_DEBUG
orage_message(-20, P_N evolution timezone fix %s, tz_loc);
+#endif
new_str = g_strsplit(tz_loc, /, 4);
if (new_str[0] != NULL new_str[1] != NULL new_str[2] != NULL
new_str[3] != NULL)
@@ -920,21 +942,17 @@
{
#undef P_N
#define P_N convert_to_timezone:
-icalparameter *itime_tz = NULL;
-gchar *tz_loc = NULL;
-icaltimezone *l_icaltimezone = NULL;
+gchar *tz_loc;
+icaltimezone *l_icaltimezone;
struct icaltimetype tz;
#ifdef ORAGE_DEBUG
orage_message(-300, P_N);
#endif
-itime_tz = icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER);
-if (itime_tz) {
-tz_loc = (char *)icalparameter_get_tzid(itime_tz);
+if (tz_loc = get_char_timezone(p)) {
/* FIXME: could we now call convert_to_zone or is it a problem
* if we always move to zone format ? */
-l_icaltimezone = get_builtin_timezone(tz_loc);
-if (!l_icaltimezone) {
+if (!(l_icaltimezone = get_builtin_timezone(tz_loc))) {
orage_message(250, P_N builtin timezone %s not found, conversion
failed., tz_loc);
}
tz = icaltime_convert_to_zone(t, l_icaltimezone);
@@ -1803,7 +1821,7 @@
}
if (appt-freq != XFICAL_FREQ_NONE) {
/* NOTE: according to standard
[Xfce4-commits] r26682 - xfcalendar/trunk/src
Author: juha
Date: 2008-03-17 20:44:57 + (Mon, 17 Mar 2008)
New Revision: 26682
Modified:
xfcalendar/trunk/src/about-xfcalendar.c
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/appointment.h
xfcalendar/trunk/src/event-list.c
xfcalendar/trunk/src/main.c
xfcalendar/trunk/src/mainbox.c
xfcalendar/trunk/src/parameters.c
xfcalendar/trunk/src/parameters.h
xfcalendar/trunk/src/reminder.c
xfcalendar/trunk/src/tray_icon.c
xfcalendar/trunk/src/tray_icon.h
Log:
minor changes in tray icon handling
minor changes in h files making them less dependent on each other
Modified: xfcalendar/trunk/src/about-xfcalendar.c
===
--- xfcalendar/trunk/src/about-xfcalendar.c 2008-03-17 18:12:48 UTC (rev
26681)
+++ xfcalendar/trunk/src/about-xfcalendar.c 2008-03-17 20:44:57 UTC (rev
26682)
@@ -42,7 +42,7 @@
, _(Manage your time with Xfce4)
, XFCE_COPYRIGHT_TEXT(2003-2008, Juha Kautto)
, XFCE_LICENSE_GPL);
- orage_logo = orage_create_icon(xfcal, FALSE, 48, 48);
+ orage_logo = orage_create_icon(FALSE, 48, 48);
xfce_about_info_set_homepage(about, http://www.xfce.org;);
/* Credits */
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2008-03-17 18:12:48 UTC (rev 26681)
+++ xfcalendar/trunk/src/appointment.c 2008-03-17 20:44:57 UTC (rev 26682)
@@ -704,7 +704,7 @@
gtk_object_destroy(GTK_OBJECT(apptw-Tooltips));
g_free(apptw-xf_uid);
g_free(apptw-par);
-xfical_appt_free(apptw-appt);
+xfical_appt_free((xfical_appt *)apptw-xf_appt);
g_free(apptw);
}
@@ -1074,7 +1074,7 @@
static gboolean save_xfical_from_appt_win(appt_win *apptw)
{
gboolean ok = FALSE;
-xfical_appt *appt = apptw-appt;
+xfical_appt *appt = (xfical_appt *)apptw-xf_appt;
if (fill_appt_from_apptw(appt, apptw)) {
/* Here we try to save the event... */
@@ -1241,7 +1241,7 @@
appt_win *apptw = (appt_win *)user_data;
xfical_appt *appt;
-appt = apptw-appt;
+appt = (xfical_appt *)apptw-xf_appt;
if (xfical_timezone_button_clicked(button, GTK_WINDOW(apptw-Window)
, appt-start_tz_loc))
mark_appointment_changed(apptw);
@@ -1253,7 +1253,7 @@
appt_win *apptw = (appt_win *)user_data;
xfical_appt *appt;
-appt = apptw-appt;
+appt = (xfical_appt *)apptw-xf_appt;
if (xfical_timezone_button_clicked(button, GTK_WINDOW(apptw-Window)
, appt-end_tz_loc))
mark_appointment_changed(apptw);
@@ -1265,7 +1265,7 @@
appt_win *apptw = (appt_win *)user_data;
xfical_appt *appt;
-appt = apptw-appt;
+appt = (xfical_appt *)apptw-xf_appt;
if (xfical_timezone_button_clicked(button, GTK_WINDOW(apptw-Window)
, appt-completed_tz_loc))
mark_appointment_changed(apptw);
@@ -1888,10 +1888,10 @@
orage_message(10, %s appointment: %s, action, par);
if ((appt = fill_appt_window_get_appt(apptw, action, par)) == NULL) {
-apptw-appt = NULL;
+apptw-xf_appt = NULL;
return;
}
-apptw-appt = appt;
+apptw-xf_appt = appt;
/* first flags */
apptw-xf_uid = g_strdup(appt-uid);
@@ -2190,7 +2190,7 @@
, gpointer user_data)
{
appt_win *apptw = (appt_win *)user_data;
-xfical_appt *appt = apptw-appt;
+xfical_appt *appt = (xfical_appt *)apptw-xf_appt;
fill_appt_from_apptw_alarm(appt, apptw);
store_default_alarm(appt);
@@ -2200,7 +2200,7 @@
, gpointer user_data)
{
appt_win *apptw = (appt_win *)user_data;
-xfical_appt *appt = apptw-appt;
+xfical_appt *appt = (xfical_appt *)apptw-xf_appt;
read_default_alarm(appt);
fill_appt_window_alarm(appt, apptw);
@@ -2923,7 +2923,7 @@
apptw = g_new(appt_win, 1);
apptw-xf_uid = NULL;
apptw-par = NULL;
-apptw-appt = NULL;
+apptw-xf_appt = NULL;
apptw-el = NULL;
apptw-dw = NULL;
apptw-appointment_changed = FALSE;
@@ -2955,7 +2955,7 @@
, G_CALLBACK(on_appWindow_delete_event_cb), apptw);
fill_appt_window(apptw, action, par);
-if (apptw-appt) { /* all fine */
+if (apptw-xf_appt) { /* all fine */
gtk_widget_show_all(apptw-Window);
recur_hide_show(apptw);
type_hide_show(apptw);
Modified: xfcalendar/trunk/src/appointment.h
===
--- xfcalendar/trunk/src/appointment.h 2008-03-17 18:12:48 UTC (rev 26681)
+++ xfcalendar/trunk/src/appointment.h 2008-03-17 20:44:57 UTC (rev 26682)
@@ -24,8 +24,6 @@
#ifndef __APPOINTMENT_H__
#define __APPOINTMENT_H__
-#include ical-code.h
-
typedef struct _appt_win
{
GtkAccelGroup *accel_group;
@@ -181,7 +179,7 @@
GtkWidget *Recur_byday_spin_hbox;
GtkWidget *Recur_byday_spin[7]; /* 0=Mo, 1=Tu ... 6=Su */
-xfical_appt
[Xfce4-commits] r26881 - xfcalendar/trunk/src
Author: juha
Date: 2008-04-21 20:49:01 + (Mon, 21 Apr 2008)
New Revision: 26881
Modified:
xfcalendar/trunk/src/appointment.c
xfcalendar/trunk/src/main.c
xfcalendar/trunk/src/reminder.c
Log:
minor changes from a trial version.
Modified: xfcalendar/trunk/src/appointment.c
===
--- xfcalendar/trunk/src/appointment.c 2008-04-21 19:46:12 UTC (rev 26880)
+++ xfcalendar/trunk/src/appointment.c 2008-04-21 20:49:01 UTC (rev 26881)
@@ -1438,6 +1438,14 @@
/* categories start.*/
//
+typedef struct _orage_category
+{
+gchar *category;
+GdkColor color;
+} orage_category_struct;
+
+GList *orage_category_list = NULL;
+
static OrageRc *orage_category_file_open(gboolean read_only)
{
gchar *fpath;
@@ -1452,15 +1460,6 @@
return(orc);
}
-typedef struct _orage_category
-{
-gchar *category;
-GdkColor color;
-} orage_category_struct;
-
-
-GList *orage_category_list = NULL;
-
GdkColor *orage_category_list_contains(char *categories)
{
GList *cat_l;
@@ -1616,7 +1615,7 @@
OrageRc *orc;
if (!ORAGE_STR_EXISTS(category)) {
-orage_message(50, orage_category_write_entry: empty category. Not
removed);
+orage_message(50, orage_category_remove_entry: empty category. Not
removed);
return;
}
orc = orage_category_file_open(FALSE);
Modified: xfcalendar/trunk/src/main.c
===
--- xfcalendar/trunk/src/main.c 2008-04-21 19:46:12 UTC (rev 26880)
+++ xfcalendar/trunk/src/main.c 2008-04-21 20:49:01 UTC (rev 26881)
@@ -481,7 +481,7 @@
/* start monitoring foreign file updates if we have foreign files */
if (g_par.foreign_count)
-g_timeout_add(30*1000, (GtkFunction) orage_foreign_files_check, NULL);
+g_timeout_add(30*1000, (GtkFunction)orage_foreign_files_check, NULL);
/* let's check if I got filename as a parameter */
initialized = TRUE;
Modified: xfcalendar/trunk/src/reminder.c
===
--- xfcalendar/trunk/src/reminder.c 2008-04-21 19:46:12 UTC (rev 26880)
+++ xfcalendar/trunk/src/reminder.c 2008-04-21 20:49:01 UTC (rev 26881)
@@ -423,7 +423,8 @@
}
strncpy(heading, _(Reminder ), 199);
-strncat(heading, alarm-title, 50);
+if (alarm-title)
+g_strlcat(heading, alarm-title, 50);
n = notify_notification_new(heading, alarm-description, NULL, NULL);
alarm-active_alarm-active_notify = n;
if (g_par.trayIcon
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26900 - in xfcalendar/trunk: . src
Author: juha
Date: 2008-04-29 11:30:34 + (Tue, 29 Apr 2008)
New Revision: 26900
Modified:
xfcalendar/trunk/NEWS
xfcalendar/trunk/src/event-list.c
Log:
1) two memory leaks found and fixed when checking the code with
valgrind and xrestop
2) updated NEWS file
Modified: xfcalendar/trunk/NEWS
===
--- xfcalendar/trunk/NEWS 2008-04-28 20:07:21 UTC (rev 26899)
+++ xfcalendar/trunk/NEWS 2008-04-29 11:30:34 UTC (rev 26900)
@@ -1,3 +1,46 @@
+20080429: differences between 4.6 and 4.4 Version or Orage
+-
+* globaltime added.
+- shows several clocks from different timezones
+- can be raised and hidden by clicking middle mouse
+ button on orage clock panel plugin
+- Has timetune feature, which makes it easy to see what
+ the time is in other clocks on certain time
+* all visible dates are now in country native format (strftime (%x))
+* all parameters now visible in preferences,
+ which was also restructured
+* new appointment types: TODO and JOURNAL
+- TODO can be used to remember things that needs to done
+- JOURNALs are for notes and things to remember
+* Possible to rename Orage calendar files
+* External files can be used
+- It is possible to add fiels from other sources
+ and Orage keeps track on those.
+* Export and import appointments.
+* Text search in event list
+* Orage is now dependent on local libical.
+- standard libical cannot be used due to several fixes
+ done to Orage's private copy
+* daylist view
+- Possible to see calendar in day view format in addition
+ to the old list view.
+* new alarms.
+- libnotify alarms
+- script type alarms
+* possibility to set alarm based on end time also
+* possible to define default alarm
+* persistent alarms
+- persistent alarms are raised after Orage is started
+ even if your computer or Orage has been turned off when the
+ alarm happened.
+* Orage and orageclock now only wake up when needed.
+- saves battery in laptops when timer wakes up only when
+ needed instead of regularly every second.
+* Main calendar now has list of events and todos.
+* Categories added
+- Also possible to give colour to certain category
+ and then colour is shown in even list view
+
20070104:
-
* Orage version 4.5.9 released
@@ -3,9 +46,9 @@
* globaltime added. Can show times in several timezones
-20072101:
+20070121:
-
* Orage version 4.4.0 released together with Xfce 4.4.0
-20061904:
+20060419:
-
* xfcalendar renamed to orage
Modified: xfcalendar/trunk/src/event-list.c
===
--- xfcalendar/trunk/src/event-list.c 2008-04-28 20:07:21 UTC (rev 26899)
+++ xfcalendar/trunk/src/event-list.c 2008-04-29 11:30:34 UTC (rev 26900)
@@ -243,6 +243,7 @@
, background-gdk,color
, background-set,TRUE
, NULL);
+g_free(categories);
}
static void start_time_data_func(GtkTreeViewColumn *col, GtkCellRenderer *rend
@@ -346,6 +347,7 @@
, NULL);
}
g_free(stime);
+g_free(stime2);
}
else {
g_object_set(rend
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26901 - in xfcalendar/trunk: . panel-plugin
Author: juha
Date: 2008-04-29 20:23:38 + (Tue, 29 Apr 2008)
New Revision: 26901
Modified:
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/panel-plugin/orageclock.c
Log:
fixed timing problem in orageclock panel plugin.
If only hour or slower change clock was shown,
the timer did not refresh it fast enough.
version 4.5.13.8 ready for production except for documents.
Modified: xfcalendar/trunk/configure.in.in
===
--- xfcalendar/trunk/configure.in.in2008-04-29 11:30:34 UTC (rev 26900)
+++ xfcalendar/trunk/configure.in.in2008-04-29 20:23:38 UTC (rev 26901)
@@ -9,7 +9,7 @@
dnl
dnl Version information
-m4_define([orage_version], [4.5.13.7-svn])
+m4_define([orage_version], [4.5.13.8-svn])
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
Modified: xfcalendar/trunk/panel-plugin/orageclock.c
===
--- xfcalendar/trunk/panel-plugin/orageclock.c 2008-04-29 11:30:34 UTC (rev
26900)
+++ xfcalendar/trunk/panel-plugin/orageclock.c 2008-04-29 20:23:38 UTC (rev
26901)
@@ -121,12 +121,20 @@
{
time_t t;
gint delay_time = 0;
+/* if we are using longer than 1 minute (= 6) interval, we need
+ * to delay the first start so that clock changes when minute or hour
+ * changes */
oc_get_time(clock);
time(t);
localtime_r(t, clock-now);
-if (clock-interval = 6)
-delay_time = (clock-interval-clock-now.tm_sec*1000);
+if (clock-interval = 6) {
+if (clock-interval = 360) /* match to next full hour */
+delay_time = (clock-interval -
+(clock-now.tm_min*6 + clock-now.tm_sec*1000));
+else /* match to next full minute */
+delay_time = (clock-interval - clock-now.tm_sec*1000);
+}
if (clock-delay_timeout_id) {
g_source_remove(clock-delay_timeout_id);
clock-delay_timeout_id = 0;
@@ -137,21 +145,31 @@
}
clock-delay_timeout_id = g_timeout_add_full(G_PRIORITY_DEFAULT_IDLE
, delay_time, (GSourceFunc)oc_get_time_delay, clock, NULL);
-return(TRUE);
+/* if we have longer than 1 sec timer, we need to reschedule
+ * it regularly since it will fall down slowly but surely, so
+ * we keep this running. */
+if (clock-interval = 6) {
+if (delay_time 6)
+/* let's run it once in case we happened to kill it
+ just when it was supposed to start */
+oc_get_time(clock);
+return(FALSE);
+}
+else
+return(TRUE);
}
static gboolean oc_end_tuning(Clock *clock)
{
-/* if we have longer than 1 sec timer, we need to reschedule it regularly
- * since it will fall down slowly but surely
- * */
+/* if we have longer than 1 sec timer, we need to reschedule
+ * it regularly since it will fall down slowly but surely */
if (clock-adjust_timeout_id) {
g_source_remove(clock-adjust_timeout_id);
clock-adjust_timeout_id = 0;
}
-if (clock-interval = 6) {
+if (clock-interval = 6) { /* resync it after each 6 hours */
clock-adjust_timeout_id = g_timeout_add_full(G_PRIORITY_DEFAULT_IDLE
-, 60*60*1000, (GSourceFunc)oc_start_timer, clock, NULL);
+, 6*60*60*1000, (GSourceFunc)oc_start_timer, clock, NULL);
}
g_free(clock-tune);
clock-tune = NULL;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26981 - xfcalendar/trunk/panel-plugin
Author: juha
Date: 2008-05-22 15:04:01 + (Thu, 22 May 2008)
New Revision: 26981
Modified:
xfcalendar/trunk/panel-plugin/orageclock.c
Log:
Fixed: Bug 4096 - Orage freezes on double click
Actually it was not a freeze but a multiple start.
Modified: xfcalendar/trunk/panel-plugin/orageclock.c
===
--- xfcalendar/trunk/panel-plugin/orageclock.c 2008-05-20 21:51:26 UTC (rev
26980)
+++ xfcalendar/trunk/panel-plugin/orageclock.c 2008-05-22 15:04:01 UTC (rev
26981)
@@ -311,7 +311,8 @@
}
}
-static gboolean popup_program(GtkWidget *widget, gchar *program, Clock *clock)
+static gboolean popup_program(GtkWidget *widget, gchar *program, Clock *clock
+, guint event_time)
{
GdkAtom atom;
Window xwindow;
@@ -350,6 +351,14 @@
return(TRUE);
}
else { /* not running, let's try to start it. Need to reset TZ! */
+static guint prev_event_time = 0; /* prevenst double start (BUG 4096)
*/
+
+if (prev_event_time ((event_time - prev_event_time) 1000)) {
+g_message(%s: double start of %s prevented, OC_NAME, program);
+return(FALSE);
+}
+
+prev_event_time = event_time;
if (clock-TZ_orig != NULL) /* we had TZ when we started */
g_setenv(TZ, clock-TZ_orig, 1);
else /* TZ was not set so take it out */
@@ -374,10 +383,12 @@
static gboolean on_button_press_event_cb(GtkWidget *widget
, GdkEventButton *event, Clock *clock)
{
+if (event-type != GDK_BUTTON_PRESS) /* double or triple click */
+return(FALSE); /* ignore */
if (event-button == 1)
-return(popup_program(widget, orage, clock));
+return(popup_program(widget, orage, clock, event-time));
else if (event-button == 2)
-return(popup_program(widget, globaltime, clock));
+return(popup_program(widget, globaltime, clock, event-time));
return(FALSE);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r26982 - in xfcalendar/trunk/doc/C: . images
Author: juha Date: 2008-05-23 13:13:37 + (Fri, 23 May 2008) New Revision: 26982 Modified: xfcalendar/trunk/doc/C/images/default_calendar.png xfcalendar/trunk/doc/C/images/orage_appointment.png xfcalendar/trunk/doc/C/images/orage_appointment_alarm.png xfcalendar/trunk/doc/C/images/orage_preferences_display.png xfcalendar/trunk/doc/C/images/orage_preferences_extra.png xfcalendar/trunk/doc/C/orage.html xfcalendar/trunk/doc/C/orage.xml Log: Documentation update. Now ready for production. Modified: xfcalendar/trunk/doc/C/images/default_calendar.png === (Binary files differ) Modified: xfcalendar/trunk/doc/C/images/orage_appointment.png === (Binary files differ) Modified: xfcalendar/trunk/doc/C/images/orage_appointment_alarm.png === (Binary files differ) Modified: xfcalendar/trunk/doc/C/images/orage_preferences_display.png === (Binary files differ) Modified: xfcalendar/trunk/doc/C/images/orage_preferences_extra.png === (Binary files differ) Modified: xfcalendar/trunk/doc/C/orage.html === --- xfcalendar/trunk/doc/C/orage.html 2008-05-22 15:04:01 UTC (rev 26981) +++ xfcalendar/trunk/doc/C/orage.html 2008-05-23 13:13:37 UTC (rev 26982) @@ -1,6 +1,6 @@ -htmlheadmeta http-equiv=Content-Type content=text/html; charset=ISO-8859-1titleOrage/titlelink rel=stylesheet href=../xfce.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.72.0link rel=start href=#orage title=Oragelink rel=next href=#orage-intro title=Introduction/headbody bgcolor=white text=black link=#FF vlink=#840084 alink=#FFdiv class=article lang=endiv class=titlepagedivdivh1 class=titlea name=orage/aOrage/h1/divdivdiv class=authorgroupdiv class=authorh3 class=authorspan class=firstnameJuha/span span class=surnameKautto/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameMickael/span span class=surnameGraf/span/h3div class=affiliationdiv class= addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameBenedikt/span span class=surnameMeurer/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/div/div/divdivspan xmlns=http://www.w3.org/TR/xhtml1/transitional; class=releaseinfoThis manual describes strong xmlns= class=applicationcodeorage/code/strong version 4.5.12. -Last updated: January 2008 - br/br/span/divdivp class=copyrightCopyright � 2006-2008 Juha Kautto/p/div/divhr/divdiv class=tocpbTable of Contents/b/pdldtspan class=sect1a href=#orage-introIntroduction/a/span/dtdtspan class=sect1a href=#orage-getting-startedGetting started/a/span/dtdtspan class=sect1a href=#orage-calendar-windowThe calendar window/a/span/dtdddldtspan class=sect2a href=#calendar-menu-barThe menu bar/a/span/dtdtspan class=sect2a href=#calendar-windowThe calendar/a/span/dtdtspan class=sect2a href=#calendar-todo-windowThe TODO list/a/span/dt/dl/dddtspan class=sect1a href=#orage-eventlist-windowThe event list window/a/span/dtdddldtspan class=sect2a href=#event%20list-action-barThe button bar/a/span/dtdtspan class=sect2a href=#eventlist-tabsThe tabs/a/span/dtdtspan class=sect2a href=#eventlist- appointmentsThe appointment list/a/span/dt/dl/dddtspan class=sect1a href=#orage-daylist-windowThe day list window/a/span/dtdddldtspan class=sect2a href=#daylist-action-barThe button bar/a/span/dtdtspan class=sect2a href=#daylist-parametersThe parameters/a/span/dtdtspan class=sect2a href=#daylist-listThe day list/a/span/dt/dl/dddtspan class=sect1a href=#orage-appointment-windowThe appointment window/a/span/dtdddldtspan class=sect2a href=#appointment-action-barThe button bar/a/span/dtdtspan class=sect2a href=#appointment-general-tabThe general tab/a/span/dtdtspan class=sect2a href=#appointment-alarm-tabThe alarm tab/a/span/dtdtspan class=sect2a href=#appointment-recurrence-tabThe recurrence tab/a/span/dt/dl/dddtspan class=sect1a href=#orage-exchangedata-windowThe exchange data window/a/span/dt dddldtspan class=sect2a href=#exchange-impexp-tabThe import export tab/a/span/dtdtspan class=sect2a href=#exchange-oragefiles-tabThe orage files tab/a/span/dtdtspan class=sect2a href=#exchange-foreign-tabThe foreign files tab/a/span/dt/dl/dddtspan class=sect1a href=#orage-preferences-windowThe preferences window/a/span/dtdddldtspan class=sect2a href=#preferences-main-tabThe main tab/a/span
[Xfce4-commits] r27043 - in xfcalendar/trunk: . plugin
Author: juha Date: 2008-06-08 20:07:39 + (Sun, 08 Jun 2008) New Revision: 27043 Removed: xfcalendar/trunk/plugin/xfcalendar_plugin.c Modified: xfcalendar/trunk/configure.in.in xfcalendar/trunk/plugin/Makefile.am xfcalendar/trunk/plugin/xfce-xfcalendar-settings.desktop.in Log: applied fix for Bug 4074 - Remove mcs-dependency Thanks to Stephan Arts, who created this patch Modified: xfcalendar/trunk/configure.in.in === --- xfcalendar/trunk/configure.in.in2008-06-08 08:50:03 UTC (rev 27042) +++ xfcalendar/trunk/configure.in.in2008-06-08 20:07:39 UTC (rev 27043) @@ -9,7 +9,7 @@ dnl dnl Version information -m4_define([orage_version], [4.5.13.8-svn]) +m4_define([orage_version], [4.5.13.9-svn]) m4_define([gtk_minimum_version], [2.6.0]) m4_define([xfce_minimum_version], [4.4.0]) @@ -74,15 +74,11 @@ XDT_I18N([EMAIL PROTECTED]@]) dnl Check for required packages -XDT_CHECK_PACKAGE([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0], [xfce_minimum_version]) XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [xfce_minimum_version]) dnl Needed for panel plugin XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [xfce_minimum_version]) -dnl configure the mcs plugin -XDT_XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [xfce_minimum_version]) - dnl the ical magic ac_INCLUDED_LIBICAL=yes Modified: xfcalendar/trunk/plugin/Makefile.am === --- xfcalendar/trunk/plugin/Makefile.am 2008-06-08 08:50:03 UTC (rev 27042) +++ xfcalendar/trunk/plugin/Makefile.am 2008-06-08 20:07:39 UTC (rev 27043) @@ -1,22 +1,3 @@ -orage_plugindir = \ - $(libdir)/xfce4/mcs-plugins - -orage_plugin_LTLIBRARIES = orage_plugin.la - -orage_plugin_la_LDFLAGS = \ - -avoid-version \ - -module - -orage_plugin_la_SOURCES = \ - xfcalendar_plugin.c - -orage_plugin_la_CFLAGS = \ - $(XFCE_MCS_MANAGER_CFLAGS) \ - -DBINDIR=\$(bindir)\ \ - -DPACKAGE_LOCALE_DIR=\$(localedir)\ \ - -DSYSCONFDIR=\$(sysconfdir)\ \ - -DDATADIR=\$(pkgdatadir)\ - desktopdir = $(datadir)/applications desktop_in_files = xfce-xfcalendar-settings.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) Deleted: xfcalendar/trunk/plugin/xfcalendar_plugin.c Modified: xfcalendar/trunk/plugin/xfce-xfcalendar-settings.desktop.in === --- xfcalendar/trunk/plugin/xfce-xfcalendar-settings.desktop.in 2008-06-08 08:50:03 UTC (rev 27042) +++ xfcalendar/trunk/plugin/xfce-xfcalendar-settings.desktop.in 2008-06-08 20:07:39 UTC (rev 27043) @@ -3,7 +3,7 @@ Encoding=UTF-8 _Name=Xfce 4 Calendar Settings _Comment=Settings for the Xfce 4 Calendar Application -Exec=xfce-setting-show orage +Exec=orage -p Icon=xfcalendar Terminal=false Type=Application ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27075 - xfcalendar/trunk/po
Author: juha Date: 2008-06-16 12:09:51 + (Mon, 16 Jun 2008) New Revision: 27075 Modified: xfcalendar/trunk/po/de.po Log: Fixed bug 4152 - German translation typo he typo seems to be here (po/de.po): #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1 msgid Calendar Settings msgstr Kalandereinstellungen to Kalendereinstellungen Modified: xfcalendar/trunk/po/de.po === --- xfcalendar/trunk/po/de.po 2008-06-16 05:46:20 UTC (rev 27074) +++ xfcalendar/trunk/po/de.po 2008-06-16 12:09:51 UTC (rev 27075) @@ -3379,7 +3379,7 @@ #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1 msgid Calendar Settings -msgstr Kalandereinstellungen +msgstr Kalendereinstellungen #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2 msgid Settings for the Xfce 4 Calendar Application ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27076 - xfcalendar/branches/xfce_4_4/po
Author: juha Date: 2008-06-16 12:13:21 + (Mon, 16 Jun 2008) New Revision: 27076 Modified: xfcalendar/branches/xfce_4_4/po/de.po Log: fixed bug 4152 - German translation typo Kalandereinstellungen - Kalendereinstellungen Modified: xfcalendar/branches/xfce_4_4/po/de.po === --- xfcalendar/branches/xfce_4_4/po/de.po 2008-06-16 12:09:51 UTC (rev 27075) +++ xfcalendar/branches/xfce_4_4/po/de.po 2008-06-16 12:13:21 UTC (rev 27076) @@ -2266,7 +2266,7 @@ #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1 msgid Calendar Settings -msgstr Kalandereinstellungen +msgstr Kalendereinstellungen #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2 msgid Settings for the Xfce 4 Calendar Application ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27287 - in xfcalendar/trunk: doc doc/C globaltime
Author: juha Date: 2008-07-14 20:32:07 + (Mon, 14 Jul 2008) New Revision: 27287 Modified: xfcalendar/trunk/doc/C/orage.html xfcalendar/trunk/doc/C/orage.xml xfcalendar/trunk/doc/Makefile.am xfcalendar/trunk/globaltime/Makefile.am Log: fix for bug 4200 - orage 4.5.13.9-r27141 install manpages in /usr/man Also documented procedure alamr limitation to handle standard input redirection with commands. Modified: xfcalendar/trunk/doc/C/orage.html === --- xfcalendar/trunk/doc/C/orage.html 2008-07-14 19:35:00 UTC (rev 27286) +++ xfcalendar/trunk/doc/C/orage.html 2008-07-14 20:32:07 UTC (rev 27287) @@ -1,8 +1,8 @@ -htmlheadmeta http-equiv=Content-Type content=text/html; charset=ISO-8859-1titleOrage/titlelink rel=stylesheet href=../xfce.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.72.0link rel=start href=#orage title=Oragelink rel=next href=#orage-intro title=Introduction/headbody bgcolor=white text=black link=#FF vlink=#840084 alink=#FFdiv class=article lang=endiv class=titlepagedivdivh1 class=titlea name=orage/aOrage/h1/divdivdiv class=authorgroupdiv class=authorh3 class=authorspan class=firstnameJuha/span span class=surnameKautto/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameMickael/span span class=surnameGraf/span/h3div class=affiliationdiv class= addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameBenedikt/span span class=surnameMeurer/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/div/div/divdivspan xmlns=http://www.w3.org/TR/xhtml1/transitional; class=releaseinfoThis manual describes strong xmlns= class=applicationcodeorage/code/strong version 4.5.13. -Last updated: May 2008 +htmlheadmeta http-equiv=Content-Type content=text/html; charset=ISO-8859-1titleOrage/titlelink rel=stylesheet href=../xfce.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=#orage title=Oragelink rel=next href=#orage-intro title=Introduction/headbody bgcolor=white text=black link=#FF vlink=#840084 alink=#FFdiv class=article lang=endiv class=titlepagedivdivh2 class=titlea name=orage/aOrage/h2/divdivdiv class=authorgroupdiv class=authorh3 class=authorspan class=firstnameJuha/span span class=surnameKautto/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a class=email href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameMickael/span span class=surnameGraf/span/h3div class=affiliatio ndiv class=addresspcode class=emaillt;a class=email href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/divdiv class=authorh3 class=authorspan class=firstnameBenedikt/span span class=surnameMeurer/span/h3div class=affiliationdiv class=addresspcode class=emaillt;a class=email href=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/agt;/code/p/div/div/div/div/divdivspan xmlns=http://www.w3.org/TR/xhtml1/transitional; class=releaseinfoThis manual describes strong xmlns= class=applicationcodeorage/code/strong version 4.5.13. +Last updated: July 2008 br/br/span/divdivp class=copyrightCopyright � 2006-2008 Juha Kautto/p/div/divhr/divdiv class=tocpbTable of Contents/b/pdldtspan class=sect1a href=#orage-introIntroduction/a/span/dtdtspan class=sect1a href=#orage-getting-startedGetting started/a/span/dtdtspan class=sect1a href=#orage-calendar-windowThe calendar window/a/span/dtdddldtspan class=sect2a href=#calendar-menu-barThe menu bar/a/span/dtdtspan class=sect2a href=#calendar-windowThe calendar/a/span/dtdtspan class=sect2a href=#calendar-todo-windowThe TODO list/a/span/dtdtspan class=sect2a href=#calendar-events-windowThe EVENT list/a/span/dt/dl/dddtspan class=sect1a href=#orage-eventlist-windowThe event list window/a/span/dtdddldtspan class=sect2a href=#event%20list-action-barThe button bar/a/span/dtdtspan class=sect2a hre f=#eventlist-tabsThe tabs/a/span/dtdtspan class=sect2a href=#eventlist-appointmentsThe appointment list/a/span/dt/dl/dddtspan class=sect1a href=#orage-daylist-windowThe day list window/a/span/dtdddldtspan class=sect2a href=#daylist-action-barThe button bar/a/span/dtdtspan class=sect2a href=#daylist-parametersThe parameters/a/span/dtdtspan class=sect2a href=#daylist-listThe day list/a/span/dt/dl/dddtspan class=sect1a href=#orage-appointment-windowThe appointment window/a/span/dtdddldtspan class=sect2a href=#appointment-action-barThe button bar/a/span/dtdtspan class=sect2a href=#appointment-general-tabThe general tab/a/span/dtdtspan class=sect2a href=#appointment-alarm-tabThe alarm
[Xfce4-commits] r27342 - xfcalendar/trunk
Author: juha Date: 2008-07-18 18:08:31 + (Fri, 18 Jul 2008) New Revision: 27342 Modified: xfcalendar/trunk/NEWS Log: latest additions Modified: xfcalendar/trunk/NEWS === --- xfcalendar/trunk/NEWS 2008-07-18 16:44:24 UTC (rev 27341) +++ xfcalendar/trunk/NEWS 2008-07-18 18:08:31 UTC (rev 27342) @@ -1,35 +1,36 @@ -20080429: differences between 4.6 and 4.4 Version or Orage +20080718: differences between 4.6 and 4.4 Version or Orage - -* globaltime added. +* Man page created for orage and globaltime +* Globaltime added. - shows several clocks from different timezones - can be raised and hidden by clicking middle mouse button on orage clock panel plugin -- Has timetune feature, which makes it easy to see what +- has timetune feature, which makes it easy to see what the time is in other clocks on certain time -* all visible dates are now in country native format (strftime (%x)) -* all parameters now visible in preferences, - which was also restructured -* new appointment types: TODO and JOURNAL +* All visible dates are now in country native format (strftime (%x)) +* All parameters now visible in preferences +- restructured parameter screens +* New appointment types: TODO and JOURNAL - TODO can be used to remember things that needs to done - JOURNALs are for notes and things to remember * Possible to rename Orage calendar files * External files can be used -- It is possible to add fiels from other sources +- it is possible to add files from other sources and Orage keeps track on those. * Export and import appointments. * Text search in event list * Orage is now dependent on local libical. - standard libical cannot be used due to several fixes done to Orage's private copy -* daylist view -- Possible to see calendar in day view format in addition +* Daylist view +- possible to see calendar in day view format in addition to the old list view. -* new alarms. +* New alarms. - libnotify alarms - script type alarms -* possibility to set alarm based on end time also -* possible to define default alarm -* persistent alarms +* Possibility to set alarm based on end time also +* Possible to define default alarm +* Persistent alarms - persistent alarms are raised after Orage is started even if your computer or Orage has been turned off when the alarm happened. @@ -37,8 +38,9 @@ - saves battery in laptops when timer wakes up only when needed instead of regularly every second. * Main calendar now has list of events and todos. +* Better compatibility with evolution ical files * Categories added -- Also possible to give colour to certain category +- also possible to give colour to certain category and then colour is shown in even list view 20070104: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27354 - xfcalendar/trunk/src
Author: juha Date: 2008-07-20 17:49:09 + (Sun, 20 Jul 2008) New Revision: 27354 Modified: xfcalendar/trunk/src/ical-code.c xfcalendar/trunk/src/reminder.c Log: fixed small memory leak in ical categories handling Modified: xfcalendar/trunk/src/ical-code.c === --- xfcalendar/trunk/src/ical-code.c2008-07-20 14:50:11 UTC (rev 27353) +++ xfcalendar/trunk/src/ical-code.c2008-07-20 17:49:09 UTC (rev 27354) @@ -2587,6 +2587,7 @@ g_free(appt-sound); g_free(appt-procedure_cmd); g_free(appt-procedure_params); +g_free(appt-categories); /* g_free(appt-email_attendees); */ Modified: xfcalendar/trunk/src/reminder.c === --- xfcalendar/trunk/src/reminder.c 2008-07-20 14:50:11 UTC (rev 27353) +++ xfcalendar/trunk/src/reminder.c 2008-07-20 17:49:09 UTC (rev 27354) @@ -596,7 +596,7 @@ #endif status = orage_exec(alarm-cmd, active, error); if (!status) -g_warning(create_procedure_reminder: cmd failed(%s), alarm-cmd); +g_warning(P_N cmd failed(%s), alarm-cmd); } static void create_reminders(alarm_struct *alarm) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27355 - in xfcalendar/trunk: doc/C src
Author: juha Date: 2008-07-20 19:54:06 + (Sun, 20 Jul 2008) New Revision: 27355 Modified: xfcalendar/trunk/doc/C/orage.html xfcalendar/trunk/doc/C/orage.xml xfcalendar/trunk/src/reminder.c Log: fixed Bug 4209 - Alarm Procedure with redirection (meaning lt; or gt;) is Parsed Incorrectly Used linux system command so this makes Orage less portable. Modified: xfcalendar/trunk/doc/C/orage.html === --- xfcalendar/trunk/doc/C/orage.html 2008-07-20 17:49:09 UTC (rev 27354) +++ xfcalendar/trunk/doc/C/orage.html 2008-07-20 19:54:06 UTC (rev 27355) @@ -431,14 +431,6 @@ This makes it possible to use external alarms. You can run any operating system command or script. Common use for this is sending email. - /pp -Note that strong class=applicationcodeorage/code/strong can not handle normal linux redirection. So to send -email you can not set command to: -span class=commandstrongmail -s hi [EMAIL PROTECTED] lt; send_this_file.txt -/strong/span because lt; is not interpreted as redirection of -standard input, but it is normal parameter instead. You need to -write a shell script to do this and give the file name as a -parameter to your script. /p/dddtspan class=termDefault alarm/span/dtddp You can either set alarm back to default options or you can store current settings to be default alarm for all new appointments. @@ -717,20 +709,20 @@ wrong, you can try to set this. 0 = Monday, 1 = Tuesday... /p/li/ul/div/divdiv class=sect1 lang=endiv class=titlepagedivdivh2 class=title style=clear: botha name=orage-faq/aFrequently Asked Questions/h2/div/div/divp Some common questions and answers. - /ptr class=qandadivtd align=left valign=top colspan=2h4 class=titlea name=id2574147/a1. Frequently Asked Questions/h4/td/trtr class=toctd align=left valign=top colspan=2dldt1.1. a href=#id2574151 + /ptr class=qandadivtd align=left valign=top colspan=2h4 class=titlea name=id2574133/a1. Frequently Asked Questions/h4/td/trtr class=toctd align=left valign=top colspan=2dldt1.1. a href=#id2574137 Why does my week start on Saturday? -/a/dtdt1.2. a href=#id2574245 +/a/dtdt1.2. a href=#id2574231 How can I insert my ical file into orage? -/a/dtdt1.3. a href=#id2574283 +/a/dtdt1.3. a href=#id2574269 How can skip my repeating appointment from happening during some period of time? -/a/dtdt1.4. a href=#id2574315 +/a/dtdt1.4. a href=#id2574302 I have found a bug in orage or would like to see a new feature. How can I inform that to the developers? -/a/dtdt1.5. a href=#id2574365 +/a/dtdt1.5. a href=#id2574351 I upgraded to Orage 4.5 from Orage 4.4 and now my old appointments are missing. Are they permanetly lost? -/a/dt/dl/td/trtr class=questiontd align=left valign=topa name=id2574151/aa name=id2574153/apb1.1./b/p/tdtd align=left valign=topp +/a/dt/dl/td/trtr class=questiontd align=left valign=topa name=id2574137/aa name=id2574139/apb1.1./b/p/tdtd align=left valign=topp Why does my week start on Saturday? /p/td/trtr class=answertd align=left valign=top/tdtd align=left valign=topp This really is a problem in your distro. You can check how your @@ -756,7 +748,7 @@ After that you can check what the setting is: span class=commandstronggrep first_weekday fi_FI/strong/span and change that if it is wrong and after that you need to recompile your locale database. -/p/td/trtr class=questiontd align=left valign=topa name=id2574245/aa name=id2574247/apb1.2./b/p/tdtd align=left valign=topp +/p/td/trtr class=questiontd align=left valign=topa name=id2574231/aa name=id2574233/apb1.2./b/p/tdtd align=left valign=topp How can I insert my ical file into strong class=applicationcodeorage/code/strong? /p/td/trtr class=answertd align=left valign=top/tdtd align=left valign=topp You can do this with so called foreig files. Add your file as @@ -764,7 +756,7 @@ and strong class=applicationcodeorage/code/strong includes the appointmemts (After this you can not tell the difference anymore, so you can not easily move them back to where they came form.) -/p/td/trtr class=questiontd align=left valign=topa name=id2574283/aa name=id2574285/apb1.3./b/p/tdtd align=left valign=topp +/p/td/trtr class=questiontd align=left valign=topa name=id2574269/aa name=id2574271/apb1.3./b/p/tdtd align=left valign=topp How can skip my repeating appointment from happening during some period of time? /p/td/trtr class=answertd align=left valign=top
[Xfce4-commits] r27363 - xfcalendar/trunk
Author: juha Date: 2008-07-22 08:13:18 + (Tue, 22 Jul 2008) New Revision: 27363 Modified: xfcalendar/trunk/configure.in.in Log: new stable release 4.5.13.0 Modified: xfcalendar/trunk/configure.in.in === --- xfcalendar/trunk/configure.in.in2008-07-22 08:07:15 UTC (rev 27362) +++ xfcalendar/trunk/configure.in.in2008-07-22 08:13:18 UTC (rev 27363) @@ -9,7 +9,7 @@ dnl dnl Version information -m4_define([orage_version], [4.5.14.0-svn]) +m4_define([orage_version], [4.5.14.0]) m4_define([gtk_minimum_version], [2.6.0]) m4_define([xfce_minimum_version], [4.4.0]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
