Merge commit 'remotes/fml/master'
[paraslash.git] / gui_theme.c
index e4cf39a..78f7aa0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -200,60 +200,78 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
        d[SI_SCORE].y = 17;
        d[SI_SCORE].len = 10;
 
-       d[SI_AUDIOD_STATUS].prefix = "audiod: ";
+       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].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 = 17;
+       d[SI_FILE_SIZE].len = 10;
 
-       d[SI_CHANNELS].prefix = "ch: ";
-       d[SI_CHANNELS].postfix = "";
+       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 = LEFT;
-       d[SI_CHANNELS].x = 71;
+       d[SI_CHANNELS].align = CENTER;
+       d[SI_CHANNELS].x = 47;
        d[SI_CHANNELS].y = 27;
-       d[SI_CHANNELS].len = 8;
+       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 = 79;
+       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 = 12;
+
+       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 = 85;
+       d[SI_CHUNK_TIME].y = 27;
+       d[SI_CHUNK_TIME].len = 15;
+
        d[SI_AUDIO_FILE_INFO].prefix = "";
        d[SI_AUDIO_FILE_INFO].postfix = "";
        d[SI_AUDIO_FILE_INFO].fg = COLOR_GREEN;