Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added "edit playlist" menu item to Scratchpad window

Browse source
This commit is contained in:
fgerlits 2005-07-15 15:43:19 +00:00
parent 5bcaae0a29
commit b08dba6b5c
5 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
livesupport/products/gLiveSupport/src/GLiveSupport.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.56 $ Version : $Revision: 1.57 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -646,6 +646,8 @@ GLiveSupport :: openPlaylistForEditing(Ptr<UniqueId>::Ref playlistId)
editedPlaylist = storage->editPlaylist(sessionId, playlistId); editedPlaylist = storage->editPlaylist(sessionId, playlistId);
editedPlaylist->createSavedCopy(); editedPlaylist->createSavedCopy();
masterPanel->updateSimplePlaylistMgmtWindow();
return editedPlaylist; return editedPlaylist;
} }

20
livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.25 $ Version : $Revision: 1.26 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -187,6 +187,10 @@ ScratchpadWindow :: ScratchpadWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
// register the signal handlers for the popup menu // register the signal handlers for the popup menu
try{ try{
playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("editPlaylistMenuItem"),
sigc::mem_fun(*this,
&ScratchpadWindow::onEditPlaylist)));
playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem( playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("addToPlaylistMenuItem"), *getResourceUstring("addToPlaylistMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
@ -283,7 +287,7 @@ ScratchpadWindow :: showContents(void) throw ()
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Event handler for the create playlist button getting clicked. * Event handler for the add to playlist button getting clicked.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
ScratchpadWindow :: onAddToPlaylistButtonClicked (void) throw () ScratchpadWindow :: onAddToPlaylistButtonClicked (void) throw ()
@ -495,6 +499,18 @@ ScratchpadWindow :: removeItem(Ptr<const UniqueId>::Ref id) throw ()
} }
/*------------------------------------------------------------------------------
* Event handler for the Edit Playlist menu item selected from the
* entry conext menu
*----------------------------------------------------------------------------*/
void
ScratchpadWindow :: onEditPlaylist(void) throw ()
{
Ptr<Playable>::Ref playable = currentRow[modelColumns.playableColumn];
gLiveSupport->openPlaylistForEditing(playable->getId());
}
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Event handler for the Add To Playlist menu item selected from the * Event handler for the Add To Playlist menu item selected from the
* entry conext menu * entry conext menu

13
livesupport/products/gLiveSupport/src/ScratchpadWindow.h
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.9 $ Version : $Revision: 1.10 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/ScratchpadWindow.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/ScratchpadWindow.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -73,7 +73,7 @@ using namespace LiveSupport::Widgets;
* playlists. * playlists.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.9 $ * @version $Revision: 1.10 $
*/ */
class ScratchpadWindow : public WhiteWindow, class ScratchpadWindow : public WhiteWindow,
public LocalizedObject public LocalizedObject
@ -87,7 +87,7 @@ class ScratchpadWindow : public WhiteWindow,
* Lists one clip per row. * Lists one clip per row.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.9 $ * @version $Revision: 1.10 $
*/ */
class ModelColumns : public PlayableTreeModelColumnRecord class ModelColumns : public PlayableTreeModelColumnRecord
{ {
@ -243,6 +243,13 @@ class ScratchpadWindow : public WhiteWindow,
virtual void virtual void
onDownItem(void) throw (); onDownItem(void) throw ();
/**
* Signal handler for the "edit playlist" menu item selected from
* the entry context menu.
*/
virtual void
onEditPlaylist(void) throw ();
/** /**
* Signal handler for the "add to playlist" menu item selected from * Signal handler for the "add to playlist" menu item selected from
* the entry context menu. * the entry context menu.

6
livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.20 $ Version : $Revision: 1.21 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -294,6 +294,7 @@ SimplePlaylistManagementWindow :: showContents(void) throw ()
playlist = gLiveSupport->getEditedPlaylist(); playlist = gLiveSupport->getEditedPlaylist();
if (playlist) { if (playlist) {
nameEntry->set_text(*playlist->getTitle());
entriesModel->clear(); entriesModel->clear();
rowNumber = 0; rowNumber = 0;
for (it = playlist->begin(); it != playlist->end(); ++it) { for (it = playlist->begin(); it != playlist->end(); ++it) {
@ -380,6 +381,9 @@ SimplePlaylistManagementWindow :: onFadeInfoEdited(
return; // should never happen return; // should never happen
} }
Ptr<Glib::ustring>::Ref title(new Glib::ustring(nameEntry->get_text()));
playlist->setTitle(title); // this is stupid; TODO: fix it
showContents(); showContents();
} }

3
livesupport/products/gLiveSupport/var/root.txt
View file

@ -60,8 +60,9 @@ root:table
upMenuItem:string { "Move _Up" } upMenuItem:string { "Move _Up" }
downMenuItem:string { "Move D_own" } downMenuItem:string { "Move D_own" }
removeMenuItem:string { "_Remove" } removeMenuItem:string { "_Remove" }
editPlaylistMenuItem:string { "_Edit" }
addToPlaylistMenuItem:string { "_Add To Playlist" } addToPlaylistMenuItem:string { "_Add To Playlist" }
schedulePlaylistMenuItem:string { "_Schedule Playlist" } schedulePlaylistMenuItem:string { "_Schedule" }
cueMenuItem:string { "Pre_view" } cueMenuItem:string { "Pre_view" }
addToLiveModeMenuItem:string { "Add To _Live Mode" } addToLiveModeMenuItem:string { "Add To _Live Mode" }
} }