Mercurial > audlegacy

changeset 2267:8c9e27a834fd trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - namespace for playlist menus (part 3, hopefully the last); separated concepts and actions for current_track_info and playlist_track_info, the second still needs some work
author giacomo
date Thu, 04 Jan 2007 08:11:28 -0800
parents 900f163cb243
children 69c9f0e21447
files ChangeLog audacious/actions-mainwin.h audacious/actions-playlist.h audacious/ui/mainwin.ui audacious/ui/playlist.ui audacious/ui_main.c audacious/ui_manager.c audacious/ui_playlist.c
diffstat 8 files changed, 158 insertions(+), 130 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 04 07:49:55 2007 -0800
+++ b/ChangeLog	Thu Jan 04 08:11:28 2007 -0800
@@ -1,3 +1,39 @@
+2007-01-04 15:49:55 +0000  Kiyoshi Aman <kiyoshi.aman@gmail.com>
+  revision [3537]
+  Update po/; translators, you *will* need to update your translations.
+  trunk/po/POTFILES.in   |   15 
+  trunk/po/audacious.pot | 1180 ++++++++++++++++------------------
+  trunk/po/br.po         | 1495 +++++++++++++++++++++----------------------
+  trunk/po/cs.po         | 1663 ++++++++++++++++++++++++------------------------
+  trunk/po/cy.po         | 1597 ++++++++++++++++++++++++----------------------
+  trunk/po/de.po         | 1690 +++++++++++++++++++++++++------------------------
+  trunk/po/el.po         | 1672 +++++++++++++++++++++++++-----------------------
+  trunk/po/es.po         | 1672 +++++++++++++++++++++++++-----------------------
+  trunk/po/fi.po         | 1681 +++++++++++++++++++++++++-----------------------
+  trunk/po/fr.po         | 1645 +++++++++++++++++++++++++----------------------
+  trunk/po/hi.po         | 1674 +++++++++++++++++++++++++-----------------------
+  trunk/po/hu.po         | 1641 ++++++++++++++++++++++++-----------------------
+  trunk/po/it.po         | 1670 +++++++++++++++++++++++++-----------------------
+  trunk/po/ja.po         | 1677 +++++++++++++++++++++++++-----------------------
+  trunk/po/ka.po         | 1656 ++++++++++++++++++++++++------------------------
+  trunk/po/ko.po         | 1662 ++++++++++++++++++++++++------------------------
+  trunk/po/lt.po         | 1674 +++++++++++++++++++++++++-----------------------
+  trunk/po/mk.po         | 1661 ++++++++++++++++++++++++------------------------
+  trunk/po/nl.po         | 1658 +++++++++++++++++++++++++-----------------------
+  trunk/po/pl.po         | 1663 +++++++++++++++++++++++++-----------------------
+  trunk/po/pt_BR.po      | 1662 ++++++++++++++++++++++++------------------------
+  trunk/po/ro.po         | 1605 ++++++++++++++++++++++++----------------------
+  trunk/po/ru.po         | 1561 ++++++++++++++++++++++++---------------------
+  trunk/po/sk.po         | 1665 ++++++++++++++++++++++++------------------------
+  trunk/po/sr.po         | 1605 ++++++++++++++++++++++++----------------------
+  trunk/po/sr@Latn.po    | 1601 ++++++++++++++++++++++++----------------------
+  trunk/po/sv.po         | 1671 +++++++++++++++++++++++++-----------------------
+  trunk/po/uk.po         | 1666 +++++++++++++++++++++++++-----------------------
+  trunk/po/zh_CN.po      | 1643 +++++++++++++++++++++++++----------------------
+  trunk/po/zh_TW.po      | 1604 ++++++++++++++++++++++++----------------------
+  30 files changed, 24532 insertions(+), 22697 deletions(-)
+
+
 2007-01-04 15:40:01 +0000  Giacomo Lozito <james@develia.org>
   revision [3535]
   - add missing actions-equalizer.h (these things love to be forgotten, it seems)
