Merge pull request #117 from aliasbind/master

Add "show_indicators" option
This commit is contained in:
Sascha Kruse 2013-07-27 13:35:15 -07:00
commit 6a3a855b48
5 changed files with 12 additions and 2 deletions

View File

@ -22,6 +22,7 @@ int show_age_threshold = -1; /* show age of notification, when notification i
enum alignment align = left; /* text alignment [left/center/right] */
float bounce_freq = 1; /* determines the bounce frequency (if activated) */
int sticky_history = True;
int show_indicators = True;
int verbosity = 0;
int word_wrap = False;
int ignore_newline = False;

View File

@ -92,6 +92,9 @@
# timeout as if it would normally do.
sticky_history = yes
# Display indicators for URLs (U) and actions (A)
show_indicators = yes
# The height of a single line. If the height is smaller than the font height,
# it will get raised to the font height.
# This adds empty space above and under the text.

View File

@ -501,12 +501,13 @@ void notification_update_text_to_render(notification *n)
char *msg = g_strstrip(n->msg);
/* print dup_count and msg */
if (n->dup_count > 0 && (n->actions || n->urls)) {
if (n->dup_count > 0 && (n->actions || n->urls)
&& settings.show_indicators) {
buf = g_strdup_printf("(%d%s%s) %s",
n->dup_count,
n->actions ? "A" : "",
n->urls ? "U" : "", msg);
} else if (n->actions || n->urls) {
} else if ((n->actions || n->urls) && settings.show_indicators) {
buf = g_strdup_printf("(%s%s) %s",
n->actions ? "A" : "",
n->urls ? "U" : "", msg);

View File

@ -138,6 +138,10 @@ void load_settings(char *cmdline_config_path)
option_get_bool("global", "sticky_history", "-sticky_history",
sticky_history,
"Don't timeout notifications popped up from history");
settings.show_indicators =
option_get_bool("global", "show_indicators", "-show_indicators",
show_indicators,
"Show indicators for actions \"(A)\" and URLs \"(U)\"");
settings.separator_height =
option_get_int("global", "separator_height",
"-sep_height/-separator_height", separator_height,

View File

@ -23,6 +23,7 @@ typedef struct _settings {
enum alignment align;
float bounce_freq;
int sticky_history;
int show_indicators;
int verbosity;
int word_wrap;
int ignore_newline;