[easytag/wip/application-window: 61/72] Move tag area to EtTagArea object



commit 4751380165d29e793cf24fdbbb1e507de66bf529
Author: David King <amigadave amigadave com>
Date:   Fri Jul 18 08:42:22 2014 +0100

    Move tag area to EtTagArea object

 Makefile.am              |    2 +
 po/POTFILES.in           |    1 +
 src/application_window.c | 1653 +---------------------
 src/application_window.h |    3 +
 src/easytag.c            |    9 +-
 src/easytag.h            |   30 -
 src/et_core.c            |  542 +-------
 src/misc.c               |  200 ---
 src/misc.h               |    4 -
 src/picture.c            |  893 +------------
 src/picture.h            |   49 +-
 src/tag_area.c           | 3537 ++++++++++++++++++++++++++++++++++++++++++++++
 src/tag_area.h           |   62 +
 13 files changed, 3680 insertions(+), 3305 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b88893c..7f617e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,6 +78,7 @@ easytag_SOURCES = \
        src/scan_dialog.c \
        src/search_dialog.c \
        src/setting.c \
+       src/tag_area.c \
        src/vcedit.c \
        src/wavpack_header.c \
        src/wavpack_tag.c \
@@ -128,6 +129,7 @@ easytag_headers = \
        src/scan_dialog.h \
        src/search_dialog.h \
        src/setting.h \
+       src/tag_area.h \
        src/vcedit.h \
        src/wavpack_header.h \
        src/wavpack_tag.h \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b2e644b..0769306 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -35,6 +35,7 @@ src/preferences_dialog.c
 src/scan_dialog.c
 src/search_dialog.c
 src/setting.c
+src/tag_area.c
 src/vcedit.c
 src/wavpack_header.c
 src/wavpack_tag.c
diff --git a/src/application_window.c b/src/application_window.c
index 221b677..aae6c07 100644
--- a/src/application_window.c
+++ b/src/application_window.c
@@ -38,6 +38,7 @@
 #include "scan.h"
 #include "scan_dialog.h"
 #include "setting.h"
+#include "tag_area.h"
 
 /* TODO: Use G_DEFINE_TYPE_WITH_PRIVATE. */
 G_DEFINE_TYPE (EtApplicationWindow, et_application_window, GTK_TYPE_APPLICATION_WINDOW)
@@ -58,38 +59,9 @@ struct _EtApplicationWindowPrivate
     GtkWidget *scan_dialog;
     GtkWidget *search_dialog;
 
-    /* Tag area labels. */
-    GtkWidget *title_label;
-    GtkWidget *artist_label;
-    GtkWidget *album_artist_label;
-    GtkWidget *album_label;
-    GtkWidget *disc_number_label;
-    GtkWidget *year_label;
-    GtkWidget *track_label;
-    GtkWidget *genre_label;
-    GtkWidget *comment_label;
-    GtkWidget *composer_label;
-    GtkWidget *orig_artist_label;
-    GtkWidget *copyright_label;
-    GtkWidget *url_label;
-    GtkWidget *encoded_by_label;
-
-    /* FIXME: Tag area entries. */
-
-    /* Notebook tabs. */
-    GtkWidget *images_tab;
-
-    /* Image treeview model. */
-    GtkListStore *images_model;
-
     GtkWidget *hpaned;
     GtkWidget *vpaned;
 
-    /* Mini buttons. */
-    GtkWidget *track_sequence_button;
-    GtkWidget *track_number_button;
-    GtkToolItem *apply_image_toolitem;
-
     gboolean is_maximized;
     gint height;
     gint width;
@@ -100,12 +72,6 @@ static gboolean SF_HideMsgbox_Delete_File;
 /* To remember which button was pressed when deleting file */
 static gint SF_ButtonPressed_Delete_File;
 
-static gboolean et_tag_field_on_key_press_event (GtkEntry *entry,
-                                                 GdkEventKey *event,
-                                                 gpointer user_data);
-
-static void Mini_Button_Clicked (GObject *object);
-
 static gboolean
 on_main_window_delete_event (GtkWidget *window,
                              GdkEvent *event,
@@ -252,254 +218,42 @@ on_window_state_event (GtkWidget *window,
     return GDK_EVENT_PROPAGATE;
 }
 
-static void
-Convert_P20_And_Underscore_Into_Spaces (GtkWidget *entry)
-{
-    gchar *string = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
-
-    Scan_Convert_Underscore_Into_Space (string);
-    Scan_Convert_P20_Into_Space (string);
-    gtk_entry_set_text (GTK_ENTRY (entry), string);
-    g_free (string);
-}
-
-static void
-Convert_Space_Into_Underscore (GtkWidget *entry)
-{
-    gchar *string = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
-
-    Scan_Convert_Space_Into_Underscore (string);
-    gtk_entry_set_text (GTK_ENTRY (entry), string);
-    g_free (string);
-}
-
-static void
-Convert_All_Uppercase (GtkWidget *entry)
-{
-    gchar *res;
-    const gchar *string = gtk_entry_get_text (GTK_ENTRY (entry));
-
-    res = Scan_Process_Fields_All_Uppercase (string);
-    gtk_entry_set_text (GTK_ENTRY (entry), res);
-    g_free (res);
-}
-
-static void
-Convert_All_Lowercase (GtkWidget *entry)
-{
-    gchar *res;
-    const gchar *string = gtk_entry_get_text (GTK_ENTRY (entry));
-
-    res = Scan_Process_Fields_All_Downcase (string);
-    gtk_entry_set_text (GTK_ENTRY (entry), res);
-    g_free (res);
-}
-
-static void
-Convert_Letter_Uppercase (GtkWidget *entry)
-{
-    gchar *res;
-    const gchar *string = gtk_entry_get_text (GTK_ENTRY (entry));
-
-    res = Scan_Process_Fields_Letter_Uppercase (string);
-    gtk_entry_set_text (GTK_ENTRY (entry), res);
-    g_free (res);
-}
-
-static void
-Convert_First_Letters_Uppercase (GtkWidget *entry)
+File_Tag *
+et_application_window_tag_area_create_file_tag (EtApplicationWindow *self)
 {
-    EtScanDialog *dialog;
-    gchar *string;
-
-    string = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
-    dialog = ET_SCAN_DIALOG (et_application_window_get_scan_dialog (ET_APPLICATION_WINDOW (MainWindow)));
+    EtApplicationWindowPrivate *priv;
 
-    Scan_Process_Fields_First_Letters_Uppercase (dialog, &string);
-    gtk_entry_set_text (GTK_ENTRY (entry), string);
-    g_free (string);
-}
+    g_return_if_fail (ET_APPLICATION_WINDOW (self));
 
-static void
-Convert_Remove_Space (GtkWidget *entry)
-{
-    gchar *string = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+    priv = et_application_window_get_instance_private (self);
 
-    Scan_Process_Fields_Remove_Space (string);
-    gtk_entry_set_text (GTK_ENTRY (entry), string);
-    g_free (string);
+    return et_tag_area_create_file_tag (ET_TAG_AREA (priv->tag_area));
 }
 
-static void
-Convert_Insert_Space (GtkWidget *entry)
+gboolean
+et_application_window_tag_area_display_et_file (EtApplicationWindow *self,
+                                                ET_File *ETFile)
 {
-    gchar *res;
-    const gchar *string = (gtk_entry_get_text (GTK_ENTRY (entry)));
+    EtApplicationWindowPrivate *priv;
 
-    res = Scan_Process_Fields_Insert_Space (string);
-    gtk_entry_set_text (GTK_ENTRY (entry), res);
-    g_free (res);
-}
+    g_return_if_fail (ET_APPLICATION_WINDOW (self));
 
-static void
-Convert_Only_One_Space (GtkWidget *entry)
-{
-    gchar *string = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+    priv = et_application_window_get_instance_private (self);
 
-    Scan_Process_Fields_Keep_One_Space (string);
-    gtk_entry_set_text (GTK_ENTRY (entry), string);
-    g_free (string);
+    return et_tag_area_display_et_file (ET_TAG_AREA (priv->tag_area), ETFile);
 }
 
-static void
-Convert_Remove_All_Text (GtkWidget *entry)
+/* Clear the entries of tag area. */
+void
+et_application_window_tag_area_clear (EtApplicationWindow *self)
 {
-    gtk_entry_set_text (GTK_ENTRY (entry), "");
-}
+    EtApplicationWindowPrivate *priv;
 
-/* TODO: Support populate-all and do not assume the widget is a GtkMenu.
- * Popup menu attached to all entries of tag + filename + rename combobox.
- * Displayed when pressing the right mouse button and contains functions to process ths strings.
- */
-static void
-on_entry_populate_popup (GtkEntry *entry,
-                         GtkWidget *menu,
-                         gpointer user_data)
-{
-    GtkWidget *image;
-    GtkWidget *menu_item;
-
-    /* Menu items */
-    menu_item = gtk_image_menu_item_new_with_label (_("Tag selected files with this field"));
-    image = gtk_image_new_from_icon_name ("go-jump", GTK_ICON_SIZE_MENU);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    g_signal_connect_swapped (menu_item, "activate",
-                              G_CALLBACK (Mini_Button_Clicked),
-                              G_OBJECT (entry));
-
-    /* Separator */
-    menu_item = gtk_menu_item_new ();
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-
-    menu_item = gtk_image_menu_item_new_with_label (_("Convert '_' and '%20' to spaces"));
-    image = gtk_image_new_from_stock (GTK_STOCK_CONVERT, GTK_ICON_SIZE_MENU);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    g_signal_connect_swapped (menu_item, "activate",
-                              G_CALLBACK (Convert_P20_And_Underscore_Into_Spaces),
-                              G_OBJECT (entry));
-
-    menu_item = gtk_image_menu_item_new_with_label (_("Convert ' ' to '_'"));
-    image = gtk_image_new_from_stock (GTK_STOCK_CONVERT, GTK_ICON_SIZE_MENU);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    g_signal_connect_swapped (menu_item, "activate",
-                              G_CALLBACK (Convert_Space_Into_Underscore),
-                              G_OBJECT (entry));
-
-    /* Separator */
-    menu_item = gtk_menu_item_new ();
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-
-    menu_item = gtk_image_menu_item_new_with_label (_("All uppercase"));
-    image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/all-uppercase.png");
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    g_signal_connect_swapped (menu_item, "activate",
-                              G_CALLBACK (Convert_All_Uppercase),
-                              G_OBJECT (entry));
-
-    menu_item = gtk_image_menu_item_new_with_label (_("All lowercase"));
-    image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/all-lowercase.png");
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    g_signal_connect_swapped (menu_item, "activate",
-                              G_CALLBACK (Convert_All_Lowercase),
-                              G_OBJECT (entry));
-
-    menu_item = gtk_image_menu_item_new_with_label (_("First letter uppercase"));
-    image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/first-letter-uppercase.png");
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    g_signal_connect_swapped (menu_item, "activate",
-                              G_CALLBACK (Convert_Letter_Uppercase),
-                              G_OBJECT (entry));
-
-    menu_item = gtk_image_menu_item_new_with_label (_("First letter uppercase of each word"));
-    image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/first-letter-uppercase-word.png");
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    g_signal_connect_swapped (menu_item, "activate",
-                              G_CALLBACK (Convert_First_Letters_Uppercase),
-                              G_OBJECT (entry));
-
-    /* Separator */
-    menu_item = gtk_menu_item_new ();
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-
-    menu_item = gtk_image_menu_item_new_with_label (_("Remove spaces"));
-    image = gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_MENU);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    g_signal_connect_swapped (menu_item, "activate",
-                              G_CALLBACK (Convert_Remove_Space),
-                              G_OBJECT (entry));
-
-    menu_item = gtk_image_menu_item_new_with_label (_("Insert space before uppercase letter"));
-    image = gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_MENU);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    g_signal_connect_swapped (menu_item, "activate",
-                              G_CALLBACK (Convert_Insert_Space),
-                              G_OBJECT (entry));
-
-    menu_item = gtk_image_menu_item_new_with_label (_("Remove duplicate spaces or underscores"));
-    image = gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_MENU);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    g_signal_connect_swapped (menu_item, "activate",
-                              G_CALLBACK (Convert_Only_One_Space),
-                              G_OBJECT (entry));
-
-    menu_item = gtk_image_menu_item_new_with_label (_("Remove all text"));
-    image = gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_MENU);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    g_signal_connect_swapped (menu_item, "activate",
-                              G_CALLBACK (Convert_Remove_All_Text),
-                              G_OBJECT (entry));
-
-    gtk_widget_show_all (menu);
-}
+    g_return_if_fail (ET_APPLICATION_WINDOW (self));
 
+    priv = et_application_window_get_instance_private (self);
 
-/*
- * Clear the entries of tag area
- */
-void
-Clear_Tag_Entry_Fields (void)
-{
-    g_return_if_fail (TitleEntry != NULL);
-
-    gtk_entry_set_text (GTK_ENTRY (TitleEntry), "");
-    gtk_entry_set_text (GTK_ENTRY (ArtistEntry), "");
-    gtk_entry_set_text (GTK_ENTRY (AlbumArtistEntry), "");
-    gtk_entry_set_text (GTK_ENTRY (AlbumEntry), "");
-    gtk_entry_set_text (GTK_ENTRY (DiscNumberEntry), "");
-    gtk_entry_set_text (GTK_ENTRY (YearEntry), "");
-    gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (TrackEntryCombo))),
-                        "");
-    gtk_entry_set_text (GTK_ENTRY (TrackTotalEntry), "");
-    gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (GenreCombo))),
-                        "");
-    gtk_entry_set_text (GTK_ENTRY (CommentEntry), "");
-    gtk_entry_set_text (GTK_ENTRY (ComposerEntry), "");
-    gtk_entry_set_text (GTK_ENTRY (OrigArtistEntry), "");
-    gtk_entry_set_text (GTK_ENTRY (CopyrightEntry), "");
-    gtk_entry_set_text (GTK_ENTRY (URLEntry), "");
-    gtk_entry_set_text (GTK_ENTRY (EncodedByEntry), "");
-    PictureEntry_Clear ();
+    et_tag_area_clear (ET_TAG_AREA (priv->tag_area));
 }
 
 
@@ -534,541 +288,6 @@ Clear_Header_Fields (void)
     gtk_label_set_text (GTK_LABEL (DurationValueLabel), "");
 }
 
-
-static void
-Mini_Button_Clicked (GObject *object)
-{
-    GtkWidget *toplevel;
-    EtApplicationWindowPrivate *priv;
-    GList *etfilelist = NULL;
-    GList *selection_filelist = NULL;
-    GList *l;
-    gchar *string_to_set = NULL;
-    gchar *string_to_set1 = NULL;
-    gchar *msg = NULL;
-    ET_File *etfile;
-    File_Tag *FileTag;
-    GtkTreeSelection *selection;
-
-    g_return_if_fail (ETCore->ETFileDisplayedList != NULL);
-
-    /* FIXME: hack! */
-    toplevel = gtk_widget_get_toplevel (GTK_WIDGET (object));
-
-    if (gtk_widget_is_toplevel (toplevel))
-    {
-        priv = et_application_window_get_instance_private (ET_APPLICATION_WINDOW (toplevel));
-    }
-    else
-    {
-        g_error ("Main window is not a toplevel!");
-    }
-
-    // Save the current displayed data
-    ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
-
-    /* Warning : 'selection_filelist' is not a list of 'ETFile' items! */
-    selection = et_application_window_browser_get_selection (ET_APPLICATION_WINDOW (toplevel));
-    selection_filelist = gtk_tree_selection_get_selected_rows (selection, NULL);
-
-    // Create an 'ETFile' list from 'selection_filelist'
-    for (l = selection_filelist; l != NULL; l = g_list_next (l))
-    {
-        etfile = et_browser_get_et_file_from_path (ET_BROWSER (priv->browser),
-                                                   l->data);
-        etfilelist = g_list_prepend (etfilelist, etfile);
-    }
-
-    etfilelist = g_list_reverse (etfilelist);
-    g_list_free_full (selection_filelist, (GDestroyNotify)gtk_tree_path_free);
-
-
-    if (object == G_OBJECT (TitleEntry))
-    {
-        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(TitleEntry),0,-1); // The string to apply to all 
other files
-
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->title,string_to_set);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with title '%s'."),string_to_set);
-        else
-            msg = g_strdup(_("Removed title from selected files."));
-    }
-    else if (object == G_OBJECT (ArtistEntry))
-    {
-        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(ArtistEntry),0,-1);
-
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->artist,string_to_set);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with artist '%s'."),string_to_set);
-        else
-            msg = g_strdup(_("Removed artist from selected files."));
-    }
-    else if (object == G_OBJECT (AlbumArtistEntry))
-    {
-        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(AlbumArtistEntry),0,-1);
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->album_artist,string_to_set);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with album artist '%s'."),string_to_set);
-        else
-            msg = g_strdup(_("Removed album artist from selected files."));
-    }
-    else if (object == G_OBJECT (AlbumEntry))
-    {
-        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(AlbumEntry),0,-1);
-
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->album,string_to_set);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with album '%s'."),string_to_set);
-        else
-            msg = g_strdup(_("Removed album name from selected files."));
-    }
-    else if (object == G_OBJECT (DiscNumberEntry))
-    {
-        const gchar *entry_text;
-        gchar *separator;
-
-        entry_text = gtk_entry_get_text (GTK_ENTRY (DiscNumberEntry));
-        separator = g_utf8_strchr (entry_text, -1, '/');
-
-        if (separator)
-        {
-            string_to_set1 = g_strdup (separator + 1);
-            string_to_set = g_strndup (entry_text,
-                                       separator - entry_text);
-        }
-        else
-        {
-            string_to_set = g_strdup (entry_text);
-            string_to_set1 = NULL;
-        }
-
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item (&FileTag->disc_number, string_to_set);
-            ET_Set_Field_File_Tag_Item (&FileTag->disc_total, string_to_set1);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-
-        if (string_to_set != NULL && g_utf8_strlen (string_to_set, -1) > 0)
-        {
-            if (string_to_set1 != NULL
-                && g_utf8_strlen (string_to_set1, -1) > 0)
-            {
-                msg = g_strdup_printf (_("Selected files tagged with disc number '%s/%s'."),
-                                       string_to_set, string_to_set1);
-            }
-            else
-            {
-                msg = g_strdup_printf (_("Selected files tagged with disc number like 'xx'."));
-            }
-        }
-        else
-        {
-            msg = g_strdup (_("Removed disc number from selected files."));
-        }
-    }
-    else if (object == G_OBJECT (YearEntry))
-    {
-        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(YearEntry),0,-1);
-
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->year,string_to_set);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with year '%s'."),string_to_set);
-        else
-            msg = g_strdup(_("Removed year from selected files."));
-    }
-    else if (object == G_OBJECT (TrackTotalEntry))
-    {
-        /* Used of Track and Total Track values */
-        string_to_set = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(TrackEntryCombo)))));
-        string_to_set1 = gtk_editable_get_chars(GTK_EDITABLE(TrackTotalEntry),0,-1);
-
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-
-            // We apply the TrackEntry field to all others files only if it is to delete
-            // the field (string=""). Else we don't overwrite the track number
-            if (!string_to_set || g_utf8_strlen(string_to_set, -1) == 0)
-                ET_Set_Field_File_Tag_Item(&FileTag->track,string_to_set);
-            ET_Set_Field_File_Tag_Item(&FileTag->track_total,string_to_set1);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-
-        if ( string_to_set && g_utf8_strlen(string_to_set, -1) > 0 ) //&& atoi(string_to_set)>0 )
-        {
-            if ( string_to_set1 != NULL && g_utf8_strlen(string_to_set1, -1)>0 ) //&& atoi(string_to_set1)>0 
)
-            {
-                msg = g_strdup_printf(_("Selected files tagged with track like 'xx/%s'."),string_to_set1);
-            }else
-            {
-                msg = g_strdup_printf(_("Selected files tagged with track like 'xx'."));
-            }
-        }else
-        {
-            msg = g_strdup(_("Removed track number from selected files."));
-        }
-    }
-    else if (object == G_OBJECT (priv->track_sequence_button))
-    {
-        /* This part doesn't set the same track number to all files, but sequence the tracks.
-         * So we must browse the whole 'etfilelistfull' to get position of each selected file.
-         * Note : 'etfilelistfull' and 'etfilelist' must be sorted in the same order */
-        GList *etfilelistfull = NULL;
-        gint sort_mode;
-        gchar *path = NULL;
-        gchar *path1 = NULL;
-        gint i = 0;
-
-        /* FIX ME!: see to fill also the Total Track (it's a good idea?) */
-        etfilelistfull = g_list_first(ETCore->ETFileList);
-
-        /* Sort 'etfilelistfull' and 'etfilelist' in the same order. */
-        sort_mode = g_settings_get_enum (MainSettings, "sort-mode");
-        etfilelist = ET_Sort_File_List (etfilelist, sort_mode);
-        etfilelistfull = ET_Sort_File_List (etfilelistfull, sort_mode);
-
-        while (etfilelist && etfilelistfull)
-        {
-            // To get the path of the file
-            File_Name *FileNameCur = (File_Name *)((ET_File *)etfilelistfull->data)->FileNameCur->data;
-            // The ETFile in the selected file list
-            etfile = etfilelist->data;
-
-            // Restart counter when entering a new directory
-            g_free(path1);
-            path1 = g_path_get_dirname(FileNameCur->value);
-            if ( path && path1 && strcmp(path,path1)!=0 )
-                i = 0;
-
-            string_to_set = et_track_number_to_string (++i);
-
-            // The file is in the selection?
-            if ( (ET_File *)etfilelistfull->data == etfile )
-            {
-                FileTag = ET_File_Tag_Item_New();
-                ET_Copy_File_Tag_Item(etfile,FileTag);
-                ET_Set_Field_File_Tag_Item(&FileTag->track,string_to_set);
-                ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-
-                if (!etfilelist->next) break;
-                etfilelist = g_list_next(etfilelist);
-            }
-
-            g_free(string_to_set);
-            g_free(path);
-            path = g_strdup(path1);
-
-            etfilelistfull = g_list_next(etfilelistfull);
-        }
-        g_free(path);
-        g_free(path1);
-        //msg = g_strdup_printf(_("All %d tracks numbered sequentially."), 
ETCore->ETFileSelectionList_Length);
-        msg = g_strdup_printf(_("Selected tracks numbered sequentially."));
-    }
-    else if (object==G_OBJECT(priv->track_number_button))
-    {
-        /* Used of Track and Total Track values */
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            gchar *path_utf8, *filename_utf8;
-
-            etfile        = (ET_File *)l->data;
-            filename_utf8 = ((File_Name *)etfile->FileNameNew->data)->value_utf8;
-            path_utf8     = g_path_get_dirname(filename_utf8);
-
-            string_to_set = et_track_number_to_string (ET_Get_Number_Of_Files_In_Directory (path_utf8));
-
-            g_free(path_utf8);
-            if (!string_to_set1)
-                string_to_set1 = g_strdup(string_to_set); // Just for the message below...
-
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->track_total,string_to_set);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-
-        if ( string_to_set1 != NULL && g_utf8_strlen(string_to_set1, -1)>0 ) //&& atoi(string_to_set1)>0 )
-        {
-            msg = g_strdup_printf(_("Selected files tagged with track like 'xx/%s'."),string_to_set1);
-        }else
-        {
-            msg = g_strdup(_("Removed track number from selected files."));
-        }
-    }
-    else if (object == G_OBJECT (gtk_bin_get_child (GTK_BIN (GenreCombo))))
-    {
-        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(GenreCombo))),0,-1);
-
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->genre,string_to_set);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with genre '%s'."),string_to_set);
-        else
-            msg = g_strdup(_("Removed genre from selected files."));
-    }
-    else if (object == G_OBJECT (CommentEntry))
-    {
-        //GtkTextBuffer *textbuffer;
-        //GtkTextIter    start_iter;
-        //GtkTextIter    end_iter;
-        //textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(CommentView));
-        //gtk_text_buffer_get_bounds(GTK_TEXT_BUFFER(textbuffer),&start_iter,&end_iter);
-        //string_to_set = gtk_text_buffer_get_text(GTK_TEXT_BUFFER(textbuffer),&start_iter,&end_iter,TRUE);
-
-        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(CommentEntry),0,-1);
-
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->comment,string_to_set);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with comment '%s'."),string_to_set);
-        else
-            msg = g_strdup(_("Removed comment from selected files."));
-    }
-    else if (object == G_OBJECT (ComposerEntry))
-    {
-        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(ComposerEntry),0,-1);
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->composer,string_to_set);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with composer '%s'."),string_to_set);
-        else
-            msg = g_strdup(_("Removed composer from selected files."));
-    }
-    else if (object == G_OBJECT (OrigArtistEntry))
-    {
-        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(OrigArtistEntry),0,-1);
-
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->orig_artist,string_to_set);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with original artist '%s'."),string_to_set);
-        else
-            msg = g_strdup(_("Removed original artist from selected files."));
-    }
-    else if (object == G_OBJECT (CopyrightEntry))
-    {
-        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(CopyrightEntry),0,-1);
-
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->copyright,string_to_set);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with copyright '%s'."),string_to_set);
-        else
-            msg = g_strdup(_("Removed copyright from selected files."));
-    }
-    else if (object == G_OBJECT (URLEntry))
-    {
-        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(URLEntry),0,-1);
-
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->url,string_to_set);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with URL '%s'."),string_to_set);
-        else
-            msg = g_strdup(_("Removed URL from selected files."));
-    }
-    else if (object == G_OBJECT (EncodedByEntry))
-    {
-        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(EncodedByEntry),0,-1);
-
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->encoded_by,string_to_set);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with encoder name '%s'."),string_to_set);
-        else
-            msg = g_strdup(_("Removed encoder name from selected files."));
-    }
-    else if (object == G_OBJECT (priv->apply_image_toolitem))
-    {
-        Picture *res = NULL, *pic, *prev_pic = NULL;
-        GtkTreeModel *model;
-        GtkTreeIter iter;
-
-        model = gtk_tree_view_get_model(GTK_TREE_VIEW(PictureEntryView));
-        if (gtk_tree_model_get_iter_first(model, &iter))
-        {
-            do
-            {
-                gtk_tree_model_get(model, &iter, PICTURE_COLUMN_DATA, &pic, -1);
-                pic = Picture_Copy_One(pic);
-                if (!res)
-                    res = pic;
-                else
-                    prev_pic->next = pic;
-                prev_pic = pic;
-            } while (gtk_tree_model_iter_next(model, &iter));
-        }
-
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
-        {
-            etfile = (ET_File *)l->data;
-            FileTag = ET_File_Tag_Item_New();
-            ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Picture((Picture **)&FileTag->picture, res);
-            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
-        }
-        if (res)
-            msg = g_strdup (_("Selected files tagged with images."));
-        else
-            msg = g_strdup (_("Removed images from selected files."));
-        Picture_Free(res);
-    }
-
-    g_list_free(etfilelist);
-
-    /* Refresh the whole list (faster than file by file) to show changes. */
-    et_application_window_browser_refresh_list (ET_APPLICATION_WINDOW (toplevel));
-
-    /* Display the current file (Needed when sequencing tracks) */
-    ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
-
-    if (msg)
-    {
-        Log_Print(LOG_OK,"%s",msg);
-        Statusbar_Message(msg,TRUE);
-        g_free(msg);
-    }
-    g_free(string_to_set);
-    g_free(string_to_set1);
-
-    /* To update state of Undo button */
-    et_application_window_update_actions (ET_APPLICATION_WINDOW (toplevel));
-}
-
-/*
- * et_tag_field_connect_signals:
- * @entry: the entry for which to connect signals
- *
- * Connect the GtkWidget::key-press-event and GtkEntry::icon-release signals
- * of @entry to appropriate handlers for tag entry fields.
- */
-static void
-et_tag_field_connect_signals (GtkEntry *entry)
-{
-    g_signal_connect_after (entry, "key-press-event",
-                            G_CALLBACK (et_tag_field_on_key_press_event),
-                            NULL);
-    g_signal_connect (entry, "icon-release", G_CALLBACK (Mini_Button_Clicked),
-                      NULL);
-}
-
-/*
- * et_tag_field_on_key_press_event:
- * @entry: the tag entry field on which the event was generated
- * @event: the generated event
- * @user_data: user data set when the signal was connected
- *
- * Handle the Ctrl+Return combination being pressed in the tag field GtkEntrys
- * and apply the tag to selected files.
- *
- * Returns: %TRUE if the event was handled, %FALSE if the event should
- * propagate further
- */
-static gboolean
-et_tag_field_on_key_press_event (GtkEntry *entry, GdkEventKey *event,
-                                 gpointer user_data)
-{
-    GdkModifierType modifiers = gtk_accelerator_get_default_mod_mask ();
-
-    switch (event->keyval)
-    {
-        case GDK_KEY_Return:
-        case GDK_KEY_KP_Enter:
-        case GDK_KEY_ISO_Enter:
-            if ((event->state & modifiers) == GDK_CONTROL_MASK)
-            {
-                Mini_Button_Clicked (G_OBJECT (entry));
-            }
-            return TRUE;
-        default:
-            return FALSE;
-    }
-}
-
 static GtkWidget *
 create_browser_area (EtApplicationWindow *self)
 {
@@ -1187,598 +406,6 @@ create_file_area (void)
     return FileFrame;
 }
 
-static GtkWidget *
-create_tag_area (EtApplicationWindow *self)
-{
-    EtApplicationWindowPrivate *priv;
-    GtkWidget *separator;
-    GtkWidget *table;
-    GtkWidget *label;
-    GtkWidget *scrolled_window;
-    GtkWidget *toolbar;
-    GIcon *icon;
-    GtkWidget *image;
-    GtkWidget *vbox;
-    GList *focus_chain = NULL;
-    GtkEntryCompletion *completion;
-    gint MButtonSize = 13;
-    gint TablePadding = 2;
-
-    /* For Picture. */
-    static const GtkTargetEntry drops[] = { { "text/uri-list", 0,
-                                              TARGET_URI_LIST } };
-    GtkCellRenderer *renderer;
-    GtkTreeViewColumn *column;
-    GtkTreeSelection *selection;
-
-    priv = et_application_window_get_instance_private (self);
-
-    /* Main Frame */
-    TagFrame = gtk_frame_new (_("Tag"));
-    gtk_container_set_border_width (GTK_CONTAINER (TagFrame), 2);
-
-    /* Box for the notebook (only for setting a border) */
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL ,0);
-    gtk_container_add (GTK_CONTAINER (TagFrame), vbox);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
-
-    /*
-     * Note book
-     */
-    TagNoteBook = gtk_notebook_new ();
-    gtk_notebook_popup_enable (GTK_NOTEBOOK (TagNoteBook));
-    gtk_box_pack_start (GTK_BOX (vbox), TagNoteBook, TRUE, TRUE, 0);
-    gtk_notebook_set_tab_pos (GTK_NOTEBOOK (TagNoteBook), GTK_POS_TOP);
-    gtk_notebook_set_show_border (GTK_NOTEBOOK (TagNoteBook), FALSE);
-    gtk_notebook_popup_enable (GTK_NOTEBOOK (TagNoteBook));
-
-    /*
-     * 1 - Page for common tag fields
-     */
-    label = gtk_label_new (_("Common"));
-
-    table = et_grid_new (11, 11);
-    gtk_notebook_append_page (GTK_NOTEBOOK (TagNoteBook), table, label);
-    gtk_container_set_border_width (GTK_CONTAINER (table), 2);
-
-    /* Title */
-    priv->title_label = gtk_label_new (_("Title:"));
-    et_grid_attach_full (GTK_GRID (table), priv->title_label, 0, 0, 1, 1,
-                         FALSE, FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->title_label), 1.0, 0.5);
-
-    TitleEntry = gtk_entry_new ();
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (TitleEntry),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    et_grid_attach_full (GTK_GRID (table), TitleEntry, 1, 0, 9, 1, TRUE, TRUE,
-                         TablePadding, TablePadding);
-
-    et_tag_field_connect_signals (GTK_ENTRY (TitleEntry));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (TitleEntry),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this title"));
-
-    g_signal_connect (TitleEntry, "populate-popup",
-                      G_CALLBACK (on_entry_populate_popup), NULL);
-
-    /* Artist */
-    priv->artist_label = gtk_label_new (_("Artist:"));
-    et_grid_attach_full (GTK_GRID (table), priv->artist_label, 0, 1, 1, 1,
-                         FALSE, FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->artist_label), 1.0, 0.5);
-
-    ArtistEntry = gtk_entry_new ();
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (ArtistEntry),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    et_grid_attach_full (GTK_GRID (table), ArtistEntry, 1, 1, 9, 1, TRUE, TRUE,
-                         TablePadding,TablePadding);
-
-    et_tag_field_connect_signals (GTK_ENTRY (ArtistEntry));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (ArtistEntry),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this artist"));
-
-    g_signal_connect (ArtistEntry, "populate-popup",
-                      G_CALLBACK (on_entry_populate_popup), NULL);
-
-    /* Album Artist */
-    priv->album_artist_label = gtk_label_new (_("Album artist:"));
-    et_grid_attach_full (GTK_GRID (table), priv->album_artist_label, 0, 2, 1,
-                         1, FALSE, FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->album_artist_label), 1.0, 0.5);
-
-    AlbumArtistEntry = gtk_entry_new ();
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (AlbumArtistEntry),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    et_grid_attach_full (GTK_GRID (table), AlbumArtistEntry, 1, 2, 9, 1, TRUE,
-                         TRUE, TablePadding, TablePadding);
-
-    et_tag_field_connect_signals (GTK_ENTRY (AlbumArtistEntry));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (AlbumArtistEntry),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this album artist"));
-
-    g_signal_connect (AlbumArtistEntry, "populate-popup",
-                      G_CALLBACK (on_entry_populate_popup), NULL);
-
-    /* Album */
-    priv->album_label = gtk_label_new (_("Album:"));
-    et_grid_attach_full (GTK_GRID (table), priv->album_label, 0, 3, 1, 1,
-                         FALSE, FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->album_label), 1.0, 0.5);
-
-    AlbumEntry = gtk_entry_new ();
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (AlbumEntry),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    et_grid_attach_full (GTK_GRID (table), AlbumEntry, 1, 3, 6, 1, TRUE, TRUE,
-                         TablePadding, TablePadding);
-
-    et_tag_field_connect_signals (GTK_ENTRY (AlbumEntry));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (AlbumEntry),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this album name"));
-
-    g_signal_connect (AlbumEntry, "populate-popup",
-                      G_CALLBACK (on_entry_populate_popup), NULL);
-
-    /* Disc Number */
-    priv->disc_number_label = gtk_label_new (_("CD:"));
-    et_grid_attach_full (GTK_GRID (table), priv->disc_number_label, 8, 3, 1, 1,
-                         FALSE, FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->disc_number_label), 1.0, 0.5);
-
-    DiscNumberEntry = gtk_entry_new ();
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (DiscNumberEntry),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    et_grid_attach_full (GTK_GRID (table), DiscNumberEntry, 9, 3, 1, 1, TRUE,
-                         TRUE, TablePadding, TablePadding);
-    gtk_entry_set_width_chars (GTK_ENTRY (DiscNumberEntry), 3);
-    /* FIXME should allow to type only something like : 1/3. */
-    
/*g_signal_connect(G_OBJECT(GTK_ENTRY(DiscNumberEntry)),"insert_text",G_CALLBACK(Insert_Only_Digit),NULL); */
-
-    et_tag_field_connect_signals (GTK_ENTRY (DiscNumberEntry));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (DiscNumberEntry),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this disc number"));
-
-    g_signal_connect (DiscNumberEntry, "populate-popup",
-                      G_CALLBACK (on_entry_populate_popup), NULL);
-
-    /* Year */
-    priv->year_label = gtk_label_new (_("Year:"));
-    et_grid_attach_full (GTK_GRID (table), priv->year_label, 0, 4, 1, 1, FALSE,
-                         FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->year_label), 1.0, 0.5);
-
-    YearEntry = gtk_entry_new ();
-    gtk_entry_set_max_length (GTK_ENTRY (YearEntry), 4);
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (YearEntry),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    et_grid_attach_full (GTK_GRID (table), YearEntry, 1, 4, 1, 1, TRUE, TRUE,
-                         TablePadding, TablePadding);
-    gtk_entry_set_width_chars (GTK_ENTRY (YearEntry), 5);
-    g_signal_connect (YearEntry, "insert-text", G_CALLBACK (Insert_Only_Digit),
-                      NULL);
-    g_signal_connect (YearEntry, "activate", G_CALLBACK (Parse_Date), NULL);
-    g_signal_connect (YearEntry, "focus-out-event", G_CALLBACK (Parse_Date),
-                      NULL);
-
-    et_tag_field_connect_signals (GTK_ENTRY (YearEntry));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (YearEntry),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this year"));
-
-    /* Small vertical separator */
-    separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
-    et_grid_attach_full (GTK_GRID (table), separator, 3, 4, 1, 1, FALSE, FALSE,
-                         TablePadding,TablePadding);
-
-    /* Track and Track total */
-    priv->track_sequence_button = gtk_button_new ();
-    gtk_widget_set_size_request (priv->track_sequence_button, MButtonSize,
-                                 MButtonSize);
-    et_grid_attach_full (GTK_GRID (table), priv->track_sequence_button, 4, 4,
-                         1, 1, FALSE, FALSE, TablePadding, TablePadding);
-    g_signal_connect (priv->track_sequence_button, "clicked",
-                      G_CALLBACK (Mini_Button_Clicked), NULL);
-    gtk_widget_set_tooltip_text (priv->track_sequence_button,
-                                 _("Number selected tracks sequentially. "
-                                   "Starts at 01 in each subdirectory."));
-    /* Pixmap into priv->track_sequence_button button. */
-    image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/sequence-track.png");
-    gtk_container_add (GTK_CONTAINER (priv->track_sequence_button), image);
-    gtk_widget_set_can_default (priv->track_sequence_button, TRUE);
-    gtk_widget_set_can_focus (priv->track_sequence_button, FALSE);
-
-    priv->track_label = gtk_label_new (_("Track #:"));
-    et_grid_attach_full (GTK_GRID (table), priv->track_label, 5, 4, 1, 1,
-                         FALSE, FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->track_label), 1.0, 0.5);
-
-    if (TrackEntryComboModel != NULL)
-    {
-        gtk_list_store_clear (TrackEntryComboModel);
-    }
-    else
-    {
-        TrackEntryComboModel = gtk_list_store_new (MISC_COMBO_COUNT,
-                                                   G_TYPE_STRING);
-    }
-
-    TrackEntryCombo = gtk_combo_box_new_with_model_and_entry (GTK_TREE_MODEL (TrackEntryComboModel));
-    gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (TrackEntryCombo),
-                                         MISC_COMBO_TEXT);
-    et_grid_attach_full (GTK_GRID (table), TrackEntryCombo, 6, 4, 1, 1, TRUE,
-                         TRUE, TablePadding, TablePadding);
-    gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (TrackEntryCombo), 3); // Three columns to display track 
numbers list
-
-    gtk_entry_set_width_chars (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (TrackEntryCombo))),
-                               2);
-    g_signal_connect (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (TrackEntryCombo))),
-                      "insert-text", G_CALLBACK (Insert_Only_Digit), NULL);
-
-    label = gtk_label_new ("/");
-    et_grid_attach_full (GTK_GRID (table), label, 7, 4, 1, 1, FALSE, FALSE,
-                         TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
-
-    priv->track_number_button = gtk_button_new ();
-    gtk_widget_set_size_request (priv->track_number_button, MButtonSize,
-                                 MButtonSize);
-    et_grid_attach_full (GTK_GRID (table), priv->track_number_button, 8, 4, 1,
-                         1, FALSE, FALSE, TablePadding, TablePadding);
-    g_signal_connect (priv->track_number_button, "clicked",
-                      G_CALLBACK (Mini_Button_Clicked), NULL);
-    gtk_widget_set_tooltip_text (priv->track_number_button,
-                                 _("Set the number of files, in the same directory of the displayed file, to 
the selected tracks."));
-    /* Pixmap into priv->track_number_button button. */
-    image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/sequence-track.png");
-    gtk_container_add (GTK_CONTAINER (priv->track_number_button), image);
-    gtk_widget_set_can_default (priv->track_number_button, TRUE);
-    gtk_widget_set_can_focus (priv->track_number_button, FALSE);
-
-    TrackTotalEntry = gtk_entry_new();
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (TrackTotalEntry),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    et_grid_attach_full (GTK_GRID (table), TrackTotalEntry, 9, 4, 1, 1, TRUE,
-                         TRUE, TablePadding, TablePadding);
-    gtk_entry_set_width_chars (GTK_ENTRY (TrackTotalEntry), 3);
-    g_signal_connect (GTK_ENTRY (TrackTotalEntry), "insert-text",
-                      G_CALLBACK (Insert_Only_Digit), NULL);
-
-    et_tag_field_connect_signals (GTK_ENTRY (TrackTotalEntry));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (TrackTotalEntry),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this number of tracks"));
-
-    /* Genre */
-    priv->genre_label = gtk_label_new (_("Genre:"));
-    et_grid_attach_full (GTK_GRID (table), priv->genre_label, 0, 5, 1, 1,
-                         FALSE, FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->genre_label), 1.0, 0.5);
-
-    if (GenreComboModel != NULL)
-    {
-        gtk_list_store_clear (GenreComboModel);
-    }
-    else
-    {
-        GenreComboModel = gtk_list_store_new (MISC_COMBO_COUNT, G_TYPE_STRING);
-    }
-    GenreCombo = gtk_combo_box_new_with_model_and_entry (GTK_TREE_MODEL (GenreComboModel));
-    gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (GenreCombo),
-                                         MISC_COMBO_TEXT);
-    completion = gtk_entry_completion_new ();
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (GenreCombo))),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    gtk_entry_set_completion (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (GenreCombo))),
-                              completion);
-    g_object_unref (completion);
-    gtk_entry_completion_set_model (completion,
-                                    GTK_TREE_MODEL (GenreComboModel));
-    gtk_entry_completion_set_text_column (completion, 0);
-    gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (GenreComboModel),
-                                     MISC_COMBO_TEXT, Combo_Alphabetic_Sort,
-                                     NULL, NULL);
-    gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (GenreComboModel),
-                                          MISC_COMBO_TEXT, GTK_SORT_ASCENDING);
-    et_grid_attach_full (GTK_GRID (table), GenreCombo, 1, 5, 9, 1, TRUE, TRUE,
-                         TablePadding, TablePadding);
-    Load_Genres_List_To_UI ();
-    gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (GenreCombo), 2); // Two columns to display genres list
-
-    et_tag_field_connect_signals (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (GenreCombo))));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (GenreCombo))),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this genre"));
-
-    g_signal_connect (gtk_bin_get_child (GTK_BIN (GenreCombo)),
-                      "populate-popup", G_CALLBACK (on_entry_populate_popup),
-                      NULL);
-
-    /* Comment */
-    priv->comment_label = gtk_label_new (_("Comment:"));
-    et_grid_attach_full (GTK_GRID (table), priv->comment_label, 0, 6, 1, 1,
-                         FALSE, FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->comment_label), 1.0, 0.5);
-
-    CommentEntry = gtk_entry_new ();
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (CommentEntry),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    et_grid_attach_full (GTK_GRID (table), CommentEntry, 1, 6, 9, 1, TRUE,
-                         TRUE, TablePadding, TablePadding);
-
-    et_tag_field_connect_signals (GTK_ENTRY (CommentEntry));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (CommentEntry),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this comment"));
-
-    g_signal_connect (CommentEntry, "populate-popup",
-                      G_CALLBACK (on_entry_populate_popup), NULL);
-
-    /* Composer (name of the composers) */
-    priv->composer_label = gtk_label_new (_("Composer:"));
-    et_grid_attach_full (GTK_GRID (table), priv->composer_label, 0, 7, 1, 1,
-                         FALSE, FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->composer_label), 1.0, 0.5);
-
-    ComposerEntry = gtk_entry_new ();
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (ComposerEntry),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    et_grid_attach_full (GTK_GRID (table), ComposerEntry, 1, 7, 9, 1, TRUE,
-                         TRUE, TablePadding, TablePadding);
-
-    et_tag_field_connect_signals (GTK_ENTRY (ComposerEntry));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (ComposerEntry),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this composer"));
-
-    g_signal_connect (ComposerEntry, "populate-popup",
-                      G_CALLBACK (on_entry_populate_popup), NULL);
-
-    /* Translators: Original Artist / Performer. Please try to keep this string
-     * as short as possible, as it must fit into a narrow column. */
-    priv->orig_artist_label = gtk_label_new (_("Orig. artist:"));
-    et_grid_attach_full (GTK_GRID (table), priv->orig_artist_label, 0, 8, 1, 1,
-                         FALSE, FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->orig_artist_label), 1.0, 0.5);
-
-    OrigArtistEntry = gtk_entry_new ();
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (OrigArtistEntry),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    et_grid_attach_full (GTK_GRID (table), OrigArtistEntry, 1, 8, 9, 1, TRUE,
-                         TRUE, TablePadding, TablePadding);
-
-    et_tag_field_connect_signals (GTK_ENTRY (OrigArtistEntry));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (OrigArtistEntry),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this original artist"));
-
-    g_signal_connect (OrigArtistEntry, "populate-popup",
-                      G_CALLBACK (on_entry_populate_popup), NULL);
-
-
-    /* Copyright */
-    priv->copyright_label = gtk_label_new (_("Copyright:"));
-    et_grid_attach_full (GTK_GRID (table), priv->copyright_label, 0, 9, 1, 1,
-                         FALSE, FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->copyright_label), 1.0, 0.5);
-
-    CopyrightEntry = gtk_entry_new ();
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (CopyrightEntry),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    et_grid_attach_full (GTK_GRID (table), CopyrightEntry, 1, 9, 9, 1, TRUE,
-                         TRUE, TablePadding, TablePadding);
-
-    et_tag_field_connect_signals (GTK_ENTRY (CopyrightEntry));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (CopyrightEntry),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this copyright"));
-
-    g_signal_connect (CopyrightEntry, "populate-popup",
-                      G_CALLBACK (on_entry_populate_popup), NULL);
-
-
-    /* URL */
-    priv->url_label = gtk_label_new (_("URL:"));
-    et_grid_attach_full (GTK_GRID (table), priv->url_label, 0, 10, 1, 1, FALSE,
-                         FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->url_label), 1.0, 0.5);
-
-    URLEntry = gtk_entry_new ();
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (URLEntry),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    et_grid_attach_full (GTK_GRID (table), URLEntry, 1, 10, 9, 1, TRUE, TRUE,
-                         TablePadding, TablePadding);
-
-    et_tag_field_connect_signals (GTK_ENTRY (URLEntry));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (URLEntry),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this URL"));
-
-    g_signal_connect (URLEntry, "populate-popup",
-                      G_CALLBACK (on_entry_populate_popup), NULL);
-
-
-    /* Encoded by */
-    priv->encoded_by_label = gtk_label_new (_("Encoded by:"));
-    et_grid_attach_full (GTK_GRID (table), priv->encoded_by_label, 0, 11, 1, 1,
-                         FALSE, FALSE, TablePadding, TablePadding);
-    gtk_misc_set_alignment (GTK_MISC (priv->encoded_by_label), 1.0, 0.5);
-
-    EncodedByEntry = gtk_entry_new ();
-    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (EncodedByEntry),
-                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
-    et_grid_attach_full (GTK_GRID (table), EncodedByEntry, 1, 11, 9, 1, TRUE,
-                         TRUE, TablePadding, TablePadding);
-
-    et_tag_field_connect_signals (GTK_ENTRY (EncodedByEntry));
-    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (EncodedByEntry),
-                                     GTK_ENTRY_ICON_SECONDARY,
-                                     _("Tag selected files with this encoder name"));
-
-    g_signal_connect (EncodedByEntry, "populate-popup",
-                      G_CALLBACK (on_entry_populate_popup), NULL);
-
-    /* Set focus chain. */
-    focus_chain = g_list_prepend (focus_chain, TitleEntry);
-    focus_chain = g_list_prepend (focus_chain, ArtistEntry);
-    focus_chain = g_list_prepend (focus_chain, AlbumArtistEntry);
-    focus_chain = g_list_prepend (focus_chain, AlbumEntry);
-    focus_chain = g_list_prepend (focus_chain, DiscNumberEntry);
-    focus_chain = g_list_prepend (focus_chain, YearEntry);
-    focus_chain = g_list_prepend (focus_chain, TrackEntryCombo);
-    focus_chain = g_list_prepend (focus_chain, TrackTotalEntry);
-    focus_chain = g_list_prepend (focus_chain, GenreCombo);
-    focus_chain = g_list_prepend (focus_chain, CommentEntry);
-    focus_chain = g_list_prepend (focus_chain, ComposerEntry);
-    focus_chain = g_list_prepend (focus_chain, OrigArtistEntry);
-    focus_chain = g_list_prepend (focus_chain, CopyrightEntry);
-    focus_chain = g_list_prepend (focus_chain, URLEntry);
-    focus_chain = g_list_prepend (focus_chain, EncodedByEntry);
-    /* More efficient than using g_list_append(), which must traverse the
-     * whole list. */
-    focus_chain = g_list_reverse (focus_chain);
-    gtk_container_set_focus_chain (GTK_CONTAINER (table), focus_chain);
-
-
-    /*
-     * 2 - Page for extra tag fields
-     */
-    /* Also used in ET_Display_File_Tag_To_UI. */
-    label = gtk_label_new (_("Images"));
-
-    priv->images_tab = table = et_grid_new (1, 2);
-    gtk_notebook_append_page (GTK_NOTEBOOK (TagNoteBook), table, label);
-    gtk_container_set_border_width (GTK_CONTAINER (table), 2);
-
-    /* Scroll window for PictureEntryView. */
-    scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-                                    GTK_POLICY_AUTOMATIC,
-                                    GTK_POLICY_AUTOMATIC);
-    et_grid_attach_full (GTK_GRID (table), scrolled_window, 0, 0, 1, 1,
-                         TRUE, TRUE, TablePadding, TablePadding);
-
-    priv->images_model = gtk_list_store_new (PICTURE_COLUMN_COUNT,
-                                             GDK_TYPE_PIXBUF, G_TYPE_STRING,
-                                             G_TYPE_POINTER);
-    PictureEntryView = gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->images_model));
-    g_object_unref (priv->images_model);
-    gtk_container_add (GTK_CONTAINER (scrolled_window), PictureEntryView);
-    gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (PictureEntryView), FALSE);
-    gtk_widget_set_size_request (PictureEntryView, -1, 200);
-    gtk_widget_set_tooltip_text (PictureEntryView,
-                                 _("You can use drag and drop to add an image"));
-
-    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (PictureEntryView));
-    gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
-
-    renderer = gtk_cell_renderer_pixbuf_new ();
-    column = gtk_tree_view_column_new ();
-    gtk_tree_view_column_pack_start (column, renderer, FALSE);
-    gtk_tree_view_column_set_attributes (column, renderer, "pixbuf",
-                                         PICTURE_COLUMN_PIC, NULL);
-    gtk_tree_view_append_column (GTK_TREE_VIEW (PictureEntryView), column);
-    gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    renderer = gtk_cell_renderer_text_new ();
-    column = gtk_tree_view_column_new ();
-    gtk_tree_view_column_pack_start (column, renderer, FALSE);
-    gtk_tree_view_column_set_attributes (column, renderer, "text",
-                                         PICTURE_COLUMN_TEXT, NULL);
-    gtk_tree_view_append_column (GTK_TREE_VIEW (PictureEntryView), column);
-    gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-    /* Activate Drag'n'Drop for the PictureEntryView. */
-    gtk_drag_dest_set(GTK_WIDGET(PictureEntryView),
-                      GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
-                      drops, sizeof(drops) / sizeof(GtkTargetEntry),
-                      GDK_ACTION_COPY);
-    g_signal_connect (PictureEntryView, "drag-data-received",
-                      G_CALLBACK (Tag_Area_Picture_Drag_Data), 0);
-    g_signal_connect (selection, "changed",
-                      G_CALLBACK (Picture_Selection_Changed_cb), NULL);
-    g_signal_connect (PictureEntryView, "button-press-event",
-                      G_CALLBACK (Picture_Entry_View_Button_Pressed), NULL);
-    g_signal_connect (PictureEntryView, "key-press-event",
-                      G_CALLBACK (Picture_Entry_View_Key_Pressed), NULL);
-
-    /* Picture action toolbar. */
-    toolbar = gtk_toolbar_new ();
-    gtk_style_context_add_class (gtk_widget_get_style_context (toolbar),
-                                 GTK_STYLE_CLASS_INLINE_TOOLBAR);
-    gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
-    gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU);
-    et_grid_attach_full (GTK_GRID (table), toolbar, 0, 1, 1, 1, FALSE, FALSE,
-                        TablePadding, TablePadding);
-
-    /* TODO: Make the icons use the symbolic variants. */
-    icon = g_themed_icon_new_with_default_fallbacks ("list-add");
-    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
-    add_image_toolitem = gtk_tool_button_new (image, NULL);
-    g_object_unref (icon);
-    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), add_image_toolitem, -1);
-    gtk_widget_set_tooltip_text (GTK_WIDGET (add_image_toolitem),
-                                 _("Add images to the tag"));
-    g_signal_connect (add_image_toolitem, "clicked",
-                      G_CALLBACK (Picture_Add_Button_Clicked), NULL);
-
-    /* Activate Drag'n'Drop for the add_image_toolitem. */
-    gtk_drag_dest_set (GTK_WIDGET (add_image_toolitem),
-                       GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
-                       drops, sizeof(drops) / sizeof(GtkTargetEntry),
-                       GDK_ACTION_COPY);
-    g_signal_connect (add_image_toolitem, "drag-data-received",
-                      G_CALLBACK (Tag_Area_Picture_Drag_Data), 0);
-
-    icon = g_themed_icon_new_with_default_fallbacks ("list-remove");
-    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
-    remove_image_toolitem = gtk_tool_button_new (image, NULL);
-    g_object_unref (icon);
-    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), remove_image_toolitem, -1);
-    gtk_widget_set_tooltip_text (GTK_WIDGET (remove_image_toolitem),
-                                 _("Remove selected images from the tag"));
-    gtk_widget_set_sensitive (GTK_WIDGET (remove_image_toolitem), FALSE);
-    g_signal_connect (remove_image_toolitem, "clicked",
-                      G_CALLBACK (Picture_Clear_Button_Clicked), NULL);
-
-    icon = g_themed_icon_new_with_default_fallbacks ("document-save");
-    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
-    save_image_toolitem = gtk_tool_button_new (image, NULL);
-    g_object_unref (icon);
-    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), save_image_toolitem, -1);
-    gtk_widget_set_tooltip_text (GTK_WIDGET (save_image_toolitem),
-                                 _("Save the selected images to files"));
-    gtk_widget_set_sensitive (GTK_WIDGET (save_image_toolitem), FALSE);
-    g_signal_connect (save_image_toolitem, "clicked",
-                      G_CALLBACK (Picture_Save_Button_Clicked), NULL);
-
-    icon = g_themed_icon_new_with_default_fallbacks ("document-properties");
-    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
-    image_properties_toolitem = gtk_tool_button_new (image, NULL);
-    g_object_unref (icon);
-    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), image_properties_toolitem, -1);
-    gtk_widget_set_tooltip_text (GTK_WIDGET (image_properties_toolitem),
-                                 _("Edit image properties"));
-    gtk_widget_set_sensitive (GTK_WIDGET (image_properties_toolitem), FALSE);
-    g_signal_connect (image_properties_toolitem, "clicked",
-                      G_CALLBACK (Picture_Properties_Button_Clicked), NULL);
-
-    icon = g_themed_icon_new_with_default_fallbacks ("insert-image");
-    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
-    priv->apply_image_toolitem = gtk_tool_button_new (image, NULL);
-    g_object_unref (icon);
-    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->apply_image_toolitem, -1);
-    gtk_widget_set_tooltip_text (GTK_WIDGET (priv->apply_image_toolitem),
-                                 _("Tag selected files with these images"));
-    g_signal_connect (priv->apply_image_toolitem, "clicked",
-                      G_CALLBACK (Mini_Button_Clicked), NULL);
-
-    gtk_widget_show_all (TagFrame);
-    return TagFrame;
-}
-
 static void
 et_application_window_show_cddb_dialog (EtApplicationWindow *self)
 {
@@ -2229,8 +856,13 @@ on_select_all (GSimpleAction *action,
                GVariant *variant,
                gpointer user_data)
 {
+    EtApplicationWindow *self;
+    EtApplicationWindowPrivate *priv;
     GtkWidget *focused;
 
+    self = ET_APPLICATION_WINDOW (user_data);
+    priv = et_application_window_get_instance_private (self);
+
     /* Use the currently-focused widget and "select all" as appropriate.
      * https://bugzilla.gnome.org/show_bug.cgi?id=697515 */
     focused = gtk_window_get_focus (GTK_WINDOW (user_data));
@@ -2239,12 +871,9 @@ on_select_all (GSimpleAction *action,
     {
         gtk_editable_select_region (GTK_EDITABLE (focused), 0, -1);
     }
-    else if (focused == PictureEntryView)
-    {
-        GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (focused));
-        gtk_tree_selection_select_all (selection);
-    }
-    else /* Assume that other widgets should select all in the file view. */
+    else if (!et_tag_area_select_all_if_focused (ET_TAG_AREA (priv->tag_area),
+                                                 focused))
+    /* Assume that other widgets should select all in the file view. */
     {
         EtApplicationWindowPrivate *priv;
         EtApplicationWindow *self = ET_APPLICATION_WINDOW (user_data);
@@ -2283,12 +912,9 @@ on_unselect_all (GSimpleAction *action,
         gtk_editable_select_region (editable, 0, 0);
         gtk_editable_set_position (editable, pos);
     }
-    else if (focused == PictureEntryView)
-    {
-        GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (focused));
-        gtk_tree_selection_unselect_all (selection);
-    }
-    else /* Assume that other widgets should unselect all in the file view. */
+    else if (!et_tag_area_unselect_all_if_focused (ET_TAG_AREA (priv->tag_area),
+                                                   focused))
+    /* Assume that other widgets should unselect all in the file view. */
     {
         /* Save the current displayed data */
         ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
@@ -2810,7 +1436,7 @@ on_go_first (GSimpleAction *action,
 
     if (g_settings_get_boolean (MainSettings, "tag-preserve-focus"))
     {
-        gtk_widget_grab_focus (GTK_WIDGET (TitleEntry));
+        et_tag_area_title_grab_focus (ET_TAG_AREA (priv->tag_area));
     }
 }
 
@@ -2849,7 +1475,7 @@ on_go_previous (GSimpleAction *action,
 
     if (g_settings_get_boolean (MainSettings, "tag-preserve-focus"))
     {
-        gtk_widget_grab_focus (GTK_WIDGET (TitleEntry));
+        et_tag_area_title_grab_focus (ET_TAG_AREA (priv->tag_area));
     }
 }
 
@@ -2888,7 +1514,7 @@ on_go_next (GSimpleAction *action,
 
     if (g_settings_get_boolean (MainSettings, "tag-preserve-focus"))
     {
-        gtk_widget_grab_focus (GTK_WIDGET (TitleEntry));
+        et_tag_area_title_grab_focus (ET_TAG_AREA (priv->tag_area));
     }
 }
 
@@ -2927,7 +1553,7 @@ on_go_last (GSimpleAction *action,
 
     if (g_settings_get_boolean (MainSettings, "tag-preserve-focus"))
     {
-        gtk_widget_grab_focus (GTK_WIDGET (TitleEntry));
+        et_tag_area_title_grab_focus (ET_TAG_AREA (priv->tag_area));
     }
 }
 
@@ -3196,7 +1822,7 @@ et_application_window_init (EtApplicationWindow *self)
     gtk_box_pack_start (GTK_BOX (vbox), priv->file_area, FALSE, FALSE, 0);
 
     /* Tag */
-    priv->tag_area = create_tag_area (self);
+    priv->tag_area = et_tag_area_new ();
     gtk_box_pack_start (GTK_BOX (vbox), priv->tag_area, FALSE, FALSE, 0);
 
     /* Vertical pane for Browser Area + FileArea + TagArea */
@@ -3776,26 +2402,6 @@ et_application_window_update_actions (EtApplicationWindow *self)
     }
 }
 
-static void
-et_application_window_hide_images_tab (EtApplicationWindow *self)
-{
-    EtApplicationWindowPrivate *priv;
-
-    priv = et_application_window_get_instance_private (self);
-
-    gtk_widget_hide (priv->images_tab);
-}
-
-static void
-et_application_window_show_images_tab (EtApplicationWindow *self)
-{
-    EtApplicationWindowPrivate *priv;
-
-    priv = et_application_window_get_instance_private (self);
-
-    gtk_widget_show (priv->images_tab);
-}
-
 /*
  * Display controls according the kind of tag... (Hide some controls if not available for a tag type)
  */
@@ -3810,190 +2416,7 @@ et_application_window_tag_area_display_controls (EtApplicationWindow *self,
 
     priv = et_application_window_get_instance_private (self);
 
-    g_return_if_fail (priv->title_label != NULL);
-
-    /* Common controls for all tags. */
-    gtk_widget_show (GTK_WIDGET (priv->title_label));
-    gtk_widget_show(GTK_WIDGET(TitleEntry));
-    gtk_widget_show (GTK_WIDGET (priv->artist_label));
-    gtk_widget_show(GTK_WIDGET(ArtistEntry));
-    gtk_widget_show (GTK_WIDGET (priv->album_artist_label));
-    gtk_widget_show(GTK_WIDGET(AlbumArtistEntry));
-    gtk_widget_show (GTK_WIDGET (priv->album_label));
-    gtk_widget_show(GTK_WIDGET(AlbumEntry));
-    gtk_widget_show (GTK_WIDGET (priv->year_label));
-    gtk_widget_show(GTK_WIDGET(YearEntry));
-    gtk_widget_show (GTK_WIDGET (priv->track_label));
-    gtk_widget_show(GTK_WIDGET(TrackEntryCombo));
-    gtk_widget_show(GTK_WIDGET(TrackTotalEntry));
-    gtk_widget_show(GTK_WIDGET(priv->track_sequence_button));
-    gtk_widget_show(GTK_WIDGET(priv->track_number_button));
-    gtk_widget_show (GTK_WIDGET (priv->genre_label));
-    gtk_widget_show(GTK_WIDGET(GenreCombo));
-    gtk_widget_show (GTK_WIDGET (priv->comment_label));
-    gtk_widget_show(GTK_WIDGET(CommentEntry));
-
-    /* Special controls to display or not! */
-    switch (ETFile->ETFileDescription->TagType)
-    {
-        case ID3_TAG:
-            if (!g_settings_get_boolean (MainSettings, "id3v2-enabled"))
-            {
-                /* ID3v1 : Hide specifics ID3v2 fields if not activated! */
-                gtk_widget_hide (GTK_WIDGET (priv->disc_number_label));
-                gtk_widget_hide(GTK_WIDGET(DiscNumberEntry));
-                gtk_widget_hide (GTK_WIDGET (priv->composer_label));
-                gtk_widget_hide(GTK_WIDGET(ComposerEntry));
-                gtk_widget_hide (GTK_WIDGET (priv->orig_artist_label));
-                gtk_widget_hide(GTK_WIDGET(OrigArtistEntry));
-                gtk_widget_hide (GTK_WIDGET (priv->copyright_label));
-                gtk_widget_hide(GTK_WIDGET(CopyrightEntry));
-                gtk_widget_hide (GTK_WIDGET (priv->url_label));
-                gtk_widget_hide(GTK_WIDGET(URLEntry));
-                gtk_widget_hide (GTK_WIDGET (priv->encoded_by_label));
-                gtk_widget_hide(GTK_WIDGET(EncodedByEntry));
-                et_application_window_hide_images_tab (self);
-            }else
-            {
-                gtk_widget_show (GTK_WIDGET (priv->disc_number_label));
-                gtk_widget_show(GTK_WIDGET(DiscNumberEntry));
-                gtk_widget_show (GTK_WIDGET (priv->composer_label));
-                gtk_widget_show(GTK_WIDGET(ComposerEntry));
-                gtk_widget_show (GTK_WIDGET (priv->orig_artist_label));
-                gtk_widget_show(GTK_WIDGET(OrigArtistEntry));
-                gtk_widget_show (GTK_WIDGET (priv->copyright_label));
-                gtk_widget_show(GTK_WIDGET(CopyrightEntry));
-                gtk_widget_show (GTK_WIDGET (priv->url_label));
-                gtk_widget_show(GTK_WIDGET(URLEntry));
-                gtk_widget_show (GTK_WIDGET (priv->encoded_by_label));
-                gtk_widget_show(GTK_WIDGET(EncodedByEntry));
-                et_application_window_show_images_tab (self);
-            }
-            break;
-
-#ifdef ENABLE_OGG
-        case OGG_TAG:
-            gtk_widget_show (GTK_WIDGET (priv->disc_number_label));
-            gtk_widget_show(GTK_WIDGET(DiscNumberEntry));
-            gtk_widget_show (GTK_WIDGET (priv->composer_label));
-            gtk_widget_show(GTK_WIDGET(ComposerEntry));
-            gtk_widget_show (GTK_WIDGET (priv->orig_artist_label));
-            gtk_widget_show(GTK_WIDGET(OrigArtistEntry));
-            gtk_widget_show (GTK_WIDGET (priv->copyright_label));
-            gtk_widget_show(GTK_WIDGET(CopyrightEntry));
-            gtk_widget_show (GTK_WIDGET (priv->url_label));
-            gtk_widget_show(GTK_WIDGET(URLEntry));
-            gtk_widget_show (GTK_WIDGET (priv->encoded_by_label));
-            gtk_widget_show(GTK_WIDGET(EncodedByEntry));
-            et_application_window_show_images_tab (self);
-            break;
-#endif
-
-#ifdef ENABLE_OPUS
-        case OPUS_TAG:
-            gtk_widget_show (GTK_WIDGET (priv->disc_number_label));
-            gtk_widget_show (GTK_WIDGET (DiscNumberEntry));
-            gtk_widget_show (GTK_WIDGET (priv->composer_label));
-            gtk_widget_show (GTK_WIDGET (ComposerEntry));
-            gtk_widget_show (GTK_WIDGET (priv->orig_artist_label));
-            gtk_widget_show (GTK_WIDGET (OrigArtistEntry));
-            gtk_widget_show (GTK_WIDGET (priv->copyright_label));
-            gtk_widget_show (GTK_WIDGET (CopyrightEntry));
-            gtk_widget_show (GTK_WIDGET (priv->url_label));
-            gtk_widget_show (GTK_WIDGET (URLEntry));
-            gtk_widget_show (GTK_WIDGET (priv->encoded_by_label));
-            gtk_widget_show (GTK_WIDGET (EncodedByEntry));
-            et_application_window_show_images_tab (self);
-            break;
-#endif
-
-#ifdef ENABLE_FLAC
-        case FLAC_TAG:
-            gtk_widget_show (GTK_WIDGET (priv->disc_number_label));
-            gtk_widget_show(GTK_WIDGET(DiscNumberEntry));
-            gtk_widget_show (GTK_WIDGET (priv->composer_label));
-            gtk_widget_show(GTK_WIDGET(ComposerEntry));
-            gtk_widget_show (GTK_WIDGET (priv->orig_artist_label));
-            gtk_widget_show(GTK_WIDGET(OrigArtistEntry));
-            gtk_widget_show (GTK_WIDGET (priv->copyright_label));
-            gtk_widget_show(GTK_WIDGET(CopyrightEntry));
-            gtk_widget_show (GTK_WIDGET (priv->url_label));
-            gtk_widget_show(GTK_WIDGET(URLEntry));
-            gtk_widget_show (GTK_WIDGET (priv->encoded_by_label));
-            gtk_widget_show(GTK_WIDGET(EncodedByEntry));
-            et_application_window_show_images_tab (self);
-            break;
-#endif
-
-        case APE_TAG:
-            gtk_widget_show (GTK_WIDGET (priv->disc_number_label));
-            gtk_widget_show(GTK_WIDGET(DiscNumberEntry));
-            gtk_widget_show (GTK_WIDGET (priv->composer_label));
-            gtk_widget_show(GTK_WIDGET(ComposerEntry));
-            gtk_widget_show (GTK_WIDGET (priv->orig_artist_label));
-            gtk_widget_show(GTK_WIDGET(OrigArtistEntry));
-            gtk_widget_show (GTK_WIDGET (priv->copyright_label));
-            gtk_widget_show(GTK_WIDGET(CopyrightEntry));
-            gtk_widget_show (GTK_WIDGET (priv->url_label));
-            gtk_widget_show(GTK_WIDGET(URLEntry));
-            gtk_widget_show (GTK_WIDGET (priv->encoded_by_label));
-            gtk_widget_show(GTK_WIDGET(EncodedByEntry));
-            et_application_window_show_images_tab (self);
-            break;
-
-#ifdef ENABLE_MP4
-        case MP4_TAG:
-            gtk_widget_show (GTK_WIDGET (priv->disc_number_label));
-            gtk_widget_show (GTK_WIDGET (DiscNumberEntry));
-            gtk_widget_show (GTK_WIDGET (priv->composer_label));
-            gtk_widget_show (GTK_WIDGET (ComposerEntry));
-            gtk_widget_hide (GTK_WIDGET (priv->orig_artist_label));
-            gtk_widget_hide(GTK_WIDGET(OrigArtistEntry));
-            gtk_widget_show (GTK_WIDGET (priv->copyright_label));
-            gtk_widget_show (GTK_WIDGET (CopyrightEntry));
-            gtk_widget_hide (GTK_WIDGET (priv->url_label));
-            gtk_widget_hide(GTK_WIDGET(URLEntry));
-            gtk_widget_show (GTK_WIDGET (priv->encoded_by_label));
-            gtk_widget_show (GTK_WIDGET(EncodedByEntry));
-            et_application_window_show_images_tab (self);
-            break;
-#endif
-
-#ifdef ENABLE_WAVPACK
-        case WAVPACK_TAG:
-            gtk_widget_show (GTK_WIDGET (priv->disc_number_label));
-            gtk_widget_show(GTK_WIDGET(DiscNumberEntry));
-            gtk_widget_show (GTK_WIDGET (priv->composer_label));
-            gtk_widget_show(GTK_WIDGET(ComposerEntry));
-            gtk_widget_show (GTK_WIDGET (priv->orig_artist_label));
-            gtk_widget_show(GTK_WIDGET(OrigArtistEntry));
-            gtk_widget_show (GTK_WIDGET (priv->copyright_label));
-            gtk_widget_show(GTK_WIDGET(CopyrightEntry));
-            gtk_widget_show (GTK_WIDGET (priv->url_label));
-            gtk_widget_show(GTK_WIDGET(URLEntry));
-            gtk_widget_show (GTK_WIDGET (priv->encoded_by_label));
-            gtk_widget_show(GTK_WIDGET(EncodedByEntry));
-            et_application_window_hide_images_tab (self);
-            break;
-#endif /* ENABLE_WAVPACK */
-
-        case UNKNOWN_TAG:
-        default:
-            gtk_widget_hide (GTK_WIDGET (priv->disc_number_label));
-            gtk_widget_hide(GTK_WIDGET(DiscNumberEntry));
-            gtk_widget_hide (GTK_WIDGET (priv->composer_label));
-            gtk_widget_hide(GTK_WIDGET(ComposerEntry));
-            gtk_widget_hide (GTK_WIDGET (priv->orig_artist_label));
-            gtk_widget_hide(GTK_WIDGET(OrigArtistEntry));
-            gtk_widget_hide (GTK_WIDGET (priv->copyright_label));
-            gtk_widget_hide(GTK_WIDGET(CopyrightEntry));
-            gtk_widget_hide (GTK_WIDGET (priv->url_label));
-            gtk_widget_hide(GTK_WIDGET(URLEntry));
-            gtk_widget_hide (GTK_WIDGET (priv->encoded_by_label));
-            gtk_widget_hide(GTK_WIDGET(EncodedByEntry));
-            et_application_window_hide_images_tab (self);
-            break;
-    }
+    et_tag_area_update_controls (ET_TAG_AREA (priv->tag_area), ETFile);
 }
 
 void
diff --git a/src/application_window.h b/src/application_window.h
index 600bda0..3dcd429 100644
--- a/src/application_window.h
+++ b/src/application_window.h
@@ -47,6 +47,9 @@ struct _EtApplicationWindowClass
 
 GType et_application_window_get_type (void);
 EtApplicationWindow *et_application_window_new (GtkApplication *application);
+File_Tag * et_application_window_tag_area_create_file_tag (EtApplicationWindow *self);
+gboolean et_application_window_tag_area_display_et_file (EtApplicationWindow *self, ET_File *ETFile);
+void et_application_window_tag_area_clear (EtApplicationWindow *self);
 void et_application_window_tag_area_set_sensitive (EtApplicationWindow *self, gboolean sensitive);
 void et_application_window_file_area_set_sensitive (EtApplicationWindow *self, gboolean sensitive);
 void et_application_window_disable_command_actions (EtApplicationWindow *self);
diff --git a/src/easytag.c b/src/easytag.c
index 78dafce..68cf2d3 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -125,8 +125,6 @@ common_init (GApplication *application)
     ET_Core_Create();
     Main_Stop_Button_Pressed = FALSE;
     Init_Mouse_Cursor();
-    TrackEntryComboModel = NULL;
-    GenreComboModel      = NULL;
 
     /* The main window */
     window = et_application_window_new (GTK_APPLICATION (application));
@@ -1220,7 +1218,7 @@ gboolean Read_Directory (gchar *path_real)
     /* Clear entry boxes  */
     Clear_File_Entry_Field();
     Clear_Header_Fields();
-    Clear_Tag_Entry_Fields();
+    et_application_window_tag_area_clear (window);
     gtk_label_set_text(GTK_LABEL(FileIndex),"0/0:");
 
     // Set to unsensitive the Browser Area, to avoid to select another file while loading the first one
@@ -1328,9 +1326,6 @@ gboolean Read_Directory (gchar *path_real)
         /* Load the list of file into the browser list widget */
         et_application_window_browser_toggle_display_mode (window);
 
-        /* Load the list attached to the TrackEntry */
-        Load_Track_List_To_UI();
-
         /* Display the first file */
         //No need to select first item, because Browser_Display_Tree_Or_Artist_Album_List() does this
         //etfilelist = ET_Displayed_File_List_First();
@@ -1360,7 +1355,7 @@ gboolean Read_Directory (gchar *path_real)
         /* Clear entry boxes */
         Clear_File_Entry_Field();
         Clear_Header_Fields();
-        Clear_Tag_Entry_Fields();
+        et_application_window_tag_area_clear (ET_APPLICATION_WINDOW (MainWindow));
 
         if (FileIndex)
             gtk_label_set_text(GTK_LABEL(FileIndex),"0/0:");
diff --git a/src/easytag.h b/src/easytag.h
index 97e6922..7427ec9 100644
--- a/src/easytag.h
+++ b/src/easytag.h
@@ -59,35 +59,6 @@ GtkWidget *SizeValueLabel;
 GtkWidget *DurationLabel;
 GtkWidget *DurationValueLabel;
 
-/* TAG Area */
-GtkWidget    *TagFrame;
-GtkWidget    *TagNoteBook;
-GtkWidget    *TitleEntry;
-GtkWidget    *ArtistEntry;
-GtkWidget    *AlbumArtistEntry;
-GtkWidget    *AlbumEntry;
-GtkWidget    *DiscNumberEntry;
-GtkWidget    *YearEntry;
-GtkWidget    *TrackEntryCombo;
-GtkListStore *TrackEntryComboModel;
-GtkWidget    *TrackTotalEntry;
-GtkWidget    *GenreCombo;
-GtkListStore *GenreComboModel;
-GtkWidget    *CommentEntry;
-//GtkWidget    *CommentView;
-GtkWidget    *ComposerEntry;
-GtkWidget    *OrigArtistEntry;
-GtkWidget    *CopyrightEntry;
-GtkWidget    *URLEntry;
-GtkWidget    *EncodedByEntry;
-GtkWidget    *PictureEntryView;
-
-/* Other for picture. */
-GtkToolItem *remove_image_toolitem;
-GtkToolItem *add_image_toolitem;
-GtkToolItem *save_image_toolitem;
-GtkToolItem *image_properties_toolitem;
-
 gchar *INIT_DIRECTORY;
 
 #ifndef errno
@@ -113,7 +84,6 @@ gboolean Read_Directory               (gchar *path);
 void Quit_MainWindow                  (void);
 
 void Clear_File_Entry_Field (void);
-void Clear_Tag_Entry_Fields (void);
 void Clear_Header_Fields    (void);
 
 
diff --git a/src/et_core.c b/src/et_core.c
index 4397cfb..660b44b 100644
--- a/src/et_core.c
+++ b/src/et_core.c
@@ -160,13 +160,11 @@ static gboolean ET_Remove_File_From_Artist_Album_List (ET_File *ETFile);
 
 static void ET_Display_File_And_List_Status_To_UI (ET_File *ETFile);
 static void ET_Display_Filename_To_UI (ET_File *ETFile);
-static gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile);
 static gboolean ET_Display_File_Info_To_UI (ET_File_Info *ETFileInfo);
 
 static gboolean ET_Save_File_Name_From_UI (ET_File *ETFile,
                                            File_Name *FileName);
 static gboolean ET_Save_File_Name_Internal (ET_File *ETFile, File_Name *FileName);
