MovieWidget: don't show menuBar()

Also, remove some left over menus from old ArchiveView.

2 files changed, 2 insertions, 9 deletions

diff --git a/shemov.cpp b/shemov.cpp
index 576611f..ef542da 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -208,14 +208,13 @@ void SheMov::configure(){
 }
 
 void SheMov::tabChanged(int newTab){
-    if(newTab == FileManager){
+    if(newTab == FileManager || newTab == Movies){
         menuBar()->setVisible(false);
     }else{
         menuBar()->setVisible(true);
     }
     mEditPicMenuA->setVisible(newTab == Pictures);
     mViewPicMenuA->setVisible(newTab == Pictures);
-    mArchiveMenuA->setVisible(newTab == Movies);
     mPicActionGroup->setEnabled(newTab == Pictures);
     mPVSelectAllA->disconnect();
     mPVShowNPDialogA->setEnabled(newTab == FileManager);
@@ -507,10 +506,6 @@ void SheMov::createMenus(){
     mEditPicMenu->addAction(mPWEditPicMappingsA);
     mEditPicMenuA = menuBar()->addMenu(mEditPicMenu);
 
-    //Archive edit menu: populated when creating context menu!
-    mArchiveEditMenu = new QMenu(tr("&Edit"), this);
-    mArchiveMenuA = menuBar()->addMenu(mArchiveEditMenu);
-
     //Pictures view menu
     mPicViewMenu = new QMenu(tr("&View"), this);
     mPicViewMenu->addAction(mPVToggleA);
@@ -561,7 +556,7 @@ void SheMov::createMenus(){
 
     // Random
     mRandomEditMenu = mRandomTab->editMenu();
-    mRandomEditMenuA = menuBar()->insertMenu(mArchiveMenuA, mRandomEditMenu);
+    mRandomEditMenuA = menuBar()->addMenu(mRandomEditMenu);
 }
 
 void SheMov::createToolBar(){
diff --git a/shemov.h b/shemov.h
index c91a89b..4c2a674 100644
--- a/shemov.h
+++ b/shemov.h
@@ -115,7 +115,6 @@ class SheMov : public QMainWindow {
         QActionGroup *mArchiveBrowserAG;
 
         //ArchiveFiles actions
-        QAction *mArchiveMenuA;
         QAction *mArchiveFilesPlayA;
         QAction *mArchiveFilesQualityA;
         QAction *mArchiveFilesDvdNoA;
@@ -132,7 +131,6 @@ class SheMov : public QMainWindow {
         QAction *mAnalyzePartsA;
 
         QMenu *mEditPicMenu;
-        QMenu *mArchiveEditMenu;
         QMenu *mPlaySelectedTimesMenuFS;
         QMenu *mPicViewMenu;
         QMenu *mArchiveBrowserViewMenu;