[easytag] Move pixmaps to data/pixmaps

From: David King <davidk src gnome org>
To: commits-list gnome org
Cc:
Subject: [easytag] Move pixmaps to data/pixmaps
Date: Mon, 21 Jan 2013 22:57:28 +0000 (UTC)
commit 15003246bc1fe8037c99ab0cabb632e5861fbb1a
Author: David King <amigadave amigadave com>
Date:   Mon Jan 21 20:02:03 2013 +0000

    Move pixmaps to data/pixmaps

 Makefile.am                                        |   66 ++++++++++----------
 {pixmaps => data/pixmaps}/EasyTAG.ico              |  Bin 4286 -> 4286 bytes
 {pixmaps => data/pixmaps}/EasyTAG2.ico             |  Bin 13094 -> 13094 bytes
 {pixmaps => data/pixmaps}/EasyTAG2.xpm             |    0
 {pixmaps => data/pixmaps}/EasyTAG_logo.xpm         |    0
 {pixmaps => data/pixmaps}/add_folder.xpm           |    0
 {pixmaps => data/pixmaps}/album.xpm                |    0
 {pixmaps => data/pixmaps}/all_downcase.xpm         |    0
 {pixmaps => data/pixmaps}/all_uppercase.xpm        |    0
 {pixmaps => data/pixmaps}/artist.xpm               |    0
 {pixmaps => data/pixmaps}/artist_album.xpm         |    0
 {pixmaps => data/pixmaps}/black.xpm                |    0
 {pixmaps => data/pixmaps}/blackwhite.xpm           |    0
 {pixmaps => data/pixmaps}/closed_folder.xpm        |    0
 .../pixmaps}/closed_folder_readonly.xpm            |    0
 .../pixmaps}/closed_folder_unreadable.xpm          |    0
 {pixmaps => data/pixmaps}/easytag.png              |  Bin 5182 -> 5182 bytes
 .../pixmaps}/first_letter_uppercase.xpm            |    0
 .../pixmaps}/first_letter_uppercase_word.xpm       |    0
 {pixmaps => data/pixmaps}/forbidden.xpm            |    0
 {pixmaps => data/pixmaps}/freedb.xpm               |    0
 {pixmaps => data/pixmaps}/gnudb.xpm                |    0
 {pixmaps => data/pixmaps}/grab.xpm                 |    0
 {pixmaps => data/pixmaps}/invert_selection.xpm     |    0
 {pixmaps => data/pixmaps}/mask.xpm                 |    0
 {pixmaps => data/pixmaps}/musicbrainz.xpm          |    0
 {pixmaps => data/pixmaps}/opened_folder.xpm        |    0
 {pixmaps => data/pixmaps}/parent_folder.xpm        |    0
 {pixmaps => data/pixmaps}/ram_disk.xpm             |    0
 {pixmaps => data/pixmaps}/read_only.xpm            |    0
 {pixmaps => data/pixmaps}/red_lines.xpm            |    0
 {pixmaps => data/pixmaps}/sequence_track.xpm       |    0
 {pixmaps => data/pixmaps}/sound.xpm                |    0
 {pixmaps => data/pixmaps}/unselect_all.xpm         |    0
 easytag-win32-installer.nsi.in                     |    2 +-
 src/browser.c                                      |   10 ++--
 src/cddb.c                                         |    8 +-
 src/easytag.c                                      |    2 +-
 src/misc.c                                         |   38 ++++++------
 src/scan.c                                         |    6 +-
 src/win32/easytag.rc                               |    2 +-
 41 files changed, 67 insertions(+), 67 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a9ec0c8..2c92017 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -135,47 +135,47 @@ dist_text_DATA = ChangeLog
 man_MANS = doc/easytag.1
 
 pixmaps = \