-static gboolean ET_Save_File_Tag_From_UI (File_Tag *FileTag);
 static gboolean ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag);
 
 static void ET_Mark_File_Tag_As_Saved (ET_File *ETFile);
@@ -904,7 +902,7 @@ gboolean ET_Remove_File_From_File_List (ET_File *ETFile)
         // Reinit the tag and file area
         Clear_File_Entry_Field();
         Clear_Header_Fields();
-        Clear_Tag_Entry_Fields();
+        et_application_window_tag_area_clear (ET_APPLICATION_WINDOW (MainWindow));
         gtk_label_set_text(GTK_LABEL(FileIndex),"0/0:");
         et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
     }
@@ -2759,55 +2757,8 @@ void ET_Display_File_Data_To_UI (ET_File *ETFile)
     ET_Display_Filename_To_UI(ETFile);
 
     /* Display tag data */
-    switch (ETFileDescription->TagType)
-    {
-#ifdef ENABLE_MP3
-        case ID3_TAG:
-            gtk_frame_set_label(GTK_FRAME(TagFrame),_("ID3 Tag"));
-            ET_Display_File_Tag_To_UI(ETFile);
-            break;
-#endif
-#ifdef ENABLE_OGG
-        case OGG_TAG:
-            gtk_frame_set_label(GTK_FRAME(TagFrame),_("Ogg Vorbis Tag"));
-            ET_Display_File_Tag_To_UI(ETFile);
-            break;
-#endif
-#ifdef ENABLE_FLAC
-        case FLAC_TAG:
-            gtk_frame_set_label(GTK_FRAME(TagFrame),_("FLAC Vorbis Tag"));
-            ET_Display_File_Tag_To_UI(ETFile);
-            break;
-#endif
-        case APE_TAG:
-            gtk_frame_set_label(GTK_FRAME(TagFrame),_("APE Tag"));
-            ET_Display_File_Tag_To_UI(ETFile);
-            break;
-#ifdef ENABLE_MP4
-        case MP4_TAG:
-            gtk_frame_set_label(GTK_FRAME(TagFrame),_("MP4/M4A/AAC Tag"));
-            ET_Display_File_Tag_To_UI(ETFile);
-            break;
-#endif
-#ifdef ENABLE_WAVPACK
-        case WAVPACK_TAG:
-            gtk_frame_set_label(GTK_FRAME(TagFrame),_("Wavpack Tag"));
-            ET_Display_File_Tag_To_UI(ETFile);
-            break;
-#endif
-#ifdef ENABLE_OPUS
-        case OPUS_TAG:
-            gtk_frame_set_label (GTK_FRAME (TagFrame), _("Opus Tag"));
-            ET_Display_File_Tag_To_UI (ETFile);
-            break;
-#endif
-        case UNKNOWN_TAG:
-        default:
-            gtk_frame_set_label(GTK_FRAME(TagFrame),_("Tag"));
-            ET_Display_File_Tag_To_UI(ETFile); // To reinit screen
-            Log_Print(LOG_ERROR,"FileTag: Undefined tag type %d for file 
%s.",ETFileDescription->TagType,cur_filename_utf8);
-            break;
-    }
+    et_application_window_tag_area_display_et_file (ET_APPLICATION_WINDOW (MainWindow),
+                                                    ETFile);
 
     /* Display controls in tag area */
     et_application_window_tag_area_display_controls (ET_APPLICATION_WINDOW (MainWindow),
@@ -3038,227 +2989,6 @@ ET_Display_Filename_To_UI (ET_File *ETFile)
 
 
 /*
- * Display all tag infos (tags fields) into entry boxes of the user interface.
- * These data have the same structure for all files.
- */
-static gboolean
-ET_Display_File_Tag_To_UI (ET_File *ETFile)
-{
-    File_Tag *FileTag = NULL;
-    //GtkTextBuffer *textbuffer;
-
-    if (!ETFile || !ETFile->FileTag)
-    {
-        // Reset all tag entries
-        Clear_Tag_Entry_Fields();
-        //Tag_Area_Set_Sensitive(FALSE);
-        return FALSE;
-    }
-
-    //Tag_Area_Set_Sensitive(TRUE); // Causes displaying problem when saving files
-
-    FileTag = (File_Tag *)(ETFile->FileTag->data);
-
-    /* Show title */
-    if (FileTag && FileTag->title)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->title);
-        gtk_entry_set_text(GTK_ENTRY(TitleEntry), tmp);
-        g_free(tmp);
-    }else
-        gtk_entry_set_text(GTK_ENTRY(TitleEntry),"");
-
-    /* Show artist */
-    if (FileTag && FileTag->artist)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->artist);
-        gtk_entry_set_text(GTK_ENTRY(ArtistEntry), tmp);
-        g_free(tmp);
-    }else
-        gtk_entry_set_text(GTK_ENTRY(ArtistEntry),"");
-
-       /* Show album artist */
-    if (FileTag && FileTag->album_artist)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->album_artist);
-        gtk_entry_set_text(GTK_ENTRY(AlbumArtistEntry), tmp);
-        g_free(tmp);
-    }else
-        gtk_entry_set_text(GTK_ENTRY(AlbumArtistEntry),"");
-
-    /* Show album */
-    if (FileTag && FileTag->album)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->album);
-        gtk_entry_set_text(GTK_ENTRY(AlbumEntry), tmp);
-        g_free(tmp);
-    }else
-        gtk_entry_set_text(GTK_ENTRY(AlbumEntry),"");
-
-    /* Show disc number and number of discs. */
-    if (FileTag && FileTag->disc_number)
-    {
-        gchar *tmp;
-
-        if (FileTag->disc_total)
-        {
-            gchar *total;
-
-            total = g_strjoin ("/", FileTag->disc_number, FileTag->disc_total,
-                               NULL);
-            tmp = Try_To_Validate_Utf8_String (total);
-            g_free (total);
-        }
-        else
-        {
-            tmp = Try_To_Validate_Utf8_String (FileTag->disc_number);
-        }
-
-        gtk_entry_set_text (GTK_ENTRY (DiscNumberEntry), tmp);
-        g_free (tmp);
-    }
-    else
-    {
-        gtk_entry_set_text (GTK_ENTRY (DiscNumberEntry), "");
-    }
-
-    /* Show year */
-    if (FileTag && FileTag->year)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->year);
-        gtk_entry_set_text(GTK_ENTRY(YearEntry),tmp);
-        g_free(tmp);
-    }else
-        gtk_entry_set_text(GTK_ENTRY(YearEntry),"");
-
-    /* Show track */
-    if (FileTag && FileTag->track)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->track);
-        gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(TrackEntryCombo))),tmp);
-        g_free(tmp);
-    }else
-        gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(TrackEntryCombo))),"");
-
-    /* Show number of tracks on the album */
-    if (FileTag && FileTag->track_total)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->track_total);
-        gtk_entry_set_text(GTK_ENTRY(TrackTotalEntry),tmp);
-        g_free(tmp);
-    }else
-        gtk_entry_set_text(GTK_ENTRY(TrackTotalEntry),"");
-
-    /* Show genre */
-    if (FileTag && FileTag->genre)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->genre);
-        gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(GenreCombo))), tmp);
-        g_free(tmp);
-    }else
-        gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(GenreCombo))),"");
-
-    /* Show comment */
-    //textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(CommentView));
-    if (FileTag && FileTag->comment)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->comment);
-        //gtk_text_buffer_set_text(GTK_TEXT_BUFFER(textbuffer), FileTag->comment, -1);
-        gtk_entry_set_text(GTK_ENTRY(CommentEntry), tmp);
-        g_free(tmp);
-    }else
-        //gtk_text_buffer_set_text(GTK_TEXT_BUFFER(textbuffer), "", -1);
-        gtk_entry_set_text(GTK_ENTRY(CommentEntry),"");
-
-    /* Show composer */
-    if (FileTag && FileTag->composer)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->composer);
-        gtk_entry_set_text(GTK_ENTRY(ComposerEntry), tmp);
-        g_free(tmp);
-    }else
-        gtk_entry_set_text(GTK_ENTRY(ComposerEntry),"");
-
-    /* Show original artist */
-    if (FileTag && FileTag->orig_artist)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->orig_artist);
-        gtk_entry_set_text(GTK_ENTRY(OrigArtistEntry), tmp);
-        g_free(tmp);
-    }else
-        gtk_entry_set_text(GTK_ENTRY(OrigArtistEntry),"");
-
-    /* Show copyright */
-    if (FileTag && FileTag->copyright)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->copyright);
-        gtk_entry_set_text(GTK_ENTRY(CopyrightEntry), tmp);
-        g_free(tmp);
-    }else
-        gtk_entry_set_text(GTK_ENTRY(CopyrightEntry),"");
-
-    /* Show URL */
-    if (FileTag && FileTag->url)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->url);
-        gtk_entry_set_text(GTK_ENTRY(URLEntry), tmp);
-        g_free(tmp);
-    }else
-        gtk_entry_set_text(GTK_ENTRY(URLEntry),"");
-
-    /* Show Encoded by */
-    if (FileTag && FileTag->encoded_by)
-    {
-        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->encoded_by);
-        gtk_entry_set_text(GTK_ENTRY(EncodedByEntry), tmp);
-        g_free(tmp);
-    }else
-        gtk_entry_set_text(GTK_ENTRY(EncodedByEntry),"");
-
-    /* Show picture */
-    PictureEntry_Clear();
-    if (FileTag && FileTag->picture)
-    {
-        Picture *pic = FileTag->picture;
-        guint    nbr_pic = 0;
-        GtkWidget *page;
-        gchar *string;
-
-        PictureEntry_Update(FileTag->picture, FALSE);
-
-        // Count the number of items
-        for (pic = FileTag->picture; pic != NULL; pic = pic->next)
-        {
-            nbr_pic++;
-        }
-
-        // Get page "Images" of the notebook
-        page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(TagNoteBook),1);
-        string = g_strdup_printf (_("Images (%d)"), nbr_pic);
-        // Update the notebook tab
-        gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(TagNoteBook),page,string);
-        // Update the notebook menu
-        gtk_notebook_set_menu_label_text(GTK_NOTEBOOK(TagNoteBook),page,string);
-        g_free(string);
-
-    }else
-    {
-        GtkWidget *page;
-        // Get page "Images" of the notebook
-        page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(TagNoteBook),1);
-        // Update the notebook tab
-        gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (TagNoteBook), page,
-                                         _("Images"));
-        // Update the notebook menu
-        gtk_notebook_set_menu_label_text (GTK_NOTEBOOK (TagNoteBook), page,
-                                          _("Images"));
-    }
-
-    return TRUE;
-}
-
-
-/*
  * "Default" way to display File Info to the user interface.
  */
 static gboolean
@@ -3349,13 +3079,6 @@ void ET_Save_File_Data_From_UI (ET_File *ETFile)
     FileName->key = undo_key;
     ET_Save_File_Name_From_UI(ETFile,FileName); // Used for all files!
 
-    /*
-     * Save tag data and generate undo for tag
-     */
-    FileTag = g_malloc0(sizeof(File_Tag));
-    ET_Initialize_File_Tag_Item(FileTag);
-    FileTag->key = undo_key;
-
     switch (ETFileDescription->TagType)
     {
 #ifdef ENABLE_MP3
@@ -3377,11 +3100,12 @@ void ET_Save_File_Data_From_UI (ET_File *ETFile)
         case OPUS_TAG:
 #endif
         case APE_TAG:
-            ET_Save_File_Tag_From_UI(FileTag);
-            ET_Copy_File_Tag_Item_Other_Field(ETFile,FileTag);
+            FileTag = et_application_window_tag_area_create_file_tag (ET_APPLICATION_WINDOW (MainWindow));
+            ET_Copy_File_Tag_Item_Other_Field (ETFile, FileTag);
             break;
         case UNKNOWN_TAG:
         default:
+            FileTag = ET_File_Tag_Item_New ();
             Log_Print(LOG_ERROR,"FileTag: Undefined tag type %d for file 
%s.",ETFileDescription->TagType,cur_filename_utf8);
             break;
     }
@@ -3554,260 +3278,8 @@ ET_Save_File_Name_Internal (ET_File *ETFile, File_Name *FileName)
     }
 }
 
-
-/*
- * Load values, entered into entries of the UI, into a File_Tag structure which had been newly created.
- */
-static gboolean
-ET_Save_File_Tag_From_UI (File_Tag *FileTag)
-{
-    gchar *buffer = NULL;
-    //GtkTextBuffer *textbuffer;
-    //GtkTextIter    start_iter;
-    //GtkTextIter    end_iter;
-
-    g_return_val_if_fail (FileTag != NULL, FALSE);
-
-    /* Title */
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(TitleEntry)));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0 )
-        FileTag->title = buffer;
-    else
-    {
-        FileTag->title = NULL;
-        g_free(buffer);
-    }
-
-    /* Artist */
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(ArtistEntry)));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0 )
-        FileTag->artist = buffer;
-    else
-    {
-        FileTag->artist = NULL;
-        g_free(buffer);
-    }
-
-       /* Album Artist */
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(AlbumArtistEntry)));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0 )
-        FileTag->album_artist = buffer;
-    else
-    {
-        FileTag->album_artist = NULL;
-        g_free(buffer);
-    }
-
-    /* Album */
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(AlbumEntry)));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0 )
-        FileTag->album = buffer;
-    else
-    {
-        FileTag->album = NULL;
-        g_free(buffer);
-    }
-
-    /* Disc number and total number of discs. */
-    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (DiscNumberEntry)));
-    g_strstrip (buffer);
-
-    if (g_utf8_strlen (buffer, -1) > 0)
-    {
-        gchar *separator;
-
-        separator = g_utf8_strchr (buffer, -1, '/');
-
-        if (separator != NULL && g_utf8_strlen (separator + 1, -1) > 0)
-        {
-            /* Copy before the separator for the disc number, beyond the
-             * separator for the total number of discs. */
-            FileTag->disc_number = g_strndup (buffer, separator - buffer);
-            FileTag->disc_total = g_strdup (separator + 1);
-            g_free (buffer);
-        }
-        else
-        {
-            FileTag->disc_number = buffer;
-            FileTag->disc_total = NULL;
-        }
-    }
-    else
-    {
-        FileTag->disc_number = NULL;
-        FileTag->disc_total = NULL;
-        g_free (buffer);
-    }
-
-    /* Year */
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(YearEntry)));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0 )
-        FileTag->year = buffer;
-    else
-    {
-        FileTag->year = NULL;
-        g_free(buffer);
-    }
-
-    /* Track */
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(TrackEntryCombo)))));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0  )
-    {
-        FileTag->track = et_track_number_to_string (atoi (buffer));
-        g_free (buffer);
-    } else
-    {
-        FileTag->track = NULL;
-        g_free(buffer);
-    }
-
-    /* Track Total */
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(TrackTotalEntry)));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0  )
-    {
-        FileTag->track_total = et_track_number_to_string (atoi (buffer));
-        g_free (buffer);
-    } else
-    {
-        FileTag->track_total = NULL;
-        g_free(buffer);
-    }
-
-    /* Genre */
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(GenreCombo)))));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0 )
-        FileTag->genre = buffer;
-    else
-    {
-        FileTag->genre = NULL;
-        g_free(buffer);
-    }
-
-    /* Comment */
-    //textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(CommentView));
-    //gtk_text_buffer_get_bounds(GTK_TEXT_BUFFER(textbuffer),&start_iter,&end_iter);
-    //buffer = gtk_text_buffer_get_text(GTK_TEXT_BUFFER(textbuffer),&start_iter,&end_iter,TRUE);
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(CommentEntry)));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0 )
-        FileTag->comment = buffer;
-    else
-    {
-        FileTag->comment = NULL;
-        g_free(buffer);
-    }
-
-    /* Composer */
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(ComposerEntry)));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0 )
-        FileTag->composer = buffer;
-    else
-    {
-        FileTag->composer = NULL;
-        g_free(buffer);
-    }
-
-    /* Original Artist */
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(OrigArtistEntry)));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0 )
-        FileTag->orig_artist = buffer;
-    else
-    {
-        FileTag->orig_artist = NULL;
-        g_free(buffer);
-    }
-
-    /* Copyright */
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(CopyrightEntry)));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0 )
-        FileTag->copyright = buffer;
-    else
-    {
-        FileTag->copyright = NULL;
-        g_free(buffer);
-    }
-
-    /* URL */
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(URLEntry)));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0 )
-        FileTag->url = buffer;
-    else
-    {
-        FileTag->url = NULL;
-        g_free(buffer);
-    }
-
-    /* Encoded by */
-    buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(EncodedByEntry)));
-    g_strstrip (buffer);
-
-    if ( g_utf8_strlen(buffer, -1) > 0 )
-        FileTag->encoded_by = buffer;
-    else
-    {
-        FileTag->encoded_by = NULL;
-        g_free(buffer);
-    }
-
-    /* Picture */
-    {
-        Picture *pic, *prev_pic = NULL;
-        GtkTreeModel *model;
-        GtkTreeIter iter;
-
-        if (FileTag->picture)
-        {
-            Picture_Free(FileTag->picture);
-            FileTag->picture = NULL;
-        }
-
-        model = gtk_tree_view_get_model(GTK_TREE_VIEW(PictureEntryView));
-        if (gtk_tree_model_get_iter_first(model, &iter))
-        {
-            do
-            {
-                gtk_tree_model_get(model, &iter, PICTURE_COLUMN_DATA, &pic,-1);
-                pic = Picture_Copy_One(pic);
-                if (!FileTag->picture)
-                    FileTag->picture = pic;
-                else
-                    prev_pic->next = pic;
-                prev_pic = pic;
-            } while (gtk_tree_model_iter_next(model, &iter));
-        }
-    }
-
-    return TRUE;
-}
-
-
 /*
- * Do the same thing of ET_Save_File_Tag_From_UI without getting the data from the UI.
+ * Do the same thing of et_tag_area_create_file_tag without getting the data from the UI.
  */
 static gboolean
 ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
diff --git a/src/misc.c b/src/misc.c
index 60a990e..ade7569 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -34,7 +34,6 @@
 #include "setting.h"
 #include "bar.h"
 #include "preferences_dialog.h"
-#include "genres.h"
 #include "log.h"
 #include "charset.h"
 
