changeset 2244:1148bfa60fd5 trunk

[svn] skinwin.[ch] -> ui_skinselector.[ch]
author nenolod
date Tue, 02 Jan 2007 22:23:09 -0800
parents 58082d2be394
children 6fb65026a8c7
files ChangeLog audacious/Makefile audacious/genevent.c audacious/main.c audacious/playback.c audacious/skinwin.c audacious/skinwin.h audacious/ui_fileinfo.c audacious/ui_main.c audacious/ui_preferences.c audacious/ui_skinselector.c audacious/ui_skinselector.h audacious/widgets/skin.c
diffstat 13 files changed, 464 insertions(+), 457 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jan 02 22:17:06 2007 -0800
+++ b/ChangeLog	Tue Jan 02 22:23:09 2007 -0800
@@ -1,3 +1,11 @@
+2007-01-03 06:17:06 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3491]
+  - fix skin scripts
+  
+  trunk/audacious/widgets/skin.c |    8 ++++----
+  1 file changed, 4 insertions(+), 4 deletions(-)
+
+
 2007-01-03 06:13:10 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3489]
   - prefswin.c -> ui_preferences.c
--- a/audacious/Makefile	Tue Jan 02 22:17:06 2007 -0800
+++ b/audacious/Makefile	Tue Jan 02 22:23:09 2007 -0800
@@ -62,7 +62,7 @@
 	playback.c \
 	main.c \
 	logger.c \
-	skinwin.c \
+	ui_skinselector.c \
 	ui_preferences.c \
 	ui_fileinfo.c \
 	ui_playlist.c \
--- a/audacious/genevent.c	Tue Jan 02 22:17:06 2007 -0800
+++ b/audacious/genevent.c	Tue Jan 02 22:23:09 2007 -0800
@@ -61,7 +61,6 @@
 #include "playlist.h"
 #include "ui_playlist.h"
 #include "pluginenum.h"
-#include "skinwin.h"
 #include "util.h"
 #include "visualization.h"
 
--- a/audacious/main.c	Tue Jan 02 22:17:06 2007 -0800
+++ b/audacious/main.c	Tue Jan 02 22:23:09 2007 -0800
@@ -67,7 +67,7 @@
 #include "ui_playlist.h"
 #include "ui_preferences.h"
 #include "pluginenum.h"
-#include "skinwin.h"
+#include "ui_skinselector.h"
 #include "util.h"
 #include "visualization.h"
 #include "build_stamp.h"
--- a/audacious/playback.c	Tue Jan 02 22:17:06 2007 -0800
+++ b/audacious/playback.c	Tue Jan 02 22:23:09 2007 -0800
@@ -44,7 +44,7 @@
 #include "output.h"
 #include "playlist.h"
 #include "ui_playlist.h"
-#include "skinwin.h"
+#include "ui_skinselector.h"
 #include "libaudacious/urldecode.h"
 #include "util.h"
 
