From ff5c75fe9a9ed6f44be047d39848779ff939772e Mon Sep 17 00:00:00 2001 From: Tats Date: Wed, 28 Dec 2016 14:09:13 -0500 Subject: [PATCH] Removed playback menu and reorganized items in View menu. --- MainWindow.cpp | 15 ++++----------- MainWindow.h | 1 - 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/MainWindow.cpp b/MainWindow.cpp index 3eea31c..0496098 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -1984,27 +1984,20 @@ void MainWindow::createMenus() // Preferences editMenu->addAction(preferencesAction); - // Output + // View. viewMenu = menuBar->addMenu(tr("&View")); viewMenu->addAction(outputFullScreenAction); - //viewMenu->addActions(screenActions); - viewMenu->addSeparator(); viewMenu->addAction(displayTestSignalAction); viewMenu->addAction(displayControlsAction); viewMenu->addAction(displayPaintControlsAction); - viewMenu->addSeparator(); - viewMenu->addAction(outputFullScreenAction); outputScreenMenu = viewMenu->addMenu(tr("&Output screen")); outputScreenMenu->addActions(screenActions); - viewMenu->addSeparator(); - // Playback. - playbackMenu = viewMenu->addMenu(tr("&Playback")); - playbackMenu->addAction(playAction); - playbackMenu->addAction(pauseAction); - playbackMenu->addAction(rewindAction); + viewMenu->addAction(playAction); + viewMenu->addAction(pauseAction); + viewMenu->addAction(rewindAction); // Window windowMenu = menuBar->addMenu(tr("&Window")); diff --git a/MainWindow.h b/MainWindow.h index 701353d..dfbd5f4 100644 --- a/MainWindow.h +++ b/MainWindow.h @@ -338,7 +338,6 @@ private: // Sub-menus. QMenu *outputScreenMenu; - QMenu *playbackMenu; QMenu *recentFileMenu; QMenu *recentVideoMenu; QMenu *mappingContextMenu;