From 02aa9ff4e92159f60326a628f8e0c31e13164d43 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sat, 24 Nov 2007 23:26:11 +0100 Subject: [PATCH] gui: Reorder display of status items. --- gui_theme.c | 71 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 27 deletions(-) diff --git a/gui_theme.c b/gui_theme.c index 84f8e45d..e4cf39a2 100644 --- a/gui_theme.c +++ b/gui_theme.c @@ -168,19 +168,37 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_NUM_PLAYED].postfix = ""; d[SI_NUM_PLAYED].fg = COLOR_RED; d[SI_NUM_PLAYED].bg = COLOR_BLACK; - d[SI_NUM_PLAYED].align = CENTER; + d[SI_NUM_PLAYED].align = LEFT; d[SI_NUM_PLAYED].x = 60; d[SI_NUM_PLAYED].y = 17; - d[SI_NUM_PLAYED].len = 15; + d[SI_NUM_PLAYED].len = 5; d[SI_BITRATE].prefix = ""; d[SI_BITRATE].postfix = ""; d[SI_BITRATE].fg = COLOR_RED; d[SI_BITRATE].bg = COLOR_BLACK; d[SI_BITRATE].align = CENTER; - d[SI_BITRATE].x = 75; + d[SI_BITRATE].x = 65; d[SI_BITRATE].y = 17; - d[SI_BITRATE].len = 25; + d[SI_BITRATE].len = 13; + + d[SI_FREQUENCY].prefix = ""; + d[SI_FREQUENCY].postfix = ""; + d[SI_FREQUENCY].fg = COLOR_RED; + d[SI_FREQUENCY].bg = COLOR_BLACK; + d[SI_FREQUENCY].align = CENTER; + d[SI_FREQUENCY].x = 78; + d[SI_FREQUENCY].y = 17; + d[SI_FREQUENCY].len = 10; + + d[SI_SCORE].prefix = "sc: "; + d[SI_SCORE].postfix = ""; + d[SI_SCORE].fg = COLOR_RED; + d[SI_SCORE].bg = COLOR_BLACK; + d[SI_SCORE].align = CENTER; + d[SI_SCORE].x = 88; + d[SI_SCORE].y = 17; + d[SI_SCORE].len = 10; d[SI_AUDIOD_STATUS].prefix = "audiod: "; d[SI_AUDIOD_STATUS].postfix = ""; @@ -191,7 +209,6 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_AUDIOD_STATUS].y = 27; d[SI_AUDIOD_STATUS].len = 14; - d[SI_DECODER_FLAGS].prefix = "["; d[SI_DECODER_FLAGS].postfix = "]"; d[SI_DECODER_FLAGS].fg = COLOR_MAGENTA; @@ -211,22 +228,31 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_MTIME].len = 29; d[SI_FILE_SIZE].prefix = "Size: "; - d[SI_FILE_SIZE].postfix = " kb"; + d[SI_FILE_SIZE].postfix = "kb"; d[SI_FILE_SIZE].fg = COLOR_MAGENTA; d[SI_FILE_SIZE].bg = COLOR_BLACK; d[SI_FILE_SIZE].align = CENTER; d[SI_FILE_SIZE].x = 54; d[SI_FILE_SIZE].y = 27; - d[SI_FILE_SIZE].len = 24; - - d[SI_AUDIOD_UPTIME].prefix = "AUp: "; - d[SI_AUDIOD_UPTIME].postfix = ""; - d[SI_AUDIOD_UPTIME].fg = COLOR_MAGENTA; - d[SI_AUDIOD_UPTIME].bg = COLOR_BLACK; - d[SI_AUDIOD_UPTIME].align = CENTER; - d[SI_AUDIOD_UPTIME].x = 78; - d[SI_AUDIOD_UPTIME].y = 27; - d[SI_AUDIOD_UPTIME].len = 22; + d[SI_FILE_SIZE].len = 17; + + d[SI_CHANNELS].prefix = "ch: "; + d[SI_CHANNELS].postfix = ""; + d[SI_CHANNELS].fg = COLOR_MAGENTA; + d[SI_CHANNELS].bg = COLOR_BLACK; + d[SI_CHANNELS].align = LEFT; + d[SI_CHANNELS].x = 71; + d[SI_CHANNELS].y = 27; + d[SI_CHANNELS].len = 8; + + d[SI_LAST_PLAYED].prefix = "lp: "; + d[SI_LAST_PLAYED].postfix = ""; + d[SI_LAST_PLAYED].fg = COLOR_MAGENTA; + d[SI_LAST_PLAYED].bg = COLOR_BLACK; + d[SI_LAST_PLAYED].align = CENTER; + d[SI_LAST_PLAYED].x = 79; + d[SI_LAST_PLAYED].y = 27; + d[SI_LAST_PLAYED].len = 21; d[SI_AUDIO_FILE_INFO].prefix = ""; d[SI_AUDIO_FILE_INFO].postfix = ""; @@ -262,16 +288,7 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_AFS_MODE].align = CENTER; d[SI_AFS_MODE].x = 0; d[SI_AFS_MODE].y = 77; - d[SI_AFS_MODE].len = 50; - - d[SI_DURATION].prefix = ""; - d[SI_DURATION].postfix = ""; - d[SI_DURATION].fg = COLOR_YELLOW; - d[SI_DURATION].bg = COLOR_BLACK; - d[SI_DURATION].align = CENTER; - d[SI_DURATION].x = 50; - d[SI_DURATION].y = 77; - d[SI_DURATION].len = 50; + d[SI_AFS_MODE].len = 100; d[SI_ATTRIBUTES_TXT].prefix = ""; d[SI_ATTRIBUTES_TXT].postfix = ""; @@ -282,7 +299,7 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_ATTRIBUTES_TXT].y = 87; d[SI_ATTRIBUTES_TXT].len = 100; - d[SI_DIRECTORY].prefix = "dir:"; + d[SI_DIRECTORY].prefix = "dir: "; d[SI_DIRECTORY].postfix = ""; d[SI_DIRECTORY].fg = COLOR_YELLOW; d[SI_DIRECTORY].bg = COLOR_BLACK; -- 2.39.5