-	pixmaps/add_folder.xpm \
-	pixmaps/album.xpm \
-	pixmaps/all_downcase.xpm \
-	pixmaps/all_uppercase.xpm \
-	pixmaps/artist.xpm \
-	pixmaps/artist_album.xpm \
-	pixmaps/black.xpm \
-	pixmaps/blackwhite.xpm \
-	pixmaps/closed_folder_readonly.xpm \
-	pixmaps/closed_folder_unreadable.xpm \
-	pixmaps/closed_folder.xpm \
-	pixmaps/EasyTAG.ico \
-	pixmaps/EasyTAG2.ico \
-	pixmaps/EasyTAG2.xpm \
-	pixmaps/first_letter_uppercase.xpm \
-	pixmaps/first_letter_uppercase_word.xpm \
-	pixmaps/forbidden.xpm \
-	pixmaps/freedb.xpm \
-	pixmaps/gnudb.xpm \
-	pixmaps/grab.xpm \
-	pixmaps/invert_selection.xpm \
-	pixmaps/mask.xpm \
-	pixmaps/musicbrainz.xpm \
-	pixmaps/opened_folder.xpm \
-	pixmaps/parent_folder.xpm \
-	pixmaps/ram_disk.xpm \
-	pixmaps/read_only.xpm \
-	pixmaps/red_lines.xpm \
-	pixmaps/sequence_track.xpm \
-	pixmaps/sound.xpm \
-	pixmaps/unselect_all.xpm
+	data/pixmaps/add_folder.xpm \
+	data/pixmaps/album.xpm \
+	data/pixmaps/all_downcase.xpm \
+	data/pixmaps/all_uppercase.xpm \
+	data/pixmaps/artist.xpm \
+	data/pixmaps/artist_album.xpm \
+	data/pixmaps/black.xpm \
+	data/pixmaps/blackwhite.xpm \
+	data/pixmaps/closed_folder_readonly.xpm \
+	data/pixmaps/closed_folder_unreadable.xpm \
+	data/pixmaps/closed_folder.xpm \
+	data/pixmaps/EasyTAG.ico \
+	data/pixmaps/EasyTAG2.ico \
+	data/pixmaps/EasyTAG2.xpm \
+	data/pixmaps/first_letter_uppercase.xpm \
+	data/pixmaps/first_letter_uppercase_word.xpm \
+	data/pixmaps/forbidden.xpm \
+	data/pixmaps/freedb.xpm \
+	data/pixmaps/gnudb.xpm \
+	data/pixmaps/grab.xpm \
+	data/pixmaps/invert_selection.xpm \
+	data/pixmaps/mask.xpm \
+	data/pixmaps/musicbrainz.xpm \
+	data/pixmaps/opened_folder.xpm \
+	data/pixmaps/parent_folder.xpm \
+	data/pixmaps/ram_disk.xpm \
+	data/pixmaps/read_only.xpm \
+	data/pixmaps/red_lines.xpm \
+	data/pixmaps/sequence_track.xpm \
+	data/pixmaps/sound.xpm \
+	data/pixmaps/unselect_all.xpm
 
 pixmapdir = $(pkgdatadir)
 dist_pixmap_DATA = \
-	pixmaps/EasyTAG_logo.xpm
+	data/pixmaps/EasyTAG_logo.xpm
 
 iconthemedir = $(datadir)/icons/hicolor
 
 appicondir = $(iconthemedir)/64x64/apps
 dist_appicon_DATA = \
-	pixmaps/easytag.png
+	data/pixmaps/easytag.png
 
 UPDATE_ICON_CACHE = gtk-update-icon-cache --ignore-theme-index --force
 
