X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui_theme.c;h=262d9d56ac140286e3fe898a2bb6a9fcf2ed7505;hp=f3009082f04cd513938489eaa3629fcb820b1be1;hb=d85f74ca004d40e251d58ce8eed31e6786a6a6a3;hpb=07caf51b881e2f8e93fbcf529ea1a9b14a40f82e

diff --git a/gui_theme.c b/gui_theme.c
index f3009082..262d9d56 100644
--- a/gui_theme.c
+++ b/gui_theme.c
@@ -137,14 +137,23 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
 	d[SI_STATUS_FLAGS].y = 17;
 	d[SI_STATUS_FLAGS].len = 10;
 
-	d[SI_SELECTOR].prefix = "selector: ";
-	d[SI_SELECTOR].postfix = "";
-	d[SI_SELECTOR].fg = COLOR_RED;
-	d[SI_SELECTOR].bg = COLOR_BLACK;
-	d[SI_SELECTOR].align = CENTER;
-	d[SI_SELECTOR].x = 21;
-	d[SI_SELECTOR].y = 17;
-	d[SI_SELECTOR].len = 21;
+	d[SI_IMAGE_ID].prefix = "img: ";
+	d[SI_IMAGE_ID].postfix = "";
+	d[SI_IMAGE_ID].fg = COLOR_RED;
+	d[SI_IMAGE_ID].bg = COLOR_BLACK;
+	d[SI_IMAGE_ID].align = CENTER;
+	d[SI_IMAGE_ID].x = 21;
+	d[SI_IMAGE_ID].y = 17;
+	d[SI_IMAGE_ID].len = 10;
+
+	d[SI_LYRICS_ID].prefix = "lyr: ";
+	d[SI_LYRICS_ID].postfix = "";
+	d[SI_LYRICS_ID].fg = COLOR_RED;
+	d[SI_LYRICS_ID].bg = COLOR_BLACK;
+	d[SI_LYRICS_ID].align = CENTER;
+	d[SI_LYRICS_ID].x = 31;
+	d[SI_LYRICS_ID].y = 17;
+	d[SI_LYRICS_ID].len = 11;
 
 	d[SI_FORMAT].prefix = "format: ";
 	d[SI_FORMAT].postfix = "";
@@ -164,14 +173,14 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
 	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_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].y = 17;
+	d[SI_BITRATE].len = 25;
 
 	d[SI_AUDIOD_STATUS].prefix = "audiod: ";
 	d[SI_AUDIOD_STATUS].postfix = "";
@@ -219,33 +228,32 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
 	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_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_TAG_INFO1].prefix = "";
+	d[SI_TAG_INFO1].postfix = "";
+	d[SI_TAG_INFO1].fg = COLOR_GREEN;
+	d[SI_TAG_INFO1].bg = COLOR_BLACK;
+	d[SI_TAG_INFO1].align = CENTER;
+	d[SI_TAG_INFO1].x = 0;
+	d[SI_TAG_INFO1].y = 53;
+	d[SI_TAG_INFO1].len = 100;
+
+	d[SI_TAG_INFO2].prefix = "";
+	d[SI_TAG_INFO2].postfix = "";
+	d[SI_TAG_INFO2].fg = COLOR_GREEN;
+	d[SI_TAG_INFO2].bg = COLOR_BLACK;
+	d[SI_TAG_INFO2].align = CENTER;
+	d[SI_TAG_INFO2].x = 0;
+	d[SI_TAG_INFO2].y = 63;
+	d[SI_TAG_INFO2].len = 100;
 
 	d[SI_AFS_MODE].prefix = "";
 	d[SI_AFS_MODE].postfix = "";
@@ -254,25 +262,34 @@ 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 = 100;
-
-	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_DBINFO3].prefix = "";
-	d[SI_DBINFO3].postfix = "";
-	d[SI_DBINFO3].fg = COLOR_YELLOW;
-	d[SI_DBINFO3].bg = COLOR_BLACK;
-	d[SI_DBINFO3].align = CENTER;
-	d[SI_DBINFO3].x = 0;
-	d[SI_DBINFO3].y = 97;
-	d[SI_DBINFO3].len = 100;
+	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_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;
+	d[SI_DIRECTORY].align = CENTER;
+	d[SI_DIRECTORY].x = 0;
+	d[SI_DIRECTORY].y = 97;
+	d[SI_DIRECTORY].len = 100;
 }
 
 void init_theme(int num, struct gui_theme *t)