projects / paraslash.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Replace status item STATUS_BAR to BASENAME.
[paraslash.git] / gui_theme.c
diff --git a/gui_theme.c b/gui_theme.c
index 029e043a867c32f13897baf9c19a1546f6b2ffd3..f3009082f04cd513938489eaa3629fcb820b1be1 100644 (file)
--- a/gui_theme.c
+++ b/gui_theme.c
@@ -1,22 +1,11 @@
 /*
- * Copyright (C) 2005 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 #include "para.h"
+#include "gui.h"
 #include <curses.h>
 
 #define NUM_THEMES 2
@@ -51,14 +40,14 @@ static void init_theme_simple(struct gui_theme *t)
        t->default_bg = COLOR_BLUE;
        t->sep_str = "*";
 
-       d[SI_STATUS_BAR].prefix = "";
-       d[SI_STATUS_BAR].postfix = "";
-       d[SI_STATUS_BAR].fg = COLOR_WHITE;
-       d[SI_STATUS_BAR].bg = COLOR_BLUE;
-       d[SI_STATUS_BAR].align = CENTER;
-       d[SI_STATUS_BAR].x = 0;
-       d[SI_STATUS_BAR].y = 7;
-       d[SI_STATUS_BAR].len = 100;
+       d[SI_BASENAME].prefix = "";
+       d[SI_BASENAME].postfix = "";
+       d[SI_BASENAME].fg = COLOR_WHITE;
+       d[SI_BASENAME].bg = COLOR_BLUE;
+       d[SI_BASENAME].align = CENTER;
+       d[SI_BASENAME].x = 0;
+       d[SI_BASENAME].y = 7;
+       d[SI_BASENAME].len = 100;
 
        d[SI_STATUS].prefix = "para_server: ";
        d[SI_STATUS].postfix = "";
@@ -121,14 +110,14 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
        d[SI_PLAY_TIME].y = 7;
        d[SI_PLAY_TIME].len = 35;
 
-       d[SI_STATUS_BAR].prefix = "";
-       d[SI_STATUS_BAR].postfix = "";
-       d[SI_STATUS_BAR].fg = COLOR_CYAN;
-       d[SI_STATUS_BAR].bg = COLOR_BLACK;
-       d[SI_STATUS_BAR].align = LEFT;
-       d[SI_STATUS_BAR].x = 35;
-       d[SI_STATUS_BAR].y = 7;
-       d[SI_STATUS_BAR].len = 65;
+       d[SI_BASENAME].prefix = "";
+       d[SI_BASENAME].postfix = "";
+       d[SI_BASENAME].fg = COLOR_CYAN;
+       d[SI_BASENAME].bg = COLOR_BLACK;
+       d[SI_BASENAME].align = LEFT;
+       d[SI_BASENAME].x = 35;
+       d[SI_BASENAME].y = 7;
+       d[SI_BASENAME].len = 65;
 
        d[SI_STATUS].prefix = "";
        d[SI_STATUS].postfix = " ";
@@ -155,7 +144,7 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
        d[SI_SELECTOR].align = CENTER;
        d[SI_SELECTOR].x = 21;
        d[SI_SELECTOR].y = 17;
-       d[SI_SELECTOR].len = 20;
+       d[SI_SELECTOR].len = 21;
 
        d[SI_FORMAT].prefix = "format: ";
        d[SI_FORMAT].postfix = "";
@@ -164,8 +153,7 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
        d[SI_FORMAT].align = CENTER;
        d[SI_FORMAT].x = 42;
        d[SI_FORMAT].y = 17;
-       d[SI_FORMAT].len = 14;
-
+       d[SI_FORMAT].len = 18;
 
        d[SI_NUM_PLAYED].prefix = "#";
        d[SI_NUM_PLAYED].postfix = "";
@@ -192,7 +180,7 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
        d[SI_AUDIOD_STATUS].align = RIGHT;
        d[SI_AUDIOD_STATUS].x = 0;
        d[SI_AUDIOD_STATUS].y = 27;
-       d[SI_AUDIOD_STATUS].len = 13;
+       d[SI_AUDIOD_STATUS].len = 14;
 
 
        d[SI_DECODER_FLAGS].prefix = "[";
@@ -200,27 +188,27 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
        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 = 14;
+       d[SI_DECODER_FLAGS].x = 15;
        d[SI_DECODER_FLAGS].y = 27;
-       d[SI_DECODER_FLAGS].len = 8;
+       d[SI_DECODER_FLAGS].len = 10;
 
        d[SI_MTIME].prefix = "Mtime: ";
        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 = 22;
+       d[SI_MTIME].x = 25;
        d[SI_MTIME].y = 27;
-       d[SI_MTIME].len = 30;
+       d[SI_MTIME].len = 29;
 
        d[SI_FILE_SIZE].prefix = "Size: ";
        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 = 52;
+       d[SI_FILE_SIZE].x = 54;
        d[SI_FILE_SIZE].y = 27;
-       d[SI_FILE_SIZE].len = 26;
+       d[SI_FILE_SIZE].len = 24;
 
        d[SI_AUDIOD_UPTIME].prefix = "AUp: ";
        d[SI_AUDIOD_UPTIME].postfix = "";
@@ -259,23 +247,23 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
        d[SI_AUDIO_INFO3].y = 63;
        d[SI_AUDIO_INFO3].len = 100;
 
-       d[SI_DBINFO1].prefix = "";
-       d[SI_DBINFO1].postfix = "";
-       d[SI_DBINFO1].fg = COLOR_YELLOW;
-       d[SI_DBINFO1].bg = COLOR_BLACK;
-       d[SI_DBINFO1].align = CENTER;
-       d[SI_DBINFO1].x = 0;
-       d[SI_DBINFO1].y = 77;
-       d[SI_DBINFO1].len = 100;
-
-       d[SI_DBINFO2].prefix = "";
-       d[SI_DBINFO2].postfix = "";
-       d[SI_DBINFO2].fg = COLOR_YELLOW;
-       d[SI_DBINFO2].bg = COLOR_BLACK;
-       d[SI_DBINFO2].align = CENTER;
-       d[SI_DBINFO2].x = 0;
-       d[SI_DBINFO2].y = 87;
-       d[SI_DBINFO2].len = 100;
+       d[SI_AFS_MODE].prefix = "";
+       d[SI_AFS_MODE].postfix = "";
+       d[SI_AFS_MODE].fg = COLOR_YELLOW;
+       d[SI_AFS_MODE].bg = COLOR_BLACK;
+       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 = "";
paraslash - network audio streaming tools