fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make appearance.calendarview more explicit in config file

Browse Source 
Instead of using 0 or 1 as a value for `appearance.calendarview`,
introduce the more explicit "monthly" and "weekly".

Also update `scripts/calcurse-upgrade.sh` to reflect the change.

Signed-off-by: Baptiste Jonglez <baptiste--git@jonglez.org>
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Baptiste Jonglez 2012-05-29 09:55:01 +02:00 committed by Lukas Fleischer
parent f7a88a5515
commit 2c5235cca7
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/calcurse-upgrade.sh
View File

@ -86,6 +86,8 @@ if grep -q -e '^auto_save=' -e '^auto_gc=' -e '^periodic_save=' \
$1 == "general.systemdialogs" || $1 == "general.progressbar" \ $1 == "general.systemdialogs" || $1 == "general.progressbar" \
{ $2 = ($2 == "yes") ? "no" : "yes" } { $2 = ($2 == "yes") ? "no" : "yes" }
$1 == "general.firstdayofweek" { $2 = ($2 == "yes") ? "monday" : "sunday" } $1 == "general.firstdayofweek" { $2 = ($2 == "yes") ? "monday" : "sunday" }
$1 == "appearance.calendarview" { $2 = ($2 == 0) ? "monthly" :
($2 == 1) ? "weekly" : $2 }
{ print } { print }
' < "$CONFFILE" > "$tmpfile" ' < "$CONFFILE" > "$tmpfile"
mv "$tmpfile" "$CONFFILE" mv "$tmpfile" "$CONFFILE"

7
src/calcurse.h
View File

@ -360,6 +360,13 @@ struct recur_event {
char *note; /* note attached to event */ char *note; /* note attached to event */
}; };
/* Available view for the calendar panel. */
enum {
CAL_MONTH_VIEW,
CAL_WEEK_VIEW,
CAL_VIEWS
};
struct notify_app { struct notify_app {
long time; long time;
int got_app; int got_app;

6
src/calendar.c
View File

@ -57,12 +57,6 @@
#define ISLEAP(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0) #define ISLEAP(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
enum {
CAL_MONTH_VIEW,
CAL_WEEK_VIEW,
CAL_VIEWS
};
enum pom { enum pom {
NO_POM, NO_POM,
FIRST_QUARTER, FIRST_QUARTER,

16
src/config.c
View File

@ -196,7 +196,13 @@ static int config_parse_color_pair(int *dest1, int *dest2, const char *val)
static int config_parse_calendar_view(void *dummy, const char *val) static int config_parse_calendar_view(void *dummy, const char *val)
{ {
calendar_set_view(atoi(val)); if (!strcmp(val, "monthly"))
calendar_set_view(CAL_MONTH_VIEW);
else if (!strcmp(val, "weekly"))
calendar_set_view(CAL_WEEK_VIEW);
else
return 0;
return 1; return 1;
} }
@ -350,8 +356,12 @@ static void config_color_theme_name(char *theme_name)
static int config_serialize_calendar_view(char *buf, void *dummy) static int config_serialize_calendar_view(char *buf, void *dummy)
{ {
int tmp = calendar_get_view(); if (calendar_get_view() == CAL_WEEK_VIEW)
return config_serialize_int(buf, &tmp); strcpy(buf, "weekly");
else
strcpy(buf, "monthly");
return 1;
} }
static int config_serialize_first_day_of_week(char *buf, void *dummy) static int config_serialize_first_day_of_week(char *buf, void *dummy)