diff main/MainWindow.h @ 498:d2a58dfc3ae5

Merge from branch "fullscreen"

--- 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;