Mercurial > hg > sonic-visualiser

changeset 498:d2a58dfc3ae5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "fullscreen"
author Chris Cannam
date Mon, 30 Jan 2012 16:06:47 +0000
parents e583f57f1311 (current diff) 80eae4eb6cc8 (diff)
children 44ab626bb866 032deed8b35b
files main/MainWindow.cpp main/MainWindow.h
diffstat 2 files changed, 114 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/main/MainWindow.cpp	Mon Jan 30 16:01:21 2012 +0000
+++ b/main/MainWindow.cpp	Mon Jan 30 16:06:47 2012 +0000
@@ -197,12 +197,12 @@
 
     m_descriptionLabel = new QLabel; //!!! hang on, this is declared in base class -- should be declared and initialised by same class
 
-    QScrollArea *scroll = new QScrollArea(frame);
-    scroll->setWidgetResizable(true);
-    scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    scroll->setFrameShape(QFrame::NoFrame);
-
-    scroll->setWidget(m_paneStack);
+    m_mainScroll = new QScrollArea(frame);
+    m_mainScroll->setWidgetResizable(true);
+    m_mainScroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    m_mainScroll->setFrameShape(QFrame::NoFrame);
+
+    m_mainScroll->setWidget(m_paneStack);
 
     m_overview = new Overview(frame);
     m_overview->setViewManager(m_viewManager);
@@ -259,7 +259,7 @@
     m_playControlsSpacer = new QFrame;
 
     layout->setSpacing(4);
-    layout->addWidget(scroll, 0, 0, 1, 5);
+    layout->addWidget(m_mainScroll, 0, 0, 1, 5);
     layout->addWidget(m_overview, 1, 1);
     layout->addWidget(m_playControlsSpacer, 1, 2);
     layout->addWidget(m_playSpeed, 1, 3);
@@ -374,6 +374,46 @@
 }
 
 void
