diff options
author | Will Song <incertia9474@gmail.com> | 2015-01-27 19:55:16 -0600 |
---|---|---|
committer | Will Song <incertia9474@gmail.com> | 2015-01-27 19:55:16 -0600 |
commit | 7f436d614b11d72893d856f1c3d817ab34b0b9eb (patch) | |
tree | 0f0692382e6976602e51643c569c6fd467040642 /src/command | |
parent | 6529220351dd9b11c610df1c3372dd138d2af2b4 (diff) | |
download | profani-tty-7f436d614b11d72893d856f1c3d817ab34b0b9eb.tar.gz |
use custom format string for time preference
Diffstat (limited to 'src/command')
-rw-r--r-- | src/command/command.c | 22 | ||||
-rw-r--r-- | src/command/commands.c | 23 |
2 files changed, 9 insertions, 36 deletions
diff --git a/src/command/command.c b/src/command/command.c index 8e16276b..1441ef46 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -620,10 +620,10 @@ static struct cmd_t command_defs[] = { "/time", cmd_time, parse_args, 1, 1, &cons_time_setting, - { "/time minutes|seconds", "Time display.", - { "/time minutes|seconds", + { "/time <format>", "Time display.", + { "/time <format>", "---------------------", - "Configure time precision for the main window.", + "Configure the time format for the main window.", NULL } } }, { "/inpblock", @@ -1121,7 +1121,6 @@ static Autocomplete form_ac; static Autocomplete form_field_multi_ac; static Autocomplete occupants_ac; static Autocomplete occupants_default_ac; -static Autocomplete time_ac; static Autocomplete resource_ac; static Autocomplete inpblock_ac; @@ -1461,15 +1460,6 @@ cmd_init(void) autocomplete_add(occupants_default_ac, "show"); autocomplete_add(occupants_default_ac, "hide"); - time_ac = autocomplete_new(); - autocomplete_add(time_ac, "minutes"); - autocomplete_add(time_ac, "seconds"); - autocomplete_add(time_ac, "off"); - - time_ac = autocomplete_new(); - autocomplete_add(time_ac, "minutes"); - autocomplete_add(time_ac, "seconds"); - resource_ac = autocomplete_new(); autocomplete_add(resource_ac, "set"); autocomplete_add(resource_ac, "off"); @@ -1532,7 +1522,6 @@ cmd_uninit(void) autocomplete_free(form_field_multi_ac); autocomplete_free(occupants_ac); autocomplete_free(occupants_default_ac); - autocomplete_free(time_ac); autocomplete_free(resource_ac); autocomplete_free(inpblock_ac); } @@ -1697,7 +1686,6 @@ cmd_reset_autocomplete() autocomplete_reset(form_field_multi_ac); autocomplete_reset(occupants_ac); autocomplete_reset(occupants_default_ac); - autocomplete_reset(time_ac); autocomplete_reset(resource_ac); autocomplete_reset(inpblock_ac); @@ -2010,8 +1998,8 @@ _cmd_complete_parameters(const char * const input) } } - gchar *cmds[] = { "/help", "/prefs", "/disco", "/close", "/wins", "/subject", "/room", "/time" }; - Autocomplete completers[] = { help_ac, prefs_ac, disco_ac, close_ac, wins_ac, subject_ac, room_ac, time_ac }; + gchar *cmds[] = { "/help", "/prefs", "/disco", "/close", "/wins", "/subject", "/room", }; + Autocomplete completers[] = { help_ac, prefs_ac, disco_ac, close_ac, wins_ac, subject_ac, room_ac, }; for (i = 0; i < ARRAY_SIZE(cmds); i++) { result = autocomplete_param_with_ac(input, cmds[i], completers[i], TRUE); diff --git a/src/command/commands.c b/src/command/commands.c index 60ef3780..02910f99 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -3257,25 +3257,10 @@ cmd_wrap(gchar **args, struct cmd_help_t help) gboolean cmd_time(gchar **args, struct cmd_help_t help) { - if (g_strcmp0(args[0], "minutes") == 0) { - prefs_set_string(PREF_TIME, "minutes"); - cons_show("Time precision set to minutes."); - wins_resize_all(); - return TRUE; - } else if (g_strcmp0(args[0], "seconds") == 0) { - prefs_set_string(PREF_TIME, "seconds"); - cons_show("Time precision set to seconds."); - wins_resize_all(); - return TRUE; - } else if (g_strcmp0(args[0], "off") == 0) { - prefs_set_string(PREF_TIME, "off"); - cons_show("Time display disabled."); - wins_resize_all(); - return TRUE; - } else { - cons_show("Usage: %s", help.usage); - return TRUE; - } + prefs_set_string(PREF_TIME, args[0]); + cons_show("Time format set to '%s'", args[0]); + wins_resize_all(); + return TRUE; } gboolean |