Mercurial > audlegacy

changeset 1804:e0e46bce806e trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - mainwinEQButtonX, mainwinEQButtonY, mainwinPLButtonX, mainwinPLButtonY, mainwinAboutX, mainwinAboutY, mainwinShuffleX, mainwinShuffleY, mainwinRepeatX, mainwinRepeatY.
author nenolod
date Wed, 04 Oct 2006 21:46:00 -0700
parents dde3f2e14160
children 27a2c571a033
files ChangeLog audacious/mainwin.c audacious/widgets/skin.c audacious/widgets/skin.h
diffstat 4 files changed, 309 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 04 21:05:51 2006 -0700
+++ b/ChangeLog	Wed Oct 04 21:46:00 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-05 04:05:51 +0000  Jonathan Schleifer <js@h3c.de>
+  revision [2563]
+  WTF, and now even a typo in the ChangeLog! (Fixed.)
+  
+  trunk/ChangeLog |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2006-10-05 04:04:50 +0000  Jonathan Schleifer <js@h3c.de>
   revision [2561]
   Just saw that it's ordered by last name. Of course, I was too blind
--- a/audacious/mainwin.c	Wed Oct 04 21:05:51 2006 -0700
+++ b/audacious/mainwin.c	Wed Oct 04 21:46:00 2006 -0700
@@ -905,6 +905,55 @@
 	widget_move(WIDGET(mainwin_position), bmp_active_skin->properties.mainwin_position_x,
 		bmp_active_skin->properties.mainwin_position_y);
 
+    if (bmp_active_skin->properties.mainwin_previous_x && bmp_active_skin->properties.mainwin_previous_y)
+	widget_move(WIDGET(mainwin_rew), bmp_active_skin->properties.mainwin_previous_x,
+		bmp_active_skin->properties.mainwin_previous_y);
+
+    if (bmp_active_skin->properties.mainwin_play_x && bmp_active_skin->properties.mainwin_play_y)
+	widget_move(WIDGET(mainwin_play), bmp_active_skin->properties.mainwin_play_x,
+		bmp_active_skin->properties.mainwin_play_y);
+
+    if (bmp_active_skin->properties.mainwin_pause_x && bmp_active_skin->properties.mainwin_pause_y)
+	widget_move(WIDGET(mainwin_pause), bmp_active_skin->properties.mainwin_pause_x,
+		bmp_active_skin->properties.mainwin_pause_y);
+
+    if (bmp_active_skin->properties.mainwin_stop_x && bmp_active_skin->properties.mainwin_stop_y)
+	widget_move(WIDGET(mainwin_stop), bmp_active_skin->properties.mainwin_stop_x,
+		bmp_active_skin->properties.mainwin_stop_y);
+
+    if (bmp_active_skin->properties.mainwin_next_x && bmp_active_skin->properties.mainwin_next_y)
+	widget_move(WIDGET(mainwin_fwd), bmp_active_skin->properties.mainwin_next_x,
+		bmp_active_skin->properties.mainwin_next_y);
+
+    if (bmp_active_skin->properties.mainwin_eject_x && bmp_active_skin->properties.mainwin_eject_y)
+	widget_move(WIDGET(mainwin_eject), bmp_active_skin->properties.mainwin_eject_x,
+		bmp_active_skin->properties.mainwin_eject_y);
+
+    if (bmp_active_skin->properties.mainwin_eqbutton_x && bmp_active_skin->properties.mainwin_eqbutton_y)
+	widget_move(WIDGET(mainwin_eq), bmp_active_skin->properties.mainwin_eqbutton_x,
+		bmp_active_skin->properties.mainwin_eqbutton_y);
+
+    if (bmp_active_skin->properties.mainwin_plbutton_x && bmp_active_skin->properties.mainwin_plbutton_y)
+	widget_move(WIDGET(mainwin_pl), bmp_active_skin->properties.mainwin_plbutton_x,
+		bmp_active_skin->properties.mainwin_plbutton_y);
+
+    if (bmp_active_skin->properties.mainwin_shuffle_x && bmp_active_skin->properties.mainwin_shuffle_y)
+	widget_move(WIDGET(mainwin_shuffle), bmp_active_skin->properties.mainwin_shuffle_x,
+		bmp_active_skin->properties.mainwin_shuffle_y);
+
+    if (bmp_active_skin->properties.mainwin_repeat_x && bmp_active_skin->properties.mainwin_repeat_y)
+	widget_move(WIDGET(mainwin_repeat), bmp_active_skin->properties.mainwin_repeat_x,
+		bmp_active_skin->properties.mainwin_repeat_y);
+
+    if (bmp_active_skin->properties.mainwin_about_x && bmp_active_skin->properties.mainwin_about_y)
+	widget_move(WIDGET(mainwin_about), bmp_active_skin->properties.mainwin_about_x,
+		bmp_active_skin->properties.mainwin_about_y);
+
+    /* window size, mainwinWidth && mainwinHeight properties */
+    if (bmp_active_skin->properties.mainwin_height && bmp_active_skin->properties.mainwin_width)
+        dock_resize(dock_window_list, GTK_WINDOW(mainwin), bmp_active_skin->properties.mainwin_width,
+		bmp_active_skin->properties.mainwin_height);
+
     /* visibility attributes */
     if (bmp_active_skin->properties.mainwin_menurow_visible)
         widget_show(WIDGET(mainwin_menurow));
