Commit fb7b3628 authored by Scott Wheeler's avatar Scott Wheeler

Did most of the conversion over to making the "document" a playlist rather

than an audio file.

svn path=/trunk/kdemultimedia/juk/; revision=204519
parent 09775ba4
......@@ -91,10 +91,19 @@ void JuK::setupLayout()
void JuK::setupActions()
{
// file menu
KStdAction::openNew(splitter, SLOT(createPlaylist()), actionCollection());
KStdAction::open(splitter, SLOT(open()), actionCollection());
new KAction(i18n("Open &Directory..."), "fileopen", 0, splitter, SLOT(openDirectory()), actionCollection(), "openDirectory");
KStdAction::save(splitter, SLOT(save()), actionCollection());
new KAction(i18n("Delete"), "editdelete", 0, splitter, SLOT(removeSelectedItems()), actionCollection(), "remove");
renamePlaylistAction = new KAction(i18n("Rename..."), 0, splitter, SLOT(renamePlaylist()),
actionCollection(), "renamePlaylist");
new KAction(i18n("Duplicate..."), "editcopy", 0, splitter, SLOT(duplicatePlaylist()), actionCollection(), "duplicatePlaylist");
savePlaylistAction = KStdAction::save(splitter, SLOT(savePlaylist()), actionCollection());
saveAsPlaylistAction = KStdAction::saveAs(splitter, SLOT(saveAsPlaylist()), actionCollection());
deleteItemPlaylistAction = new KAction(i18n("Delete"), "editdelete", 0, splitter, SLOT(deleteItemPlaylist()),
actionCollection(), "deleteItemPlaylist");
KStdAction::quit(this, SLOT(close()), actionCollection());
// edit menu
......@@ -116,18 +125,9 @@ void JuK::setupActions()
backAction = new KAction(i18n("Skip &Back"), "player_start", 0, this, SLOT(backFile()), actionCollection(), "backFile");
forwardAction = new KAction(i18n("Skip &Forward"), "player_end", 0, this, SLOT(forwardFile()), actionCollection(), "forwardFile");
// playlist menu
new KAction(i18n("New..."), "filenew", 0, splitter, SLOT(createPlaylist()), actionCollection(), "createPlaylist");
new KAction(i18n("Open..."), "fileopen", 0, splitter, SLOT(openPlaylist()), actionCollection(), "openPlaylist");
savePlaylistAction = new KAction(i18n("Save"), "filesave", 0, splitter, SLOT(savePlaylist()), actionCollection(), "savePlaylist");
saveAsPlaylistAction = new KAction(i18n("Save As..."), "filesaveas", 0, splitter, SLOT(saveAsPlaylist()),
actionCollection(), "saveAsPlaylist");
renamePlaylistAction = new KAction(i18n("Rename..."), 0, splitter, SLOT(renamePlaylist()),
actionCollection(), "renamePlaylist");
new KAction(i18n("Duplicate..."), "editcopy", 0, splitter, SLOT(duplicatePlaylist()), actionCollection(), "duplicatePlaylist");
deleteItemPlaylistAction = new KAction(i18n("Delete"), "editdelete", 0, splitter, SLOT(deleteItemPlaylist()),
actionCollection(), "deleteItemPlaylist");
// tagger menu
new KAction(i18n("Save"), "filesave", 0, splitter, SLOT(saveItem()), actionCollection(), "saveItem");
new KAction(i18n("Delete"), "editdelete", 0, splitter, SLOT(removeSelectedItems()), actionCollection(), "removeItem");
// settings menu
restoreOnLoadAction = new KToggleAction(i18n("Restored Playlists on Load"), 0, actionCollection(), "restoreOnLoad");
......
......@@ -2,37 +2,46 @@
<kpartgui name="juk">
<MenuBar>
<Menu name="file" noMerge="1"><text>&amp;File</text>
<Action name="file_new"/>
<Action name="file_open"/>
<Action name="openDirectory"/>
<Separator/>
<Action name="file_save"/>
<Action name="renamePlaylist"/>
<Action name="duplicatePlaylist"/>
<Action name="deleteItemPlaylist"/>
<Separator/>
<Action name="remove"/>
<Action name="file_save"/>
<Action name="file_saveas"/>
<Separator/>
<Action name="file_quit"/>
</Menu>
<Menu name="view" noMerge="1"><text>&amp;View</text>
<Action name="showEditor"/>
<Separator/>
<Action name="view_redisplay"/>
</Menu>
<Menu name="player"><text>&amp;Player</text>
<Action name="randomPlay"/>
<Separator/>
<Action name="playFile"/>
<Action name="pauseFile"/>
<Action name="stopFile"/>
<Action name="backFile"/>
<Action name="forwardFile"/>
</Menu>
<Menu name="playlist"><text>Play&amp;list</text>
<Action name="createPlaylist"/>
<Action name="openPlaylist"/>
<Action name="savePlaylist"/>
<Action name="saveAsPlaylist"/>
<Action name="renamePlaylist"/>
<Action name="duplicatePlaylist"/>
<Action name="deleteItemPlaylist"/>
<Menu name="playlist"><text>Tagger</text>
<Action name="saveItem"/>
<Action name="removeItem"/>
</Menu>
<Menu name="settings" noMerge="1"><text>&amp;Settings</text>
<Action name="showGenreListEditor"/>
......@@ -43,11 +52,15 @@
<ToolBar name="mainToolBar" noMerge="1"><text>Main Toolbar</text>
<Action name="file_open"/>
<Action name="file_save"/>
<Separator lineSeparator="true"/>
<Action name="edit_cut"/>
<Action name="edit_copy"/>
<Action name="edit_paste"/>
<Separator lineSeparator="true"/>
<Action name="showEditor"/>
</ToolBar>
......@@ -55,7 +68,9 @@
<Action name="playFile"/>
<Action name="pauseFile"/>
<Action name="stopFile"/>
<Separator lineSeparator="false"/>
<Action name="backFile"/>
<Action name="forwardFile"/>
<Action name="trackPositionAction"/>
......
......@@ -155,7 +155,7 @@ public slots:
/**
* Save.
*/
void save() { editor->save(); }
void saveItem() { editor->save(); }
// Edit slots
......
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