aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Added main.help.header theme option

Browse Source 
Conflicts:
	src/command/cmd_funcs.c
	src/ui/console.c
This commit is contained in:
James Booth 2016-10-30 17:17:58 +00:00
parent 853a6b4cbc
commit 09a49b7ed9
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/cmd_funcs.c
View File

@ -1483,9 +1483,9 @@ _cmd_help_cmd_list(const char *const tag)
cons_show(""); cons_show("");
ProfWin *console = wins_get_console(); ProfWin *console = wins_get_console();
if (tag) { if (tag) {
win_vprint(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "%s commands", tag); win_vprint(console, '-', 0, NULL, 0, THEME_HELP_HEADER, "", "%s commands", tag);
} else { } else {
win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "All commands"); win_print(console, '-', 0, NULL, 0, THEME_HELP_HEADER, "", "All commands");
} }
GList *ordered_commands = NULL; GList *ordered_commands = NULL;

2
src/config/theme.c
View File

@ -81,6 +81,7 @@ theme_init(const char *const theme_name)
g_hash_table_insert(defaults, strdup("main.text.me"), strdup("white")); g_hash_table_insert(defaults, strdup("main.text.me"), strdup("white"));
g_hash_table_insert(defaults, strdup("main.text.them"), strdup("white")); g_hash_table_insert(defaults, strdup("main.text.them"), strdup("white"));
g_hash_table_insert(defaults, strdup("main.splash"), strdup("cyan")); g_hash_table_insert(defaults, strdup("main.splash"), strdup("cyan"));
g_hash_table_insert(defaults, strdup("main.help.header"), strdup("white"));
g_hash_table_insert(defaults, strdup("error"), strdup("red")); g_hash_table_insert(defaults, strdup("error"), strdup("red"));
g_hash_table_insert(defaults, strdup("incoming"), strdup("yellow")); g_hash_table_insert(defaults, strdup("incoming"), strdup("yellow"));
g_hash_table_insert(defaults, strdup("mention"), strdup("yellow")); g_hash_table_insert(defaults, strdup("mention"), strdup("yellow"));
@ -717,6 +718,7 @@ theme_attrs(theme_item_t attrs)
case THEME_TEXT_ME: _theme_prep_fgnd("main.text.me", lookup_str, &bold); break; case THEME_TEXT_ME: _theme_prep_fgnd("main.text.me", lookup_str, &bold); break;
case THEME_TEXT_THEM: _theme_prep_fgnd("main.text.them", lookup_str, &bold); break; case THEME_TEXT_THEM: _theme_prep_fgnd("main.text.them", lookup_str, &bold); break;
case THEME_SPLASH: _theme_prep_fgnd("main.splash", lookup_str, &bold); break; case THEME_SPLASH: _theme_prep_fgnd("main.splash", lookup_str, &bold); break;
case THEME_HELP_HEADER: _theme_prep_fgnd("main.help.header", lookup_str, &bold); break;
case THEME_ERROR: _theme_prep_fgnd("error", lookup_str, &bold); break; case THEME_ERROR: _theme_prep_fgnd("error", lookup_str, &bold); break;
case THEME_INCOMING: _theme_prep_fgnd("incoming", lookup_str, &bold); break; case THEME_INCOMING: _theme_prep_fgnd("incoming", lookup_str, &bold); break;
case THEME_MENTION: _theme_prep_fgnd("mention", lookup_str, &bold); break; case THEME_MENTION: _theme_prep_fgnd("mention", lookup_str, &bold); break;

1
src/config/theme.h
View File