--- a/audacious/actions-mainwin.h	Thu Jan 04 07:49:55 2007 -0800
+++ b/audacious/actions-mainwin.h	Thu Jan 04 08:11:28 2007 -0800
@@ -71,7 +71,7 @@
 void action_playback_stop(void);
 void action_preferences(void);
 void action_quit(void);
-void action_track_info(void);
+void action_current_track_info(void);
 
 
 #endif
--- a/audacious/actions-playlist.h	Thu Jan 04 07:49:55 2007 -0800
+++ b/audacious/actions-playlist.h	Thu Jan 04 08:11:28 2007 -0800
@@ -18,55 +18,55 @@
 #ifndef ACTIONS_PLAYLIST_H
 #define ACTIONS_PLAYLIST_H
 
-void action_load_list(void);
-void action_save_list(void);
-void action_save_default_list(void);
+void action_playlist_load_list(void);
+void action_playlist_save_list(void);
+void action_playlist_save_default_list(void);
+void action_playlist_refresh_list(void);
 void action_open_list_manager(void);
-void action_refresh_list(void);
 
 void action_playlist_prev(void);
 void action_playlist_new(void);
 void action_playlist_next(void);
 void action_playlist_delete(void);
 
-void action_search_and_select(void);
-void action_invert_selection(void);
-void action_select_all(void);
-void action_select_none(void);
+void action_playlist_search_and_select(void);
+void action_playlist_invert_selection(void);
+void action_playlist_select_all(void);
+void action_playlist_select_none(void);
 
-void action_clear_queue(void);
-void action_remove_unavailable(void);
-void action_remove_dupes_by_title(void);
-void action_remove_dupes_by_filename(void);
-void action_remove_dupes_by_full_path(void);
-void action_remove_all(void);
-void action_remove_selected(void);
-void action_remove_unselected(void);
+void action_playlist_clear_queue(void);
+void action_playlist_remove_unavailable(void);
+void action_playlist_remove_dupes_by_title(void);
+void action_playlist_remove_dupes_by_filename(void);
+void action_playlist_remove_dupes_by_full_path(void);
+void action_playlist_remove_all(void);
+void action_playlist_remove_selected(void);
+void action_playlist_remove_unselected(void);
 
-void action_add_cd(void);
-void action_add_url(void);
-void action_add_files(void);
+void action_playlist_add_cd(void);
+void action_playlist_add_url(void);
+void action_playlist_add_files(void);
 
-void action_randomize_list(void);
-void action_reverse_list(void);
+void action_playlist_randomize_list(void);
+void action_playlist_reverse_list(void);
 
-void action_sort_by_title(void);
-void action_sort_by_artist(void);
-void action_sort_by_filename(void);
-void action_sort_by_full_path(void);
-void action_sort_by_date(void);
-void action_sort_by_track_number(void);
-void action_sort_by_playlist_entry(void);
+void action_playlist_sort_by_title(void);
+void action_playlist_sort_by_artist(void);
+void action_playlist_sort_by_filename(void);
+void action_playlist_sort_by_full_path(void);
+void action_playlist_sort_by_date(void);
+void action_playlist_sort_by_track_number(void);
+void action_playlist_sort_by_playlist_entry(void);
 
-void action_sort_selected_by_title(void);
-void action_sort_selected_by_artist(void);
-void action_sort_selected_by_filename(void);
-void action_sort_selected_by_full_path(void);
-void action_sort_selected_by_date(void);
-void action_sort_selected_by_track_number(void);
-void action_sort_selected_by_playlist_entry(void);
+void action_playlist_sort_selected_by_title(void);
+void action_playlist_sort_selected_by_artist(void);
+void action_playlist_sort_selected_by_filename(void);
+void action_playlist_sort_selected_by_full_path(void);
+void action_playlist_sort_selected_by_date(void);
+void action_playlist_sort_selected_by_track_number(void);
+void action_playlist_sort_selected_by_playlist_entry(void);
 