+MainWindow::goFullScreen()
+{
+    QWidget *ps = m_mainScroll->takeWidget();
+    ps->setParent(0);
+
+    QShortcut *sc;
+
+    sc = new QShortcut(QKeySequence("Esc"), ps);
+    connect(sc, SIGNAL(activated()), this, SLOT(endFullScreen()));
+
+    sc = new QShortcut(QKeySequence("F11"), ps);
+    connect(sc, SIGNAL(activated()), this, SLOT(endFullScreen()));
+
+    QAction *acts[] = {
+        m_playAction, m_zoomInAction, m_zoomOutAction, m_zoomFitAction,
+        m_scrollLeftAction, m_scrollRightAction, m_showPropertyBoxesAction
+    };
+
+    for (int i = 0; i < sizeof(acts)/sizeof(acts[0]); ++i) {
+        sc = new QShortcut(acts[i]->shortcut(), ps);
+        connect(sc, SIGNAL(activated()), acts[i], SLOT(trigger()));
+    }
+
+    ps->showFullScreen();
+}
+
+void
+MainWindow::endFullScreen()
+{
+    // these were only created in goFullScreen:
+    QObjectList cl = m_paneStack->children();
+    foreach (QObject *o, cl) {
+        QShortcut *sc = qobject_cast<QShortcut *>(o);
+        if (sc) delete sc;
+    }
+
+    m_mainScroll->setWidget(m_paneStack);
+}
+
+void
 MainWindow::setupFileMenu()
 {
     if (m_mainMenusCreated) return;
@@ -754,21 +794,21 @@
 
     QMenu *menu = menuBar()->addMenu(tr("&View"));
     menu->setTearOffEnabled(true);
-    action = new QAction(tr("Scroll &Left"), this);
-    action->setShortcut(tr("Left"));
-    action->setStatusTip(tr("Scroll the current pane to the left"));
-    connect(action, SIGNAL(triggered()), this, SLOT(scrollLeft()));
-    connect(this, SIGNAL(canScroll(bool)), action, SLOT(setEnabled(bool)));
-    m_keyReference->registerShortcut(action);
-    menu->addAction(action);
+    m_scrollLeftAction = new QAction(tr("Scroll &Left"), this);
+    m_scrollLeftAction->setShortcut(tr("Left"));
+    m_scrollLeftAction->setStatusTip(tr("Scroll the current pane to the left"));
+    connect(m_scrollLeftAction, SIGNAL(triggered()), this, SLOT(scrollLeft()));
+    connect(this, SIGNAL(canScroll(bool)), m_scrollLeftAction, SLOT(setEnabled(bool)));
+    m_keyReference->registerShortcut(m_scrollLeftAction);
+    menu->addAction(m_scrollLeftAction);
 	
-    action = new QAction(tr("Scroll &Right"), this);
-    action->setShortcut(tr("Right"));
-    action->setStatusTip(tr("Scroll the current pane to the right"));
-    connect(action, SIGNAL(triggered()), this, SLOT(scrollRight()));
-    connect(this, SIGNAL(canScroll(bool)), action, SLOT(setEnabled(bool)));
-    m_keyReference->registerShortcut(action);
-    menu->addAction(action);
+    m_scrollRightAction = new QAction(tr("Scroll &Right"), this);
+    m_scrollRightAction->setShortcut(tr("Right"));
+    m_scrollRightAction->setStatusTip(tr("Scroll the current pane to the right"));
+    connect(m_scrollRightAction, SIGNAL(triggered()), this, SLOT(scrollRight()));
+    connect(this, SIGNAL(canScroll(bool)), m_scrollRightAction, SLOT(setEnabled(bool)));
+    m_keyReference->registerShortcut(m_scrollRightAction);
+    menu->addAction(m_scrollRightAction);
 	
     action = new QAction(tr("&Jump Left"), this);
     action->setShortcut(tr("Ctrl+Left"));
@@ -806,23 +846,23 @@
 
     m_keyReference->setCategory(tr("Zoom"));
 
-    action = new QAction(il.load("zoom-in"),
-                         tr("Zoom &In"), this);
-    action->setShortcut(tr("Up"));
-    action->setStatusTip(tr("Increase the zoom level"));
-    connect(action, SIGNAL(triggered()), this, SLOT(zoomIn()));
-    connect(this, SIGNAL(canZoom(bool)), action, SLOT(setEnabled(bool)));
-    m_keyReference->registerShortcut(action);
-    menu->addAction(action);
+    m_zoomInAction = new QAction(il.load("zoom-in"),
+                                 tr("Zoom &In"), this);
+    m_zoomInAction->setShortcut(tr("Up"));
+    m_zoomInAction->setStatusTip(tr("Increase the zoom level"));
+    connect(m_zoomInAction, SIGNAL(triggered()), this, SLOT(zoomIn()));
+    connect(this, SIGNAL(canZoom(bool)), m_zoomInAction, SLOT(setEnabled(bool)));
+    m_keyReference->registerShortcut(m_zoomInAction);
+    menu->addAction(m_zoomInAction);
 	
-    action = new QAction(il.load("zoom-out"),
-                         tr("Zoom &Out"), this);
-    action->setShortcut(tr("Down"));
-    action->setStatusTip(tr("Decrease the zoom level"));
-    connect(action, SIGNAL(triggered()), this, SLOT(zoomOut()));
-    connect(this, SIGNAL(canZoom(bool)), action, SLOT(setEnabled(bool)));
-    m_keyReference->registerShortcut(action);
-    menu->addAction(action);
+    m_zoomOutAction = new QAction(il.load("zoom-out"),
+                                  tr("Zoom &Out"), this);
+    m_zoomOutAction->setShortcut(tr("Down"));
+    m_zoomOutAction->setStatusTip(tr("Decrease the zoom level"));
+    connect(m_zoomOutAction, SIGNAL(triggered()), this, SLOT(zoomOut()));
+    connect(this, SIGNAL(canZoom(bool)), m_zoomOutAction, SLOT(setEnabled(bool)));
+    m_keyReference->registerShortcut(m_zoomOutAction);
+    menu->addAction(m_zoomOutAction);
 	
     action = new QAction(tr("Restore &Default Zoom"), this);
     action->setStatusTip(tr("Restore the zoom level to the default"));
@@ -830,14 +870,14 @@
     connect(this, SIGNAL(canZoom(bool)), action, SLOT(setEnabled(bool)));
     menu->addAction(action);
 
-    action = new QAction(il.load("zoom-fit"),
-                         tr("Zoom to &Fit"), this);
-    action->setShortcut(tr("F"));
-    action->setStatusTip(tr("Zoom to show the whole file"));
-    connect(action, SIGNAL(triggered()), this, SLOT(zoomToFit()));
-    connect(this, SIGNAL(canZoom(bool)), action, SLOT(setEnabled(bool)));
-    m_keyReference->registerShortcut(action);
-    menu->addAction(action);
+    m_zoomFitAction = new QAction(il.load("zoom-fit"),
+                                  tr("Zoom to &Fit"), this);
+    m_zoomFitAction->setShortcut(tr("F"));
+    m_zoomFitAction->setStatusTip(tr("Zoom to show the whole file"));
+    connect(m_zoomFitAction, SIGNAL(triggered()), this, SLOT(zoomToFit()));
+    connect(this, SIGNAL(canZoom(bool)), m_zoomFitAction, SLOT(setEnabled(bool)));
+    m_keyReference->registerShortcut(m_zoomFitAction);
+    menu->addAction(m_zoomFitAction);
 
     menu->addSeparator();
 
@@ -904,14 +944,14 @@
     m_keyReference->registerShortcut(action);
     menu->addAction(action);
 
-    action = new QAction(tr("Show Property Bo&xes"), this);
-    action->setShortcut(tr("X"));
-    action->setStatusTip(tr("Show the layer property boxes at the side of the main window"));
-    connect(action, SIGNAL(triggered()), this, SLOT(togglePropertyBoxes()));
-    action->setCheckable(true);
-    action->setChecked(true);
-    m_keyReference->registerShortcut(action);
-    menu->addAction(action);
+    m_showPropertyBoxesAction = new QAction(tr("Show Property Bo&xes"), this);
+    m_showPropertyBoxesAction->setShortcut(tr("X"));
+    m_showPropertyBoxesAction->setStatusTip(tr("Show the layer property boxes at the side of the main window"));
+    connect(m_showPropertyBoxesAction, SIGNAL(triggered()), this, SLOT(togglePropertyBoxes()));
+    m_showPropertyBoxesAction->setCheckable(true);
+    m_showPropertyBoxesAction->setChecked(true);
+    m_keyReference->registerShortcut(m_showPropertyBoxesAction);
+    menu->addAction(m_showPropertyBoxesAction);
 
     action = new QAction(tr("Show Status &Bar"), this);
     action->setStatusTip(tr("Show context help information in the status bar at the bottom of the window"));
@@ -942,6 +982,15 @@
     action->setStatusTip(tr("Open a window listing interactions and other events"));
     connect(action, SIGNAL(triggered()), this, SLOT(showActivityLog()));
     menu->addAction(action);
+
+    menu->addSeparator();
+
+    action = new QAction(tr("Go Full-Screen"), this);
+    action->setShortcut(tr("F11"));
+    action->setStatusTip(tr("Expand the pane area to the whole screen"));
+    connect(action, SIGNAL(triggered()), this, SLOT(goFullScreen()));
+    m_keyReference->registerShortcut(action);
+    menu->addAction(action);
 }
 
 void
