[Xfce4-commits] <orage:master> 4.8.1.8 Added hourly repeating option and did some code cleaning
Juha Kautto
noreply at xfce.org
Thu Jul 28 10:52:01 CEST 2011
Updating branch refs/heads/master
to 44c855931730fa582c857ee606613d2fa0f578fa (commit)
from eff744be6887b5758b4d515a3db901990d8f85cf (commit)
commit 44c855931730fa582c857ee606613d2fa0f578fa
Author: Juha Kautto <juha at xfce.org>
Date: Thu Jul 28 11:48:00 2011 +0300
4.8.1.8 Added hourly repeating option and did some code cleaning
Added possibity to create events which repeat hourly. Note that those very
easily will become very heavy.
Also removed low priority events from event window and main calender event
box. You can still find those with search.
configure.in.in | 2 +-
src/about-xfcalendar.c | 43 +-------------------------------------
src/appointment.c | 16 +++++++-------
src/event-list.c | 54 ++++++++++++++++++++++++-----------------------
src/ical-archive.c | 1 -
src/ical-code.c | 50 ++++++++++++++++++++++++-------------------
src/ical-code.h | 1 +
src/mainbox.c | 11 ++++++++-
8 files changed, 77 insertions(+), 101 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 9278b25..6695216 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
dnl
dnl Version information
-m4_define([orage_version], [4.8.1.7-git])
+m4_define([orage_version], [4.8.1.8-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/src/about-xfcalendar.c b/src/about-xfcalendar.c
index 2746e96..469b89e 100644
--- a/src/about-xfcalendar.c
+++ b/src/about-xfcalendar.c
@@ -43,7 +43,7 @@ void create_wAbout(GtkWidget *widget, gpointer user_data)
about = (GtkAboutDialog *) dialog;
gtk_about_dialog_set_program_name(about, "Orage");
gtk_about_dialog_set_version(about, VERSION);
- gtk_about_dialog_set_copyright(about, "Copyright © 2003-2010 Juha Kautto");
+ gtk_about_dialog_set_copyright(about, "Copyright © 2003-2011 Juha Kautto");
gtk_about_dialog_set_comments(about, _("Manage your time with Orage"));
/*
gtk_about_dialog_set_license(about, XFCE_LICENSE_GPL);
@@ -60,44 +60,3 @@ void create_wAbout(GtkWidget *widget, gpointer user_data)
gtk_widget_destroy(dialog);
g_object_unref(orage_logo);
}
-/*
-void create_wAbout_old(GtkWidget *widget, gpointer user_data)
-{
- CalWin *xfcal = (CalWin *)user_data;
- GtkWidget *dialog;
- GdkPixbuf *orage_logo;
- XfceAboutInfo *about;
-
- about = xfce_about_info_new("Orage", VERSION
- , _("Manage your time with Xfce4")
- , XFCE_COPYRIGHT_TEXT("2003-2008", " Juha Kautto")
- , XFCE_LICENSE_GPL);
- orage_logo = orage_create_icon(FALSE, 48);
- xfce_about_info_set_homepage(about, "http://www.xfce.org");
-
- xfce_about_info_add_credit(about,
- "Juha Kautto",
- "juha at xfce.org",
- _("Maintainer"));
-
- xfce_about_info_add_credit(about,
- "Mickael 'Korbinus' Graf",
- "korbinus at xfce.org",
- _("Original creator, retired maintainer"));
-
- xfce_about_info_add_credit(about,
- "Benedikt Meurer",
- "benny at xfce.org",
- _("Contributor"));
-
- dialog = xfce_about_dialog_new_with_values(GTK_WINDOW(xfcal->mWindow)
- , about, orage_logo);
-
- gtk_window_set_default_size(GTK_WINDOW(dialog), 520, 440);
-
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
- xfce_about_info_free(about);
- g_object_unref(orage_logo);
-}
-*/
diff --git a/src/appointment.c b/src/appointment.c
index 275f2b1..936c68e 100644
--- a/src/appointment.c
+++ b/src/appointment.c
@@ -565,7 +565,7 @@ static void on_appNote_buffer_changed_cb(GtkTextBuffer *b, gpointer user_data)
appt_win *apptw = (appt_win *)user_data;
GtkTextIter start, end, match_start, match_end;
GtkTextBuffer *tb;
- gchar *cdate, c_time[6], *cdatetime;
+ gchar *cdate, ctime[6], *cdatetime;
struct tm *tm;
tb = apptw->Note_buffer;
@@ -581,17 +581,17 @@ static void on_appNote_buffer_changed_cb(GtkTextBuffer *b, gpointer user_data)
, GTK_TEXT_SEARCH_TEXT_ONLY
, &match_start, &match_end, &end)) { /* found it */
tm = orage_localtime();
- g_sprintf(c_time, "%02d:%02d", tm->tm_hour, tm->tm_min);
+ g_sprintf(ctime, "%02d:%02d", tm->tm_hour, tm->tm_min);
gtk_text_buffer_delete(tb, &match_start, &match_end);
- gtk_text_buffer_insert(tb, &match_start, c_time, -1);
+ gtk_text_buffer_insert(tb, &match_start, ctime, -1);
}
else if (gtk_text_iter_forward_search(&start, "<DT>"
, GTK_TEXT_SEARCH_TEXT_ONLY
, &match_start, &match_end, &end)) { /* found it */
tm = orage_localtime();
cdate = orage_tm_date_to_i18_date(tm);
- g_sprintf(c_time, "%02d:%02d", tm->tm_hour, tm->tm_min);
- cdatetime = g_strconcat(cdate, " ", c_time, NULL);
+ g_sprintf(ctime, "%02d:%02d", tm->tm_hour, tm->tm_min);
+ cdatetime = g_strconcat(cdate, " ", ctime, NULL);
gtk_text_buffer_delete(tb, &match_start, &match_end);
gtk_text_buffer_insert(tb, &match_start, cdatetime, -1);
g_free(cdatetime);
@@ -3118,8 +3118,8 @@ static void build_recurrence_page(appt_win *apptw)
{
gint row, i;
guint y, m;
- char *recur_freq_array[5] = {
- _("None"), _("Daily"), _("Weekly"), _("Monthly"), _("Yearly")};
+ char *recur_freq_array[6] = {
+ _("None"), _("Daily"), _("Weekly"), _("Monthly"), _("Yearly"), _("Hourly")};
char *weekday_array[7] = {
_("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun")};
GtkWidget *hbox;
@@ -3157,7 +3157,7 @@ static void build_recurrence_page(appt_win *apptw)
apptw->Recur_freq_label = gtk_label_new(_("Frequency"));
apptw->Recur_freq_hbox = gtk_hbox_new(FALSE, 0);
apptw->Recur_freq_cb = orage_create_combo_box_with_content(
- recur_freq_array, 5);
+ recur_freq_array, 6);
gtk_box_pack_start(GTK_BOX(apptw->Recur_freq_hbox)
, apptw->Recur_freq_cb, FALSE, FALSE, 0);
apptw->Recur_int_spin_label1 = gtk_label_new(_("Each"));
diff --git a/src/event-list.c b/src/event-list.c
index c157621..1cf1452 100644
--- a/src/event-list.c
+++ b/src/event-list.c
@@ -250,7 +250,7 @@ static void start_time_data_func(GtkTreeViewColumn *col, GtkCellRenderer *rend
, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
{
el_win *el = (el_win *)user_data;
- gchar *s_time, *etime, *stime2;
+ gchar *stime, *etime, *stime2;
gchar start_time[17], end_time[17];
gint len;
@@ -264,15 +264,15 @@ static void start_time_data_func(GtkTreeViewColumn *col, GtkCellRenderer *rend
return;
}
- gtk_tree_model_get(model, iter, COL_TIME, &s_time, -1);
+ gtk_tree_model_get(model, iter, COL_TIME, &stime, -1);
/* we need to remember the real address in case we increment it,
* so that we can free the correct pointer */
- stime2 = s_time;
- if (s_time[0] == '+')
- s_time++;
- etime = s_time + 8; /* hh:mm - hh:mm */
+ stime2 = stime;
+ if (stime[0] == '+')
+ stime++;
+ etime = stime + 8; /* hh:mm - hh:mm */
/* only add special highlight if we are on today (=start with time) */
- if (s_time[2] != ':') {
+ if (stime[2] != ':') {
g_object_set(rend
, "foreground-set", FALSE
, "strikethrough-set", FALSE
@@ -288,7 +288,7 @@ static void start_time_data_func(GtkTreeViewColumn *col, GtkCellRenderer *rend
, "weight-set", TRUE
, NULL);
}
- else if (strncmp(s_time, el->time_now, 5) <= 0
+ else if (strncmp(stime, el->time_now, 5) <= 0
&& strncmp(etime, el->time_now, 5) >= 0) { /* current */
g_object_set(rend
, "foreground", "Blue"
@@ -309,19 +309,19 @@ static void start_time_data_func(GtkTreeViewColumn *col, GtkCellRenderer *rend
g_free(stime2);
}
else if (el->page == TODO_PAGE) {
- gtk_tree_model_get(model, iter, COL_SORT, &s_time, -1);
- if (s_time[8] == 'T') { /* date+time */
+ gtk_tree_model_get(model, iter, COL_SORT, &stime, -1);
+ if (stime[8] == 'T') { /* date+time */
len = 15;
}
else { /* date only */
len = 8;
}
- strncpy(start_time, s_time, len);
+ strncpy(start_time, stime, len);
gtk_tree_model_get(model, iter, COL_TIME, &stime2, -1);
if (g_str_has_suffix(stime2, "- ...")) /* no due time */
strncpy(end_time, "99999", len); /* long in the future*/
else /* normal due time*/
- strncpy(end_time, s_time+len, len);
+ strncpy(end_time, stime+len, len);
if (strncmp(end_time, el->date_now, len) < 0) { /* gone */
g_object_set(rend
, "foreground", "Red"
@@ -349,7 +349,7 @@ static void start_time_data_func(GtkTreeViewColumn *col, GtkCellRenderer *rend
, "weight-set", TRUE
, NULL);
}
- g_free(s_time);
+ g_free(stime);
g_free(stime2);
}
else {
@@ -367,12 +367,12 @@ static void add_el_row(el_win *el, xfical_appt *appt, char *par)
GtkListStore *list1;
gchar *title = NULL, *tmp;
gchar flags[6];
- gchar *s_time;
+ gchar *stime;
gchar /* *s_sort,*/ *s_sort1;
gchar *tmp_note;
guint len = 50;
- s_time = format_time(el, appt, par);
+ stime = format_time(el, appt, par);
if (appt->alarmtime != 0)
if (appt->sound != NULL)
flags[0] = 'S';
@@ -432,7 +432,7 @@ static void add_el_row(el_win *el, xfical_appt *appt, char *par)
list1 = el->ListStore;
gtk_list_store_append(list1, &iter1);
gtk_list_store_set(list1, &iter1
- , COL_TIME, s_time
+ , COL_TIME, stime
, COL_FLAGS, flags
, COL_HEAD, title
, COL_UID, appt->uid
@@ -441,7 +441,7 @@ static void add_el_row(el_win *el, xfical_appt *appt, char *par)
, -1);
g_free(title);
g_free(s_sort1);
- g_free(s_time);
+ g_free(stime);
/*
g_free(s_sort);
*/
@@ -504,7 +504,9 @@ static void app_rows(el_win *el, char *a_day, char *par, xfical_type ical_type
tmp != NULL;
tmp = g_list_next(tmp)) {
appt = (xfical_appt *)tmp->data;
- add_el_row(el, appt, par);
+ if (appt->priority < g_par.priority_list_limit) {
+ add_el_row(el, appt, par);
+ }
xfical_appt_free(appt);
}
g_list_free(appt_list);
@@ -585,7 +587,7 @@ static void refresh_time_field(el_win *el)
static void event_data(el_win *el)
{
char *title; /* in %x strftime format */
- char *s_time; /* in icaltime format */
+ char *stime; /* in icaltime format */
char a_day[9]; /* yyyymmdd */
struct tm *t, t_title;
@@ -594,8 +596,8 @@ static void event_data(el_win *el)
el->days = gtk_spin_button_get_value(GTK_SPIN_BUTTON(el->event_spin));
title = (char *)gtk_window_get_title(GTK_WINDOW(el->Window));
t_title = orage_i18_date_to_tm_date(title);
- s_time = orage_tm_time_to_icaltime(&t_title);
- strncpy(a_day, s_time, 8);
+ stime = orage_tm_time_to_icaltime(&t_title);
+ strncpy(a_day, stime, 8);
a_day[8] = '\0';
t = orage_localtime();
g_sprintf(el->time_now, "%02d:%02d", t->tm_hour, t->tm_min);
@@ -611,16 +613,16 @@ static void event_data(el_win *el)
static void todo_data(el_win *el)
{
- char *s_time;
+ char *stime;
char a_day[9]; /* yyyymmdd */
struct tm *t;
el->days = 0; /* not used */
t = orage_localtime();
- s_time = orage_tm_time_to_icaltime(t);
- strncpy(a_day, s_time, 8);
+ stime = orage_tm_time_to_icaltime(t);
+ strncpy(a_day, stime, 8);
a_day[8] = '\0';
- strncpy(el->date_now, s_time, XFICAL_APPT_TIME_FORMAT_LEN);
+ strncpy(el->date_now, stime, XFICAL_APPT_TIME_FORMAT_LEN);
app_data(el, a_day, NULL);
}
@@ -960,7 +962,7 @@ static void on_journal_start_button_clicked(GtkWidget *button
}
static void drag_data_get(GtkWidget *widget, GdkDragContext *context
- , GtkSelectionData *selection_data, guint info, guint i_time
+ , GtkSelectionData *selection_data, guint info, guint itime
, gpointer user_data)
{
GtkTreeSelection *sel;
diff --git a/src/ical-archive.c b/src/ical-archive.c
index 1cfa01e..01617cc 100644
--- a/src/ical-archive.c
+++ b/src/ical-archive.c
@@ -193,7 +193,6 @@ static void xfical_icalcomponent_archive_recurrent(icalcomponent *e
* enddates and actually only the date parts since time will stay.
* Note that we may need to remove limited recurrency events. We only
* add X-ORAGE-ORIG... dates if those are not there already.
- * NOTE: these are not added to Archive file.
*/
sdate = icalcomponent_get_dtstart(e);
pdtstart = icalcomponent_get_first_property(e, ICAL_DTSTART_PROPERTY);
diff --git a/src/ical-code.c b/src/ical-code.c
index 1fb5618..e1633fa 100644
--- a/src/ical-code.c
+++ b/src/ical-code.c
@@ -795,7 +795,7 @@ int xfical_compare_times(xfical_appt *appt)
{
#undef P_N
#define P_N "xfical_compare_times: "
- struct icaltimetype s_time, etime;
+ struct icaltimetype stime, etime;
const char *text;
struct icaldurationtype duration;
@@ -811,9 +811,9 @@ int xfical_compare_times(xfical_appt *appt)
orage_message(250, P_N "null start time");
return(0); /* should be error ! */
}
- s_time = icaltime_from_string(appt->starttime);
+ stime = icaltime_from_string(appt->starttime);
duration = icaldurationtype_from_int(appt->duration);
- etime = icaltime_add(s_time, duration);
+ etime = icaltime_add(stime, duration);
text = icaltime_as_ical_string(etime);
g_strlcpy(appt->endtime, text, 17);
g_free(appt->end_tz_loc);
@@ -824,17 +824,17 @@ int xfical_compare_times(xfical_appt *appt)
else {
if (ORAGE_STR_EXISTS(appt->starttime)
&& ORAGE_STR_EXISTS(appt->endtime)) {
- s_time = icaltime_from_string(appt->starttime);
+ stime = icaltime_from_string(appt->starttime);
etime = icaltime_from_string(appt->endtime);
- s_time = convert_to_zone(s_time, appt->start_tz_loc);
- s_time = icaltime_convert_to_zone(s_time, local_icaltimezone);
+ stime = convert_to_zone(stime, appt->start_tz_loc);
+ stime = icaltime_convert_to_zone(stime, local_icaltimezone);
etime = convert_to_zone(etime, appt->end_tz_loc);
etime = icaltime_convert_to_zone(etime, local_icaltimezone);
- duration = icaltime_subtract(etime, s_time);
+ duration = icaltime_subtract(etime, stime);
appt->duration = icaldurationtype_as_int(duration);
- return(icaltime_compare(s_time, etime));
+ return(icaltime_compare(stime, etime));
}
else {
orage_message(250, P_N "null time %s %s"
@@ -1206,6 +1206,9 @@ static void appt_add_recur_internal(xfical_appt *appt, icalcomponent *icmp)
case XFICAL_FREQ_YEARLY:
recur_p = g_stpcpy(recur_p, "YEARLY");
break;
+ case XFICAL_FREQ_HOURLY:
+ recur_p = g_stpcpy(recur_p, "HOURLY");
+ break;
default:
orage_message(160, P_N "Unsupported freq");
icalrecurrencetype_clear(&rrule);
@@ -1750,7 +1753,7 @@ static void get_appt_alarm_from_icalcomponent(icalcomponent *c
}
static void process_start_date(xfical_appt *appt, icalproperty *p
- , struct icaltimetype *itime, struct icaltimetype *s_time
+ , struct icaltimetype *itime, struct icaltimetype *stime
, struct icaltimetype *sltime, struct icaltimetype *etime)
{
#undef P_N
@@ -1762,7 +1765,7 @@ static void process_start_date(xfical_appt *appt, icalproperty *p
#endif
text = icalproperty_get_value_as_string(p);
*itime = icaltime_from_string(text);
- *s_time = ic_convert_to_timezone(*itime, p);
+ *stime = ic_convert_to_timezone(*itime, p);
*sltime = convert_to_local_timezone(*itime, p);
g_strlcpy(appt->starttime, text, 17);
if (icaltime_is_date(*itime)) {
@@ -1780,7 +1783,7 @@ static void process_start_date(xfical_appt *appt, icalproperty *p
if (appt->endtime[0] == '\0') {
g_strlcpy(appt->endtime, appt->starttime, 17);
appt->end_tz_loc = appt->start_tz_loc;
- etime = s_time;
+ etime = stime;
}
}
@@ -1862,6 +1865,9 @@ static void ical_appt_get_rrule_internal(icalcomponent *c, xfical_appt *appt
case ICAL_YEARLY_RECURRENCE:
appt->freq = XFICAL_FREQ_YEARLY;
break;
+ case ICAL_HOURLY_RECURRENCE:
+ appt->freq = XFICAL_FREQ_HOURLY;
+ break;
default:
appt->freq = XFICAL_FREQ_NONE;
break;
@@ -1928,7 +1934,7 @@ static gboolean get_appt_from_icalcomponent(icalcomponent *c, xfical_appt *appt)
#define P_N "get_appt_from_icalcomponent: "
const char *text;
icalproperty *p = NULL;
- struct icaltimetype itime, s_time, etime, sltime, eltime, wtime;
+ struct icaltimetype itime, stime, etime, sltime, eltime, wtime;
icaltimezone *l_icaltimezone = NULL;
icalproperty_transp xf_transp;
struct icaldurationtype duration, duration_tmp;
@@ -1954,7 +1960,7 @@ static gboolean get_appt_from_icalcomponent(icalcomponent *c, xfical_appt *appt)
return(FALSE);
}
/*********** Defaults ***********/
- s_time = icaltime_null_time();
+ stime = icaltime_null_time();
sltime = icaltime_null_time();
eltime = icaltime_null_time();
duration = icaldurationtype_null_duration();
@@ -2039,7 +2045,7 @@ static gboolean get_appt_from_icalcomponent(icalcomponent *c, xfical_appt *appt)
case ICAL_DTSTART_PROPERTY:
if (!stime_found)
process_start_date(appt, p
- , &itime, &s_time, &sltime, &etime);
+ , &itime, &stime, &sltime, &etime);
break;
case ICAL_DTEND_PROPERTY:
case ICAL_DUE_PROPERTY:
@@ -2066,7 +2072,7 @@ g_print("X PROPERTY: %s\n", text);
text = icalproperty_get_x_name(p);
if (g_str_has_prefix(text, "X-ORAGE-ORIG-DTSTART")) {
process_start_date(appt, p
- , &itime, &s_time, &sltime, &etime);
+ , &itime, &stime, &sltime, &etime);
stime_found = TRUE;
break;
}
@@ -2149,7 +2155,7 @@ g_print("X PROPERTY: %s\n", text);
/* need to set missing endtime or duration */
if (appt->use_duration) {
- etime = icaltime_add(s_time, duration);
+ etime = icaltime_add(stime, duration);
text = icaltime_as_ical_string(etime);
g_strlcpy(appt->endtime, text, 17);
appt->end_tz_loc = appt->start_tz_loc;
@@ -2163,7 +2169,7 @@ g_print("X PROPERTY: %s\n", text);
duration_tmp = icaldurationtype_from_int(60*60*24);
appt->duration -= icaldurationtype_as_int(duration_tmp);
duration = icaldurationtype_from_int(appt->duration);
- etime = icaltime_add(s_time, duration);
+ etime = icaltime_add(stime, duration);
text = icaltime_as_ical_string(etime);
g_strlcpy(appt->endtime, text, 17);
}
@@ -3709,7 +3715,7 @@ static xfical_appt *xfical_appt_get_next_with_string_internal(char *str
xfical_appt *appt;
gboolean found_valid, search_done = FALSE;
struct icaltimetype it;
- const char *s_time;
+ const char *stime;
#ifdef ORAGE_DEBUG
orage_message(-200, P_N);
@@ -3830,14 +3836,14 @@ static xfical_appt *xfical_appt_get_next_with_string_internal(char *str
it = convert_to_zone(it, appt->start_tz_loc);
it = icaltime_convert_to_zone(it
, local_icaltimezone);
- s_time = icaltime_as_ical_string(it);
- g_strlcpy(appt->starttimecur, s_time, 17);
+ stime = icaltime_as_ical_string(it);
+ g_strlcpy(appt->starttimecur, stime, 17);
it = icaltime_from_string(appt->endtime);
it = convert_to_zone(it, appt->end_tz_loc);
it = icaltime_convert_to_zone(it
, local_icaltimezone);
- s_time = icaltime_as_ical_string(it);
- g_strlcpy(appt->endtimecur, s_time, 17);
+ stime = icaltime_as_ical_string(it);
+ g_strlcpy(appt->endtimecur, stime, 17);
}
beg = find_next(uid, end, "\nEND:");
if (!beg) {
diff --git a/src/ical-code.h b/src/ical-code.h
index 25132d9..26138cd 100644
--- a/src/ical-code.h
+++ b/src/ical-code.h
@@ -33,6 +33,7 @@ typedef enum
,XFICAL_FREQ_WEEKLY
,XFICAL_FREQ_MONTHLY
,XFICAL_FREQ_YEARLY
+ ,XFICAL_FREQ_HOURLY
} xfical_freq;
typedef enum
diff --git a/src/mainbox.c b/src/mainbox.c
index 6d0bdc1..3bd44b7 100644
--- a/src/mainbox.c
+++ b/src/mainbox.c
@@ -506,11 +506,20 @@ static void info_process(gpointer a, gpointer pbox)
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
+ /*
+ orage_message(100, "%s %s", P_N, appt->uid);
+ if (appt->freq == XFICAL_FREQ_HOURLY) {
+ orage_message(100, "%s %s", P_N, "HOURLY");
+ if (appt->priority >= g_par.priority_list_limit)
+ orage_message(100, "%s %s", P_N, " low priority HOURLY");
+ }
+ */
if (pbox == cal->mTodo_rows_vbox)
todo = TRUE;
else
todo = FALSE;
- add_info_row(appt, box, todo);
+ if (appt->priority < g_par.priority_list_limit)
+ add_info_row(appt, box, todo);
xfical_appt_free(appt);
}
More information about the Xfce4-commits
mailing list