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

Use status_ask_simplechoice() where applicable

Browse Source 
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-14 12:38:21 +02:00 committed by Lukas Fleischer
parent b2c92b2eb4
commit 4087cd4e5e
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/day.c
View File

@ -814,38 +814,33 @@ update_rept (struct rpt **rpt, const long start)
void void
day_edit_item (void) day_edit_item (void)
{ {
#define STRT '1'
#define END '2'
#define DESC '3'
#define REPT '4'
struct day_item *p; struct day_item *p;
struct recur_event *re; struct recur_event *re;
struct event *e; struct event *e;
struct recur_apoint *ra; struct recur_apoint *ra;
struct apoint *a; struct apoint *a;
long date; long date;
int item_num, ch; int item_num;
int need_check_notify = 0; int need_check_notify = 0;
item_num = apoint_hilt (); item_num = apoint_hilt ();
p = day_get_item (item_num); p = day_get_item (item_num);
date = calendar_get_slctd_day_sec (); date = calendar_get_slctd_day_sec ();
ch = -1;
switch (p->type) switch (p->type)
{ {
case RECUR_EVNT: case RECUR_EVNT:
re = recur_get_event (date, day_item_nb (date, item_num, RECUR_EVNT)); re = recur_get_event (date, day_item_nb (date, item_num, RECUR_EVNT));
status_mesg (_("Edit: (1)Description or (2)Repetition?"), "[1/2] "); const char *choice_recur_evnt[2] = {
while (ch != '1' && ch != '2' && ch != KEY_GENERIC_CANCEL) "Description",
ch = wgetch (win[STA].p); "Repetition",
switch (ch) };
switch (status_ask_simplechoice (_("Edit: "), choice_recur_evnt, 2))
{ {
case '1': case 1:
update_desc (&re->mesg); update_desc (&re->mesg);
break; break;
case '2': case 2:
update_rept (&re->rpt, re->day); update_rept (&re->rpt, re->day);
break; break;
default: default:
@ -858,54 +853,56 @@ day_edit_item (void)
break; break;
case RECUR_APPT: case RECUR_APPT:
ra = recur_get_apoint (date, day_item_nb (date, item_num, RECUR_APPT)); ra = recur_get_apoint (date, day_item_nb (date, item_num, RECUR_APPT));
status_mesg (_("Edit: (1)Start time, (2)End time, " const char *choice_recur_appt[4] = {
"(3)Description or (4)Repetition?"), "[1/2/3/4] "); "Start time",
while (ch != STRT && ch != END && ch != DESC && "End time",
ch != REPT && ch != KEY_GENERIC_CANCEL) "Description",
ch = wgetch (win[STA].p); "Repetition",
switch (ch) };
switch (status_ask_simplechoice (_("Edit: "), choice_recur_appt, 4))
{ {
case STRT: case 1:
need_check_notify = 1; need_check_notify = 1;
update_start_time (&ra->start, &ra->dur); update_start_time (&ra->start, &ra->dur);
break; break;
case END: case 2:
update_duration (&ra->start, &ra->dur); update_duration (&ra->start, &ra->dur);
break; break;
case DESC: case 3:
if (notify_bar ()) if (notify_bar ())
need_check_notify = notify_same_recur_item (ra); need_check_notify = notify_same_recur_item (ra);
update_desc (&ra->mesg); update_desc (&ra->mesg);
break; break;
case REPT: case 4:
need_check_notify = 1; need_check_notify = 1;
update_rept (&ra->rpt, ra->start); update_rept (&ra->rpt, ra->start);
break; break;
case KEY_GENERIC_CANCEL: default:
return; return;
} }
break; break;
case APPT: case APPT:
a = apoint_get (date, day_item_nb (date, item_num, APPT)); a = apoint_get (date, day_item_nb (date, item_num, APPT));
status_mesg (_("Edit: (1)Start time, (2)End time " const char *choice_appt[3] = {
"or (3)Description?"), "[1/2/3] "); "Start time",
while (ch != STRT && ch != END && ch != DESC && ch != KEY_GENERIC_CANCEL) "End time",
ch = wgetch (win[STA].p); "Description",
switch (ch) };
switch (status_ask_simplechoice (_("Edit: "), choice_appt, 3))
{ {
case STRT: case 1:
need_check_notify = 1; need_check_notify = 1;
update_start_time (&a->start, &a->dur); update_start_time (&a->start, &a->dur);
break; break;
case END: case 2:
update_duration (&a->start, &a->dur); update_duration (&a->start, &a->dur);
break; break;
case DESC: case 3:
if (notify_bar ()) if (notify_bar ())
need_check_notify = notify_same_item (a->start); need_check_notify = notify_same_item (a->start);
update_desc (&a->mesg); update_desc (&a->mesg);
break; break;
case KEY_GENERIC_CANCEL: default:
return; return;
} }
break; break;