--- a/audacious/widgets/skin.c	Wed Oct 04 21:05:51 2006 -0700
+++ b/audacious/widgets/skin.c	Wed Oct 04 21:46:00 2006 -0700
@@ -530,19 +530,6 @@
 
     path_p = path_p ? path_p : skin->path;
 
-    skin->properties.mainwin_othertext = FALSE;
-    skin->properties.mainwin_vis_x = 24;
-    skin->properties.mainwin_vis_y = 43;
-    skin->properties.mainwin_vis_width = 76;
-    skin->properties.mainwin_text_x = 112;
-    skin->properties.mainwin_text_y = 27;
-    skin->properties.mainwin_text_width = 153;
-
-    skin->properties.mainwin_menurow_visible = TRUE;
-    skin->properties.mainwin_vis_visible = TRUE;
-    skin->properties.mainwin_text_visible = TRUE;
-    skin->properties.mainwin_othertext_visible = TRUE;
-
     filename = find_file_recursively(path_p, "skin.hints");
 
     if (filename == NULL)
@@ -552,6 +539,7 @@
     skin->description = read_ini_string(filename, "skin", "skinDescription");
 #endif
 
+    skin->properties.mainwin_othertext = FALSE;
     tmp = read_ini_string(filename, "skin", "mainwinOthertext");
 
     if (tmp != NULL)
@@ -560,6 +548,7 @@
         g_free(tmp);
     }
 
+    skin->properties.mainwin_vis_x = 24;
     tmp = read_ini_string(filename, "skin", "mainwinVisX");
 
     if (tmp != NULL)
@@ -568,6 +557,7 @@
         g_free(tmp);
     }
 
+    skin->properties.mainwin_vis_y = 43;
     tmp = read_ini_string(filename, "skin", "mainwinVisY");
 
     if (tmp != NULL)
@@ -576,6 +566,7 @@
         g_free(tmp);
     }
 
+    skin->properties.mainwin_vis_width = 76;
     tmp = read_ini_string(filename, "skin", "mainwinVisWidth");
 
     if (tmp != NULL)
@@ -584,6 +575,7 @@
         g_free(tmp);
     }
 
+    skin->properties.mainwin_text_x = 112;
     tmp = read_ini_string(filename, "skin", "mainwinTextX");
 
     if (tmp != NULL)
@@ -592,6 +584,7 @@
         g_free(tmp);
     }
 
+    skin->properties.mainwin_text_y = 27;
     tmp = read_ini_string(filename, "skin", "mainwinTextY");
 
     if (tmp != NULL)
@@ -600,6 +593,7 @@
         g_free(tmp);
     }
 
+    skin->properties.mainwin_text_width = 153;
     tmp = read_ini_string(filename, "skin", "mainwinTextWidth");
 
     if (tmp != NULL)
@@ -608,6 +602,7 @@
         g_free(tmp);
     }
 
+    skin->properties.mainwin_infobar_x = 112;
     tmp = read_ini_string(filename, "skin", "mainwinInfoBarX");
 
     if (tmp != NULL)
@@ -720,6 +715,7 @@
         g_free(tmp);
     }
 
+    skin->properties.mainwin_menurow_visible = TRUE;
     tmp = read_ini_string(filename, "skin", "mainwinMenurowVisible");
 
     if (tmp != NULL)
@@ -784,6 +780,7 @@
         g_free(tmp);
     }
 
+    skin->properties.mainwin_othertext_visible = TRUE;
     tmp = read_ini_string(filename, "skin", "mainwinOthertextVisible");
 
     if (tmp != NULL)
@@ -792,6 +789,7 @@
         g_free(tmp);
     }
 
+    skin->properties.mainwin_text_visible = TRUE;
     tmp = read_ini_string(filename, "skin", "mainwinTextVisible");
 
     if (tmp != NULL)