@@ -191,162 +190,6 @@ gchar *Get_Active_Combo_Box_Item (GtkComboBox *combo)
 }
 
 /*
- * To insert only digits in an entry. If the text contains only digits: returns it,
- * else only first digits.
- */
-void Insert_Only_Digit (GtkEditable *editable, const gchar *inserted_text, gint length,
-                        gint *position, gpointer data)
-{
-    int i = 1; // Ignore first character
-    int j = 1;
-    gchar *result;
-
-    if (length<=0 || !inserted_text)
-        return;
-
-    if (!isdigit((guchar)inserted_text[0]) && inserted_text[0] != '-')
-    {
-        g_signal_stop_emission_by_name(G_OBJECT(editable),"insert_text");
-        return;
-    } else if (length == 1)
-    {
-        // We already checked the first digit...
-        return;
-    }
-
-    g_signal_stop_emission_by_name(G_OBJECT(editable),"insert_text");
-    result = g_malloc0(length+1);
-    result[0] = inserted_text[0];
-
-    // Check the rest, if any...
-    for (i = 1; i < length; i++)
-    {
-        if (isdigit((guchar)inserted_text[i]))
-        {
-            result[j++] = inserted_text[i];
-        }
-    }
-    // Null terminate for the benefit of glib/gtk
-    result[j] = '\0';
-
-    if (result[0] == '\0')
-    {
-        g_free(result);
-        return;
-    }
-
-    g_signal_handlers_block_by_func(G_OBJECT(editable),G_CALLBACK(Insert_Only_Digit),data);
-    gtk_editable_insert_text(editable, result, j, position);
-    g_signal_handlers_unblock_by_func(G_OBJECT(editable),G_CALLBACK(Insert_Only_Digit),data);
-    g_free(result);
-}
-
-/*
- * Parse and auto complete date entry if you don't type the 4 digits.
- */
-#include <stdlib.h>
-gboolean Parse_Date (void)
-{
-    const gchar *year;
-    gchar *tmp, *tmp1;
-    gchar *current_year;
-    GDateTime *dt;
-
-    /* Early return. */
-    if (!g_settings_get_boolean (MainSettings, "tag-date-autocomplete"))
-    {
-        return FALSE;
-    }
-
-    /* Get the info entered by user */
-    year = gtk_entry_get_text(GTK_ENTRY(YearEntry));
-
-    if ( strcmp(year,"")!=0 && strlen(year)<4 )
-    {
-        dt = g_date_time_new_now_local ();
-        current_year = g_date_time_format (dt, "%Y");
-        g_date_time_unref (dt);
-
-        tmp = &current_year[4-strlen(year)];
-        if ( atoi(year) <= atoi(tmp) )
-        {
-            sprintf(current_year,"%d",atoi(current_year)-atoi(tmp));
-            tmp1 = g_strdup_printf("%d",atoi(current_year)+atoi(year));
-            gtk_entry_set_text(GTK_ENTRY(YearEntry),tmp1);
-            g_free(tmp1);
-
-        }else
-        {
-            sprintf(current_year,"%d",atoi(current_year)-atoi(tmp)
-                -(strlen(year)<=0 ? 1 : strlen(year)<=1 ? 10 :          // pow(10,strlen(year)) returns 99 
instead of 100 under Win32...
-                 strlen(year)<=2 ? 100 : strlen(year)<=3 ? 1000 : 0));
-            tmp1 = g_strdup_printf("%d",atoi(current_year)+atoi(year));
-            gtk_entry_set_text(GTK_ENTRY(YearEntry),tmp1);
-            g_free(tmp1);
-        }
-
-        g_free (current_year);
-    }
-    return FALSE;
-}
-
-/*
- * Load the genres list to the combo, and sorts it
- */
-void Load_Genres_List_To_UI (void)
-{
-    gsize i;
-
-    g_return_if_fail (GenreComboModel != NULL);
-
-    gtk_list_store_insert_with_values (GTK_LIST_STORE (GenreComboModel), NULL,
-                                       G_MAXINT, MISC_COMBO_TEXT, "", -1);
-    gtk_list_store_insert_with_values (GTK_LIST_STORE (GenreComboModel), NULL,
-                                       G_MAXINT, MISC_COMBO_TEXT, "Unknown",
-                                       -1);
-
-    for (i = 0; i <= GENRE_MAX; i++)
-    {
-        gtk_list_store_insert_with_values (GTK_LIST_STORE (GenreComboModel),
-                                           NULL, G_MAXINT, MISC_COMBO_TEXT,
-                                           id3_genres[i], -1);
-    }
-}
-
-/*
- * Load the track numbers into the track combo list
- * We limit the preloaded values to 30 to avoid lost of time with lot of files...
- */
-void Load_Track_List_To_UI (void)
-{
-    /* Number mini of items
-     *if ((len=ETCore->ETFileDisplayedList_Length) < 30)
-     * Length limited to 30 (instead to the number of files)! */
-    const gsize len = 30;
-    gsize i;
-    gchar *text;
-
-    g_return_if_fail (ETCore->ETFileDisplayedList != NULL ||
-                      TrackEntryComboModel != NULL);
-
-    /* Remove the entries in the list to avoid duplicates. */
-    gtk_list_store_clear (TrackEntryComboModel);
-
-    /* Create list of tracks. */
-    for (i = 1; i <= len; i++)
-    {
-        text = et_track_number_to_string (i);
-
-        gtk_list_store_insert_with_values (GTK_LIST_STORE (TrackEntryComboModel),
-                                           NULL, G_MAXINT, MISC_COMBO_TEXT,
-                                           text, -1);
-        g_free(text);
-    }
-
-}
-
-
-/*
  * Change mouse cursor
  */
 void Init_Mouse_Cursor (void)
@@ -381,49 +224,6 @@ void Set_Unbusy_Cursor (void)
 }
 
 /*
- * Iter compare func: Sort alphabetically
- */
-gint Combo_Alphabetic_Sort (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer data)
-{
-    gchar *text1, *text1_folded;
-    gchar *text2, *text2_folded;
-    gint ret;
-
-    gtk_tree_model_get(model, a, MISC_COMBO_TEXT, &text1, -1);
-    gtk_tree_model_get(model, b, MISC_COMBO_TEXT, &text2, -1);
-
-    if (text1 == text2)
-    {
-        g_free(text1);
-        g_free(text2);
-        return 0;
-    }
-
-    if (text1 == NULL)
-    {
-        g_free(text2);
-        return -1;
-    }
-
-    if (text2 == NULL)
-    {
-        g_free(text1);
-        return 1;
-    }
-
-    text1_folded = g_utf8_casefold(text1, -1);
-    text2_folded = g_utf8_casefold(text2, -1);
-    ret = g_utf8_collate(text1_folded, text2_folded);
-
-    g_free(text1);
-    g_free(text2);
-    g_free(text1_folded);
-    g_free(text2_folded);
-    return ret;
-}
-
-
-/*
  * Run a program with a list of parameters
  *  - args_list : list of filename (with path)
  */
diff --git a/src/misc.h b/src/misc.h
index e067a21..b51b6ef 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -40,10 +40,6 @@ gchar   *Get_Active_Combo_Box_Item(GtkComboBox *combo);
 /*
  * Other
  */
-void Insert_Only_Digit (GtkEditable *editable,const gchar *text,gint length,gint *position,gpointer data);
-gboolean Parse_Date (void);
-void Load_Genres_List_To_UI (void);
-void Load_Track_List_To_UI  (void);
 void Init_Character_Translation_Table (void);
 gchar *Check_If_Executable_Exists (const gchar *program);
 
diff --git a/src/picture.c b/src/picture.c
index e8e6121..27a860f 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -1,24 +1,22 @@
-/* picture.c - 2004/11/21 */
-/*
- *  EasyTAG - Tag editor for MP3 and Ogg Vorbis files
- *  Copyright (C) 2000-2003  Jerome Couderc <easytag gmail com>
+/* EasyTAG - Tag editor for audio files
+ * Copyright (C) 2014  David King <amigadave amigadave com>
+ * Copyright (C) 2000-2003  Jerome Couderc <easytag gmail 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 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.
+ * 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.
+ * 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 <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
@@ -47,15 +45,8 @@
  * Prototypes *
  **************/
 
-static void et_picture_load_file (GFile *file, gpointer user_data);
-
 static const gchar *Picture_Format_String (Picture_Format format);
-static const gchar *Picture_Type_String (EtPictureType type);
-static gchar *Picture_Info (Picture *pic);
 
-static Picture *et_picture_load_file_data (GFile *file, GError **error);
-static gboolean et_picture_save_file_data (const Picture *pic, GFile *file,
-                                           GError **error);
 
 /*
  * Note :
@@ -69,106 +60,6 @@ static gboolean et_picture_save_file_data (const Picture *pic, GFile *file,
  * Functions *
  *************/
 
-void Tag_Area_Picture_Drag_Data (GtkWidget *widget, GdkDragContext *dc,
-                                 gint x, gint y, GtkSelectionData *selection_data,
-                                 guint info, guint t, gpointer data)
-{
-    GtkTreeSelection *selection;
-    gchar **uri_list, **uri;
-
-    gtk_drag_finish(dc, TRUE, FALSE, t);
-
-    if (info != TARGET_URI_LIST
-    ||  !selection_data
-    ||  !PictureEntryView)
-        return;
-
-    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(PictureEntryView));
-    gtk_tree_selection_unselect_all(selection);
-
-    uri = uri_list = g_strsplit ((const gchar *)gtk_selection_data_get_data (selection_data),
-                                 "\r\n", 0);
-
-    while (*uri && strlen(*uri))
-    {
-        GFile *file = g_file_new_for_uri (*uri);
-
-        et_picture_load_file (file, NULL);
-
-        g_object_unref (file);
-        uri++;
-    }
-    g_strfreev(uri_list);
-}
-
-void
-Picture_Selection_Changed_cb (GtkTreeSelection *selection, gpointer data)
-{
-    if (gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (selection)) >= 1)
-    {
-        gtk_widget_set_sensitive (GTK_WIDGET (remove_image_toolitem), TRUE);
-        gtk_widget_set_sensitive (GTK_WIDGET (save_image_toolitem), TRUE);
-        gtk_widget_set_sensitive (GTK_WIDGET (image_properties_toolitem),
-                                  TRUE);
-    }
-    else
-    {
-        gtk_widget_set_sensitive (GTK_WIDGET (remove_image_toolitem), FALSE);
-        gtk_widget_set_sensitive (GTK_WIDGET (save_image_toolitem), FALSE);
-        gtk_widget_set_sensitive (GTK_WIDGET (image_properties_toolitem),
-                                  FALSE);
-    }
-}
-
-void Picture_Clear_Button_Clicked (GObject *object)
-{
-    GList *paths, *refs = NULL;
-    GList *l;
-    GtkTreeSelection *selection;
-    GtkTreeModel *model;
-    GtkTreeIter iter;
-
-    g_return_if_fail (PictureEntryView != NULL);
-
-    model = gtk_tree_view_get_model(GTK_TREE_VIEW(PictureEntryView));
-    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(PictureEntryView));
-    paths = gtk_tree_selection_get_selected_rows (selection, NULL);
-
-    /* List of items to delete. */
-    for (l = paths; l != NULL; l = g_list_next (l))
-    {
-        refs = g_list_prepend (refs, gtk_tree_row_reference_new (model,
-                                                                 l->data));
-    }
-
-    g_list_free_full (paths, (GDestroyNotify)gtk_tree_path_free);
-
-    for (l = refs; l != NULL; l = g_list_next (l))
-    {
-        GtkTreePath *path = gtk_tree_row_reference_get_path (l->data);
-        Picture *pic;
-
-        if (gtk_tree_model_get_iter (model, &iter, path))
-        {
-            gtk_tree_model_get(model, &iter, PICTURE_COLUMN_DATA, &pic,-1);
-            Picture_Free(pic);
-
-            gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
-        }
-
-        gtk_tree_path_free(path);
-        gtk_tree_row_reference_free (l->data);
-    }
-
-    if (ETCore->ETFileDisplayed)
-    {
-        ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
-        ET_Display_File_Data_To_UI (ETCore->ETFileDisplayed);
-    }
-
-    g_list_free(refs);
-}
-
 /*
  * et_picture_type_from_filename:
  * @filename: UTF-8 representation of a filename
@@ -179,7 +70,7 @@ void Picture_Clear_Button_Clicked (GObject *object)
  * Returns: the picture type, or %ET_PICTURE_TYPE_FRONT_COVER if the type could
  * not be estimated
  */
-static EtPictureType
+EtPictureType
 et_picture_type_from_filename (const gchar *filename_utf8)
 {
     EtPictureType picture_type = ET_PICTURE_TYPE_FRONT_COVER;
@@ -223,559 +114,6 @@ et_picture_type_from_filename (const gchar *filename_utf8)
     return picture_type;
 }
 
-/*
- * et_picture_load_file:
- * @file: the image file to load
- * @user_data: (unused) user data
- *
- * Load the image file @file and update the images tree model.
- */
-static void
-et_picture_load_file (GFile *file, gpointer user_data)
-{
-    Picture *pic;
-    const gchar *filename_utf8;
-    GFileInfo *info;
-    GError *error = NULL;
-
-    info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
-                              G_FILE_QUERY_INFO_NONE, NULL, &error);
-
-    if (!info)
-    {
-        Log_Print (LOG_ERROR, _("Image file not loaded: %s"), error->message);
-        g_error_free (error);
-        return;
-    }
-
-    filename_utf8 = g_file_info_get_display_name (info);
-    pic = et_picture_load_file_data (file, &error);
-
-    if (!pic)
-    {
-        GtkWidget *msgdialog;
-
-        /* Picture file not opened */
-        msgdialog = gtk_message_dialog_new (GTK_WINDOW (MainWindow),
-                                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                            GTK_MESSAGE_ERROR,
-                                            GTK_BUTTONS_CLOSE,
-                                            _("Cannot open file: '%s'"),
-                                            filename_utf8);
-        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(msgdialog),
-                                                  "%s", error->message);
-        gtk_window_set_title (GTK_WINDOW (msgdialog), _("Image File Error"));
-        gtk_dialog_run (GTK_DIALOG (msgdialog));
-        gtk_widget_destroy (msgdialog);
-
-        Log_Print (LOG_ERROR, _("Image file not loaded: %s"),
-                   error->message);
-        g_error_free (error);
-        return;
-    }
-    else
-    {
-        Log_Print (LOG_OK, _("Image file loaded"));
-    }
-
-    if (filename_utf8)
-    {
-        // Behaviour following the tag type...
-        switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
-        {
-            // Only one picture supported for MP4
-            case MP4_TAG:
-                pic->type = ET_PICTURE_TYPE_FRONT_COVER;
-                break;
-
-            // Other tag types
-            case ID3_TAG:
-            case OGG_TAG:
-            case OPUS_TAG:
-            case APE_TAG:
-            case FLAC_TAG:
-            case WAVPACK_TAG:
-                // By default, set the filename in the description
-                pic->description = g_strdup (filename_utf8);
-                pic->type = et_picture_type_from_filename (pic->description);
-                break;
-
-            default:
-                g_assert_not_reached ();
-        }
-
-        PictureEntry_Update (pic, TRUE);
-
-        Picture_Free (pic);
-    }
-
-    g_object_unref (info);
-}
-
-/*
- * To add a picture in the list -> call a FileSelectionWindow
- */
-void Picture_Add_Button_Clicked (GObject *object)
-{
-    GtkWidget *FileSelectionWindow;
-    GtkFileFilter *filter;
-    GtkWindow *parent_window = NULL;
-    static gchar *init_dir = NULL;
-    gint response;
-
-    g_return_if_fail (PictureEntryView != NULL);
-
-    parent_window = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(object)));
-    if (!gtk_widget_is_toplevel(GTK_WIDGET(parent_window)))
-    {
-        g_warning("Could not get parent window\n");
-        return;
-    }
-
-
-    FileSelectionWindow = gtk_file_chooser_dialog_new(_("Add Images"),
-                                                      parent_window,
-                                                      GTK_FILE_CHOOSER_ACTION_OPEN,
-                                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                                      GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
-                                                      NULL);
-
-    // Add files filters
-    // "All files" filter
-    filter = gtk_file_filter_new ();
-    gtk_file_filter_set_name(GTK_FILE_FILTER(filter), _("All Files"));
-    gtk_file_filter_add_pattern(GTK_FILE_FILTER(filter), "*");
-    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(FileSelectionWindow), GTK_FILE_FILTER(filter));
-
-    // "PNG and JPEG" filter
-    filter = gtk_file_filter_new ();
-    gtk_file_filter_set_name(GTK_FILE_FILTER(filter), _("PNG and JPEG"));
-    gtk_file_filter_add_mime_type(GTK_FILE_FILTER(filter), "image/jpeg"); // Using mime type avoid problem 
of case sensitive with extensions
-    gtk_file_filter_add_mime_type(GTK_FILE_FILTER(filter), "image/png");
-    //gtk_file_filter_add_pattern(GTK_FILE_FILTER(filter), "*.jpeg"); // Warning: *.JPEG or *.JpEg files 
will not be displayed
-    //gtk_file_filter_add_pattern(GTK_FILE_FILTER(filter), "*.jpg");
-    //gtk_file_filter_add_pattern(GTK_FILE_FILTER(filter), "*.png");
-    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (FileSelectionWindow), GTK_FILE_FILTER(filter));
-    // Make this filter the default
-    gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(FileSelectionWindow), GTK_FILE_FILTER(filter));
-
-    // Behaviour following the tag type...
-    switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
-    {
-        case MP4_TAG:
-        {
-            // Only one file can be selected
-            gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), FALSE);
-            break;
-        }
-
-        // Other tag types
-        default:
-        {
-            gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), TRUE);
-            break;
-        }
-    }
-
-    gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (FileSelectionWindow),
-                                     FALSE);
-
-    // Starting directory (the same of the current file)
-    if (ETCore->ETFileDisplayed)
-    {
-        gchar *cur_filename_utf8 = ((File_Name *)((GList 
*)ETCore->ETFileDisplayed->FileNameCur)->data)->value_utf8;
-        init_dir = g_path_get_dirname(cur_filename_utf8);
-        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow),init_dir);
-    }else
-    // Starting directory (the same than the previous one)
-    if (init_dir)
-        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow),init_dir);
-
-    response = gtk_dialog_run(GTK_DIALOG(FileSelectionWindow));
-    if (response == GTK_RESPONSE_OK)
-    {
-        GtkTreeSelection *selection;
-        GSList *list;
-
-        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(PictureEntryView));
-        gtk_tree_selection_unselect_all(selection);
-
-        list = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (FileSelectionWindow));
-        g_slist_foreach (list, (GFunc) et_picture_load_file, NULL);
-        g_slist_free_full (list, g_object_unref);
-
-        // Save the directory selected for initialize next time
-        g_free(init_dir);
-        init_dir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow));
-    }
-
-    if (ETCore->ETFileDisplayed)
-    {
-        ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
-        ET_Display_File_Data_To_UI (ETCore->ETFileDisplayed);
-    }
-
-    gtk_widget_destroy(FileSelectionWindow);
-}
-
-
-/*
- * Open the window to select and type the picture properties
- */
-void Picture_Properties_Button_Clicked (GObject *object)
-{
-    GtkWidget *ScrollWindowPictureTypes, *PictureTypesWindow;
-    GtkWidget *type, *label, *desc;
-    GtkCellRenderer *renderer;
-    GtkTreeViewColumn *column;
-    GtkTreeSelection *selection;
-    GtkListStore *store;
-    GtkTreeIter type_iter_to_select, iter;
-    GtkTreeModel *model;
-    GtkWindow *parent_window = NULL;
-    GList *selection_list = NULL;
-    GList *l;
-    gint selection_nbr, selection_i = 1;
-    gint response;
-    EtPictureType pic_type;
-
-    g_return_if_fail (PictureEntryView != NULL);
-
-    parent_window = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(object)));
-    if (!gtk_widget_is_toplevel(GTK_WIDGET(parent_window)))
-    {
-        g_warning("Could not get parent window\n");
-        return;
-    }
-
-    model          = gtk_tree_view_get_model(GTK_TREE_VIEW(PictureEntryView));
-    selection      = gtk_tree_view_get_selection(GTK_TREE_VIEW(PictureEntryView));
-    selection_list = gtk_tree_selection_get_selected_rows(selection, NULL);
-    selection_nbr  = gtk_tree_selection_count_selected_rows(GTK_TREE_SELECTION(selection));
-
-    for (l = selection_list; l != NULL; l = g_list_next (l))
-    {
-        GtkTreePath *path = l->data;
-        Picture *pic = NULL;
-        GtkTreeSelection *selectiontype;
-        gchar *title;
-        GtkTreePath *rowPath;
-        gboolean valid;
-
-        // Get corresponding picture
-        valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &iter, path);
-
-        if (valid)
-        {
-            gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
-                                PICTURE_COLUMN_DATA, &pic, -1);
-        }
-        else
-        {
-            g_warning ("Iter not found in picture model");
-            break;
-        }
-
-        title = g_strdup_printf (_("Image Properties %d/%d"), selection_i++,
-                                 selection_nbr);
-        PictureTypesWindow = gtk_dialog_new_with_buttons(title,
-                                                         parent_window,
-                                                         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                         GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-                                                         GTK_STOCK_OK,     GTK_RESPONSE_OK,
-                                                         NULL);
-        g_free(title);
-
-        gtk_window_set_default_size (GTK_WINDOW (PictureTypesWindow), 400,
-                                     400);
-        gtk_dialog_set_default_response(GTK_DIALOG(PictureTypesWindow), GTK_RESPONSE_OK);
-
-        ScrollWindowPictureTypes = gtk_scrolled_window_new(NULL, NULL);
-        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ScrollWindowPictureTypes),
-                                       GTK_POLICY_AUTOMATIC,
-                                       GTK_POLICY_AUTOMATIC);
-        store = gtk_list_store_new(PICTURE_TYPE_COLUMN_COUNT, G_TYPE_STRING, G_TYPE_INT);
-        type = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
-        g_object_unref (store);
-        gtk_container_add(GTK_CONTAINER(ScrollWindowPictureTypes), type);
-
-        renderer = gtk_cell_renderer_text_new();
-        column = gtk_tree_view_column_new();
-        gtk_tree_view_column_pack_start(column, renderer, FALSE);
-        gtk_tree_view_column_set_title (column, _("Image Type"));
-        gtk_tree_view_column_set_attributes(column, renderer,
-                                            "text", PICTURE_TYPE_COLUMN_TEXT,
-                                            NULL);
-        gtk_tree_view_append_column(GTK_TREE_VIEW(type), column);
-        
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(PictureTypesWindow))),ScrollWindowPictureTypes,TRUE,TRUE,0);
-
-        // Behaviour following the tag type...
-        switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
-        {
-            case MP4_TAG:
-            {
-                /* Load picture type (only Front Cover!). */
-                GtkTreeIter itertype;
-
-                gtk_list_store_insert_with_values (store, &itertype, G_MAXINT,
-                                                   PICTURE_TYPE_COLUMN_TEXT,
-                                                   _(Picture_Type_String (ET_PICTURE_TYPE_FRONT_COVER)),
-                                                   PICTURE_TYPE_COLUMN_TYPE_CODE,
-                                                   ET_PICTURE_TYPE_FRONT_COVER,
-                                                   -1);
-                /* Line to select by default. */
-                type_iter_to_select = itertype;
-                break;
-            }
-
-            // Other tag types
-            default:
-            {
-                // Load pictures types
-                for (pic_type = ET_PICTURE_TYPE_OTHER; pic_type < ET_PICTURE_TYPE_UNDEFINED; pic_type++)
-                {
-                    GtkTreeIter itertype;
-
-                    gtk_list_store_insert_with_values (store, &itertype,
-                                                       G_MAXINT,
-                                                       PICTURE_TYPE_COLUMN_TEXT,
-                                                       _(Picture_Type_String (pic_type)),
-                                                       PICTURE_TYPE_COLUMN_TYPE_CODE,
-                                                       pic_type, -1);
-                    /* Line to select by default. */
-                    if (pic->type == pic_type)
-                        type_iter_to_select = itertype;
-                }
-                break;
-            }
-        }
-
-        // Select the line by default
-        selectiontype = gtk_tree_view_get_selection(GTK_TREE_VIEW(type));
-        gtk_tree_selection_select_iter(selectiontype, &type_iter_to_select);
-
-        // Set visible the current selected line
-        rowPath = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &type_iter_to_select);
-        gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(type), rowPath, NULL, FALSE, 0, 0);
-        gtk_tree_path_free(rowPath);
-
-        // Description of the picture
-        label = gtk_label_new (_("Image Description:"));
-        
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(PictureTypesWindow))),label,FALSE,FALSE,4);
-
-        // Entry for the description
-        desc = gtk_entry_new();
-        
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(PictureTypesWindow))),desc,FALSE,FALSE,0);
-        if (pic->description)
-        {
-            gchar *tmp = Try_To_Validate_Utf8_String(pic->description);
-            gtk_entry_set_text(GTK_ENTRY(desc), tmp);
-            g_free(tmp);
-        }
-
-        // Behaviour following the tag type...
-        switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
-        {
-            case MP4_TAG:
-            {
-                gtk_widget_set_sensitive(GTK_WIDGET(label), FALSE);
-                gtk_widget_set_sensitive(GTK_WIDGET(desc), FALSE);
-                break;
-            }
-
-            // Other tag types
-            default:
-            {
-                break;
-            }
-        }
-
-        gtk_widget_show_all(PictureTypesWindow);
-
-        response = gtk_dialog_run(GTK_DIALOG(PictureTypesWindow));
-        if (response == GTK_RESPONSE_OK)
-        {
-            GtkTreeModel *modeltype;
-            GtkTreeIter itertype;
-
-            modeltype     = gtk_tree_view_get_model(GTK_TREE_VIEW(type));
-            selectiontype = gtk_tree_view_get_selection(GTK_TREE_VIEW(type));
-            if (gtk_tree_selection_get_selected(selectiontype, &modeltype, &itertype))
-            {
-                gchar *buffer, *pic_info;
-                gint t;
-
-                gtk_tree_model_get(modeltype, &itertype,
-                                   PICTURE_TYPE_COLUMN_TYPE_CODE, &t, -1);
-                pic->type = t;
-
-                buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(desc)));
-                g_strstrip (buffer);
-                if (pic->description)
-                    g_free(pic->description);
-
-                /* If the entry was empty, buffer will be the empty string "".
-                 * This can be safely passed to the underlying
-                 * FLAC__metadata_object_picture_set_description(). See
-                 * https://bugs.launchpad.net/ubuntu/+source/easytag/+bug/558804
-                 * and https://bugzilla.redhat.com/show_bug.cgi?id=559828 for
-                 * downstream bugs when 0 was passed instead. */
-                pic->description = buffer;
-
-                // Update value in the PictureEntryView
-                pic_info = Picture_Info(pic);
-                gtk_list_store_set(GTK_LIST_STORE(model), &iter,
-                                   PICTURE_COLUMN_TEXT, pic_info,
-                                   -1);
-                g_free(pic_info);
-            }
-        }
-        gtk_widget_destroy(PictureTypesWindow);
-    }
-
-    g_list_free_full (selection_list, (GDestroyNotify)gtk_tree_path_free);
-}
-
-
-void Picture_Save_Button_Clicked (GObject *object)
-{
-    GtkWidget *FileSelectionWindow;
-    GtkFileFilter *filter;
-    GtkWindow *parent_window = NULL;
-    static gchar *init_dir = NULL;
-
-    GtkTreeSelection *selection;
-    GList *selection_list = NULL;
-    GList *l;
-    GtkTreeModel *model;
-    gint selection_nbr, selection_i = 1;
-
-    g_return_if_fail (PictureEntryView != NULL);
-
-    parent_window = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(object)));
-    if (!gtk_widget_is_toplevel(GTK_WIDGET(parent_window)))
-    {
-        g_warning("Could not get parent window\n");
-        return;
-    }
-
-    model          = gtk_tree_view_get_model(GTK_TREE_VIEW(PictureEntryView));
-    selection      = gtk_tree_view_get_selection(GTK_TREE_VIEW(PictureEntryView));
-    selection_list = gtk_tree_selection_get_selected_rows(selection, NULL);
-    selection_nbr  = gtk_tree_selection_count_selected_rows(GTK_TREE_SELECTION(selection));
-
-    for (l = selection_list; l != NULL; l = g_list_next (l))
-    {
-        GtkTreePath *path = l->data;
-        GtkTreeIter iter;
-        Picture *pic;
-        gchar *title;
-        gboolean valid;
-        gint response;
-
-        // Get corresponding picture
-        valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &iter, path);
-
-        if (valid)
-        {
-            gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
-                                PICTURE_COLUMN_DATA, &pic, -1);
-        }
-        else
-        {
-            g_warning ("Iter not found in picture model");
-            break;
-        }
-
-        title = g_strdup_printf (_("Save Image %d/%d"), selection_i++,
-                                 selection_nbr);
-        FileSelectionWindow = gtk_file_chooser_dialog_new(title,
-                                                          parent_window,
-                                                          GTK_FILE_CHOOSER_ACTION_SAVE,
-                                                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                                          GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
-                                                          NULL);
-        g_free(title);
-
-        // Add files filters
-        // "All files" filter
-        filter = gtk_file_filter_new ();
-        gtk_file_filter_set_name(GTK_FILE_FILTER(filter), _("All Files"));
-        gtk_file_filter_add_pattern(GTK_FILE_FILTER(filter), "*");
-        gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(FileSelectionWindow), GTK_FILE_FILTER(filter));
-
-        // "PNG and JPEG" filter
-        filter = gtk_file_filter_new ();
-        gtk_file_filter_set_name(GTK_FILE_FILTER(filter), _("PNG and JPEG"));
-        gtk_file_filter_add_mime_type(GTK_FILE_FILTER(filter), "image/jpeg");
-        gtk_file_filter_add_mime_type(GTK_FILE_FILTER(filter), "image/png");
-        gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (FileSelectionWindow), GTK_FILE_FILTER(filter));
-        // Make this filter the default
-        gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(FileSelectionWindow),  GTK_FILE_FILTER(filter));
-
-        // Set the default folder if defined
-        if (init_dir)
-            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow),init_dir);
-
-        // Suggest a filename to the user
-        if ( pic->description && strlen(pic->description) )
-        {
-            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(FileSelectionWindow), pic->description); 
//filename in UTF8
-        }else
-        {
-            gchar *image_name = NULL;
-            switch (Picture_Format_From_Data(pic))
-            {
-                case PICTURE_FORMAT_JPEG :
-                    image_name = g_strdup("image_name.jpg");
-                    break;
-                case PICTURE_FORMAT_PNG :
-                    image_name = g_strdup("image_name.png");
-                    break;
-                case PICTURE_FORMAT_GIF:
-                    image_name = g_strdup ("image_name.gif");
-                    break;
-                case PICTURE_FORMAT_UNKNOWN :
-                    image_name = g_strdup("image_name.ext");
-                    break;
-            }
-            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(FileSelectionWindow), image_name); //filename 
in UTF8
-            g_free(image_name);
-        }
-
-        gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (FileSelectionWindow),
-                                                        TRUE);
-        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (FileSelectionWindow),
-                                         FALSE);
-
-        response = gtk_dialog_run(GTK_DIALOG(FileSelectionWindow));
-        if (response == GTK_RESPONSE_OK)
-        {
-            GFile *file;
-            GError *error = NULL;
-
-            // Save the directory selected for initialize next time
-            g_free(init_dir);
-            init_dir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow));
-
-            file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (FileSelectionWindow));
-
-            if (!et_picture_save_file_data (pic, file, &error))
-            {
-                 Log_Print (LOG_ERROR, _("Image file not saved: %s"),
-                            error->message);
-                 g_error_free (error);
-            }
-
-            g_object_unref (file);
-        }
-        gtk_widget_destroy(FileSelectionWindow);
-    }
-
-    g_list_free_full (selection_list, (GDestroyNotify)gtk_tree_path_free);
-}
-
-
 /* FIXME: Possibly use gnome_vfs_get_mime_type_for_buffer. */
 Picture_Format Picture_Format_From_Data (Picture *pic)
 {
@@ -855,7 +193,7 @@ Picture_Format_String (Picture_Format format)
     }
 }
 