diff --git a/pixmaps/EasyTAG.ico b/data/pixmaps/EasyTAG.ico
similarity index 100%
rename from pixmaps/EasyTAG.ico
rename to data/pixmaps/EasyTAG.ico
diff --git a/pixmaps/EasyTAG2.ico b/data/pixmaps/EasyTAG2.ico
similarity index 100%
rename from pixmaps/EasyTAG2.ico
rename to data/pixmaps/EasyTAG2.ico
diff --git a/pixmaps/EasyTAG2.xpm b/data/pixmaps/EasyTAG2.xpm
similarity index 100%
rename from pixmaps/EasyTAG2.xpm
rename to data/pixmaps/EasyTAG2.xpm
diff --git a/pixmaps/EasyTAG_logo.xpm b/data/pixmaps/EasyTAG_logo.xpm
similarity index 100%
rename from pixmaps/EasyTAG_logo.xpm
rename to data/pixmaps/EasyTAG_logo.xpm
diff --git a/pixmaps/add_folder.xpm b/data/pixmaps/add_folder.xpm
similarity index 100%
rename from pixmaps/add_folder.xpm
rename to data/pixmaps/add_folder.xpm
diff --git a/pixmaps/album.xpm b/data/pixmaps/album.xpm
similarity index 100%
rename from pixmaps/album.xpm
rename to data/pixmaps/album.xpm
diff --git a/pixmaps/all_downcase.xpm b/data/pixmaps/all_downcase.xpm
similarity index 100%
rename from pixmaps/all_downcase.xpm
rename to data/pixmaps/all_downcase.xpm
diff --git a/pixmaps/all_uppercase.xpm b/data/pixmaps/all_uppercase.xpm
similarity index 100%
rename from pixmaps/all_uppercase.xpm
rename to data/pixmaps/all_uppercase.xpm
diff --git a/pixmaps/artist.xpm b/data/pixmaps/artist.xpm
similarity index 100%
rename from pixmaps/artist.xpm
rename to data/pixmaps/artist.xpm
diff --git a/pixmaps/artist_album.xpm b/data/pixmaps/artist_album.xpm
similarity index 100%
rename from pixmaps/artist_album.xpm
rename to data/pixmaps/artist_album.xpm
diff --git a/pixmaps/black.xpm b/data/pixmaps/black.xpm
similarity index 100%
rename from pixmaps/black.xpm
rename to data/pixmaps/black.xpm
diff --git a/pixmaps/blackwhite.xpm b/data/pixmaps/blackwhite.xpm
similarity index 100%
rename from pixmaps/blackwhite.xpm
rename to data/pixmaps/blackwhite.xpm
diff --git a/pixmaps/closed_folder.xpm b/data/pixmaps/closed_folder.xpm
similarity index 100%
rename from pixmaps/closed_folder.xpm
rename to data/pixmaps/closed_folder.xpm
diff --git a/pixmaps/closed_folder_readonly.xpm b/data/pixmaps/closed_folder_readonly.xpm
similarity index 100%
rename from pixmaps/closed_folder_readonly.xpm
rename to data/pixmaps/closed_folder_readonly.xpm
diff --git a/pixmaps/closed_folder_unreadable.xpm b/data/pixmaps/closed_folder_unreadable.xpm
similarity index 100%
rename from pixmaps/closed_folder_unreadable.xpm
rename to data/pixmaps/closed_folder_unreadable.xpm
diff --git a/pixmaps/easytag.png b/data/pixmaps/easytag.png
similarity index 100%
rename from pixmaps/easytag.png
rename to data/pixmaps/easytag.png
diff --git a/pixmaps/first_letter_uppercase.xpm b/data/pixmaps/first_letter_uppercase.xpm
similarity index 100%
rename from pixmaps/first_letter_uppercase.xpm
rename to data/pixmaps/first_letter_uppercase.xpm
diff --git a/pixmaps/first_letter_uppercase_word.xpm b/data/pixmaps/first_letter_uppercase_word.xpm
similarity index 100%
rename from pixmaps/first_letter_uppercase_word.xpm
rename to data/pixmaps/first_letter_uppercase_word.xpm
diff --git a/pixmaps/forbidden.xpm b/data/pixmaps/forbidden.xpm
similarity index 100%
rename from pixmaps/forbidden.xpm
rename to data/pixmaps/forbidden.xpm
diff --git a/pixmaps/freedb.xpm b/data/pixmaps/freedb.xpm
similarity index 100%
rename from pixmaps/freedb.xpm
rename to data/pixmaps/freedb.xpm
diff --git a/pixmaps/gnudb.xpm b/data/pixmaps/gnudb.xpm
similarity index 100%
rename from pixmaps/gnudb.xpm
rename to data/pixmaps/gnudb.xpm
diff --git a/pixmaps/grab.xpm b/data/pixmaps/grab.xpm
similarity index 100%
rename from pixmaps/grab.xpm
rename to data/pixmaps/grab.xpm
diff --git a/pixmaps/invert_selection.xpm b/data/pixmaps/invert_selection.xpm
similarity index 100%
rename from pixmaps/invert_selection.xpm
rename to data/pixmaps/invert_selection.xpm
diff --git a/pixmaps/mask.xpm b/data/pixmaps/mask.xpm
similarity index 100%
rename from pixmaps/mask.xpm
rename to data/pixmaps/mask.xpm
diff --git a/pixmaps/musicbrainz.xpm b/data/pixmaps/musicbrainz.xpm
similarity index 100%
rename from pixmaps/musicbrainz.xpm
rename to data/pixmaps/musicbrainz.xpm
diff --git a/pixmaps/opened_folder.xpm b/data/pixmaps/opened_folder.xpm
similarity index 100%
rename from pixmaps/opened_folder.xpm
rename to data/pixmaps/opened_folder.xpm
diff --git a/pixmaps/parent_folder.xpm b/data/pixmaps/parent_folder.xpm
similarity index 100%
rename from pixmaps/parent_folder.xpm
rename to data/pixmaps/parent_folder.xpm
diff --git a/pixmaps/ram_disk.xpm b/data/pixmaps/ram_disk.xpm
similarity index 100%
rename from pixmaps/ram_disk.xpm
rename to data/pixmaps/ram_disk.xpm
diff --git a/pixmaps/read_only.xpm b/data/pixmaps/read_only.xpm
similarity index 100%
rename from pixmaps/read_only.xpm
rename to data/pixmaps/read_only.xpm
diff --git a/pixmaps/red_lines.xpm b/data/pixmaps/red_lines.xpm
similarity index 100%
rename from pixmaps/red_lines.xpm
rename to data/pixmaps/red_lines.xpm
diff --git a/pixmaps/sequence_track.xpm b/data/pixmaps/sequence_track.xpm
similarity index 100%
rename from pixmaps/sequence_track.xpm
rename to data/pixmaps/sequence_track.xpm
diff --git a/pixmaps/sound.xpm b/data/pixmaps/sound.xpm
similarity index 100%
rename from pixmaps/sound.xpm
rename to data/pixmaps/sound.xpm
diff --git a/pixmaps/unselect_all.xpm b/data/pixmaps/unselect_all.xpm
similarity index 100%
rename from pixmaps/unselect_all.xpm
rename to data/pixmaps/unselect_all.xpm
diff --git a/easytag-win32-installer.nsi.in b/easytag-win32-installer.nsi.in
index e66c1d5..0bc376e 100644
--- a/easytag-win32-installer.nsi.in
+++ b/easytag-win32-installer.nsi.in
@@ -27,7 +27,7 @@ ShowUninstDetails show
 !define MUI_ABORTWARNING
 !define MUI_COMPONENTSPAGE_SMALLDESC
 !define MUI_ICON "data/nsis/easytag-install.ico"
