Mercurial > audlegacy

changeset 4787:f04094af8d57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove XMMS-style fileopener
author mf0102 <0102@gmx.at>
date Tue, 30 Sep 2008 17:58:41 +0200
parents a28b97667415
children 7da84f662ce2
files src/audacious/audconfig.c src/audacious/audconfig.h src/audacious/ui_fileopener.c
diffstat 3 files changed, 2 insertions(+), 274 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/audconfig.c	Mon Sep 29 20:58:40 2008 +0200
+++ b/src/audacious/audconfig.c	Tue Sep 30 17:58:41 2008 +0200
@@ -151,7 +151,6 @@
     .filepopup_pixelsize = 150,        /* short side length of the picture in the filepopup */
     .filepopup_delay = 20,             /* delay until the filepopup comes up */
     .use_file_cover = FALSE,           /* use filename.jpg for coverart */
-    .use_xmms_style_fileselector = FALSE,
     .use_extension_probing = TRUE,
     .colorize_r = 255, .colorize_g = 255, .colorize_b = 255,
     .filepopup_showprogressbar = TRUE,
@@ -263,7 +262,6 @@
     {"show_filepopup_for_tuple", &cfg.show_filepopup_for_tuple, TRUE},
     {"recurse_for_cover", &cfg.recurse_for_cover, TRUE},
     {"use_file_cover", &cfg.use_file_cover, TRUE},
-    {"use_xmms_style_fileselector", &cfg.use_xmms_style_fileselector, TRUE},
     {"use_extension_probing", &cfg.use_extension_probing, TRUE},
     {"filepopup_showprogressbar", &cfg.filepopup_showprogressbar, TRUE},
     {"close_jtf_dialog", &cfg.close_jtf_dialog, TRUE},
--- a/src/audacious/audconfig.h	Mon Sep 29 20:58:40 2008 +0200
+++ b/src/audacious/audconfig.h	Tue Sep 30 17:58:41 2008 +0200
@@ -108,7 +108,6 @@
     gint filepopup_pixelsize;
     gint filepopup_delay;
     gboolean use_file_cover;
-    gboolean use_xmms_style_fileselector;
     gboolean use_extension_probing;
     gint colorize_r; gint colorize_g; gint colorize_b;
     gboolean filepopup_showprogressbar;