--- a/audacious/skinwin.c	Tue Jan 02 22:17:06 2007 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,405 +0,0 @@
-/*  BMP - Cross-platform multimedia player
- *  Copyright (C) 2003-2004  BMP development team.
- *
- *  Based on XMMS:
- *  Copyright (C) 1998-2003  XMMS development team.
- *
- *  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; under version 2 of the License.
- *
- *  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "skinwin.h"
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include "platform/smartinclude.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "main.h"
-#include "widgets/widgetcore.h"
-#include "util.h"
-
-#define EXTENSION_TARGETS 7
-
-static gchar *ext_targets[EXTENSION_TARGETS] = { "bmp", "xpm", "png", "svg",
-        "gif", "jpg", "jpeg" };
-
-#define THUMBNAIL_WIDTH  90
-#define THUMBNAIL_HEIGHT 40
-
-
-enum SkinViewCols {
-    SKIN_VIEW_COL_PREVIEW,
-    SKIN_VIEW_COL_FORMATTEDNAME,
-    SKIN_VIEW_COL_NAME,
-    SKIN_VIEW_N_COLS
-};
-
-
-GList *skinlist = NULL;
-
-
-
-static gchar *
-get_thumbnail_filename(const gchar * path)
-{
-    gchar *basename, *pngname, *thumbname;
-
-    g_return_val_if_fail(path != NULL, NULL);
-
-    basename = g_path_get_basename(path);
-    pngname = g_strconcat(basename, ".png", NULL);
-
-    thumbname = g_build_filename(bmp_paths[BMP_PATH_SKIN_THUMB_DIR],
-                                 pngname, NULL);
-
-    g_free(basename);
-    g_free(pngname);
-
-    return thumbname;
-}
-
-
-static GdkPixbuf *
-skin_get_preview(const gchar * path)
-{
-    GdkPixbuf *preview = NULL;
-    gchar *dec_path, *preview_path;
-    gboolean is_archive = FALSE;
-    gint i = 0;
-    gchar buf[60];			/* gives us lots of room */
-
-    if (file_is_archive(path))
-    {
-        if (!(dec_path = archive_decompress(path)))
-            return NULL;
-
-        is_archive = TRUE;
-    }
-    else
-    {
-        dec_path = g_strdup(path);
-    }
-
-    for (i = 0; i < EXTENSION_TARGETS; i++)
-    {
-        sprintf(buf, "main.%s", ext_targets[i]);
-
-        if ((preview_path = find_file_recursively(dec_path, buf)) != NULL)
-            break;
-    }
-
-    if (preview_path)
-    {
-        preview = gdk_pixbuf_new_from_file(preview_path, NULL);
-        g_free(preview_path);
-    }
-
-    if (is_archive)
-        del_directory(dec_path);
-
-    g_free(dec_path);
-
-    return preview;
-}
-
-
-static GdkPixbuf *
-skin_get_thumbnail(const gchar * path)
-{
-    GdkPixbuf *scaled = NULL;
-    GdkPixbuf *preview;
-    gchar *thumbname;
-
-    g_return_val_if_fail(path != NULL, NULL);
-
-    if (g_str_has_suffix(path, BMP_SKIN_THUMB_DIR_BASENAME))
-        return NULL;
-
-    thumbname = get_thumbnail_filename(path);
-
-    if (g_file_test(thumbname, G_FILE_TEST_EXISTS)) {
-        scaled = gdk_pixbuf_new_from_file(thumbname, NULL);
-        g_free(thumbname);
-        return scaled;
-    }
-
-    if (!(preview = skin_get_preview(path))) {
-        g_free(thumbname);
-        return NULL;
-    }
-
-    scaled = gdk_pixbuf_scale_simple(preview,
-                                     THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT,
-                                     GDK_INTERP_BILINEAR);
-    g_object_unref(preview);
-
-    gdk_pixbuf_save(scaled, thumbname, "png", NULL, NULL);
-    g_free(thumbname);
-
-    return scaled;
-}
-
-static void
-skinlist_add(const gchar * filename)
-{
-    SkinNode *node;
-    gchar *basename;
-
-    g_return_if_fail(filename != NULL);
-
-    node = g_new0(SkinNode, 1);
-    node->path = g_strdup(filename);
-
-    basename = g_path_get_basename(filename);
-
-    if (file_is_archive(filename)) {
-        node->name = archive_basename(basename);
-	node->desc = _("Archived Winamp 2.x skin");
-        g_free(basename);
-    }
-    else {
-        node->name = basename;
-	node->desc = _("Unarchived Winamp 2.x skin");
-    }
-
-    skinlist = g_list_prepend(skinlist, node);
-}
-
-static gboolean
-scan_skindir_func(const gchar * path, const gchar * basename, gpointer data)
-{
-    if (g_file_test(path, G_FILE_TEST_IS_REGULAR)) {
-        if (file_is_archive(path)) {
-            skinlist_add(path);
-        }
-    }
-    else if (g_file_test(path, G_FILE_TEST_IS_DIR)) {
-        skinlist_add(path);
-    }
-
-    return FALSE;
-}
-
-static void
-scan_skindir(const gchar * path)
-{
-    GError *error = NULL;
-
-    g_return_if_fail(path != NULL);
-
-    if (path[0] == '.')
-        return;
-
-    if (!dir_foreach(path, scan_skindir_func, NULL, &error)) {
-        g_warning("Failed to open directory (%s): %s", path, error->message);
-        g_error_free(error);
-        return;
-    }
-}
-
-static gint
-skinlist_compare_func(gconstpointer a, gconstpointer b)
-{
-    g_return_val_if_fail(a != NULL && SKIN_NODE(a)->name != NULL, 1);
-    g_return_val_if_fail(b != NULL && SKIN_NODE(b)->name != NULL, 1);
-    return strcasecmp(SKIN_NODE(a)->name, SKIN_NODE(b)->name);
-}
-
-static void
-skin_free_func(gpointer data)
-{
-    g_return_if_fail(data != NULL);
-    g_free(SKIN_NODE(data)->name);
-    g_free(SKIN_NODE(data)->path);
-    g_free(data);
-}
-
-
-static void
-skinlist_clear(void)
-{
-    if (!skinlist)
-        return;
-
-    g_list_foreach(skinlist, (GFunc) skin_free_func, NULL);
-    g_list_free(skinlist);
-    skinlist = NULL;
-}
-
-void
-skinlist_update(void)
-{
-    gchar *skinsdir;
-
-    skinlist_clear();
-
-    scan_skindir(bmp_paths[BMP_PATH_USER_SKIN_DIR]);
-    scan_skindir(DATA_DIR G_DIR_SEPARATOR_S BMP_SKIN_DIR_BASENAME);
-
-    skinsdir = getenv("SKINSDIR");
-    if (skinsdir) {
-        gchar **dir_list = g_strsplit(skinsdir, ":", 0);
-        gchar **dir;
-
-        for (dir = dir_list; *dir; dir++)
-            scan_skindir(*dir);
-        g_strfreev(dir_list);
-    }
-
-    skinlist = g_list_sort(skinlist, skinlist_compare_func);
-
-    g_assert(skinlist != NULL);
-}
-
-void
-skin_view_update(GtkTreeView * treeview, GtkWidget * refresh_button)
-{
-    GtkTreeSelection *selection = NULL;
-    GtkListStore *store;
-    GtkTreeIter iter, iter_current_skin;
-    gboolean have_current_skin = FALSE;
-    GtkTreePath *path;
-
-    GdkPixbuf *thumbnail;
-    gchar *formattedname;
-    gchar *name;
-    GList *entry;
-
-    gtk_widget_set_sensitive(GTK_WIDGET(treeview), FALSE);
-    gtk_widget_set_sensitive(GTK_WIDGET(refresh_button), FALSE);
-
-    store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-
-    gtk_list_store_clear(store);
-
-    skinlist_update();
-
-    for (entry = skinlist; entry; entry = g_list_next(entry)) {
-        thumbnail = skin_get_thumbnail(SKIN_NODE(entry->data)->path);
-
-        formattedname = g_strdup_printf("<big><b>%s</b></big>\n<i>%s</i>",
-		SKIN_NODE(entry->data)->name, SKIN_NODE(entry->data)->desc);
-        name = SKIN_NODE(entry->data)->name;
-
-        gtk_list_store_append(store, &iter);
-        gtk_list_store_set(store, &iter,
-                           SKIN_VIEW_COL_PREVIEW, thumbnail,
-                           SKIN_VIEW_COL_FORMATTEDNAME, formattedname,
-                           SKIN_VIEW_COL_NAME, name, -1);
-        if (thumbnail)
-            g_object_unref(thumbnail);
-        g_free(formattedname);
-
-        if (g_strstr_len(bmp_active_skin->path,
-                         strlen(bmp_active_skin->path), name) ) {
-            iter_current_skin = iter;
-            have_current_skin = TRUE;
-        }
-
-        while (gtk_events_pending())
-            gtk_main_iteration();
-    }
-
-    if (have_current_skin) {
-        selection = gtk_tree_view_get_selection(treeview);
-        gtk_tree_selection_select_iter(selection, &iter_current_skin);
-
-        path = gtk_tree_model_get_path(GTK_TREE_MODEL(store),
-		                               &iter_current_skin);
-        gtk_tree_view_scroll_to_cell(treeview, path, NULL, TRUE, 0.5, 0.5);
-        gtk_tree_path_free(path);
-    }
-
-    gtk_widget_set_sensitive(GTK_WIDGET(treeview), TRUE);
-    gtk_widget_set_sensitive(GTK_WIDGET(refresh_button), TRUE);
-}
-
-
-static void
-skin_view_on_cursor_changed(GtkTreeView * treeview,
-                            gpointer data)
-{
-    GtkTreeModel *model;
-    GtkTreeSelection *selection;
-    GtkTreeIter iter;
-
-    GList *node;
-    gchar *name;
-    gchar *comp = NULL;
-
-    selection = gtk_tree_view_get_selection(treeview);
-    if (!gtk_tree_selection_get_selected(selection, &model, &iter))
-        return;
-
-    gtk_tree_model_get(model, &iter, SKIN_VIEW_COL_NAME, &name, -1);
-
-    for (node = skinlist; node; node = g_list_next(node)) {
-        comp = SKIN_NODE(node->data)->path;
-        if (g_strrstr(comp, name))
-            break;
-    }
-
-    g_free(name);
-
-    bmp_active_skin_load(comp);
-}
-
-
-void
-skin_view_realize(GtkTreeView * treeview)
-{
-    GtkListStore *store;
-    GtkTreeViewColumn *column;
-    GtkCellRenderer *renderer;
-    GtkTreeSelection *selection;
-
-    gtk_widget_show_all(GTK_WIDGET(treeview));
-    
-    gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), TRUE);
-    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
-
-    store = gtk_list_store_new(SKIN_VIEW_N_COLS, GDK_TYPE_PIXBUF,
-                               G_TYPE_STRING , G_TYPE_STRING);
-    gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(store));
-
-    column = gtk_tree_view_column_new();
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-    gtk_tree_view_column_set_spacing(column, 16);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(treeview),
-                                GTK_TREE_VIEW_COLUMN(column));
-
-    renderer = gtk_cell_renderer_pixbuf_new();
-    gtk_tree_view_column_pack_start(column, renderer, FALSE);
-    gtk_tree_view_column_set_attributes(column, renderer, "pixbuf",
-                                        SKIN_VIEW_COL_PREVIEW, NULL);
-
-    renderer = gtk_cell_renderer_text_new();
-    gtk_tree_view_column_pack_start(column, renderer, TRUE);
-    gtk_tree_view_column_set_attributes(column, renderer, "markup",
-                                        SKIN_VIEW_COL_FORMATTEDNAME, NULL);
-
-    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-    gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
-
-    g_signal_connect(treeview, "cursor-changed",
-                     G_CALLBACK(skin_view_on_cursor_changed), NULL);
-}
--- a/audacious/skinwin.h	Tue Jan 02 22:17:06 2007 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*  BMP - Cross-platform multimedia player
- *  Copyright (C) 2003-2004  BMP development team.
- *
- *  Based on XMMS:
- *  Copyright (C) 1998-2003  XMMS development team.
- *
- *  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; under version 2 of the License.
- *
- *  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef SKINWIN_H
-#define SKINWIN_H
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#define SKIN_NODE(x)  ((SkinNode *)(x))
-struct _SkinNode {
-    gchar *name;
-    gchar *desc;
-    gchar *path;
-    GTime *time;
-};
-
-typedef struct _SkinNode SkinNode;
-
-extern GList *skinlist;
-
-void skinlist_update();
-void skin_view_realize(GtkTreeView * treeview);
-void skin_view_update(GtkTreeView * treeview, GtkWidget * refresh_button);
-
-#endif
--- a/audacious/ui_fileinfo.c	Tue Jan 02 22:17:06 2007 -0800
+++ b/audacious/ui_fileinfo.c	Tue Jan 02 22:23:09 2007 -0800
@@ -58,7 +58,6 @@
 
 #include "ui_main.h"
 #include "ui_playlist.h"
