[easytag] Remove custom add folder icon



commit 9b372f7f452d10fdaee802587f29059588dbe576
Author: David King <amigadave amigadave com>
Date:   Thu Mar 21 17:05:58 2013 +0000

    Remove custom add folder icon
    
    Replace it with the themed "folder-new" icon instead.

 Makefile.am                 |    1 -
 data/pixmaps/add_folder.xpm |  157 -------------------------------------------
 src/misc.c                  |    2 -
 src/scan.c                  |    6 ++-
 4 files changed, 5 insertions(+), 161 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5525c7f..5350b3b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,7 +150,6 @@ nodist_man_MANS = doc/easytag.1
 endif
 
 pixmaps = \
-       data/pixmaps/add_folder.xpm \
        data/pixmaps/album.xpm \
        data/pixmaps/all_downcase.xpm \
        data/pixmaps/all_uppercase.xpm \
diff --git a/src/misc.c b/src/misc.c
index e0762d3..f6a6358 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -610,7 +610,6 @@ void Set_Unbusy_Cursor (void)
 /*
  * Add easytag specific icons to GTK stock set
  */
-#include "data/pixmaps/add_folder.xpm"
 #include "data/pixmaps/album.xpm"
 #include "data/pixmaps/all_uppercase.xpm"
 #include "data/pixmaps/all_downcase.xpm"
@@ -643,7 +642,6 @@ void Init_Custom_Icons (void)
     Create_Xpm_Icon_Factory((const char**)red_lines_xpm,            "easytag-red-lines");
     Create_Xpm_Icon_Factory((const char**)artist_album_xpm,     "easytag-artist-album");
 ////    Create_Png_Icon_Factory("artist_album.png",                     "easytag-artist-album");
-    Create_Xpm_Icon_Factory((const char**)add_folder_xpm,           "easytag-add-folder");
     Create_Xpm_Icon_Factory((const char**)sound_xpm,                "easytag-sound");
     Create_Xpm_Icon_Factory((const char**)all_uppercase_xpm,        "easytag-all-uppercase");
     Create_Xpm_Icon_Factory((const char**)all_downcase_xpm,         "easytag-all-downcase");
diff --git a/src/scan.c b/src/scan.c
index 3c7b153..bfffdb9 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -2326,6 +2326,7 @@ void Open_ScannerWindow (gint scanner_type)
     GtkWidget *Label;
     GtkWidget *Button;
     GtkWidget *Separator;
+    GIcon *new_folder;
     GtkWidget *Icon;
     GtkWidget *MaskStatusIconBox;
     GList *pf_cb_group1 = NULL;
@@ -2530,7 +2531,10 @@ void Open_ScannerWindow (gint scanner_type)
 
     // Button to prefix path
     RenameFilePrefixPathButton = gtk_button_new();
-    Icon = gtk_image_new_from_stock("easytag-add-folder", GTK_ICON_SIZE_SMALL_TOOLBAR); // On Win32, 
GTK_ICON_SIZE_BUTTON enlarge the combobox...
+    new_folder = g_themed_icon_new ("folder-new");
+    /* TODO: On Win32, GTK_ICON_SIZE_BUTTON enlarges the combobox. */
+    Icon = gtk_image_new_from_gicon (new_folder, GTK_ICON_SIZE_MENU);
+    g_object_unref (new_folder);
     gtk_container_add(GTK_CONTAINER(RenameFilePrefixPathButton),Icon);
     gtk_box_pack_start(GTK_BOX(HBox4),RenameFilePrefixPathButton,FALSE,FALSE,0);
     gtk_button_set_relief(GTK_BUTTON(RenameFilePrefixPathButton),GTK_RELIEF_NONE);


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