Mercurial > audlegacy
changeset 2263:052ce3b52d04 trunk
[svn] - given some decent namespacing to playlist menus (part 2, the end)
| author | giacomo |
|---|---|
| date | Thu, 04 Jan 2007 05:45:38 -0800 |
| parents | 99a0241f97bb |
| children | 32e570c6d808 |
| files | ChangeLog audacious/ui/playlist.ui audacious/ui_manager.c audacious/ui_manager.h |
| diffstat | 4 files changed, 105 insertions(+), 97 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jan 04 05:35:15 2007 -0800 +++ b/ChangeLog Thu Jan 04 05:45:38 2007 -0800 @@ -1,3 +1,10 @@ +2007-01-04 13:35:15 +0000 Alexandr Orlov <alxorlov@pochta.ru> + revision [3529] + Update russian translation + trunk/po/ru.po | 454 +++++++++++++++++---------------------------------------- + 1 file changed, 141 insertions(+), 313 deletions(-) + + 2007-01-04 13:29:13 +0000 Giacomo Lozito <james@develia.org> revision [3527] - given some decent namespacing to playlist menus (part 1); removed last references to obsolete mainwin_accel
--- a/audacious/ui/playlist.ui Thu Jan 04 05:35:15 2007 -0800 +++ b/audacious/ui/playlist.ui Thu Jan 04 05:45:38 2007 -0800 @@ -5,64 +5,64 @@ <menu action="dummy" name="playlist-rightclick-menu"> <menuitem action="track info" /> <separator /> - <menuitem action="remove selected" /> - <menuitem action="remove unselected" /> - <menuitem action="remove all" /> + <menuitem action="playlist remove selected" /> + <menuitem action="playlist remove unselected" /> + <menuitem action="playlist remove all" /> <separator /> <menuitem action="queue toggle" /> </menu> <menu action="dummy" name="add-menu"> - <menuitem action="add cd" /> - <menuitem action="add url" /> - <menuitem action="add files" /> + <menuitem action="playlist add cd" /> + <menuitem action="playlist add url" /> + <menuitem action="playlist add files" /> </menu> <menu action="dummy" name="del-menu"> - <menuitem action="clear queue" /> + <menuitem action="playlist clear queue" /> <separator /> - <menuitem action="remove unavailable" /> - <menu action="remove duplicates menu"> - <menuitem action="remove by title" /> - <menuitem action="remove by filename" /> - <menuitem action="remove by full path" /> + <menuitem action="playlist remove unavailable" /> + <menu action="playlist remove dups menu"> + <menuitem action="playlist remove dups by title" /> + <menuitem action="playlist remove dups by filename" /> + <menuitem action="playlist remove dups by full path" /> </menu> <separator /> - <menuitem action="remove all" /> - <menuitem action="remove unselected" /> - <menuitem action="remove selected" /> + <menuitem action="playlist remove all" /> + <menuitem action="playlist remove unselected" /> + <menuitem action="playlist remove selected" /> </menu> <menu action="dummy" name="select-menu"> - <menuitem action="search and select" /> + <menuitem action="playlist search and select" /> <separator /> - <menuitem action="invert selection" /> + <menuitem action="playlist invert selection" /> <separator /> - <menuitem action="select none" /> - <menuitem action="select all" /> + <menuitem action="playlist select none" /> + <menuitem action="playlist select all" /> </menu> <menu action="dummy" name="misc-menu"> - <menuitem action="randomize list" /> - <menuitem action="reverse list" /> + <menuitem action="playlist randomize list" /> + <menuitem action="playlist reverse list" /> <separator /> - <menu action="sort menu"> - <menuitem action="sort by title" /> - <menuitem action="sort by artist" /> - <menuitem action="sort by filename" /> - <menuitem action="sort by full path" /> - <menuitem action="sort by date" /> - <menuitem action="sort by track number" /> - <menuitem action="sort by playlist entry" /> + <menu action="playlist sort menu"> + <menuitem action="playlist sort by title" /> + <menuitem action="playlist sort by artist" /> + <menuitem action="playlist sort by filename" /> + <menuitem action="playlist sort by full path" /> + <menuitem action="playlist sort by date" /> + <menuitem action="playlist sort by track number" /> + <menuitem action="playlist sort by playlist entry" /> </menu> - <menu action="sort selected menu"> - <menuitem action="sort selected by title" /> - <menuitem action="sort selected by artist" /> - <menuitem action="sort selected by filename" /> - <menuitem action="sort selected by full path" /> - <menuitem action="sort selected by date" /> - <menuitem action="sort selected by track number" /> - <menuitem action="sort selected by playlist entry" /> + <menu action="playlist sort selected menu"> + <menuitem action="playlist sort selected by title" /> + <menuitem action="playlist sort selected by artist" /> + <menuitem action="playlist sort selected by filename" /> + <menuitem action="playlist sort selected by full path" /> + <menuitem action="playlist sort selected by date" /> + <menuitem action="playlist sort selected by track number" /> + <menuitem action="playlist sort selected by playlist entry" /> </menu> </menu>
--- a/audacious/ui_manager.c Thu Jan 04 05:35:15 2007 -0800 +++ b/audacious/ui_manager.c Thu Jan 04 05:45:38 2007 -0800 @@ -27,9 +27,10 @@ /* TODO ui_main.h is only included because ui_manager.c needs the values of TimerMode enum; move that enum elsewhere so we can get rid of this include */ #include "ui_main.h" +/* we need this to define values of visualization radio-actions */ +#include "widgets/widgetcore.h" #include "icons-stock.h" -#include "widgets/widgetcore.h" static GtkUIManager *ui_manager; @@ -244,140 +245,140 @@ { "view", NULL, "View" } }; -static GtkActionEntry action_entries_add[] = { - { "add cd", GTK_STOCK_CDROM, N_("Add CD..."), "<Shift>C", +static GtkActionEntry action_entries_playlist_add[] = { + { "playlist add cd", GTK_STOCK_CDROM, N_("Add CD..."), "<Shift>C", N_("Adds a CD to the playlist."), G_CALLBACK(action_add_cd) }, - { "add url", GTK_STOCK_NETWORK, N_("Add Internet Address..."), "<Ctrl>H", + { "playlist add url", GTK_STOCK_NETWORK, N_("Add Internet Address..."), "<Ctrl>H", N_("Adds a remote track to the playlist."), G_CALLBACK(action_add_url) }, - { "add files", GTK_STOCK_ADD, N_("Add Files..."), "F", + { "playlist add files", GTK_STOCK_ADD, N_("Add Files..."), "F", N_("Adds files to the playlist."), G_CALLBACK(action_add_files) }, }; -static GtkActionEntry action_entries_select[] = { - { "search and select", GTK_STOCK_FIND, N_("Search and Select"), "<Ctrl>F", +static GtkActionEntry action_entries_playlist_select[] = { + { "playlist search and select", GTK_STOCK_FIND, N_("Search and Select"), "<Ctrl>F", N_("Searches the playlist and selects playlist entries based on specific criteria."), G_CALLBACK(action_search_and_select) }, - { "invert selection", AUD_STOCK_SELECTINVERT , N_("Invert Selection"), NULL, + { "playlist invert selection", AUD_STOCK_SELECTINVERT , N_("Invert Selection"), NULL, N_("Inverts the selected and unselected entries."), G_CALLBACK(action_invert_selection) }, - { "select all", AUD_STOCK_SELECTALL , N_("Select All"), "<Ctrl>A", + { "playlist select all", AUD_STOCK_SELECTALL , N_("Select All"), "<Ctrl>A", N_("Selects all of the playlist entries."), G_CALLBACK(action_select_all) }, - { "select none", AUD_STOCK_SELECTNONE , N_("Select None"), "<Shift><Ctrl>A", + { "playlist select none", AUD_STOCK_SELECTNONE , N_("Select None"), "<Shift><Ctrl>A", N_("Deselects all of the playlist entries."), G_CALLBACK(action_select_none) }, }; -static GtkActionEntry action_entries_delete[] = { - { "clear queue", GTK_STOCK_REMOVE, N_("Clear Queue"), "<Shift>Q", +static GtkActionEntry action_entries_playlist_delete[] = { + { "playlist clear queue", GTK_STOCK_REMOVE, N_("Clear Queue"), "<Shift>Q", N_("Clears the queue associated with this playlist."), G_CALLBACK(action_clear_queue) }, - { "remove unavailable", AUD_STOCK_REMOVEUNAVAIL , N_("Remove Unavailable Files"), NULL, + { "playlist remove unavailable", AUD_STOCK_REMOVEUNAVAIL , N_("Remove Unavailable Files"), NULL, N_("Removes unavailable files from the playlist."), G_CALLBACK(action_remove_unavailable) }, - { "remove duplicates menu", AUD_STOCK_REMOVEDUPS , N_("Remove Duplicates") }, + { "playlist remove dups menu", AUD_STOCK_REMOVEDUPS , N_("Remove Duplicates") }, - { "remove by title", AUD_STOCK_REMOVEDUPS , N_("By Title"), NULL, + { "playlist remove dups by title", AUD_STOCK_REMOVEDUPS , N_("By Title"), NULL, N_("Removes duplicate entries from the playlist by title."), G_CALLBACK(action_remove_dupes_by_title) }, - { "remove by filename", AUD_STOCK_REMOVEDUPS , N_("By Filename"), NULL, + { "playlist remove dups by filename", AUD_STOCK_REMOVEDUPS , N_("By Filename"), NULL, N_("Removes duplicate entries from the playlist by filename."), G_CALLBACK(action_remove_dupes_by_filename) }, - { "remove by full path", AUD_STOCK_REMOVEDUPS , N_("By Path + Filename"), NULL, + { "playlist remove dups by full path", AUD_STOCK_REMOVEDUPS , N_("By Path + Filename"), NULL, N_("Removes duplicate entries from the playlist by their full path."), G_CALLBACK(action_remove_dupes_by_full_path) }, - { "remove all", GTK_STOCK_CLEAR, N_("Remove All"), NULL, + { "playlist remove all", GTK_STOCK_CLEAR, N_("Remove All"), NULL, N_("Removes all entries from the playlist."), G_CALLBACK(action_remove_all) }, - { "remove unselected", GTK_STOCK_REMOVE, N_("Remove Unselected"), NULL, + { "playlist remove unselected", GTK_STOCK_REMOVE, N_("Remove Unselected"), NULL, N_("Remove unselected entries from the playlist."), G_CALLBACK(action_remove_unselected) }, - { "remove selected", GTK_STOCK_REMOVE, N_("Remove Selected"), "Delete", + { "playlist remove selected", GTK_STOCK_REMOVE, N_("Remove Selected"), "Delete", N_("Remove selected entries from the playlist."), G_CALLBACK(action_remove_selected) }, }; -static GtkActionEntry action_entries_sort[] = { - { "randomize list", AUD_STOCK_RANDOMIZEPL , N_("Randomize List"), "<Ctrl><Shift>R", +static GtkActionEntry action_entries_playlist_sort[] = { + { "playlist randomize list", AUD_STOCK_RANDOMIZEPL , N_("Randomize List"), "<Ctrl><Shift>R", N_("Randomizes the playlist."), G_CALLBACK(action_randomize_list) }, - { "reverse list", AUD_STOCK_INVERTPL , N_("Reverse List"), NULL, + { "playlist reverse list", AUD_STOCK_INVERTPL , N_("Reverse List"), NULL, N_("Reverses the playlist."), G_CALLBACK(action_reverse_list) }, - { "sort menu", AUD_STOCK_SORTBYTITLE , N_("Sort List") }, + { "playlist sort menu", AUD_STOCK_SORTBYTITLE , N_("Sort List") }, - { "sort by title", AUD_STOCK_SORTBYTITLE , N_("By Title"), NULL, + { "playlist sort by title", AUD_STOCK_SORTBYTITLE , N_("By Title"), NULL, N_("Sorts the list by title."), G_CALLBACK(action_sort_by_title) }, - { "sort by artist", AUD_STOCK_SORTBYARTIST , N_("By Artist"), NULL, + { "playlist sort by artist", AUD_STOCK_SORTBYARTIST , N_("By Artist"), NULL, N_("Sorts the list by artist."), G_CALLBACK(action_sort_by_artist) }, - { "sort by filename", AUD_STOCK_SORTBYFILENAME , N_("By Filename"), NULL, + { "playlist sort by filename", AUD_STOCK_SORTBYFILENAME , N_("By Filename"), NULL, N_("Sorts the list by filename."), G_CALLBACK(action_sort_by_filename) }, - { "sort by full path", AUD_STOCK_SORTBYPATHFILE , N_("By Path + Filename"), NULL, + { "playlist sort by full path", AUD_STOCK_SORTBYPATHFILE , N_("By Path + Filename"), NULL, N_("Sorts the list by full pathname."), G_CALLBACK(action_sort_by_full_path) }, - { "sort by date", AUD_STOCK_SORTBYARTIST , N_("By Date"), NULL, + { "playlist sort by date", AUD_STOCK_SORTBYARTIST , N_("By Date"), NULL, N_("Sorts the list by modification time."), G_CALLBACK(action_sort_by_date) }, - { "sort by track number", AUD_STOCK_SORTBYFILENAME , N_("By Track Number"), NULL, + { "playlist sort by track number", AUD_STOCK_SORTBYFILENAME , N_("By Track Number"), NULL, N_("Sorts the list by track number."), G_CALLBACK(action_sort_by_track_number) }, - { "sort by playlist entry", AUD_STOCK_SORTBYPATHFILE , N_("By Playlist Entry"), NULL, + { "playlist sort by playlist entry", AUD_STOCK_SORTBYPATHFILE , N_("By Playlist Entry"), NULL, N_("Sorts the list by playlist entry."), G_CALLBACK(action_sort_by_playlist_entry) }, - { "sort selected menu", AUD_STOCK_SORTBYTITLE , N_("Sort Selected") }, + { "playlist sort selected menu", AUD_STOCK_SORTBYTITLE , N_("Sort Selected") }, - { "sort selected by title", AUD_STOCK_SORTBYTITLE , N_("By Title"), NULL, + { "playlist sort selected by title", AUD_STOCK_SORTBYTITLE , N_("By Title"), NULL, N_("Sorts the list by title."), G_CALLBACK(action_sort_selected_by_title) }, - { "sort selected by artist", AUD_STOCK_SORTBYARTIST, N_("By Artist"), NULL, + { "playlist sort selected by artist", AUD_STOCK_SORTBYARTIST, N_("By Artist"), NULL, N_("Sorts the list by artist."), G_CALLBACK(action_sort_selected_by_artist) }, - { "sort selected by filename", AUD_STOCK_SORTBYFILENAME , N_("By Filename"), NULL, + { "playlist sort selected by filename", AUD_STOCK_SORTBYFILENAME , N_("By Filename"), NULL, N_("Sorts the list by filename."), G_CALLBACK(action_sort_selected_by_filename) }, - { "sort selected by full path", AUD_STOCK_SORTBYPATHFILE , N_("By Path + Filename"), NULL, + { "playlist sort selected by full path", AUD_STOCK_SORTBYPATHFILE , N_("By Path + Filename"), NULL, N_("Sorts the list by full pathname."), G_CALLBACK(action_sort_selected_by_full_path) }, - { "sort selected by date", AUD_STOCK_SORTBYARTIST , N_("By Date"), NULL, + { "playlist sort selected by date", AUD_STOCK_SORTBYARTIST , N_("By Date"), NULL, N_("Sorts the list by modification time."), G_CALLBACK(action_sort_selected_by_date) }, - { "sort selected by track number", AUD_STOCK_SORTBYFILENAME , N_("By Track Number"), NULL, + { "playlist sort selected by track number", AUD_STOCK_SORTBYFILENAME , N_("By Track Number"), NULL, N_("Sorts the list by track number."), G_CALLBACK(action_sort_selected_by_track_number) }, - { "sort selected by playlist entry", AUD_STOCK_SORTBYPATHFILE, N_("By Playlist Entry"), NULL, + { "playlist sort selected by playlist entry", AUD_STOCK_SORTBYPATHFILE, N_("By Playlist Entry"), NULL, N_("Sorts the list by playlist entry."), G_CALLBACK(action_sort_selected_by_playlist_entry) }, }; @@ -574,25 +575,25 @@ action_group_others , action_entries_others , G_N_ELEMENTS(action_entries_others) , NULL ); - action_group_add = ui_manager_new_action_group("action_add"); + action_group_playlist_add = ui_manager_new_action_group("action_playlist_add"); gtk_action_group_add_actions( - action_group_add, action_entries_add, - G_N_ELEMENTS(action_entries_add), NULL ); + action_group_playlist_add, action_entries_playlist_add, + G_N_ELEMENTS(action_entries_playlist_add), NULL ); - action_group_select = ui_manager_new_action_group("action_select"); + action_group_playlist_select = ui_manager_new_action_group("action_playlist_select"); gtk_action_group_add_actions( - action_group_select, action_entries_select, - G_N_ELEMENTS(action_entries_select), NULL ); + action_group_playlist_select, action_entries_playlist_select, + G_N_ELEMENTS(action_entries_playlist_select), NULL ); - action_group_delete = ui_manager_new_action_group("action_delete"); + action_group_playlist_delete = ui_manager_new_action_group("action_playlist_delete"); gtk_action_group_add_actions( - action_group_delete, action_entries_delete, - G_N_ELEMENTS(action_entries_delete), NULL ); + action_group_playlist_delete, action_entries_playlist_delete, + G_N_ELEMENTS(action_entries_playlist_delete), NULL ); - action_group_sort = ui_manager_new_action_group("action_sort"); + action_group_playlist_sort = ui_manager_new_action_group("action_playlist_sort"); gtk_action_group_add_actions( - action_group_sort, action_entries_sort, - G_N_ELEMENTS(action_entries_sort), NULL ); + action_group_playlist_sort, action_entries_playlist_sort, + G_N_ELEMENTS(action_entries_playlist_sort), NULL ); action_group_equalizer = ui_manager_new_action_group("action_equalizer"); gtk_action_group_add_actions( @@ -617,10 +618,10 @@ gtk_ui_manager_insert_action_group( ui_manager , action_group_visualization , 0 ); gtk_ui_manager_insert_action_group( ui_manager , action_group_view , 0 ); gtk_ui_manager_insert_action_group( ui_manager , action_group_others , 0 ); - gtk_ui_manager_insert_action_group( ui_manager , action_group_add , 0 ); - gtk_ui_manager_insert_action_group( ui_manager , action_group_select , 0 ); - gtk_ui_manager_insert_action_group( ui_manager , action_group_delete , 0 ); - gtk_ui_manager_insert_action_group( ui_manager , action_group_sort , 0 ); + gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist_add , 0 ); + gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist_select , 0 ); + gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist_delete , 0 ); + gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist_sort , 0 ); gtk_ui_manager_insert_action_group( ui_manager , action_group_equalizer , 0 ); return;
--- a/audacious/ui_manager.h Thu Jan 04 05:35:15 2007 -0800 +++ b/audacious/ui_manager.h Thu Jan 04 05:45:38 2007 -0800 @@ -52,14 +52,14 @@ GtkActionGroup *radioaction_group_vismode; /* Visualization mode */ GtkActionGroup *radioaction_group_viewtime; /* View time (remaining/elapsed) */ GtkActionGroup *action_group_playback; -GtkActionGroup *action_group_playlist; GtkActionGroup *action_group_visualization; GtkActionGroup *action_group_view; GtkActionGroup *action_group_others; -GtkActionGroup *action_group_add; -GtkActionGroup *action_group_select; -GtkActionGroup *action_group_delete; -GtkActionGroup *action_group_sort; +GtkActionGroup *action_group_playlist; +GtkActionGroup *action_group_playlist_add; +GtkActionGroup *action_group_playlist_select; +GtkActionGroup *action_group_playlist_delete; +GtkActionGroup *action_group_playlist_sort; GtkActionGroup *action_group_equalizer;