--- a/src/audacious/ui_fileopener.c	Mon Sep 29 20:58:40 2008 +0200
+++ b/src/audacious/ui_fileopener.c	Tue Sep 30 17:58:41 2008 +0200
@@ -198,266 +198,6 @@
 }
 
 /*
- * Derived from Beep Media Player 0.9.6.1.
- * Which is (C) 2003 - 2006 Milosz Derezynski &c
- *
- * Although I changed it quite a bit. -nenolod
- */
-static void
-filebrowser_changed_classic(GtkFileSelection * filesel)
-{
-    GList *list;
-    GList *node;
-    char *filename = (char *)
-        gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel));
-    GtkListStore *store;
-    GtkTreeIter iter;
-
-    if ((list = input_scan_dir(filename)) != NULL)
-    {
-        /*
-         * We enter a directory that has been "hijacked" by an
-         * input-plugin. This is used by the CDDA plugin
-         */
-        store =
-            GTK_LIST_STORE(gtk_tree_view_get_model
-                           (GTK_TREE_VIEW(filesel->file_list)));
-        gtk_list_store_clear(store);
-
-        node = list;
-        while (node) {
-            gtk_list_store_append(store, &iter);
-            gtk_list_store_set(store, &iter, 0, node->data, -1);
-            g_free(node->data);
-            node = g_list_next(node);
-        }
-
-        g_list_free(list);
-    }
-}
-
-static void
-filebrowser_entry_changed_classic(GtkEditable * entry, gpointer data)
-{
-    filebrowser_changed_classic(GTK_FILE_SELECTION(data));
-}
-
-
-static gboolean
-filebrowser_is_dir_classic(GtkFileSelection * filesel)
-{
-    char *text;
-    struct stat buf;
-    gboolean retv = FALSE;
-
-    text = g_strdup(gtk_file_selection_get_filename(filesel));
-
-    if (stat(text, &buf) == 0 && S_ISDIR(buf.st_mode)) {
-        /* Selected directory */
-        int len = strlen(text);
-        if (len > 3 && !strcmp(text + len - 4, "/../")) {
-            if (len == 4)
-                /* At the root already */
-                *(text + len - 3) = '\0';
-            else {
-                char *ptr;
-                *(text + len - 4) = '\0';
-                ptr = strrchr(text, '/');
-                *(ptr + 1) = '\0';
-            }
-        } else if (len > 2 && !strcmp(text + len - 3, "/./"))
-            *(text + len - 2) = '\0';
-        gtk_file_selection_set_filename(filesel, text);
-        retv = TRUE;
-    }
-    g_free(text);
-    return retv;
-}
-
-static void filebrowser_add_files_classic(gchar ** files,
-                                          GtkFileSelection * filesel)
-{
-    int ctr = 0;
-    char *ptr;
-    Playlist *playlist = playlist_get_active();
-
-
-    while (files[ctr] != NULL) {
-        gchar *filename = g_filename_to_uri((const gchar *) files[ctr++], NULL, NULL);
-        playlist_add(playlist, filename);
-        g_free(filename);
-    }
-    hook_call("playlist update", playlist);
-
-    gtk_label_get(GTK_LABEL(GTK_BIN(filesel->history_pulldown)->child),
-                  &ptr);
-
-    /* This will give an extra slash if the current dir is the root. */
-    cfg.filesel_path = g_strconcat(ptr, "/", NULL);
-}
-
-static void
-filebrowser_ok_classic(GtkWidget * w, GtkWidget * filesel)
-{
-    gchar **files;
-
-    if (filebrowser_is_dir_classic(GTK_FILE_SELECTION(filesel)))
-        return;
-    files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
-    filebrowser_add_files_classic(files, GTK_FILE_SELECTION(filesel));
-    gtk_widget_destroy(filesel);
-}
-
-static void
-filebrowser_play_classic(GtkWidget * w, GtkWidget * filesel)
-{
-    gchar **files;
-
-    if (filebrowser_is_dir_classic
-        (GTK_FILE_SELECTION(GTK_FILE_SELECTION(filesel))))
-        return;
-    playlist_clear(playlist_get_active());
-    files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
-    filebrowser_add_files_classic(files, GTK_FILE_SELECTION(filesel));
-    gtk_widget_destroy(filesel);
-    playback_initiate();
-}
-
-static void
-filebrowser_add_selected_files_classic(GtkWidget * w, gpointer data)
-{
-    gchar **files;
-
-    GtkFileSelection *filesel = GTK_FILE_SELECTION(data);
-    files = gtk_file_selection_get_selections(filesel);
-
-    filebrowser_add_files_classic(files, filesel);
-    gtk_tree_selection_unselect_all(gtk_tree_view_get_selection
-                                    (GTK_TREE_VIEW(filesel->file_list)));
-
-    gtk_entry_set_text(GTK_ENTRY(filesel->selection_entry), "");
-}
-
-static void
-filebrowser_add_all_files_classic(GtkWidget * w, gpointer data)
-{
-    gchar **files;
-    GtkFileSelection *filesel;
-
-    filesel = data;
-    gtk_tree_selection_select_all(gtk_tree_view_get_selection
-                                  (GTK_TREE_VIEW(filesel->file_list)));
-    files = gtk_file_selection_get_selections(filesel);
-    filebrowser_add_files_classic(files, filesel);
-    gtk_tree_selection_unselect_all(gtk_tree_view_get_selection
-                                    (GTK_TREE_VIEW(filesel->file_list)));
-    gtk_entry_set_text(GTK_ENTRY(filesel->selection_entry), "");
-}
-
-static void
-run_filebrowser_classic(gboolean play_button, gboolean show)
-{
-    static GtkWidget *dialog;
-    GtkWidget *button_add_selected, *button_add_all, *button_close,
-              *button_add;
-    char *title;
-
-    if (!show) {
-        if(dialog) {
-            gtk_widget_hide(dialog);
-            return;
-        }
-        else
-            return;
-    }
-    else if (dialog) {
-            gtk_window_present(GTK_WINDOW(dialog));
-            return;
-    }
-
-    if (play_button)
-        title = _("Play files");
-    else
-        title = _("Load files");
-
-    dialog = gtk_file_selection_new(title);
-
-    gtk_file_selection_set_select_multiple
-        (GTK_FILE_SELECTION(dialog), TRUE);
-
-    if (cfg.filesel_path)
-        gtk_file_selection_set_filename(GTK_FILE_SELECTION(dialog),
-                                        cfg.filesel_path);
-
-    gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(dialog));
-    gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
-
-    gtk_widget_hide(GTK_FILE_SELECTION(dialog)->ok_button);
-    gtk_widget_destroy(GTK_FILE_SELECTION(dialog)->cancel_button);
-
-    /*
-     * The mnemonics are quite unorthodox, but that should guarantee they're unique in any locale
-     * plus kinda easy to use
-     */
-    button_add_selected =
-        gtk_dialog_add_button(GTK_DIALOG(dialog), "Add selected",
-                              GTK_RESPONSE_NONE);
-    gtk_button_set_use_underline(GTK_BUTTON(button_add_selected), TRUE);
-    g_signal_connect(G_OBJECT(button_add_selected), "clicked",
-                     G_CALLBACK(filebrowser_add_selected_files_classic), dialog);
-
-    button_add_all =
-        gtk_dialog_add_button(GTK_DIALOG(dialog), "Add all",
-                              GTK_RESPONSE_NONE);
-    gtk_button_set_use_underline(GTK_BUTTON(button_add_all), TRUE);
-    g_signal_connect(G_OBJECT(button_add_all), "clicked",
-                     G_CALLBACK(filebrowser_add_all_files_classic), dialog);
-
-    if (play_button) {
-        button_add =
-            gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_MEDIA_PLAY,
-                                  GTK_RESPONSE_NONE);
-        gtk_button_set_use_stock(GTK_BUTTON(button_add), TRUE);
-        g_signal_connect(G_OBJECT(button_add), "clicked",
-                         G_CALLBACK(filebrowser_play_classic), dialog);
-        g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(dialog)->ok_button),
-                         "clicked", G_CALLBACK(filebrowser_play_classic), dialog);
-    } else {
-        button_add =
-            gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_ADD,
-                                  GTK_RESPONSE_NONE);
-        gtk_button_set_use_stock(GTK_BUTTON(button_add), TRUE);
-        g_signal_connect(G_OBJECT(button_add), "clicked",
-                         G_CALLBACK(filebrowser_ok_classic), dialog);
-        g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(dialog)->ok_button),
-                         "clicked", G_CALLBACK(filebrowser_ok_classic), dialog);
-    }
-
-    button_close =
-        gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE,
-                              GTK_RESPONSE_NONE);
-    gtk_button_set_use_stock(GTK_BUTTON(button_close), TRUE);
-    g_signal_connect_swapped(G_OBJECT(button_close), "clicked",
-                             G_CALLBACK(gtk_widget_destroy),
-                             G_OBJECT(dialog));
-
-    gtk_widget_set_size_request(dialog, 600, 450);
-    gtk_widget_realize(dialog);
-
-    g_signal_connect(G_OBJECT
-                     (GTK_FILE_SELECTION(dialog)->history_pulldown),
-                     "changed", G_CALLBACK(filebrowser_entry_changed_classic),
-                     dialog);
-
-    g_signal_connect(G_OBJECT(dialog), "destroy",
-                     G_CALLBACK(gtk_widget_destroyed), &dialog);
-
-    filebrowser_changed_classic(GTK_FILE_SELECTION(dialog));
-
-    gtk_widget_show(dialog);
-}
-
-/*
  * run_filebrowser(gboolean play_button)
  *
  * Inputs:
@@ -467,24 +207,15 @@
  *
  * Outputs:
  *     - none
- *
- * Side Effects:
- *     - either a GTK1 or a GTK2 fileselector is launched
  */
 void
 run_filebrowser(gboolean play_button)
 {
-    if (!cfg.use_xmms_style_fileselector)
-        run_filebrowser_gtk2style(play_button, TRUE);
-    else
-        run_filebrowser_classic(play_button, TRUE);
+    run_filebrowser_gtk2style(play_button, TRUE);
 }
 
 void
 hide_filebrowser(void)
 {
-    if (!cfg.use_xmms_style_fileselector)
-        run_filebrowser_gtk2style(FALSE, FALSE);
-    else
-        run_filebrowser_classic(FALSE, FALSE);
+    run_filebrowser_gtk2style(FALSE, FALSE);
 }