changeset 1786:4051f893f571 trunk

[svn] - add: [skin.hints:mainwinVolumeX], [skin.hints:mainwinVolumeY] [skin.hints:mainwinBalanceX], [skin.hints:mainwinBalanceY] [skin.hints:mainwinPositionX], [skin.hints:mainwinPositionY]
author nenolod
date Wed, 04 Oct 2006 16:00:03 -0700
parents e360fad09415
children d1ef4890fb44
files ChangeLog audacious/mainwin.c audacious/widgets/skin.c audacious/widgets/skin.h
diffstat 4 files changed, 78 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 04 15:33:17 2006 -0700
+++ b/ChangeLog	Wed Oct 04 16:00:03 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-04 22:33:17 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2527]
+  - wa2 values for mainwinTitleText property.
+  
+  trunk/audacious/widgets/skin.c |    3 +++
+  1 file changed, 3 insertions(+)
+
+
 2006-10-04 22:27:00 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2525]
   - allow the menurow to be set invisible
--- a/audacious/mainwin.c	Wed Oct 04 15:33:17 2006 -0700
+++ b/audacious/mainwin.c	Wed Oct 04 16:00:03 2006 -0700
@@ -875,6 +875,18 @@
 	widget_move(WIDGET(mainwin_playstatus), bmp_active_skin->properties.mainwin_playstatus_x,
 		bmp_active_skin->properties.mainwin_playstatus_y);
 
+    if (bmp_active_skin->properties.mainwin_volume_x && bmp_active_skin->properties.mainwin_volume_y)
+	widget_move(WIDGET(mainwin_volume), bmp_active_skin->properties.mainwin_volume_x,
+		bmp_active_skin->properties.mainwin_volume_y);
+
+    if (bmp_active_skin->properties.mainwin_balance_x && bmp_active_skin->properties.mainwin_balance_y)
+	widget_move(WIDGET(mainwin_balance), bmp_active_skin->properties.mainwin_balance_x,
+		bmp_active_skin->properties.mainwin_balance_y);
+
+    if (bmp_active_skin->properties.mainwin_position_x && bmp_active_skin->properties.mainwin_position_y)
+	widget_move(WIDGET(mainwin_position), bmp_active_skin->properties.mainwin_position_x,
+		bmp_active_skin->properties.mainwin_position_y);
+
     /* visibility attributes */
     if (bmp_active_skin->properties.mainwin_menurow_visible)
         widget_show(WIDGET(mainwin_menurow));
--- a/audacious/widgets/skin.c	Wed Oct 04 15:33:17 2006 -0700
+++ b/audacious/widgets/skin.c	Wed Oct 04 16:00:03 2006 -0700
@@ -725,6 +725,55 @@
         g_free(tmp);
     }
 
+    tmp = read_ini_string(filename, "skin", "mainwinVolumeX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_volume_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinVolumeY");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_volume_y = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinBalanceX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_balance_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinBalanceY");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_balance_y = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinPositionX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_position_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+
+    tmp = read_ini_string(filename, "skin", "mainwinPositionX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_position_y = atoi(tmp);
+        g_free(tmp);
+    }
+
     g_free(filename);
 }
 
--- a/audacious/widgets/skin.h	Wed Oct 04 15:33:17 2006 -0700
+++ b/audacious/widgets/skin.h	Wed Oct 04 16:00:03 2006 -0700
@@ -100,6 +100,15 @@
 	gint mainwin_playstatus_x;
 	gint mainwin_playstatus_y;
 
+	gint mainwin_volume_x;
+	gint mainwin_volume_y;	
+
+	gint mainwin_balance_x;
+	gint mainwin_balance_y;	
+
+	gint mainwin_position_x;
+	gint mainwin_position_y;
+
 	gboolean mainwin_menurow_visible;
 } SkinProperties;