[easytag/wip/application-window: 7/15] Move file search dialog to EtSearchDialog object



commit 7352fd2dc6662200107e4f0e02c6c2229061a24e
Author: David King <amigadave amigadave com>
Date:   Sat Dec 28 01:31:11 2013 +0000

    Move file search dialog to EtSearchDialog object

 Makefile.am              |    2 +
 src/application_window.c |   35 ++
 src/application_window.h |    2 +
 src/bar.c                |    2 +-
 src/misc.c               |  882 ------------------------------------------
 src/misc.h               |    4 -
 src/search_dialog.c      |  951 ++++++++++++++++++++++++++++++++++++++++++++++
 src/search_dialog.h      |   54 +++
 src/setting.c            |   16 +-
 src/setting.h            |    5 -
 10 files changed, 1049 insertions(+), 904 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5f26452..4549ee9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,6 +65,7 @@ easytag_SOURCES = \
        src/playlist_dialog.c \
        src/prefs.c \
        src/scan.c \
+       src/search_dialog.c \
        src/setting.c \
        src/vcedit.c \
        src/wavpack_header.c \
@@ -107,6 +108,7 @@ easytag_headers = \
        src/playlist_dialog.h \
        src/prefs.h \
        src/scan.h \
+       src/search_dialog.h \
        src/setting.h \
        src/ui_manager.h \
        src/vcedit.h \
diff --git a/src/application_window.c b/src/application_window.c
index cd1fd49..dc4bf14 100644
--- a/src/application_window.c
+++ b/src/application_window.c
@@ -32,6 +32,7 @@
 #include "misc.h"
 #include "picture.h"
 #include "playlist_dialog.h"
+#include "search_dialog.h"
 #include "scan.h"
 #include "setting.h"
 
@@ -47,6 +48,7 @@ struct _EtApplicationWindowPrivate
     GtkWidget *tag_area;
     GtkWidget *load_files_dialog;
     GtkWidget *playlist_dialog;
+    GtkWidget *search_dialog;
 
     /* Tag area labels. */
     GtkWidget *title_label;
@@ -1640,6 +1642,7 @@ et_application_window_finalize (GObject *object)
 
     g_clear_object (&priv->load_files_dialog);
     g_clear_object (&priv->playlist_dialog);
+    g_clear_object (&priv->search_dialog);
 
     G_OBJECT_CLASS (et_application_window_parent_class)->finalize (object);
 }
@@ -1659,6 +1662,7 @@ et_application_window_init (EtApplicationWindow *self)
 
     priv->load_files_dialog = NULL;
     priv->playlist_dialog = NULL;
+    priv->search_dialog = NULL;
 
     window = GTK_WINDOW (self);
 
@@ -1848,6 +1852,37 @@ et_application_window_show_load_files_dialog (G_GNUC_UNUSED GtkAction *action,
     }
 }
 
+GtkWidget *
+et_application_window_get_search_dialog (EtApplicationWindow *self)
+{
+    EtApplicationWindowPrivate *priv;
+
+    g_return_val_if_fail (self != NULL, NULL);
+
+    priv = et_application_window_get_instance_private (self);
+
+    return priv->search_dialog;
+}
+
+void
+et_application_window_show_search_dialog (G_GNUC_UNUSED GtkAction *action,
+                                          gpointer user_data)
+{
+    EtApplicationWindowPrivate *priv;
+    EtApplicationWindow *self = ET_APPLICATION_WINDOW (user_data);
+
+    priv = et_application_window_get_instance_private (self);
+
+    if (priv->search_dialog)
+    {
+        gtk_widget_show (priv->search_dialog);
+    }
+    else
+    {
+        priv->search_dialog = GTK_WIDGET (et_search_dialog_new ());
+    }
+}
+
 /*
  * Disable (FALSE) / Enable (TRUE) all user widgets in the tag area
  */
diff --git a/src/application_window.h b/src/application_window.h
index 9e69cd3..36771d1 100644
--- a/src/application_window.h
+++ b/src/application_window.h
@@ -55,6 +55,8 @@ GtkWidget * et_application_window_get_playlist_dialog (EtApplicationWindow *self
 void et_application_window_show_playlist_dialog (GtkAction *action, gpointer user_data);
 GtkWidget * et_application_window_get_load_files_dialog (EtApplicationWindow *self);
 void et_application_window_show_load_files_dialog (GtkAction *action, gpointer user_data);
+GtkWidget * et_application_window_get_search_dialog (EtApplicationWindow *self);
+void et_application_window_show_search_dialog (GtkAction *action, gpointer user_data);
 void et_application_window_hide_log_area (EtApplicationWindow *self);
 void et_application_window_show_log_area (EtApplicationWindow *self);
 
diff --git a/src/bar.c b/src/bar.c
index 941d342..dc20442 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -285,7 +285,7 @@ Create_UI (GtkWindow *window, GtkWidget **ppmenubar, GtkWidget **pptoolbar)
         { MENU_MISC,                NULL,                   _("_Miscellaneous"),                             
NULL,         NULL,                                 NULL },
         { AM_SEARCH_FILE, GTK_STOCK_FIND, _("_Find…"), "<Primary>F",
           _("Search filenames and tags"),
-          G_CALLBACK (Open_Search_File_Window) },
+          G_CALLBACK (et_application_window_show_search_dialog) },
         { AM_CDDB_SEARCH, GTK_STOCK_CDROM, _("CDD_B Search…"), "<Primary>B",
           _("CDDB search"), G_CALLBACK (Open_Cddb_Window) },
         { AM_FILENAME_FROM_TXT, GTK_STOCK_OPEN,
diff --git a/src/misc.c b/src/misc.c
index b0e27f4..e58cdb0 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -52,86 +52,9 @@ static const guint BOX_SPACING = 6;
 
 static GdkCursor *MouseCursor;
 
-/* Search file window. */
-static GtkWidget *SearchFileWindow = NULL;
-static GtkWidget *SearchStringCombo;
-static GtkListStore *SearchStringModel = NULL;
-static GtkWidget *SearchInFilename;
-static GtkWidget *SearchInTag;
-static GtkWidget *SearchCaseSensitive;
-static GtkWidget *SearchResultList;
-static GtkListStore *SearchResultListModel;
-static GtkWidget *SearchStatusBar;
-static guint SearchStatusBarContext;
-
-enum
-{
-    // Columns for titles
-    SEARCH_RESULT_FILENAME = 0,
-    SEARCH_RESULT_TITLE,
-    SEARCH_RESULT_ARTIST,
-    SEARCH_RESULT_ALBUM_ARTIST,
-    SEARCH_RESULT_ALBUM,
-    SEARCH_RESULT_DISC_NUMBER,
-    SEARCH_RESULT_YEAR,
-    SEARCH_RESULT_TRACK,
-    SEARCH_RESULT_GENRE,
-    SEARCH_RESULT_COMMENT,
-    SEARCH_RESULT_COMPOSER,
-    SEARCH_RESULT_ORIG_ARTIST,
-    SEARCH_RESULT_COPYRIGHT,
-    SEARCH_RESULT_URL,
-    SEARCH_RESULT_ENCODED_BY,
-
-    // Columns for pango style (normal/bold)
-    SEARCH_RESULT_FILENAME_WEIGHT,
-    SEARCH_RESULT_TITLE_WEIGHT,
-    SEARCH_RESULT_ARTIST_WEIGHT,
-    SEARCH_RESULT_ALBUM_ARTIST_WEIGHT,
-    SEARCH_RESULT_ALBUM_WEIGHT,
-    SEARCH_RESULT_DISC_NUMBER_WEIGHT,
-    SEARCH_RESULT_YEAR_WEIGHT,
-    SEARCH_RESULT_TRACK_WEIGHT,
-    SEARCH_RESULT_GENRE_WEIGHT,
-    SEARCH_RESULT_COMMENT_WEIGHT,
-    SEARCH_RESULT_COMPOSER_WEIGHT,
-    SEARCH_RESULT_ORIG_ARTIST_WEIGHT,
-    SEARCH_RESULT_COPYRIGHT_WEIGHT,
-    SEARCH_RESULT_URL_WEIGHT,
-    SEARCH_RESULT_ENCODED_BY_WEIGHT,
-
-    // Columns for color (normal/red)
-    SEARCH_RESULT_FILENAME_FOREGROUND,
-    SEARCH_RESULT_TITLE_FOREGROUND,
-    SEARCH_RESULT_ARTIST_FOREGROUND,
-    SEARCH_RESULT_ALBUM_ARTIST_FOREGROUND,
-    SEARCH_RESULT_ALBUM_FOREGROUND,
-    SEARCH_RESULT_DISC_NUMBER_FOREGROUND,
-    SEARCH_RESULT_YEAR_FOREGROUND,
-    SEARCH_RESULT_TRACK_FOREGROUND,
-    SEARCH_RESULT_GENRE_FOREGROUND,
-    SEARCH_RESULT_COMMENT_FOREGROUND,
-    SEARCH_RESULT_COMPOSER_FOREGROUND,
-    SEARCH_RESULT_ORIG_ARTIST_FOREGROUND,
-    SEARCH_RESULT_COPYRIGHT_FOREGROUND,
-    SEARCH_RESULT_URL_FOREGROUND,
-    SEARCH_RESULT_ENCODED_BY_FOREGROUND,
-
-    SEARCH_RESULT_POINTER,
-    SEARCH_COLUMN_COUNT
-};
-
 /**************
  * Prototypes *
  **************/
-void Open_Search_File_Window          (void);
-static void Destroy_Search_File_Window (void);
-static void Search_File (GtkWidget *search_button);
-static void Add_Row_To_Search_Result_List (ET_File *ETFile,
-                                           const gchar *string_to_search);
-static void Search_Result_List_Row_Selected (GtkTreeSelection* selection,
-                                             gpointer data);
-
 static void Create_Xpm_Icon_Factory (const char **xpm_data,
                                      const char *name_in_factory);
 
@@ -1038,811 +961,6 @@ et_get_file_size (const gchar *filename)
     return size;
 }
 
