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

added "play" pop-up menu item in Live Mode window;

Browse source 
changed "playMenuItem" to "cueMenuItem" in ScratchpadWindow localization, for consistency with LiveModeWindow
This commit is contained in:
fgerlits 2005-05-18 17:44:00 +00:00
parent 6af5fe6bd5
commit 7081d4461a
5 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
livesupport/products/gLiveSupport/src/LiveModeWindow.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.12 $ Version : $Revision: 1.13 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -135,7 +135,7 @@ LiveModeWindow :: LiveModeWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
// connect the signal handler for the output play button // connect the signal handler for the output play button
outputPlayButton->signal_clicked().connect(sigc::mem_fun(*this, outputPlayButton->signal_clicked().connect(sigc::mem_fun(*this,
&LiveModeWindow::onOutputPlayButtonClicked )); &LiveModeWindow::onOutputPlay ));
// create the right-click entry context menu for audio clips // create the right-click entry context menu for audio clips
contextMenu = Gtk::manage(new Gtk::Menu()); contextMenu = Gtk::manage(new Gtk::Menu());
@ -158,6 +158,10 @@ LiveModeWindow :: LiveModeWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
*getResourceUstring("removeMenuItem"), *getResourceUstring("removeMenuItem"),
sigc::mem_fun(*this, sigc::mem_fun(*this,
&LiveModeWindow::onRemoveMenuOption))); &LiveModeWindow::onRemoveMenuOption)));
contextMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("playMenuItem"),
sigc::mem_fun(*this,
&LiveModeWindow::onOutputPlay)));
} catch (std::invalid_argument &e) { } catch (std::invalid_argument &e) {
std::cerr << e.what() << std::endl; std::cerr << e.what() << std::endl;
std::exit(1); std::exit(1);
@ -241,7 +245,7 @@ LiveModeWindow :: popTop(void) throw ()
* Signal handler for the output play button clicked. * Signal handler for the output play button clicked.
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
void void
LiveModeWindow :: onOutputPlayButtonClicked(void) throw () LiveModeWindow :: onOutputPlay(void) throw ()
{ {
Glib::RefPtr<Gtk::TreeView::Selection> refSelection = Glib::RefPtr<Gtk::TreeView::Selection> refSelection =
treeView->get_selection(); treeView->get_selection();

17
livesupport/products/gLiveSupport/src/LiveModeWindow.h
View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.11 $ Version : $Revision: 1.12 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LiveModeWindow.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LiveModeWindow.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -74,7 +74,7 @@ using namespace LiveSupport::Widgets;
* playlists. * playlists.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.11 $ * @version $Revision: 1.12 $
*/ */
class LiveModeWindow : public WhiteWindow, public LocalizedObject class LiveModeWindow : public WhiteWindow, public LocalizedObject
{ {
@ -87,7 +87,7 @@ class LiveModeWindow : public WhiteWindow, public LocalizedObject
* Lists one clip per row. * Lists one clip per row.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.11 $ * @version $Revision: 1.12 $
*/ */
class ModelColumns : public PlayableTreeModelColumnRecord class ModelColumns : public PlayableTreeModelColumnRecord
{ {
@ -95,8 +95,8 @@ class LiveModeWindow : public WhiteWindow, public LocalizedObject
/** /**
* The column for the play button. * The column for the play button.
*/ */
// Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf> > // Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf> >
// playButtonColumn; // playButtonColumn;
/** /**
* The column for the title, creator, etc. * The column for the title, creator, etc.
@ -108,7 +108,7 @@ class LiveModeWindow : public WhiteWindow, public LocalizedObject
*/ */
ModelColumns(void) throw () ModelColumns(void) throw ()
{ {
// add(playButtonColumn); // add(playButtonColumn);
add(infoColumn); add(infoColumn);
} }
}; };
@ -151,10 +151,11 @@ class LiveModeWindow : public WhiteWindow, public LocalizedObject
Gtk::Menu * contextMenu; Gtk::Menu * contextMenu;
/** /**
* Signal handler for the output play button clicked. * Signal handler for the output play button clicked
* or the output play menu option selected.
*/ */
void void
onOutputPlayButtonClicked(void) throw (); onOutputPlay(void) throw ();
/** /**
* Signal handler for the mouse clicked on one of the entries. * Signal handler for the mouse clicked on one of the entries.

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

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.18 $ Version : $Revision: 1.19 $
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 $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -157,7 +157,7 @@ ScratchpadWindow :: ScratchpadWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
sigc::mem_fun(*this, sigc::mem_fun(*this,
&ScratchpadWindow::onDeleteItem))); &ScratchpadWindow::onDeleteItem)));
audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem( audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("playMenuItem"), *getResourceUstring("cueMenuItem"),
sigc::mem_fun(*audioButtonBox, sigc::mem_fun(*audioButtonBox,
&CuePlayer::onPlayItem))); &CuePlayer::onPlayItem)));
audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem( audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
@ -202,7 +202,7 @@ ScratchpadWindow :: ScratchpadWindow (Ptr<GLiveSupport>::Ref gLiveSupport,
sigc::mem_fun(*this, sigc::mem_fun(*this,
&ScratchpadWindow::onDeleteItem))); &ScratchpadWindow::onDeleteItem)));
playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem( playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem(
*getResourceUstring("playMenuItem"), *getResourceUstring("cueMenuItem"),
sigc::mem_fun(*audioButtonBox, sigc::mem_fun(*audioButtonBox,
&CuePlayer::onPlayItem))); &CuePlayer::onPlayItem)));
playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem( playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem(

11
livesupport/products/gLiveSupport/var/hu.txt
View file

@ -51,11 +51,11 @@ hu:table
upMenuItem:string { "_Fel" } upMenuItem:string { "_Fel" }
downMenuItem:string { "_Le" } downMenuItem:string { "_Le" }
removeMenuItem:string { "_Eltávolít" } removeMenuItem:string { "_Eltávolítani" }
addToPlaylistMenuItem:string { "_Hozzáad Playlisthez" } addToPlaylistMenuItem:string { "Playlisthez _hozzáadni" }
schedulePlaylistMenuItem:string { "_Playlist időzítése" } schedulePlaylistMenuItem:string { "_Playlist időzítése" }
deleteMenuItem:string { "_Töröl" } deleteMenuItem:string { "_Törölni" }
playMenuItem:string { "_Belehallgatni" } cueMenuItem:string { "_Belehallgatni" }
addToLiveModeMenuItem:string { "Élő _adásba" } addToLiveModeMenuItem:string { "Élő _adásba" }
} }
@ -183,7 +183,8 @@ hu:table
cueMenuItem:string { "_Belehallgatni" } cueMenuItem:string { "_Belehallgatni" }
upMenuItem:string { "_Fel" } upMenuItem:string { "_Fel" }
downMenuItem:string { "_Le" } downMenuItem:string { "_Le" }
removeMenuItem:string { "_Eltávolít" } removeMenuItem:string { "_Eltávolítani" }
playMenuItem:string { "Le_játszani" }
cuePlayerLabel:string { "Belehallgatni" } cuePlayerLabel:string { "Belehallgatni" }
} }

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

@ -56,7 +56,7 @@ root:table
addToPlaylistMenuItem:string { "_Add To Playlist" } addToPlaylistMenuItem:string { "_Add To Playlist" }
schedulePlaylistMenuItem:string { "_Schedule Playlist" } schedulePlaylistMenuItem:string { "_Schedule Playlist" }
deleteMenuItem:string { "_Delete" } deleteMenuItem:string { "_Delete" }
playMenuItem:string { "_Preview" } cueMenuItem:string { "Pre_view" }
addToLiveModeMenuItem:string { "Add To _Live Mode" } addToLiveModeMenuItem:string { "Add To _Live Mode" }
} }
@ -182,10 +182,11 @@ root:table
{ {
windowTitle:string { "LiveSupport Live Mode Window" } windowTitle:string { "LiveSupport Live Mode Window" }
cueMenuItem:string { "_Preview" } cueMenuItem:string { "Pre_view" }
upMenuItem:string { "Move _Up" } upMenuItem:string { "Move _Up" }
downMenuItem:string { "Move D_own" } downMenuItem:string { "Move D_own" }
removeMenuItem:string { "_Remove" } removeMenuItem:string { "_Remove" }
playMenuItem:string { "_Play" }
cuePlayerLabel:string { "Preview" } cuePlayerLabel:string { "Preview" }
} }