devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

use custom format string for time preference

Browse Source
This commit is contained in:
Will Song
2015-01-27 19:55:16 -06:00
parent 6529220351
commit 7f436d614b
5 changed files with 15 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ui/console.c
View File

@@ -919,12 +919,10 @@ void
cons_time_setting(void)
{
char *pref_time = prefs_get_string(PREF_TIME);
if (g_strcmp0(pref_time, "minutes") == 0)
cons_show("Time (/time) : minutes");
else if (g_strcmp0(pref_time, "off") == 0)
if (g_strcmp0(pref_time, "off") == 0)
cons_show("Time (/time) : OFF");
else
cons_show("Time (/time) : seconds");
cons_show("Time (/time) : %s", pref_time);
prefs_free_string(pref_time);
}

9
src/ui/window.c
View File

@@ -36,6 +36,7 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <assert.h>
#include <glib.h>
@@ -882,14 +883,10 @@ _win_print(ProfWin *window, const char show_char, GDateTime *time,
if ((flags & NO_DATE) == 0) {
gchar *date_fmt = NULL;
char *time_pref = prefs_get_string(PREF_TIME);
if (g_strcmp0(time_pref, "minutes") == 0) {
date_fmt = g_date_time_format(time, "%H:%M");
} else if (g_strcmp0(time_pref, "seconds") == 0) {
date_fmt = g_date_time_format(time, "%H:%M:%S");
}
date_fmt = g_date_time_format(time, time_pref);
free(time_pref);
if (date_fmt) {
if (date_fmt && strlen(date_fmt)) {
if ((flags & NO_COLOUR_DATE) == 0) {
wattron(window->layout->win, theme_attrs(THEME_TIME));
}