-;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" ;".\pixmaps\EasyTAG.ico"
+;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" ;"data/pixmaps/EasyTAG.ico"
 
 ; Modern UI Configuration
 !define MUI_HEADERIMAGE
diff --git a/src/browser.c b/src/browser.c
index 2fbe809..89a4aca 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -58,12 +58,12 @@
 #endif /* G_OS_WIN32 */
 
 /* Pixmaps */
-#include "pixmaps/opened_folder.xpm"
-#include "pixmaps/closed_folder.xpm"
-#include "pixmaps/closed_folder_readonly.xpm"
-#include "pixmaps/closed_folder_unreadable.xpm"
+#include "data/pixmaps/opened_folder.xpm"
+#include "data/pixmaps/closed_folder.xpm"
+#include "data/pixmaps/closed_folder_readonly.xpm"
+#include "data/pixmaps/closed_folder_unreadable.xpm"
 #ifdef G_OS_WIN32
-#include "pixmaps/ram_disk.xpm"
+#include "data/pixmaps/ram_disk.xpm"
 #endif /* G_OS_WIN32 */
 
 
diff --git a/src/cddb.c b/src/cddb.c
index 8988a7f..cdba800 100644
--- a/src/cddb.c
+++ b/src/cddb.c
@@ -4128,10 +4128,10 @@ Cddb_Get_Id3_Genre_From_Cddb_Genre (const gchar *cddb_genre)
 }
 
 /* Pixmaps */
-#include "../pixmaps/freedb.xpm"
-#include "../pixmaps/gnudb.xpm"
-#include "../pixmaps/musicbrainz.xpm"
-//#include "../pixmaps/closed_folder.xpm"
+#include "data/pixmaps/freedb.xpm"
+#include "data/pixmaps/gnudb.xpm"
+#include "data/pixmaps/musicbrainz.xpm"
+/*#include "data/pixmaps/closed_folder.xpm"*/
 
 /*
  * Returns the pixmap to display following the server name
diff --git a/src/easytag.c b/src/easytag.c
index f7c8589..3e671f1 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -562,7 +562,7 @@ Create_File_Area (void)
     return FileFrame;
 }
 
-#include "../pixmaps/sequence_track.xpm"
+#include "data/pixmaps/sequence_track.xpm"
 static GtkWidget *
 Create_Tag_Area (void)
 {
diff --git a/src/misc.c b/src/misc.c
index 6a39a41..e7d6c55 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -602,25 +602,25 @@ void Set_Unbusy_Cursor (void)
 /*
  * Add easytag specific icons to GTK stock set
  */
-#include "../pixmaps/add_folder.xpm"
-#include "../pixmaps/album.xpm"
-#include "../pixmaps/all_uppercase.xpm"
-#include "../pixmaps/all_downcase.xpm"
-#include "../pixmaps/artist.xpm"
-#include "../pixmaps/artist_album.xpm"
-//#include "../pixmaps/blackwhite.xpm"
-#include "../pixmaps/first_letter_uppercase.xpm"
-#include "../pixmaps/first_letter_uppercase_word.xpm"
-#include "../pixmaps/forbidden.xpm"
-#include "../pixmaps/grab.xpm"
-#include "../pixmaps/invert_selection.xpm"
-#include "../pixmaps/mask.xpm"
-#include "../pixmaps/parent_folder.xpm"
-#include "../pixmaps/read_only.xpm"
-#include "../pixmaps/red_lines.xpm"
-//#include "../pixmaps/sequence_track.xpm"
-#include "../pixmaps/sound.xpm"
-#include "../pixmaps/unselect_all.xpm"
+#include "data/pixmaps/add_folder.xpm"
+#include "data/pixmaps/album.xpm"
+#include "data/pixmaps/all_uppercase.xpm"
+#include "data/pixmaps/all_downcase.xpm"
+#include "data/pixmaps/artist.xpm"
+#include "data/pixmaps/artist_album.xpm"
+//#include "data/pixmaps/blackwhite.xpm"
+#include "data/pixmaps/first_letter_uppercase.xpm"
+#include "data/pixmaps/first_letter_uppercase_word.xpm"
+#include "data/pixmaps/forbidden.xpm"
+#include "data/pixmaps/grab.xpm"
+#include "data/pixmaps/invert_selection.xpm"
+#include "data/pixmaps/mask.xpm"
+#include "data/pixmaps/parent_folder.xpm"
+#include "data/pixmaps/read_only.xpm"
+#include "data/pixmaps/red_lines.xpm"
+//#include "data/pixmaps/sequence_track.xpm"
+#include "data/pixmaps/sound.xpm"
+#include "data/pixmaps/unselect_all.xpm"
 void Init_Custom_Icons (void)
 {
     Create_Xpm_Icon_Factory((const char**)artist_xpm,               "easytag-artist");
diff --git a/src/scan.c b/src/scan.c
index 22aaede..4c8cc63 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -2316,8 +2316,8 @@ static gchar
 /******************
  * Scanner Window *
  ******************/
-#include "../pixmaps/black.xpm"
-#include "../pixmaps/blackwhite.xpm"
+#include "data/pixmaps/black.xpm"
+#include "data/pixmaps/blackwhite.xpm"
 void Open_ScannerWindow (gint scanner_type)
 {
     GtkWidget *ScanVBox;
@@ -3314,7 +3314,7 @@ gboolean Scan_Check_Rename_File_Mask (GtkWidget *widget_to_show_hide, GtkEntry *
     // Not a valid path....
     if ( strstr(mask,"//") != NULL
     ||   strstr(mask,"./") != NULL
-    ||   strstr(mask,"../") != NULL)
+    ||   strstr(mask,"data/") != NULL)
         goto Bad_Mask;
 
     while (mask)
diff --git a/src/win32/easytag.rc b/src/win32/easytag.rc
index cd8fd58..6745ac0 100644
--- a/src/win32/easytag.rc
+++ b/src/win32/easytag.rc
@@ -1,4 +1,4 @@
 #include "resource.h"
 
-EASYTAG_ICON			ICON "../pixmaps/easytag.ico"
+EASYTAG_ICON			ICON "data/pixmaps/easytag.ico"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]