Make actions local

Define actions in their respective Widgets instead of MainWindow and fix
the menus and toolbars accordingly.

1 files changed, 0 insertions, 61 deletions

diff --git a/shemovcleaner.cpp b/shemovcleaner.cpp
index 3ba0802..c0c6048 100644
--- a/shemovcleaner.cpp
+++ b/shemovcleaner.cpp
@@ -38,7 +38,6 @@ ShemovCleaner::ShemovCleaner(QWidget *parent, Qt::WindowFlags f) : QMainWindow(p
     mTab->addTab(mTorrentTab, tr("&Torrents"));
     mTab->addTab(mFileTab, tr("Fi&les"));
     setCentralWidget(mTab);
-    createActions();
 
     connect(mTorrentTab, SIGNAL(statusMessage(QString)), this, SLOT(statusBarMessage(QString)));
     connect(mTorrentTab, SIGNAL(selectionCountChanged(QString)), this, SLOT(setSelectionCount(QString)));
@@ -119,66 +118,6 @@ void ShemovCleaner::createGlobalActions(){
     Globals::instance()->addAction(configA);
 }
 
-void ShemovCleaner::createActions(){
-    //TorrentWidget
-    mTorRefreshA = new QAction(QIcon(":/refresh.png"), tr("Refresh"), this);
-    connect(mTorRefreshA, SIGNAL(triggered()), mTorrentTab, SLOT(gatherData()));
-    mTorDeleteA = new QAction(QIcon(":/delete.png"), tr("Delete..."), this);
-    connect(mTorDeleteA, SIGNAL(triggered()), mTorrentTab, SLOT(deleteFiles()));
-    mTorMoveA = new QAction(QIcon(":/diaper.png"), tr("Move..."), this);
-    connect(mTorMoveA, SIGNAL(triggered()), mTorrentTab, SLOT(moveFiles()));
-    mTorInfoA = new QAction(QIcon(":/huge_bra.png"), tr("Torrent info..."), this);
-    connect(mTorInfoA, SIGNAL(triggered()), mTorrentTab, SLOT(torrentInfo()));
-    mTorDirA = new QAction(QIcon(":/folder.png"), tr("Select folder..."), this);
-    connect(mTorDirA, SIGNAL(triggered()), mTorrentTab, SLOT(selectDir()));
-    mFnThisCopyToClipA = new QAction(QIcon(":/edit-copy.png"), tr("Copy"), this);
-    connect(mFnThisCopyToClipA, SIGNAL(triggered()), mTorrentTab, SLOT(copyToClipboard()));
-
-    mTorrentTab->toolBar()->addAction(mTorRefreshA);
-    mTorrentTab->toolBar()->addAction(mFnThisCopyToClipA);
-    mTorrentTab->toolBar()->addSeparator();
-    mTorrentTab->toolBar()->addAction(mTorDirA);
-    mTorrentTab->toolBar()->addAction(mTorMoveA);
-    mTorrentTab->toolBar()->addAction(mTorDeleteA);
-    mTorrentTab->toolBar()->addSeparator();
-    mTorrentTab->toolBar()->addAction(mTorInfoA);
-    mTorrentTab->toolBar()->addSeparator();
-    //mTorrentTab->toolBar()->addAction(configA);
-    QMenu *torFileM = new QMenu(tr("File"));
-    torFileM->addAction(mTorDirA);
-    torFileM->addAction(mTorRefreshA);
-    torFileM->addSeparator();
-    //torFileM->addAction(quitA);
-    mTorrentTab->menuBar()->addMenu(torFileM);
-    QMenu *torEditM = new QMenu(tr("Edit"));
-    torEditM->addAction(mTorInfoA);
-    torEditM->addSeparator();
-    torEditM->addAction(mTorRefreshA);
-    torEditM->addAction(mFnThisCopyToClipA);
-    torEditM->addSeparator();
-    torEditM->addAction(mTorMoveA);
-    torEditM->addAction(mTorDeleteA);
-    torEditM->addSeparator();
-    //torEditM->addAction(configA);
-    torEditM->addSeparator();
-    torEditM->addAction(mTorInfoA);
-    mTorrentTab->menuBar()->addMenu(torEditM);
-    mTorrentTab->addAction(mTorInfoA);
-    mTorrentTab->addAction(createSeparator());
-    mTorrentTab->addAction(mTorRefreshA);
-    mTorrentTab->addAction(mFnThisCopyToClipA);
-    mTorrentTab->addAction(createSeparator());
-    mTorrentTab->addAction(mTorMoveA);
-    mTorrentTab->addAction(mTorDeleteA);
-    mTorrentTab->addAction(createSeparator());
-    mTorrentTab->addAction(mTorDirA);
-
-    //TorrentDisplay
-    mTorCopyToClipA = new QAction(QIcon(":/edit-copy.png"), tr("Copy"), this);
-    connect(mTorCopyToClipA, SIGNAL(triggered()), mTorrentTab->torrentDisplay(), SLOT(copyToClipboard()));
-    mTorrentTab->torrentDisplay()->addAction(mTorCopyToClipA);
-}
-
 void ShemovCleaner::openDatabase(){
     QSettings s;
     QString dbhost = s.value("dbhost").toString();