[easytag] Use stock GTK+ icons in a few more places
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag] Use stock GTK+ icons in a few more places
- Date: Sat, 12 Jan 2013 09:20:34 +0000 (UTC)
commit d2d6dac866d8f7b44b7f903562fab89826459ac4
Author: David King <amigadave amigadave com>
Date: Mon Dec 3 18:51:19 2012 +0000
Use stock GTK+ icons in a few more places
Partially fixes bug 689418.
Makefile.am | 2 --
pixmaps/select_all.xpm | 27 ---------------------------
src/bar.c | 10 +++++-----
src/misc.c | 5 -----
4 files changed, 5 insertions(+), 39 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c343495..a3f47bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,8 +149,6 @@ pixmaps = \
pixmaps/ram_disk.xpm \
pixmaps/read_only.xpm \
pixmaps/red_lines.xpm \
- pixmaps/scan.xpm \
- pixmaps/select_all.xpm \
pixmaps/sequence_track.xpm \
pixmaps/sound.xpm \
pixmaps/unselect_all.xpm
diff --git a/src/bar.c b/src/bar.c
index aedf312..e765852 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -190,7 +190,7 @@ void Create_UI (GtkWidget **ppmenubar, GtkWidget **pptoolbar)
{ AM_SORT_DESCENDING_FILE_SAMPLERATE, GTK_STOCK_SORT_DESCENDING, _("Descending by samplerate"), NULL, _("Descending by samplerate"), G_CALLBACK(Menu_Sort_Action) },
{ AM_OPEN_FILE_WITH, GTK_STOCK_OPEN, _("Open Files Withâ"), NULL, _("Open files withâ"), G_CALLBACK(Browser_Open_Run_Program_List_Window) },
- { AM_SELECT_ALL_FILES, "easytag-select-all", _("Select All Files"), "<Control>A", _("Select all files"), G_CALLBACK(Action_Select_All_Files) },
+ { AM_SELECT_ALL_FILES, GTK_STOCK_SELECT_ALL, _("Select All Files"), "<Control>A", _("Select all files"), G_CALLBACK(Action_Select_All_Files) },
{ AM_UNSELECT_ALL_FILES, "easytag-unselect-all", _("Unselect All Files"), "<Shift><Control>A", _("Unselect all files"), G_CALLBACK(Action_Unselect_All_Files) },
{ AM_INVERT_SELECTION, "easytag-invert-selection", _("Invert Files Selection"), "<Control>I", _("Invert files selection"), G_CALLBACK(Action_Invert_Files_Selection) },
{ AM_DELETE_FILE, GTK_STOCK_DELETE, _("Delete Files"), NULL, _("Delete files"), G_CALLBACK(Action_Delete_Selected_Files) },
@@ -235,7 +235,7 @@ void Create_UI (GtkWidget **ppmenubar, GtkWidget **pptoolbar)
{ AM_CDDB_SEARCH, GTK_STOCK_CDROM, _("CD Data_base Searchâ"), "<Control>B", _("CDDB search"), G_CALLBACK(Open_Cddb_Window) },
{ AM_FILENAME_FROM_TXT, GTK_STOCK_OPEN, _("Load Filenames From Text Fileâ"), "<Alt>T", _("Load filenames from text file"), G_CALLBACK(Open_Load_Filename_Window) },
{ AM_WRITE_PLAYLIST, GTK_STOCK_SAVE_AS, _("Write Playlistâ"), "<Alt>W", _("Write playlist"), G_CALLBACK(Open_Write_Playlist_Window) },
- { AM_RUN_AUDIO_PLAYER, "easytag-sound", _("Run Audio Player"), "<Alt>X", _("Run audio player"), G_CALLBACK(Run_Audio_Player_Using_Selection) },
+ { AM_RUN_AUDIO_PLAYER, GTK_STOCK_MEDIA_PLAY, _("Run Audio Player"), "<Alt>X", _("Run audio player"), G_CALLBACK(Run_Audio_Player_Using_Selection) },
{ MENU_SETTINGS, NULL, _("_Settings"), NULL, NULL, NULL },
{ AM_OPEN_OPTIONS_WINDOW, GTK_STOCK_PREFERENCES, _("_Preferences"), "<Alt>P", _("Preferences"), G_CALLBACK(Open_OptionsWindow) },
@@ -255,9 +255,9 @@ void Create_UI (GtkWidget **ppmenubar, GtkWidget **pptoolbar)
*/
{ POPUP_FILE, NULL, _("_File Operations"), NULL, NULL, NULL },
{ POPUP_SUBMENU_SCANNER, "easytag-scan", _("S_canner"), NULL, NULL, NULL },
- { POPUP_DIR_RUN_AUDIO, "easytag-sound", _("Run Audio Player"), NULL, _("Run audio player"), G_CALLBACK(Run_Audio_Player_Using_Directory) },
- { AM_ARTIST_RUN_AUDIO_PLAYER, "easytag-sound", _("Run Audio Player"), NULL, _("Run audio player"), G_CALLBACK(Run_Audio_Player_Using_Browser_Artist_List) },
- { AM_ALBUM_RUN_AUDIO_PLAYER, "easytag-sound", _("Run Audio Player"), NULL, _("Run audio player"), G_CALLBACK(Run_Audio_Player_Using_Browser_Album_List) },
+ { POPUP_DIR_RUN_AUDIO, GTK_STOCK_MEDIA_PLAY, _("Run Audio Player"), NULL, _("Run audio player"), G_CALLBACK(Run_Audio_Player_Using_Directory) },
+ { AM_ARTIST_RUN_AUDIO_PLAYER, GTK_STOCK_MEDIA_PLAY, _("Run Audio Player"), NULL, _("Run audio player"), G_CALLBACK(Run_Audio_Player_Using_Browser_Artist_List) },
+ { AM_ALBUM_RUN_AUDIO_PLAYER, GTK_STOCK_MEDIA_PLAY, _("Run Audio Player"), NULL, _("Run audio player"), G_CALLBACK(Run_Audio_Player_Using_Browser_Album_List) },
{ AM_CDDB_SEARCH_FILE, GTK_STOCK_CDROM, _("CDDB Search Filesâ"), NULL, _("CDDB search filesâ"), G_CALLBACK(Cddb_Popup_Menu_Search_Selected_File) },
//{ AM_ARTIST_OPEN_FILE_WITH, GTK_STOCK_OPEN, _("Open File(s) withâ"), NULL, _("Open File(s) withâ"), G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
//{ AM_ALBUM_OPEN_FILE_WITH, GTK_STOCK_OPEN, _("Open File(s) withâ"), NULL, _("Open File(s) withâ"), G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
diff --git a/src/misc.c b/src/misc.c
index 5daed31..cd6aca5 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -610,8 +610,6 @@ void Set_Unbusy_Cursor (void)
#include "../pixmaps/parent_folder.xpm"
#include "../pixmaps/read_only.xpm"
#include "../pixmaps/red_lines.xpm"
-#include "../pixmaps/scan.xpm"
-#include "../pixmaps/select_all.xpm"
//#include "../pixmaps/sequence_track.xpm"
#include "../pixmaps/sound.xpm"
#include "../pixmaps/unselect_all.xpm"
@@ -619,9 +617,6 @@ void Init_Custom_Icons (void)
{
Create_Xpm_Icon_Factory((const char**)artist_xpm, "easytag-artist");
Create_Xpm_Icon_Factory((const char**)album_xpm, "easytag-album");
- Create_Xpm_Icon_Factory((const char**)select_all_xpm, "easytag-select-all");
- Create_Xpm_Icon_Factory((const char**)scan_xpm, "easytag-scan");
-//// Create_Png_Icon_Factory("scan.png", "easytag-scan");
Create_Xpm_Icon_Factory((const char**)invert_selection_xpm, "easytag-invert-selection");
Create_Xpm_Icon_Factory((const char**)unselect_all_xpm, "easytag-unselect-all");
Create_Xpm_Icon_Factory((const char**)grab_xpm, "easytag-grab");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]