@ -44,6 +44,7 @@ typedef enum {
THEME_TEXT_ME, THEME_TEXT_ME,
THEME_TEXT_THEM, THEME_TEXT_THEM,
THEME_SPLASH, THEME_SPLASH,
THEME_HELP_HEADER,
THEME_ERROR, THEME_ERROR,
THEME_INCOMING, THEME_INCOMING,
THEME_MENTION, THEME_MENTION,

19
src/ui/console.c
View File

@ -124,22 +124,23 @@ cons_show_help(const char *const cmd, CommandHelp *help)
ProfWin *console = wins_get_console(); ProfWin *console = wins_get_console();
cons_show(""); cons_show("");
win_vprint(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "%s", &cmd[1]); win_vprint(console, '-', 0, NULL, 0, THEME_HELP_HEADER, "", "%s", &cmd[1]);
win_print(console, '-', 0, NULL, NO_EOL, THEME_WHITE_BOLD, "", ""); win_print(console, '-', 0, NULL, NO_EOL, THEME_HELP_HEADER, "", "");
int i; int i;
for (i = 0; i < strlen(cmd) - 1 ; i++) { for (i = 0; i < strlen(cmd) - 1 ; i++) {
win_print(console, '-', 0, NULL, NO_EOL | NO_DATE, THEME_WHITE_BOLD, "", "-"); win_print(console, '-', 0, NULL, NO_EOL | NO_DATE, THEME_HELP_HEADER, "", "-");
} }
win_print(console, '-', 0, NULL, NO_DATE, THEME_WHITE_BOLD, "", ""); win_print(console, '-', 0, NULL, NO_DATE, THEME_HELP_HEADER, "", "");
cons_show(""); cons_show("");
win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Synopsis"); win_print(console, '-', 0, NULL, 0, THEME_HELP_HEADER, "", "Synopsis");
ui_show_lines(console, help->synopsis); ui_show_lines(console, help->synopsis);
cons_show(""); cons_show("");
win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Description"); win_print(console, '-', 0, NULL, 0, THEME_HELP_HEADER, "", "Description");
win_println(console, 0, help->desc); win_println(console, 0, help->desc);
int maxlen = 0; int maxlen = 0;
for (i = 0; help->args[i][0] != NULL; i++) { for (i = 0; help->args[i][0] != NULL; i++) {
if (strlen(help->args[i][0]) > maxlen) if (strlen(help->args[i][0]) > maxlen)
@ -148,7 +149,7 @@ cons_show_help(const char *const cmd, CommandHelp *help)
if (i > 0) { if (i > 0) {
cons_show(""); cons_show("");
win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Arguments"); win_print(console, '-', 0, NULL, 0, THEME_HELP_HEADER, "", "Arguments");
for (i = 0; help->args[i][0] != NULL; i++) { for (i = 0; help->args[i][0] != NULL; i++) {
win_vprint(console, '-', maxlen + 3, NULL, 0, 0, "", "%-*s: %s", maxlen + 1, help->args[i][0], help->args[i][1]); win_vprint(console, '-', maxlen + 3, NULL, 0, 0, "", "%-*s: %s", maxlen + 1, help->args[i][0], help->args[i][1]);
} }
@ -156,7 +157,7 @@ cons_show_help(const char *const cmd, CommandHelp *help)
if (g_strv_length((gchar**)help->examples) > 0) { if (g_strv_length((gchar**)help->examples) > 0) {
cons_show(""); cons_show("");
win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Examples"); win_print(console, '-', 0, NULL, 0, THEME_HELP_HEADER, "", "Examples");
ui_show_lines(console, help->examples); ui_show_lines(console, help->examples);
} }
} }
@ -2066,7 +2067,7 @@ cons_navigation_help(void)
{ {
ProfWin *console = wins_get_console(); ProfWin *console = wins_get_console();
cons_show(""); cons_show("");
win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Navigation"); win_print(console, '-', 0, NULL, 0, THEME_HELP_HEADER, "", "Navigation");
cons_show("Alt-1..Alt-0, F1..F10 : Choose window."); cons_show("Alt-1..Alt-0, F1..F10 : Choose window.");
cons_show("Alt-LEFT, Alt-RIGHT : Previous/next chat window."); cons_show("Alt-LEFT, Alt-RIGHT : Previous/next chat window.");
cons_show("PAGEUP, PAGEDOWN : Page the main window."); cons_show("PAGEUP, PAGEDOWN : Page the main window.");