aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Add /titlebar show resource command

Browse Source 
Additionally to `/resource titlebar on` we now allow the setting via
/titlebar show|hide resource` since it's about the titlebar.

But makes sense to have it in `/resource` too because there is
`/resource message on|off` too. And this one doesnt have an setting of
it's own.

Regards https://github.com/profanity-im/profanity/issues/1116
This commit is contained in:
Michael Vetter 2019-11-05 20:51:27 +01:00
parent fc6f2755c1
commit 3d272f02bc
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/command/cmd_ac.c
View File

@ -776,6 +776,7 @@ cmd_ac_init(void)
titlebar_show_ac = autocomplete_new(); titlebar_show_ac = autocomplete_new();
autocomplete_add(titlebar_show_ac, "tls"); autocomplete_add(titlebar_show_ac, "tls");
autocomplete_add(titlebar_show_ac, "encwarn"); autocomplete_add(titlebar_show_ac, "encwarn");
autocomplete_add(titlebar_show_ac, "resource");
tls_certpath_ac = autocomplete_new(); tls_certpath_ac = autocomplete_new();
autocomplete_add(tls_certpath_ac, "set"); autocomplete_add(tls_certpath_ac, "set");

5
src/command/cmd_defs.c
View File

@ -1319,14 +1319,15 @@ static struct cmd_t command_defs[] =
CMD_SYN( CMD_SYN(
"/titlebar up", "/titlebar up",
"/titlebar down", "/titlebar down",
"/titlebar show|hide [tls|encwarn]") "/titlebar show|hide [encwarn|resource|tls]")
CMD_DESC( CMD_DESC(
"Titlebar settings.") "Titlebar settings.")
CMD_ARGS( CMD_ARGS(
{ "up", "Move the title bar up the screen." }, { "up", "Move the title bar up the screen." },
{ "down", "Move the title bar down the screen." }, { "down", "Move the title bar down the screen." },
{ "show tls", "Show or hide TLS indicator in the titlebar." }, { "show tls", "Show or hide TLS indicator in the titlebar." },
{ "show encwarn", "Enable or disable the unencrypted warning message in the titlebar." } { "show encwarn", "Enable or disable the unencrypted warning message in the titlebar." },
{ "show resource", "Show or hide the current resource in the titlebar." }
) )
CMD_EXAMPLES( CMD_EXAMPLES(
"/titlebar up", "/titlebar up",

7
src/command/cmd_funcs.c
View File

@ -3136,7 +3136,6 @@ cmd_blocked(ProfWin *window, const char *const command, gchar **args)
return TRUE; return TRUE;
} }
gboolean gboolean
cmd_resource(ProfWin *window, const char *const command, gchar **args) cmd_resource(ProfWin *window, const char *const command, gchar **args)
{ {
@ -5958,6 +5957,9 @@ cmd_titlebar_show_hide(ProfWin *window, const char *const command, gchar **args)
} else if (g_strcmp0(args[1], "encwarn") == 0) { } else if (g_strcmp0(args[1], "encwarn") == 0) {
cons_show("Encryption warning titlebar indicator enabled."); cons_show("Encryption warning titlebar indicator enabled.");
prefs_set_boolean(PREF_ENC_WARN, TRUE); prefs_set_boolean(PREF_ENC_WARN, TRUE);
} else if (g_strcmp0(args[1], "resource") == 0) {
cons_show("Showing resource in titlebar enabled.");
prefs_set_boolean(PREF_RESOURCE_TITLE , TRUE);
} else { } else {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
} }
@ -5969,6 +5971,9 @@ cmd_titlebar_show_hide(ProfWin *window, const char *const command, gchar **args)
} else if (g_strcmp0(args[1], "encwarn") == 0) { } else if (g_strcmp0(args[1], "encwarn") == 0) {
cons_show("Encryption warning titlebar indicator disabled."); cons_show("Encryption warning titlebar indicator disabled.");
prefs_set_boolean(PREF_ENC_WARN, FALSE); prefs_set_boolean(PREF_ENC_WARN, FALSE);
} else if (g_strcmp0(args[1], "resource") == 0) {
cons_show("Showing resource in titlebar disabled.");
prefs_set_boolean(PREF_RESOURCE_TITLE , FALSE);
} else { } else {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
} }