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

renamed DjBagWindow to ScratchpadWindow

Browse source
This commit is contained in:
fgerlits 2005-04-11 13:22:42 +00:00
parent 0b934b72d2
commit 277b4bc6b7
2 changed files with 76 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

128
livesupport/products/gLiveSupport/src/DjBagWindow.cxx → livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx
View file

@ -22,8 +22,8 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.14 $ Version : $Revision: 1.1 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/Attic/DjBagWindow.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -38,7 +38,7 @@
#include "LiveSupport/Widgets/WidgetFactory.h" #include "LiveSupport/Widgets/WidgetFactory.h"
#include "SchedulePlaylistWindow.h" #include "SchedulePlaylistWindow.h"
#include "DjBagWindow.h" #include "ScratchpadWindow.h"
using namespace Glib; using namespace Glib;
@ -61,7 +61,7 @@ using namespace LiveSupport::GLiveSupport;
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Constructor. * Constructor.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
DjBagWindow :: DjBagWindow (Ptr<GLiveSupport>::Ref gLiveSupport, ScratchpadWindow :: ScratchpadWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
Ptr<ResourceBundle>::Ref bundle) Ptr<ResourceBundle>::Ref bundle)
throw () throw ()
: WhiteWindow("", : WhiteWindow("",
@ -91,23 +91,23 @@ DjBagWindow :: DjBagWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
playButton->set_name("playButton"); playButton->set_name("playButton");
playButton->signal_clicked().connect(sigc::mem_fun(*this, playButton->signal_clicked().connect(sigc::mem_fun(*this,
&DjBagWindow::onPlayButtonClicked)); &ScratchpadWindow::onPlayButtonClicked));
pauseButton->set_name("pauseButton"); pauseButton->set_name("pauseButton");
pauseButton->signal_clicked().connect(sigc::mem_fun(*this, pauseButton->signal_clicked().connect(sigc::mem_fun(*this,
&DjBagWindow::onPauseButtonClicked)); &ScratchpadWindow::onPauseButtonClicked));
stopButton->set_name("stopButton"); stopButton->set_name("stopButton");
stopButton->signal_clicked().connect(sigc::mem_fun(*this, stopButton->signal_clicked().connect(sigc::mem_fun(*this,
&DjBagWindow::onStopButtonClicked)); &ScratchpadWindow::onStopButtonClicked));
clearListButton->set_name("clearListButton"); clearListButton->set_name("clearListButton");
clearListButton->signal_clicked().connect(sigc::mem_fun(*this, clearListButton->signal_clicked().connect(sigc::mem_fun(*this,
&DjBagWindow::onClearListButtonClicked)); &ScratchpadWindow::onClearListButtonClicked));
removeButton->set_name("removeButton"); removeButton->set_name("removeButton");
removeButton->signal_clicked().connect(sigc::mem_fun(*this, removeButton->signal_clicked().connect(sigc::mem_fun(*this,
&DjBagWindow::onRemoveItem)); &ScratchpadWindow::onRemoveItem));
add(vBox); add(vBox);
@ -130,7 +130,7 @@ DjBagWindow :: DjBagWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
// register the signal handler for treeview entries being clicked // register the signal handler for treeview entries being clicked
treeView->signal_button_press_event().connect_notify(sigc::mem_fun(*this, treeView->signal_button_press_event().connect_notify(sigc::mem_fun(*this,
&DjBagWindow::onEntryClicked)); &ScratchpadWindow::onEntryClicked));
// Add the TreeView, inside a ScrolledWindow, with the button underneath: // Add the TreeView, inside a ScrolledWindow, with the button underneath:
scrolledWindow.add(*treeView); scrolledWindow.add(*treeView);
@ -161,27 +161,27 @@ DjBagWindow :: DjBagWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem( audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("addToPlaylistMenuItem"), *getResourceUstring("addToPlaylistMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
&DjBagWindow::onAddToPlaylist))); &ScratchpadWindow::onAddToPlaylist)));
audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem( audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("upMenuItem"), *getResourceUstring("upMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
&DjBagWindow::onUpItem))); &ScratchpadWindow::onUpItem)));
audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem( audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("downMenuItem"), *getResourceUstring("downMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
&DjBagWindow::onDownItem))); &ScratchpadWindow::onDownItem)));
audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem( audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("removeMenuItem"), *getResourceUstring("removeMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
&DjBagWindow::onRemoveItem))); &ScratchpadWindow::onRemoveItem)));
audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem( audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("deleteMenuItem"), *getResourceUstring("deleteMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
&DjBagWindow::onDeleteItem))); &ScratchpadWindow::onDeleteItem)));
audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem( audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("playMenuItem"), *getResourceUstring("playMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
&DjBagWindow::onPlayItem))); &ScratchpadWindow::onPlayItem)));
audioClipMenu->accelerate(*this); audioClipMenu->accelerate(*this);
// create the right-click entry context menu for playlists // create the right-click entry context menu for playlists
@ -191,31 +191,31 @@ DjBagWindow :: DjBagWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
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,
&DjBagWindow::onAddToPlaylist))); &ScratchpadWindow::onAddToPlaylist)));
playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem( playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("schedulePlaylistMenuItem"), *getResourceUstring("schedulePlaylistMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
&DjBagWindow::onSchedulePlaylist))); &ScratchpadWindow::onSchedulePlaylist)));
playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem( playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("upMenuItem"), *getResourceUstring("upMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
&DjBagWindow::onUpItem))); &ScratchpadWindow::onUpItem)));
playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem( playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("downMenuItem"), *getResourceUstring("downMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
&DjBagWindow::onDownItem))); &ScratchpadWindow::onDownItem)));
playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem( playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("removeMenuItem"), *getResourceUstring("removeMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
&DjBagWindow::onRemoveItem))); &ScratchpadWindow::onRemoveItem)));
playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem( playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("deleteMenuItem"), *getResourceUstring("deleteMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
&DjBagWindow::onDeleteItem))); &ScratchpadWindow::onDeleteItem)));
playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem( playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("playMenuItem"), *getResourceUstring("playMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
&DjBagWindow::onPlayItem))); &ScratchpadWindow::onPlayItem)));
playlistMenu->accelerate(*this); playlistMenu->accelerate(*this);
// show // show
@ -234,17 +234,17 @@ DjBagWindow :: DjBagWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
* Show all audio clips * Show all audio clips
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: showContents(void) throw () ScratchpadWindow :: showContents(void) throw ()
{ {
Ptr<GLiveSupport::PlayableList>::Ref djBagContents; Ptr<GLiveSupport::PlayableList>::Ref scratchpadContents;
GLiveSupport::PlayableList::iterator it; GLiveSupport::PlayableList::iterator it;
GLiveSupport::PlayableList::iterator end; GLiveSupport::PlayableList::iterator end;
Ptr<Playable>::Ref playable; Ptr<Playable>::Ref playable;
Gtk::TreeModel::Row row; Gtk::TreeModel::Row row;
djBagContents = gLiveSupport->getDjBagContents(); scratchpadContents = gLiveSupport->getScratchpadContents();
it = djBagContents->begin(); it = scratchpadContents->begin();
end = djBagContents->end(); end = scratchpadContents->end();
treeModel->clear(); treeModel->clear();
int rowNumber = 0; int rowNumber = 0;
@ -278,7 +278,7 @@ DjBagWindow :: showContents(void) throw ()
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Destructor. * Destructor.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
DjBagWindow :: ~DjBagWindow (void) throw () ScratchpadWindow :: ~ScratchpadWindow (void) throw ()
{ {
} }
@ -287,11 +287,11 @@ DjBagWindow :: ~DjBagWindow (void) throw ()
* Event handler for the clear list button getting clicked. * Event handler for the clear list button getting clicked.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: onClearListButtonClicked (void) throw () ScratchpadWindow :: onClearListButtonClicked (void) throw ()
{ {
Ptr<GLiveSupport::PlayableList>::Ref djBagContents Ptr<GLiveSupport::PlayableList>::Ref
= gLiveSupport->getDjBagContents(); scratchpadContents = gLiveSupport->getScratchpadContents();
djBagContents->clear(); scratchpadContents->clear();
showContents(); showContents();
} }
@ -300,7 +300,7 @@ DjBagWindow :: onClearListButtonClicked (void) throw ()
* Event handler for an entry being clicked in the list * Event handler for an entry being clicked in the list
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: onEntryClicked (GdkEventButton * event) throw () ScratchpadWindow :: onEntryClicked (GdkEventButton * event) throw ()
{ {
if (event->type == GDK_BUTTON_PRESS && event->button == 3) { if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
// only show the context menu, if something is already selected // only show the context menu, if something is already selected
@ -334,7 +334,7 @@ DjBagWindow :: onEntryClicked (GdkEventButton * event) throw ()
* Event handler for the Remove menu item selected from the entry conext menu * Event handler for the Remove menu item selected from the entry conext menu
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: onRemoveItem(void) throw () ScratchpadWindow :: onRemoveItem(void) throw ()
{ {
Glib::RefPtr<Gtk::TreeView::Selection> refSelection = Glib::RefPtr<Gtk::TreeView::Selection> refSelection =
treeView->get_selection(); treeView->get_selection();
@ -355,7 +355,7 @@ DjBagWindow :: onRemoveItem(void) throw ()
* Event handler for the Up menu item selected from the entry conext menu * Event handler for the Up menu item selected from the entry conext menu
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: onUpItem(void) throw () ScratchpadWindow :: onUpItem(void) throw ()
{ {
Glib::RefPtr<Gtk::TreeView::Selection> refSelection = Glib::RefPtr<Gtk::TreeView::Selection> refSelection =
treeView->get_selection(); treeView->get_selection();
@ -365,24 +365,24 @@ DjBagWindow :: onUpItem(void) throw ()
if (iter) { if (iter) {
Ptr<Playable>::Ref playable = (*iter)[modelColumns.playableColumn]; Ptr<Playable>::Ref playable = (*iter)[modelColumns.playableColumn];
Ptr<GLiveSupport::PlayableList>::Ref djBagContents; Ptr<GLiveSupport::PlayableList>::Ref scratchpadContents;
GLiveSupport::PlayableList::iterator it; GLiveSupport::PlayableList::iterator it;
GLiveSupport::PlayableList::iterator end; GLiveSupport::PlayableList::iterator end;
djBagContents = gLiveSupport->getDjBagContents(); scratchpadContents = gLiveSupport->getScratchpadContents();
it = djBagContents->begin(); it = scratchpadContents->begin();
end = djBagContents->end(); end = scratchpadContents->end();
while (it != end) { while (it != end) {
Ptr<Playable>::Ref p= *it; Ptr<Playable>::Ref p= *it;
if (*p->getId() == *playable->getId()) { if (*p->getId() == *playable->getId()) {
// move one up, and insert the same before that // move one up, and insert the same before that
if (it == djBagContents->begin()) { if (it == scratchpadContents->begin()) {
break; break;
} }
djBagContents->insert(--it, playable); scratchpadContents->insert(--it, playable);
// move back to what we've found, and erase it // move back to what we've found, and erase it
djBagContents->erase(++it); scratchpadContents->erase(++it);
showContents(); showContents();
break; break;
@ -400,7 +400,7 @@ DjBagWindow :: onUpItem(void) throw ()
* Event handler for the Down menu item selected from the entry conext menu * Event handler for the Down menu item selected from the entry conext menu
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: onDownItem(void) throw () ScratchpadWindow :: onDownItem(void) throw ()
{ {
Glib::RefPtr<Gtk::TreeView::Selection> refSelection = Glib::RefPtr<Gtk::TreeView::Selection> refSelection =
treeView->get_selection(); treeView->get_selection();
@ -410,13 +410,13 @@ DjBagWindow :: onDownItem(void) throw ()
if (iter) { if (iter) {
Ptr<Playable>::Ref playable = (*iter)[modelColumns.playableColumn]; Ptr<Playable>::Ref playable = (*iter)[modelColumns.playableColumn];
Ptr<GLiveSupport::PlayableList>::Ref djBagContents; Ptr<GLiveSupport::PlayableList>::Ref scratchpadContents;
GLiveSupport::PlayableList::iterator it; GLiveSupport::PlayableList::iterator it;
GLiveSupport::PlayableList::iterator end; GLiveSupport::PlayableList::iterator end;
djBagContents = gLiveSupport->getDjBagContents(); scratchpadContents = gLiveSupport->getScratchpadContents();
it = djBagContents->begin(); it = scratchpadContents->begin();
end = djBagContents->end(); end = scratchpadContents->end();
while (it != end) { while (it != end) {
Ptr<Playable>::Ref p= *it; Ptr<Playable>::Ref p= *it;
@ -426,11 +426,11 @@ DjBagWindow :: onDownItem(void) throw ()
if (it == end) { if (it == end) {
break; break;
} }
djBagContents->insert(++it, playable); scratchpadContents->insert(++it, playable);
// move back to what we've found, and erase it // move back to what we've found, and erase it
--it; --it;
--it; --it;
djBagContents->erase(--it); scratchpadContents->erase(--it);
showContents(); showContents();
break; break;
@ -448,7 +448,7 @@ DjBagWindow :: onDownItem(void) throw ()
* Event handler for the Delete menu item selected from the entry conext menu * Event handler for the Delete menu item selected from the entry conext menu
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: onDeleteItem(void) throw () ScratchpadWindow :: onDeleteItem(void) throw ()
{ {
Glib::RefPtr<Gtk::TreeView::Selection> refSelection = Glib::RefPtr<Gtk::TreeView::Selection> refSelection =
treeView->get_selection(); treeView->get_selection();
@ -473,20 +473,20 @@ DjBagWindow :: onDeleteItem(void) throw ()
* Remove an item from the dj bag * Remove an item from the dj bag
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: removeItem(Ptr<const UniqueId>::Ref id) throw () ScratchpadWindow :: removeItem(Ptr<const UniqueId>::Ref id) throw ()
{ {
Ptr<GLiveSupport::PlayableList>::Ref djBagContents; Ptr<GLiveSupport::PlayableList>::Ref scratchpadContents;
GLiveSupport::PlayableList::iterator it; GLiveSupport::PlayableList::iterator it;
GLiveSupport::PlayableList::iterator end; GLiveSupport::PlayableList::iterator end;
djBagContents = gLiveSupport->getDjBagContents(); scratchpadContents = gLiveSupport->getScratchpadContents();
it = djBagContents->begin(); it = scratchpadContents->begin();
end = djBagContents->end(); end = scratchpadContents->end();
while (it != end) { while (it != end) {
Ptr<Playable>::Ref playable = *it; Ptr<Playable>::Ref playable = *it;
if (*playable->getId() == *id) { if (*playable->getId() == *id) {
djBagContents->erase(it); scratchpadContents->erase(it);
break; break;
} }
@ -499,7 +499,7 @@ DjBagWindow :: 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 dj bag
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: deleteItem(Ptr<Playable>::Ref playable) ScratchpadWindow :: deleteItem(Ptr<Playable>::Ref playable)
throw (XmlRpcException) throw (XmlRpcException)
{ {
removeItem(playable->getId()); removeItem(playable->getId());
@ -512,7 +512,7 @@ DjBagWindow :: deleteItem(Ptr<Playable>::Ref playable)
* entry conext menu * entry conext menu
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: onAddToPlaylist(void) throw () ScratchpadWindow :: onAddToPlaylist(void) throw ()
{ {
Glib::RefPtr<Gtk::TreeView::Selection> refSelection = Glib::RefPtr<Gtk::TreeView::Selection> refSelection =
treeView->get_selection(); treeView->get_selection();
@ -533,7 +533,7 @@ DjBagWindow :: onAddToPlaylist(void) throw ()
* entry conext menu * entry conext menu
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: onSchedulePlaylist(void) throw () ScratchpadWindow :: onSchedulePlaylist(void) throw ()
{ {
Glib::RefPtr<Gtk::TreeView::Selection> refSelection = Glib::RefPtr<Gtk::TreeView::Selection> refSelection =
treeView->get_selection(); treeView->get_selection();
@ -578,7 +578,7 @@ DjBagWindow :: onSchedulePlaylist(void) throw ()
* Event handler for the Play menu item selected from the entry conext menu * Event handler for the Play menu item selected from the entry conext menu
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: onPlayItem(void) throw () ScratchpadWindow :: onPlayItem(void) throw ()
{ {
Glib::RefPtr<Gtk::TreeView::Selection> refSelection = Glib::RefPtr<Gtk::TreeView::Selection> refSelection =
treeView->get_selection(); treeView->get_selection();
@ -606,7 +606,7 @@ DjBagWindow :: onPlayItem(void) throw ()
* Event handler for the Play button getting clicked * Event handler for the Play button getting clicked
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: onPlayButtonClicked(void) throw () ScratchpadWindow :: onPlayButtonClicked(void) throw ()
{ {
onPlayItem(); onPlayItem();
} }
@ -616,7 +616,7 @@ DjBagWindow :: onPlayButtonClicked(void) throw ()
* Event handler for the Pause button getting clicked * Event handler for the Pause button getting clicked
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: onPauseButtonClicked(void) throw () ScratchpadWindow :: onPauseButtonClicked(void) throw ()
{ {
try { try {
gLiveSupport->pauseAudio(); gLiveSupport->pauseAudio();
@ -631,7 +631,7 @@ DjBagWindow :: onPauseButtonClicked(void) throw ()
* Event handler for the Stop button getting clicked * Event handler for the Stop button getting clicked
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
DjBagWindow :: onStopButtonClicked(void) throw () ScratchpadWindow :: onStopButtonClicked(void) throw ()
{ {
try { try {
gLiveSupport->stopAudio(); gLiveSupport->stopAudio();

20
livesupport/products/gLiveSupport/src/DjBagWindow.h → livesupport/products/gLiveSupport/src/ScratchpadWindow.h
View file

@ -22,12 +22,12 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.12 $ Version : $Revision: 1.1 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/Attic/DjBagWindow.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/ScratchpadWindow.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
#ifndef DjBagWindow_h #ifndef ScratchpadWindow_h
#define DjBagWindow_h #define ScratchpadWindow_h
#ifndef __cplusplus #ifndef __cplusplus
#error This is a C++ include file #error This is a C++ include file
@ -72,9 +72,9 @@ using namespace LiveSupport::Widgets;
* playlists. * playlists.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.12 $ * @version $Revision: 1.1 $
*/ */
class DjBagWindow : public WhiteWindow, public LocalizedObject class ScratchpadWindow : public WhiteWindow, public LocalizedObject
{ {
private: private:
@ -85,7 +85,7 @@ class DjBagWindow : public WhiteWindow, public LocalizedObject
* Lists one clip per row. * Lists one clip per row.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.12 $ * @version $Revision: 1.1 $
*/ */
class ModelColumns : public ZebraTreeModelColumnRecord class ModelColumns : public ZebraTreeModelColumnRecord
{ {
@ -298,14 +298,14 @@ class DjBagWindow : public WhiteWindow, public LocalizedObject
* @param bundle the resource bundle holding the localized * @param bundle the resource bundle holding the localized
* resources for this window * resources for this window
*/ */
DjBagWindow(Ptr<GLiveSupport>::Ref gLiveSupport, ScratchpadWindow(Ptr<GLiveSupport>::Ref gLiveSupport,
Ptr<ResourceBundle>::Ref bundle) throw (); Ptr<ResourceBundle>::Ref bundle) throw ();
/** /**
* Virtual destructor. * Virtual destructor.
*/ */
virtual virtual
~DjBagWindow(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 dj bag.
@ -331,5 +331,5 @@ class DjBagWindow : public WhiteWindow, public LocalizedObject
} // namespace GLiveSupport } // namespace GLiveSupport
} // namespace LiveSupport } // namespace LiveSupport
#endif // DjBagWindow_h #endif // ScratchpadWindow_h