-void action_view_track_info(void);
+void action_playlist_track_info(void);
 void action_queue_toggle(void);
 
 #endif
--- a/audacious/ui/mainwin.ui	Thu Jan 04 07:49:55 2007 -0800
+++ b/audacious/ui/mainwin.ui	Thu Jan 04 08:11:28 2007 -0800
@@ -3,7 +3,7 @@
 <ui>
 	<menubar name="mainwin-menus">
 		<menu action="dummy" name="songname-menu">
-			<menuitem action="track info" />
+			<menuitem action="current track info" />
 			<separator />
 			<menuitem action="autoscroll songname" />
 			<menuitem action="stop after current song" />
--- a/audacious/ui/playlist.ui	Thu Jan 04 07:49:55 2007 -0800
+++ b/audacious/ui/playlist.ui	Thu Jan 04 08:11:28 2007 -0800
@@ -3,7 +3,7 @@
 <ui>
 	<menubar name="playlist-menus">
 		<menu action="dummy" name="playlist-rightclick-menu">
-			<menuitem action="track info" />
+			<menuitem action="playlist track info" />
 			<separator />
 			<menuitem action="playlist remove selected" />
 			<menuitem action="playlist remove unselected" />
--- a/audacious/ui_main.c	Thu Jan 04 07:49:55 2007 -0800
+++ b/audacious/ui_main.c	Thu Jan 04 08:11:28 2007 -0800
@@ -3920,7 +3920,7 @@
 }
 
 void
-action_track_info( void )
+action_current_track_info( void )
 {
   playlist_fileinfo_current(playlist_get_active());
 }
--- a/audacious/ui_manager.c	Thu Jan 04 07:49:55 2007 -0800
+++ b/audacious/ui_manager.c	Thu Jan 04 08:11:28 2007 -0800
@@ -222,22 +222,22 @@
 	  N_("Delete Playlist"), G_CALLBACK(action_playlist_delete) },
 
         { "playlist load", GTK_STOCK_OPEN, N_("Load List"), "O",
-          N_("Loads a playlist file into the selected playlist."), G_CALLBACK(action_load_list) },
+          N_("Loads a playlist file into the selected playlist."), G_CALLBACK(action_playlist_load_list) },
 
         { "playlist save", GTK_STOCK_SAVE, N_("Save List"), "<Shift>S",
-          N_("Saves the selected playlist."), G_CALLBACK(action_save_list) },
+          N_("Saves the selected playlist."), G_CALLBACK(action_playlist_save_list) },
 
         { "playlist save default", GTK_STOCK_SAVE, N_("Save Default List"), "<Alt>S",
           N_("Saves the selected playlist to the default location."),
-          G_CALLBACK(action_save_default_list) },
+          G_CALLBACK(action_playlist_save_default_list) },
+
+        { "playlist refresh", GTK_STOCK_REFRESH, N_("Refresh List"), "F5",
+          N_("Refreshes metadata associated with a playlist entry."),
+          G_CALLBACK(action_playlist_refresh_list) },
 
         { "playlist manager", AUD_STOCK_PLAYLIST , N_("List Manager"), "P",
           N_("Opens the playlist manager."),
-          G_CALLBACK(action_open_list_manager) },
-
-        { "playlist refresh", GTK_STOCK_REFRESH, N_("Refresh List"), "F5",
-          N_("Refreshes metadata associated with a playlist entry."),
-          G_CALLBACK(action_refresh_list) },
+          G_CALLBACK(action_open_list_manager) }
 };
 
 static GtkActionEntry action_entries_view[] = {
@@ -248,147 +248,150 @@
 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) },
