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

Update configuration dialogs

Browse Source 
Rename the configuration options shown in the configuration dialogs to
match the new naming scheme used in the configuration file.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2012-05-17 20:59:27 +02:00
parent 7c7c65d194
commit 7f68083027
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/custom.c
View File

@ -628,8 +628,8 @@ print_general_options (WINDOW *win)
PERIODIC_SAVE, PERIODIC_SAVE,
CONFIRM_QUIT, CONFIRM_QUIT,
CONFIRM_DELETE, CONFIRM_DELETE,
SKIP_SYSTEM_DIAGS, SYSTEM_DIAGS,
SKIP_PROGRESS_BAR, PROGRESS_BAR,
WEEK_BEGINS_MONDAY, WEEK_BEGINS_MONDAY,
OUTPUT_DATE_FMT, OUTPUT_DATE_FMT,
INPUT_DATE_FMT, INPUT_DATE_FMT,
@ -639,16 +639,16 @@ print_general_options (WINDOW *win)
const int YOFF = 3; const int YOFF = 3;
int y; int y;
char *opt[NB_OPTIONS] = { char *opt[NB_OPTIONS] = {
_("auto_save = "), _("general.autosave = "),
_("auto_gc = "), _("general.autogc = "),
_("periodic_save = "), _("general.periodicsave = "),
_("confirm_quit = "), _("general.confirmquit = "),
_("confirm_delete = "), _("general.confirmdelete = "),
_("system_dialogs = "), _("general.systemdialogs = "),
_("progress_bar = "), _("general.progressbar = "),
_("week_begins_on_monday = "), _("general.firstdayofweek = "),
_("output_datefmt = "), _("format.outputdate = "),
_("input_datefmt = ") _("format.inputdate = ")
}; };
y = 0; y = 0;
@ -686,16 +686,16 @@ print_general_options (WINDOW *win)
_("(if set to YES, confirmation is required " _("(if set to YES, confirmation is required "
"before deleting an event)")); "before deleting an event)"));
y += YOFF; y += YOFF;
mvwprintw (win, y, XPOS, "[6] %s ", opt[SKIP_SYSTEM_DIAGS]); mvwprintw (win, y, XPOS, "[6] %s ", opt[SYSTEM_DIAGS]);
print_bool_option_incolor (win, conf.system_dialogs, y, print_bool_option_incolor (win, conf.system_dialogs, y,
XPOS + 4 + strlen (opt[SKIP_SYSTEM_DIAGS])); XPOS + 4 + strlen (opt[SYSTEM_DIAGS]));
mvwprintw (win, y + 1, XPOS, mvwprintw (win, y + 1, XPOS,
_("(if set to YES, messages about loaded " _("(if set to YES, messages about loaded "
"and saved data will be displayed)")); "and saved data will be displayed)"));
y += YOFF; y += YOFF;
mvwprintw (win, y, XPOS, "[7] %s ", opt[SKIP_PROGRESS_BAR]); mvwprintw (win, y, XPOS, "[7] %s ", opt[PROGRESS_BAR]);
print_bool_option_incolor (win, conf.progress_bar, y, print_bool_option_incolor (win, conf.progress_bar, y,
XPOS + 4 + strlen (opt[SKIP_PROGRESS_BAR])); XPOS + 4 + strlen (opt[PROGRESS_BAR]));
mvwprintw (win, y + 1, XPOS, mvwprintw (win, y + 1, XPOS,
_("(if set to YES, progress bar will be displayed " _("(if set to YES, progress bar will be displayed "
"when saving data)")); "when saving data)"));

16
src/notify.c
View File

@ -639,29 +639,29 @@ print_config_options (WINDOW *optwin)
int i; int i;
opt[SHOW].name = _("notify-bar_show = "); opt[SHOW].name = _("appearance.notifybar = ");
opt[SHOW].desc = _("(if set to YES, notify-bar will be displayed)"); opt[SHOW].desc = _("(if set to YES, notify-bar will be displayed)");
opt[DATE].name = _("notify-bar_date = "); opt[DATE].name = _("format.notifydate = ");
opt[DATE].desc = _("(Format of the date to be displayed inside notify-bar)"); opt[DATE].desc = _("(Format of the date to be displayed inside notify-bar)");
opt[CLOCK].name = _("notify-bar_clock = "); opt[CLOCK].name = _("format.notifytime = ");
opt[CLOCK].desc = _("(Format of the time to be displayed inside notify-bar)"); opt[CLOCK].desc = _("(Format of the time to be displayed inside notify-bar)");
opt[WARN].name = _("notify-bar_warning = "); opt[WARN].name = _("notification.warning = ");
opt[WARN].desc = _("(Warn user if an appointment is within next " opt[WARN].desc = _("(Warn user if an appointment is within next "
"'notify-bar_warning' seconds)"); "'notify-bar_warning' seconds)");
opt[CMD].name = _("notify-bar_command = "); opt[CMD].name = _("notification.command = ");
opt[CMD].desc = _("(Command used to notify user of an upcoming appointment)"); opt[CMD].desc = _("(Command used to notify user of an upcoming appointment)");
opt[NOTIFY_ALL].name = _("notify-all = "); opt[NOTIFY_ALL].name = _("notification.notifyall = ");
opt[NOTIFY_ALL].desc = _("(Notify all appointments instead of flagged ones only)"); opt[NOTIFY_ALL].desc = _("(Notify all appointments instead of flagged ones only)");
opt[DMON].name = _("notify-daemon_enable = "); opt[DMON].name = _("daemon.enable = ");
opt[DMON].desc = _("(Run in background to get notifications after exiting)"); opt[DMON].desc = _("(Run in background to get notifications after exiting)");
opt[DMON_LOG].name = _("notify-daemon_log = "); opt[DMON_LOG].name = _("daemon.log = ");
opt[DMON_LOG].desc = _("(Log activity when running in background)"); opt[DMON_LOG].desc = _("(Log activity when running in background)");
pthread_mutex_lock (&nbar.mutex); pthread_mutex_lock (&nbar.mutex);