From 7081d4461ad7e9f5fbb7b4b2f909e27bcc9e1499 Mon Sep 17 00:00:00 2001 From: fgerlits Date: Wed, 18 May 2005 17:44:00 +0000 Subject: [PATCH] added "play" pop-up menu item in Live Mode window; changed "playMenuItem" to "cueMenuItem" in ScratchpadWindow localization, for consistency with LiveModeWindow --- .../gLiveSupport/src/LiveModeWindow.cxx | 10 +++++++--- .../products/gLiveSupport/src/LiveModeWindow.h | 17 +++++++++-------- .../gLiveSupport/src/ScratchpadWindow.cxx | 6 +++--- livesupport/products/gLiveSupport/var/hu.txt | 11 ++++++----- livesupport/products/gLiveSupport/var/root.txt | 5 +++-- 5 files changed, 28 insertions(+), 21 deletions(-) diff --git a/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx b/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx index 2b64f2b1a..dd9194f2c 100644 --- a/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx +++ b/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx @@ -22,7 +22,7 @@ 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 $ ------------------------------------------------------------------------------*/ @@ -135,7 +135,7 @@ LiveModeWindow :: LiveModeWindow (Ptr::Ref gLiveSupport, // connect the signal handler for the output play button outputPlayButton->signal_clicked().connect(sigc::mem_fun(*this, - &LiveModeWindow::onOutputPlayButtonClicked )); + &LiveModeWindow::onOutputPlay )); // create the right-click entry context menu for audio clips contextMenu = Gtk::manage(new Gtk::Menu()); @@ -158,6 +158,10 @@ LiveModeWindow :: LiveModeWindow (Ptr::Ref gLiveSupport, *getResourceUstring("removeMenuItem"), sigc::mem_fun(*this, &LiveModeWindow::onRemoveMenuOption))); + contextMenuList.push_back(Gtk::Menu_Helpers::MenuElem( + *getResourceUstring("playMenuItem"), + sigc::mem_fun(*this, + &LiveModeWindow::onOutputPlay))); } catch (std::invalid_argument &e) { std::cerr << e.what() << std::endl; std::exit(1); @@ -241,7 +245,7 @@ LiveModeWindow :: popTop(void) throw () * Signal handler for the output play button clicked. *----------------------------------------------------------------------------*/ void -LiveModeWindow :: onOutputPlayButtonClicked(void) throw () +LiveModeWindow :: onOutputPlay(void) throw () { Glib::RefPtr refSelection = treeView->get_selection(); diff --git a/livesupport/products/gLiveSupport/src/LiveModeWindow.h b/livesupport/products/gLiveSupport/src/LiveModeWindow.h index a4f139ac0..978ae0f8c 100644 --- a/livesupport/products/gLiveSupport/src/LiveModeWindow.h +++ b/livesupport/products/gLiveSupport/src/LiveModeWindow.h @@ -22,7 +22,7 @@ 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 $ ------------------------------------------------------------------------------*/ @@ -74,7 +74,7 @@ using namespace LiveSupport::Widgets; * playlists. * * @author $Author: fgerlits $ - * @version $Revision: 1.11 $ + * @version $Revision: 1.12 $ */ class LiveModeWindow : public WhiteWindow, public LocalizedObject { @@ -87,7 +87,7 @@ class LiveModeWindow : public WhiteWindow, public LocalizedObject * Lists one clip per row. * * @author $Author: fgerlits $ - * @version $Revision: 1.11 $ + * @version $Revision: 1.12 $ */ class ModelColumns : public PlayableTreeModelColumnRecord { @@ -95,8 +95,8 @@ class LiveModeWindow : public WhiteWindow, public LocalizedObject /** * The column for the play button. */ -// Gtk::TreeModelColumn > -// playButtonColumn; +// Gtk::TreeModelColumn > +// playButtonColumn; /** * The column for the title, creator, etc. @@ -108,7 +108,7 @@ class LiveModeWindow : public WhiteWindow, public LocalizedObject */ ModelColumns(void) throw () { -// add(playButtonColumn); +// add(playButtonColumn); add(infoColumn); } }; @@ -151,10 +151,11 @@ class LiveModeWindow : public WhiteWindow, public LocalizedObject 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 - onOutputPlayButtonClicked(void) throw (); + onOutputPlay(void) throw (); /** * Signal handler for the mouse clicked on one of the entries. diff --git a/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx b/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx index 44a7778eb..c20312b7f 100644 --- a/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx +++ b/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx @@ -22,7 +22,7 @@ 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 $ ------------------------------------------------------------------------------*/ @@ -157,7 +157,7 @@ ScratchpadWindow :: ScratchpadWindow (Ptr::Ref gLiveSupport, sigc::mem_fun(*this, &ScratchpadWindow::onDeleteItem))); audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem( - *getResourceUstring("playMenuItem"), + *getResourceUstring("cueMenuItem"), sigc::mem_fun(*audioButtonBox, &CuePlayer::onPlayItem))); audioClipMenuList.push_back(Gtk::Menu_Helpers::MenuElem( @@ -202,7 +202,7 @@ ScratchpadWindow :: ScratchpadWindow (Ptr::Ref gLiveSupport, sigc::mem_fun(*this, &ScratchpadWindow::onDeleteItem))); playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem( - *getResourceUstring("playMenuItem"), + *getResourceUstring("cueMenuItem"), sigc::mem_fun(*audioButtonBox, &CuePlayer::onPlayItem))); playlistMenuList.push_back(Gtk::Menu_Helpers::MenuElem( diff --git a/livesupport/products/gLiveSupport/var/hu.txt b/livesupport/products/gLiveSupport/var/hu.txt index 02b15d14e..5ff0fa00f 100644 --- a/livesupport/products/gLiveSupport/var/hu.txt +++ b/livesupport/products/gLiveSupport/var/hu.txt @@ -51,11 +51,11 @@ hu:table upMenuItem:string { "_Fel" } downMenuItem:string { "_Le" } - removeMenuItem:string { "_Eltávolít" } - addToPlaylistMenuItem:string { "_Hozzáad Playlisthez" } + removeMenuItem:string { "_Eltávolítani" } + addToPlaylistMenuItem:string { "Playlisthez _hozzáadni" } schedulePlaylistMenuItem:string { "_Playlist időzítése" } - deleteMenuItem:string { "_Töröl" } - playMenuItem:string { "_Belehallgatni" } + deleteMenuItem:string { "_Törölni" } + cueMenuItem:string { "_Belehallgatni" } addToLiveModeMenuItem:string { "Élő _adásba" } } @@ -183,7 +183,8 @@ hu:table cueMenuItem:string { "_Belehallgatni" } upMenuItem:string { "_Fel" } downMenuItem:string { "_Le" } - removeMenuItem:string { "_Eltávolít" } + removeMenuItem:string { "_Eltávolítani" } + playMenuItem:string { "Le_játszani" } cuePlayerLabel:string { "Belehallgatni" } } diff --git a/livesupport/products/gLiveSupport/var/root.txt b/livesupport/products/gLiveSupport/var/root.txt index 8bcddbb42..db3b5bca7 100644 --- a/livesupport/products/gLiveSupport/var/root.txt +++ b/livesupport/products/gLiveSupport/var/root.txt @@ -56,7 +56,7 @@ root:table addToPlaylistMenuItem:string { "_Add To Playlist" } schedulePlaylistMenuItem:string { "_Schedule Playlist" } deleteMenuItem:string { "_Delete" } - playMenuItem:string { "_Preview" } + cueMenuItem:string { "Pre_view" } addToLiveModeMenuItem:string { "Add To _Live Mode" } } @@ -182,10 +182,11 @@ root:table { windowTitle:string { "LiveSupport Live Mode Window" } - cueMenuItem:string { "_Preview" } + cueMenuItem:string { "Pre_view" } upMenuItem:string { "Move _Up" } downMenuItem:string { "Move D_own" } removeMenuItem:string { "_Remove" } + playMenuItem:string { "_Play" } cuePlayerLabel:string { "Preview" } }