changed "DJ Bag" to "Scratchpad" everywhere
This commit is contained in:
fgerlits
parent
238004c55d
commit
0b934b72d2
7 changed files with 59 additions and 59 deletions
|
|
@ -21,7 +21,7 @@
|
|||
#
|
||||
#
|
||||
# Author : $Author: fgerlits $
|
||||
# Version : $Revision: 1.24 $
|
||||
# Version : $Revision: 1.25 $
|
||||
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/Makefile.in,v $
|
||||
#
|
||||
# @configure_input@
|
||||
|
|
@ -186,7 +186,7 @@ G_LIVESUPPORT_OBJS = ${TMP_DIR}/GLiveSupport.o \
|
|||
${TMP_DIR}/AudioClipListWindow.o \
|
||||
${TMP_DIR}/PlaylistListWindow.o \
|
||||
${TMP_DIR}/UploadFileWindow.o \
|
||||
${TMP_DIR}/DjBagWindow.o \
|
||||
${TMP_DIR}/ScratchpadWindow.o \
|
||||
${TMP_DIR}/SimplePlaylistManagementWindow.o \
|
||||
${TMP_DIR}/SchedulerWindow.o \
|
||||
${TMP_DIR}/SchedulePlaylistWindow.o
|
||||
|
|
@ -262,10 +262,10 @@ install: ${SCHEDULER_EXE}
|
|||
-${MAKE} -C ${SCHEDULER_DIR} install_web
|
||||
|
||||
start: ${SCHEDULER_EXE}
|
||||
${MAKE} -C ${SCHEDULER_DIR} start_web
|
||||
${MAKE} -C ${SCHEDULER_DIR} start
|
||||
|
||||
stop: ${SCHEDULER_EXE}
|
||||
${MAKE} -C ${SCHEDULER_DIR} stop_web
|
||||
${MAKE} -C ${SCHEDULER_DIR} stop
|
||||
|
||||
uninstall: ${SCHEDULER_EXE}
|
||||
-${MAKE} -C ${SCHEDULER_DIR} uninstall_web
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
|
||||
Author : $Author: fgerlits $
|
||||
Version : $Revision: 1.24 $
|
||||
Version : $Revision: 1.25 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.cxx,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
|
@ -91,7 +91,7 @@ static const std::string nameAttrName = "name";
|
|||
/*------------------------------------------------------------------------------
|
||||
* The name of the user preference for storing DJ Bag contents
|
||||
*----------------------------------------------------------------------------*/
|
||||
static const std::string djBagContentsKey = "djBagContents";
|
||||
static const std::string scratchpadContentsKey = "scratchpadContents";
|
||||
|
||||
|
||||
|
||||
|
|
@ -261,7 +261,7 @@ GLiveSupport :: login(const std::string & login,
|
|||
{
|
||||
try {
|
||||
sessionId = authentication->login(login, password);
|
||||
loadDjBagContents();
|
||||
loadScratchpadContents();
|
||||
return true;
|
||||
} catch (XmlRpcException &e) {
|
||||
return false;
|
||||
|
|
@ -277,8 +277,8 @@ LiveSupport :: GLiveSupport ::
|
|||
GLiveSupport :: logout(void) throw ()
|
||||
{
|
||||
if (sessionId.get() != 0) {
|
||||
storeDjBagContents();
|
||||
djBagContents->clear();
|
||||
storeScratchpadContents();
|
||||
scratchpadContents->clear();
|
||||
authentication->logout(sessionId);
|
||||
sessionId.reset();
|
||||
}
|
||||
|
|
@ -290,7 +290,7 @@ GLiveSupport :: logout(void) throw ()
|
|||
*----------------------------------------------------------------------------*/
|
||||
void
|
||||
LiveSupport :: GLiveSupport ::
|
||||
GLiveSupport :: storeDjBagContents(void) throw ()
|
||||
GLiveSupport :: storeScratchpadContents(void) throw ()
|
||||
{
|
||||
// just store this as a space-delimited list of ids
|
||||
std::ostringstream prefsString;
|
||||
|
|
@ -298,8 +298,8 @@ GLiveSupport :: storeDjBagContents(void) throw ()
|
|||
GLiveSupport::PlayableList::iterator end;
|
||||
Ptr<Playable>::Ref playable;
|
||||
|
||||
it = djBagContents->begin();
|
||||
end = djBagContents->end();
|
||||
it = scratchpadContents->begin();
|
||||
end = scratchpadContents->end();
|
||||
while (it != end) {
|
||||
playable = *it;
|
||||
prefsString << playable->getId()->getId() << " ";
|
||||
|
|
@ -310,7 +310,7 @@ GLiveSupport :: storeDjBagContents(void) throw ()
|
|||
Ptr<Glib::ustring>::Ref prefsUstring(new Glib::ustring(prefsString.str()));
|
||||
try {
|
||||
authentication->savePreferencesItem(sessionId,
|
||||
djBagContentsKey,
|
||||
scratchpadContentsKey,
|
||||
prefsUstring);
|
||||
} catch (XmlRpcException &e) {
|
||||
// TODO: signal error
|
||||
|
|
@ -324,13 +324,13 @@ GLiveSupport :: storeDjBagContents(void) throw ()
|
|||
*----------------------------------------------------------------------------*/
|
||||
void
|
||||
LiveSupport :: GLiveSupport ::
|
||||
GLiveSupport :: loadDjBagContents(void) throw ()
|
||||
GLiveSupport :: loadScratchpadContents(void) throw ()
|
||||
{
|
||||
Ptr<Glib::ustring>::Ref prefsUstring;
|
||||
|
||||
try {
|
||||
prefsUstring = authentication->loadPreferencesItem(sessionId,
|
||||
djBagContentsKey);
|
||||
scratchpadContentsKey);
|
||||
} catch (XmlRpcException &e) {
|
||||
// TODO: signal error
|
||||
std::cerr << "error loading user preferences: " << e.what()
|
||||
|
|
@ -356,10 +356,10 @@ GLiveSupport :: loadDjBagContents(void) throw ()
|
|||
// the storage
|
||||
if (storage->existsPlaylist(sessionId, id)) {
|
||||
Ptr<Playlist>::Ref playlist = storage->getPlaylist(sessionId, id);
|
||||
djBagContents->push_back(playlist);
|
||||
scratchpadContents->push_back(playlist);
|
||||
} else if (storage->existsAudioClip(sessionId, id)) {
|
||||
Ptr<AudioClip>::Ref clip = storage->getAudioClip(sessionId, id);
|
||||
djBagContents->push_back(clip);
|
||||
scratchpadContents->push_back(clip);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -419,8 +419,8 @@ GLiveSupport :: uploadFile(Ptr<AudioClip>::Ref audioClip)
|
|||
storage->storeAudioClip(sessionId, audioClip);
|
||||
|
||||
// add the uploaded file to the DJ Bag, and update it
|
||||
djBagContents->push_front(audioClip);
|
||||
masterPanel->updateDjBagWindow();
|
||||
scratchpadContents->push_front(audioClip);
|
||||
masterPanel->updateScratchpadWindow();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -505,8 +505,8 @@ GLiveSupport :: savePlaylist(void)
|
|||
|
||||
// add the saved playlist to the DJ Bag, and update it
|
||||
// TODO: if already in the DJ bag, don't add, just pop it to the front
|
||||
djBagContents->push_front(playlist);
|
||||
masterPanel->updateDjBagWindow();
|
||||
scratchpadContents->push_front(playlist);
|
||||
masterPanel->updateScratchpadWindow();
|
||||
|
||||
editedPlaylist.reset();
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
|
||||
Author : $Author: fgerlits $
|
||||
Version : $Revision: 1.22 $
|
||||
Version : $Revision: 1.23 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.h,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
|
@ -100,7 +100,7 @@ class MasterPanelWindow;
|
|||
* respective documentation.
|
||||
*
|
||||
* @author $Author: fgerlits $
|
||||
* @version $Revision: 1.22 $
|
||||
* @version $Revision: 1.23 $
|
||||
* @see LocalizedObject#getBundle(const xmlpp::Element &)
|
||||
* @see AuthenticationClientFactory
|
||||
* @see StorageClientFactory
|
||||
|
|
@ -120,7 +120,7 @@ class GLiveSupport : public LocalizedConfigurable,
|
|||
const std::string> LanguageMap;
|
||||
|
||||
/**
|
||||
* The type of the list for storing the DjBag contents.
|
||||
* The type of the list for storing the Scratchpad contents.
|
||||
* This is a list holding Ptr<Playable>::Ref references.
|
||||
*/
|
||||
typedef std::list<Ptr<Playable>::Ref> PlayableList;
|
||||
|
|
@ -175,7 +175,7 @@ class GLiveSupport : public LocalizedConfigurable,
|
|||
/**
|
||||
* The contents of a DJ Bag, stored as a list.
|
||||
*/
|
||||
Ptr<PlayableList>::Ref djBagContents;
|
||||
Ptr<PlayableList>::Ref scratchpadContents;
|
||||
|
||||
/**
|
||||
* The one and only playlist that may be edited at any one time.
|
||||
|
|
@ -208,13 +208,13 @@ class GLiveSupport : public LocalizedConfigurable,
|
|||
* Store the contents of the DJ Bag as a user preference.
|
||||
*/
|
||||
void
|
||||
storeDjBagContents(void) throw ();
|
||||
storeScratchpadContents(void) throw ();
|
||||
|
||||
/**
|
||||
* Load the contents of the DJ Bag as a user preference.
|
||||
*/
|
||||
void
|
||||
loadDjBagContents(void) throw ();
|
||||
loadScratchpadContents(void) throw ();
|
||||
|
||||
|
||||
public:
|
||||
|
|
@ -223,7 +223,7 @@ class GLiveSupport : public LocalizedConfigurable,
|
|||
*/
|
||||
GLiveSupport(void) throw ()
|
||||
{
|
||||
djBagContents.reset(new PlayableList());
|
||||
scratchpadContents.reset(new PlayableList());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -393,9 +393,9 @@ class GLiveSupport : public LocalizedConfigurable,
|
|||
* @return the list holding the DJ Bag contents.
|
||||
*/
|
||||
Ptr<PlayableList>::Ref
|
||||
getDjBagContents(void) throw ()
|
||||
getScratchpadContents(void) throw ()
|
||||
{
|
||||
return djBagContents;
|
||||
return scratchpadContents;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
|
||||
Author : $Author: fgerlits $
|
||||
Version : $Revision: 1.15 $
|
||||
Version : $Revision: 1.16 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.cxx,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
#include "LiveSupport/Core/TimeConversion.h"
|
||||
#include "UploadFileWindow.h"
|
||||
#include "DjBagWindow.h"
|
||||
#include "ScratchpadWindow.h"
|
||||
#include "MasterPanelWindow.h"
|
||||
|
||||
|
||||
|
|
@ -194,8 +194,8 @@ MasterPanelWindow :: changeLanguage(Ptr<ResourceBundle>::Ref bundle)
|
|||
|
||||
uploadFileButton = wf->createButton(
|
||||
*getResourceUstring("uploadFileButtonLabel"));
|
||||
djBagButton = wf->createButton(
|
||||
*getResourceUstring("djBagButtonLabel"));
|
||||
scratchpadButton = wf->createButton(
|
||||
*getResourceUstring("scratchpadButtonLabel"));
|
||||
simplePlaylistMgmtButton = wf->createButton(
|
||||
*getResourceUstring("simplePlaylistMgmtButtonLabel"));
|
||||
schedulerButton = wf->createButton(
|
||||
|
|
@ -210,7 +210,7 @@ MasterPanelWindow :: changeLanguage(Ptr<ResourceBundle>::Ref bundle)
|
|||
buttonBar->attach(*uploadFileButton, 0, 1, 0, 1,
|
||||
Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL,
|
||||
5, 0);
|
||||
buttonBar->attach(*djBagButton, 1, 2, 0, 1,
|
||||
buttonBar->attach(*scratchpadButton, 1, 2, 0, 1,
|
||||
Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL,
|
||||
5, 0);
|
||||
buttonBar->attach(*simplePlaylistMgmtButton, 2, 3, 0, 1,
|
||||
|
|
@ -223,8 +223,8 @@ MasterPanelWindow :: changeLanguage(Ptr<ResourceBundle>::Ref bundle)
|
|||
// re-bind events to the buttons
|
||||
uploadFileButton->signal_clicked().connect(sigc::mem_fun(*this,
|
||||
&MasterPanelWindow::onUploadFileButtonClicked));
|
||||
djBagButton->signal_clicked().connect(sigc::mem_fun(*this,
|
||||
&MasterPanelWindow::onDjBagButtonClicked));
|
||||
scratchpadButton->signal_clicked().connect(sigc::mem_fun(*this,
|
||||
&MasterPanelWindow::onScratchpadButtonClicked));
|
||||
simplePlaylistMgmtButton->signal_clicked().connect(
|
||||
sigc::mem_fun(*this,
|
||||
&MasterPanelWindow::onSimplePlaylistMgmtButtonClicked));
|
||||
|
|
@ -310,25 +310,25 @@ MasterPanelWindow :: onUploadFileButtonClicked(void) throw ()
|
|||
* The event when the DJ Bag button has been clicked.
|
||||
*----------------------------------------------------------------------------*/
|
||||
void
|
||||
MasterPanelWindow :: onDjBagButtonClicked(void) throw ()
|
||||
MasterPanelWindow :: onScratchpadButtonClicked(void) throw ()
|
||||
{
|
||||
if (!djBagWindow.get()) {
|
||||
if (!scratchpadWindow.get()) {
|
||||
Ptr<ResourceBundle>::Ref bundle;
|
||||
try {
|
||||
bundle = getBundle("djBagWindow");
|
||||
bundle = getBundle("scratchpadWindow");
|
||||
} catch (std::invalid_argument &e) {
|
||||
std::cerr << e.what() << std::endl;
|
||||
return;
|
||||
}
|
||||
|
||||
djBagWindow.reset(new DjBagWindow(gLiveSupport, bundle));
|
||||
scratchpadWindow.reset(new ScratchpadWindow(gLiveSupport, bundle));
|
||||
}
|
||||
|
||||
if (!djBagWindow->is_visible()) {
|
||||
djBagWindow->show();
|
||||
if (!scratchpadWindow->is_visible()) {
|
||||
scratchpadWindow->show();
|
||||
}
|
||||
|
||||
djBagWindow->showContents();
|
||||
scratchpadWindow->showContents();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -390,7 +390,7 @@ MasterPanelWindow :: showAnonymousUI(void) throw ()
|
|||
show_all();
|
||||
buttonBar->hide();
|
||||
uploadFileButton->hide();
|
||||
djBagButton->hide();
|
||||
scratchpadButton->hide();
|
||||
simplePlaylistMgmtButton->hide();
|
||||
schedulerButton->hide();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
|
||||
Author : $Author: maroy $
|
||||
Version : $Revision: 1.9 $
|
||||
Author : $Author: fgerlits $
|
||||
Version : $Revision: 1.10 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/MasterPanelWindow.h,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
|
||||
#include "GLiveSupport.h"
|
||||
#include "MasterPanelUserInfoWidget.h"
|
||||
#include "DjBagWindow.h"
|
||||
#include "ScratchpadWindow.h"
|
||||
#include "SimplePlaylistManagementWindow.h"
|
||||
#include "SchedulerWindow.h"
|
||||
|
||||
|
|
@ -87,8 +87,8 @@ using namespace LiveSupport::Widgets;
|
|||
* +--------------------------------------------------+
|
||||
* </code></pre>
|
||||
*
|
||||
* @author $Author: maroy $
|
||||
* @version $Revision: 1.9 $
|
||||
* @author $Author: fgerlits $
|
||||
* @version $Revision: 1.10 $
|
||||
*/
|
||||
class MasterPanelWindow : public Gtk::Window, public LocalizedObject
|
||||
{
|
||||
|
|
@ -187,7 +187,7 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
|
|||
/**
|
||||
* The button to invoke the DJ Bag window.
|
||||
*/
|
||||
Button * djBagButton;
|
||||
Button * scratchpadButton;
|
||||
|
||||
/**
|
||||
* The button to invoke the Simple Playlist Management Window.
|
||||
|
|
@ -207,7 +207,7 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
|
|||
/**
|
||||
* The one and only DJ Bag window.
|
||||
*/
|
||||
Ptr<DjBagWindow>::Ref djBagWindow;
|
||||
Ptr<ScratchpadWindow>::Ref scratchpadWindow;
|
||||
|
||||
/**
|
||||
* The one and only simple playlist management window.
|
||||
|
|
@ -258,7 +258,7 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
|
|||
* pressed.
|
||||
*/
|
||||
virtual void
|
||||
onDjBagButtonClicked(void) throw ();
|
||||
onScratchpadButtonClicked(void) throw ();
|
||||
|
||||
/**
|
||||
* Function to catch the event of the Simple Playlist
|
||||
|
|
@ -322,10 +322,10 @@ class MasterPanelWindow : public Gtk::Window, public LocalizedObject
|
|||
* Update the DJ Bag window.
|
||||
*/
|
||||
void
|
||||
updateDjBagWindow(void) throw ()
|
||||
updateScratchpadWindow(void) throw ()
|
||||
{
|
||||
// this will create, open and display the window.
|
||||
onDjBagButtonClicked();
|
||||
onScratchpadButtonClicked();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ hu:table
|
|||
loginButtonLabel:string { "bejelentkezés" }
|
||||
logoutButtonLabel:string { "kijelentkezés" }
|
||||
uploadFileButtonLabel:string { "file feltöltés" }
|
||||
djBagButtonLabel:string { "praktikus csupor" }
|
||||
scratchpadButtonLabel:string { "praktikus csupor" }
|
||||
simplePlaylistMgmtButtonLabel:string { "egyszerű playlist kezelés" }
|
||||
schedulerButtonLabel:string { "időzítő" }
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ hu:table
|
|||
closeButtonLabel:string { "bezár" }
|
||||
}
|
||||
|
||||
djBagWindow:table
|
||||
scratchpadWindow:table
|
||||
{
|
||||
windowTitle:string { "LiveSupport Praktikus Csupor" }
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ root:table
|
|||
loginButtonLabel:string { "log in" }
|
||||
logoutButtonLabel:string { "log out" }
|
||||
uploadFileButtonLabel:string { "upload file" }
|
||||
djBagButtonLabel:string { "scratchpad" }
|
||||
scratchpadButtonLabel:string { "scratchpad" }
|
||||
simplePlaylistMgmtButtonLabel:string { "simple playlist management" }
|
||||
schedulerButtonLabel:string { "scheduler" }
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ root:table
|
|||
closeButtonLabel:string { "close" }
|
||||
}
|
||||
|
||||
djBagWindow:table
|
||||
scratchpadWindow:table
|
||||
{
|
||||
windowTitle:string { "LiveSupport Scratchpad" }
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue