Mercurial > audlegacy

changeset 4054:d3b549e75380

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed some old icons and replaced them with shiny, new ones
author mf0102 <0102@gmx.at>
date Sun, 02 Dec 2007 21:21:21 +0100
parents 838ef7dc0cd6
children cb1fdf8bafac
files Skins/Default/pledit.png src/audacious/Makefile src/audacious/icons-stock.c src/audacious/icons-stock.h src/audacious/images/info.png src/audacious/images/menu_invert_playlist.png src/audacious/images/menu_playlist.png src/audacious/images/menu_plugin.png src/audacious/images/menu_remove_dups.png src/audacious/images/menu_remove_unavail.png src/audacious/images/menu_select_all.png src/audacious/images/menu_select_invert.png src/audacious/images/menu_select_none.png src/audacious/images/menu_sort_artist.png src/audacious/images/menu_sort_filename.png src/audacious/images/menu_sort_pathfile.png src/audacious/images/menu_sort_title.png src/audacious/images/pl.png src/audacious/ui_manager.c
diffstat 19 files changed, 40 insertions(+), 80 deletions(-) [+]
line wrap: on
line diff
Binary file Skins/Default/pledit.png has changed
--- a/src/audacious/Makefile	Sun Dec 02 18:26:26 2007 +0100
+++ b/src/audacious/Makefile	Sun Dec 02 21:21:21 2007 +0100
@@ -126,22 +126,11 @@
        images/audacious_playlist.xpm		\
        images/audio.png						\
        images/connectivity.png				\
-       images/info.png						\
-       images/menu_invert_playlist.png		\
+       images/menu_playlist.png				\
+       images/menu_plugin.png				\
        images/menu_queue_toggle.png			\
        images/menu_randomize_playlist.png	\
-       images/menu_remove_dups.png			\
-       images/menu_remove_unavail.png		\
-       images/menu_select_all.png			\
-       images/menu_select_invert.png		\
-       images/menu_select_none.png			\
-       images/menu_sort_artist.png			\
-       images/menu_sort_filename.png		\
-       images/menu_sort_pathfile.png		\
-       images/menu_sort_title.png			\
        images/mouse.png						\
-       images/pl.png						\
-       images/play.png						\
        images/playlist.png					\
        images/plugins.png					\
        ui/equalizer.ui						\
--- a/src/audacious/icons-stock.c	Sun Dec 02 18:26:26 2007 +0100
+++ b/src/audacious/icons-stock.c	Sun Dec 02 21:21:21 2007 +0100
@@ -45,34 +45,15 @@
 {
     GtkIconFactory *iconfactory = gtk_icon_factory_new();
 
-    load_stock_icon(AUD_STOCK_INFO,
-                    DATA_DIR "/images/info.png", iconfactory);
-    load_stock_icon(AUD_STOCK_INVERTPL,
-                    DATA_DIR "/images/menu_invert_playlist.png", iconfactory);
     load_stock_icon(AUD_STOCK_PLAYLIST,
-                    DATA_DIR "/images/pl.png", iconfactory);
+                    DATA_DIR "/images/menu_playlist.png", iconfactory);
+    load_stock_icon(AUD_STOCK_PLUGIN,
+                    DATA_DIR "/images/menu_plugin.png", iconfactory);
     load_stock_icon(AUD_STOCK_QUEUETOGGLE,
                     DATA_DIR "/images/menu_queue_toggle.png", iconfactory);
     load_stock_icon(AUD_STOCK_RANDOMIZEPL,
                     DATA_DIR "/images/menu_randomize_playlist.png", iconfactory);
-    load_stock_icon(AUD_STOCK_REMOVEDUPS,
-                    DATA_DIR "/images/menu_remove_dups.png", iconfactory);
-    load_stock_icon(AUD_STOCK_REMOVEUNAVAIL,
-                    DATA_DIR "/images/menu_remove_unavail.png", iconfactory);
-    load_stock_icon(AUD_STOCK_SELECTALL,
-                    DATA_DIR "/images/menu_select_all.png", iconfactory);
-    load_stock_icon(AUD_STOCK_SELECTINVERT,
-                    DATA_DIR "/images/menu_select_invert.png", iconfactory);
-    load_stock_icon(AUD_STOCK_SELECTNONE,
-                    DATA_DIR "/images/menu_select_none.png", iconfactory);
-    load_stock_icon(AUD_STOCK_SORTBYARTIST,
-                    DATA_DIR "/images/menu_sort_artist.png", iconfactory);
-    load_stock_icon(AUD_STOCK_SORTBYFILENAME,
-                    DATA_DIR "/images/menu_sort_filename.png", iconfactory);
-    load_stock_icon(AUD_STOCK_SORTBYPATHFILE,
-                    DATA_DIR "/images/menu_sort_pathfile.png", iconfactory);
-    load_stock_icon(AUD_STOCK_SORTBYTITLE,
-                    DATA_DIR "/images/menu_sort_title.png", iconfactory);
+    
 
     gtk_icon_factory_add_default( iconfactory );
     g_object_unref( iconfactory );
--- a/src/audacious/icons-stock.h	Sun Dec 02 18:26:26 2007 +0100
+++ b/src/audacious/icons-stock.h	Sun Dec 02 21:21:21 2007 +0100
@@ -24,19 +24,9 @@
 
 /* this header contains macro defines for Audacious stock icons */
 
-#define AUD_STOCK_INFO				"aud-info"
-#define AUD_STOCK_INVERTPL			"aud-invertpl"
 #define AUD_STOCK_PLAYLIST			"aud-playlist"
+#define AUD_STOCK_PLUGIN			"aud-plugin"
 #define AUD_STOCK_QUEUETOGGLE		"aud-queuetoggle"
 #define AUD_STOCK_RANDOMIZEPL		"aud-randomizepl"
-#define AUD_STOCK_REMOVEDUPS		"aud-removedups"
-#define AUD_STOCK_REMOVEUNAVAIL		"aud-removeunavail"
-#define AUD_STOCK_SELECTALL			"aud-selectall"
-#define AUD_STOCK_SELECTINVERT		"aud-selectinvert"
-#define AUD_STOCK_SELECTNONE		"aud-selectnone"
-#define AUD_STOCK_SORTBYARTIST		"aud-sortbydate"
-#define AUD_STOCK_SORTBYFILENAME	"aud-sortbyfilename"
-#define AUD_STOCK_SORTBYPATHFILE	"aud-sortbypathfile"
-#define AUD_STOCK_SORTBYTITLE		"aud-sortbytitle"
 
 #endif
Binary file src/audacious/images/info.png has changed
Binary file src/audacious/images/menu_invert_playlist.png has changed
Binary file src/audacious/images/menu_playlist.png has changed
Binary file src/audacious/images/menu_plugin.png has changed
Binary file src/audacious/images/menu_remove_dups.png has changed
Binary file src/audacious/images/menu_remove_unavail.png has changed
Binary file src/audacious/images/menu_select_all.png has changed
Binary file src/audacious/images/menu_select_invert.png has changed
Binary file src/audacious/images/menu_select_none.png has changed
Binary file src/audacious/images/menu_sort_artist.png has changed
Binary file src/audacious/images/menu_sort_filename.png has changed
Binary file src/audacious/images/menu_sort_pathfile.png has changed
Binary file src/audacious/images/menu_sort_title.png has changed
Binary file src/audacious/images/pl.png has changed
--- a/src/audacious/ui_manager.c	Sun Dec 02 18:26:26 2007 +0100
+++ b/src/audacious/ui_manager.c	Sun Dec 02 21:21:21 2007 +0100
@@ -253,46 +253,42 @@
           N_("Searches the playlist and selects playlist entries based on specific criteria."),
           G_CALLBACK(action_playlist_search_and_select) },
 
-        { "playlist invert selection", AUD_STOCK_SELECTINVERT , N_("Invert Selection"), NULL,
+        { "playlist invert selection", NULL , N_("Invert Selection"), NULL,
           N_("Inverts the selected and unselected entries."),
           G_CALLBACK(action_playlist_invert_selection) },
 
-        { "playlist select all", AUD_STOCK_SELECTALL , N_("Select All"), "<Ctrl>A",
+        { "playlist select all", NULL , N_("Select All"), "<Ctrl>A",
           N_("Selects all of the playlist entries."),
           G_CALLBACK(action_playlist_select_all) },
 
-        { "playlist select none", AUD_STOCK_SELECTNONE , N_("Select None"), "<Shift><Ctrl>A",
+        { "playlist select none", NULL , N_("Select None"), "<Shift><Ctrl>A",
           N_("Deselects all of the playlist entries."),
           G_CALLBACK(action_playlist_select_none) },
 };
 
 static GtkActionEntry action_entries_playlist_delete[] = {
-	{ "playlist clear queue", GTK_STOCK_REMOVE, N_("Clear Queue"), "<Shift>Q",
+	{ "playlist clear queue", GTK_STOCK_CLEAR, N_("Clear Queue"), "<Shift>Q",
 	  N_("Clears the queue associated with this playlist."),
 	  G_CALLBACK(action_playlist_clear_queue) },
 
-	{ "playlist remove unavailable", AUD_STOCK_REMOVEUNAVAIL , N_("Remove Unavailable Files"), NULL,
+	{ "playlist remove unavailable", GTK_STOCK_DIALOG_ERROR , N_("Remove Unavailable Files"), NULL,
 	  N_("Removes unavailable files from the playlist."),
 	  G_CALLBACK(action_playlist_remove_unavailable) },
 
-	{ "playlist remove dups menu", AUD_STOCK_REMOVEDUPS , N_("Remove Duplicates") },
+	{ "playlist remove dups menu", NULL , N_("Remove Duplicates") },
 
-	{ "playlist remove dups by title", AUD_STOCK_REMOVEDUPS , N_("By Title"), NULL,
+	{ "playlist remove dups by title", NULL , N_("By Title"), NULL,
 	  N_("Removes duplicate entries from the playlist by title."),
 	  G_CALLBACK(action_playlist_remove_dupes_by_title) },
 
-	{ "playlist remove dups by filename", AUD_STOCK_REMOVEDUPS , N_("By Filename"), NULL, 
+	{ "playlist remove dups by filename", NULL , N_("By Filename"), NULL, 
 	  N_("Removes duplicate entries from the playlist by filename."),
 	  G_CALLBACK(action_playlist_remove_dupes_by_filename) },
 
-	{ "playlist remove dups by full path", AUD_STOCK_REMOVEDUPS , N_("By Path + Filename"), NULL, 
+	{ "playlist remove dups by full path", NULL , N_("By Path + Filename"), NULL, 
 	  N_("Removes duplicate entries from the playlist by their full path."),
 	  G_CALLBACK(action_playlist_remove_dupes_by_full_path) },
 
-	{ "playlist remove all", GTK_STOCK_CLEAR, N_("Remove All"), NULL, 
-	  N_("Removes all entries from the playlist."),
-	  G_CALLBACK(action_playlist_remove_all) },
-
 	{ "playlist remove unselected", GTK_STOCK_REMOVE, N_("Remove Unselected"), NULL,
 	  N_("Remove unselected entries from the playlist."),
 	  G_CALLBACK(action_playlist_remove_unselected) },
@@ -300,6 +296,10 @@
 	{ "playlist remove selected", GTK_STOCK_REMOVE, N_("Remove Selected"), "Delete", 
 	  N_("Remove selected entries from the playlist."),
 	  G_CALLBACK(action_playlist_remove_selected) },
+
+	{ "playlist remove all", GTK_STOCK_CLEAR, N_("Remove All"), NULL, 
+	  N_("Removes all entries from the playlist."),
+	  G_CALLBACK(action_playlist_remove_all) },
 };
 
 static GtkActionEntry action_entries_playlist_sort[] = {
@@ -307,67 +307,67 @@
 	  N_("Randomizes the playlist."),
 	  G_CALLBACK(action_playlist_randomize_list) },
 
-	{ "playlist reverse list", AUD_STOCK_INVERTPL , N_("Reverse List"), NULL,
+	{ "playlist reverse list", NULL , N_("Reverse List"), NULL,
 	  N_("Reverses the playlist."),
 	  G_CALLBACK(action_playlist_reverse_list) },
 
-	{ "playlist sort menu", AUD_STOCK_SORTBYTITLE , N_("Sort List") },
+	{ "playlist sort menu", NULL , N_("Sort List") },
 
-	{ "playlist sort by title", AUD_STOCK_SORTBYTITLE , N_("By Title"), NULL,
+	{ "playlist sort by title", NULL , N_("By Title"), NULL,
 	  N_("Sorts the list by title."),
 	  G_CALLBACK(action_playlist_sort_by_title) },
 
-	{ "playlist sort by artist", AUD_STOCK_SORTBYARTIST , N_("By Artist"), NULL,
+	{ "playlist sort by artist", NULL , N_("By Artist"), NULL,
 	  N_("Sorts the list by artist."),
 	  G_CALLBACK(action_playlist_sort_by_artist) },
 
-	{ "playlist sort by filename", AUD_STOCK_SORTBYFILENAME , N_("By Filename"), NULL,
+	{ "playlist sort by filename", NULL , N_("By Filename"), NULL,
 	  N_("Sorts the list by filename."),
 	  G_CALLBACK(action_playlist_sort_by_filename) },
 
-	{ "playlist sort by full path", AUD_STOCK_SORTBYPATHFILE , N_("By Path + Filename"), NULL,
+	{ "playlist sort by full path", NULL , N_("By Path + Filename"), NULL,
 	  N_("Sorts the list by full pathname."),
 	  G_CALLBACK(action_playlist_sort_by_full_path) },
 
-	{ "playlist sort by date", AUD_STOCK_SORTBYARTIST , N_("By Date"), NULL,
+	{ "playlist sort by date", NULL , N_("By Date"), NULL,
 	  N_("Sorts the list by modification time."),
 	  G_CALLBACK(action_playlist_sort_by_date) },
 
-	{ "playlist sort by track number", AUD_STOCK_SORTBYFILENAME , N_("By Track Number"), NULL,
+	{ "playlist sort by track number", NULL , N_("By Track Number"), NULL,
 	  N_("Sorts the list by track number."),
 	  G_CALLBACK(action_playlist_sort_by_track_number) },
 
-	{ "playlist sort by playlist entry", AUD_STOCK_SORTBYPATHFILE , N_("By Playlist Entry"), NULL,
+	{ "playlist sort by playlist entry", NULL , N_("By Playlist Entry"), NULL,
 	  N_("Sorts the list by playlist entry."),
 	  G_CALLBACK(action_playlist_sort_by_playlist_entry) },
 
-	{ "playlist sort selected menu", AUD_STOCK_SORTBYTITLE , N_("Sort Selected") },
+	{ "playlist sort selected menu", NULL , N_("Sort Selected") },
 
-	{ "playlist sort selected by title", AUD_STOCK_SORTBYTITLE , N_("By Title"), NULL,
+	{ "playlist sort selected by title", NULL , N_("By Title"), NULL,
 	  N_("Sorts the list by title."),
 	  G_CALLBACK(action_playlist_sort_selected_by_title) },
 
-	{ "playlist sort selected by artist", AUD_STOCK_SORTBYARTIST, N_("By Artist"), NULL,
+	{ "playlist sort selected by artist", NULL, N_("By Artist"), NULL,
 	  N_("Sorts the list by artist."),
 	  G_CALLBACK(action_playlist_sort_selected_by_artist) },
 
-	{ "playlist sort selected by filename", AUD_STOCK_SORTBYFILENAME , N_("By Filename"), NULL,
+	{ "playlist sort selected by filename", NULL , N_("By Filename"), NULL,
 	  N_("Sorts the list by filename."),
 	  G_CALLBACK(action_playlist_sort_selected_by_filename) },
 
-	{ "playlist sort selected by full path", AUD_STOCK_SORTBYPATHFILE , N_("By Path + Filename"), NULL,
+	{ "playlist sort selected by full path", NULL , N_("By Path + Filename"), NULL,
 	  N_("Sorts the list by full pathname."),
 	  G_CALLBACK(action_playlist_sort_selected_by_full_path) },
 
-	{ "playlist sort selected by date", AUD_STOCK_SORTBYARTIST , N_("By Date"), NULL,
+	{ "playlist sort selected by date", NULL , N_("By Date"), NULL,
 	  N_("Sorts the list by modification time."),
 	  G_CALLBACK(action_playlist_sort_selected_by_date) },
 
-	{ "playlist sort selected by track number", AUD_STOCK_SORTBYFILENAME , N_("By Track Number"), NULL,
+	{ "playlist sort selected by track number", NULL , N_("By Track Number"), NULL,
 	  N_("Sorts the list by track number."),
 	  G_CALLBACK(action_playlist_sort_selected_by_track_number) },
 
-	{ "playlist sort selected by playlist entry", AUD_STOCK_SORTBYPATHFILE, N_("By Playlist Entry"), NULL,
+	{ "playlist sort selected by playlist entry", NULL, N_("By Playlist Entry"), NULL,
 	  N_("Sorts the list by playlist entry."),
 	  G_CALLBACK(action_playlist_sort_selected_by_playlist_entry) },
 };
@@ -380,12 +380,12 @@
         { "file", NULL, N_("File") },
         { "help", NULL, N_("Help") },
 
-	{ "plugins-menu", NULL, N_("Plugin Services") },
+	{ "plugins-menu", AUD_STOCK_PLUGIN, N_("Plugin Services") },
 
-	{ "current track info", AUD_STOCK_INFO , N_("View Track Details"), "I",
+	{ "current track info", GTK_STOCK_INFO , N_("View Track Details"), "I",
 	  N_("View track details"), G_CALLBACK(action_current_track_info) },
 
-	{ "playlist track info", AUD_STOCK_INFO , N_("View Track Details"), "<Alt>I",
+	{ "playlist track info", GTK_STOCK_INFO , N_("View Track Details"), "<Alt>I",
 	  N_("View track details"), G_CALLBACK(action_playlist_track_info) },
 
 	{ "about audacious", GTK_STOCK_DIALOG_INFO , N_("About Audacious"), NULL,