Mercurial > audlegacy

changeset 2240:9711bc859ea6 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - fix sed
author nenolod
date Tue, 02 Jan 2007 22:06:49 -0800
parents bb4d730fbcd0
children a6010343e979
files ChangeLog audacious/ui_main.c
diffstat 2 files changed, 34 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jan 02 22:05:31 2007 -0800
+++ b/ChangeLog	Tue Jan 02 22:06:49 2007 -0800
@@ -1,3 +1,11 @@
+2007-01-03 06:05:31 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3483]
+  - fix sed
+  
+  trunk/audacious/ui_manager.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2007-01-03 06:04:44 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3481]
   - fix sed
--- a/audacious/ui_main.c	Tue Jan 02 22:05:31 2007 -0800
+++ b/audacious/ui_main.c	Tue Jan 02 22:06:49 2007 -0800
@@ -56,7 +56,7 @@
 #include "icons-stock.h"
 
 #include "ui_manager.h"
-#include "actions-ui_main.h"
+#include "actions-mainwin.h"
 
 #include "main.h"
 
@@ -299,8 +299,8 @@
         mainwin_shade->pb_ny = mainwin_shade->pb_py = 27;
     }
     else {
-	gint height = !bmp_active_skin->properties.ui_main.height ? MAINWIN_HEIGHT :
-                     bmp_active_skin->properties.ui_main.height;
+	gint height = !bmp_active_skin->properties.mainwin_height ? MAINWIN_HEIGHT :
+                     bmp_active_skin->properties.mainwin_height;
 
         dock_shade(dock_window_list, GTK_WINDOW(mainwin), height * (cfg.doublesize + 1));
 
@@ -505,7 +505,7 @@
         if (!cfg.player_shaded)
             skin_draw_pixmap(bmp_active_skin, mainwin_bg, mainwin_gc,
                              SKIN_MAIN, 0, 0, 0, 0, bmp_active_skin->properties.mainwin_width,
-                             bmp_active_skin->properties.ui_main.height);
+                             bmp_active_skin->properties.mainwin_height);
         mainwin_draw_titlebar(gtk_window_has_toplevel_focus
                               (GTK_WINDOW(mainwin)));
     }
@@ -518,12 +518,12 @@
                 img = gdk_drawable_get_image(mainwin_bg, 0, 0, bmp_active_skin->properties.mainwin_width,
                                              cfg.player_shaded ?
                                              MAINWIN_SHADED_HEIGHT :
-                                             bmp_active_skin->properties.ui_main.height);
+                                             bmp_active_skin->properties.mainwin_height);
                 img2x = create_dblsize_image(img);
                 gdk_draw_image(mainwin_bg_x2, mainwin_gc, img2x, 0, 0,
                                0, 0, bmp_active_skin->properties.mainwin_width * 2,
                                cfg.player_shaded ? MAINWIN_SHADED_HEIGHT *
-                               2 : bmp_active_skin->properties.ui_main.height * 2);
+                               2 : bmp_active_skin->properties.mainwin_height * 2);
                 g_object_unref(img2x);
                 g_object_unref(img);
             }
@@ -539,14 +539,14 @@
                     continue;
 
 	        if (w->x > bmp_active_skin->properties.mainwin_width ||
-		    w->y > bmp_active_skin->properties.ui_main.height)
+		    w->y > bmp_active_skin->properties.mainwin_height)
 		    continue;
 
                 if (cfg.doublesize) {
                     gint width, height;
 
                     width = w->x + w->width <= bmp_active_skin->properties.mainwin_width ? w->width : (w->width - ((w->x + w->width) - bmp_active_skin->properties.mainwin_width));
-                    height = w->y + w->height <= bmp_active_skin->properties.mainwin_width ? w->height : (w->height - ((w->y + w->height) - bmp_active_skin->properties.ui_main.height));
+                    height = w->y + w->height <= bmp_active_skin->properties.mainwin_width ? w->height : (w->height - ((w->y + w->height) - bmp_active_skin->properties.mainwin_height));
 
                     img = gdk_drawable_get_image(mainwin_bg, w->x, w->y,
                                                  width, height);
@@ -797,29 +797,29 @@
         widget_hide(WIDGET(mainwin_vis));
 
     /* window size, mainwinWidth && mainwinHeight properties */
-    if (bmp_active_skin->properties.ui_main.height && bmp_active_skin->properties.mainwin_width)
+    if (bmp_active_skin->properties.mainwin_height && bmp_active_skin->properties.mainwin_width)
     {
 	gint width, height;
 
 	gdk_window_get_size(mainwin->window, &width, &height);
 
         if (width == bmp_active_skin->properties.mainwin_width * (cfg.doublesize + 1) &&
-	    height == bmp_active_skin->properties.ui_main.height * (cfg.doublesize + 1))
+	    height == bmp_active_skin->properties.mainwin_height * (cfg.doublesize + 1))
             return;
 
         dock_window_resize(GTK_WINDOW(mainwin), cfg.player_shaded ? MAINWIN_SHADED_WIDTH * (cfg.doublesize + 1) : bmp_active_skin->properties.mainwin_width * (cfg.doublesize + 1),
-		cfg.player_shaded ? MAINWIN_SHADED_HEIGHT * (cfg.doublesize + 1) : bmp_active_skin->properties.ui_main.height * (cfg.doublesize + 1),
+		cfg.player_shaded ? MAINWIN_SHADED_HEIGHT * (cfg.doublesize + 1) : bmp_active_skin->properties.mainwin_height * (cfg.doublesize + 1),
 		bmp_active_skin->properties.mainwin_width * (cfg.doublesize + 1),
-		bmp_active_skin->properties.ui_main.height * (cfg.doublesize + 1));
+		bmp_active_skin->properties.mainwin_height * (cfg.doublesize + 1));
 
 	g_object_unref(mainwin_bg);
 	g_object_unref(mainwin_bg_x2);
         mainwin_bg = gdk_pixmap_new(mainwin->window,
 				bmp_active_skin->properties.mainwin_width,
-				bmp_active_skin->properties.ui_main.height, -1);
+				bmp_active_skin->properties.mainwin_height, -1);
         mainwin_bg_x2 = gdk_pixmap_new(mainwin->window,
 				bmp_active_skin->properties.mainwin_width * 2,
-				bmp_active_skin->properties.ui_main.height * 2, -1);
+				bmp_active_skin->properties.mainwin_height * 2, -1);
         mainwin_set_back_pixmap();
 	widget_list_change_pixmap(mainwin_wlist, mainwin_bg);
 	gdk_flush();
@@ -2484,18 +2484,18 @@
     gdk_window_set_hints(mainwin->window, 0, 0,
                          !bmp_active_skin->properties.mainwin_width ? PLAYER_WIDTH :
 				bmp_active_skin->properties.mainwin_width,
-                         !bmp_active_skin->properties.ui_main.height ? PLAYER_HEIGHT :
-				bmp_active_skin->properties.ui_main.height,
+                         !bmp_active_skin->properties.mainwin_height ? PLAYER_HEIGHT :
+				bmp_active_skin->properties.mainwin_height,
                          !bmp_active_skin->properties.mainwin_width ? PLAYER_WIDTH :
 				bmp_active_skin->properties.mainwin_width,
-                         !bmp_active_skin->properties.ui_main.height ? PLAYER_HEIGHT :
-				bmp_active_skin->properties.ui_main.height,
+                         !bmp_active_skin->properties.mainwin_height ? PLAYER_HEIGHT :
+				bmp_active_skin->properties.mainwin_height,
                          GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
     gtk_window_resize(GTK_WINDOW(mainwin), 
                          !bmp_active_skin->properties.mainwin_width ? PLAYER_WIDTH :
 				bmp_active_skin->properties.mainwin_width,
-                         !bmp_active_skin->properties.ui_main.height ? PLAYER_HEIGHT :
-				bmp_active_skin->properties.ui_main.height);
+                         !bmp_active_skin->properties.mainwin_height ? PLAYER_HEIGHT :
+				bmp_active_skin->properties.mainwin_height);
     if (cfg.player_x != -1 && cfg.player_y != -1)
         gtk_window_move(GTK_WINDOW(mainwin), cfg.player_x, cfg.player_y);
 
@@ -2552,13 +2552,13 @@
     if (cfg.player_shaded)
         height = MAINWIN_SHADED_HEIGHT;
     else
-        height = bmp_active_skin->properties.ui_main.height;
+        height = bmp_active_skin->properties.mainwin_height;
 
     mainwin_set_shape_mask();
 
     dock_window_resize(GTK_WINDOW(mainwin), cfg.player_shaded ? MAINWIN_SHADED_WIDTH : bmp_active_skin->properties.mainwin_width,
-		cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : bmp_active_skin->properties.ui_main.height,
-		bmp_active_skin->properties.mainwin_width * 2, bmp_active_skin->properties.ui_main.height * 2);
+		cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : bmp_active_skin->properties.mainwin_height,
+		bmp_active_skin->properties.mainwin_width * 2, bmp_active_skin->properties.mainwin_height * 2);
 
     if (cfg.doublesize) {
         gdk_window_set_back_pixmap(mainwin->window, mainwin_bg_x2, 0);
@@ -3425,7 +3425,7 @@
     gtk_window_set_resizable(GTK_WINDOW(mainwin), FALSE);
 
     width = cfg.player_shaded ? MAINWIN_SHADED_WIDTH : bmp_active_skin->properties.mainwin_width;
-    height = cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : bmp_active_skin->properties.ui_main.height;
+    height = cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : bmp_active_skin->properties.mainwin_height;
 
     if (cfg.doublesize) {
         width *= 2;
@@ -3486,10 +3486,10 @@
     mainwin_gc = gdk_gc_new(mainwin->window);
     mainwin_bg = gdk_pixmap_new(mainwin->window,
                                 bmp_active_skin->properties.mainwin_width,
-				bmp_active_skin->properties.ui_main.height, -1);
+				bmp_active_skin->properties.mainwin_height, -1);
     mainwin_bg_x2 = gdk_pixmap_new(mainwin->window,
                                 bmp_active_skin->properties.mainwin_width * 2,
-				bmp_active_skin->properties.ui_main.height * 2, -1);
+				bmp_active_skin->properties.mainwin_height * 2, -1);
     mainwin_set_back_pixmap();
     mainwin_create_widgets();