-/*****************************
- * Searching files functions *
- *****************************/
-/*
- * The window to search keywords in the list of files.
- */
-void Open_Search_File_Window (void)
-{
-    GtkWidget *VBox;
-    GtkWidget *Table;
-    GtkWidget *Label;
-    GtkWidget *Button;
-    GtkWidget *Separator;
-    GtkWidget *ScrollWindow;
-    GtkTreeViewColumn* column;
-    GtkCellRenderer* renderer;
-    gchar *SearchResultList_Titles[] = { N_("Filename"),
-                                         N_("Title"),
-                                         N_("Artist"),
-                                         N_("Album Artist"),
-                                         N_("Album"),
-                                         N_("CD"),
-                                         N_("Year"),
-                                         N_("Track"),
-                                         N_("Genre"),
-                                         N_("Comment"),
-                                         N_("Composer"),
-                                         N_("Original Artist"),
-                                         N_("Copyright"),
-                                         N_("URL"),
-                                         N_("Encoded By")
-                                       };
-
-
-    if (SearchFileWindow != NULL)
-    {
-        gtk_window_present(GTK_WINDOW(SearchFileWindow));
-        return;
-    }
-
-    SearchFileWindow = gtk_dialog_new ();
-    gtk_window_set_transient_for (GTK_WINDOW (SearchFileWindow),
-                                  GTK_WINDOW (MainWindow));
-    gtk_window_set_title (GTK_WINDOW (SearchFileWindow), _("Find Files"));
-    g_signal_connect(G_OBJECT(SearchFileWindow),"destroy", G_CALLBACK(Destroy_Search_File_Window),NULL);
-    g_signal_connect(G_OBJECT(SearchFileWindow),"delete_event", G_CALLBACK(Destroy_Search_File_Window),NULL);
-    gtk_window_set_default_size(GTK_WINDOW(SearchFileWindow),SEARCH_WINDOW_WIDTH,SEARCH_WINDOW_HEIGHT);
-
-    VBox = gtk_dialog_get_content_area (GTK_DIALOG (SearchFileWindow));
-    gtk_box_set_spacing (GTK_BOX (VBox), BOX_SPACING);
-    gtk_container_set_border_width (GTK_CONTAINER (SearchFileWindow),
-                                    BOX_SPACING);
-
-    Table = et_grid_new (3, 6);
-    gtk_container_add (GTK_CONTAINER (VBox), Table);
-    gtk_grid_set_row_spacing (GTK_GRID (Table), BOX_SPACING);
-    gtk_grid_set_column_spacing (GTK_GRID (Table), BOX_SPACING);
-
-    // Words to search
-    if (!SearchStringModel)
-        SearchStringModel = gtk_list_store_new(MISC_COMBO_COUNT, G_TYPE_STRING);
-    else
-        gtk_list_store_clear(SearchStringModel);
-
-    Label = gtk_label_new(_("Search:"));
-    gtk_misc_set_alignment(GTK_MISC(Label),1.0,0.5);
-    gtk_grid_attach (GTK_GRID (Table), Label, 0, 0, 1, 1);
-    SearchStringCombo = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(SearchStringModel));
-    gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(SearchStringCombo),MISC_COMBO_TEXT);
-    gtk_widget_set_size_request(GTK_WIDGET(SearchStringCombo),200,-1);
-    gtk_grid_attach (GTK_GRID (Table), SearchStringCombo, 1, 0, 4, 1);
-    // History List
-    Load_Search_File_List(SearchStringModel, MISC_COMBO_TEXT);
-    gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(SearchStringCombo))),"");
-    gtk_widget_set_tooltip_text(GTK_WIDGET(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(SearchStringCombo)))),
-        _("Type the word to search into files. Or type nothing to display all files."));
-
-    // Set content of the clipboard if available
-    gtk_editable_paste_clipboard(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(SearchStringCombo))));
-
-    // Where...
-    Label = gtk_label_new(_("In:"));
-    gtk_misc_set_alignment(GTK_MISC(Label),1.0,0.5);
-    gtk_grid_attach (GTK_GRID (Table), Label, 0, 1, 1, 1);
-    /* Translators: This option is for the previous 'in' option. For instance,
-     * translate this as "Search" "In:" "the Filename". */
-    SearchInFilename = gtk_check_button_new_with_label(_("the Filename"));
-    /* Translators: This option is for the previous 'in' option. For instance,
-     * translate this as "Search" "In:" "the Tag".
-     * Note: label changed to "the Tag" (to be the only one) to fix a Hungarian
-     * grammatical problem (which uses one word to say "in the tag" like here)
-     */
-    SearchInTag = gtk_check_button_new_with_label(_("the Tag"));
-    gtk_grid_attach (GTK_GRID (Table), SearchInFilename, 1, 1, 1, 1);
-    gtk_grid_attach (GTK_GRID (Table), SearchInTag, 2, 1, 1, 1);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(SearchInFilename),SEARCH_IN_FILENAME);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(SearchInTag),SEARCH_IN_TAG);
-
-    Separator = gtk_separator_new(GTK_ORIENTATION_VERTICAL);
-    et_grid_attach_full (GTK_GRID (Table), Separator, 3, 1, 1, 1, FALSE, FALSE,
-                         4, 0);
-
-    // Property of the search
-    SearchCaseSensitive = gtk_check_button_new_with_label(_("Case sensitive"));
-    et_grid_attach_full (GTK_GRID (Table), SearchCaseSensitive, 4, 1, 1, 1,
-                         TRUE, FALSE, 0, 0);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(SearchCaseSensitive),SEARCH_CASE_SENSITIVE);
-
-    // Results list
-    ScrollWindow = gtk_scrolled_window_new(NULL,NULL);
-    
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ScrollWindow),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
-    gtk_widget_set_size_request(GTK_WIDGET(ScrollWindow), -1, 130);
-    et_grid_attach_full (GTK_GRID (Table), ScrollWindow, 0, 2, 6, 1, TRUE,
-                         TRUE, 0, 0);
-
-    SearchResultListModel = gtk_list_store_new(SEARCH_COLUMN_COUNT,
-                                               G_TYPE_STRING, /* Filename */
-                                               G_TYPE_STRING, /* Title */
-                                               G_TYPE_STRING, /* Artist */
-                                               G_TYPE_STRING, /* Album Artist */
-                                                                                          G_TYPE_STRING, /* 
Album */
-                                               G_TYPE_STRING, /* Disc Number */
-                                               G_TYPE_STRING, /* Year */
-                                               G_TYPE_STRING, /* Track + Track Total */
-                                               G_TYPE_STRING, /* Genre */
-                                               G_TYPE_STRING, /* Comment */
-                                               G_TYPE_STRING, /* Composer */
-                                               G_TYPE_STRING, /* Orig. Artist */
-                                               G_TYPE_STRING, /* Copyright */
-                                               G_TYPE_STRING, /* URL */
-                                               G_TYPE_STRING, /* Encoded by */
-
-                                               G_TYPE_INT, /* Font Weight for Filename */
-                                               G_TYPE_INT, /* Font Weight for Title */
-                                               G_TYPE_INT, /* Font Weight for Artist */
-                                               G_TYPE_INT, /* Font Weight for Album Artist */
-                                                                                          G_TYPE_INT, /* 
Font Weight for Album */
-                                               G_TYPE_INT, /* Font Weight for Disc Number */
-                                               G_TYPE_INT, /* Font Weight for Year */
-                                               G_TYPE_INT, /* Font Weight for Track + Track Total */
-                                               G_TYPE_INT, /* Font Weight for Genre */
-                                               G_TYPE_INT, /* Font Weight for Comment */
-                                               G_TYPE_INT, /* Font Weight for Composer */
-                                               G_TYPE_INT, /* Font Weight for Orig. Artist */
-                                               G_TYPE_INT, /* Font Weight for Copyright */
-                                               G_TYPE_INT, /* Font Weight for URL */
-                                               G_TYPE_INT, /* Font Weight for Encoded by */
-
-                                               GDK_TYPE_COLOR, /* Color Weight for Filename */
-                                               GDK_TYPE_COLOR, /* Color Weight for Title */
-                                               GDK_TYPE_COLOR, /* Color Weight for Artist */
-                                               GDK_TYPE_COLOR, /* Color Weight for Album Artist */
-                                                                                          GDK_TYPE_COLOR, /* 
Color Weight for Album */
-                                               GDK_TYPE_COLOR, /* Color Weight for Disc Number */
-                                               GDK_TYPE_COLOR, /* Color Weight for Year */
-                                               GDK_TYPE_COLOR, /* Color Weight for Track + Track Total */
-                                               GDK_TYPE_COLOR, /* Color Weight for Genre */
-                                               GDK_TYPE_COLOR, /* Color Weight for Comment */
-                                               GDK_TYPE_COLOR, /* Color Weight for Composer */
-                                               GDK_TYPE_COLOR, /* Color Weight for Orig. Artist */
-                                               GDK_TYPE_COLOR, /* Color Weight for Copyright */
-                                               GDK_TYPE_COLOR, /* Color Weight for URL */
-                                               GDK_TYPE_COLOR, /* Color Weight for Encoded by */
-
-                                               G_TYPE_POINTER);
-    SearchResultList = gtk_tree_view_new_with_model(GTK_TREE_MODEL(SearchResultListModel));
-    g_object_unref (SearchResultListModel);
-
-    renderer = gtk_cell_renderer_text_new(); /* Filename */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[0]), renderer,
-                                                      "text",           SEARCH_RESULT_FILENAME,
-                                                      "weight",         SEARCH_RESULT_FILENAME_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_FILENAME_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new(); /* Title */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[1]), renderer,
-                                                      "text",           SEARCH_RESULT_TITLE,
-                                                      "weight",         SEARCH_RESULT_TITLE_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_TITLE_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new(); /* Artist */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[2]), renderer,
-                                                      "text",           SEARCH_RESULT_ARTIST,
-                                                      "weight",         SEARCH_RESULT_ARTIST_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_ARTIST_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-       renderer = gtk_cell_renderer_text_new(); /* Album Artist */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[3]), renderer,
-                                                      "text",           SEARCH_RESULT_ALBUM_ARTIST,
-                                                      "weight",         SEARCH_RESULT_ALBUM_ARTIST_WEIGHT,
-                                                      "foreground-gdk", 
SEARCH_RESULT_ALBUM_ARTIST_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new(); /* Album */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[4]), renderer,
-                                                      "text",           SEARCH_RESULT_ALBUM,
-                                                      "weight",         SEARCH_RESULT_ALBUM_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_ALBUM_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new(); /* Disc Number */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[5]), renderer,
-                                                      "text",           SEARCH_RESULT_DISC_NUMBER,
-                                                      "weight",         SEARCH_RESULT_DISC_NUMBER_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_DISC_NUMBER_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new(); /* Year */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[6]), renderer,
-                                                      "text",           SEARCH_RESULT_YEAR,
-                                                      "weight",         SEARCH_RESULT_YEAR_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_YEAR_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new(); /* Track */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[7]), renderer,
-                                                      "text",           SEARCH_RESULT_TRACK,
-                                                      "weight",         SEARCH_RESULT_TRACK_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_TRACK_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new(); /* Genre */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[8]), renderer,
-                                                      "text",           SEARCH_RESULT_GENRE,
-                                                      "weight",         SEARCH_RESULT_GENRE_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_GENRE_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new(); /* Comment */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[9]), renderer,
-                                                      "text",           SEARCH_RESULT_COMMENT,
-                                                      "weight",         SEARCH_RESULT_COMMENT_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_COMMENT_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new(); /* Composer */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[10]), renderer,
-                                                      "text",           SEARCH_RESULT_COMPOSER,
-                                                      "weight",         SEARCH_RESULT_COMPOSER_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_COMPOSER_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new(); /* Orig. Artist */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[11]), renderer,
-                                                      "text",           SEARCH_RESULT_ORIG_ARTIST,
-                                                      "weight",         SEARCH_RESULT_ORIG_ARTIST_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_ORIG_ARTIST_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new(); /* Copyright */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[12]), renderer,
-                                                      "text",           SEARCH_RESULT_COPYRIGHT,
-                                                      "weight",         SEARCH_RESULT_COPYRIGHT_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_COPYRIGHT_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new(); /* URL */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[13]), renderer,
-                                                      "text",           SEARCH_RESULT_URL,
-                                                      "weight",         SEARCH_RESULT_URL_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_URL_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new(); /* Encoded by */
-    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[14]), renderer,
-                                                      "text",           SEARCH_RESULT_ENCODED_BY,
-                                                      "weight",         SEARCH_RESULT_ENCODED_BY_WEIGHT,
-                                                      "foreground-gdk", SEARCH_RESULT_ENCODED_BY_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(SearchResultList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    gtk_container_add(GTK_CONTAINER(ScrollWindow),SearchResultList);
-    gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(SearchResultList)),
-            GTK_SELECTION_MULTIPLE);
-    //gtk_tree_view_columns_autosize(GTK_TREE_VIEW(SearchResultList)); // Doesn't seem to work...
-    gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(SearchResultList), FALSE);
-    gtk_widget_set_sensitive(GTK_WIDGET(SearchResultList), FALSE);
-    g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(SearchResultList))),
-            "changed", G_CALLBACK(Search_Result_List_Row_Selected), NULL);
-
-    // Button to run the search
-    Button = gtk_button_new_from_stock(GTK_STOCK_FIND);
-    gtk_grid_attach (GTK_GRID (Table), Button, 5, 0, 1, 1);
-    gtk_widget_set_can_default(Button,TRUE);
-    gtk_widget_grab_default(Button);
-    g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(Search_File),NULL);
-    g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(SearchStringCombo))),"activate", 
G_CALLBACK(Search_File),NULL);
-
-    // Button to cancel
-    Button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-    gtk_grid_attach (GTK_GRID (Table), Button, 5, 1, 1, 1);
-    g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(Destroy_Search_File_Window),NULL);
-
-    // Status bar
-    SearchStatusBar = gtk_statusbar_new();
-    /*gtk_grid_attach (GTK_GRID (Table), SearchStatusBar, 0, 3, 5, 1);*/
-    gtk_box_pack_start(GTK_BOX(VBox),SearchStatusBar,FALSE,TRUE,0);
-    SearchStatusBarContext = gtk_statusbar_get_context_id(GTK_STATUSBAR(SearchStatusBar),"Messages");
-    gtk_statusbar_push(GTK_STATUSBAR(SearchStatusBar),SearchStatusBarContext,_("Ready to search…"));
-
-    gtk_widget_show_all(SearchFileWindow);
-
-    if (SET_SEARCH_WINDOW_POSITION)
-        gtk_window_move(GTK_WINDOW(SearchFileWindow), SEARCH_WINDOW_X, SEARCH_WINDOW_Y);
-}
-
-static void
-Destroy_Search_File_Window (void)
-{
-    if (SearchFileWindow)
-    {
-        /* Save combobox history lists before exit */
-        Save_Search_File_List(SearchStringModel, MISC_COMBO_TEXT);
-
-        Search_File_Window_Apply_Changes();
-
-        gtk_widget_destroy(SearchFileWindow);
-        SearchFileWindow = NULL;
-    }
-}
-
-/*
- * For the configuration file...
- */
-void Search_File_Window_Apply_Changes (void)
-{
-    if (SearchFileWindow)
-    {
-        gint x, y, width, height;
-        GdkWindow *window;
-
-        window = gtk_widget_get_window(SearchFileWindow);
-
-        if ( window && gdk_window_is_visible(window) && 
gdk_window_get_state(window)!=GDK_WINDOW_STATE_MAXIMIZED )
-        {
-            // Position and Origin of the scanner window
-            gdk_window_get_root_origin(window,&x,&y);
-            SEARCH_WINDOW_X = x;
-            SEARCH_WINDOW_Y = y;
-            width = gdk_window_get_width(window);
-            height = gdk_window_get_height(window);
-            SEARCH_WINDOW_WIDTH  = width;
-            SEARCH_WINDOW_HEIGHT = height;
-        }
-
-        SEARCH_IN_FILENAME    = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(SearchInFilename));
-        SEARCH_IN_TAG         = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(SearchInTag));
-        SEARCH_CASE_SENSITIVE = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(SearchCaseSensitive));
-    }
-}
-
-/*
- * This function and the one below could do with improving
- * as we are looking up tag data twice (once when searching, once when adding to list)
- */
-static void
-Search_File (GtkWidget *search_button)
-{
-    const gchar *string_to_search = NULL;
-    GList *l;
-    ET_File *ETFile;
-    gchar *msg;
-    gchar *temp = NULL;
-    gchar *title2, *artist2, *album_artist2, *album2, *disc_number2,
-          *disc_total2, *year2, *track2, *track_total2, *genre2, *comment2,
-          *composer2, *orig_artist2, *copyright2, *url2, *encoded_by2,
-          *string_to_search2;
-    gint resultCount = 0;
-
-
-    if (!SearchStringCombo || !SearchInFilename || !SearchInTag || !SearchResultList)
-        return;
-
-    string_to_search = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(SearchStringCombo))));
-    if (!string_to_search)
-        return;
-
-    Add_String_To_Combo_List(SearchStringModel, string_to_search);
-
-    gtk_widget_set_sensitive(GTK_WIDGET(search_button),FALSE);
-    gtk_list_store_clear(SearchResultListModel);
-    gtk_statusbar_push(GTK_STATUSBAR(SearchStatusBar),SearchStatusBarContext,"");
-
-    for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
-    {
-        ETFile = (ET_File *)l->data;
-
-        // Search in the filename
-        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(SearchInFilename)))
-        {
-            gchar *filename_utf8 = ((File_Name *)ETFile->FileNameNew->data)->value_utf8;
-            gchar *basename_utf8;
-
-            // To search without case sensivity
-            if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(SearchCaseSensitive)))
-            {
-                temp = g_path_get_basename(filename_utf8);
-                basename_utf8 = g_utf8_casefold(temp, -1);
-                g_free(temp);
-                string_to_search2 = g_utf8_casefold(string_to_search, -1);
-            } else
-            {
-                basename_utf8 = g_path_get_basename(filename_utf8);
-                string_to_search2 = g_strdup(string_to_search);
-            }
-
-            if ( basename_utf8 && strstr(basename_utf8,string_to_search2) )
-            {
-                Add_Row_To_Search_Result_List(ETFile, string_to_search2);
-                g_free(basename_utf8);
-                g_free(string_to_search2);
-                continue;
-            }
-            g_free(basename_utf8);
-            g_free(string_to_search2);
-        }
-
-        // Search in the tag
-        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(SearchInTag)))
-        {
-            File_Tag *FileTag   = (File_Tag *)ETFile->FileTag->data;
-
-            // To search with or without case sensivity
-            if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(SearchCaseSensitive)))
-            {
-                // To search without case sensivity...
-                // Duplicate and convert the strings into UTF-8 in loxer case
-                if (FileTag->title)       title2       = g_utf8_casefold(FileTag->title, -1);        else 
title2       = NULL;
-                if (FileTag->artist)      artist2      = g_utf8_casefold(FileTag->artist, -1);       else 
artist2      = NULL;
-                if (FileTag->album_artist) album_artist2 = g_utf8_casefold(FileTag->album_artist, -1); else 
album_artist2= NULL;
-                if (FileTag->album)       album2       = g_utf8_casefold(FileTag->album, -1);        else 
album2       = NULL;
-                if (FileTag->disc_number) disc_number2 = g_utf8_casefold(FileTag->disc_number, -1);  else 
disc_number2 = NULL;
-                if (FileTag->disc_total)
-                {
-                    disc_total2 = g_utf8_casefold (FileTag->disc_total, -1);
-                }
-                else
-                {
-                    disc_total2 = NULL;
-                }
-                if (FileTag->year)        year2        = g_utf8_casefold(FileTag->year, -1);         else 
year2        = NULL;
-                if (FileTag->track)       track2       = g_utf8_casefold(FileTag->track, -1);        else 
track2       = NULL;
-                if (FileTag->track_total) track_total2 = g_utf8_casefold(FileTag->track_total, -1);  else 
track_total2 = NULL;
-                if (FileTag->genre)       genre2       = g_utf8_casefold(FileTag->genre, -1);        else 
genre2       = NULL;
-                if (FileTag->comment)     comment2     = g_utf8_casefold(FileTag->comment, -1);      else 
comment2     = NULL;
-                if (FileTag->composer)    composer2    = g_utf8_casefold(FileTag->composer, -1);     else 
composer2    = NULL;
-                if (FileTag->orig_artist) orig_artist2 = g_utf8_casefold(FileTag->orig_artist, -1);  else 
orig_artist2 = NULL;
-                if (FileTag->copyright)   copyright2   = g_utf8_casefold(FileTag->copyright, -1);    else 
copyright2   = NULL;
-                if (FileTag->url)         url2         = g_utf8_casefold(FileTag->url, -1);          else 
url2         = NULL;
-                if (FileTag->encoded_by)  encoded_by2  = g_utf8_casefold(FileTag->encoded_by, -1);   else 
encoded_by2  = NULL;
-                string_to_search2 = g_utf8_strdown(string_to_search, -1);
-            }else
-            {
-                // To search with case sensivity...
-                // Duplicate and convert the strings into UTF-8
-                title2       = g_strdup(FileTag->title);
-                artist2      = g_strdup(FileTag->artist);
-                album_artist2= g_strdup(FileTag->album_artist);
-                album2       = g_strdup(FileTag->album);
-                disc_number2 = g_strdup(FileTag->disc_number);
-                disc_total2 = g_strdup (FileTag->disc_total);
-                year2        = g_strdup(FileTag->year);
-                track2       = g_strdup(FileTag->track);
-                track_total2 = g_strdup(FileTag->track_total);
-                genre2       = g_strdup(FileTag->genre);
-                comment2     = g_strdup(FileTag->comment);
-                composer2    = g_strdup(FileTag->composer);
-                orig_artist2 = g_strdup(FileTag->orig_artist);
-                copyright2   = g_strdup(FileTag->copyright);
-                url2         = g_strdup(FileTag->url);
-                encoded_by2  = g_strdup(FileTag->encoded_by);
-                string_to_search2 = g_strdup(string_to_search);
-            }
-
-            // FIX ME : should use UTF-8 functions?
-            if ( (title2       && strstr(title2,       string_to_search2) )
-             ||  (artist2      && strstr(artist2,      string_to_search2) )
-             ||  (album_artist2 && strstr(album_artist2,string_to_search2) )
-             ||  (album2       && strstr(album2,       string_to_search2) )
-             ||  (disc_number2 && strstr(disc_number2, string_to_search2) )
-             ||  (disc_total2 && strstr (disc_total2, string_to_search2))
-             ||  (year2        && strstr(year2,        string_to_search2) )
-             ||  (track2       && strstr(track2,       string_to_search2) )
-             ||  (track_total2 && strstr(track_total2, string_to_search2) )
-             ||  (genre2       && strstr(genre2,       string_to_search2) )
-             ||  (comment2     && strstr(comment2,     string_to_search2) )
-             ||  (composer2    && strstr(composer2,    string_to_search2) )
-             ||  (orig_artist2 && strstr(orig_artist2, string_to_search2) )
-             ||  (copyright2   && strstr(copyright2,   string_to_search2) )
-             ||  (url2         && strstr(url2,         string_to_search2) )
-             ||  (encoded_by2  && strstr(encoded_by2,  string_to_search2) ) )
-            {
-                Add_Row_To_Search_Result_List(ETFile, string_to_search);
-            }
-            g_free(title2);
-            g_free(artist2);
-            g_free(album_artist2);
-            g_free(album2);
-            g_free(disc_number2);
-            g_free (disc_total2);
-            g_free(year2);
-            g_free(track2);
-            g_free(track_total2);
-            g_free(genre2);
-            g_free(comment2);
-            g_free(composer2);
-            g_free(orig_artist2);
-            g_free(copyright2);
-            g_free(url2);
-            g_free(encoded_by2);
-            g_free(string_to_search2);
-        }
-    }
-
-    gtk_widget_set_sensitive(GTK_WIDGET(search_button),TRUE);
-
-    // Display the number of files in the statusbar
-    resultCount = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(SearchResultListModel), NULL);
-    msg = g_strdup_printf (ngettext ("Found one file", "Found %d files",
-                           resultCount), resultCount);
-    gtk_statusbar_push(GTK_STATUSBAR(SearchStatusBar),SearchStatusBarContext,msg);
-    g_free(msg);
-
-    // Disable result list if no row inserted
-    if (resultCount > 0 )
-    {
-        gtk_widget_set_sensitive(GTK_WIDGET(SearchResultList), TRUE);
-    } else
-    {
-        gtk_widget_set_sensitive(GTK_WIDGET(SearchResultList), FALSE);
-    }
-}
-
-static void
-Add_Row_To_Search_Result_List (ET_File *ETFile, const gchar *string_to_search)
-{
-    gchar *SearchResultList_Text[15]; // Because : 15 columns to display
-    gint SearchResultList_Weight[15] = {PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
-                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
-                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
-                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
-                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
-                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
-                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
-                                        PANGO_WEIGHT_NORMAL};
-    GdkColor *SearchResultList_Color[15] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                                            NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                                            NULL};
-    gchar *track, *track_total;
-    gchar *disc_number, *disc_total;
-    gboolean case_sensitive;
-    gint column;
-
-    if (!ETFile || !string_to_search)
-        return;
-
-    case_sensitive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(SearchCaseSensitive));
-
-    // Filename
-    SearchResultList_Text[SEARCH_RESULT_FILENAME]    = g_path_get_basename( ((File_Name 
*)ETFile->FileNameNew->data)->value_utf8 );
-    // Title
-    SearchResultList_Text[SEARCH_RESULT_TITLE]       = g_strdup(((File_Tag *)ETFile->FileTag->data)->title);
-    // Artist
-    SearchResultList_Text[SEARCH_RESULT_ARTIST]      = g_strdup(((File_Tag *)ETFile->FileTag->data)->artist);
-    // Album Artist
-    SearchResultList_Text[SEARCH_RESULT_ALBUM_ARTIST]= g_strdup(((File_Tag 
*)ETFile->FileTag->data)->album_artist);
-    // Album
-    SearchResultList_Text[SEARCH_RESULT_ALBUM]       = g_strdup(((File_Tag *)ETFile->FileTag->data)->album);
-    // Year
-    SearchResultList_Text[SEARCH_RESULT_YEAR]        = g_strdup(((File_Tag *)ETFile->FileTag->data)->year);
-    //Genre
-    SearchResultList_Text[SEARCH_RESULT_GENRE]       = g_strdup(((File_Tag *)ETFile->FileTag->data)->genre);
-    // Comment
-    SearchResultList_Text[SEARCH_RESULT_COMMENT]     = g_strdup(((File_Tag 
*)ETFile->FileTag->data)->comment);
-    // Composer
-    SearchResultList_Text[SEARCH_RESULT_COMPOSER]    = g_strdup(((File_Tag 
*)ETFile->FileTag->data)->composer);
-    // Orig. Artist
-    SearchResultList_Text[SEARCH_RESULT_ORIG_ARTIST] = g_strdup(((File_Tag 
*)ETFile->FileTag->data)->orig_artist);
-    // Copyright
-    SearchResultList_Text[SEARCH_RESULT_COPYRIGHT]   = g_strdup(((File_Tag 
*)ETFile->FileTag->data)->copyright);
-    // URL
-    SearchResultList_Text[SEARCH_RESULT_URL]         = g_strdup(((File_Tag *)ETFile->FileTag->data)->url);
-    // Encoded by
-    SearchResultList_Text[SEARCH_RESULT_ENCODED_BY]  = g_strdup(((File_Tag 
*)ETFile->FileTag->data)->encoded_by);
-
-    /* Disc Number. */
-    disc_number = ((File_Tag *)ETFile->FileTag->data)->disc_number;
-    disc_total = ((File_Tag *)ETFile->FileTag->data)->disc_total;
-
-    if (disc_number)
-    {
-        if (disc_total)
-        {
-            SearchResultList_Text[SEARCH_RESULT_DISC_NUMBER] = g_strconcat (disc_number, "/", disc_total, 
NULL);
-        }
-        else
-        {
-            SearchResultList_Text[SEARCH_RESULT_DISC_NUMBER] = g_strdup (disc_number);
-        }
-    }
-    else
-    {
-        SearchResultList_Text[SEARCH_RESULT_DISC_NUMBER] = NULL;
-    }
-
-    // Track
-    track       = ((File_Tag *)ETFile->FileTag->data)->track;
-    track_total = ((File_Tag *)ETFile->FileTag->data)->track_total;
-    if (track)
-    {
-        if (track_total)
-            SearchResultList_Text[SEARCH_RESULT_TRACK] = g_strconcat(track,"/",track_total,NULL);
-        else
-            SearchResultList_Text[SEARCH_RESULT_TRACK] = g_strdup(track);
-    } else
-    {
-        SearchResultList_Text[SEARCH_RESULT_TRACK] = NULL;
-    }
-
-
-    // Highlight the keywords in the result list
-    // Don't display files to red if the searched string is '' (to display all files)
-    for (column=0;column<14;column++)
-    {
-        if (case_sensitive)
-        {
-            if ( SearchResultList_Text[column] && strlen(string_to_search) && 
strstr(SearchResultList_Text[column],string_to_search) )
-            {
-                if (CHANGED_FILES_DISPLAYED_TO_BOLD)
-                    SearchResultList_Weight[column] = PANGO_WEIGHT_BOLD;
-                else
-                    SearchResultList_Color[column] = &RED;
-            }
-
-        } else
-        {
-            // Search wasn't case sensitive
-            gchar *list_text = NULL;
-            gchar *string_to_search2 = g_utf8_casefold(string_to_search, -1);
-
-            if (!SearchResultList_Text[column])
-            {
-                g_free(string_to_search2);
-                continue;
-            }
-
-            list_text = g_utf8_casefold(SearchResultList_Text[column], -1);
-
-            if ( list_text && strlen(string_to_search2) && strstr(list_text,string_to_search2) )
-            {
-                if (CHANGED_FILES_DISPLAYED_TO_BOLD)
-                    SearchResultList_Weight[column] = PANGO_WEIGHT_BOLD;
-                else
-                    SearchResultList_Color[column] = &RED;
-            }
-
-            g_free(list_text);
-            g_free(string_to_search2);
-        }
-    }
-
-    // Load the row in the list
-    gtk_list_store_insert_with_values (SearchResultListModel, NULL, G_MAXINT,
-                       SEARCH_RESULT_FILENAME,    SearchResultList_Text[SEARCH_RESULT_FILENAME],
-                       SEARCH_RESULT_TITLE,       SearchResultList_Text[SEARCH_RESULT_TITLE],
-                       SEARCH_RESULT_ARTIST,      SearchResultList_Text[SEARCH_RESULT_ARTIST],
-                       SEARCH_RESULT_ALBUM_ARTIST,SearchResultList_Text[SEARCH_RESULT_ALBUM_ARTIST],
-                       SEARCH_RESULT_ALBUM,       SearchResultList_Text[SEARCH_RESULT_ALBUM],
-                       SEARCH_RESULT_DISC_NUMBER, SearchResultList_Text[SEARCH_RESULT_DISC_NUMBER],
-                       SEARCH_RESULT_YEAR,        SearchResultList_Text[SEARCH_RESULT_YEAR],
-                       SEARCH_RESULT_TRACK,       SearchResultList_Text[SEARCH_RESULT_TRACK],
-                       SEARCH_RESULT_GENRE,       SearchResultList_Text[SEARCH_RESULT_GENRE],
-                       SEARCH_RESULT_COMMENT,     SearchResultList_Text[SEARCH_RESULT_COMMENT],
-                       SEARCH_RESULT_COMPOSER,    SearchResultList_Text[SEARCH_RESULT_COMPOSER],
-                       SEARCH_RESULT_ORIG_ARTIST, SearchResultList_Text[SEARCH_RESULT_ORIG_ARTIST],
-                       SEARCH_RESULT_COPYRIGHT,   SearchResultList_Text[SEARCH_RESULT_COPYRIGHT],
-                       SEARCH_RESULT_URL,         SearchResultList_Text[SEARCH_RESULT_URL],
-                       SEARCH_RESULT_ENCODED_BY,  SearchResultList_Text[SEARCH_RESULT_ENCODED_BY],
-
-                       SEARCH_RESULT_FILENAME_WEIGHT,    SearchResultList_Weight[SEARCH_RESULT_FILENAME],
-                       SEARCH_RESULT_TITLE_WEIGHT,       SearchResultList_Weight[SEARCH_RESULT_TITLE],
-                       SEARCH_RESULT_ARTIST_WEIGHT,      SearchResultList_Weight[SEARCH_RESULT_ARTIST],
-                       SEARCH_RESULT_ALBUM_ARTIST_WEIGHT, 
SearchResultList_Weight[SEARCH_RESULT_ALBUM_ARTIST],
-                      SEARCH_RESULT_ALBUM_WEIGHT,       SearchResultList_Weight[SEARCH_RESULT_ALBUM],
-                       SEARCH_RESULT_DISC_NUMBER_WEIGHT, SearchResultList_Weight[SEARCH_RESULT_DISC_NUMBER],
-                       SEARCH_RESULT_YEAR_WEIGHT,        SearchResultList_Weight[SEARCH_RESULT_YEAR],
-                       SEARCH_RESULT_TRACK_WEIGHT,       SearchResultList_Weight[SEARCH_RESULT_TRACK],
-                       SEARCH_RESULT_GENRE_WEIGHT,       SearchResultList_Weight[SEARCH_RESULT_GENRE],
-                       SEARCH_RESULT_COMMENT_WEIGHT,     SearchResultList_Weight[SEARCH_RESULT_COMMENT],
-                       SEARCH_RESULT_COMPOSER_WEIGHT,    SearchResultList_Weight[SEARCH_RESULT_COMPOSER],
-                       SEARCH_RESULT_ORIG_ARTIST_WEIGHT, SearchResultList_Weight[SEARCH_RESULT_ORIG_ARTIST],
-                       SEARCH_RESULT_COPYRIGHT_WEIGHT,   SearchResultList_Weight[SEARCH_RESULT_COPYRIGHT],
-                       SEARCH_RESULT_URL_WEIGHT,         SearchResultList_Weight[SEARCH_RESULT_URL],
-                       SEARCH_RESULT_ENCODED_BY_WEIGHT,  SearchResultList_Weight[SEARCH_RESULT_ENCODED_BY],
-
-                       SEARCH_RESULT_FILENAME_FOREGROUND,    SearchResultList_Color[SEARCH_RESULT_FILENAME],
-                       SEARCH_RESULT_TITLE_FOREGROUND,       SearchResultList_Color[SEARCH_RESULT_TITLE],
-                       SEARCH_RESULT_ARTIST_FOREGROUND,      SearchResultList_Color[SEARCH_RESULT_ARTIST],
-                       SEARCH_RESULT_ALBUM_ARTIST_FOREGROUND,       
SearchResultList_Color[SEARCH_RESULT_ALBUM_ARTIST],
-                      SEARCH_RESULT_ALBUM_FOREGROUND,       SearchResultList_Color[SEARCH_RESULT_ALBUM],
-                       SEARCH_RESULT_DISC_NUMBER_FOREGROUND, 
SearchResultList_Color[SEARCH_RESULT_DISC_NUMBER],
-                       SEARCH_RESULT_YEAR_FOREGROUND,        SearchResultList_Color[SEARCH_RESULT_YEAR],
-                       SEARCH_RESULT_TRACK_FOREGROUND,       SearchResultList_Color[SEARCH_RESULT_TRACK],
-                       SEARCH_RESULT_GENRE_FOREGROUND,       SearchResultList_Color[SEARCH_RESULT_GENRE],
-                       SEARCH_RESULT_COMMENT_FOREGROUND,     SearchResultList_Color[SEARCH_RESULT_COMMENT],
-                       SEARCH_RESULT_COMPOSER_FOREGROUND,    SearchResultList_Color[SEARCH_RESULT_COMPOSER],
-                       SEARCH_RESULT_ORIG_ARTIST_FOREGROUND, 
SearchResultList_Color[SEARCH_RESULT_ORIG_ARTIST],
-                       SEARCH_RESULT_COPYRIGHT_FOREGROUND,   SearchResultList_Color[SEARCH_RESULT_COPYRIGHT],
-                       SEARCH_RESULT_URL_FOREGROUND,         SearchResultList_Color[SEARCH_RESULT_URL],
-                       SEARCH_RESULT_ENCODED_BY_FOREGROUND,  
SearchResultList_Color[SEARCH_RESULT_ENCODED_BY],
-
-                       SEARCH_RESULT_POINTER, ETFile,
-                       -1);
-
-    // Frees allocated data
-    g_free(SearchResultList_Text[SEARCH_RESULT_FILENAME]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_TITLE]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_ARTIST]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_ALBUM_ARTIST]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_ALBUM]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_DISC_NUMBER]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_YEAR]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_TRACK]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_GENRE]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_COMMENT]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_COMPOSER]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_ORIG_ARTIST]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_COPYRIGHT]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_URL]);
-    g_free(SearchResultList_Text[SEARCH_RESULT_ENCODED_BY]);
-}
-
-/*
- * Callback to select-row event
- * Select all results that are selected in the search result list also in the browser list
- */
-static void
-Search_Result_List_Row_Selected (GtkTreeSelection *selection, gpointer data)
-{
-    GList       *selectedRows;
-    GList *l;
-    ET_File     *ETFile;
-    GtkTreeIter  currentFile;
-
-    selectedRows = gtk_tree_selection_get_selected_rows(selection, NULL);
-
-    /* We might be called with no rows selected */
-    if (!selectedRows)
-    {
-        return;
-    }
-
-    // Unselect files in the main list before re-selecting them...
-    Browser_List_Unselect_All_Files();
-
-    for (l = selectedRows; l != NULL; l = g_list_next (l))
-    {
-        if (gtk_tree_model_get_iter (GTK_TREE_MODEL (SearchResultListModel),
-                                     &currentFile, (GtkTreePath *)l->data))
-        {
-            gtk_tree_model_get(GTK_TREE_MODEL(SearchResultListModel), &currentFile, 
-                               SEARCH_RESULT_POINTER, &ETFile, -1);
-            // Select the files (but don't display them to increase speed)
-            Browser_List_Select_File_By_Etfile(ETFile, TRUE);
-            // Display only the last file (to increase speed)
-            if (!selectedRows->next)
-                Action_Select_Nth_File_By_Etfile(ETFile);
-        }
-    }
-
-    g_list_free_full (selectedRows, (GDestroyNotify)gtk_tree_path_free);
-}
-
 gchar *
 et_disc_number_to_string (const guint disc_number)
 {
diff --git a/src/misc.h b/src/misc.h
index 07c1ec8..56c2843 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -73,10 +73,6 @@ gint Combo_Alphabetic_Sort (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b,
 void File_Selection_Window_For_File      (GtkWidget *entry);
 void File_Selection_Window_For_Directory (GtkWidget *entry);
 
-// Search file window
-void Open_Search_File_Window (void);
-void Search_File_Window_Apply_Changes (void);
-
 gchar * et_disc_number_to_string (const guint disc_number);
 gchar * et_track_number_to_string (const guint track_number);
 
diff --git a/src/search_dialog.c b/src/search_dialog.c
new file mode 100644
index 0000000..deadcac
--- /dev/null
+++ b/src/search_dialog.c
@@ -0,0 +1,951 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2013  David King <amigadave amigadave com>
+ *
+ * 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; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * 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.
+ */
+
+#include "config.h"
+
+#include "search_dialog.h"
+
+#include <glib/gi18n.h>
+
+#include "bar.h"
+#include "browser.h"
+#include "charset.h"
+#include "easytag.h"
+#include "gtk2_compat.h"
+#include "log.h"
+#include "misc.h"
+#include "picture.h"
+#include "scan.h"
+#include "setting.h"
+
+/* TODO: Use G_DEFINE_TYPE_WITH_PRIVATE. */
+G_DEFINE_TYPE (EtSearchDialog, et_search_dialog, GTK_TYPE_DIALOG)
+
+#define et_search_dialog_get_instance_private(dialog) (dialog->priv)
+
+static const guint BOX_SPACING = 6;
+
+enum
+{
+    // Columns for titles
+    SEARCH_RESULT_FILENAME = 0,
+    SEARCH_RESULT_TITLE,
+    SEARCH_RESULT_ARTIST,
+    SEARCH_RESULT_ALBUM_ARTIST,
+    SEARCH_RESULT_ALBUM,
+    SEARCH_RESULT_DISC_NUMBER,
+    SEARCH_RESULT_YEAR,
+    SEARCH_RESULT_TRACK,
+    SEARCH_RESULT_GENRE,
+    SEARCH_RESULT_COMMENT,
+    SEARCH_RESULT_COMPOSER,
+    SEARCH_RESULT_ORIG_ARTIST,
+    SEARCH_RESULT_COPYRIGHT,
+    SEARCH_RESULT_URL,
+    SEARCH_RESULT_ENCODED_BY,
+
+    // Columns for pango style (normal/bold)
+    SEARCH_RESULT_FILENAME_WEIGHT,
+    SEARCH_RESULT_TITLE_WEIGHT,
+    SEARCH_RESULT_ARTIST_WEIGHT,
+    SEARCH_RESULT_ALBUM_ARTIST_WEIGHT,
+    SEARCH_RESULT_ALBUM_WEIGHT,
+    SEARCH_RESULT_DISC_NUMBER_WEIGHT,
+    SEARCH_RESULT_YEAR_WEIGHT,
+    SEARCH_RESULT_TRACK_WEIGHT,
+    SEARCH_RESULT_GENRE_WEIGHT,
+    SEARCH_RESULT_COMMENT_WEIGHT,
+    SEARCH_RESULT_COMPOSER_WEIGHT,
+    SEARCH_RESULT_ORIG_ARTIST_WEIGHT,
+    SEARCH_RESULT_COPYRIGHT_WEIGHT,
+    SEARCH_RESULT_URL_WEIGHT,
+    SEARCH_RESULT_ENCODED_BY_WEIGHT,
+
+    // Columns for color (normal/red)
+    SEARCH_RESULT_FILENAME_FOREGROUND,
+    SEARCH_RESULT_TITLE_FOREGROUND,
+    SEARCH_RESULT_ARTIST_FOREGROUND,
+    SEARCH_RESULT_ALBUM_ARTIST_FOREGROUND,
+    SEARCH_RESULT_ALBUM_FOREGROUND,
+    SEARCH_RESULT_DISC_NUMBER_FOREGROUND,
+    SEARCH_RESULT_YEAR_FOREGROUND,
+    SEARCH_RESULT_TRACK_FOREGROUND,
+    SEARCH_RESULT_GENRE_FOREGROUND,
+    SEARCH_RESULT_COMMENT_FOREGROUND,
+    SEARCH_RESULT_COMPOSER_FOREGROUND,
+    SEARCH_RESULT_ORIG_ARTIST_FOREGROUND,
+    SEARCH_RESULT_COPYRIGHT_FOREGROUND,
+    SEARCH_RESULT_URL_FOREGROUND,
+    SEARCH_RESULT_ENCODED_BY_FOREGROUND,
+
+    SEARCH_RESULT_POINTER,
+    SEARCH_COLUMN_COUNT
+};
+
+struct _EtSearchDialogPrivate
+{
+    GtkWidget *search_string_combo;
+    GtkListStore *search_string_model;
+    GtkWidget *search_in_filename;
+    GtkWidget *search_in_tag;
+    GtkWidget *search_case_sensitive;
+    GtkWidget *search_results_view;
+    GtkListStore *search_results_model;
+    GtkWidget *status_bar;
+    guint status_bar_context;
+};
+
+/*
+ * Callback to select-row event
+ * Select all results that are selected in the search result list also in the browser list
+ */
+static void
+Search_Result_List_Row_Selected (GtkTreeSelection *selection,
+                                 gpointer user_data)
+{
+    EtSearchDialogPrivate *priv;
+    GList       *selectedRows;
+    GList *l;
+    ET_File     *ETFile;
+    GtkTreeIter  currentFile;
+
+    priv = et_search_dialog_get_instance_private (ET_SEARCH_DIALOG (user_data));
+
+    selectedRows = gtk_tree_selection_get_selected_rows(selection, NULL);
+
+    /* We might be called with no rows selected */
+    if (!selectedRows)
+    {
+        return;
+    }
+
+    // Unselect files in the main list before re-selecting them...
+    Browser_List_Unselect_All_Files();
+
+    for (l = selectedRows; l != NULL; l = g_list_next (l))
+    {
+        if (gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->search_results_model),
+                                     &currentFile, (GtkTreePath *)l->data))
+        {
+            gtk_tree_model_get(GTK_TREE_MODEL(priv->search_results_model), &currentFile, 
+                               SEARCH_RESULT_POINTER, &ETFile, -1);
+            // Select the files (but don't display them to increase speed)
+            Browser_List_Select_File_By_Etfile(ETFile, TRUE);
+            // Display only the last file (to increase speed)
+            if (!selectedRows->next)
+                Action_Select_Nth_File_By_Etfile(ETFile);
+        }
+    }
+
+    g_list_free_full (selectedRows, (GDestroyNotify)gtk_tree_path_free);
+}
+
+static void
+Add_Row_To_Search_Result_List (EtSearchDialog *self,
+                               ET_File *ETFile, const gchar *string_to_search)
+{
+    EtSearchDialogPrivate *priv;
+    gchar *SearchResultList_Text[15]; // Because : 15 columns to display
+    gint SearchResultList_Weight[15] = {PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
+                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
+                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
+                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
+                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
+                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
+                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
+                                        PANGO_WEIGHT_NORMAL};
+    GdkColor *SearchResultList_Color[15] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                                            NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                                            NULL};
+    gchar *track, *track_total;
+    gchar *disc_number, *disc_total;
+    gboolean case_sensitive;
+    gint column;
+
+    priv = et_search_dialog_get_instance_private (self);
+
+    if (!ETFile || !string_to_search)
+        return;
+
+    case_sensitive = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->search_case_sensitive));
+
+    // Filename
+    SearchResultList_Text[SEARCH_RESULT_FILENAME]    = g_path_get_basename( ((File_Name 
*)ETFile->FileNameNew->data)->value_utf8 );
+    // Title
+    SearchResultList_Text[SEARCH_RESULT_TITLE]       = g_strdup(((File_Tag *)ETFile->FileTag->data)->title);
+    // Artist
+    SearchResultList_Text[SEARCH_RESULT_ARTIST]      = g_strdup(((File_Tag *)ETFile->FileTag->data)->artist);
+    // Album Artist
+    SearchResultList_Text[SEARCH_RESULT_ALBUM_ARTIST]= g_strdup(((File_Tag 
*)ETFile->FileTag->data)->album_artist);
+    // Album
+    SearchResultList_Text[SEARCH_RESULT_ALBUM]       = g_strdup(((File_Tag *)ETFile->FileTag->data)->album);
+    // Year
+    SearchResultList_Text[SEARCH_RESULT_YEAR]        = g_strdup(((File_Tag *)ETFile->FileTag->data)->year);
+    //Genre
+    SearchResultList_Text[SEARCH_RESULT_GENRE]       = g_strdup(((File_Tag *)ETFile->FileTag->data)->genre);
+    // Comment
+    SearchResultList_Text[SEARCH_RESULT_COMMENT]     = g_strdup(((File_Tag 
*)ETFile->FileTag->data)->comment);
+    // Composer
+    SearchResultList_Text[SEARCH_RESULT_COMPOSER]    = g_strdup(((File_Tag 
*)ETFile->FileTag->data)->composer);
+    // Orig. Artist
+    SearchResultList_Text[SEARCH_RESULT_ORIG_ARTIST] = g_strdup(((File_Tag 
*)ETFile->FileTag->data)->orig_artist);
+    // Copyright
+    SearchResultList_Text[SEARCH_RESULT_COPYRIGHT]   = g_strdup(((File_Tag 
*)ETFile->FileTag->data)->copyright);
+    // URL
+    SearchResultList_Text[SEARCH_RESULT_URL]         = g_strdup(((File_Tag *)ETFile->FileTag->data)->url);
+    // Encoded by
+    SearchResultList_Text[SEARCH_RESULT_ENCODED_BY]  = g_strdup(((File_Tag 
*)ETFile->FileTag->data)->encoded_by);
+
+    /* Disc Number. */
+    disc_number = ((File_Tag *)ETFile->FileTag->data)->disc_number;
+    disc_total = ((File_Tag *)ETFile->FileTag->data)->disc_total;
+
+    if (disc_number)
+    {
+        if (disc_total)
+        {
+            SearchResultList_Text[SEARCH_RESULT_DISC_NUMBER] = g_strconcat (disc_number, "/", disc_total, 
NULL);
+        }
+        else
+        {
+            SearchResultList_Text[SEARCH_RESULT_DISC_NUMBER] = g_strdup (disc_number);
+        }
+    }
+    else
+    {
+        SearchResultList_Text[SEARCH_RESULT_DISC_NUMBER] = NULL;
+    }
+
+    // Track
+    track       = ((File_Tag *)ETFile->FileTag->data)->track;
+    track_total = ((File_Tag *)ETFile->FileTag->data)->track_total;
+    if (track)
+    {
+        if (track_total)
+            SearchResultList_Text[SEARCH_RESULT_TRACK] = g_strconcat(track,"/",track_total,NULL);
+        else
+            SearchResultList_Text[SEARCH_RESULT_TRACK] = g_strdup(track);
+    } else
+    {
+        SearchResultList_Text[SEARCH_RESULT_TRACK] = NULL;
+    }
+
+
+    // Highlight the keywords in the result list
+    // Don't display files to red if the searched string is '' (to display all files)
+    for (column=0;column<14;column++)
+    {
+        if (case_sensitive)
+        {
+            if ( SearchResultList_Text[column] && strlen(string_to_search) && 
strstr(SearchResultList_Text[column],string_to_search) )
+            {
+                if (CHANGED_FILES_DISPLAYED_TO_BOLD)
+                    SearchResultList_Weight[column] = PANGO_WEIGHT_BOLD;
+                else
+                    SearchResultList_Color[column] = &RED;
+            }
+
+        } else
+        {
+            // Search wasn't case sensitive
+            gchar *list_text = NULL;
+            gchar *string_to_search2 = g_utf8_casefold(string_to_search, -1);
+
+            if (!SearchResultList_Text[column])
+            {
+                g_free(string_to_search2);
+                continue;
+            }
+
+            list_text = g_utf8_casefold(SearchResultList_Text[column], -1);
+
+            if ( list_text && strlen(string_to_search2) && strstr(list_text,string_to_search2) )
+            {
+                if (CHANGED_FILES_DISPLAYED_TO_BOLD)
+                    SearchResultList_Weight[column] = PANGO_WEIGHT_BOLD;
+                else
+                    SearchResultList_Color[column] = &RED;
+            }
+
+            g_free(list_text);
+            g_free(string_to_search2);
+        }
+    }
+
+    // Load the row in the list
+    gtk_list_store_insert_with_values (priv->search_results_model, NULL, G_MAXINT,
+                       SEARCH_RESULT_FILENAME,    SearchResultList_Text[SEARCH_RESULT_FILENAME],
+                       SEARCH_RESULT_TITLE,       SearchResultList_Text[SEARCH_RESULT_TITLE],
+                       SEARCH_RESULT_ARTIST,      SearchResultList_Text[SEARCH_RESULT_ARTIST],
+                       SEARCH_RESULT_ALBUM_ARTIST,SearchResultList_Text[SEARCH_RESULT_ALBUM_ARTIST],
+                       SEARCH_RESULT_ALBUM,       SearchResultList_Text[SEARCH_RESULT_ALBUM],
+                       SEARCH_RESULT_DISC_NUMBER, SearchResultList_Text[SEARCH_RESULT_DISC_NUMBER],
+                       SEARCH_RESULT_YEAR,        SearchResultList_Text[SEARCH_RESULT_YEAR],
+                       SEARCH_RESULT_TRACK,       SearchResultList_Text[SEARCH_RESULT_TRACK],
+                       SEARCH_RESULT_GENRE,       SearchResultList_Text[SEARCH_RESULT_GENRE],
+                       SEARCH_RESULT_COMMENT,     SearchResultList_Text[SEARCH_RESULT_COMMENT],
+                       SEARCH_RESULT_COMPOSER,    SearchResultList_Text[SEARCH_RESULT_COMPOSER],
+                       SEARCH_RESULT_ORIG_ARTIST, SearchResultList_Text[SEARCH_RESULT_ORIG_ARTIST],
+                       SEARCH_RESULT_COPYRIGHT,   SearchResultList_Text[SEARCH_RESULT_COPYRIGHT],
+                       SEARCH_RESULT_URL,         SearchResultList_Text[SEARCH_RESULT_URL],
+                       SEARCH_RESULT_ENCODED_BY,  SearchResultList_Text[SEARCH_RESULT_ENCODED_BY],
+
+                       SEARCH_RESULT_FILENAME_WEIGHT,    SearchResultList_Weight[SEARCH_RESULT_FILENAME],
+                       SEARCH_RESULT_TITLE_WEIGHT,       SearchResultList_Weight[SEARCH_RESULT_TITLE],
+                       SEARCH_RESULT_ARTIST_WEIGHT,      SearchResultList_Weight[SEARCH_RESULT_ARTIST],
+                       SEARCH_RESULT_ALBUM_ARTIST_WEIGHT, 
SearchResultList_Weight[SEARCH_RESULT_ALBUM_ARTIST],
+                      SEARCH_RESULT_ALBUM_WEIGHT,       SearchResultList_Weight[SEARCH_RESULT_ALBUM],
+                       SEARCH_RESULT_DISC_NUMBER_WEIGHT, SearchResultList_Weight[SEARCH_RESULT_DISC_NUMBER],
+                       SEARCH_RESULT_YEAR_WEIGHT,        SearchResultList_Weight[SEARCH_RESULT_YEAR],
+                       SEARCH_RESULT_TRACK_WEIGHT,       SearchResultList_Weight[SEARCH_RESULT_TRACK],
+                       SEARCH_RESULT_GENRE_WEIGHT,       SearchResultList_Weight[SEARCH_RESULT_GENRE],
+                       SEARCH_RESULT_COMMENT_WEIGHT,     SearchResultList_Weight[SEARCH_RESULT_COMMENT],
+                       SEARCH_RESULT_COMPOSER_WEIGHT,    SearchResultList_Weight[SEARCH_RESULT_COMPOSER],
+                       SEARCH_RESULT_ORIG_ARTIST_WEIGHT, SearchResultList_Weight[SEARCH_RESULT_ORIG_ARTIST],
+                       SEARCH_RESULT_COPYRIGHT_WEIGHT,   SearchResultList_Weight[SEARCH_RESULT_COPYRIGHT],
+                       SEARCH_RESULT_URL_WEIGHT,         SearchResultList_Weight[SEARCH_RESULT_URL],
+                       SEARCH_RESULT_ENCODED_BY_WEIGHT,  SearchResultList_Weight[SEARCH_RESULT_ENCODED_BY],
+
+                       SEARCH_RESULT_FILENAME_FOREGROUND,    SearchResultList_Color[SEARCH_RESULT_FILENAME],
+                       SEARCH_RESULT_TITLE_FOREGROUND,       SearchResultList_Color[SEARCH_RESULT_TITLE],
+                       SEARCH_RESULT_ARTIST_FOREGROUND,      SearchResultList_Color[SEARCH_RESULT_ARTIST],
+                       SEARCH_RESULT_ALBUM_ARTIST_FOREGROUND,       
SearchResultList_Color[SEARCH_RESULT_ALBUM_ARTIST],
+                      SEARCH_RESULT_ALBUM_FOREGROUND,       SearchResultList_Color[SEARCH_RESULT_ALBUM],
+                       SEARCH_RESULT_DISC_NUMBER_FOREGROUND, 
SearchResultList_Color[SEARCH_RESULT_DISC_NUMBER],
+                       SEARCH_RESULT_YEAR_FOREGROUND,        SearchResultList_Color[SEARCH_RESULT_YEAR],
+                       SEARCH_RESULT_TRACK_FOREGROUND,       SearchResultList_Color[SEARCH_RESULT_TRACK],
+                       SEARCH_RESULT_GENRE_FOREGROUND,       SearchResultList_Color[SEARCH_RESULT_GENRE],
+                       SEARCH_RESULT_COMMENT_FOREGROUND,     SearchResultList_Color[SEARCH_RESULT_COMMENT],
+                       SEARCH_RESULT_COMPOSER_FOREGROUND,    SearchResultList_Color[SEARCH_RESULT_COMPOSER],
+                       SEARCH_RESULT_ORIG_ARTIST_FOREGROUND, 
SearchResultList_Color[SEARCH_RESULT_ORIG_ARTIST],
+                       SEARCH_RESULT_COPYRIGHT_FOREGROUND,   SearchResultList_Color[SEARCH_RESULT_COPYRIGHT],
+                       SEARCH_RESULT_URL_FOREGROUND,         SearchResultList_Color[SEARCH_RESULT_URL],
+                       SEARCH_RESULT_ENCODED_BY_FOREGROUND,  
SearchResultList_Color[SEARCH_RESULT_ENCODED_BY],
+
+                       SEARCH_RESULT_POINTER, ETFile,
+                       -1);
+
+    // Frees allocated data
+    g_free(SearchResultList_Text[SEARCH_RESULT_FILENAME]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_TITLE]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_ARTIST]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_ALBUM_ARTIST]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_ALBUM]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_DISC_NUMBER]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_YEAR]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_TRACK]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_GENRE]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_COMMENT]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_COMPOSER]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_ORIG_ARTIST]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_COPYRIGHT]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_URL]);
+    g_free(SearchResultList_Text[SEARCH_RESULT_ENCODED_BY]);
+}
+
+/*
+ * This function and the one below could do with improving
+ * as we are looking up tag data twice (once when searching, once when adding to list)
+ */
+static void
+Search_File (GtkWidget *search_button, gpointer user_data)
+{
+    EtSearchDialog *self;
+    EtSearchDialogPrivate *priv;
+    const gchar *string_to_search = NULL;
+    GList *l;
+    ET_File *ETFile;
+    gchar *msg;
+    gchar *temp = NULL;
+    gchar *title2, *artist2, *album_artist2, *album2, *disc_number2,
+          *disc_total2, *year2, *track2, *track_total2, *genre2, *comment2,
+          *composer2, *orig_artist2, *copyright2, *url2, *encoded_by2,
+          *string_to_search2;
+    gint resultCount = 0;
+
+    self = ET_SEARCH_DIALOG (user_data);
+    priv = et_search_dialog_get_instance_private (self);
+
+    if (!priv->search_string_combo || !priv->search_in_filename || !priv->search_in_tag || 
!priv->search_results_view)
+        return;
+
+    string_to_search = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(priv->search_string_combo))));
+    if (!string_to_search)
+        return;
+
+    Add_String_To_Combo_List (priv->search_string_model, string_to_search);
+
+    gtk_widget_set_sensitive(GTK_WIDGET(search_button),FALSE);
+    gtk_list_store_clear(priv->search_results_model);
+    gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,"");
+
+    for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
+    {
+        ETFile = (ET_File *)l->data;
+
+        // Search in the filename
+        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->search_in_filename)))
+        {
+            gchar *filename_utf8 = ((File_Name *)ETFile->FileNameNew->data)->value_utf8;
+            gchar *basename_utf8;
+
+            // To search without case sensivity
+            if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->search_case_sensitive)))
+            {
+                temp = g_path_get_basename(filename_utf8);
+                basename_utf8 = g_utf8_casefold(temp, -1);
+                g_free(temp);
+                string_to_search2 = g_utf8_casefold(string_to_search, -1);
+            } else
+            {
+                basename_utf8 = g_path_get_basename(filename_utf8);
+                string_to_search2 = g_strdup(string_to_search);
+            }
+
+            if ( basename_utf8 && strstr(basename_utf8,string_to_search2) )
+            {
+                Add_Row_To_Search_Result_List (self, ETFile,
+                                               string_to_search2);
+                g_free(basename_utf8);
+                g_free(string_to_search2);
+                continue;
+            }
+            g_free(basename_utf8);
+            g_free(string_to_search2);
+        }
+
+        // Search in the tag
+        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->search_in_tag)))
+        {
+            File_Tag *FileTag   = (File_Tag *)ETFile->FileTag->data;
+
+            // To search with or without case sensivity
+            if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->search_case_sensitive)))
+            {
+                // To search without case sensivity...
+                // Duplicate and convert the strings into UTF-8 in loxer case
+                if (FileTag->title)       title2       = g_utf8_casefold(FileTag->title, -1);        else 
title2       = NULL;
+                if (FileTag->artist)      artist2      = g_utf8_casefold(FileTag->artist, -1);       else 
artist2      = NULL;
+                if (FileTag->album_artist) album_artist2 = g_utf8_casefold(FileTag->album_artist, -1); else 
album_artist2= NULL;
+                if (FileTag->album)       album2       = g_utf8_casefold(FileTag->album, -1);        else 
album2       = NULL;
+                if (FileTag->disc_number) disc_number2 = g_utf8_casefold(FileTag->disc_number, -1);  else 
disc_number2 = NULL;
+                if (FileTag->disc_total)
+                {
+                    disc_total2 = g_utf8_casefold (FileTag->disc_total, -1);
+                }
+                else
+                {
+                    disc_total2 = NULL;
+                }
+                if (FileTag->year)        year2        = g_utf8_casefold(FileTag->year, -1);         else 
year2        = NULL;
+                if (FileTag->track)       track2       = g_utf8_casefold(FileTag->track, -1);        else 
track2       = NULL;
+                if (FileTag->track_total) track_total2 = g_utf8_casefold(FileTag->track_total, -1);  else 
track_total2 = NULL;
+                if (FileTag->genre)       genre2       = g_utf8_casefold(FileTag->genre, -1);        else 
genre2       = NULL;
+                if (FileTag->comment)     comment2     = g_utf8_casefold(FileTag->comment, -1);      else 
comment2     = NULL;
+                if (FileTag->composer)    composer2    = g_utf8_casefold(FileTag->composer, -1);     else 
composer2    = NULL;
+                if (FileTag->orig_artist) orig_artist2 = g_utf8_casefold(FileTag->orig_artist, -1);  else 
orig_artist2 = NULL;
+                if (FileTag->copyright)   copyright2   = g_utf8_casefold(FileTag->copyright, -1);    else 
copyright2   = NULL;
+                if (FileTag->url)         url2         = g_utf8_casefold(FileTag->url, -1);          else 
url2         = NULL;
+                if (FileTag->encoded_by)  encoded_by2  = g_utf8_casefold(FileTag->encoded_by, -1);   else 
encoded_by2  = NULL;
+                string_to_search2 = g_utf8_strdown(string_to_search, -1);
+            }else
+            {
+                // To search with case sensivity...
+                // Duplicate and convert the strings into UTF-8
+                title2       = g_strdup(FileTag->title);
+                artist2      = g_strdup(FileTag->artist);
+                album_artist2= g_strdup(FileTag->album_artist);
+                album2       = g_strdup(FileTag->album);
+                disc_number2 = g_strdup(FileTag->disc_number);
+                disc_total2 = g_strdup (FileTag->disc_total);
+                year2        = g_strdup(FileTag->year);
+                track2       = g_strdup(FileTag->track);
+                track_total2 = g_strdup(FileTag->track_total);
+                genre2       = g_strdup(FileTag->genre);
+                comment2     = g_strdup(FileTag->comment);
+                composer2    = g_strdup(FileTag->composer);
+                orig_artist2 = g_strdup(FileTag->orig_artist);
+                copyright2   = g_strdup(FileTag->copyright);
+                url2         = g_strdup(FileTag->url);
+                encoded_by2  = g_strdup(FileTag->encoded_by);
+                string_to_search2 = g_strdup(string_to_search);
+            }
+
+            // FIX ME : should use UTF-8 functions?
+            if ( (title2       && strstr(title2,       string_to_search2) )
+             ||  (artist2      && strstr(artist2,      string_to_search2) )
+             ||  (album_artist2 && strstr(album_artist2,string_to_search2) )
+             ||  (album2       && strstr(album2,       string_to_search2) )
+             ||  (disc_number2 && strstr(disc_number2, string_to_search2) )
+             ||  (disc_total2 && strstr (disc_total2, string_to_search2))
+             ||  (year2        && strstr(year2,        string_to_search2) )
+             ||  (track2       && strstr(track2,       string_to_search2) )
+             ||  (track_total2 && strstr(track_total2, string_to_search2) )
+             ||  (genre2       && strstr(genre2,       string_to_search2) )
+             ||  (comment2     && strstr(comment2,     string_to_search2) )
+             ||  (composer2    && strstr(composer2,    string_to_search2) )
+             ||  (orig_artist2 && strstr(orig_artist2, string_to_search2) )
+             ||  (copyright2   && strstr(copyright2,   string_to_search2) )
+             ||  (url2         && strstr(url2,         string_to_search2) )
+             ||  (encoded_by2  && strstr(encoded_by2,  string_to_search2) ) )
+            {
+                Add_Row_To_Search_Result_List (self, ETFile, string_to_search);
+            }
+            g_free(title2);
+            g_free(artist2);
+            g_free(album_artist2);
+            g_free(album2);
+            g_free(disc_number2);
+            g_free (disc_total2);
+            g_free(year2);
+            g_free(track2);
+            g_free(track_total2);
+            g_free(genre2);
+            g_free(comment2);
+            g_free(composer2);
+            g_free(orig_artist2);
+            g_free(copyright2);
+            g_free(url2);
+            g_free(encoded_by2);
+            g_free(string_to_search2);
+        }
+    }
+
+    gtk_widget_set_sensitive(GTK_WIDGET(search_button),TRUE);
+
+    // Display the number of files in the statusbar
+    resultCount = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(priv->search_results_model), NULL);
+    msg = g_strdup_printf (ngettext ("Found one file", "Found %d files",
+                           resultCount), resultCount);
+    gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
+    g_free(msg);
+
+    // Disable result list if no row inserted
+    if (resultCount > 0 )
+    {
+        gtk_widget_set_sensitive(GTK_WIDGET(priv->search_results_view), TRUE);
+    } else
+    {
+        gtk_widget_set_sensitive(GTK_WIDGET(priv->search_results_view), FALSE);
+    }
+}
+
+static void
+on_close_clicked (GtkButton *button, gpointer user_data)
+{
+    EtSearchDialog *self;
+
+    self = ET_SEARCH_DIALOG (user_data);
+
+    et_search_dialog_apply_changes (self);
+    gtk_widget_hide (GTK_WIDGET (self));
+}
+
+static gboolean
+on_delete_event (GtkWidget *widget)
+{
+    et_search_dialog_apply_changes (ET_SEARCH_DIALOG (widget));
+
+    return TRUE;
+}
+
+/*
+ * The window to search keywords in the list of files.
+ */
+static void
+create_search_dialog (EtSearchDialog *self)
+{
+    EtSearchDialogPrivate *priv;
+    GtkWidget *content_area;
+    GtkWidget *Table;
+    GtkWidget *Label;
+    GtkWidget *Button;
+    GtkWidget *Separator;
+    GtkWidget *ScrollWindow;
+    GtkTreeViewColumn* column;
+    GtkCellRenderer* renderer;
+    gchar *SearchResultList_Titles[] = { N_("Filename"),
+                                         N_("Title"),
+                                         N_("Artist"),
+                                         N_("Album Artist"),
+                                         N_("Album"),
+                                         N_("CD"),
+                                         N_("Year"),
+                                         N_("Track"),
+                                         N_("Genre"),
+                                         N_("Comment"),
+                                         N_("Composer"),
+                                         N_("Original Artist"),
+                                         N_("Copyright"),
+                                         N_("URL"),
+                                         N_("Encoded By")
+                                       };
+
+    priv = et_search_dialog_get_instance_private (self);
+
+    gtk_window_set_transient_for (GTK_WINDOW (self), GTK_WINDOW (MainWindow));
+    gtk_window_set_title (GTK_WINDOW (self), _("Find Files"));
+    g_signal_connect (self, "delete-event", G_CALLBACK (on_delete_event),
+                      NULL);
+
+    content_area = gtk_dialog_get_content_area (GTK_DIALOG (self));
+    gtk_box_set_spacing (GTK_BOX (content_area), BOX_SPACING);
+    gtk_container_set_border_width (GTK_CONTAINER (self),
+                                    BOX_SPACING);
+
+    Table = et_grid_new (3, 6);
+    gtk_container_add (GTK_CONTAINER (content_area), Table);
+    gtk_grid_set_row_spacing (GTK_GRID (Table), BOX_SPACING);
+    gtk_grid_set_column_spacing (GTK_GRID (Table), BOX_SPACING);
+
+    /* Words to search. */
+    priv->search_string_model = gtk_list_store_new (MISC_COMBO_COUNT, G_TYPE_STRING);
+
+    Label = gtk_label_new(_("Search:"));
+    gtk_misc_set_alignment(GTK_MISC(Label),1.0,0.5);
+    gtk_grid_attach (GTK_GRID (Table), Label, 0, 0, 1, 1);
+    priv->search_string_combo = gtk_combo_box_new_with_model_and_entry (GTK_TREE_MODEL 
(priv->search_string_model));
+    g_object_unref (priv->search_string_model);
+    gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(priv->search_string_combo),MISC_COMBO_TEXT);
+    gtk_widget_set_size_request(GTK_WIDGET(priv->search_string_combo),200,-1);
+    gtk_grid_attach (GTK_GRID (Table), priv->search_string_combo, 1, 0, 4, 1);
+    // History List
+    Load_Search_File_List(priv->search_string_model, MISC_COMBO_TEXT);
+    gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(priv->search_string_combo))),"");
+    gtk_widget_set_tooltip_text(GTK_WIDGET(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(priv->search_string_combo)))),
+        _("Type the word to search into files. Or type nothing to display all files."));
+
+    // Set content of the clipboard if available
+    gtk_editable_paste_clipboard(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(priv->search_string_combo))));
+
+    // Where...
+    Label = gtk_label_new(_("In:"));
+    gtk_misc_set_alignment(GTK_MISC(Label),1.0,0.5);
+    gtk_grid_attach (GTK_GRID (Table), Label, 0, 1, 1, 1);
+    /* Translators: This option is for the previous 'in' option. For instance,
+     * translate this as "Search" "In:" "the Filename". */
+    priv->search_in_filename = gtk_check_button_new_with_label(_("the Filename"));
+    /* Translators: This option is for the previous 'in' option. For instance,
+     * translate this as "Search" "In:" "the Tag".
+     * Note: label changed to "the Tag" (to be the only one) to fix a Hungarian
+     * grammatical problem (which uses one word to say "in the tag" like here)
+     */
+    priv->search_in_tag = gtk_check_button_new_with_label (_("the Tag"));
+    gtk_grid_attach (GTK_GRID (Table), priv->search_in_filename, 1, 1, 1, 1);
+    gtk_grid_attach (GTK_GRID (Table), priv->search_in_tag, 2, 1, 1, 1);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->search_in_filename),
+                                  SEARCH_IN_FILENAME);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->search_in_tag),
+                                  SEARCH_IN_TAG);
+
+    Separator = gtk_separator_new(GTK_ORIENTATION_VERTICAL);
+    et_grid_attach_full (GTK_GRID (Table), Separator, 3, 1, 1, 1, FALSE, FALSE,
+                         4, 0);
+
+    // Property of the search
+    priv->search_case_sensitive = gtk_check_button_new_with_label (_("Case sensitive"));
+    et_grid_attach_full (GTK_GRID (Table), priv->search_case_sensitive, 4, 1,
+                         1, 1, TRUE, FALSE, 0, 0);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->search_case_sensitive),
+                                  SEARCH_CASE_SENSITIVE);
+
+    // Results list
+    ScrollWindow = gtk_scrolled_window_new(NULL,NULL);
+    
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ScrollWindow),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
+    gtk_widget_set_size_request(GTK_WIDGET(ScrollWindow), -1, 130);
+    et_grid_attach_full (GTK_GRID (Table), ScrollWindow, 0, 2, 6, 1, TRUE,
+                         TRUE, 0, 0);
+
+    priv->search_results_model = gtk_list_store_new(SEARCH_COLUMN_COUNT,
+                                               G_TYPE_STRING, /* Filename */
+                                               G_TYPE_STRING, /* Title */
+                                               G_TYPE_STRING, /* Artist */
+                                               G_TYPE_STRING, /* Album Artist */
+                                                                                          G_TYPE_STRING, /* 
Album */
+                                               G_TYPE_STRING, /* Disc Number */
+                                               G_TYPE_STRING, /* Year */
+                                               G_TYPE_STRING, /* Track + Track Total */
+                                               G_TYPE_STRING, /* Genre */
+                                               G_TYPE_STRING, /* Comment */
+                                               G_TYPE_STRING, /* Composer */
+                                               G_TYPE_STRING, /* Orig. Artist */
+                                               G_TYPE_STRING, /* Copyright */
+                                               G_TYPE_STRING, /* URL */
+                                               G_TYPE_STRING, /* Encoded by */
+
+                                               G_TYPE_INT, /* Font Weight for Filename */
+                                               G_TYPE_INT, /* Font Weight for Title */
+                                               G_TYPE_INT, /* Font Weight for Artist */
+                                               G_TYPE_INT, /* Font Weight for Album Artist */
+                                                                                          G_TYPE_INT, /* 
Font Weight for Album */
+                                               G_TYPE_INT, /* Font Weight for Disc Number */
+                                               G_TYPE_INT, /* Font Weight for Year */
+                                               G_TYPE_INT, /* Font Weight for Track + Track Total */
+                                               G_TYPE_INT, /* Font Weight for Genre */
+                                               G_TYPE_INT, /* Font Weight for Comment */
+                                               G_TYPE_INT, /* Font Weight for Composer */
+                                               G_TYPE_INT, /* Font Weight for Orig. Artist */
+                                               G_TYPE_INT, /* Font Weight for Copyright */
+                                               G_TYPE_INT, /* Font Weight for URL */
+                                               G_TYPE_INT, /* Font Weight for Encoded by */
+
+                                               GDK_TYPE_COLOR, /* Color Weight for Filename */
+                                               GDK_TYPE_COLOR, /* Color Weight for Title */
+                                               GDK_TYPE_COLOR, /* Color Weight for Artist */
+                                               GDK_TYPE_COLOR, /* Color Weight for Album Artist */
+                                                                                          GDK_TYPE_COLOR, /* 
Color Weight for Album */
+                                               GDK_TYPE_COLOR, /* Color Weight for Disc Number */
+                                               GDK_TYPE_COLOR, /* Color Weight for Year */
+                                               GDK_TYPE_COLOR, /* Color Weight for Track + Track Total */
+                                               GDK_TYPE_COLOR, /* Color Weight for Genre */
+                                               GDK_TYPE_COLOR, /* Color Weight for Comment */
+                                               GDK_TYPE_COLOR, /* Color Weight for Composer */
+                                               GDK_TYPE_COLOR, /* Color Weight for Orig. Artist */
+                                               GDK_TYPE_COLOR, /* Color Weight for Copyright */
+                                               GDK_TYPE_COLOR, /* Color Weight for URL */
+                                               GDK_TYPE_COLOR, /* Color Weight for Encoded by */
+
+                                               G_TYPE_POINTER);
+    priv->search_results_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(priv->search_results_model));
+    g_object_unref (priv->search_results_model);
+
+    renderer = gtk_cell_renderer_text_new(); /* Filename */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[0]), renderer,
+                                                      "text",           SEARCH_RESULT_FILENAME,
+                                                      "weight",         SEARCH_RESULT_FILENAME_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_FILENAME_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Title */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[1]), renderer,
+                                                      "text",           SEARCH_RESULT_TITLE,
+                                                      "weight",         SEARCH_RESULT_TITLE_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_TITLE_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Artist */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[2]), renderer,
+                                                      "text",           SEARCH_RESULT_ARTIST,
+                                                      "weight",         SEARCH_RESULT_ARTIST_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_ARTIST_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+       renderer = gtk_cell_renderer_text_new(); /* Album Artist */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[3]), renderer,
+                                                      "text",           SEARCH_RESULT_ALBUM_ARTIST,
+                                                      "weight",         SEARCH_RESULT_ALBUM_ARTIST_WEIGHT,
+                                                      "foreground-gdk", 
SEARCH_RESULT_ALBUM_ARTIST_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Album */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[4]), renderer,
+                                                      "text",           SEARCH_RESULT_ALBUM,
+                                                      "weight",         SEARCH_RESULT_ALBUM_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_ALBUM_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Disc Number */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[5]), renderer,
+                                                      "text",           SEARCH_RESULT_DISC_NUMBER,
+                                                      "weight",         SEARCH_RESULT_DISC_NUMBER_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_DISC_NUMBER_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Year */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[6]), renderer,
+                                                      "text",           SEARCH_RESULT_YEAR,
+                                                      "weight",         SEARCH_RESULT_YEAR_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_YEAR_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Track */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[7]), renderer,
+                                                      "text",           SEARCH_RESULT_TRACK,
+                                                      "weight",         SEARCH_RESULT_TRACK_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_TRACK_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Genre */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[8]), renderer,
+                                                      "text",           SEARCH_RESULT_GENRE,
+                                                      "weight",         SEARCH_RESULT_GENRE_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_GENRE_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Comment */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[9]), renderer,
+                                                      "text",           SEARCH_RESULT_COMMENT,
+                                                      "weight",         SEARCH_RESULT_COMMENT_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_COMMENT_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Composer */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[10]), renderer,
+                                                      "text",           SEARCH_RESULT_COMPOSER,
+                                                      "weight",         SEARCH_RESULT_COMPOSER_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_COMPOSER_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Orig. Artist */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[11]), renderer,
+                                                      "text",           SEARCH_RESULT_ORIG_ARTIST,
+                                                      "weight",         SEARCH_RESULT_ORIG_ARTIST_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_ORIG_ARTIST_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Copyright */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[12]), renderer,
+                                                      "text",           SEARCH_RESULT_COPYRIGHT,
+                                                      "weight",         SEARCH_RESULT_COPYRIGHT_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_COPYRIGHT_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* URL */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[13]), renderer,
+                                                      "text",           SEARCH_RESULT_URL,
+                                                      "weight",         SEARCH_RESULT_URL_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_URL_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new(); /* Encoded by */
+    column = gtk_tree_view_column_new_with_attributes(_(SearchResultList_Titles[14]), renderer,
+                                                      "text",           SEARCH_RESULT_ENCODED_BY,
+                                                      "weight",         SEARCH_RESULT_ENCODED_BY_WEIGHT,
+                                                      "foreground-gdk", SEARCH_RESULT_ENCODED_BY_FOREGROUND,
+                                                      NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(priv->search_results_view), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    gtk_container_add(GTK_CONTAINER(ScrollWindow),priv->search_results_view);
+    gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->search_results_view)),
+            GTK_SELECTION_MULTIPLE);
+    //gtk_tree_view_columns_autosize(GTK_TREE_VIEW(priv->search_results_view)); // Doesn't seem to work...
+    gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(priv->search_results_view), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(priv->search_results_view), FALSE);
+    g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->search_results_view)),
+                      "changed", G_CALLBACK(Search_Result_List_Row_Selected),
+                      self);
+
+    // Button to run the search
+    Button = gtk_button_new_from_stock(GTK_STOCK_FIND);
+    gtk_grid_attach (GTK_GRID (Table), Button, 5, 0, 1, 1);
+    gtk_widget_set_can_default(Button,TRUE);
+    gtk_widget_grab_default(Button);
+    g_signal_connect (Button, "clicked", G_CALLBACK (Search_File), self);
+    g_signal_connect (gtk_bin_get_child (GTK_BIN (priv->search_string_combo)),
+                      "activate", G_CALLBACK (Search_File), self);
+
+    // Button to cancel
+    Button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+    gtk_grid_attach (GTK_GRID (Table), Button, 5, 1, 1, 1);
+    g_signal_connect (Button, "clicked", G_CALLBACK (on_close_clicked), self);
+
+    // Status bar
+    priv->status_bar = gtk_statusbar_new();
+    /*gtk_grid_attach (GTK_GRID (Table), priv->status_bar, 0, 3, 5, 1);*/
+    gtk_box_pack_start(GTK_BOX(content_area),priv->status_bar,FALSE,TRUE,0);
+    priv->status_bar_context = gtk_statusbar_get_context_id(GTK_STATUSBAR(priv->status_bar),"Messages");
+    gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,_("Ready to search…"));
+
+    gtk_widget_show_all (GTK_WIDGET (self));
+}
+
+/*
+ * For the configuration file...
+ */
+void
+et_search_dialog_apply_changes (EtSearchDialog *self)
+{
+    EtSearchDialogPrivate *priv;
+
+    g_return_if_fail (ET_SEARCH_DIALOG (self));
+
+    priv = et_search_dialog_get_instance_private (self);
+
+    Save_Search_File_List (priv->search_string_model, MISC_COMBO_TEXT);
+
+    SEARCH_IN_FILENAME = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->search_in_filename));
+    SEARCH_IN_TAG = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->search_in_tag));
+    SEARCH_CASE_SENSITIVE = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->search_case_sensitive));
+}
+
+static void
+et_search_dialog_finalize (GObject *object)
+{
+    G_OBJECT_CLASS (et_search_dialog_parent_class)->finalize (object);
+}
+
+static void
+et_search_dialog_init (EtSearchDialog *self)
+{
+    self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ET_TYPE_SEARCH_DIALOG,
+                                              EtSearchDialogPrivate);
+
+    create_search_dialog (self);
+
+    gtk_widget_show_all (GTK_WIDGET (self));
+}
+
+static void
+et_search_dialog_class_init (EtSearchDialogClass *klass)
+{
+    G_OBJECT_CLASS (klass)->finalize = et_search_dialog_finalize;
+
+    g_type_class_add_private (klass, sizeof (EtSearchDialogPrivate));
+}
+
+/*
+ * et_search_dialog_new:
+ *
+ * Create a new EtSearchDialog instance.
+ *
+ * Returns: a new #EtSearchDialog
+ */
+EtSearchDialog *
+et_search_dialog_new (void)
+{
+    return g_object_new (ET_TYPE_SEARCH_DIALOG, NULL);
+}
diff --git a/src/search_dialog.h b/src/search_dialog.h
new file mode 100644
index 0000000..5331afc
--- /dev/null
+++ b/src/search_dialog.h
@@ -0,0 +1,54 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2013  David King <amigadave amigadave com>
+ *
+ * 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; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * 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 ET_SEARCH_DIALOG_H_
+#define ET_SEARCH_DIALOG_H_
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#include "et_core.h"
+
+#define ET_TYPE_SEARCH_DIALOG (et_search_dialog_get_type ())
+#define ET_SEARCH_DIALOG(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ET_TYPE_SEARCH_DIALOG, 
EtSearchDialog))
+
+typedef struct _EtSearchDialog EtSearchDialog;
+typedef struct _EtSearchDialogClass EtSearchDialogClass;
+typedef struct _EtSearchDialogPrivate EtSearchDialogPrivate;
+
+struct _EtSearchDialog
+{
+    /*< private >*/
+    GtkDialog parent_instance;
+    EtSearchDialogPrivate *priv;
+};
+
+struct _EtSearchDialogClass
+{
+    /*< private >*/
+    GtkDialogClass parent_class;
+};
+
+GType et_search_dialog_get_type (void);
+EtSearchDialog *et_search_dialog_new (void);
+void et_search_dialog_apply_changes (EtSearchDialog *self);
+
+G_END_DECLS
+
+#endif /* !ET_SEARCH_DIALOG_H_ */
diff --git a/src/setting.c b/src/setting.c
index 9cfe1d4..0a1428d 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -37,6 +37,7 @@
 #include "load_files_dialog.h"
 #include "playlist_dialog.h"
 #include "prefs.h"
