Commit 065bdbcf authored by Scott Wheeler's avatar Scott Wheeler

Added "reload" back into the playlist menus.

svn path=/trunk/kdemultimedia/juk/; revision=235868
parent 28ba5282
......@@ -284,6 +284,8 @@ void JuK::setupActions()
createSplitterAction(i18n("Save"), SLOT(slotSavePlaylist()), "file_save", "filesave", "CTRL+s");
createSplitterAction(i18n("Save As..."), SLOT(slotSaveAsPlaylist()), "file_save_as", "filesaveas");
createSplitterAction(i18n("R&emove"), SLOT(slotDeletePlaylist()), "deleteItemPlaylist", "edittrash");
createSplitterAction(i18n("R&emove"), SLOT(slotDeletePlaylist()), "deleteItemPlaylist", "edittrash");
createSplitterAction(i18n("Reload"), SLOT(slotReloadPlaylist()), "reloadPlaylist", "reload");
KStdAction::quit(this, SLOT(slotQuit()), actionCollection());
......
......@@ -70,6 +70,7 @@ PlaylistBox::PlaylistBox(PlaylistSplitter *parent, const QString &name) :
actions->action("file_new")->plug(m_contextMenu);
actions->action("renamePlaylist")->plug(m_contextMenu);
actions->action("duplicatePlaylist")->plug(m_contextMenu);
actions->action("reloadPlaylist")->plug(m_contextMenu);
actions->action("deleteItemPlaylist")->plug(m_contextMenu);
actions->action("file_save")->plug(m_contextMenu);
actions->action("file_save_as")->plug(m_contextMenu);
......@@ -303,12 +304,6 @@ void PlaylistBox::deleteItem(Item *item)
delete item;
}
void PlaylistBox::reload(Item *item)
{
if(item && item->playlist())
item->playlist()->slotReload();
}
void PlaylistBox::decode(QMimeSource *s, Item *item)
{
if(!s || !item || !item->playlist())
......
......@@ -97,7 +97,6 @@ private:
void rename(Item *item);
void duplicate(Item *item);
void deleteItem(Item *item);
void reload(Item *item);
virtual void decode(QMimeSource *s, Item *item);
virtual void contentsDropEvent(QDropEvent *e);
......
......@@ -201,11 +201,25 @@ public slots:
void slotDeleteSelectedItems();
/**
* Refresh the contents of the currently visible playlist. This will cause
* all of the audio meta data to be reread from disk.
* Refresh either the selection, or if there is no selection, the contents
* of the currently visible playlist. This will cause all of the audio
* meta data to be reread from disk.
*
* \note Within this context "refresh" indicates reloading meta data and
* "reloading" typically denotes reloading the playlist.
*
* \see slotReloadPlaylist()
*/
void slotRefresh() { visiblePlaylist()->refresh(); }
/**
* If the current playlist is one that was imported from a .m3u file, this
* will revert to the contents of that file.
*
* \see slotRefresh()
*/
void slotReloadPlaylist() { visiblePlaylist()->slotReload(); }
/**
* Show or hide the editor.
*/
......@@ -230,7 +244,6 @@ public slots:
void slotRenamePlaylist() { m_playlistBox->rename(); }
void slotDuplicatePlaylist() { m_playlistBox->duplicate(); }
void slotDeletePlaylist();
signals:
void signalActivated();
void signalListBoxDoubleClicked();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment