Finally get rid of menuBar()!!!!

4 files changed, 3 insertions, 43 deletions

diff --git a/randomtab.cpp b/randomtab.cpp
index 893b327..3c01514 100644
--- a/randomtab.cpp
+++ b/randomtab.cpp
@@ -45,7 +45,6 @@ RandomTab::RandomTab(QWidget *parent) : QWidget(parent) {
     mActorModel = new QStandardItemModel(this);
     setupModels();
     setupGui();
-    setupActions();
     mFileView->setContextMenu(mContextMenu);
     clearAll();
     readSettings();
@@ -179,22 +178,6 @@ void RandomTab::setupGui(){
     setLayout(mainLayout);
 }
 
-void RandomTab::setupActions(){
-    mRefreshA = new QAction(QIcon(":/refresh.png"), tr("Refresh"));
-    connect(mRefreshA, SIGNAL(triggered()), this, SLOT(refreshComboboxes()));
-    mClearA = new QAction(QIcon(":/delete.png"), tr("Clear"), this);
-    connect(mClearA, SIGNAL(triggered()), this, SLOT(clearAll()));
-    mConfigureA = new QAction(QIcon(":/chastity_belt.png"), tr("Configure..."), this);
-    connect(mConfigureA, SIGNAL(triggered()), this, SIGNAL(configure()));
-
-    mEditMenu = new QMenu(tr("&Edit"), this);
-    mEditMenu->addSeparator();
-    mEditMenu->addAction(mRefreshA);
-    mEditMenu->addAction(mClearA);
-    mEditMenu->addSeparator();
-    mEditMenu->addAction(mConfigureA);
-}
-
 void RandomTab::writeSettings(){
     QSettings s;
     QStringList selGenres;
diff --git a/randomtab.h b/randomtab.h
index 7cf63a7..c479ac3 100644
--- a/randomtab.h
+++ b/randomtab.h
@@ -34,7 +34,6 @@ class RandomTab : public QWidget {
         explicit RandomTab(QWidget *parent = nullptr);
         virtual ~RandomTab();
         const QMenu *contextMenu() const { return mContextMenu; }
-        QMenu *editMenu() { return mEditMenu; }
 
     public slots:
         void setupModels();
@@ -52,7 +51,6 @@ class RandomTab : public QWidget {
 
     private:
         void setupGui();
-        void setupActions();
         void writeSettings();
         void readSettings();
         QStringList validDvdNos();
@@ -73,11 +71,7 @@ class RandomTab : public QWidget {
         QSortFilterProxyModel *mFileProxy;
         QSqlDatabase mDb;
         QStringList mValidDvds;
-        QAction *mClearA;
-        QAction *mRefreshA;
-        QAction *mConfigureA;
         QMenu *mContextMenu;
-        QMenu *mEditMenu;
 };
 
 class RandomFileView : public QTreeView {
diff --git a/shemov.cpp b/shemov.cpp
index 23d4c54..ac8e38c 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -210,12 +210,6 @@ void SheMov::configure(){
 }
 
 void SheMov::tabChanged(int newTab){
-    if(newTab == FileManager || newTab == Movies || newTab == Pictures || newTab == ArchiveBrowserTab){
-        menuBar()->setVisible(false);
-    }else{
-        menuBar()->setVisible(true);
-    }
-    mRandomEditMenuA->setVisible(newTab == RandomDisp);
     statusbarMessage(QString());
     switch(newTab){
         case FileManager:
@@ -231,6 +225,9 @@ void SheMov::tabChanged(int newTab){
         case ArchiveBrowserTab:
             setWindowTitle(tr("Archive Browser"));
             break;
+        case RandomDisp:
+            setWindowTitle(tr("Random Browser"));
+            break;
         default:
             setDuration(0x0, false);
             ;;
@@ -348,17 +345,6 @@ void SheMov::createMenus(){
     analyzeMenu->addAction(mAnalyzeGenresA);
     analyzeMenu->addAction(mAnalyzeSeriesA);
     analyzeMenu->addAction(mAnalyzePartsA);
-
-	QMenu *helpMenu = new QMenu(tr("&Help"), this);
-	helpMenu->addAction(mAboutShemovA);
-	helpMenu->addAction(mAboutQtA);
-	helpMenu->addSeparator();
-	helpMenu->addAction(mStatisticsA);
-	menuBar()->addMenu(helpMenu);
-
-    // Random
-    mRandomEditMenu = mRandomTab->editMenu();
-    mRandomEditMenuA = menuBar()->addMenu(mRandomEditMenu);
 }
 
 void SheMov::writeSettings(){
diff --git a/shemov.h b/shemov.h
index 6106480..13ec741 100644
--- a/shemov.h
+++ b/shemov.h
@@ -84,9 +84,6 @@ class SheMov : public QMainWindow {
         QAction *mAnalyzeSeriesA;
         QAction *mAnalyzePartsA;
 
-        QMenu *mRandomEditMenu;
-        QAction *mRandomEditMenuA;
-
 		//widgets + dialogs
 		QTabWidget *mTab;
         SearchDialog *mSearchDialog;