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

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2016-02-11 00:47:16 +00:00
commit b23f2f55ce
21 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/command.c
View File

@ -662,7 +662,7 @@ static struct cmd_t command_defs[] =
CMD_TAG_GROUPCHAT)
CMD_SYN(
"/affiliation set <affiliation> <jid> [<reason>]",
"/list [<affiliation>]")
"/affiliation list [<affiliation>]")
CMD_DESC(
"Manage room affiliations. "
"Affiliation may be one of owner, admin, member, outcast or none.")
@ -678,7 +678,7 @@ static struct cmd_t command_defs[] =
CMD_TAG_GROUPCHAT)
CMD_SYN(
"/role set <role> <nick> [<reason>]",
"/list [<role>]")
"/role list [<role>]")
CMD_DESC(
"Manage room roles. "
"Role may be one of moderator, participant, visitor or none.")

4
src/config/theme.c
View File

@ -82,6 +82,8 @@ theme_init(const char *const theme_name)
g_hash_table_insert(defaults, strdup("main.splash"), strdup("cyan"));
g_hash_table_insert(defaults, strdup("error"), strdup("red"));
g_hash_table_insert(defaults, strdup("incoming"), strdup("yellow"));
g_hash_table_insert(defaults, strdup("mention"), strdup("yellow"));
g_hash_table_insert(defaults, strdup("trigger"), strdup("yellow"));
g_hash_table_insert(defaults, strdup("input.text"), strdup("white"));
g_hash_table_insert(defaults, strdup("main.time"), strdup("white"));
g_hash_table_insert(defaults, strdup("titlebar.text"), strdup("white"));
@ -724,6 +726,8 @@ theme_attrs(theme_item_t attrs)
case THEME_SPLASH: _theme_prep_fgnd("main.splash", 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_MENTION: _theme_prep_fgnd("mention", lookup_str, &bold); break;
case THEME_TRIGGER: _theme_prep_fgnd("trigger", lookup_str, &bold); break;
case THEME_INPUT_TEXT: _theme_prep_fgnd("input.text", lookup_str, &bold); break;
case THEME_TIME: _theme_prep_fgnd("main.time", lookup_str, &bold); break;
case THEME_TITLE_TEXT: _theme_prep_fgnd("titlebar.text", lookup_str, &bold); break;

2
src/config/theme.h
View File

@ -46,6 +46,8 @@ typedef enum {
THEME_SPLASH,
THEME_ERROR,
THEME_INCOMING,
THEME_MENTION,
THEME_TRIGGER,
THEME_INPUT_TEXT,
THEME_TIME,
THEME_TITLE_TEXT,

10
src/ui/console.c
View File

@ -334,10 +334,10 @@ cons_show_incoming_room_message(const char *const nick, const char *const room,
if (g_strcmp0(muc_show, "all") == 0) {
if (mention) {
win_vprint(console, '-', 0, NULL, 0, THEME_INCOMING, "", "<< room mention: %s in %s (win %d)", nick, room, ui_index);
win_vprint(console, '-', 0, NULL, 0, THEME_MENTION, "", "<< room mention: %s in %s (win %d)", nick, room, ui_index);
} else if (triggers) {
char *triggers_str = _room_triggers_to_string(triggers);
win_vprint(console, '-', 0, NULL, 0, THEME_INCOMING, "", "<< room trigger %s: %s in %s (win %d)", triggers_str, nick, room, ui_index);
win_vprint(console, '-', 0, NULL, 0, THEME_TRIGGER, "", "<< room trigger %s: %s in %s (win %d)", triggers_str, nick, room, ui_index);
free(triggers_str);
} else {
win_vprint(console, '-', 0, NULL, 0, THEME_INCOMING, "", "<< room message: %s in %s (win %d)", nick, room, ui_index);
@ -346,11 +346,11 @@ cons_show_incoming_room_message(const char *const nick, const char *const room,
} else if (g_strcmp0(muc_show, "first") == 0) {
if (mention) {
win_vprint(console, '-', 0, NULL, 0, THEME_INCOMING, "", "<< room mention: %s in %s (win %d)", nick, room, ui_index);
win_vprint(console, '-', 0, NULL, 0, THEME_MENTION, "", "<< room mention: %s in %s (win %d)", nick, room, ui_index);
cons_alert();
} else if (triggers) {
char *triggers_str = _room_triggers_to_string(triggers);
win_vprint(console, '-', 0, NULL, 0, THEME_INCOMING, "", "<< room trigger %s: %s in %s (win %d)", triggers_str, nick, room, ui_index);
win_vprint(console, '-', 0, NULL, 0, THEME_TRIGGER, "", "<< room trigger %s: %s in %s (win %d)", triggers_str, nick, room, ui_index);
free(triggers_str);
cons_alert();
} else if (unread == 0) {
@ -2208,6 +2208,8 @@ cons_theme_properties(void)
_cons_theme_prop(THEME_UNSUBSCRIBED, "unsubscribed");
_cons_theme_prop(THEME_INCOMING, "incoming");
_cons_theme_prop(THEME_MENTION, "mention");
_cons_theme_prop(THEME_TRIGGER, "trigger");
_cons_theme_prop(THEME_TYPING, "typing");
_cons_theme_prop(THEME_GONE, "gone");

2
theme_template
View File

@ -38,6 +38,8 @@ dnd=
xa=
offline=
incoming=
mention=
trigger=
typing=
gone=
error=

2
themes/aqua
View File

@ -38,6 +38,8 @@ dnd=blue
xa=cyan
offline=bold_black
incoming=bold_cyan
mention=bold_blue
trigger=bold_blue
typing=cyan
gone=blue
error=bold_white

2
themes/batman
View File

@ -22,6 +22,8 @@ typing=cyan
gone=red
error=red
incoming=yellow
mention=cyan
trigger=cyan
roominfo=green
me=black_bold
them=yellow

2
themes/bios
View File

@ -38,6 +38,8 @@ dnd=bold_red
xa=bold_cyan
offline=bold_blue
incoming=bold_yellow
mention=bold_green
trigger=bold_green
typing=bold_yellow
gone=bold_red
error=bold_red

4
themes/boothj5
View File

@ -38,6 +38,8 @@ dnd=magenta
xa=blue
offline=red
incoming=bold_yellow
mention=bold_cyan
trigger=bold_blue
typing=yellow
gone=red
error=red
@ -92,7 +94,7 @@ enc.warn=true
resource.title=true
resource.message=true
statuses.console=all
statuses.chat=all
statuses.chat=none
statuses.muc=none
roster=true
roster.offline=true

2
themes/boothj5_slack
View File

@ -38,6 +38,8 @@ dnd=magenta
xa=blue
offline=red
incoming=bold_yellow
mention=bold_cyan
trigger=bold_blue
typing=yellow
gone=red
error=red

2
themes/forest
View File

@ -38,6 +38,8 @@ dnd=bold_black
xa=blue
offline=bold_black
incoming=bold_yellow
mention=bold_cyan
trigger=bold_cyan
typing=yellow
gone=bold_black
error=bold_black

2
themes/hacker
View File

@ -38,6 +38,8 @@ dnd=green
xa=green
offline=green
incoming=bold_green
mention=bold_green
trigger=bold_green
typing=green
gone=green
error=bold_green

2
themes/headache
View File

@ -38,6 +38,8 @@ dnd=megenta
xa=cyan
offline=green
incoming=yellow
mention=green
trigger=green
typing=magenta
gone=yellow
error=red

2
themes/joker
View File

@ -38,6 +38,8 @@ dnd=green
xa=yellow
offline=bold_black
incoming=yellow
mention=green
trigger=green
typing=green
gone=red
error=red

2
themes/mono
View File

@ -38,6 +38,8 @@ dnd=white
xa=white
offline=white
incoming=white
mention=white
trigger=white
typing=white
gone=white
error=white

2
themes/orange
View File

@ -38,6 +38,8 @@ dnd=white
xa=white
offline=white
incoming=blue
mention=blue
trigger=blue
typing=black
gone=green
error=red

2
themes/original
View File

@ -38,6 +38,8 @@ dnd=red
xa=cyan
offline=red
incoming=yellow
mention=yellow
trigger=yellow
typing=yellow
gone=yellow
error=red

2
themes/original_bright
View File

@ -38,6 +38,8 @@ dnd=bold_red
xa=bold_cyan
offline=bold_red
incoming=bold_yellow
mention=bold_yellow
trigger=bold_yellow
typing=bold_yellow
gone=bold_yellow
error=bold_red

2
themes/shade
View File

@ -38,6 +38,8 @@ dnd=green
xa=yellow
offline=white
incoming=yellow
mention=green
trigger=green
typing=green
gone=red
error=red

2
themes/spawn
View File

@ -38,6 +38,8 @@ dnd=green
xa=yellow
offline=bold_black
incoming=yellow
mention=red
trigger=red
typing=green
gone=red
error=red

2
themes/whiteness
View File

@ -38,6 +38,8 @@ dnd=red
xa=cyan
offline=red
incoming=yellow
mention=yellow
trigger=yellow
typing=yellow
gone=red
error=red