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

updated statusbar to use strftime formats

Browse Source
This commit is contained in:
Will Song 2015-05-29 20:23:09 -05:00
parent 9463c67190
commit f2629aca7b
No known key found for this signature in database
GPG Key ID: AF0CA153EA5D9C7C
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/ui/statusbar.c
View File

@ -129,10 +129,13 @@ status_bar_resize(void)
if (message) { if (message) {
char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR); char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR);
if (g_strcmp0(time_pref, "minutes") == 0) { gchar *date_fmt = g_date_time_format(last_time, time_pref);
mvwprintw(status_bar, 0, 10, message); assert(date_fmt != NULL);
} else if (g_strcmp0(time_pref, "seconds") == 0) { size_t len = strlen(date_fmt);
mvwprintw(status_bar, 0, 13, message); if (g_strcmp0(time_pref, "") != 0) {
/* 01234567890123456
* [HH:MM] message */
mvwprintw(status_bar, 0, 5 + len, message);
} else { } else {
mvwprintw(status_bar, 0, 1, message); mvwprintw(status_bar, 0, 1, message);
} }
@ -303,10 +306,11 @@ status_bar_print_message(const char * const msg)
message = strdup(msg); message = strdup(msg);
char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR); char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR);
if (g_strcmp0(time_pref, "minutes") == 0) { gchar *date_fmt = g_date_time_format(last_time, time_pref);
mvwprintw(status_bar, 0, 10, message); assert(date_fmt != NULL);
} else if (g_strcmp0(time_pref, "seconds") == 0) { size_t len = strlen(date_fmt);
mvwprintw(status_bar, 0, 13, message); if (g_strcmp0(time_pref, "") != 0) {
mvwprintw(status_bar, 0, 5 + len, message);
} else { } else {
mvwprintw(status_bar, 0, 1, message); mvwprintw(status_bar, 0, 1, message);
} }
@ -436,26 +440,16 @@ _status_bar_draw(void)
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET); int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR); char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR);
if (g_strcmp0(time_pref, "minutes") == 0) { if (g_strcmp0(time_pref, "") != 0) {
gchar *date_fmt = g_date_time_format(last_time, "%H:%M"); gchar *date_fmt = g_date_time_format(last_time, time_pref);
assert(date_fmt != NULL); assert(date_fmt != NULL);
size_t len = strlen(date_fmt);
wattron(status_bar, bracket_attrs); wattron(status_bar, bracket_attrs);
mvwaddch(status_bar, 0, 1, '['); mvwaddch(status_bar, 0, 1, '[');
wattroff(status_bar, bracket_attrs); wattroff(status_bar, bracket_attrs);
mvwprintw(status_bar, 0, 2, date_fmt); mvwprintw(status_bar, 0, 2, date_fmt);
wattron(status_bar, bracket_attrs); wattron(status_bar, bracket_attrs);
mvwaddch(status_bar, 0, 7, ']'); mvwaddch(status_bar, 0, 2 + len, ']');
wattroff(status_bar, bracket_attrs);
g_free(date_fmt);
} else if (g_strcmp0(time_pref, "seconds") == 0) {
gchar *date_fmt = g_date_time_format(last_time, "%H:%M:%S");
assert(date_fmt != NULL);
wattron(status_bar, bracket_attrs);
mvwaddch(status_bar, 0, 1, '[');
wattroff(status_bar, bracket_attrs);
mvwprintw(status_bar, 0, 2, date_fmt);
wattron(status_bar, bracket_attrs);
mvwaddch(status_bar, 0, 10, ']');
wattroff(status_bar, bracket_attrs); wattroff(status_bar, bracket_attrs);
g_free(date_fmt); g_free(date_fmt);
} }