+          G_CALLBACK(action_playlist_add_cd) },
 
         { "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) },
+          G_CALLBACK(action_playlist_add_url) },
 
         { "playlist add files", GTK_STOCK_ADD, N_("Add Files..."), "F",
           N_("Adds files to the playlist."),
-          G_CALLBACK(action_add_files) },
+          G_CALLBACK(action_playlist_add_files) },
 };
 
 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) },
+          G_CALLBACK(action_playlist_search_and_select) },
 
         { "playlist invert selection", AUD_STOCK_SELECTINVERT , N_("Invert Selection"), NULL,
           N_("Inverts the selected and unselected entries."),
-          G_CALLBACK(action_invert_selection) },
+          G_CALLBACK(action_playlist_invert_selection) },
 
         { "playlist select all", AUD_STOCK_SELECTALL , N_("Select All"), "<Ctrl>A",
           N_("Selects all of the playlist entries."),
-          G_CALLBACK(action_select_all) },
+          G_CALLBACK(action_playlist_select_all) },
 
         { "playlist select none", AUD_STOCK_SELECTNONE , N_("Select None"), "<Shift><Ctrl>A",
           N_("Deselects all of the playlist entries."),
-          G_CALLBACK(action_select_none) },
+          G_CALLBACK(action_playlist_select_none) },
 };
 
 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) },
+	  G_CALLBACK(action_playlist_clear_queue) },
 
 	{ "playlist remove unavailable", AUD_STOCK_REMOVEUNAVAIL , N_("Remove Unavailable Files"), NULL,
 	  N_("Removes unavailable files from the playlist."),
-	  G_CALLBACK(action_remove_unavailable) },
+	  G_CALLBACK(action_playlist_remove_unavailable) },
 
 	{ "playlist remove dups menu", AUD_STOCK_REMOVEDUPS , N_("Remove Duplicates") },
 
 	{ "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) },
+	  G_CALLBACK(action_playlist_remove_dupes_by_title) },
 
 	{ "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) },
+	  G_CALLBACK(action_playlist_remove_dupes_by_filename) },
 
 	{ "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) },
+	  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_remove_all) },
+	  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_remove_unselected) },
+	  G_CALLBACK(action_playlist_remove_unselected) },
 
 	{ "playlist remove selected", GTK_STOCK_REMOVE, N_("Remove Selected"), "Delete", 
 	  N_("Remove selected entries from the playlist."),
-	  G_CALLBACK(action_remove_selected) },
+	  G_CALLBACK(action_playlist_remove_selected) },
 };
 
 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) },