+#include "search_dialog.h"
 #include "bar.h"
 #include "easytag.h"
 #include "charset.h"
@@ -302,11 +303,6 @@ static const tConfigVariable Config_Variables[] =
 
     {"cddb_run_scanner",                        CV_TYPE_BOOL,    &CDDB_RUN_SCANNER                       },
 
-    {"set_search_window_position",              CV_TYPE_BOOL,    &SET_SEARCH_WINDOW_POSITION             },
-    {"search_window_x",                         CV_TYPE_INT,     &SEARCH_WINDOW_X                        },
-    {"search_window_y",                         CV_TYPE_INT,     &SEARCH_WINDOW_Y                        },
-    {"search_window_height",                    CV_TYPE_INT,     &SEARCH_WINDOW_HEIGHT                   },
-    {"search_window_width",                     CV_TYPE_INT,     &SEARCH_WINDOW_WIDTH                    },
     {"search_in_filename",                      CV_TYPE_BOOL,    &SEARCH_IN_FILENAME                     },
     {"search_in_tag",                           CV_TYPE_BOOL,    &SEARCH_IN_TAG                          },
     {"search_case_sensitive",                   CV_TYPE_BOOL,    &SEARCH_CASE_SENSITIVE                  },
@@ -575,11 +571,6 @@ void Init_Config_Variables (void)
     /*
      * Search window
      */
