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

replace "DJ Bag" with "Scratchpad" in a couple more places

Browse source
This commit is contained in:
fgerlits 2005-04-11 14:27:50 +00:00
parent 890704765b
commit 2d4269991c
6 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
livesupport/products/gLiveSupport/src/GLiveSupport.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/GLiveSupport.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -89,7 +89,7 @@ static const std::string localeAttrName = "locale";
static const std::string nameAttrName = "name"; static const std::string nameAttrName = "name";
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* The name of the user preference for storing DJ Bag contents * The name of the user preference for storing Scratchpad contents
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
static const std::string scratchpadContentsKey = "scratchpadContents"; static const std::string scratchpadContentsKey = "scratchpadContents";
@ -286,7 +286,7 @@ GLiveSupport :: logout(void) throw ()
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Store the DJ Bag contents as a user preference * Store the Scratchpad contents as a user preference
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
LiveSupport :: GLiveSupport :: LiveSupport :: GLiveSupport ::
@ -320,7 +320,7 @@ GLiveSupport :: storeScratchpadContents(void) throw ()
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Load the DJ Bag contents from a user preference * Load the Scratchpad contents from a user preference
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
LiveSupport :: GLiveSupport :: LiveSupport :: GLiveSupport ::
@ -418,7 +418,7 @@ GLiveSupport :: uploadFile(Ptr<AudioClip>::Ref audioClip)
{ {
storage->storeAudioClip(sessionId, audioClip); storage->storeAudioClip(sessionId, audioClip);
// add the uploaded file to the DJ Bag, and update it // add the uploaded file to the Scratchpad, and update it
scratchpadContents->push_front(audioClip); scratchpadContents->push_front(audioClip);
masterPanel->updateScratchpadWindow(); masterPanel->updateScratchpadWindow();
} }
@ -503,8 +503,8 @@ GLiveSupport :: savePlaylist(void)
Ptr<Playlist>::Ref playlist = storage->getPlaylist(sessionId, Ptr<Playlist>::Ref playlist = storage->getPlaylist(sessionId,
editedPlaylist->getId()); editedPlaylist->getId());
// add the saved playlist to the DJ Bag, and update it // add the saved playlist to the Scratchpad, and update it
// TODO: if already in the DJ bag, don't add, just pop it to the front // TODO: if already in the Scratchpad, don't add, just pop it to the front
scratchpadContents->push_front(playlist); scratchpadContents->push_front(playlist);
masterPanel->updateScratchpadWindow(); masterPanel->updateScratchpadWindow();

14
livesupport/products/gLiveSupport/src/GLiveSupport.h
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.23 $ Version : $Revision: 1.24 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -100,7 +100,7 @@ class MasterPanelWindow;
* respective documentation. * respective documentation.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.23 $ * @version $Revision: 1.24 $
* @see LocalizedObject#getBundle(const xmlpp::Element &) * @see LocalizedObject#getBundle(const xmlpp::Element &)
* @see AuthenticationClientFactory * @see AuthenticationClientFactory
* @see StorageClientFactory * @see StorageClientFactory
@ -173,7 +173,7 @@ class GLiveSupport : public LocalizedConfigurable,
Ptr<MasterPanelWindow>::Ref masterPanel; Ptr<MasterPanelWindow>::Ref masterPanel;
/** /**
* The contents of a DJ Bag, stored as a list. * The contents of a Scratchpad, stored as a list.
*/ */
Ptr<PlayableList>::Ref scratchpadContents; Ptr<PlayableList>::Ref scratchpadContents;
@ -205,13 +205,13 @@ class GLiveSupport : public LocalizedConfigurable,
throw (std::invalid_argument); throw (std::invalid_argument);
/** /**
* Store the contents of the DJ Bag as a user preference. * Store the contents of the Scratchpad as a user preference.
*/ */
void void
storeScratchpadContents(void) throw (); storeScratchpadContents(void) throw ();
/** /**
* Load the contents of the DJ Bag as a user preference. * Load the contents of the Scratchpad as a user preference.
*/ */
void void
loadScratchpadContents(void) throw (); loadScratchpadContents(void) throw ();
@ -388,9 +388,9 @@ class GLiveSupport : public LocalizedConfigurable,
throw (XmlRpcException); throw (XmlRpcException);
/** /**
* Return the DJ Bag contents. * Return the Scratchpad contents.
* *
* @return the list holding the DJ Bag contents. * @return the list holding the Scratchpad contents.
*/ */
Ptr<PlayableList>::Ref Ptr<PlayableList>::Ref
getScratchpadContents(void) throw () getScratchpadContents(void) throw ()

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

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.16 $ Version : $Revision: 1.17 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -307,7 +307,7 @@ MasterPanelWindow :: onUploadFileButtonClicked(void) throw ()
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* The event when the DJ Bag button has been clicked. * The event when the Scratchpad button has been clicked.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
MasterPanelWindow :: onScratchpadButtonClicked(void) throw () MasterPanelWindow :: onScratchpadButtonClicked(void) throw ()