-static const gchar *
+const gchar *
 Picture_Type_String (EtPictureType type)
 {
     switch (type)
@@ -909,7 +247,7 @@ Picture_Type_String (EtPictureType type)
     }
 }
 
-static gchar *
+gchar *
 Picture_Info (Picture *pic)
 {
     const gchar *format, *desc, *type;
@@ -959,141 +297,6 @@ Picture_Info (Picture *pic)
     return r;
 }
 
-void PictureEntry_Clear (void)
-{
-    GtkListStore *picture_store;
-    GtkTreeModel *model;
-    GtkTreeIter iter;
-    Picture *pic;
-
-    model = gtk_tree_view_get_model(GTK_TREE_VIEW(PictureEntryView));
-    if (gtk_tree_model_get_iter_first(model, &iter))
-    {
-        do
-        {
-            gtk_tree_model_get(model, &iter, PICTURE_COLUMN_DATA, &pic,-1);
-            Picture_Free(pic);
-        } while (gtk_tree_model_iter_next(model, &iter));
-    }
-
-    picture_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(PictureEntryView)));
-    if (picture_store)
-        gtk_list_store_clear(picture_store);
-}
-
-void PictureEntry_Update (Picture *pic, gboolean select_it)
-{
-    GdkPixbufLoader *loader = 0;
-    GError *error = NULL;
-    
-    g_return_if_fail (pic != NULL && PictureEntryView != NULL);
-
-    if (!pic->data)
-    {
-        PictureEntry_Clear();
-        return;
-    }
-
-    loader = gdk_pixbuf_loader_new();
-    if (loader)
-    {
-        if (gdk_pixbuf_loader_write(loader, pic->data, pic->size, &error))
-        {
-            GtkTreeSelection *selection;
-            GdkPixbuf *pixbuf;
-
-            if (!gdk_pixbuf_loader_close(loader, &error))
-            {
-                Log_Print(LOG_ERROR,_("Error with 'loader_close': %s"), error->message);
-                g_error_free(error);
-            }
-
-            selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(PictureEntryView));
-
-            pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
-            if (pixbuf)
-            {
-                GtkListStore *picture_store;
-                GtkTreeIter iter1;
-                GdkPixbuf *scaled_pixbuf;
-                gint scaled_pixbuf_width;
-                gint scaled_pixbuf_height;
-                gchar *pic_info;
-
-                g_object_ref(pixbuf);
-                g_object_unref(loader);
-                
-                // Keep aspect ratio of the picture
-                pic->width  = gdk_pixbuf_get_width(pixbuf);
-                pic->height = gdk_pixbuf_get_height(pixbuf);
-                if (pic->width > pic->height)
-                {
-                    scaled_pixbuf_width  = 96;
-                    scaled_pixbuf_height = 96 * pic->height / pic->width;
-                }else
-                {
-                    scaled_pixbuf_width = 96 * pic->width / pic->height;
-                    scaled_pixbuf_height = 96;
-                }
-
-                scaled_pixbuf = gdk_pixbuf_scale_simple(pixbuf,
-                                    scaled_pixbuf_width, scaled_pixbuf_height,
-                                    //GDK_INTERP_NEAREST); // Lower quality but better speed
-                                    GDK_INTERP_BILINEAR);
-                g_object_unref(pixbuf);
-
-                picture_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(PictureEntryView)));
-                pic_info = Picture_Info(pic);
-                gtk_list_store_insert_with_values (picture_store, &iter1,
-                                                   G_MAXINT,
-                                                   PICTURE_COLUMN_PIC,
-                                                   scaled_pixbuf,
-                                                   PICTURE_COLUMN_TEXT,
-                                                   pic_info,
-                                                   PICTURE_COLUMN_DATA,
-                                                   Picture_Copy_One (pic), -1);
-                g_free(pic_info);
-
-                if (select_it)
-                    gtk_tree_selection_select_iter(selection, &iter1);
-                g_object_unref(scaled_pixbuf);
-            }else
-            {
-                GtkWidget *msgdialog;
-                
-                g_object_unref(loader);
-                
-                Log_Print (LOG_ERROR, "%s",
-                           _("Cannot display the image because not enough data has been read to determine 
how to create the image buffer."));
-
-                msgdialog = gtk_message_dialog_new(GTK_WINDOW(MainWindow),
-                                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                   GTK_MESSAGE_ERROR,
-                                                   GTK_BUTTONS_CLOSE,
-                                                   "%s",
-                                                   _("Cannot display the image"));
-                gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (msgdialog),
-                                                          _("Not enough data has been read to determine how 
to create the image buffer."));
-                gtk_window_set_title (GTK_WINDOW (msgdialog),
-                                      _("Load Image File"));
-                gtk_dialog_run(GTK_DIALOG(msgdialog));
-                gtk_widget_destroy(msgdialog);
-            }
-        }else
-        {
-            Log_Print(LOG_ERROR,_("Error with 'loader_write': %s"), error->message);
-            g_error_free(error);
-        }
-    }
-
-    // Do also for next picture
-    if (pic->next)
-        PictureEntry_Update(pic->next, select_it);
-
-    return;
-}
-
-
 Picture *Picture_Allocate (void)
 {
     Picture *pic = g_malloc0(sizeof(Picture));
@@ -1152,7 +355,7 @@ void Picture_Free (Picture *pic)
  *
  * Returns: an image on success, %NULL otherwise
  */
-static Picture *
+Picture *
 et_picture_load_file_data (GFile *file, GError **error)
 {
     gsize size;
@@ -1238,7 +441,7 @@ et_picture_load_file_data (GFile *file, GError **error)
  *
  * Returns: %TRUE on success, %FALSE otherwise
  */
-static gboolean
+gboolean
 et_picture_save_file_data (const Picture *pic, GFile *file, GError **error)
 {
     GFileOutputStream *file_ostream;
@@ -1277,61 +480,3 @@ et_picture_save_file_data (const Picture *pic, GFile *file, GError **error)
     g_object_unref (file_ostream);
     return TRUE;
 }
-
-/*
- * If double clicking the PictureEntryView :
- *  - over a selected row : opens properties window
- *  - over an empty area : open the adding window
- */
-gboolean Picture_Entry_View_Button_Pressed (GtkTreeView *treeview, GdkEventButton *event, gpointer data)
-{
-    if (event->type == GDK_BUTTON_PRESS && event->button == GDK_BUTTON_PRIMARY)
-    {
-        if (event->window == gtk_tree_view_get_bin_window (treeview))
-        {
-            if (!gtk_tree_view_get_path_at_pos (treeview, event->x, event->y,
-                                                NULL, NULL, NULL, NULL))
-            {
-                gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (treeview));
-            }
-        }
-    }
-
-    if (event->type == GDK_2BUTTON_PRESS
-        && event->button == GDK_BUTTON_PRIMARY)
-    {
-        GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(PictureEntryView));
-
-        if (gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (selection)) >= 1)
-            Picture_Properties_Button_Clicked (G_OBJECT (image_properties_toolitem));
-        else
-            Picture_Add_Button_Clicked (G_OBJECT (add_image_toolitem));
-
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-
-/*
- * Key press into picture entry
- *   - Delete = delete selected picture files
- */
-gboolean Picture_Entry_View_Key_Pressed (GtkTreeView *treeview, GdkEvent *event, gpointer data)
-{
-    GdkEventKey *kevent;
-
-    kevent = (GdkEventKey *)event;
-    if (event && event->type==GDK_KEY_PRESS)
-    {
-        switch(kevent->keyval)
-        {
-            case GDK_KEY_Delete:
-                Picture_Clear_Button_Clicked(NULL);
-                return TRUE;
-        }
-    }
-
-    return FALSE;
-}
diff --git a/src/picture.h b/src/picture.h
index caf5616..c7b3533 100644
--- a/src/picture.h
+++ b/src/picture.h
@@ -18,9 +18,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
-#ifndef __PICTURE_H__
-#define __PICTURE_H__
+#ifndef ET_PICTURE_H_
+#define ET_PICTURE_H_
 
 #include "et_core.h"
 
@@ -79,54 +78,24 @@ typedef enum
     PICTURE_FORMAT_UNKNOWN
 } Picture_Format;
 
-enum // Columns for PictureEntryView
-{
-    PICTURE_COLUMN_PIC, // Column 0
-    PICTURE_COLUMN_TEXT,
-    PICTURE_COLUMN_DATA,
-    PICTURE_COLUMN_COUNT
-};
-
-enum // Columns for list in properties window
-{
-    PICTURE_TYPE_COLUMN_TEXT, // Column 0
-    PICTURE_TYPE_COLUMN_TYPE_CODE,
-    PICTURE_TYPE_COLUMN_COUNT
-};
-
-enum
-{
-    TARGET_URI_LIST
-};
-
-
 /**************
  * Prototypes *
  **************/
 
-void Tag_Area_Picture_Drag_Data (GtkWidget *widget, GdkDragContext *dc, 
-                                 gint x, gint y, GtkSelectionData *selection_data,
-                                 guint info, guint t, gpointer data);
-void Picture_Selection_Changed_cb (GtkTreeSelection *selection, gpointer data);
-
-void Picture_Add_Button_Clicked         (GObject *object);
-void Picture_Properties_Button_Clicked  (GObject *object);
-void Picture_Save_Button_Clicked        (GObject *object);
-void Picture_Clear_Button_Clicked       (GObject *object);
-
-void PictureEntry_Clear  (void);
-void PictureEntry_Update (Picture *pic, gboolean select_it);
-
 Picture       *Picture_Allocate         (void);
 Picture       *Picture_Copy_One         (const Picture *pic);
 Picture       *Picture_Copy             (const Picture *pic);
 void           Picture_Free             (Picture *pic);
 Picture_Format Picture_Format_From_Data (Picture *pic);
 const gchar   *Picture_Mime_Type_String (Picture_Format format);
+const gchar * Picture_Type_String (EtPictureType type);
+gchar * Picture_Info (Picture *pic);
+
+Picture *et_picture_load_file_data (GFile *file, GError **error);
+gboolean et_picture_save_file_data (const Picture *pic, GFile *file, GError **error);
 
-gboolean Picture_Entry_View_Button_Pressed (GtkTreeView *treeview, GdkEventButton *event, gpointer data);
-gboolean Picture_Entry_View_Key_Pressed    (GtkTreeView *treeview, GdkEvent *event, gpointer data);
+EtPictureType et_picture_type_from_filename (const gchar *filename_utf8);
 
 G_END_DECLS
 
-#endif /* __PICTURE_H__ */
+#endif /* ET_PICTURE_H_ */
diff --git a/src/tag_area.c b/src/tag_area.c
new file mode 100644
index 0000000..9439412
--- /dev/null
+++ b/src/tag_area.c
@@ -0,0 +1,3537 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014  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 "tag_area.h"
+
+#include <ctype.h>
+#include <glib/gi18n.h>
+
+#include "application_window.h"
+#include "bar.h"
+#include "charset.h"
+#include "easytag.h"
+#include "et_core.h"
+#include "genres.h"
+#include "gtk2_compat.h"
+#include "log.h"
+#include "misc.h"
+#include "picture.h"
+#include "scan.h"
+#include "scan_dialog.h"
+
+/* TODO: Use G_DEFINE_TYPE_WITH_PRIVATE. */
+G_DEFINE_TYPE (EtTagArea, et_tag_area, GTK_TYPE_BIN)
+
+#define et_tag_area_get_instance_private(area) (area->priv)
+
+struct _EtTagAreaPrivate
+{
+    GtkWidget *frame;
+    GtkWidget *notebook;
+
+    GtkWidget *title_label;
+    GtkWidget *title_entry;
+    GtkWidget *artist_label;
+    GtkWidget *artist_entry;
+    GtkWidget *album_artist_label;
+    GtkWidget *album_artist_entry;
+    GtkWidget *album_label;
+    GtkWidget *album_entry;
+    GtkWidget *disc_number_label;
+    GtkWidget *disc_number_entry;
+    GtkWidget *year_label;
+    GtkWidget *year_entry;
+    GtkWidget *track_label;
+    GtkWidget *track_combo_entry;
+    GtkWidget *track_total_entry;
+    GtkWidget *genre_label;
+    GtkWidget *genre_combo_entry;
+    GtkWidget *comment_label;
+    GtkWidget *comment_entry;
+    GtkWidget *composer_label;
+    GtkWidget *composer_entry;
+    GtkWidget *orig_artist_label;
+    GtkWidget *orig_artist_entry;
+    GtkWidget *copyright_label;
+    GtkWidget *copyright_entry;
+    GtkWidget *url_label;
+    GtkWidget *url_entry;
+    GtkWidget *encoded_by_label;
+    GtkWidget *encoded_by_entry;
+
+    GtkListStore *genre_combo_model;
+    GtkListStore *track_combo_model;
+
+    GtkWidget *picture_entry_view;
+
+    /* Other for picture. */
+    GtkToolItem *remove_image_toolitem;
+    GtkToolItem *add_image_toolitem;
+    GtkToolItem *save_image_toolitem;
+    GtkToolItem *image_properties_toolitem;
+
+    /* Notebook tabs. */
+    GtkWidget *images_tab;
+
+    /* Image treeview model. */
+    GtkListStore *images_model;
+
+    /* Mini buttons. */
+    GtkWidget *track_sequence_button;
+    GtkWidget *track_number_button;
+    GtkToolItem *apply_image_toolitem;
+};
+
+enum
+{
+    TRACK_COLUMN_TRACK_NUMBER,
+    TRACK_COLUMN_COUNT
+};
+
+enum
+{
+    GENRE_COLUMN_GENRE,
+    GENRE_COLUMN_COUNT
+};
+
+enum
+{
+    TARGET_URI_LIST
+};
+
+enum /* Columns for picture_entry_view. */
+{
+    PICTURE_COLUMN_PIC,
+    PICTURE_COLUMN_TEXT,
+    PICTURE_COLUMN_DATA,
+    PICTURE_COLUMN_COUNT
+};
+
+enum /* Columns for list in properties window. */
+{
+    PICTURE_TYPE_COLUMN_TEXT,
+    PICTURE_TYPE_COLUMN_TYPE_CODE,
+    PICTURE_TYPE_COLUMN_COUNT
+};
+
+static void
+on_apply_to_selection (GObject *object,
+                       EtTagArea *self)
+{
+    EtTagAreaPrivate *priv;
+    GList *etfilelist = NULL;
+    GList *selection_filelist = NULL;
+    GList *l;
+    gchar *string_to_set = NULL;
+    gchar *string_to_set1 = NULL;
+    gchar *msg = NULL;
+    ET_File *etfile;
+    File_Tag *FileTag;
+    GtkTreeSelection *selection;
+
+    g_return_if_fail (ETCore->ETFileDisplayedList != NULL);
+
+    priv = et_tag_area_get_instance_private (self);
+
+    // Save the current displayed data
+    ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+
+    /* Warning : 'selection_filelist' is not a list of 'ETFile' items! */
+    selection = et_application_window_browser_get_selection (ET_APPLICATION_WINDOW (MainWindow));
+    selection_filelist = gtk_tree_selection_get_selected_rows (selection, NULL);
+
+    // Create an 'ETFile' list from 'selection_filelist'
+    for (l = selection_filelist; l != NULL; l = g_list_next (l))
+    {
+        etfile = et_application_window_browser_get_et_file_from_path (ET_APPLICATION_WINDOW (MainWindow),
+                                                   l->data);
+        etfilelist = g_list_prepend (etfilelist, etfile);
+    }
+
+    etfilelist = g_list_reverse (etfilelist);
+    g_list_free_full (selection_filelist, (GDestroyNotify)gtk_tree_path_free);
+
+
+    if (object == G_OBJECT (priv->title_entry))
+    {
+        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->title_entry),0,-1); // The string to apply 
to all other files
+
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item(&FileTag->title,string_to_set);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+            msg = g_strdup_printf(_("Selected files tagged with title '%s'."),string_to_set);
+        else
+            msg = g_strdup(_("Removed title from selected files."));
+    }
+    else if (object == G_OBJECT (priv->artist_entry))
+    {
+        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->artist_entry),0,-1);
+
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item(&FileTag->artist,string_to_set);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+            msg = g_strdup_printf(_("Selected files tagged with artist '%s'."),string_to_set);
+        else
+            msg = g_strdup(_("Removed artist from selected files."));
+    }
+    else if (object == G_OBJECT (priv->album_artist_entry))
+    {
+        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->album_artist_entry),0,-1);
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item(&FileTag->album_artist,string_to_set);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+            msg = g_strdup_printf(_("Selected files tagged with album artist '%s'."),string_to_set);
+        else
+            msg = g_strdup(_("Removed album artist from selected files."));
+    }
+    else if (object == G_OBJECT (priv->album_entry))
+    {
+        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->album_entry),0,-1);
+
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item(&FileTag->album,string_to_set);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+            msg = g_strdup_printf(_("Selected files tagged with album '%s'."),string_to_set);
+        else
+            msg = g_strdup(_("Removed album name from selected files."));
+    }
+    else if (object == G_OBJECT (priv->disc_number_entry))
+    {
+        const gchar *entry_text;
+        gchar *separator;
+
+        entry_text = gtk_entry_get_text (GTK_ENTRY (priv->disc_number_entry));
+        separator = g_utf8_strchr (entry_text, -1, '/');
+
+        if (separator)
+        {
+            string_to_set1 = g_strdup (separator + 1);
+            string_to_set = g_strndup (entry_text,
+                                       separator - entry_text);
+        }
+        else
+        {
+            string_to_set = g_strdup (entry_text);
+            string_to_set1 = NULL;
+        }
+
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item (&FileTag->disc_number, string_to_set);
+            ET_Set_Field_File_Tag_Item (&FileTag->disc_total, string_to_set1);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+
+        if (string_to_set != NULL && g_utf8_strlen (string_to_set, -1) > 0)
+        {
+            if (string_to_set1 != NULL
+                && g_utf8_strlen (string_to_set1, -1) > 0)
+            {
+                msg = g_strdup_printf (_("Selected files tagged with disc number '%s/%s'."),
+                                       string_to_set, string_to_set1);
+            }
+            else
+            {
+                msg = g_strdup_printf (_("Selected files tagged with disc number like 'xx'."));
+            }
+        }
+        else
+        {
+            msg = g_strdup (_("Removed disc number from selected files."));
+        }
+    }
+    else if (object == G_OBJECT (priv->year_entry))
+    {
+        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->year_entry),0,-1);
+
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item(&FileTag->year,string_to_set);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+            msg = g_strdup_printf(_("Selected files tagged with year '%s'."),string_to_set);
+        else
+            msg = g_strdup(_("Removed year from selected files."));
+    }
+    else if (object == G_OBJECT (priv->track_total_entry))
+    {
+        /* Used of Track and Total Track values */
+        string_to_set = 
g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(priv->track_combo_entry)))));
+        string_to_set1 = gtk_editable_get_chars(GTK_EDITABLE(priv->track_total_entry),0,-1);
+
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+
+            // We apply the TrackEntry field to all others files only if it is to delete
+            // the field (string=""). Else we don't overwrite the track number
+            if (!string_to_set || g_utf8_strlen(string_to_set, -1) == 0)
+                ET_Set_Field_File_Tag_Item(&FileTag->track,string_to_set);
+            ET_Set_Field_File_Tag_Item(&FileTag->track_total,string_to_set1);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+
+        if ( string_to_set && g_utf8_strlen(string_to_set, -1) > 0 ) //&& atoi(string_to_set)>0 )
+        {
+            if ( string_to_set1 != NULL && g_utf8_strlen(string_to_set1, -1)>0 ) //&& atoi(string_to_set1)>0 
)
+            {
+                msg = g_strdup_printf(_("Selected files tagged with track like 'xx/%s'."),string_to_set1);
+            }else
+            {
+                msg = g_strdup_printf(_("Selected files tagged with track like 'xx'."));
+            }
+        }else
+        {
+            msg = g_strdup(_("Removed track number from selected files."));
+        }
+    }
+    else if (object == G_OBJECT (priv->track_sequence_button))
+    {
+        /* This part doesn't set the same track number to all files, but sequence the tracks.
+         * So we must browse the whole 'etfilelistfull' to get position of each selected file.
+         * Note : 'etfilelistfull' and 'etfilelist' must be sorted in the same order */
+        GList *etfilelistfull = NULL;
+        gint sort_mode;
+        gchar *path = NULL;
+        gchar *path1 = NULL;
+        gint i = 0;
+
+        /* FIX ME!: see to fill also the Total Track (it's a good idea?) */
+        etfilelistfull = g_list_first(ETCore->ETFileList);
+
+        /* Sort 'etfilelistfull' and 'etfilelist' in the same order. */
+        sort_mode = g_settings_get_enum (MainSettings, "sort-mode");
+        etfilelist = ET_Sort_File_List (etfilelist, sort_mode);
+        etfilelistfull = ET_Sort_File_List (etfilelistfull, sort_mode);
+
+        while (etfilelist && etfilelistfull)
+        {
+            // To get the path of the file
+            File_Name *FileNameCur = (File_Name *)((ET_File *)etfilelistfull->data)->FileNameCur->data;
+            // The ETFile in the selected file list
+            etfile = etfilelist->data;
+
+            // Restart counter when entering a new directory
+            g_free(path1);
+            path1 = g_path_get_dirname(FileNameCur->value);
+            if ( path && path1 && strcmp(path,path1)!=0 )
+                i = 0;
+
+            string_to_set = et_track_number_to_string (++i);
+
+            // The file is in the selection?
+            if ( (ET_File *)etfilelistfull->data == etfile )
+            {
+                FileTag = ET_File_Tag_Item_New();
+                ET_Copy_File_Tag_Item(etfile,FileTag);
+                ET_Set_Field_File_Tag_Item(&FileTag->track,string_to_set);
+                ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+
+                if (!etfilelist->next) break;
+                etfilelist = g_list_next(etfilelist);
+            }
+
+            g_free(string_to_set);
+            g_free(path);
+            path = g_strdup(path1);
+
+            etfilelistfull = g_list_next(etfilelistfull);
+        }
+        g_free(path);
+        g_free(path1);
+        //msg = g_strdup_printf(_("All %d tracks numbered sequentially."), 
ETCore->ETFileSelectionList_Length);
+        msg = g_strdup_printf(_("Selected tracks numbered sequentially."));
+    }
+    else if (object==G_OBJECT(priv->track_number_button))
+    {
+        /* Used of Track and Total Track values */
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            gchar *path_utf8, *filename_utf8;
+
+            etfile        = (ET_File *)l->data;
+            filename_utf8 = ((File_Name *)etfile->FileNameNew->data)->value_utf8;
+            path_utf8     = g_path_get_dirname(filename_utf8);
+
+            string_to_set = et_track_number_to_string (ET_Get_Number_Of_Files_In_Directory (path_utf8));
+
+            g_free(path_utf8);
+            if (!string_to_set1)
+                string_to_set1 = g_strdup(string_to_set); // Just for the message below...
+
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item(&FileTag->track_total,string_to_set);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+
+        if ( string_to_set1 != NULL && g_utf8_strlen(string_to_set1, -1)>0 ) //&& atoi(string_to_set1)>0 )
+        {
+            msg = g_strdup_printf(_("Selected files tagged with track like 'xx/%s'."),string_to_set1);
+        }else
+        {
+            msg = g_strdup(_("Removed track number from selected files."));
+        }
+    }
+    else if (object == G_OBJECT (gtk_bin_get_child (GTK_BIN (priv->genre_combo_entry))))
+    {
+        string_to_set = 
gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(priv->genre_combo_entry))),0,-1);
+
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item(&FileTag->genre,string_to_set);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+            msg = g_strdup_printf(_("Selected files tagged with genre '%s'."),string_to_set);
+        else
+            msg = g_strdup(_("Removed genre from selected files."));
+    }
+    else if (object == G_OBJECT (priv->comment_entry))
+    {
+        //GtkTextBuffer *textbuffer;
+        //GtkTextIter    start_iter;
+        //GtkTextIter    end_iter;
+        //textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(CommentView));
+        //gtk_text_buffer_get_bounds(GTK_TEXT_BUFFER(textbuffer),&start_iter,&end_iter);
+        //string_to_set = gtk_text_buffer_get_text(GTK_TEXT_BUFFER(textbuffer),&start_iter,&end_iter,TRUE);
+
+        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->comment_entry),0,-1);
+
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item(&FileTag->comment,string_to_set);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+            msg = g_strdup_printf(_("Selected files tagged with comment '%s'."),string_to_set);
+        else
+            msg = g_strdup(_("Removed comment from selected files."));
+    }
+    else if (object == G_OBJECT (priv->composer_entry))
+    {
+        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->composer_entry),0,-1);
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item(&FileTag->composer,string_to_set);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+            msg = g_strdup_printf(_("Selected files tagged with composer '%s'."),string_to_set);
+        else
+            msg = g_strdup(_("Removed composer from selected files."));
+    }
+    else if (object == G_OBJECT (priv->orig_artist_entry))
+    {
+        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->orig_artist_entry),0,-1);
+
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item(&FileTag->orig_artist,string_to_set);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+            msg = g_strdup_printf(_("Selected files tagged with original artist '%s'."),string_to_set);
+        else
+            msg = g_strdup(_("Removed original artist from selected files."));
+    }
+    else if (object == G_OBJECT (priv->copyright_entry))
+    {
+        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->copyright_entry),0,-1);
+
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item(&FileTag->copyright,string_to_set);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+            msg = g_strdup_printf(_("Selected files tagged with copyright '%s'."),string_to_set);
+        else
+            msg = g_strdup(_("Removed copyright from selected files."));
+    }
+    else if (object == G_OBJECT (priv->url_entry))
+    {
+        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->url_entry),0,-1);
+
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item(&FileTag->url,string_to_set);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+            msg = g_strdup_printf(_("Selected files tagged with URL '%s'."),string_to_set);
+        else
+            msg = g_strdup(_("Removed URL from selected files."));
+    }
+    else if (object == G_OBJECT (priv->encoded_by_entry))
+    {
+        string_to_set = gtk_editable_get_chars(GTK_EDITABLE(priv->encoded_by_entry),0,-1);
+
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Item(&FileTag->encoded_by,string_to_set);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+        if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
+            msg = g_strdup_printf(_("Selected files tagged with encoder name '%s'."),string_to_set);
+        else
+            msg = g_strdup(_("Removed encoder name from selected files."));
+    }
+    else if (object == G_OBJECT (priv->apply_image_toolitem))
+    {
+        Picture *res = NULL, *pic, *prev_pic = NULL;
+        GtkTreeModel *model;
+        GtkTreeIter iter;
+
+        model = gtk_tree_view_get_model(GTK_TREE_VIEW(priv->picture_entry_view));
+        if (gtk_tree_model_get_iter_first(model, &iter))
+        {
+            do
+            {
+                gtk_tree_model_get(model, &iter, PICTURE_COLUMN_DATA, &pic, -1);
+                pic = Picture_Copy_One(pic);
+                if (!res)
+                    res = pic;
+                else
+                    prev_pic->next = pic;
+                prev_pic = pic;
+            } while (gtk_tree_model_iter_next(model, &iter));
+        }
+
+        for (l = etfilelist; l != NULL; l = g_list_next (l))
+        {
+            etfile = (ET_File *)l->data;
+            FileTag = ET_File_Tag_Item_New();
+            ET_Copy_File_Tag_Item(etfile,FileTag);
+            ET_Set_Field_File_Tag_Picture((Picture **)&FileTag->picture, res);
+            ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
+        }
+        if (res)
+            msg = g_strdup (_("Selected files tagged with images."));
+        else
+            msg = g_strdup (_("Removed images from selected files."));
+        Picture_Free(res);
+    }
+
+    g_list_free(etfilelist);
+
+    /* Refresh the whole list (faster than file by file) to show changes. */
+    et_application_window_browser_refresh_list (ET_APPLICATION_WINDOW (MainWindow));
+
+    /* Display the current file (Needed when sequencing tracks) */
+    ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
+
+    if (msg)
+    {
+        Log_Print(LOG_OK,"%s",msg);
+        Statusbar_Message(msg,TRUE);
+        g_free(msg);
+    }
+    g_free(string_to_set);
+    g_free(string_to_set1);
+
+    /* To update state of Undo button */
+    et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
+}
+
+static void
+Convert_P20_And_Underscore_Into_Spaces (GtkWidget *entry)
+{
+    gchar *string = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+
+    Scan_Convert_Underscore_Into_Space (string);
+    Scan_Convert_P20_Into_Space (string);
+    gtk_entry_set_text (GTK_ENTRY (entry), string);
+    g_free (string);
+}
+
+static void
+Convert_Space_Into_Underscore (GtkWidget *entry)
+{
+    gchar *string = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+
+    Scan_Convert_Space_Into_Underscore (string);
+    gtk_entry_set_text (GTK_ENTRY (entry), string);
+    g_free (string);
+}
+
+static void
+Convert_All_Uppercase (GtkWidget *entry)
+{
+    gchar *res;
+    const gchar *string = gtk_entry_get_text (GTK_ENTRY (entry));
+
+    res = Scan_Process_Fields_All_Uppercase (string);
+    gtk_entry_set_text (GTK_ENTRY (entry), res);
+    g_free (res);
+}
+
+static void
+Convert_All_Lowercase (GtkWidget *entry)
+{
+    gchar *res;
+    const gchar *string = gtk_entry_get_text (GTK_ENTRY (entry));
+
+    res = Scan_Process_Fields_All_Downcase (string);
+    gtk_entry_set_text (GTK_ENTRY (entry), res);
+    g_free (res);
+}
+
+static void
+Convert_Letter_Uppercase (GtkWidget *entry)
+{
+    gchar *res;
+    const gchar *string = gtk_entry_get_text (GTK_ENTRY (entry));
+
+    res = Scan_Process_Fields_Letter_Uppercase (string);
+    gtk_entry_set_text (GTK_ENTRY (entry), res);
+    g_free (res);
+}
+
+static void
+Convert_First_Letters_Uppercase (GtkWidget *entry)
+{
+    EtScanDialog *dialog;
+    gchar *string;
+
+    string = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+    dialog = ET_SCAN_DIALOG (et_application_window_get_scan_dialog (ET_APPLICATION_WINDOW (MainWindow)));
+
+    Scan_Process_Fields_First_Letters_Uppercase (dialog, &string);
+    gtk_entry_set_text (GTK_ENTRY (entry), string);
+    g_free (string);
+}
+
+static void
+Convert_Remove_Space (GtkWidget *entry)
+{
+    gchar *string = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+
+    Scan_Process_Fields_Remove_Space (string);
+    gtk_entry_set_text (GTK_ENTRY (entry), string);
+    g_free (string);
+}
+
+static void
+Convert_Insert_Space (GtkWidget *entry)
+{
+    gchar *res;
+    const gchar *string = (gtk_entry_get_text (GTK_ENTRY (entry)));
+
+    res = Scan_Process_Fields_Insert_Space (string);
+    gtk_entry_set_text (GTK_ENTRY (entry), res);
+    g_free (res);
+}
+
+static void
+Convert_Only_One_Space (GtkWidget *entry)
+{
+    gchar *string = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+
+    Scan_Process_Fields_Keep_One_Space (string);
+    gtk_entry_set_text (GTK_ENTRY (entry), string);
+    g_free (string);
+}
+
+static void
+Convert_Remove_All_Text (GtkWidget *entry)
+{
+    gtk_entry_set_text (GTK_ENTRY (entry), "");
+}
+
+static void
+on_apply_to_selection_menu_item (GObject *entry,
+                                 GtkMenuItem *menu_item)
+{
+    EtTagArea *self;
+
+    self = g_object_get_data (G_OBJECT (menu_item), "tag-area");
+
+    on_apply_to_selection (entry, self);
+}
+
+/* TODO: Support populate-all and do not assume the widget is a GtkMenu.
+ * Popup menu attached to all entries of tag + filename + rename combobox.
+ * Displayed when pressing the right mouse button and contains functions to process ths strings.
+ */
+void
+on_entry_populate_popup (GtkEntry *entry,
+                         GtkWidget *menu,
+                         EtTagArea *self)
+{
+    GtkWidget *image;
+    GtkWidget *menu_item;
+
+    /* Menu items */
+    menu_item = gtk_image_menu_item_new_with_label (_("Tag selected files with this field"));
+    g_object_set_data (G_OBJECT (menu_item), "tag-area", self);
+    image = gtk_image_new_from_icon_name ("go-jump", GTK_ICON_SIZE_MENU);
+    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    g_signal_connect_swapped (menu_item, "activate",
+                              G_CALLBACK (on_apply_to_selection_menu_item),
+                              G_OBJECT (entry));
+
+    /* Separator */
+    menu_item = gtk_menu_item_new ();
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+
+    menu_item = gtk_image_menu_item_new_with_label (_("Convert '_' and '%20' to spaces"));
+    image = gtk_image_new_from_stock (GTK_STOCK_CONVERT, GTK_ICON_SIZE_MENU);
+    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    g_signal_connect_swapped (menu_item, "activate",
+                              G_CALLBACK (Convert_P20_And_Underscore_Into_Spaces),
+                              G_OBJECT (entry));
+
+    menu_item = gtk_image_menu_item_new_with_label (_("Convert ' ' to '_'"));
+    image = gtk_image_new_from_stock (GTK_STOCK_CONVERT, GTK_ICON_SIZE_MENU);
+    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    g_signal_connect_swapped (menu_item, "activate",
+                              G_CALLBACK (Convert_Space_Into_Underscore),
+                              G_OBJECT (entry));
+
+    /* Separator */
+    menu_item = gtk_menu_item_new ();
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+
+    menu_item = gtk_image_menu_item_new_with_label (_("All uppercase"));
+    image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/all-uppercase.png");
+    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    g_signal_connect_swapped (menu_item, "activate",
+                              G_CALLBACK (Convert_All_Uppercase),
+                              G_OBJECT (entry));
+
+    menu_item = gtk_image_menu_item_new_with_label (_("All lowercase"));
+    image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/all-lowercase.png");
+    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    g_signal_connect_swapped (menu_item, "activate",
+                              G_CALLBACK (Convert_All_Lowercase),
+                              G_OBJECT (entry));
+
+    menu_item = gtk_image_menu_item_new_with_label (_("First letter uppercase"));
+    image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/first-letter-uppercase.png");
+    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    g_signal_connect_swapped (menu_item, "activate",
+                              G_CALLBACK (Convert_Letter_Uppercase),
+                              G_OBJECT (entry));
+
+    menu_item = gtk_image_menu_item_new_with_label (_("First letter uppercase of each word"));
+    image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/first-letter-uppercase-word.png");
+    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    g_signal_connect_swapped (menu_item, "activate",
+                              G_CALLBACK (Convert_First_Letters_Uppercase),
+                              G_OBJECT (entry));
+
+    /* Separator */
+    menu_item = gtk_menu_item_new ();
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+
+    menu_item = gtk_image_menu_item_new_with_label (_("Remove spaces"));
+    image = gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_MENU);
+    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    g_signal_connect_swapped (menu_item, "activate",
+                              G_CALLBACK (Convert_Remove_Space),
+                              G_OBJECT (entry));
+
+    menu_item = gtk_image_menu_item_new_with_label (_("Insert space before uppercase letter"));
+    image = gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_MENU);
+    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    g_signal_connect_swapped (menu_item, "activate",
+                              G_CALLBACK (Convert_Insert_Space),
+                              G_OBJECT (entry));
+
+    menu_item = gtk_image_menu_item_new_with_label (_("Remove duplicate spaces or underscores"));
+    image = gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_MENU);
+    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    g_signal_connect_swapped (menu_item, "activate",
+                              G_CALLBACK (Convert_Only_One_Space),
+                              G_OBJECT (entry));
+
+    menu_item = gtk_image_menu_item_new_with_label (_("Remove all text"));
+    image = gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_MENU);
+    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    g_signal_connect_swapped (menu_item, "activate",
+                              G_CALLBACK (Convert_Remove_All_Text),
+                              G_OBJECT (entry));
+
+    gtk_widget_show_all (menu);
+}
+
+/*
+ * et_tag_field_on_key_press_event:
+ * @entry: the tag entry field on which the event was generated
+ * @event: the generated event
+ * @user_data: user data set when the signal was connected
+ *
+ * Handle the Ctrl+Return combination being pressed in the tag field GtkEntrys
+ * and apply the tag to selected files.
+ *
+ * Returns: %TRUE if the event was handled, %FALSE if the event should
+ * propagate further
+ */
+static gboolean
+et_tag_field_on_key_press_event (GtkEntry *entry, GdkEventKey *event,
+                                 gpointer user_data)
+{
+    GdkModifierType modifiers = gtk_accelerator_get_default_mod_mask ();
+
+    switch (event->keyval)
+    {
+        case GDK_KEY_Return:
+        case GDK_KEY_KP_Enter:
+        case GDK_KEY_ISO_Enter:
+            if ((event->state & modifiers) == GDK_CONTROL_MASK)
+            {
+                on_apply_to_selection (G_OBJECT (entry),
+                                       ET_TAG_AREA (user_data));
+            }
+            return TRUE;
+        default:
+            return FALSE;
+    }
+}
+
+/*
+ * et_tag_field_connect_signals:
+ * @entry: the entry for which to connect signals
+ *
+ * Connect the GtkWidget::key-press-event and GtkEntry::icon-release signals
+ * of @entry to appropriate handlers for tag entry fields.
+ */
+static void
+et_tag_field_connect_signals (GtkEntry *entry,
+                              EtTagArea *self)
+{
+    g_signal_connect_after (entry, "key-press-event",
+                            G_CALLBACK (et_tag_field_on_key_press_event),
+                            self);
+    g_signal_connect (entry, "icon-release",
+                      G_CALLBACK (on_apply_to_selection),
+                      self);
+    g_signal_connect (entry, "populate-popup",
+                      G_CALLBACK (on_entry_populate_popup), self);
+}
+
+/*
+ * Load the genres list to the combo, and sorts it
+ */
+static void
+populate_genre_combo (EtTagArea *self)
+{
+    EtTagAreaPrivate *priv;
+    gsize i;
+
+    priv = et_tag_area_get_instance_private (self);
+
+    gtk_list_store_insert_with_values (priv->genre_combo_model, NULL,
+                                       G_MAXINT, GENRE_COLUMN_GENRE, "", -1);
+    gtk_list_store_insert_with_values (priv->genre_combo_model, NULL,
+                                       G_MAXINT, GENRE_COLUMN_GENRE, "Unknown",
+                                       -1);
+
+    for (i = 0; i <= GENRE_MAX; i++)
+    {
+        gtk_list_store_insert_with_values (priv->genre_combo_model, NULL,
+                                           G_MAXINT, GENRE_COLUMN_GENRE,
+                                           id3_genres[i], -1);
+    }
+}
+
+/*
+ * Load the track numbers into the track combo list
+ * We limit the preloaded values to 30 to avoid lost of time with lot of files...
+ */
+static void
+populate_track_combo (EtTagArea *self)
+{
+    EtTagAreaPrivate *priv;
+    /* Length limited to 30 (instead to the number of files)! */
+    const gsize len = 30;
+    gsize i;
+    gchar *text;
+
+    priv = et_tag_area_get_instance_private (self);
+
+    /* Remove the entries in the list to avoid duplicates. */
+    gtk_list_store_clear (priv->track_combo_model);
+
+    /* Create list of tracks. */
+    for (i = 1; i <= len; i++)
+    {
+        text = et_track_number_to_string (i);
+
+        gtk_list_store_insert_with_values (priv->track_combo_model, NULL,
+                                           G_MAXINT, TRACK_COLUMN_TRACK_NUMBER,
+                                           text, -1);
+        g_free (text);
+    }
+}
+
+/*
+ * Iter compare func: Sort alphabetically
+ */
+static gint
+tree_iter_alphabetical_sort (GtkTreeModel *model,
+                             GtkTreeIter *a,
+                             GtkTreeIter *b,
+                             gpointer data)
+{
+    gchar *text1, *text1_folded;
+    gchar *text2, *text2_folded;
+    gint ret;
+
+    gtk_tree_model_get (model, a, GENRE_COLUMN_GENRE, &text1, -1);
+    gtk_tree_model_get (model, b, GENRE_COLUMN_GENRE, &text2, -1);
+
+    if (text1 == text2)
+    {
+        g_free (text1);
+        g_free (text2);
+        return 0;
+    }
+
+    if (text1 == NULL)
+    {
+        g_free (text2);
+        return -1;
+    }
+
+    if (text2 == NULL)
+    {
+        g_free (text1);
+        return 1;
+    }
+
+    text1_folded = g_utf8_casefold (text1, -1);
+    text2_folded = g_utf8_casefold (text2, -1);
+    ret = g_utf8_collate (text1_folded, text2_folded);
+
+    g_free (text1);
+    g_free (text2);
+    g_free (text1_folded);
+    g_free (text2_folded);
+
+    return ret;
+}
+
+/*
+ * To insert only digits in an entry. If the text contains only digits: returns it,
+ * else only first digits.
+ */
+static void
+Insert_Only_Digit (GtkEditable *editable,
+                   const gchar *inserted_text,
+                   gint length,
+                   gint *position,
+                   gpointer data)
+{
+    int i = 1; // Ignore first character
+    int j = 1;
+    gchar *result;
+
+    if (length<=0 || !inserted_text)
+        return;
+
+    if (!isdigit((guchar)inserted_text[0]) && inserted_text[0] != '-')
+    {
+        g_signal_stop_emission_by_name(G_OBJECT(editable),"insert_text");
+        return;
+    } else if (length == 1)
+    {
+        // We already checked the first digit...
+        return;
+    }
+
+    g_signal_stop_emission_by_name(G_OBJECT(editable),"insert_text");
+    result = g_malloc0(length+1);
+    result[0] = inserted_text[0];
+
+    // Check the rest, if any...
+    for (i = 1; i < length; i++)
+    {
+        if (isdigit((guchar)inserted_text[i]))
+        {
+            result[j++] = inserted_text[i];
+        }
+    }
+    // Null terminate for the benefit of glib/gtk
+    result[j] = '\0';
+
+    if (result[0] == '\0')
+    {
+        g_free(result);
+        return;
+    }
+
+    g_signal_handlers_block_by_func(G_OBJECT(editable),G_CALLBACK(Insert_Only_Digit),data);
+    gtk_editable_insert_text(editable, result, j, position);
+    g_signal_handlers_unblock_by_func(G_OBJECT(editable),G_CALLBACK(Insert_Only_Digit),data);
+    g_free(result);
+}
+
+/*
+ * Parse and auto complete date entry if you don't type the 4 digits.
+ */
+#include <stdlib.h>
+static void
+Parse_Date (EtTagArea *self)
+{
+    EtTagAreaPrivate *priv;
+    const gchar *year;
+    gchar *current_year;
+
+    priv = et_tag_area_get_instance_private (self);
+
+    /* Early return. */
+    if (!g_settings_get_boolean (MainSettings, "tag-date-autocomplete"))
+    {
+        return;
+    }
+
+    /* Get the info entered by user */
+    year = gtk_entry_get_text (GTK_ENTRY (priv->year_entry));
+
+    if (strcmp (year,"") != 0 && strlen (year) < 4)
+    {
+        GDateTime *dt;
+        gchar *tmp, *tmp1;
+
+        dt = g_date_time_new_now_local ();
+        current_year = g_date_time_format (dt, "%Y");
+        g_date_time_unref (dt);
+
+        tmp = &current_year[4-strlen(year)];
+
+        if (atoi (year) <= atoi (tmp))
+        {
+            sprintf (current_year, "%d", atoi (current_year) - atoi (tmp));
+            tmp1 = g_strdup_printf ("%d", atoi (current_year) + atoi (year));
+            gtk_entry_set_text (GTK_ENTRY (priv->year_entry), tmp1);
+            g_free (tmp1);
+        }
+        else
+        {
+            sprintf (current_year, "%d", atoi (current_year) - atoi (tmp)
+                     - (strlen (year) <= 0 ? 1 : strlen (year) <= 1 ? 10 :          // pow(10,strlen(year)) 
returns 99 instead of 100 under Win32...
+                     strlen (year) <= 2 ? 100 : strlen (year) <= 3 ? 1000 : 0));
+            tmp1 = g_strdup_printf ("%d", atoi (current_year) + atoi (year));
+            gtk_entry_set_text (GTK_ENTRY (priv->year_entry), tmp1);
+            g_free (tmp1);
+        }
+
+        g_free (current_year);
+    }
+}
+
+static gboolean
+on_year_entry_focus_out_event (GtkWidget *widget,
+                               GdkEvent *event,
+                               gpointer user_data)
+{
+    Parse_Date (ET_TAG_AREA (user_data));
+
+    return GDK_EVENT_PROPAGATE;
+}
+
+static void
+on_year_entry_activate (GtkEntry *entry,
+                        gpointer user_data)
+{
+    Parse_Date (ET_TAG_AREA (user_data));
+}
+
+static void
+on_picture_view_selection_changed (GtkTreeSelection *selection,
+                                   gpointer user_data)
+{
+    EtTagArea *self;
+    EtTagAreaPrivate *priv;
+
+    self = ET_TAG_AREA (user_data);
+    priv = et_tag_area_get_instance_private (self);
+
+    if (gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (selection)) >= 1)
+    {
+        gtk_widget_set_sensitive (GTK_WIDGET (priv->remove_image_toolitem),
+                                  TRUE);
+        gtk_widget_set_sensitive (GTK_WIDGET (priv->save_image_toolitem),
+                                  TRUE);
+        gtk_widget_set_sensitive (GTK_WIDGET (priv->image_properties_toolitem),
+                                  TRUE);
+    }
+    else
+    {
+        gtk_widget_set_sensitive (GTK_WIDGET (priv->remove_image_toolitem),
+                                  FALSE);
+        gtk_widget_set_sensitive (GTK_WIDGET (priv->save_image_toolitem),
+                                  FALSE);
+        gtk_widget_set_sensitive (GTK_WIDGET (priv->image_properties_toolitem),
+                                  FALSE);
+    }
+}
+
+static void
+PictureEntry_Clear (EtTagArea *self)
+{
+    EtTagAreaPrivate *priv;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    Picture *pic;
+
+    priv = et_tag_area_get_instance_private (self);
+
+    model = GTK_TREE_MODEL (priv->images_model);
+
+    if (gtk_tree_model_get_iter_first (model, &iter))
+    {
+        do
+        {
+            gtk_tree_model_get (model, &iter, PICTURE_COLUMN_DATA, &pic, -1);
+            Picture_Free (pic);
+        } while (gtk_tree_model_iter_next (model, &iter));
+    }
+
+    gtk_list_store_clear (priv->images_model);
+}
+
+static void
+PictureEntry_Update (EtTagArea *self,
+                     Picture *pic,
+                     gboolean select_it)
+{
+    EtTagAreaPrivate *priv;
+    GdkPixbufLoader *loader = 0;
+    GError *error = NULL;
+    
+    g_return_if_fail (pic != NULL);
+
+    priv = et_tag_area_get_instance_private (self);
+
+    if (!pic->data)
+    {
+        PictureEntry_Clear (self);
+        return;
+    }
+
+    loader = gdk_pixbuf_loader_new ();
+
+    if (loader)
+    {
+        if (gdk_pixbuf_loader_write(loader, pic->data, pic->size, &error))
+        {
+            GtkTreeSelection *selection;
+            GdkPixbuf *pixbuf;
+
+            if (!gdk_pixbuf_loader_close(loader, &error))
+            {
+                Log_Print(LOG_ERROR,_("Error with 'loader_close': %s"), error->message);
+                g_error_free(error);
+            }
+
+            selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->picture_entry_view));
+
+            pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
+            if (pixbuf)
+            {
+                GtkTreeIter iter1;
+                GdkPixbuf *scaled_pixbuf;
+                gint scaled_pixbuf_width;
+                gint scaled_pixbuf_height;
+                gchar *pic_info;
+
+                g_object_ref(pixbuf);
+                g_object_unref(loader);
+                
+                // Keep aspect ratio of the picture
+                pic->width  = gdk_pixbuf_get_width(pixbuf);
+                pic->height = gdk_pixbuf_get_height(pixbuf);
+                if (pic->width > pic->height)
+                {
+                    scaled_pixbuf_width  = 96;
+                    scaled_pixbuf_height = 96 * pic->height / pic->width;
+                }else
+                {
+                    scaled_pixbuf_width = 96 * pic->width / pic->height;
+                    scaled_pixbuf_height = 96;
+                }
+
+                scaled_pixbuf = gdk_pixbuf_scale_simple(pixbuf,
+                                    scaled_pixbuf_width, scaled_pixbuf_height,
+                                    //GDK_INTERP_NEAREST); // Lower quality but better speed
+                                    GDK_INTERP_BILINEAR);
+                g_object_unref(pixbuf);
+
+                pic_info = Picture_Info (pic);
+                gtk_list_store_insert_with_values (priv->images_model, &iter1,
+                                                   G_MAXINT,
+                                                   PICTURE_COLUMN_PIC,
+                                                   scaled_pixbuf,
+                                                   PICTURE_COLUMN_TEXT,
+                                                   pic_info,
+                                                   PICTURE_COLUMN_DATA,
+                                                   Picture_Copy_One (pic), -1);
+                g_free(pic_info);
+
+                if (select_it)
+                    gtk_tree_selection_select_iter(selection, &iter1);
+                g_object_unref(scaled_pixbuf);
+            }else
+            {
+                GtkWidget *msgdialog;
+                
+                g_object_unref(loader);
+                
+                Log_Print (LOG_ERROR, "%s",
+                           _("Cannot display the image because not enough data has been read to determine 
how to create the image buffer."));
+
+                msgdialog = gtk_message_dialog_new(GTK_WINDOW(MainWindow),
+                                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                   GTK_MESSAGE_ERROR,
+                                                   GTK_BUTTONS_CLOSE,
+                                                   "%s",
+                                                   _("Cannot display the image"));
+                gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (msgdialog),
+                                                          _("Not enough data has been read to determine how 
to create the image buffer."));
+                gtk_window_set_title (GTK_WINDOW (msgdialog),
+                                      _("Load Image File"));
+                gtk_dialog_run(GTK_DIALOG(msgdialog));
+                gtk_widget_destroy(msgdialog);
+            }
+        }else
+        {
+            Log_Print(LOG_ERROR,_("Error with 'loader_write': %s"), error->message);
+            g_error_free(error);
+        }
+    }
+
+    /* Do also for next picture. */
+    if (pic->next)
+    {
+        PictureEntry_Update (self, pic->next, select_it);
+    }
+
+    return;
+}
+
+
+/*
+ * load_picture_from_file:
+ * @file: the image file to load
+ * @user_data: the #EtTagArea
+ *
+ * Load the image file @file and update the images tree model.
+ */
+static void
+load_picture_from_file (GFile *file,
+                        gpointer user_data)
+{
+    EtTagArea *self;
+    Picture *pic;
+    const gchar *filename_utf8;
+    GFileInfo *info;
+    GError *error = NULL;
+
+    self = ET_TAG_AREA (user_data);
+
+    info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+                              G_FILE_QUERY_INFO_NONE, NULL, &error);
+
+    if (!info)
+    {
+        Log_Print (LOG_ERROR, _("Image file not loaded: %s"), error->message);
+        g_error_free (error);
+        return;
+    }
+
+    filename_utf8 = g_file_info_get_display_name (info);
+    pic = et_picture_load_file_data (file, &error);
+
+    if (!pic)
+    {
+        GtkWidget *msgdialog;
+
+        /* Picture file not opened */
+        msgdialog = gtk_message_dialog_new (GTK_WINDOW (MainWindow),
+                                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                            GTK_MESSAGE_ERROR,
+                                            GTK_BUTTONS_CLOSE,
+                                            _("Cannot open file: '%s'"),
+                                            filename_utf8);
+        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(msgdialog),
+                                                  "%s", error->message);
+        gtk_window_set_title (GTK_WINDOW (msgdialog), _("Image File Error"));
+        gtk_dialog_run (GTK_DIALOG (msgdialog));
+        gtk_widget_destroy (msgdialog);
+
+        Log_Print (LOG_ERROR, _("Image file not loaded: %s"),
+                   error->message);
+        g_error_free (error);
+        return;
+    }
+    else
+    {
+        Log_Print (LOG_OK, _("Image file loaded"));
+    }
+
+    if (filename_utf8)
+    {
+        // Behaviour following the tag type...
+        switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
+        {
+            // Only one picture supported for MP4
+            case MP4_TAG:
+                pic->type = ET_PICTURE_TYPE_FRONT_COVER;
+                break;
+
+            // Other tag types
+            case ID3_TAG:
+            case OGG_TAG:
+            case OPUS_TAG:
+            case APE_TAG:
+            case FLAC_TAG:
+            case WAVPACK_TAG:
+                // By default, set the filename in the description
+                pic->description = g_strdup (filename_utf8);
+                pic->type = et_picture_type_from_filename (pic->description);
+                break;
+
+            default:
+                g_assert_not_reached ();
+        }
+
+        PictureEntry_Update (self, pic, TRUE);
+
+        Picture_Free (pic);
+    }
+
+    g_object_unref (info);
+}
+
+/*
+ * To add a picture in the list -> call a FileSelectionWindow
+ */
+static void
+on_picture_add_button_clicked (GObject *object,
+                               gpointer user_data)
+{
+    EtTagArea *self;
+    EtTagAreaPrivate *priv;
+    GtkWidget *FileSelectionWindow;
+    GtkFileFilter *filter;
+    GtkWindow *parent_window = NULL;
+    static gchar *init_dir = NULL;
+    gint response;
+
+    self = ET_TAG_AREA (user_data);
+    priv = et_tag_area_get_instance_private (self);
+
+    parent_window = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(object)));
+    if (!gtk_widget_is_toplevel(GTK_WIDGET(parent_window)))
+    {
+        g_warning("Could not get parent window\n");
+        return;
+    }
+
+
+    FileSelectionWindow = gtk_file_chooser_dialog_new(_("Add Images"),
+                                                      parent_window,
+                                                      GTK_FILE_CHOOSER_ACTION_OPEN,
+                                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                                      GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
+                                                      NULL);
+
+    // Add files filters
+    // "All files" filter
+    filter = gtk_file_filter_new ();
+    gtk_file_filter_set_name(GTK_FILE_FILTER(filter), _("All Files"));
+    gtk_file_filter_add_pattern(GTK_FILE_FILTER(filter), "*");
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(FileSelectionWindow), GTK_FILE_FILTER(filter));
+
+    // "PNG and JPEG" filter
+    filter = gtk_file_filter_new ();
+    gtk_file_filter_set_name(GTK_FILE_FILTER(filter), _("PNG and JPEG"));
+    gtk_file_filter_add_mime_type(GTK_FILE_FILTER(filter), "image/jpeg"); // Using mime type avoid problem 
of case sensitive with extensions
+    gtk_file_filter_add_mime_type(GTK_FILE_FILTER(filter), "image/png");
+    //gtk_file_filter_add_pattern(GTK_FILE_FILTER(filter), "*.jpeg"); // Warning: *.JPEG or *.JpEg files 
will not be displayed
+    //gtk_file_filter_add_pattern(GTK_FILE_FILTER(filter), "*.jpg");
+    //gtk_file_filter_add_pattern(GTK_FILE_FILTER(filter), "*.png");
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (FileSelectionWindow), GTK_FILE_FILTER(filter));
+    // Make this filter the default
+    gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(FileSelectionWindow), GTK_FILE_FILTER(filter));
+
+    // Behaviour following the tag type...
+    switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
+    {
+        case MP4_TAG:
+        {
+            // Only one file can be selected
+            gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), FALSE);
+            break;
+        }
+
+        // Other tag types
+        default:
+        {
+            gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), TRUE);
+            break;
+        }
+    }
+
+    gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (FileSelectionWindow),
+                                     FALSE);
+
+    // Starting directory (the same of the current file)
+    if (ETCore->ETFileDisplayed)
+    {
+        gchar *cur_filename_utf8 = ((File_Name *)((GList 
*)ETCore->ETFileDisplayed->FileNameCur)->data)->value_utf8;
+        init_dir = g_path_get_dirname(cur_filename_utf8);
+        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow),init_dir);
+    }else
+    // Starting directory (the same than the previous one)
+    if (init_dir)
+        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow),init_dir);
+
+    response = gtk_dialog_run(GTK_DIALOG(FileSelectionWindow));
+
+    if (response == GTK_RESPONSE_OK)
+    {
+        GtkTreeSelection *selection;
+        GSList *list;
+
+        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->picture_entry_view));
+        gtk_tree_selection_unselect_all (selection);
+
+        list = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (FileSelectionWindow));
+        g_slist_foreach (list, (GFunc) load_picture_from_file, self);
+        g_slist_free_full (list, g_object_unref);
+
+        // Save the directory selected for initialize next time
+        g_free(init_dir);
+        init_dir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow));
+    }
+
+    if (ETCore->ETFileDisplayed)
+    {
+        ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+        ET_Display_File_Data_To_UI (ETCore->ETFileDisplayed);
+    }
+
+    gtk_widget_destroy(FileSelectionWindow);
+}
+
+
+/*
+ * Open the window to select and type the picture properties
+ */
+static void
+on_picture_properties_button_clicked (GObject *object,
+                                      gpointer user_data)
+{
+    EtTagArea *self;
+    EtTagAreaPrivate *priv;
+    GtkWidget *ScrollWindowPictureTypes, *PictureTypesWindow;
+    GtkWidget *type, *label, *desc;
+    GtkCellRenderer *renderer;
+    GtkTreeViewColumn *column;
+    GtkTreeSelection *selection;
+    GtkListStore *store;
+    GtkTreeIter type_iter_to_select, iter;
+    GtkTreeModel *model;
+    GtkWindow *parent_window = NULL;
+    GList *selection_list = NULL;
+    GList *l;
+    gint selection_nbr, selection_i = 1;
+    gint response;
+    EtPictureType pic_type;
+
+    self = ET_TAG_AREA (user_data);
+    priv = et_tag_area_get_instance_private (self);
+
+    parent_window = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(object)));
+    if (!gtk_widget_is_toplevel(GTK_WIDGET(parent_window)))
+    {
+        g_warning("Could not get parent window\n");
+        return;
+    }
+
+    model = GTK_TREE_MODEL (priv->images_model);
+    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->picture_entry_view));
+    selection_list = gtk_tree_selection_get_selected_rows (selection, NULL);
+    selection_nbr = gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (selection));
+
+    for (l = selection_list; l != NULL; l = g_list_next (l))
+    {
+        GtkTreePath *path = l->data;
+        Picture *pic = NULL;
+        GtkTreeSelection *selectiontype;
+        gchar *title;
+        GtkTreePath *rowPath;
+        gboolean valid;
+
+        // Get corresponding picture
+        valid = gtk_tree_model_get_iter (model, &iter, path);
+
+        if (valid)
+        {
+            gtk_tree_model_get (model, &iter, PICTURE_COLUMN_DATA, &pic, -1);
+        }
+        else
+        {
+            g_warning ("Iter not found in picture model");
+            break;
+        }
+
+        title = g_strdup_printf (_("Image Properties %d/%d"), selection_i++,
+                                 selection_nbr);
+        PictureTypesWindow = gtk_dialog_new_with_buttons(title,
+                                                         parent_window,
+                                                         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                         GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+                                                         GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                                                         NULL);
+        g_free(title);
+
+        gtk_window_set_default_size (GTK_WINDOW (PictureTypesWindow), 400,
+                                     400);
+        gtk_dialog_set_default_response(GTK_DIALOG(PictureTypesWindow), GTK_RESPONSE_OK);
+
+        ScrollWindowPictureTypes = gtk_scrolled_window_new(NULL, NULL);
+        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ScrollWindowPictureTypes),
+                                       GTK_POLICY_AUTOMATIC,
+                                       GTK_POLICY_AUTOMATIC);
+        store = gtk_list_store_new(PICTURE_TYPE_COLUMN_COUNT, G_TYPE_STRING, G_TYPE_INT);
+        type = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+        g_object_unref (store);
+        gtk_container_add(GTK_CONTAINER(ScrollWindowPictureTypes), type);
+
+        renderer = gtk_cell_renderer_text_new();
+        column = gtk_tree_view_column_new();
+        gtk_tree_view_column_pack_start(column, renderer, FALSE);
+        gtk_tree_view_column_set_title (column, _("Image Type"));
+        gtk_tree_view_column_set_attributes(column, renderer,
+                                            "text", PICTURE_TYPE_COLUMN_TEXT,
+                                            NULL);
+        gtk_tree_view_append_column(GTK_TREE_VIEW(type), column);
+        
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(PictureTypesWindow))),ScrollWindowPictureTypes,TRUE,TRUE,0);
+
+        // Behaviour following the tag type...
+        switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
+        {
+            case MP4_TAG:
+            {
+                /* Load picture type (only Front Cover!). */
+                GtkTreeIter itertype;
+
+                gtk_list_store_insert_with_values (store, &itertype, G_MAXINT,
+                                                   PICTURE_TYPE_COLUMN_TEXT,
+                                                   _(Picture_Type_String (ET_PICTURE_TYPE_FRONT_COVER)),
+                                                   PICTURE_TYPE_COLUMN_TYPE_CODE,
+                                                   ET_PICTURE_TYPE_FRONT_COVER,
+                                                   -1);
+                /* Line to select by default. */
+                type_iter_to_select = itertype;
+                break;
+            }
+
+            // Other tag types
+            default:
+            {
+                // Load pictures types
+                for (pic_type = ET_PICTURE_TYPE_OTHER; pic_type < ET_PICTURE_TYPE_UNDEFINED; pic_type++)
+                {
+                    GtkTreeIter itertype;
+
+                    gtk_list_store_insert_with_values (store, &itertype,
+                                                       G_MAXINT,
+                                                       PICTURE_TYPE_COLUMN_TEXT,
+                                                       _(Picture_Type_String (pic_type)),
+                                                       PICTURE_TYPE_COLUMN_TYPE_CODE,
+                                                       pic_type, -1);
+                    /* Line to select by default. */
+                    if (pic->type == pic_type)
+                        type_iter_to_select = itertype;
+                }
+                break;
+            }
+        }
+
+        // Select the line by default
+        selectiontype = gtk_tree_view_get_selection(GTK_TREE_VIEW(type));
+        gtk_tree_selection_select_iter(selectiontype, &type_iter_to_select);
+
+        // Set visible the current selected line
+        rowPath = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &type_iter_to_select);
+        gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(type), rowPath, NULL, FALSE, 0, 0);
+        gtk_tree_path_free(rowPath);
+
+        // Description of the picture
+        label = gtk_label_new (_("Image Description:"));
+        
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(PictureTypesWindow))),label,FALSE,FALSE,4);
+
+        // Entry for the description
+        desc = gtk_entry_new();
+        
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(PictureTypesWindow))),desc,FALSE,FALSE,0);
+        if (pic->description)
+        {
+            gchar *tmp = Try_To_Validate_Utf8_String(pic->description);
+            gtk_entry_set_text(GTK_ENTRY(desc), tmp);
+            g_free(tmp);
+        }
+
+        // Behaviour following the tag type...
+        switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
+        {
+            case MP4_TAG:
+            {
+                gtk_widget_set_sensitive(GTK_WIDGET(label), FALSE);
+                gtk_widget_set_sensitive(GTK_WIDGET(desc), FALSE);
+                break;
+            }
+
+            // Other tag types
+            default:
+            {
+                break;
+            }
+        }
+
+        gtk_widget_show_all(PictureTypesWindow);
+
+        response = gtk_dialog_run(GTK_DIALOG(PictureTypesWindow));
+        if (response == GTK_RESPONSE_OK)
+        {
+            GtkTreeModel *modeltype;
+            GtkTreeIter itertype;
+
+            modeltype     = gtk_tree_view_get_model(GTK_TREE_VIEW(type));
+            selectiontype = gtk_tree_view_get_selection(GTK_TREE_VIEW(type));
+            if (gtk_tree_selection_get_selected(selectiontype, &modeltype, &itertype))
+            {
+                gchar *buffer, *pic_info;
+                gint t;
+
+                gtk_tree_model_get(modeltype, &itertype,
+                                   PICTURE_TYPE_COLUMN_TYPE_CODE, &t, -1);
+                pic->type = t;
+
+                buffer = g_strdup(gtk_entry_get_text(GTK_ENTRY(desc)));
+                g_strstrip (buffer);
+                if (pic->description)
+                    g_free(pic->description);
+
+                /* If the entry was empty, buffer will be the empty string "".
+                 * This can be safely passed to the underlying
+                 * FLAC__metadata_object_picture_set_description(). See
+                 * https://bugs.launchpad.net/ubuntu/+source/easytag/+bug/558804
+                 * and https://bugzilla.redhat.com/show_bug.cgi?id=559828 for
+                 * downstream bugs when 0 was passed instead. */
+                pic->description = buffer;
+
+                // Update value in the PictureEntryView
+                pic_info = Picture_Info(pic);
+                gtk_list_store_set(GTK_LIST_STORE(model), &iter,
+                                   PICTURE_COLUMN_TEXT, pic_info,
+                                   -1);
+                g_free(pic_info);
+            }
+        }
+        gtk_widget_destroy(PictureTypesWindow);
+    }
+
+    g_list_free_full (selection_list, (GDestroyNotify)gtk_tree_path_free);
+}
+
+static void
+on_picture_save_button_clicked (GObject *object,
+                                gpointer user_data)
+{
+    EtTagArea *self;
+    EtTagAreaPrivate *priv;
+    GtkWidget *FileSelectionWindow;
+    GtkFileFilter *filter;
+    GtkWindow *parent_window = NULL;
+    static gchar *init_dir = NULL;
+
+    GtkTreeSelection *selection;
+    GList *selection_list = NULL;
+    GList *l;
+    GtkTreeModel *model;
+    gint selection_nbr, selection_i = 1;
+
+    self = ET_TAG_AREA (user_data);
+    priv = et_tag_area_get_instance_private (self);
+
+    parent_window = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(object)));
+    if (!gtk_widget_is_toplevel(GTK_WIDGET(parent_window)))
+    {
+        g_warning("Could not get parent window\n");
+        return;
+    }
+
+    model = GTK_TREE_MODEL (priv->images_model);
+    selection      = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->picture_entry_view));
+    selection_list = gtk_tree_selection_get_selected_rows (selection, NULL);
+    selection_nbr = gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (selection));
+
+    for (l = selection_list; l != NULL; l = g_list_next (l))
+    {
+        GtkTreePath *path = l->data;
+        GtkTreeIter iter;
+        Picture *pic;
+        gchar *title;
+        gboolean valid;
+        gint response;
+
+        // Get corresponding picture
+        valid = gtk_tree_model_get_iter (model, &iter, path);
+
+        if (valid)
+        {
+            gtk_tree_model_get (model, &iter, PICTURE_COLUMN_DATA, &pic, -1);
+        }
+        else
+        {
+            g_warning ("Iter not found in picture model");
+            break;
+        }
+
+        title = g_strdup_printf (_("Save Image %d/%d"), selection_i++,
+                                 selection_nbr);
+        FileSelectionWindow = gtk_file_chooser_dialog_new(title,
+                                                          parent_window,
+                                                          GTK_FILE_CHOOSER_ACTION_SAVE,
+                                                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                                          GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
+                                                          NULL);
+        g_free(title);
+
+        // Add files filters
+        // "All files" filter
+        filter = gtk_file_filter_new ();
+        gtk_file_filter_set_name(GTK_FILE_FILTER(filter), _("All Files"));
+        gtk_file_filter_add_pattern(GTK_FILE_FILTER(filter), "*");
+        gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(FileSelectionWindow), GTK_FILE_FILTER(filter));
+
+        // "PNG and JPEG" filter
+        filter = gtk_file_filter_new ();
+        gtk_file_filter_set_name(GTK_FILE_FILTER(filter), _("PNG and JPEG"));
+        gtk_file_filter_add_mime_type(GTK_FILE_FILTER(filter), "image/jpeg");
+        gtk_file_filter_add_mime_type(GTK_FILE_FILTER(filter), "image/png");
+        gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (FileSelectionWindow), GTK_FILE_FILTER(filter));
+        // Make this filter the default
+        gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(FileSelectionWindow),  GTK_FILE_FILTER(filter));
+
+        // Set the default folder if defined
+        if (init_dir)
+            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow),init_dir);
+
+        // Suggest a filename to the user
+        if ( pic->description && strlen(pic->description) )
+        {
+            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(FileSelectionWindow), pic->description); 
//filename in UTF8
+        }else
+        {
+            gchar *image_name = NULL;
+            switch (Picture_Format_From_Data (pic))
+            {
+                case PICTURE_FORMAT_JPEG :
+                    image_name = g_strdup("image_name.jpg");
+                    break;
+                case PICTURE_FORMAT_PNG :
+                    image_name = g_strdup("image_name.png");
+                    break;
+                case PICTURE_FORMAT_GIF:
+                    image_name = g_strdup ("image_name.gif");
+                    break;
+                case PICTURE_FORMAT_UNKNOWN :
+                    image_name = g_strdup("image_name.ext");
+                    break;
+            }
+            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(FileSelectionWindow), image_name); //filename 
in UTF8
+            g_free(image_name);
+        }
+
+        gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (FileSelectionWindow),
+                                                        TRUE);
+        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (FileSelectionWindow),
+                                         FALSE);
+
+        response = gtk_dialog_run(GTK_DIALOG(FileSelectionWindow));
+        if (response == GTK_RESPONSE_OK)
+        {
+            GFile *file;
+            GError *error = NULL;
+
+            // Save the directory selected for initialize next time
+            g_free(init_dir);
+            init_dir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow));
+
+            file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (FileSelectionWindow));
+
+            if (!et_picture_save_file_data (pic, file, &error))
+            {
+                 Log_Print (LOG_ERROR, _("Image file not saved: %s"),
+                            error->message);
+                 g_error_free (error);
+            }
+
+            g_object_unref (file);
+        }
+        gtk_widget_destroy(FileSelectionWindow);
+    }
+
+    g_list_free_full (selection_list, (GDestroyNotify)gtk_tree_path_free);
+}
+
+
+/*
+ * If double clicking the PictureEntryView :
+ *  - over a selected row : opens properties window
+ *  - over an empty area : open the adding window
+ */
+static gboolean
+on_picture_view_button_pressed (GtkTreeView *treeview,
+                                GdkEventButton *event,
+                                gpointer user_data)
+{
+    EtTagArea *self;
+    EtTagAreaPrivate *priv;
+
+    self = ET_TAG_AREA (user_data);
+    priv = et_tag_area_get_instance_private (self);
+
+    if (event->type == GDK_BUTTON_PRESS && event->button == GDK_BUTTON_PRIMARY)
+    {
+        if (event->window == gtk_tree_view_get_bin_window (treeview))
+        {
+            if (!gtk_tree_view_get_path_at_pos (treeview, event->x, event->y,
+                                                NULL, NULL, NULL, NULL))
+            {
+                gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (treeview));
+            }
+        }
+    }
+
+    if (event->type == GDK_2BUTTON_PRESS
+        && event->button == GDK_BUTTON_PRIMARY)
+    {
+        GtkTreeSelection *selection;
+
+        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->picture_entry_view));
+
+        if (gtk_tree_selection_count_selected_rows (selection) >= 1)
+        {
+            on_picture_properties_button_clicked (G_OBJECT (priv->image_properties_toolitem),
+                                                  self);
+        }
+        else
+        {
+            on_picture_add_button_clicked (G_OBJECT (priv->add_image_toolitem),
+                                           self);
+        }
+
+        return GDK_EVENT_STOP;
+    }
+
+    return GDK_EVENT_PROPAGATE;
+}
+
+static void
+on_picture_view_drag_data (GtkWidget *widget, GdkDragContext *dc,
+                           gint x, gint y, GtkSelectionData *selection_data,
+                           guint info, guint t, gpointer user_data)
+{
+    EtTagArea *self;
+    EtTagAreaPrivate *priv;
+    GtkTreeSelection *selection;
+    gchar **uri_list, **uri;
+
+    gtk_drag_finish(dc, TRUE, FALSE, t);
+
+    if (info != TARGET_URI_LIST || !selection_data)
+        return;
+
+    self = ET_TAG_AREA (user_data);
+    priv = et_tag_area_get_instance_private (self);
+
+    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->picture_entry_view));
+    gtk_tree_selection_unselect_all(selection);
+
+    uri = uri_list = g_strsplit ((const gchar *)gtk_selection_data_get_data (selection_data),
+                                 "\r\n", 0);
+
+    while (*uri && strlen(*uri))
+    {
+        GFile *file = g_file_new_for_uri (*uri);
+
+        load_picture_from_file (file, NULL);
+
+        g_object_unref (file);
+        uri++;
+    }
+
+    g_strfreev (uri_list);
+}
+
+static void
+on_picture_clear_button_clicked (GObject *object,
+                                 gpointer user_data)
+{
+    EtTagArea *self;
+    EtTagAreaPrivate *priv;
+    GList *paths, *refs = NULL;
+    GList *l;
+    GtkTreeSelection *selection;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+
+    self = ET_TAG_AREA (user_data);
+    priv = et_tag_area_get_instance_private (self);
+
+    model = GTK_TREE_MODEL (priv->images_model);
+    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->picture_entry_view));
+    paths = gtk_tree_selection_get_selected_rows (selection, NULL);
+
+    /* List of items to delete. */
+    for (l = paths; l != NULL; l = g_list_next (l))
+    {
+        refs = g_list_prepend (refs, gtk_tree_row_reference_new (model,
+                                                                 l->data));
+    }
+
+    g_list_free_full (paths, (GDestroyNotify)gtk_tree_path_free);
+
+    for (l = refs; l != NULL; l = g_list_next (l))
+    {
+        GtkTreePath *path = gtk_tree_row_reference_get_path (l->data);
+        Picture *pic;
+
+        if (gtk_tree_model_get_iter (model, &iter, path))
+        {
+            gtk_tree_model_get(model, &iter, PICTURE_COLUMN_DATA, &pic,-1);
+            Picture_Free(pic);
+
+            gtk_list_store_remove (priv->images_model, &iter);
+        }
+
+        gtk_tree_path_free(path);
+        gtk_tree_row_reference_free (l->data);
+    }
+
+    if (ETCore->ETFileDisplayed)
+    {
+        ET_Save_File_Data_From_UI (ETCore->ETFileDisplayed);
+        ET_Display_File_Data_To_UI (ETCore->ETFileDisplayed);
+    }
+
+    g_list_free (refs);
+}
+
+
+/*
+ * Key press into picture entry
+ *   - Delete = delete selected picture files
+ */
+static gboolean
+on_picture_view_key_pressed (GtkTreeView *treeview,
+                             GdkEvent *event,
+                             gpointer user_data)
+{
+    EtTagArea *self;
+    EtTagAreaPrivate *priv;
+    GdkEventKey *kevent;
+
+    self = ET_TAG_AREA (user_data);
+    priv = et_tag_area_get_instance_private (self);
+
+    kevent = (GdkEventKey *)event;
+
+    if (event && event->type == GDK_KEY_PRESS)
+    {
+        switch (kevent->keyval)
+        {
+            case GDK_KEY_Delete:
+                on_picture_clear_button_clicked (G_OBJECT (priv->remove_image_toolitem),
+                                                 self);
+                return GDK_EVENT_STOP;
+        }
+    }
+
+    return GDK_EVENT_PROPAGATE;
+}
+static void
+create_tag_area (EtTagArea *self)
+{
+    EtTagAreaPrivate *priv;
+    GtkWidget *separator;
+    GtkWidget *table;
+    GtkWidget *label;
+    GtkWidget *scrolled_window;
+    GtkWidget *toolbar;
+    GIcon *icon;
+    GtkWidget *image;
+    GtkWidget *vbox;
+    GList *focus_chain = NULL;
+    GtkEntryCompletion *completion;
+    const gint MButtonSize = 13;
+    const gint TablePadding = 2;
+
+    /* For Picture. */
+    static const GtkTargetEntry drops[] = { { "text/uri-list", 0,
+                                              TARGET_URI_LIST } };
+    GtkCellRenderer *renderer;
+    GtkTreeViewColumn *column;
+    GtkTreeSelection *selection;
+
+    priv = et_tag_area_get_instance_private (self);
+
+    /* Main Frame */
+    priv->frame = gtk_frame_new (_("Tag"));
+    gtk_container_add (GTK_CONTAINER (self), priv->frame);
+    gtk_container_set_border_width (GTK_CONTAINER (priv->frame), 2);
+
+    /* Box for the notebook (only for setting a border) */
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+    gtk_container_add (GTK_CONTAINER (priv->frame), vbox);
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
+
+    /*
+     * Note book
+     */
+    priv->notebook = gtk_notebook_new ();
+    gtk_box_pack_start (GTK_BOX (vbox), priv->notebook, TRUE, TRUE, 0);
+    gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE);
+    gtk_notebook_popup_enable (GTK_NOTEBOOK (priv->notebook));
+
+    /*
+     * 1 - Page for common tag fields
+     */
+    label = gtk_label_new (_("Common"));
+
+    table = et_grid_new (11, 11);
+    gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), table, label);
+    gtk_container_set_border_width (GTK_CONTAINER (table), 2);
+
+    /* Title */
+    priv->title_label = gtk_label_new (_("Title:"));
+    et_grid_attach_full (GTK_GRID (table), priv->title_label, 0, 0, 1, 1,
+                         FALSE, FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->title_label), 1.0, 0.5);
+
+    priv->title_entry = gtk_entry_new ();
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->title_entry),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    et_grid_attach_full (GTK_GRID (table), priv->title_entry, 1, 0, 9, 1, TRUE, TRUE,
+                         TablePadding, TablePadding);
+
+    et_tag_field_connect_signals (GTK_ENTRY (priv->title_entry), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->title_entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this title"));
+
+    /* Artist */
+    priv->artist_label = gtk_label_new (_("Artist:"));
+    et_grid_attach_full (GTK_GRID (table), priv->artist_label, 0, 1, 1, 1,
+                         FALSE, FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->artist_label), 1.0, 0.5);
+
+    priv->artist_entry = gtk_entry_new ();
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->artist_entry),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    et_grid_attach_full (GTK_GRID (table), priv->artist_entry, 1, 1, 9, 1, TRUE, TRUE,
+                         TablePadding,TablePadding);
+
+    et_tag_field_connect_signals (GTK_ENTRY (priv->artist_entry), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->artist_entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this artist"));
+
+    /* Album Artist */
+    priv->album_artist_label = gtk_label_new (_("Album artist:"));
+    et_grid_attach_full (GTK_GRID (table), priv->album_artist_label, 0, 2, 1,
+                         1, FALSE, FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->album_artist_label), 1.0, 0.5);
+
+    priv->album_artist_entry = gtk_entry_new ();
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->album_artist_entry),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    et_grid_attach_full (GTK_GRID (table), priv->album_artist_entry, 1, 2, 9, 1, TRUE,
+                         TRUE, TablePadding, TablePadding);
+
+    et_tag_field_connect_signals (GTK_ENTRY (priv->album_artist_entry), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->album_artist_entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this album artist"));
+
+    /* Album */
+    priv->album_label = gtk_label_new (_("Album:"));
+    et_grid_attach_full (GTK_GRID (table), priv->album_label, 0, 3, 1, 1,
+                         FALSE, FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->album_label), 1.0, 0.5);
+
+    priv->album_entry = gtk_entry_new ();
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->album_entry),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    et_grid_attach_full (GTK_GRID (table), priv->album_entry, 1, 3, 6, 1, TRUE, TRUE,
+                         TablePadding, TablePadding);
+
+    et_tag_field_connect_signals (GTK_ENTRY (priv->album_entry), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->album_entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this album name"));
+
+    /* Disc Number */
+    priv->disc_number_label = gtk_label_new (_("CD:"));
+    et_grid_attach_full (GTK_GRID (table), priv->disc_number_label, 8, 3, 1, 1,
+                         FALSE, FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->disc_number_label), 1.0, 0.5);
+
+    priv->disc_number_entry = gtk_entry_new ();
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->disc_number_entry),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    et_grid_attach_full (GTK_GRID (table), priv->disc_number_entry, 9, 3, 1, 1, TRUE,
+                         TRUE, TablePadding, TablePadding);
+    gtk_entry_set_width_chars (GTK_ENTRY (priv->disc_number_entry), 3);
+    /* FIXME should allow to type only something like : 1/3. */
+    
/*g_signal_connect(G_OBJECT(GTK_ENTRY(priv->disc_number_entry)),"insert_text",G_CALLBACK(Insert_Only_Digit),NULL);
 */
+
+    et_tag_field_connect_signals (GTK_ENTRY (priv->disc_number_entry), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->disc_number_entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this disc number"));
+
+    /* Year */
+    priv->year_label = gtk_label_new (_("Year:"));
+    et_grid_attach_full (GTK_GRID (table), priv->year_label, 0, 4, 1, 1, FALSE,
+                         FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->year_label), 1.0, 0.5);
+
+    priv->year_entry = gtk_entry_new ();
+    gtk_entry_set_max_length (GTK_ENTRY (priv->year_entry), 4);
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->year_entry),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    et_grid_attach_full (GTK_GRID (table), priv->year_entry, 1, 4, 1, 1, TRUE, TRUE,
+                         TablePadding, TablePadding);
+    gtk_entry_set_width_chars (GTK_ENTRY (priv->year_entry), 5);
+    g_signal_connect (priv->year_entry, "insert-text", G_CALLBACK (Insert_Only_Digit),
+                      NULL);
+    g_signal_connect (priv->year_entry, "activate",
+                      G_CALLBACK (on_year_entry_activate), self);
+    g_signal_connect (priv->year_entry, "focus-out-event",
+                      G_CALLBACK (on_year_entry_focus_out_event), self);
+
+    et_tag_field_connect_signals (GTK_ENTRY (priv->year_entry), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->year_entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this year"));
+
+    /* Small vertical separator */
+    separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
+    et_grid_attach_full (GTK_GRID (table), separator, 3, 4, 1, 1, FALSE, FALSE,
+                         TablePadding,TablePadding);
+
+    /* Track and Track total */
+    priv->track_sequence_button = gtk_button_new ();
+    gtk_widget_set_size_request (priv->track_sequence_button, MButtonSize,
+                                 MButtonSize);
+    et_grid_attach_full (GTK_GRID (table), priv->track_sequence_button, 4, 4,
+                         1, 1, FALSE, FALSE, TablePadding, TablePadding);
+    g_signal_connect (priv->track_sequence_button, "clicked",
+                      G_CALLBACK (on_apply_to_selection), self);
+    gtk_widget_set_tooltip_text (priv->track_sequence_button,
+                                 _("Number selected tracks sequentially. "
+                                   "Starts at 01 in each subdirectory."));
+    /* Pixmap into priv->track_sequence_button button. */
+    image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/sequence-track.png");
+    gtk_container_add (GTK_CONTAINER (priv->track_sequence_button), image);
+    gtk_widget_set_can_default (priv->track_sequence_button, TRUE);
+    gtk_widget_set_can_focus (priv->track_sequence_button, FALSE);
+
+    priv->track_label = gtk_label_new (_("Track #:"));
+    et_grid_attach_full (GTK_GRID (table), priv->track_label, 5, 4, 1, 1,
+                         FALSE, FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->track_label), 1.0, 0.5);
+
+    if (priv->track_combo_model != NULL)
+    {
+        gtk_list_store_clear (priv->track_combo_model);
+    }
+    else
+    {
+        priv->track_combo_model = gtk_list_store_new (TRACK_COLUMN_COUNT,
+                                                      G_TYPE_STRING);
+    }
+
+    populate_track_combo (self);
+
+    priv->track_combo_entry = gtk_combo_box_new_with_model_and_entry (GTK_TREE_MODEL 
(priv->track_combo_model));
+    gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (priv->track_combo_entry),
+                                         TRACK_COLUMN_TRACK_NUMBER);
+    et_grid_attach_full (GTK_GRID (table), priv->track_combo_entry, 6, 4, 1, 1, TRUE,
+                         TRUE, TablePadding, TablePadding);
+    gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (priv->track_combo_entry), 3); // Three columns to display 
track numbers list
+
+    gtk_entry_set_width_chars (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->track_combo_entry))),
+                               2);
+    g_signal_connect (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->track_combo_entry))),
+                      "insert-text", G_CALLBACK (Insert_Only_Digit), NULL);
+
+    label = gtk_label_new ("/");
+    et_grid_attach_full (GTK_GRID (table), label, 7, 4, 1, 1, FALSE, FALSE,
+                         TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
+
+    priv->track_number_button = gtk_button_new ();
+    gtk_widget_set_size_request (priv->track_number_button, MButtonSize,
+                                 MButtonSize);
+    et_grid_attach_full (GTK_GRID (table), priv->track_number_button, 8, 4, 1,
+                         1, FALSE, FALSE, TablePadding, TablePadding);
+    g_signal_connect (priv->track_number_button, "clicked",
+                      G_CALLBACK (on_apply_to_selection), self);
+    gtk_widget_set_tooltip_text (priv->track_number_button,
+                                 _("Set the number of files, in the same directory of the displayed file, to 
the selected tracks."));
+    /* Pixmap into priv->track_number_button button. */
+    image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/sequence-track.png");
+    gtk_container_add (GTK_CONTAINER (priv->track_number_button), image);
+    gtk_widget_set_can_default (priv->track_number_button, TRUE);
+    gtk_widget_set_can_focus (priv->track_number_button, FALSE);
+
+    priv->track_total_entry = gtk_entry_new();
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->track_total_entry),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    et_grid_attach_full (GTK_GRID (table), priv->track_total_entry, 9, 4, 1, 1, TRUE,
+                         TRUE, TablePadding, TablePadding);
+    gtk_entry_set_width_chars (GTK_ENTRY (priv->track_total_entry), 3);
+    g_signal_connect (GTK_ENTRY (priv->track_total_entry), "insert-text",
+                      G_CALLBACK (Insert_Only_Digit), NULL);
+
+    et_tag_field_connect_signals (GTK_ENTRY (priv->track_total_entry), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->track_total_entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this number of tracks"));
+
+    /* Genre */
+    priv->genre_label = gtk_label_new (_("Genre:"));
+    et_grid_attach_full (GTK_GRID (table), priv->genre_label, 0, 5, 1, 1,
+                         FALSE, FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->genre_label), 1.0, 0.5);
+
+    if (priv->genre_combo_model != NULL)
+    {
+        gtk_list_store_clear (priv->genre_combo_model);
+    }
+    else
+    {
+        priv->genre_combo_model = gtk_list_store_new (GENRE_COLUMN_COUNT,
+                                                      G_TYPE_STRING);
+    }
+    priv->genre_combo_entry = gtk_combo_box_new_with_model_and_entry (GTK_TREE_MODEL 
(priv->genre_combo_model));
+    gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (priv->genre_combo_entry),
+                                         GENRE_COLUMN_GENRE);
+    completion = gtk_entry_completion_new ();
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->genre_combo_entry))),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    gtk_entry_set_completion (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->genre_combo_entry))),
+                              completion);
+    g_object_unref (completion);
+    gtk_entry_completion_set_model (completion,
+                                    GTK_TREE_MODEL (priv->genre_combo_model));
+    gtk_entry_completion_set_text_column (completion, 0);
+    gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (priv->genre_combo_model),
+                                     GENRE_COLUMN_GENRE,
+                                     tree_iter_alphabetical_sort, NULL, NULL);
+    gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->genre_combo_model),
+                                          GENRE_COLUMN_GENRE,
+                                          GTK_SORT_ASCENDING);
+    et_grid_attach_full (GTK_GRID (table), priv->genre_combo_entry, 1, 5, 9, 1, TRUE, TRUE,
+                         TablePadding, TablePadding);
+    populate_genre_combo (self);
+    gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (priv->genre_combo_entry), 2); // Two columns to display 
genres list
+
+    et_tag_field_connect_signals (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->genre_combo_entry))), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->genre_combo_entry))),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this genre"));
+
+    /* Comment */
+    priv->comment_label = gtk_label_new (_("Comment:"));
+    et_grid_attach_full (GTK_GRID (table), priv->comment_label, 0, 6, 1, 1,
+                         FALSE, FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->comment_label), 1.0, 0.5);
+
+    priv->comment_entry = gtk_entry_new ();
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->comment_entry),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    et_grid_attach_full (GTK_GRID (table), priv->comment_entry, 1, 6, 9, 1, TRUE,
+                         TRUE, TablePadding, TablePadding);
+
+    et_tag_field_connect_signals (GTK_ENTRY (priv->comment_entry), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->comment_entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this comment"));
+
+    /* Composer (name of the composers) */
+    priv->composer_label = gtk_label_new (_("Composer:"));
+    et_grid_attach_full (GTK_GRID (table), priv->composer_label, 0, 7, 1, 1,
+                         FALSE, FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->composer_label), 1.0, 0.5);
+
+    priv->composer_entry = gtk_entry_new ();
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->composer_entry),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    et_grid_attach_full (GTK_GRID (table), priv->composer_entry, 1, 7, 9, 1, TRUE,
+                         TRUE, TablePadding, TablePadding);
+
+    et_tag_field_connect_signals (GTK_ENTRY (priv->composer_entry), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->composer_entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this composer"));
+
+    /* Translators: Original Artist / Performer. Please try to keep this string
+     * as short as possible, as it must fit into a narrow column. */
+    priv->orig_artist_label = gtk_label_new (_("Orig. artist:"));
+    et_grid_attach_full (GTK_GRID (table), priv->orig_artist_label, 0, 8, 1, 1,
+                         FALSE, FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->orig_artist_label), 1.0, 0.5);
+
+    priv->orig_artist_entry = gtk_entry_new ();
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->orig_artist_entry),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    et_grid_attach_full (GTK_GRID (table), priv->orig_artist_entry, 1, 8, 9, 1, TRUE,
+                         TRUE, TablePadding, TablePadding);
+
+    et_tag_field_connect_signals (GTK_ENTRY (priv->orig_artist_entry), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->orig_artist_entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this original artist"));
+
+    /* Copyright */
+    priv->copyright_label = gtk_label_new (_("Copyright:"));
+    et_grid_attach_full (GTK_GRID (table), priv->copyright_label, 0, 9, 1, 1,
+                         FALSE, FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->copyright_label), 1.0, 0.5);
+
+    priv->copyright_entry = gtk_entry_new ();
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->copyright_entry),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    et_grid_attach_full (GTK_GRID (table), priv->copyright_entry, 1, 9, 9, 1, TRUE,
+                         TRUE, TablePadding, TablePadding);
+
+    et_tag_field_connect_signals (GTK_ENTRY (priv->copyright_entry), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->copyright_entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this copyright"));
+
+
+
+    /* URL */
+    priv->url_label = gtk_label_new (_("URL:"));
+    et_grid_attach_full (GTK_GRID (table), priv->url_label, 0, 10, 1, 1, FALSE,
+                         FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->url_label), 1.0, 0.5);
+
+    priv->url_entry = gtk_entry_new ();
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->url_entry),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    et_grid_attach_full (GTK_GRID (table), priv->url_entry, 1, 10, 9, 1, TRUE, TRUE,
+                         TablePadding, TablePadding);
+
+    et_tag_field_connect_signals (GTK_ENTRY (priv->url_entry), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->url_entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this URL"));
+
+    /* Encoded by */
+    priv->encoded_by_label = gtk_label_new (_("Encoded by:"));
+    et_grid_attach_full (GTK_GRID (table), priv->encoded_by_label, 0, 11, 1, 1,
+                         FALSE, FALSE, TablePadding, TablePadding);
+    gtk_misc_set_alignment (GTK_MISC (priv->encoded_by_label), 1.0, 0.5);
+
+    priv->encoded_by_entry = gtk_entry_new ();
+    gtk_entry_set_icon_from_icon_name (GTK_ENTRY (priv->encoded_by_entry),
+                                       GTK_ENTRY_ICON_SECONDARY, "insert-text");
+    et_grid_attach_full (GTK_GRID (table), priv->encoded_by_entry, 1, 11, 9, 1, TRUE,
+                         TRUE, TablePadding, TablePadding);
+
+    et_tag_field_connect_signals (GTK_ENTRY (priv->encoded_by_entry), self);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (priv->encoded_by_entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     _("Tag selected files with this encoder name"));
+
+    /* Set focus chain. */
+    focus_chain = g_list_prepend (focus_chain, priv->title_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->artist_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->album_artist_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->album_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->disc_number_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->year_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->track_combo_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->track_total_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->genre_combo_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->comment_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->composer_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->orig_artist_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->copyright_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->url_entry);
+    focus_chain = g_list_prepend (focus_chain, priv->encoded_by_entry);
+    /* More efficient than using g_list_append(), which must traverse the
+     * whole list. */
+    focus_chain = g_list_reverse (focus_chain);
+    gtk_container_set_focus_chain (GTK_CONTAINER (table), focus_chain);
+
+
+    /*
+     * 2 - Page for extra tag fields
+     */
+    /* Also used in ET_Display_File_Tag_To_UI. */
+    label = gtk_label_new (_("Images"));
+
+    priv->images_tab = table = et_grid_new (1, 2);
+    gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), table, label);
+    gtk_container_set_border_width (GTK_CONTAINER (table), 2);
+
+    /* Scroll window for priv->picture_entry_view. */
+    scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                    GTK_POLICY_AUTOMATIC,
+                                    GTK_POLICY_AUTOMATIC);
+    et_grid_attach_full (GTK_GRID (table), scrolled_window, 0, 0, 1, 1,
+                         TRUE, TRUE, TablePadding, TablePadding);
+
+    priv->images_model = gtk_list_store_new (PICTURE_COLUMN_COUNT,
+                                             GDK_TYPE_PIXBUF, G_TYPE_STRING,
+                                             G_TYPE_POINTER);
+    priv->picture_entry_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->images_model));
+    g_object_unref (priv->images_model);
+    gtk_container_add (GTK_CONTAINER (scrolled_window), priv->picture_entry_view);
+    gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->picture_entry_view), FALSE);
+    gtk_widget_set_size_request (priv->picture_entry_view, -1, 200);
+    gtk_widget_set_tooltip_text (priv->picture_entry_view,
+                                 _("You can use drag and drop to add an image"));
+
+    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->picture_entry_view));
+    gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
+
+    renderer = gtk_cell_renderer_pixbuf_new ();
+    column = gtk_tree_view_column_new ();
+    gtk_tree_view_column_pack_start (column, renderer, FALSE);
+    gtk_tree_view_column_set_attributes (column, renderer, "pixbuf",
+                                         PICTURE_COLUMN_PIC, NULL);
+    gtk_tree_view_append_column (GTK_TREE_VIEW (priv->picture_entry_view), column);
+    gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_text_new ();
+    column = gtk_tree_view_column_new ();
+    gtk_tree_view_column_pack_start (column, renderer, FALSE);
+    gtk_tree_view_column_set_attributes (column, renderer, "text",
+                                         PICTURE_COLUMN_TEXT, NULL);
+    gtk_tree_view_append_column (GTK_TREE_VIEW (priv->picture_entry_view), column);
+    gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    /* Activate Drag'n'Drop for the priv->picture_entry_view. */
+    gtk_drag_dest_set(GTK_WIDGET(priv->picture_entry_view),
+                      GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
+                      drops, sizeof(drops) / sizeof(GtkTargetEntry),
+                      GDK_ACTION_COPY);
+    g_signal_connect (priv->picture_entry_view, "drag-data-received",
+                      G_CALLBACK (on_picture_view_drag_data), self);
+    g_signal_connect (selection, "changed",
+                      G_CALLBACK (on_picture_view_selection_changed), self);
+    g_signal_connect (priv->picture_entry_view, "button-press-event",
+                      G_CALLBACK (on_picture_view_button_pressed), self);
+    g_signal_connect (priv->picture_entry_view, "key-press-event",
+                      G_CALLBACK (on_picture_view_key_pressed), self);
+
+    /* Picture action toolbar. */
+    toolbar = gtk_toolbar_new ();
+    gtk_style_context_add_class (gtk_widget_get_style_context (toolbar),
+                                 GTK_STYLE_CLASS_INLINE_TOOLBAR);
+    gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
+    gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU);
+    et_grid_attach_full (GTK_GRID (table), toolbar, 0, 1, 1, 1, FALSE, FALSE,
+                        TablePadding, TablePadding);
+
+    /* TODO: Make the icons use the symbolic variants. */
+    icon = g_themed_icon_new_with_default_fallbacks ("list-add");
+    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
+    priv->add_image_toolitem = gtk_tool_button_new (image, NULL);
+    g_object_unref (icon);
+    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->add_image_toolitem, -1);
+    gtk_widget_set_tooltip_text (GTK_WIDGET (priv->add_image_toolitem),
+                                 _("Add images to the tag"));
+    g_signal_connect (priv->add_image_toolitem, "clicked",
+                      G_CALLBACK (on_picture_add_button_clicked), self);
+
+    /* Activate Drag'n'Drop for the add_image_toolitem. */
+    gtk_drag_dest_set (GTK_WIDGET (priv->add_image_toolitem),
+                       GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
+                       drops, sizeof(drops) / sizeof(GtkTargetEntry),
+                       GDK_ACTION_COPY);
+    g_signal_connect (priv->add_image_toolitem, "drag-data-received",
+                      G_CALLBACK (on_picture_view_drag_data), self);
+
+    icon = g_themed_icon_new_with_default_fallbacks ("list-remove");
+    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
+    priv->remove_image_toolitem = gtk_tool_button_new (image, NULL);
+    g_object_unref (icon);
+    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->remove_image_toolitem,
+                        -1);
+    gtk_widget_set_tooltip_text (GTK_WIDGET (priv->remove_image_toolitem),
+                                 _("Remove selected images from the tag"));
+    gtk_widget_set_sensitive (GTK_WIDGET (priv->remove_image_toolitem), FALSE);
+    g_signal_connect (priv->remove_image_toolitem, "clicked",
+                      G_CALLBACK (on_picture_clear_button_clicked), self);
+
+    icon = g_themed_icon_new_with_default_fallbacks ("document-save");
+    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
+    priv->save_image_toolitem = gtk_tool_button_new (image, NULL);
+    g_object_unref (icon);
+    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->save_image_toolitem, -1);
+    gtk_widget_set_tooltip_text (GTK_WIDGET (priv->save_image_toolitem),
+                                 _("Save the selected images to files"));
+    gtk_widget_set_sensitive (GTK_WIDGET (priv->save_image_toolitem), FALSE);
+    g_signal_connect (priv->save_image_toolitem, "clicked",
+                      G_CALLBACK (on_picture_save_button_clicked), NULL);
+
+    icon = g_themed_icon_new_with_default_fallbacks ("document-properties");
+    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
+    priv->image_properties_toolitem = gtk_tool_button_new (image, NULL);
+    g_object_unref (icon);
+    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->image_properties_toolitem,
+                        -1);
+    gtk_widget_set_tooltip_text (GTK_WIDGET (priv->image_properties_toolitem),
+                                 _("Edit image properties"));
+    gtk_widget_set_sensitive (GTK_WIDGET (priv->image_properties_toolitem),
+                              FALSE);
+    g_signal_connect (priv->image_properties_toolitem, "clicked",
+                      G_CALLBACK (on_picture_properties_button_clicked), self);
+
+    icon = g_themed_icon_new_with_default_fallbacks ("insert-image");
+    image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
+    priv->apply_image_toolitem = gtk_tool_button_new (image, NULL);
+    g_object_unref (icon);
+    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->apply_image_toolitem, -1);
+    gtk_widget_set_tooltip_text (GTK_WIDGET (priv->apply_image_toolitem),
+                                 _("Tag selected files with these images"));
+    g_signal_connect (priv->apply_image_toolitem, "clicked",
+                      G_CALLBACK (on_apply_to_selection), self);
+}
+
+static void
+et_tag_area_init (EtTagArea *self)
+{
+    self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ET_TYPE_TAG_AREA,
+                                              EtTagAreaPrivate);
+    create_tag_area (self);
+
+    gtk_widget_show_all (GTK_WIDGET (self));
+}
+
+static void
+et_tag_area_class_init (EtTagAreaClass *klass)
+{
+    g_type_class_add_private (klass, sizeof (EtTagAreaPrivate));
+}
+
+/*
+ * et_tag_area_new:
+ *
+ * Create a new EtTagArea instance.
+ *
+ * Returns: a new #EtTagArea
+ */
+GtkWidget *
+et_tag_area_new (void)
+{
+    return g_object_new (ET_TYPE_TAG_AREA, NULL);
+}
+
+static void
+et_tag_area_hide_images_tab (EtTagArea *self)
+{
+    EtTagAreaPrivate *priv;
+
+    priv = et_tag_area_get_instance_private (self);
+
+    gtk_widget_hide (priv->images_tab);
+}
+
+static void
+et_tag_area_show_images_tab (EtTagArea *self)
+{
+    EtTagAreaPrivate *priv;
+
+    priv = et_tag_area_get_instance_private (self);
+
+    gtk_widget_show (priv->images_tab);
+}
+
+/*
+ * et_tag_area_update_controls:
+ *
+ * Update the visibility of entry fields depending on the type of file.
+ */
+void
+et_tag_area_update_controls (EtTagArea *self,
+                             ET_File *ETFile)
+{
+    EtTagAreaPrivate *priv;
+
+    g_return_if_fail (ET_TAG_AREA (self));
+
+    priv = et_tag_area_get_instance_private (self);
+
+    /* Common controls for all tags. */
+    gtk_widget_show (priv->title_label);
+    gtk_widget_show (priv->title_entry);
+    gtk_widget_show (priv->artist_label);
+    gtk_widget_show (priv->artist_entry);
+    gtk_widget_show (priv->album_artist_label);
+    gtk_widget_show (priv->album_artist_entry);
+    gtk_widget_show (priv->album_label);
+    gtk_widget_show (priv->album_entry);
+    gtk_widget_show (priv->year_label);
+    gtk_widget_show (priv->year_entry);
+    gtk_widget_show (priv->track_label);
+    gtk_widget_show (priv->track_combo_entry);
+    gtk_widget_show (priv->track_total_entry);
+    gtk_widget_show (priv->track_sequence_button);
+    gtk_widget_show (priv->track_number_button);
+    gtk_widget_show (priv->genre_label);
+    gtk_widget_show (priv->genre_combo_entry);
+    gtk_widget_show (priv->comment_label);
+    gtk_widget_show (priv->comment_entry);
+
+    /* Special controls to display or not! */
+    switch (ETFile->ETFileDescription->TagType)
+    {
+        case ID3_TAG:
+            if (!g_settings_get_boolean (MainSettings, "id3v2-enabled"))
+            {
+                /* ID3v1 : Hide specifics ID3v2 fields if not activated! */
+                gtk_widget_hide (priv->disc_number_label);
+                gtk_widget_hide (priv->disc_number_entry);
+                gtk_widget_hide (priv->composer_label);
+                gtk_widget_hide (priv->composer_entry);
+                gtk_widget_hide (priv->orig_artist_label);
+                gtk_widget_hide (priv->orig_artist_entry);
+                gtk_widget_hide (priv->copyright_label);
+                gtk_widget_hide (priv->copyright_entry);
+                gtk_widget_hide (priv->url_label);
+                gtk_widget_hide (priv->url_entry);
+                gtk_widget_hide (priv->encoded_by_label);
+                gtk_widget_hide (priv->encoded_by_entry);
+                et_tag_area_hide_images_tab (self);
+            }
+            else
+            {
+                gtk_widget_show (priv->disc_number_label);
+                gtk_widget_show (priv->disc_number_entry);
+                gtk_widget_show (priv->composer_label);
+                gtk_widget_show (priv->composer_entry);
+                gtk_widget_show (priv->orig_artist_label);
+                gtk_widget_show (priv->orig_artist_entry);
+                gtk_widget_show (priv->copyright_label);
+                gtk_widget_show (priv->copyright_entry);
+                gtk_widget_show (priv->url_label);
+                gtk_widget_show (priv->url_entry);
+                gtk_widget_show (priv->encoded_by_label);
+                gtk_widget_show (priv->encoded_by_entry);
+                et_tag_area_show_images_tab (self);
+            }
+            break;
+
+#ifdef ENABLE_OGG
+        case OGG_TAG:
+            gtk_widget_show (priv->disc_number_label);
+            gtk_widget_show (priv->disc_number_entry);
+            gtk_widget_show (priv->composer_label);
+            gtk_widget_show (priv->composer_entry);
+            gtk_widget_show (priv->orig_artist_label);
+            gtk_widget_show (priv->orig_artist_entry);
+            gtk_widget_show (priv->copyright_label);
+            gtk_widget_show (priv->copyright_entry);
+            gtk_widget_show (priv->url_label);
+            gtk_widget_show (priv->url_entry);
+            gtk_widget_show (priv->encoded_by_label);
+            gtk_widget_show (priv->encoded_by_entry);
+            et_tag_area_show_images_tab (self);
+            break;
+#endif
+
+#ifdef ENABLE_OPUS
+        case OPUS_TAG:
+            gtk_widget_show (priv->disc_number_label);
+            gtk_widget_show (priv->disc_number_entry);
+            gtk_widget_show (priv->composer_label);
+            gtk_widget_show (priv->composer_entry);
+            gtk_widget_show (priv->orig_artist_label);
+            gtk_widget_show (priv->orig_artist_entry);
+            gtk_widget_show (priv->copyright_label);
+            gtk_widget_show (priv->copyright_entry);
+            gtk_widget_show (priv->url_label);
+            gtk_widget_show (priv->url_entry);
+            gtk_widget_show (priv->encoded_by_label);
+            gtk_widget_show (priv->encoded_by_entry);
+            et_tag_area_show_images_tab (self);
+            break;
+#endif
+
+#ifdef ENABLE_FLAC
+        case FLAC_TAG:
+            gtk_widget_show (priv->disc_number_label);
+            gtk_widget_show (priv->disc_number_entry);
+            gtk_widget_show (priv->composer_label);
+            gtk_widget_show (priv->composer_entry);
+            gtk_widget_show (priv->orig_artist_label);
+            gtk_widget_show (priv->orig_artist_entry);
+            gtk_widget_show (priv->copyright_label);
+            gtk_widget_show (priv->copyright_entry);
+            gtk_widget_show (priv->url_label);
+            gtk_widget_show (priv->url_entry);
+            gtk_widget_show (priv->encoded_by_label);
+            gtk_widget_show (priv->encoded_by_entry);
+            et_tag_area_show_images_tab (self);
+            break;
+#endif
+
+        case APE_TAG:
+            gtk_widget_show (priv->disc_number_label);
+            gtk_widget_show (priv->disc_number_entry);
+            gtk_widget_show (priv->composer_label);
+            gtk_widget_show (priv->composer_entry);
+            gtk_widget_show (priv->orig_artist_label);
+            gtk_widget_show (priv->orig_artist_entry);
+            gtk_widget_show (priv->copyright_label);
+            gtk_widget_show (priv->copyright_entry);
+            gtk_widget_show (priv->url_label);
+            gtk_widget_show (priv->url_entry);
+            gtk_widget_show (priv->encoded_by_label);
+            gtk_widget_show (priv->encoded_by_entry);
+            et_tag_area_show_images_tab (self);
+            break;
+
+#ifdef ENABLE_MP4
+        case MP4_TAG:
+            gtk_widget_show (priv->disc_number_label);
+            gtk_widget_show (priv->disc_number_entry);
+            gtk_widget_show (priv->composer_label);
+            gtk_widget_show (priv->composer_entry);
+            gtk_widget_hide (priv->orig_artist_label);
+            gtk_widget_hide (priv->orig_artist_entry);
+            gtk_widget_show (priv->copyright_label);
+            gtk_widget_show (priv->copyright_entry);
+            gtk_widget_hide (priv->url_label);
+            gtk_widget_hide (priv->url_entry);
+            gtk_widget_show (priv->encoded_by_label);
+            gtk_widget_show (priv->encoded_by_entry);
+            et_tag_area_show_images_tab (self);
+            break;
+#endif
+
+#ifdef ENABLE_WAVPACK
+        case WAVPACK_TAG:
+            gtk_widget_show (priv->disc_number_label);
+            gtk_widget_show (priv->disc_number_entry);
+            gtk_widget_show (priv->composer_label);
+            gtk_widget_show (priv->composer_entry);
+            gtk_widget_show (priv->orig_artist_label);
+            gtk_widget_show (priv->orig_artist_entry);
+            gtk_widget_show (priv->copyright_label);
+            gtk_widget_show (priv->copyright_entry);
+            gtk_widget_show (priv->url_label);
+            gtk_widget_show (priv->url_entry);
+            gtk_widget_show (priv->encoded_by_label);
+            gtk_widget_show (priv->encoded_by_entry);
+            et_tag_area_hide_images_tab (self);
+            break;
+#endif /* ENABLE_WAVPACK */
+
+        case UNKNOWN_TAG:
+        default:
+            gtk_widget_hide (priv->disc_number_label);
+            gtk_widget_hide (priv->disc_number_entry);
+            gtk_widget_hide (priv->composer_label);
+            gtk_widget_hide (priv->composer_entry);
+            gtk_widget_hide (priv->orig_artist_label);
+            gtk_widget_hide (priv->orig_artist_entry);
+            gtk_widget_hide (priv->copyright_label);
+            gtk_widget_hide (priv->copyright_entry);
+            gtk_widget_hide (priv->url_label);
+            gtk_widget_hide (priv->url_entry);
+            gtk_widget_hide (priv->encoded_by_label);
+            gtk_widget_hide (priv->encoded_by_entry);
+            et_tag_area_hide_images_tab (self);
+            break;
+    }
+}
+
+void
+et_tag_area_clear (EtTagArea *self)
+{
+    EtTagAreaPrivate *priv;
+
+    g_return_if_fail (ET_TAG_AREA (self));
+
+    priv = et_tag_area_get_instance_private (self);
+
+    gtk_entry_set_text (GTK_ENTRY (priv->title_entry), "");
+    gtk_entry_set_text (GTK_ENTRY (priv->artist_entry), "");
+    gtk_entry_set_text (GTK_ENTRY (priv->album_artist_entry), "");
+    gtk_entry_set_text (GTK_ENTRY (priv->album_entry), "");
+    gtk_entry_set_text (GTK_ENTRY (priv->disc_number_entry), "");
+    gtk_entry_set_text (GTK_ENTRY (priv->year_entry), "");
+    gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->track_combo_entry))),
+                        "");
+    gtk_entry_set_text (GTK_ENTRY (priv->track_total_entry), "");
+    gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->genre_combo_entry))),
+                        "");
+    gtk_entry_set_text (GTK_ENTRY (priv->comment_entry), "");
+    gtk_entry_set_text (GTK_ENTRY (priv->composer_entry), "");
+    gtk_entry_set_text (GTK_ENTRY (priv->orig_artist_entry), "");
+    gtk_entry_set_text (GTK_ENTRY (priv->copyright_entry), "");
+    gtk_entry_set_text (GTK_ENTRY (priv->url_entry), "");
+    gtk_entry_set_text (GTK_ENTRY (priv->encoded_by_entry), "");
+    PictureEntry_Clear (self);
+}
+
+void
+et_tag_area_title_grab_focus (EtTagArea *self)
+{
+    EtTagAreaPrivate *priv;
+
+    g_return_if_fail (ET_TAG_AREA (self));
+
+    priv = et_tag_area_get_instance_private (self);
+
+    gtk_widget_grab_focus (priv->title_entry);
+}
+
+/*
+ * et_tag_area_create_file_tag:
+ *
+ * Create a new File_Tag structure and poopulate it with values from the UI.
+ */
+File_Tag *
+et_tag_area_create_file_tag (EtTagArea *self)
+{
+    EtTagAreaPrivate *priv;
+    gchar *buffer;
+    File_Tag *FileTag;
+
+    g_return_val_if_fail (ET_TAG_AREA (self), NULL);
+
+    priv = et_tag_area_get_instance_private (self);
+
+    /* Save tag data and generate undo for tag. */
+    FileTag = ET_File_Tag_Item_New ();
+
+    /* Title */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->title_entry)));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->title = buffer;
+    }
+    else
+    {
+        FileTag->title = NULL;
+        g_free (buffer);
+    }
+
+    /* Artist */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->artist_entry)));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->artist = buffer;
+    }
+    else
+    {
+        FileTag->artist = NULL;
+        g_free (buffer);
+    }
+
+       /* Album Artist */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->album_artist_entry)));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->album_artist = buffer;
+    }
+    else
+    {
+        FileTag->album_artist = NULL;
+        g_free (buffer);
+    }
+
+    /* Album */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->album_entry)));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->album = buffer;
+    }
+    else
+    {
+        FileTag->album = NULL;
+        g_free (buffer);
+    }
+
+    /* Disc number and total number of discs. */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->disc_number_entry)));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        gchar *separator;
+
+        separator = g_utf8_strchr (buffer, -1, '/');
+
+        if (separator != NULL && g_utf8_strlen (separator + 1, -1) > 0)
+        {
+            /* Copy before the separator for the disc number, beyond the
+             * separator for the total number of discs. */
+            FileTag->disc_number = g_strndup (buffer, separator - buffer);
+            FileTag->disc_total = g_strdup (separator + 1);
+            g_free (buffer);
+        }
+        else
+        {
+            FileTag->disc_number = buffer;
+            FileTag->disc_total = NULL;
+        }
+    }
+    else
+    {
+        FileTag->disc_number = NULL;
+        FileTag->disc_total = NULL;
+        g_free (buffer);
+    }
+
+    /* Year */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->year_entry)));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->year = buffer;
+    }
+    else
+    {
+        FileTag->year = NULL;
+        g_free (buffer);
+    }
+
+    /* Track */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN 
(priv->track_combo_entry)))));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->track = et_track_number_to_string (atoi (buffer));
+        g_free (buffer);
+    }
+    else
+    {
+        FileTag->track = NULL;
+        g_free (buffer);
+    }
+
+    /* Track Total */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->track_total_entry)));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->track_total = et_track_number_to_string (atoi (buffer));
+        g_free (buffer);
+    }
+    else
+    {
+        FileTag->track_total = NULL;
+        g_free (buffer);
+    }
+
+    /* Genre */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN 
(priv->genre_combo_entry)))));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->genre = buffer;
+    }
+    else
+    {
+        FileTag->genre = NULL;
+        g_free (buffer);
+    }
+
+    /* Comment */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->comment_entry)));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->comment = buffer;
+    }
+    else
+    {
+        FileTag->comment = NULL;
+        g_free (buffer);
+    }
+
+    /* Composer */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->composer_entry)));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->composer = buffer;
+    }
+    else
+    {
+        FileTag->composer = NULL;
+        g_free (buffer);
+    }
+
+    /* Original Artist */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->orig_artist_entry)));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->orig_artist = buffer;
+    }
+    else
+    {
+        FileTag->orig_artist = NULL;
+        g_free (buffer);
+    }
+
+    /* Copyright */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->copyright_entry)));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->copyright = buffer;
+    }
+    else
+    {
+        FileTag->copyright = NULL;
+        g_free (buffer);
+    }
+
+    /* URL */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->url_entry)));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->url = buffer;
+    }
+    else
+    {
+        FileTag->url = NULL;
+        g_free (buffer);
+    }
+
+    /* Encoded by */
+    buffer = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->encoded_by_entry)));
+    g_strstrip (buffer);
+
+    if (*buffer)
+    {
+        FileTag->encoded_by = buffer;
+    }
+    else
+    {
+        FileTag->encoded_by = NULL;
+        g_free (buffer);
+    }
+
+    /* Picture */
+    {
+        Picture *pic, *prev_pic = NULL;
+        GtkTreeModel *model;
+        GtkTreeIter iter;
+
+        if (FileTag->picture)
+        {
+            Picture_Free (FileTag->picture);
+            FileTag->picture = NULL;
+        }
+
+        model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->picture_entry_view));
+
+        if (gtk_tree_model_get_iter_first (model, &iter))
+        {
+            do
+            {
+                gtk_tree_model_get (model, &iter, PICTURE_COLUMN_DATA, &pic,-1);
+                pic = Picture_Copy_One (pic);
+                if (!FileTag->picture)
+                {
+                    FileTag->picture = pic;
+                }
+                else
+                {
+                    prev_pic->next = pic;
+                }
+
+                prev_pic = pic;
+            } while (gtk_tree_model_iter_next (model, &iter));
+        }
+    }
+
+    return FileTag;
+}
+
+gboolean
+et_tag_area_display_et_file (EtTagArea *self,
+                             ET_File *ETFile)
+{
+    EtTagAreaPrivate *priv;
+    File_Tag *FileTag = NULL;
+
+    g_return_val_if_fail (ET_TAG_AREA (self), FALSE);
+
+    if (!ETFile || !ETFile->FileTag)
+    {
+        et_tag_area_clear (self);
+        //Tag_Area_Set_Sensitive(FALSE);
+        return FALSE;
+    }
+
+    priv = et_tag_area_get_instance_private (self);
+
+    switch (ETFile->ETFileDescription->TagType)
+    {
+#ifdef ENABLE_MP3
+        case ID3_TAG:
+            gtk_frame_set_label (GTK_FRAME (priv->frame), _("ID3 Tag"));
+            break;
+#endif
+#ifdef ENABLE_OGG
+        case OGG_TAG:
+            gtk_frame_set_label (GTK_FRAME (priv->frame), _("Ogg Vorbis Tag"));
+            break;
+#endif
+#ifdef ENABLE_FLAC
+        case FLAC_TAG:
+            gtk_frame_set_label (GTK_FRAME (priv->frame),
+                                 _("FLAC Vorbis Tag"));
+            break;
+#endif
+        case APE_TAG:
+            gtk_frame_set_label (GTK_FRAME (priv->frame), _("APE Tag"));
+            break;
+#ifdef ENABLE_MP4
+        case MP4_TAG:
+            gtk_frame_set_label (GTK_FRAME (priv->frame),
+                                 _("MP4/M4A/AAC Tag"));
+            break;
+#endif
+#ifdef ENABLE_WAVPACK
+        case WAVPACK_TAG:
+            gtk_frame_set_label (GTK_FRAME (priv->frame), _("Wavpack Tag"));
+            break;
+#endif
+#ifdef ENABLE_OPUS
+        case OPUS_TAG:
+            gtk_frame_set_label (GTK_FRAME (priv->frame), _("Opus Tag"));
+            break;
+#endif
+        case UNKNOWN_TAG:
+        default:
+            gtk_frame_set_label (GTK_FRAME (priv->frame), _("Tag"));
+            /* FIXME: Translatable string. */
+            Log_Print (LOG_ERROR,
+                       "FileTag: Undefined tag type %d for file %s.",
+                       ETFile->ETFileDescription->TagType,
+                       ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8);
+            break;
+    }
+
+    //Tag_Area_Set_Sensitive(TRUE); // Causes displaying problem when saving files
+
+    FileTag = (File_Tag *)(ETFile->FileTag->data);
+
+    /* Show title */
+    if (FileTag && FileTag->title)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->title);
+        gtk_entry_set_text (GTK_ENTRY (priv->title_entry), tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (priv->title_entry), "");
+    }
+
+    /* Show artist */
+    if (FileTag && FileTag->artist)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->artist);
+        gtk_entry_set_text (GTK_ENTRY (priv->artist_entry), tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (priv->artist_entry), "");
+    }
+
+       /* Show album artist */
+    if (FileTag && FileTag->album_artist)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->album_artist);
+        gtk_entry_set_text (GTK_ENTRY (priv->album_artist_entry), tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (priv->album_artist_entry), "");
+    }
+
+    /* Show album */
+    if (FileTag && FileTag->album)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->album);
+        gtk_entry_set_text (GTK_ENTRY (priv->album_entry), tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (priv->album_entry),"");
+    }
+
+    /* Show disc number and number of discs. */
+    if (FileTag && FileTag->disc_number)
+    {
+        gchar *tmp;
+
+        if (FileTag->disc_total)
+        {
+            gchar *total;
+
+            total = g_strjoin ("/", FileTag->disc_number, FileTag->disc_total,
+                               NULL);
+            tmp = Try_To_Validate_Utf8_String (total);
+            g_free (total);
+        }
+        else
+        {
+            tmp = Try_To_Validate_Utf8_String (FileTag->disc_number);
+        }
+
+        gtk_entry_set_text (GTK_ENTRY (priv->disc_number_entry), tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (priv->disc_number_entry), "");
+    }
+
+    /* Show year */
+    if (FileTag && FileTag->year)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->year);
+        gtk_entry_set_text (GTK_ENTRY (priv->year_entry), tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (priv->year_entry), "");
+    }
+
+    /* Show track */
+    if (FileTag && FileTag->track)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->track);
+        gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->track_combo_entry))),
+                            tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->track_combo_entry))),
+                            "");
+    }
+
+    /* Show number of tracks on the album */
+    if (FileTag && FileTag->track_total)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->track_total);
+        gtk_entry_set_text (GTK_ENTRY (priv->track_total_entry), tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (priv->track_total_entry),
+                            "");
+    }
+
+    /* Show genre */
+    if (FileTag && FileTag->genre)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->genre);
+        gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->genre_combo_entry))),
+                            tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->genre_combo_entry))),
+                            "");
+    }
+
+    /* Show comment */
+    if (FileTag && FileTag->comment)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->comment);
+        gtk_entry_set_text (GTK_ENTRY (priv->comment_entry), tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (priv->comment_entry),
+                            "");
+    }
+
+    /* Show composer */
+    if (FileTag && FileTag->composer)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->composer);
+        gtk_entry_set_text (GTK_ENTRY (priv->composer_entry), tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (priv->composer_entry), "");
+    }
+
+    /* Show original artist */
+    if (FileTag && FileTag->orig_artist)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->orig_artist);
+        gtk_entry_set_text (GTK_ENTRY (priv->orig_artist_entry), tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (priv->orig_artist_entry),
+                            "");
+    }
+
+    /* Show copyright */
+    if (FileTag && FileTag->copyright)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->copyright);
+        gtk_entry_set_text (GTK_ENTRY (priv->copyright_entry), tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (priv->copyright_entry), "");
+    }
+
+    /* Show URL */
+    if (FileTag && FileTag->url)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->url);
+        gtk_entry_set_text (GTK_ENTRY (priv->url_entry), tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (priv->url_entry), "");
+    }
+
+    /* Show Encoded by */
+    if (FileTag && FileTag->encoded_by)
+    {
+        gchar *tmp = Try_To_Validate_Utf8_String (FileTag->encoded_by);
+        gtk_entry_set_text (GTK_ENTRY (priv->encoded_by_entry), tmp);
+        g_free (tmp);
+    }
+    else
+    {
+        gtk_entry_set_text (GTK_ENTRY (priv->encoded_by_entry), "");
+    }
+
+    /* Show picture */
+    PictureEntry_Clear (self);
+
+    if (FileTag && FileTag->picture)
+    {
+        Picture *pic = FileTag->picture;
+        guint    nbr_pic = 0;
+        GtkWidget *page;
+        gchar *string;
+
+        PictureEntry_Update (self, FileTag->picture, FALSE);
+
+        // Count the number of items
+        for (pic = FileTag->picture; pic != NULL; pic = pic->next)
+        {
+            nbr_pic++;
+        }
+
+        /* Get page "Images" of the notebook. */
+        page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), 1);
+        string = g_strdup_printf (_("Images (%d)"), nbr_pic);
+        /* Update the notebook tab. */
+        gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (priv->notebook), page,
+                                         string);
+        /* Update the notebook menu. */
+        gtk_notebook_set_menu_label_text (GTK_NOTEBOOK (priv->notebook), page,
+                                          string);
+        g_free (string);
+
+    }
+    else
+    {
+        GtkWidget *page;
+
+        /* Get page "Images" of the notebook. */
+        page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), 1);
+        /* Update the notebook tab. */
+        gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (priv->notebook), page,
+                                         _("Images"));
+        /* Update the notebook menu. */
+        gtk_notebook_set_menu_label_text (GTK_NOTEBOOK (priv->notebook), page,
+                                          _("Images"));
+    }
+
+    return TRUE;
+}
+
+gboolean
+et_tag_area_select_all_if_focused (EtTagArea *self,
+                                   GtkWidget *focused)
+{
+    EtTagAreaPrivate *priv;
+
+    g_return_val_if_fail (ET_TAG_AREA (self), FALSE);
+
+    priv = et_tag_area_get_instance_private (self);
+
+    if (focused == priv->picture_entry_view)
+    {
+        GtkTreeSelection *selection;
+
+        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->picture_entry_view));
+        gtk_tree_selection_select_all (selection);
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+gboolean
+et_tag_area_unselect_all_if_focused (EtTagArea *self,
+                                     GtkWidget *focused)
+{
+    EtTagAreaPrivate *priv;
+
+    g_return_val_if_fail (ET_TAG_AREA (self), FALSE);
+
+    priv = et_tag_area_get_instance_private (self);
+
+    if (focused == priv->picture_entry_view)
+    {
+        GtkTreeSelection *selection;
+
+        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->picture_entry_view));
+        gtk_tree_selection_unselect_all (selection);
+        return TRUE;
+    }
+
+    return FALSE;
+}
diff --git a/src/tag_area.h b/src/tag_area.h
new file mode 100644
index 0000000..78160da
--- /dev/null
+++ b/src/tag_area.h
@@ -0,0 +1,62 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014  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_TAG_AREA_H_
+#define ET_TAG_AREA_H_
+
+#include <gtk/gtk.h>
+
+#include "et_core.h"
+
+G_BEGIN_DECLS
+
+#define ET_TYPE_TAG_AREA (et_tag_area_get_type ())
+#define ET_TAG_AREA(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ET_TYPE_TAG_AREA, EtTagArea))
+
+typedef struct _EtTagArea EtTagArea;
+typedef struct _EtTagAreaClass EtTagAreaClass;
+typedef struct _EtTagAreaPrivate EtTagAreaPrivate;
+
+struct _EtTagArea
+{
+    /*< private >*/
+    GtkBin parent_instance;
+    EtTagAreaPrivate *priv;
+};
+
+struct _EtTagAreaClass
+{
+    /*< private >*/
+    GtkBinClass parent_class;
+};
+
+GType et_tag_area_get_type (void);
+GtkWidget * et_tag_area_new (void);
+void et_tag_area_update_controls (EtTagArea *self, ET_File *ETFile);
+void et_tag_area_clear (EtTagArea *self);
+void et_tag_area_title_grab_focus (EtTagArea *self);
+File_Tag * et_tag_area_create_file_tag (EtTagArea *self);
+gboolean et_tag_area_display_et_file (EtTagArea *self, ET_File *ETFile);
+gboolean et_tag_area_select_all_if_focused (EtTagArea *self, GtkWidget *focused);
+gboolean et_tag_area_unselect_all_if_focused (EtTagArea *self, GtkWidget *focused);
+
+void on_entry_populate_popup (GtkEntry *entry, GtkWidget *menu, EtTagArea *self);
+
+G_END_DECLS
+
+#endif /* ET_TAG_AREA_H_ */


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