--- a/main/MainWindow.h	Mon Jan 30 16:01:21 2012 +0000
+++ b/main/MainWindow.h	Mon Jan 30 16:06:47 2012 +0000
@@ -59,6 +59,7 @@
 class Labeller;
 class ActivityLog;
 class QFileSystemWatcher;
+class QScrollArea;
 
 class MainWindow : public MainWindowBase
 {
@@ -77,6 +78,9 @@
     virtual void preferenceChanged(PropertyContainer::PropertyName);
     virtual bool commitData(bool mayAskUser);
 
+    void goFullScreen();
+    void endFullScreen();
+
 protected slots:
     virtual void openSession();
     virtual void importAudio();
@@ -186,6 +190,8 @@
     Fader                   *m_fader;
     AudioDial               *m_playSpeed;
     WaveformLayer           *m_panLayer;
+    
+    QScrollArea             *m_mainScroll;
 
     bool                     m_mainMenusCreated;
     QMenu                   *m_paneMenu;
@@ -214,6 +220,12 @@
     QAction                 *m_playSelectionAction;
     QAction                 *m_playLoopAction;
     QAction                 *m_manageTemplatesAction;
+    QAction                 *m_zoomInAction;
+    QAction                 *m_zoomOutAction;
+    QAction                 *m_zoomFitAction;
+    QAction                 *m_scrollLeftAction;
+    QAction                 *m_scrollRightAction;
+    QAction                 *m_showPropertyBoxesAction;
 
     bool                     m_soloModified;
     bool                     m_prevSolo;