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

custom.c: Simplify code

Browse Source 
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-05-13 21:40:51 +02:00
parent 7cf42c1083
commit fbd0651615
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/custom.c
View File

@ -599,24 +599,22 @@ static void print_general_option(int i, WINDOW *win, int y, int hilt, void *cb_d
if (hilt) if (hilt)
custom_apply_attr(win, ATTR_HIGHEST); custom_apply_attr(win, ATTR_HIGHEST);
mvwprintw(win, y, XPOS, "%s", opt[i]);
switch (i) { switch (i) {
case 0: case 0:
mvwprintw(win, y, XPOS, "%s", opt[AUTO_SAVE]);
print_bool_option_incolor(win, conf.auto_save, y, print_bool_option_incolor(win, conf.auto_save, y,
XPOS + strlen(opt[AUTO_SAVE])); XPOS + strlen(opt[AUTO_SAVE]));
mvwaddstr(win, y + XPOS, 1, mvwaddstr(win, y + XPOS, 1,
_("(if set to YES, automatic save is done when quitting)")); _("(if set to YES, automatic save is done when quitting)"));
break; break;
case 1: case 1:
mvwprintw(win, y, XPOS, "%s", opt[AUTO_GC]);
print_bool_option_incolor(win, conf.auto_gc, y, print_bool_option_incolor(win, conf.auto_gc, y,
XPOS + strlen(opt[AUTO_GC])); XPOS + strlen(opt[AUTO_GC]));
mvwaddstr(win, y + 1, XPOS, mvwaddstr(win, y + 1, XPOS,
_("(run the garbage collector when quitting)")); _("(run the garbage collector when quitting)"));
break; break;
case 2: case 2:
mvwprintw(win, y, XPOS, "%s", opt[PERIODIC_SAVE]);
custom_apply_attr(win, ATTR_HIGHEST); custom_apply_attr(win, ATTR_HIGHEST);
mvwprintw(win, y, XPOS + strlen(opt[PERIODIC_SAVE]), "%d", mvwprintw(win, y, XPOS + strlen(opt[PERIODIC_SAVE]), "%d",
conf.periodic_save); conf.periodic_save);
@ -626,14 +624,12 @@ static void print_general_option(int i, WINDOW *win, int y, int hilt, void *cb_d
"minutes)")); "minutes)"));
break; break;
case 3: case 3:
mvwprintw(win, y, XPOS, "%s", opt[CONFIRM_QUIT]);
print_bool_option_incolor(win, conf.confirm_quit, y, print_bool_option_incolor(win, conf.confirm_quit, y,
XPOS + strlen(opt[CONFIRM_QUIT])); XPOS + strlen(opt[CONFIRM_QUIT]));
mvwaddstr(win, y + 1, XPOS, mvwaddstr(win, y + 1, XPOS,
_("(if set to YES, confirmation is required before quitting)")); _("(if set to YES, confirmation is required before quitting)"));
break; break;
case 4: case 4:
mvwprintw(win, y, XPOS, "%s", opt[CONFIRM_DELETE]);
print_bool_option_incolor(win, conf.confirm_delete, y, print_bool_option_incolor(win, conf.confirm_delete, y,
XPOS + strlen(opt[CONFIRM_DELETE])); XPOS + strlen(opt[CONFIRM_DELETE]));
mvwaddstr(win, y + 1, XPOS, mvwaddstr(win, y + 1, XPOS,
@ -641,7 +637,6 @@ static void print_general_option(int i, WINDOW *win, int y, int hilt, void *cb_d
"before deleting an event)")); "before deleting an event)"));
break; break;
case 5: case 5:
mvwprintw(win, y, XPOS, "%s", opt[SYSTEM_DIAGS]);
print_bool_option_incolor(win, conf.system_dialogs, y, print_bool_option_incolor(win, conf.system_dialogs, y,
XPOS + strlen(opt[SYSTEM_DIAGS])); XPOS + strlen(opt[SYSTEM_DIAGS]));
mvwaddstr(win, y + 1, XPOS, mvwaddstr(win, y + 1, XPOS,
@ -649,7 +644,6 @@ static void print_general_option(int i, WINDOW *win, int y, int hilt, void *cb_d
"and saved data will be displayed)")); "and saved data will be displayed)"));
break; break;
case 6: case 6:
mvwprintw(win, y, XPOS, "%s", opt[PROGRESS_BAR]);
print_bool_option_incolor(win, conf.progress_bar, y, print_bool_option_incolor(win, conf.progress_bar, y,
XPOS + strlen(opt[PROGRESS_BAR])); XPOS + strlen(opt[PROGRESS_BAR]));
mvwaddstr(win, y + 1, XPOS, mvwaddstr(win, y + 1, XPOS,
@ -657,7 +651,6 @@ static void print_general_option(int i, WINDOW *win, int y, int hilt, void *cb_d
"when saving data)")); "when saving data)"));
break; break;
case 7: case 7:
mvwprintw(win, y, XPOS, "%s", opt[FIRST_DAY_OF_WEEK]);
custom_apply_attr(win, ATTR_HIGHEST); custom_apply_attr(win, ATTR_HIGHEST);
mvwaddstr(win, y, XPOS + strlen(opt[FIRST_DAY_OF_WEEK]), mvwaddstr(win, y, XPOS + strlen(opt[FIRST_DAY_OF_WEEK]),
ui_calendar_week_begins_on_monday()? _("Monday") : ui_calendar_week_begins_on_monday()? _("Monday") :
@ -667,7 +660,6 @@ static void print_general_option(int i, WINDOW *win, int y, int hilt, void *cb_d
_("(specifies the first day of week in the calendar view)")); _("(specifies the first day of week in the calendar view)"));
break; break;
case 8: case 8:
mvwprintw(win, y, XPOS, "%s", opt[OUTPUT_DATE_FMT]);
custom_apply_attr(win, ATTR_HIGHEST); custom_apply_attr(win, ATTR_HIGHEST);
mvwaddstr(win, y, XPOS + strlen(opt[OUTPUT_DATE_FMT]), mvwaddstr(win, y, XPOS + strlen(opt[OUTPUT_DATE_FMT]),
conf.output_datefmt); conf.output_datefmt);
@ -676,7 +668,6 @@ static void print_general_option(int i, WINDOW *win, int y, int hilt, void *cb_d
_("(Format of the date to be displayed in non-interactive mode)")); _("(Format of the date to be displayed in non-interactive mode)"));
break; break;
case 9: case 9:
mvwprintw(win, y, XPOS, "%s", opt[INPUT_DATE_FMT]);
custom_apply_attr(win, ATTR_HIGHEST); custom_apply_attr(win, ATTR_HIGHEST);
mvwprintw(win, y, XPOS + strlen(opt[INPUT_DATE_FMT]), "%d", mvwprintw(win, y, XPOS + strlen(opt[INPUT_DATE_FMT]), "%d",
conf.input_datefmt); conf.input_datefmt);