-    SET_SEARCH_WINDOW_POSITION  = 1; // Set it to '0' if problem with some Windows Manager
-    SEARCH_WINDOW_X             = -1;
-    SEARCH_WINDOW_Y             = -1;
-    SEARCH_WINDOW_HEIGHT        = 350;
-    SEARCH_WINDOW_WIDTH         = 650;
     SEARCH_IN_FILENAME          = 1;
     SEARCH_IN_TAG               = 1;
     SEARCH_CASE_SENSITIVE       = 0;
@@ -858,8 +849,9 @@ Apply_Changes_Of_UI (void)
      * Function also called when destroying the window. */
     et_playlist_dialog_apply_changes (ET_PLAYLIST_DIALOG (et_application_window_get_playlist_dialog 
(ET_APPLICATION_WINDOW (MainWindow))));
 
-    // Configuration of the search_file window (see misc.c) - Function also called when destroying the window
-    Search_File_Window_Apply_Changes();
+    /* Configuration of the search_file window (see search_dialog.c).
+     * Function also called when destroying the window. */
+    et_search_dialog_apply_changes (ET_SEARCH_DIALOG (et_application_window_get_search_dialog 
(ET_APPLICATION_WINDOW (MainWindow))));
 
     /* Configuration of the load_filename window (see load_files_dialog.c).
      * Function also called when destroying the window. */
diff --git a/src/setting.h b/src/setting.h
index 78ec633..0986c1d 100644
--- a/src/setting.h
+++ b/src/setting.h
@@ -257,11 +257,6 @@ gint    CDDB_SET_TO_FILE_NAME;
 gint    CDDB_RUN_SCANNER;
 
 /* Search Window */
-gint    SET_SEARCH_WINDOW_POSITION;
-gint    SEARCH_WINDOW_X;
-gint    SEARCH_WINDOW_Y;
-gint    SEARCH_WINDOW_HEIGHT;
-gint    SEARCH_WINDOW_WIDTH;
 gint    SEARCH_IN_FILENAME;
 gint    SEARCH_IN_TAG;
 gint    SEARCH_CASE_SENSITIVE;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]