Remove menu bar from archive browser

Well, quite some code churn. Localize QActions and remove them from
SheMov. Put them in a tool bar and the context menu, the usual.

1 files changed, 4 insertions, 85 deletions

diff --git a/shemov.cpp b/shemov.cpp
index 58a2e1c..9f9d1c0 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -161,9 +161,7 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
     splash.showMessage(tr("Creating Menus and Statusbar..."), Qt::AlignHCenter, Qt::yellow);
     qApp->processEvents();
 	createStatusbar();
-	createActions();
 	createMenus();
-	createToolBar();
 	setFsFree();
 
     splash.showMessage(tr("Finishing..."), Qt::AlignHCenter, Qt::yellow);
@@ -211,12 +209,11 @@ void SheMov::configure(){
 }
 
 void SheMov::tabChanged(int newTab){
-    if(newTab == FileManager || newTab == Movies || newTab == Pictures){
+    if(newTab == FileManager || newTab == Movies || newTab == Pictures || newTab == ArchiveBrowserTab){
         menuBar()->setVisible(false);
     }else{
         menuBar()->setVisible(true);
     }
-    mArchiveBrowserViewMenuA->setVisible(newTab == ArchiveBrowserTab);
     mRandomEditMenuA->setVisible(newTab == RandomDisp);
     statusbarMessage(QString());
     switch(newTab){
@@ -230,6 +227,9 @@ void SheMov::tabChanged(int newTab){
             mPicWidget->constructWindowTitle();
             setDuration(0x0, false);
             break;
+        case ArchiveBrowserTab:
+            setWindowTitle(tr("Archive Browser"));
+            break;
         default:
             setDuration(0x0, false);
             ;;
@@ -316,24 +316,6 @@ void SheMov::setDuration(qint64 dur, bool maybeMore){
     mSelectedDuration->setText(t);
 }
 
-QAction *SheMov::createSeparator(){
-    QAction *tmp = new QAction(this);
-    tmp->setSeparator(true);
-    return tmp;
-}
-
-void SheMov::createHeaderMapper(SmTreeModel *model, SmTreeView *view, QActionGroup *group){
-    QHash<QString, int> headerData = model->headerData();
-    group->setExclusive(false);
-    for(QHash<QString, int>::const_iterator it = headerData.constBegin(); it != headerData.constEnd(); ++it){
-        QAction *a = new QAction(it.key(), this);
-        a->setCheckable(true);
-        a->setData(it.value());
-        group->addAction(a);
-        connect(a, &QAction::triggered, [=] {view->toggleHeader(a); });
-    }
-}
-
 void SheMov::createStatusbar(){
     QLabel *selDurL = new QLabel(tr("Duration"));
     mSelectedDuration = new QLabel("00:00:00");
@@ -357,31 +339,6 @@ void SheMov::createStatusbar(){
 	statusBar()->addPermanentWidget(mFsFree);
 }
 
-void SheMov::createActions(){
-    //headers
-    SmTreeModel *abrowsermodel = static_cast<SmTreeModel*>(SmGlobals::instance()->model("BrowserModel"));
-    mArchiveBrowserAG = new QActionGroup(this);
-    createHeaderMapper(abrowsermodel, mArchiveBrowser->archiveTree(), mArchiveBrowserAG);
-    mArchiveBrowser->archiveTree()->setHeaderGroup(mArchiveBrowserAG);
-
-    PictureViewer2 *picViewer = SmGlobals::instance()->pictureViewer();
-    picViewer->hide();
-
-    //ArchiveBrowser Actions
-    mArchiveBrowserMoveToBurnA = new QAction(QIcon(":/shackles.png"), tr("Move to burn..."), this);
-    connect(mArchiveBrowserMoveToBurnA, &QAction::triggered, mArchiveBrowser, &ArchiveBrowser::moveToBurn);
-    mArchiveBrowserMoveToUSBA = new QAction(QIcon(":/clean_tampon.png"), tr("Move to USB..."), this);
-    connect(mArchiveBrowserMoveToUSBA, &QAction::triggered, mArchiveBrowser, &ArchiveBrowser::moveToUSB);
-    mArchiveBrowserRefreshA = new QAction(QIcon(":/refresh.png"), tr("Refresh"), this);
-    connect(mArchiveBrowserRefreshA, &QAction::triggered, mArchiveBrowser, &ArchiveBrowser::refresh);
-    mArchiveBrowserPlaySelectedA = new QAction(QIcon(":/dildo.png"), tr("Play selected..."), this);
-    connect(mArchiveBrowserPlaySelectedA, &QAction::triggered, mArchiveBrowser, &ArchiveBrowser::playSelected);
-    mArchiveBrowserExpandAllA = new QAction(tr("Expand all"), this);
-    connect(mArchiveBrowserExpandAllA, &QAction::triggered, mArchiveBrowser->archiveTree(), &SmTreeView::expandAll);
-    mArchiveBrowserCollapseAllA = new QAction(tr("Collapse all"), this);
-    connect(mArchiveBrowserCollapseAllA, &QAction::triggered, mArchiveBrowser->archiveTree(), &SmTreeView::collapseAll);
-}
-
 void SheMov::createMenus(){
     //FIXME!
     //fileMenu->addAction(mConsistencyA);
@@ -391,23 +348,6 @@ void SheMov::createMenus(){
     analyzeMenu->addAction(mAnalyzeSeriesA);
     analyzeMenu->addAction(mAnalyzePartsA);
 
-    //Archive Browser view menu
-    mArchiveBrowserViewMenu = new QMenu(tr("&View"), this);
-    QMenu *abHeaderMenu = new QMenu(tr("Show headers"), this);
-    abHeaderMenu->addActions(mArchiveBrowserAG->actions());
-    mArchiveBrowserViewMenu->addMenu(abHeaderMenu);
-    mArchiveBrowserViewMenuA = menuBar()->addMenu(mArchiveBrowserViewMenu);
-    mArchiveBrowserViewMenu->addSeparator();
-    mArchiveBrowserViewMenu->addAction(mArchiveBrowserPlaySelectedA);
-    mArchiveBrowserViewMenu->addSeparator();
-    mArchiveBrowserViewMenu->addAction(mArchiveBrowserExpandAllA);
-    mArchiveBrowserViewMenu->addAction(mArchiveBrowserCollapseAllA);
-    mArchiveBrowserViewMenu->addSeparator();
-    mArchiveBrowserViewMenu->addAction(mArchiveBrowserMoveToBurnA);
-    mArchiveBrowserViewMenu->addAction(mArchiveBrowserMoveToUSBA);
-    mArchiveBrowserViewMenu->addSeparator();
-    mArchiveBrowserViewMenu->addAction(mArchiveBrowserRefreshA);
-
 	QMenu *helpMenu = new QMenu(tr("&Help"), this);
 	helpMenu->addAction(mAboutShemovA);
 	helpMenu->addAction(mAboutQtA);
@@ -415,32 +355,11 @@ void SheMov::createMenus(){
 	helpMenu->addAction(mStatisticsA);
 	menuBar()->addMenu(helpMenu);
 
-    // ArchiveBrowser context menu
-    mArchiveBrowser->archiveTree()->addAction(mArchiveBrowserPlaySelectedA);
-    mArchiveBrowser->archiveTree()->addAction(createSeparator());
-    mArchiveBrowser->archiveTree()->addAction(mArchiveBrowserExpandAllA);
-    mArchiveBrowser->archiveTree()->addAction(mArchiveBrowserCollapseAllA);
-    mArchiveBrowser->archiveTree()->addAction(createSeparator());
-    mArchiveBrowser->archiveTree()->addAction(mArchiveBrowserMoveToBurnA);
-    mArchiveBrowser->archiveTree()->addAction(mArchiveBrowserMoveToUSBA);
-    mArchiveBrowser->archiveTree()->addAction(createSeparator());
-    mArchiveBrowser->archiveTree()->addAction(mArchiveBrowserRefreshA);
-
     // Random
     mRandomEditMenu = mRandomTab->editMenu();
     mRandomEditMenuA = menuBar()->addMenu(mRandomEditMenu);
 }
 
-void SheMov::createToolBar(){
-    mArchiveBrowser->toolBar()->addAction(mArchiveBrowserPlaySelectedA);
-    mArchiveBrowser->toolBar()->addSeparator();
-    mArchiveBrowser->toolBar()->addAction(mArchiveBrowserRefreshA);
-    mArchiveBrowser->toolBar()->addAction(mArchiveBrowserMoveToBurnA);
-    mArchiveBrowser->toolBar()->addAction(mArchiveBrowserMoveToUSBA);
-    mArchiveBrowser->toolBar()->addSeparator();
-    mArchiveBrowser->toolBar()->addAction(mConfigA);
-}
-
 void SheMov::writeSettings(){
 	QSettings s;
     s.setValue("ui/selectedtab", mTab->currentIndex());