@@ -800,6 +798,7 @@
         g_free(tmp);
     }
 
+    skin->properties.mainwin_vis_visible = TRUE;
     tmp = read_ini_string(filename, "skin", "mainwinVisVisible");
 
     if (tmp != NULL)
@@ -808,6 +807,210 @@
         g_free(tmp);
     }
 
+    tmp = read_ini_string(filename, "skin", "mainwinPreviousX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_previous_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinPreviousY");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_previous_y = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinPlayX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_play_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinPlayY");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_play_y = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinPauseX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_pause_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinPauseY");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_pause_y = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinStopX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_stop_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinStopY");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_stop_y = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinNextX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_next_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinNextY");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_next_y = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinEjectX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_eject_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+    tmp = read_ini_string(filename, "skin", "mainwinEjectY");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_eject_y = atoi(tmp);
+        g_free(tmp);
+    }
+
+    skin->properties.mainwin_width = 275;
+    tmp = read_ini_string(filename, "skin", "mainwinWidth");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_width = atoi(tmp);
+        g_free(tmp);
+    }
+
+    skin->properties.mainwin_height = 116;
+    tmp = read_ini_string(filename, "skin", "mainwinHeight");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_height = atoi(tmp);
+        g_free(tmp);
+    }
+
+    skin->properties.mainwin_about_x = 247;
+    tmp = read_ini_string(filename, "skin", "mainwinAboutX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_about_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+    skin->properties.mainwin_about_y = 83;
+    tmp = read_ini_string(filename, "skin", "mainwinAboutY");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_about_y = atoi(tmp);
+        g_free(tmp);
+    }
+
+    skin->properties.mainwin_shuffle_x = 164;
+    tmp = read_ini_string(filename, "skin", "mainwinShuffleX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_shuffle_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+    skin->properties.mainwin_shuffle_y = 89;
+    tmp = read_ini_string(filename, "skin", "mainwinShuffleY");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_shuffle_y = atoi(tmp);
+        g_free(tmp);
+    }
+
+    skin->properties.mainwin_repeat_x = 210;
+    tmp = read_ini_string(filename, "skin", "mainwinRepeatX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_repeat_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+    skin->properties.mainwin_repeat_y = 89;
+    tmp = read_ini_string(filename, "skin", "mainwinRepeatY");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_repeat_y = atoi(tmp);
+        g_free(tmp);
+    }
+
+    skin->properties.mainwin_eqbutton_x = 219;
+    tmp = read_ini_string(filename, "skin", "mainwinEQButtonX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_eqbutton_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+    skin->properties.mainwin_eqbutton_y = 58;
+    tmp = read_ini_string(filename, "skin", "mainwinEQButtonY");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_eqbutton_y = atoi(tmp);
+        g_free(tmp);
+    }
+
+    skin->properties.mainwin_plbutton_x = 242;
+    tmp = read_ini_string(filename, "skin", "mainwinPLButtonX");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_plbutton_x = atoi(tmp);
+        g_free(tmp);
+    }
+
+    skin->properties.mainwin_plbutton_y = 58;
+    tmp = read_ini_string(filename, "skin", "mainwinPLButtonY");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_plbutton_y = atoi(tmp);
+        g_free(tmp);
+    }
+
     g_free(filename);
 }
 
--- a/audacious/widgets/skin.h	Wed Oct 04 21:05:51 2006 -0700
+++ b/audacious/widgets/skin.h	Wed Oct 04 21:46:00 2006 -0700
@@ -119,6 +119,42 @@
 	gint mainwin_position_x;
 	gint mainwin_position_y;
 
+	gint mainwin_previous_x;
+	gint mainwin_previous_y;
+
+	gint mainwin_play_x;
+	gint mainwin_play_y;
+
+	gint mainwin_pause_x;
+	gint mainwin_pause_y;
+
+	gint mainwin_stop_x;
+	gint mainwin_stop_y;
+
+	gint mainwin_next_x;
+	gint mainwin_next_y;
+
+	gint mainwin_eject_x;
+	gint mainwin_eject_y;
+
+	gint mainwin_eqbutton_x;
+	gint mainwin_eqbutton_y;
+
+	gint mainwin_plbutton_x;
+	gint mainwin_plbutton_y;
+
+	gint mainwin_shuffle_x;
+	gint mainwin_shuffle_y;
+
+	gint mainwin_repeat_x;
+	gint mainwin_repeat_y;
+
+	gint mainwin_about_x;
+	gint mainwin_about_y;
+
+	gint mainwin_width;
+	gint mainwin_height;
+
 	gboolean mainwin_menurow_visible;
 
 	gboolean mainwin_othertext_is_status;