comparison main/MainWindow.h @ 466:33d0632255b5 integration_library

Merge with the Kiosk branch

 class OSCMessage;
 class KeyReference;
 class Labeller;
 class ActivityLog;
 class QFileSystemWatcher;
+class QScrollArea;
 
 class MainWindow : public MainWindowBase
 {
     Q_OBJECT
 

     void canAlign(bool);
 
 public slots:
     virtual void preferenceChanged(PropertyContainer::PropertyName);
     virtual bool commitData(bool mayAskUser);
+    virtual void toggleViewMode(); //to switch between minimal and full modes
 
 protected slots:
     virtual void openSession();
     virtual void importAudio();
     virtual void importMoreAudio();

     virtual void help();
     virtual void about();
     virtual void keyReference();
     virtual void newerVersionAvailable(QString);
 
+    //virtual void toggleViewMode(); //to switch between minimal and full modes
+
 protected:
     Overview                *m_overview;
     Fader                   *m_fader;
     AudioDial               *m_playSpeed;
     WaveformLayer           *m_panLayer;
-
-    bool                     m_mainMenusCreated;
+    QScrollArea             *m_scroll;
+
+    bool                    m_mainMenusCreated;
     QMenu                   *m_paneMenu;
     QMenu                   *m_layerMenu;
     QMenu                   *m_transformsMenu;
     QMenu                   *m_playbackMenu;
     QMenu                   *m_existingLayersMenu;

     QMenu                   *m_rightButtonMenu;
     QMenu                   *m_rightButtonLayerMenu;
     QMenu                   *m_rightButtonTransformsMenu;
     QMenu                   *m_rightButtonPlaybackMenu;
 
+    QMenu                   *m_fileMenu;
+    QMenu                   *m_editMenu;
+    QMenu                   *m_viewMenu;
+    QMenu                   *m_helpMenu;
+
     QAction                 *m_deleteSelectedAction;
     QAction                 *m_soloAction;
     QAction                 *m_rwdStartAction;
     QAction                 *m_rwdSimilarAction;
     QAction                 *m_rwdAction;

     QAction                 *m_ffwdEndAction;
     QAction                 *m_playAction;
     QAction                 *m_playSelectionAction;
     QAction                 *m_playLoopAction;
     QAction                 *m_manageTemplatesAction;
+    QAction                 *m_alAction;
+
+    QAction                 *m_importAnnotationLayerAction;
+    QAction                 *m_exportAnnotationLayerAction;
+    QAction                 *m_showNoOverlaysAction;
+    QAction                 *m_showMinimalOverlaysAction;
+    QAction                 *m_showStandardOverlaysAction;
+    QAction                 *m_showAllOverlaysAction;
+    QAction                 *m_showAllTimeRulersAction;
+    QAction                 *m_showZoomWheelsAction;
+    QAction                 *m_showPropertyBoxesAction;
+    QAction                 *m_showStatusBarAction;
+
+    QToolBar                *m_fileToolBar;
+    QToolBar                *m_playbackToolBar;
+    QToolBar                *m_viewToolBar;
+    QToolBar                *m_playModeToolBar;
+    QToolBar                *m_editToolBar;
+    QToolBar                *m_toolsToolBar;
 
     bool                     m_soloModified;
     bool                     m_prevSolo;
 
     QFrame                  *m_playControlsSpacer;