12
livesupport/products/gLiveSupport/src/MasterPanelWindow.h
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.10 $ Version : $Revision: 1.11 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -88,7 +88,7 @@ using namespace LiveSupport::Widgets;
* </code></pre> * </code></pre>
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.10 $ * @version $Revision: 1.11 $
*/ */
class MasterPanelWindow : public Gtk::Window, public LocalizedObject class MasterPanelWindow : public Gtk::Window, public LocalizedObject
{ {
@ -185,7 +185,7 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
Button * uploadFileButton; Button * uploadFileButton;
/** /**
* The button to invoke the DJ Bag window. * The button to invoke the Scratchpad window.
*/ */
Button * scratchpadButton; Button * scratchpadButton;
@ -205,7 +205,7 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
Ptr<GLiveSupport>::Ref gLiveSupport; Ptr<GLiveSupport>::Ref gLiveSupport;
/** /**
* The one and only DJ Bag window. * The one and only Scratchpad window.
*/ */
Ptr<ScratchpadWindow>::Ref scratchpadWindow; Ptr<ScratchpadWindow>::Ref scratchpadWindow;
@ -254,7 +254,7 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
onUploadFileButtonClicked(void) throw (); onUploadFileButtonClicked(void) throw ();
/** /**
* Function to catch the event of the DJ Bag button being * Function to catch the event of the Scratchpad button being
* pressed. * pressed.
*/ */
virtual void virtual void
@ -319,7 +319,7 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
showLoggedInUI(void) throw (); showLoggedInUI(void) throw ();
/** /**
* Update the DJ Bag window. * Update the Scratchpad window.
*/ */
void void
updateScratchpadWindow(void) throw () updateScratchpadWindow(void) throw ()

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

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.1 $ Version : $Revision: 1.2 $
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 $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -470,7 +470,7 @@ ScratchpadWindow :: onDeleteItem(void) throw ()
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Remove an item from the dj bag * Remove an item from the Scratchpad
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
ScratchpadWindow :: removeItem(Ptr<const UniqueId>::Ref id) throw () ScratchpadWindow :: removeItem(Ptr<const UniqueId>::Ref id) throw ()
@ -496,7 +496,7 @@ ScratchpadWindow :: removeItem(Ptr<const UniqueId>::Ref id) throw ()
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Delete an item from storage, and remove it from the dj bag * Delete an item from storage, and remove it from the Scratchpad
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
ScratchpadWindow :: deleteItem(Ptr<Playable>::Ref playable) ScratchpadWindow :: deleteItem(Ptr<Playable>::Ref playable)

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

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.1 $ Version : $Revision: 1.2 $
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 $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -68,11 +68,11 @@ using namespace LiveSupport::Widgets;
/* =============================================================== data types */ /* =============================================================== data types */
/** /**
* The DJ Bag window, showing recent and relevant audio clips and * The Scratchpad window, showing recent and relevant audio clips and
* playlists. * playlists.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.1 $ * @version $Revision: 1.2 $
*/ */
class ScratchpadWindow : public WhiteWindow, public LocalizedObject class ScratchpadWindow : public WhiteWindow, public LocalizedObject
{ {
@ -85,7 +85,7 @@ class ScratchpadWindow : public WhiteWindow, public LocalizedObject
* Lists one clip per row. * Lists one clip per row.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.1 $ * @version $Revision: 1.2 $
*/ */
class ModelColumns : public ZebraTreeModelColumnRecord class ModelColumns : public ZebraTreeModelColumnRecord
{ {
@ -281,7 +281,7 @@ class ScratchpadWindow : public WhiteWindow, public LocalizedObject
onPlayItem(void) throw (); onPlayItem(void) throw ();
/** /**
* Delete an item from the storage and remove it from the dj bag. * Delete an item from the storage and remove it from the Scratchpad.
* *
* @param playable the Playable object to delete and remove. * @param playable the Playable object to delete and remove.
* @exception XmlRpcException on XML-RPC errors. * @exception XmlRpcException on XML-RPC errors.
@ -308,13 +308,13 @@ class ScratchpadWindow : public WhiteWindow, public LocalizedObject
~ScratchpadWindow(void) throw (); ~ScratchpadWindow(void) throw ();
/** /**
* Update the window contents, with the contents of the dj bag. * Update the window contents, with the contents of the Scratchpad.
*/ */
void void
showContents(void) throw (); showContents(void) throw ();
/** /**
* Remove an item from the dj bag. * Remove an item from the Scratchpad.
* *
* @param id the id of the item to remove. * @param id the id of the item to remove.
*/ */