-#include "skinwin.h"
 #include "build_stamp.h"
 #include "ui_fileinfo.h"
 #include "ui_playlist.h"
--- a/audacious/ui_main.c	Tue Jan 02 22:17:06 2007 -0800
+++ b/audacious/ui_main.c	Tue Jan 02 22:23:09 2007 -0800
@@ -71,7 +71,7 @@
 #include "input.h"
 #include "ui_playlist.h"
 #include "ui_preferences.h"
-#include "skinwin.h"
+#include "ui_skinselector.h"
 #include "genevent.h"
 #include "playback.h"
 #include "playlist.h"
--- a/audacious/ui_preferences.c	Tue Jan 02 22:17:06 2007 -0800
+++ b/audacious/ui_preferences.c	Tue Jan 02 22:23:09 2007 -0800
@@ -55,9 +55,10 @@
 
 #include "ui_main.h"
 #include "ui_playlist.h"
-#include "skinwin.h"
+#include "ui_skinselector.h"
+#include "ui_preferences.h"
+
 #include "build_stamp.h"
-#include "ui_preferences.h"
 
 enum CategoryViewCols {
     CATEGORY_VIEW_COL_ICON,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audacious/ui_skinselector.c	Tue Jan 02 22:23:09 2007 -0800
@@ -0,0 +1,405 @@
+/*  BMP - Cross-platform multimedia player
+ *  Copyright (C) 2003-2004  BMP development team.
+ *
+ *  Based on XMMS:
+ *  Copyright (C) 1998-2003  XMMS development team.
+ *
+ *  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; under version 2 of the License.
+ *
+ *  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "ui_skinselector.h"
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include "platform/smartinclude.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "main.h"
+#include "widgets/widgetcore.h"
+#include "util.h"
+
+#define EXTENSION_TARGETS 7
+
+static gchar *ext_targets[EXTENSION_TARGETS] = { "bmp", "xpm", "png", "svg",
+        "gif", "jpg", "jpeg" };
+
+#define THUMBNAIL_WIDTH  90
+#define THUMBNAIL_HEIGHT 40
+
+
+enum SkinViewCols {
+    SKIN_VIEW_COL_PREVIEW,
+    SKIN_VIEW_COL_FORMATTEDNAME,
+    SKIN_VIEW_COL_NAME,
+    SKIN_VIEW_N_COLS
+};
+
+
+GList *skinlist = NULL;
+
+
+
+static gchar *
+get_thumbnail_filename(const gchar * path)
+{
+    gchar *basename, *pngname, *thumbname;
+
+    g_return_val_if_fail(path != NULL, NULL);
+
+    basename = g_path_get_basename(path);
+    pngname = g_strconcat(basename, ".png", NULL);
+
+    thumbname = g_build_filename(bmp_paths[BMP_PATH_SKIN_THUMB_DIR],
+                                 pngname, NULL);
+
+    g_free(basename);
+    g_free(pngname);
+
+    return thumbname;
+}
+
+
+static GdkPixbuf *
+skin_get_preview(const gchar * path)
+{
+    GdkPixbuf *preview = NULL;
+    gchar *dec_path, *preview_path;
+    gboolean is_archive = FALSE;
+    gint i = 0;
+    gchar buf[60];			/* gives us lots of room */
+
+    if (file_is_archive(path))
+    {
+        if (!(dec_path = archive_decompress(path)))
+            return NULL;
+
+        is_archive = TRUE;
+    }
+    else
+    {
+        dec_path = g_strdup(path);
+    }
+
+    for (i = 0; i < EXTENSION_TARGETS; i++)
+    {
+        sprintf(buf, "main.%s", ext_targets[i]);
+
+        if ((preview_path = find_file_recursively(dec_path, buf)) != NULL)
+            break;
+    }
+
+    if (preview_path)
+    {
+        preview = gdk_pixbuf_new_from_file(preview_path, NULL);
+        g_free(preview_path);
+    }
+
+    if (is_archive)
+        del_directory(dec_path);
+
+    g_free(dec_path);
+
+    return preview;
+}
+
+
+static GdkPixbuf *
+skin_get_thumbnail(const gchar * path)
+{
+    GdkPixbuf *scaled = NULL;
+    GdkPixbuf *preview;
+    gchar *thumbname;
+
+    g_return_val_if_fail(path != NULL, NULL);
+
+    if (g_str_has_suffix(path, BMP_SKIN_THUMB_DIR_BASENAME))
+        return NULL;
+
+    thumbname = get_thumbnail_filename(path);
+
+    if (g_file_test(thumbname, G_FILE_TEST_EXISTS)) {
+        scaled = gdk_pixbuf_new_from_file(thumbname, NULL);
+        g_free(thumbname);
+        return scaled;
+    }
+
+    if (!(preview = skin_get_preview(path))) {
+        g_free(thumbname);
+        return NULL;
+    }
+
+    scaled = gdk_pixbuf_scale_simple(preview,
+                                     THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT,
+                                     GDK_INTERP_BILINEAR);
+    g_object_unref(preview);
+
+    gdk_pixbuf_save(scaled, thumbname, "png", NULL, NULL);
+    g_free(thumbname);
+
+    return scaled;
+}
+
+static void
+skinlist_add(const gchar * filename)
+{
+    SkinNode *node;
+    gchar *basename;
+
+    g_return_if_fail(filename != NULL);
+
+    node = g_new0(SkinNode, 1);
+    node->path = g_strdup(filename);
+
+    basename = g_path_get_basename(filename);
+
+    if (file_is_archive(filename)) {
+        node->name = archive_basename(basename);
+	node->desc = _("Archived Winamp 2.x skin");
+        g_free(basename);
+    }
+    else {
+        node->name = basename;
+	node->desc = _("Unarchived Winamp 2.x skin");
+    }
+
+    skinlist = g_list_prepend(skinlist, node);
+}
+
+static gboolean
+scan_skindir_func(const gchar * path, const gchar * basename, gpointer data)
+{
+    if (g_file_test(path, G_FILE_TEST_IS_REGULAR)) {
+        if (file_is_archive(path)) {
+            skinlist_add(path);
+        }
+    }
+    else if (g_file_test(path, G_FILE_TEST_IS_DIR)) {
+        skinlist_add(path);
+    }
+
+    return FALSE;
+}
+
+static void
+scan_skindir(const gchar * path)
+{
+    GError *error = NULL;
+
+    g_return_if_fail(path != NULL);
+
+    if (path[0] == '.')
+        return;
+
+    if (!dir_foreach(path, scan_skindir_func, NULL, &error)) {
+        g_warning("Failed to open directory (%s): %s", path, error->message);
+        g_error_free(error);
+        return;
+    }
+}
+
+static gint
+skinlist_compare_func(gconstpointer a, gconstpointer b)
+{
+    g_return_val_if_fail(a != NULL && SKIN_NODE(a)->name != NULL, 1);
+    g_return_val_if_fail(b != NULL && SKIN_NODE(b)->name != NULL, 1);
+    return strcasecmp(SKIN_NODE(a)->name, SKIN_NODE(b)->name);
+}
+
+static void
+skin_free_func(gpointer data)
+{
+    g_return_if_fail(data != NULL);
+    g_free(SKIN_NODE(data)->name);
+    g_free(SKIN_NODE(data)->path);
+    g_free(data);
+}
+
+
+static void
+skinlist_clear(void)
+{
+    if (!skinlist)
+        return;
+
+    g_list_foreach(skinlist, (GFunc) skin_free_func, NULL);
+    g_list_free(skinlist);
+    skinlist = NULL;
+}
+
+void
+skinlist_update(void)
+{
+    gchar *skinsdir;
+
+    skinlist_clear();
+
+    scan_skindir(bmp_paths[BMP_PATH_USER_SKIN_DIR]);
+    scan_skindir(DATA_DIR G_DIR_SEPARATOR_S BMP_SKIN_DIR_BASENAME);
+
+    skinsdir = getenv("SKINSDIR");
+    if (skinsdir) {
+        gchar **dir_list = g_strsplit(skinsdir, ":", 0);
+        gchar **dir;
+
+        for (dir = dir_list; *dir; dir++)
+            scan_skindir(*dir);
+        g_strfreev(dir_list);
+    }
+
+    skinlist = g_list_sort(skinlist, skinlist_compare_func);
+
+    g_assert(skinlist != NULL);
+}
+
+void
+skin_view_update(GtkTreeView * treeview, GtkWidget * refresh_button)
+{
+    GtkTreeSelection *selection = NULL;
+    GtkListStore *store;
+    GtkTreeIter iter, iter_current_skin;
+    gboolean have_current_skin = FALSE;
+    GtkTreePath *path;
+
+    GdkPixbuf *thumbnail;
+    gchar *formattedname;
+    gchar *name;
+    GList *entry;
+
+    gtk_widget_set_sensitive(GTK_WIDGET(treeview), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(refresh_button), FALSE);
+
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
+
+    gtk_list_store_clear(store);
+
+    skinlist_update();
+
+    for (entry = skinlist; entry; entry = g_list_next(entry)) {
+        thumbnail = skin_get_thumbnail(SKIN_NODE(entry->data)->path);
+
+        formattedname = g_strdup_printf("<big><b>%s</b></big>\n<i>%s</i>",
+		SKIN_NODE(entry->data)->name, SKIN_NODE(entry->data)->desc);
+        name = SKIN_NODE(entry->data)->name;
+
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter,
+                           SKIN_VIEW_COL_PREVIEW, thumbnail,
+                           SKIN_VIEW_COL_FORMATTEDNAME, formattedname,
+                           SKIN_VIEW_COL_NAME, name, -1);
+        if (thumbnail)
+            g_object_unref(thumbnail);
+        g_free(formattedname);
+
+        if (g_strstr_len(bmp_active_skin->path,
+                         strlen(bmp_active_skin->path), name) ) {
+            iter_current_skin = iter;
+            have_current_skin = TRUE;
+        }
+
+        while (gtk_events_pending())
+            gtk_main_iteration();
+    }
+
+    if (have_current_skin) {
+        selection = gtk_tree_view_get_selection(treeview);
+        gtk_tree_selection_select_iter(selection, &iter_current_skin);
+
+        path = gtk_tree_model_get_path(GTK_TREE_MODEL(store),
+		                               &iter_current_skin);
+        gtk_tree_view_scroll_to_cell(treeview, path, NULL, TRUE, 0.5, 0.5);
+        gtk_tree_path_free(path);
+    }
+
+    gtk_widget_set_sensitive(GTK_WIDGET(treeview), TRUE);
+    gtk_widget_set_sensitive(GTK_WIDGET(refresh_button), TRUE);
+}
+
+
+static void
+skin_view_on_cursor_changed(GtkTreeView * treeview,
+                            gpointer data)
+{
+    GtkTreeModel *model;
+    GtkTreeSelection *selection;
+    GtkTreeIter iter;
+
+    GList *node;
+    gchar *name;
+    gchar *comp = NULL;
+
+    selection = gtk_tree_view_get_selection(treeview);
+    if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+        return;
+
+    gtk_tree_model_get(model, &iter, SKIN_VIEW_COL_NAME, &name, -1);
+
+    for (node = skinlist; node; node = g_list_next(node)) {
+        comp = SKIN_NODE(node->data)->path;
+        if (g_strrstr(comp, name))
+            break;
+    }
+
+    g_free(name);
+
+    bmp_active_skin_load(comp);
+}
+
+
+void
+skin_view_realize(GtkTreeView * treeview)
+{
+    GtkListStore *store;
+    GtkTreeViewColumn *column;
+    GtkCellRenderer *renderer;
+    GtkTreeSelection *selection;
+
+    gtk_widget_show_all(GTK_WIDGET(treeview));
+    
+    gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), TRUE);
+    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
+
+    store = gtk_list_store_new(SKIN_VIEW_N_COLS, GDK_TYPE_PIXBUF,
+                               G_TYPE_STRING , G_TYPE_STRING);
+    gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(store));
+
+    column = gtk_tree_view_column_new();
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_spacing(column, 16);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(treeview),
+                                GTK_TREE_VIEW_COLUMN(column));
+
+    renderer = gtk_cell_renderer_pixbuf_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_attributes(column, renderer, "pixbuf",
+                                        SKIN_VIEW_COL_PREVIEW, NULL);
+
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, TRUE);
+    gtk_tree_view_column_set_attributes(column, renderer, "markup",
+                                        SKIN_VIEW_COL_FORMATTEDNAME, NULL);
+
+    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
+    gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
+
+    g_signal_connect(treeview, "cursor-changed",
+                     G_CALLBACK(skin_view_on_cursor_changed), NULL);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audacious/ui_skinselector.h	Tue Jan 02 22:23:09 2007 -0800
@@ -0,0 +1,43 @@
+/*  BMP - Cross-platform multimedia player
+ *  Copyright (C) 2003-2004  BMP development team.
+ *
+ *  Based on XMMS:
+ *  Copyright (C) 1998-2003  XMMS development team.
+ *
+ *  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; under version 2 of the License.
+ *
+ *  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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef SKINWIN_H
+#define SKINWIN_H
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#define SKIN_NODE(x)  ((SkinNode *)(x))
+struct _SkinNode {
+    gchar *name;
+    gchar *desc;
+    gchar *path;
+    GTime *time;
+};
+
+typedef struct _SkinNode SkinNode;
+
+extern GList *skinlist;
+
+void skinlist_update();
+void skin_view_realize(GtkTreeView * treeview);
+void skin_view_update(GtkTreeView * treeview, GtkWidget * refresh_button);
+
+#endif
--- a/audacious/widgets/skin.c	Tue Jan 02 22:17:06 2007 -0800
+++ b/audacious/widgets/skin.c	Tue Jan 02 22:23:09 2007 -0800
@@ -36,7 +36,7 @@
 #include "ui_equalizer.h"
 #include "main.h"
 #include "ui_playlist.h"
-#include "skinwin.h"
+#include "ui_skinselector.h"
 #include "util.h"
 
 #include "debug.h"