src/config.c: Rename configuration variables

Classify configuration options into different sections. Use consistent
names and formatting.

This was discussed on the mailing lists. A script that updates
configuration files will come in following patches.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>

1 files changed, 22 insertions, 22 deletions

diff --git a/src/config.c b/src/config.c
index 27c0c96..a5c1776 100644
--- a/src/config.c
+++ b/src/config.c
@@ -82,28 +82,28 @@ static int config_serialize_input_datefmt (char *, void *);
   (config_fn_serialize_t) config_serialize_str, &(var)
 
 static const struct confvar confmap[] = {
-  { "auto_save", CONFIG_HANDLER_BOOL (conf.auto_save) },
-  { "auto_gc", CONFIG_HANDLER_BOOL (conf.auto_gc) },
-  { "periodic_save", CONFIG_HANDLER_UNSIGNED (conf.periodic_save) },
-  { "confirm_quit", CONFIG_HANDLER_BOOL (conf.confirm_quit) },
-  { "confirm_delete", CONFIG_HANDLER_BOOL (conf.confirm_delete) },
-  { "skip_system_dialogs", CONFIG_HANDLER_BOOL (conf.skip_system_dialogs) },
-  { "skip_progress_bar", CONFIG_HANDLER_BOOL (conf.skip_progress_bar) },
-  { "calendar_default_view", config_parse_calendar_view, config_serialize_calendar_view, NULL },
-  { "week_begins_on_monday", config_parse_first_day_of_week, config_serialize_first_day_of_week, NULL },
-  { "color-theme", config_parse_color_theme, config_serialize_color_theme, NULL },
-  { "layout", config_parse_layout, config_serialize_layout, NULL },
-  { "side-bar_width", config_parse_sidebar_width, config_serialize_sidebar_width, NULL },
-  { "notify-bar_show", CONFIG_HANDLER_BOOL (nbar.show) },
-  { "notify-bar_date", CONFIG_HANDLER_STR (nbar.datefmt) },
-  { "notify-bar_clock", CONFIG_HANDLER_STR (nbar.timefmt) },
-  { "notify-bar_warning", CONFIG_HANDLER_INT (nbar.cntdwn) },
-  { "notify-bar_command", CONFIG_HANDLER_STR (nbar.cmd) },
-  { "notify-all", CONFIG_HANDLER_BOOL (nbar.notify_all) },
-  { "output_datefmt", config_parse_output_datefmt, config_serialize_output_datefmt, NULL },
-  { "input_datefmt", config_parse_input_datefmt, config_serialize_input_datefmt, NULL },
-  { "notify-daemon_enable", CONFIG_HANDLER_BOOL (dmon.enable) },
-  { "notify-daemon_log", CONFIG_HANDLER_BOOL (dmon.log) }
+  { "general.autosave", CONFIG_HANDLER_BOOL (conf.auto_save) },
+  { "general.autogc", CONFIG_HANDLER_BOOL (conf.auto_gc) },
+  { "general.periodicsave", CONFIG_HANDLER_UNSIGNED (conf.periodic_save) },
+  { "general.confirmquit", CONFIG_HANDLER_BOOL (conf.confirm_quit) },
+  { "general.confirmdelete", CONFIG_HANDLER_BOOL (conf.confirm_delete) },
+  { "general.systemdialogs", CONFIG_HANDLER_BOOL (conf.skip_system_dialogs) },
+  { "general.progressbar", CONFIG_HANDLER_BOOL (conf.skip_progress_bar) },
+  { "appearance.calendarview", config_parse_calendar_view, config_serialize_calendar_view, NULL },
+  { "general.firstdayofweek", config_parse_first_day_of_week, config_serialize_first_day_of_week, NULL },
+  { "appearance.theme", config_parse_color_theme, config_serialize_color_theme, NULL },
+  { "appearance.layout", config_parse_layout, config_serialize_layout, NULL },
+  { "appearance.sidebarwidth", config_parse_sidebar_width, config_serialize_sidebar_width, NULL },
+  { "appearance.notifybar", CONFIG_HANDLER_BOOL (nbar.show) },
+  { "format.notifydate", CONFIG_HANDLER_STR (nbar.datefmt) },
+  { "format.notifytime", CONFIG_HANDLER_STR (nbar.timefmt) },
+  { "notification.warning", CONFIG_HANDLER_INT (nbar.cntdwn) },
+  { "notification.command", CONFIG_HANDLER_STR (nbar.cmd) },
+  { "notification.notifyall", CONFIG_HANDLER_BOOL (nbar.notify_all) },
+  { "format.outputdate", config_parse_output_datefmt, config_serialize_output_datefmt, NULL },
+  { "format.inputdate", config_parse_input_datefmt, config_serialize_input_datefmt, NULL },
+  { "daemon.enable", CONFIG_HANDLER_BOOL (dmon.enable) },
+  { "daemon.log", CONFIG_HANDLER_BOOL (dmon.log) }
 };
 
 struct config_save_status {