+	  G_CALLBACK(action_playlist_randomize_list) },
 
 	{ "playlist reverse list", AUD_STOCK_INVERTPL , N_("Reverse List"), NULL,
 	  N_("Reverses the playlist."),
-	  G_CALLBACK(action_reverse_list) },
+	  G_CALLBACK(action_playlist_reverse_list) },
 
 	{ "playlist sort menu", AUD_STOCK_SORTBYTITLE , N_("Sort List") },
 
 	{ "playlist sort by title", AUD_STOCK_SORTBYTITLE , N_("By Title"), NULL,
 	  N_("Sorts the list by title."),
-	  G_CALLBACK(action_sort_by_title) },
+	  G_CALLBACK(action_playlist_sort_by_title) },
 
 	{ "playlist sort by artist", AUD_STOCK_SORTBYARTIST , N_("By Artist"), NULL,
 	  N_("Sorts the list by artist."),
-	  G_CALLBACK(action_sort_by_artist) },
+	  G_CALLBACK(action_playlist_sort_by_artist) },
 
 	{ "playlist sort by filename", AUD_STOCK_SORTBYFILENAME , N_("By Filename"), NULL,
 	  N_("Sorts the list by filename."),
-	  G_CALLBACK(action_sort_by_filename) },
+	  G_CALLBACK(action_playlist_sort_by_filename) },
 
 	{ "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) },
+	  G_CALLBACK(action_playlist_sort_by_full_path) },
 
 	{ "playlist sort by date", AUD_STOCK_SORTBYARTIST , N_("By Date"), NULL,
 	  N_("Sorts the list by modification time."),
-	  G_CALLBACK(action_sort_by_date) },
+	  G_CALLBACK(action_playlist_sort_by_date) },
 
 	{ "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) },
+	  G_CALLBACK(action_playlist_sort_by_track_number) },
 
 	{ "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) },
+	  G_CALLBACK(action_playlist_sort_by_playlist_entry) },
 
 	{ "playlist sort selected menu", AUD_STOCK_SORTBYTITLE , N_("Sort Selected") },
 
 	{ "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) },
+	  G_CALLBACK(action_playlist_sort_selected_by_title) },
 
 	{ "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) },
+	  G_CALLBACK(action_playlist_sort_selected_by_artist) },
 
 	{ "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) },
+	  G_CALLBACK(action_playlist_sort_selected_by_filename) },
 
 	{ "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) },
+	  G_CALLBACK(action_playlist_sort_selected_by_full_path) },
 
 	{ "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) },
+	  G_CALLBACK(action_playlist_sort_selected_by_date) },
 
 	{ "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) },
+	  G_CALLBACK(action_playlist_sort_selected_by_track_number) },
 
 	{ "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) },
+	  G_CALLBACK(action_playlist_sort_selected_by_playlist_entry) },
 };
 
 static GtkActionEntry action_entries_others[] = {
 
 	{ "dummy", NULL, "dummy" },
 
-	{ "track info", AUD_STOCK_INFO , N_("View Track Details"), "<Alt>I",
-	  N_("View track details"), G_CALLBACK(action_track_info) },
+	{ "current track info", AUD_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",
+	  N_("View track details"), G_CALLBACK(action_playlist_track_info) },
 
 	{ "about audacious", GTK_STOCK_DIALOG_INFO , N_("About Audacious"), NULL,
 	  N_("About Audacious"), G_CALLBACK(action_about_audacious) },
--- a/audacious/ui_playlist.c	Thu Jan 04 07:49:55 2007 -0800
+++ b/audacious/ui_playlist.c	Thu Jan 04 08:11:28 2007 -0800
@@ -1819,7 +1819,7 @@
     gtk_widget_grab_focus(mainwin);
 }
 
-void action_view_track_info(void)
+void action_playlist_track_info(void)
 {
     playlistwin_fileinfo();
 }
@@ -1829,7 +1829,7 @@
     playlist_queue(playlist_get_active());
 }
 
-void action_sort_by_playlist_entry(void)
+void action_playlist_sort_by_playlist_entry(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1837,7 +1837,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_sort_by_track_number(void)
+void action_playlist_sort_by_track_number(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1845,7 +1845,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_sort_by_title(void)
+void action_playlist_sort_by_title(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1853,7 +1853,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_sort_by_artist(void)
+void action_playlist_sort_by_artist(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1861,7 +1861,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_sort_by_full_path(void)
+void action_playlist_sort_by_full_path(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1869,7 +1869,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_sort_by_date(void)
+void action_playlist_sort_by_date(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1877,7 +1877,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_sort_by_filename(void)
+void action_playlist_sort_by_filename(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1885,7 +1885,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_sort_selected_by_playlist_entry(void)
+void action_playlist_sort_selected_by_playlist_entry(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1893,7 +1893,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_sort_selected_by_track_number(void)
+void action_playlist_sort_selected_by_track_number(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1901,7 +1901,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_sort_selected_by_title(void)
+void action_playlist_sort_selected_by_title(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1909,7 +1909,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_sort_selected_by_artist(void)
+void action_playlist_sort_selected_by_artist(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1917,7 +1917,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_sort_selected_by_full_path(void)
+void action_playlist_sort_selected_by_full_path(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1925,7 +1925,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_sort_selected_by_date(void)
+void action_playlist_sort_selected_by_date(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1933,7 +1933,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_sort_selected_by_filename(void)
+void action_playlist_sort_selected_by_filename(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1941,7 +1941,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_randomize_list(void)
+void action_playlist_randomize_list(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1949,7 +1949,7 @@
     playlistwin_update_list(playlist);
 }
 
-void action_reverse_list(void)
+void action_playlist_reverse_list(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -1958,37 +1958,37 @@
 }
 
 void
-action_clear_queue(void)
+action_playlist_clear_queue(void)
 {
     playlist_clear_queue(playlist_get_active());
 }
 
 void
-action_remove_unavailable(void)
+action_playlist_remove_unavailable(void)
 {
     playlist_remove_dead_files(playlist_get_active());
 }
 
 void
-action_remove_dupes_by_title(void)
+action_playlist_remove_dupes_by_title(void)
 {
     playlist_remove_duplicates(playlist_get_active(), PLAYLIST_DUPS_TITLE);
 }
 
 void
-action_remove_dupes_by_filename(void)
+action_playlist_remove_dupes_by_filename(void)
 {
     playlist_remove_duplicates(playlist_get_active(), PLAYLIST_DUPS_FILENAME);
 }
 
 void
-action_remove_dupes_by_full_path(void)
+action_playlist_remove_dupes_by_full_path(void)
 {
     playlist_remove_duplicates(playlist_get_active(), PLAYLIST_DUPS_PATH);
 }
 
 void
-action_remove_all(void)
+action_playlist_remove_all(void)
 {
     playlist_clear(playlist_get_active());
 
@@ -1998,19 +1998,19 @@
 }
 
 void
-action_remove_selected(void)
+action_playlist_remove_selected(void)
 {
     playlist_delete(playlist_get_active(), FALSE);
 }
 
 void
-action_remove_unselected(void)
+action_playlist_remove_unselected(void)
 {
     playlist_delete(playlist_get_active(), TRUE);
 }
 
 void
-action_add_files(void)
+action_playlist_add_files(void)
 {
     util_run_filebrowser(NO_PLAY_BUTTON);
 }
@@ -2018,30 +2018,17 @@
 void add_medium(void); /* XXX */
 
 void
-action_add_cd(void)
+action_playlist_add_cd(void)
 {
     add_medium();
 }
 
 void
-action_add_url(void)
+action_playlist_add_url(void)
 {
     mainwin_show_add_url_window();
 }
 
-/* TODO this is no longer used, remove it
-void
-action_new_list(void)
-{
-    Playlist *playlist = playlist_get_active();
-
-    playlist_set_current_name(playlist, NULL);
-    playlist_clear(playlist);
-    mainwin_clear_song_info();
-    mainwin_set_info_text();
-}
-*/
-
 void
 action_playlist_new( void )
 {
@@ -2069,7 +2056,7 @@
 }
 
 void
-action_save_list(void)
+action_playlist_save_list(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -2077,7 +2064,7 @@
 }
 
 void
-action_save_default_list(void)
+action_playlist_save_default_list(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -2085,7 +2072,7 @@
 }
 
 void
-action_load_list(void)
+action_playlist_load_list(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -2093,7 +2080,7 @@
 }
 
 void
-action_refresh_list(void)
+action_playlist_refresh_list(void)
 {
     Playlist *playlist = playlist_get_active();
 
@@ -2108,29 +2095,31 @@
 }
 
 void
-action_search_and_select(void)
+action_playlist_search_and_select(void)
 {
     playlistwin_select_search();
 }
 
 void
-action_invert_selection(void)
+action_playlist_invert_selection(void)
 {
     playlistwin_inverse_selection();
 }
 
 void
-action_select_none(void)
+action_playlist_select_none(void)
 {
     playlistwin_select_none();
 }
 
 void
-action_select_all(void)
+action_playlist_select_all(void)
 {
     playlistwin_select_all();
 }
 
+
+
 /* playlistwin_select_search callback functions
    placed here to avoid making the code messier :) */
 void