X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui_theme.c;h=9345f0ed5e10c0860801d455977a00be0a29082e;hp=e4f4ac86f0e6c21451a706c6f7054cbde235d30d;hb=5446dfe5a4d54aa49dbc961956818d751e817326;hpb=ab0e988bdbccd590a3e7ad101ae152ead4d2bfdb diff --git a/gui_theme.c b/gui_theme.c index e4f4ac86..9345f0ed 100644 --- a/gui_theme.c +++ b/gui_theme.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2007 Andre Noll + * Copyright (C) 2005-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -168,93 +168,145 @@ 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_UPTIME].prefix = "SUp: "; - d[SI_UPTIME].postfix = ""; - d[SI_UPTIME].fg = COLOR_RED; - d[SI_UPTIME].bg = COLOR_BLACK; - d[SI_UPTIME].align = CENTER; - d[SI_UPTIME].x = 75; - d[SI_UPTIME].y = 17; - d[SI_UPTIME].len = 25; - - d[SI_AUDIOD_STATUS].prefix = "audiod: "; + 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 = 65; + d[SI_BITRATE].y = 17; + 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 = ""; d[SI_AUDIOD_STATUS].postfix = ""; d[SI_AUDIOD_STATUS].fg = COLOR_MAGENTA; d[SI_AUDIOD_STATUS].bg = COLOR_BLACK; - d[SI_AUDIOD_STATUS].align = RIGHT; + d[SI_AUDIOD_STATUS].align = CENTER; d[SI_AUDIOD_STATUS].x = 0; d[SI_AUDIOD_STATUS].y = 27; - d[SI_AUDIOD_STATUS].len = 14; - + d[SI_AUDIOD_STATUS].len = 5; d[SI_DECODER_FLAGS].prefix = "["; d[SI_DECODER_FLAGS].postfix = "]"; d[SI_DECODER_FLAGS].fg = COLOR_MAGENTA; d[SI_DECODER_FLAGS].bg = COLOR_BLACK; - d[SI_DECODER_FLAGS].align = LEFT; - d[SI_DECODER_FLAGS].x = 15; + d[SI_DECODER_FLAGS].align = CENTER; + d[SI_DECODER_FLAGS].x = 5; d[SI_DECODER_FLAGS].y = 27; d[SI_DECODER_FLAGS].len = 10; - d[SI_MTIME].prefix = "Mtime: "; + d[SI_MTIME].prefix = "mod: "; d[SI_MTIME].postfix = ""; d[SI_MTIME].fg = COLOR_MAGENTA; d[SI_MTIME].bg = COLOR_BLACK; d[SI_MTIME].align = CENTER; - d[SI_MTIME].x = 25; + d[SI_MTIME].x = 15; d[SI_MTIME].y = 27; - d[SI_MTIME].len = 29; + d[SI_MTIME].len = 22; - d[SI_FILE_SIZE].prefix = "Size: "; - d[SI_FILE_SIZE].postfix = " kb"; + d[SI_FILE_SIZE].prefix = ""; + 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].x = 37; 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_AUDIO_INFO1].prefix = ""; - d[SI_AUDIO_INFO1].postfix = ""; - d[SI_AUDIO_INFO1].fg = COLOR_GREEN; - d[SI_AUDIO_INFO1].bg = COLOR_BLACK; - d[SI_AUDIO_INFO1].align = CENTER; - d[SI_AUDIO_INFO1].x = 0; - d[SI_AUDIO_INFO1].y = 43; - d[SI_AUDIO_INFO1].len = 100; - - d[SI_AUDIO_INFO2].prefix = ""; - d[SI_AUDIO_INFO2].postfix = ""; - d[SI_AUDIO_INFO2].fg = COLOR_GREEN; - d[SI_AUDIO_INFO2].bg = COLOR_BLACK; - d[SI_AUDIO_INFO2].align = CENTER; - d[SI_AUDIO_INFO2].x = 0; - d[SI_AUDIO_INFO2].y = 53; - d[SI_AUDIO_INFO2].len = 100; - - d[SI_AUDIO_INFO3].prefix = ""; - d[SI_AUDIO_INFO3].postfix = ""; - d[SI_AUDIO_INFO3].fg = COLOR_GREEN; - d[SI_AUDIO_INFO3].bg = COLOR_BLACK; - d[SI_AUDIO_INFO3].align = CENTER; - d[SI_AUDIO_INFO3].x = 0; - d[SI_AUDIO_INFO3].y = 63; - d[SI_AUDIO_INFO3].len = 100; + d[SI_FILE_SIZE].len = 10; + + d[SI_CHANNELS].prefix = ""; + d[SI_CHANNELS].postfix = "ch"; + d[SI_CHANNELS].fg = COLOR_MAGENTA; + d[SI_CHANNELS].bg = COLOR_BLACK; + d[SI_CHANNELS].align = CENTER; + d[SI_CHANNELS].x = 47; + d[SI_CHANNELS].y = 27; + d[SI_CHANNELS].len = 5; + + 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 = 52; + d[SI_LAST_PLAYED].y = 27; + d[SI_LAST_PLAYED].len = 21; + + d[SI_NUM_CHUNKS].prefix = ""; + d[SI_NUM_CHUNKS].postfix = "x"; + d[SI_NUM_CHUNKS].fg = COLOR_MAGENTA; + d[SI_NUM_CHUNKS].bg = COLOR_BLACK; + d[SI_NUM_CHUNKS].align = RIGHT; + d[SI_NUM_CHUNKS].x = 73; + d[SI_NUM_CHUNKS].y = 27; + d[SI_NUM_CHUNKS].len = 11; + + d[SI_CHUNK_TIME].prefix = ""; + d[SI_CHUNK_TIME].postfix = "ms"; + d[SI_CHUNK_TIME].fg = COLOR_MAGENTA; + d[SI_CHUNK_TIME].bg = COLOR_BLACK; + d[SI_CHUNK_TIME].align = LEFT; + d[SI_CHUNK_TIME].x = 84; + d[SI_CHUNK_TIME].y = 27; + d[SI_CHUNK_TIME].len = 8; + + d[SI_AMPLIFICATION].prefix = "amp:"; + d[SI_AMPLIFICATION].postfix = ""; + d[SI_AMPLIFICATION].fg = COLOR_MAGENTA; + d[SI_AMPLIFICATION].bg = COLOR_BLACK; + d[SI_AMPLIFICATION].align = RIGHT; + d[SI_AMPLIFICATION].x = 92; + d[SI_AMPLIFICATION].y = 27; + d[SI_AMPLIFICATION].len = 8; + + d[SI_AUDIO_FILE_INFO].prefix = ""; + d[SI_AUDIO_FILE_INFO].postfix = ""; + d[SI_AUDIO_FILE_INFO].fg = COLOR_GREEN; + d[SI_AUDIO_FILE_INFO].bg = COLOR_BLACK; + d[SI_AUDIO_FILE_INFO].align = CENTER; + d[SI_AUDIO_FILE_INFO].x = 0; + d[SI_AUDIO_FILE_INFO].y = 43; + d[SI_AUDIO_FILE_INFO].len = 100; + + d[SI_TAGINFO1].prefix = ""; + d[SI_TAGINFO1].postfix = ""; + d[SI_TAGINFO1].fg = COLOR_GREEN; + d[SI_TAGINFO1].bg = COLOR_BLACK; + d[SI_TAGINFO1].align = CENTER; + d[SI_TAGINFO1].x = 0; + d[SI_TAGINFO1].y = 53; + d[SI_TAGINFO1].len = 100; + + d[SI_TAGINFO2].prefix = ""; + d[SI_TAGINFO2].postfix = ""; + d[SI_TAGINFO2].fg = COLOR_GREEN; + d[SI_TAGINFO2].bg = COLOR_BLACK; + d[SI_TAGINFO2].align = CENTER; + d[SI_TAGINFO2].x = 0; + d[SI_TAGINFO2].y = 63; + d[SI_TAGINFO2].len = 100; d[SI_AFS_MODE].prefix = ""; d[SI_AFS_MODE].postfix = ""; @@ -263,28 +315,18 @@ 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_ATTRIBUTES].prefix = ""; - d[SI_ATTRIBUTES].postfix = ""; - d[SI_ATTRIBUTES].fg = COLOR_YELLOW; - d[SI_ATTRIBUTES].bg = COLOR_BLACK; - d[SI_ATTRIBUTES].align = CENTER; - d[SI_ATTRIBUTES].x = 0; - d[SI_ATTRIBUTES].y = 87; - d[SI_ATTRIBUTES].len = 100; - - d[SI_DIRECTORY].prefix = "dir:"; + d[SI_AFS_MODE].len = 100; + + d[SI_ATTRIBUTES_TXT].prefix = ""; + d[SI_ATTRIBUTES_TXT].postfix = ""; + d[SI_ATTRIBUTES_TXT].fg = COLOR_YELLOW; + d[SI_ATTRIBUTES_TXT].bg = COLOR_BLACK; + d[SI_ATTRIBUTES_TXT].align = CENTER; + d[SI_ATTRIBUTES_TXT].x = 0; + d[SI_ATTRIBUTES_TXT].y = 87; + d[SI_ATTRIBUTES_TXT].len = 100; + + d[SI_DIRECTORY].prefix = "dir: "; d[SI_DIRECTORY].postfix = ""; d[SI_DIRECTORY].fg = COLOR_YELLOW; d[SI_DIRECTORY].bg = COLOR_BLACK; @@ -297,8 +339,7 @@ static void init_theme_colorful_blackness(struct gui_theme *t) void init_theme(int num, struct gui_theme *t) { int i; - - for (i = 0; i < NUM_STAT_ITEMS; i++) + FOR_EACH_STATUS_ITEM(i) t->data[i].len = 0; current_theme_num = num;