Make PictureViewer useful

-Implement add and replace files
-use QList<QVariant> (typedef'd) for shoveling data around
-more code shuffling
-new artwork

1 files changed, 49 insertions, 23 deletions

diff --git a/shemov.cpp b/shemov.cpp
index abba97f..fb8f75f 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -602,26 +602,50 @@ void SheMov::createActions(){
 	connect(mSuggestFileA, SIGNAL(triggered()), mATree->filesWidget(), SLOT(suggest()));
     mShowTreeGroup->addAction(mSuggestFileA);
 
-    //picture widget actions
-    mDeletePicFromA = new QAction(QIcon(":/huge_balls_pierced.png"), tr("Delete..."), this);
-    mPicWidget->picView()->addAction(mDeletePicFromA);
-    connect(mDeletePicFromA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(deletePics()));
-    mEditPicsMappingsA = new QAction(QIcon(":/squirting_nipple.png"), tr("Edit mappings..."), this);
-    mPicWidget->picView()->addAction(mEditPicsMappingsA);
-    connect(mEditPicsMappingsA, SIGNAL(triggered()), mPicWidget->picView(), SIGNAL(editPicsMappings()));
-    mRefreshPicsA = new QAction(QIcon(":/huge_bra.png"), tr("Refresh"), this);
-    mPicWidget->picView()->addAction(mRefreshPicsA);
-    connect(mRefreshPicsA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(refresh()));
-    mTogglePicV2A = new QAction(QIcon(":/dick_in_cage.png"), tr("Show/Hide Picture Viewer"), this);
-    mTogglePicV2A->setCheckable(true);
-    connect(mTogglePicV2A, SIGNAL(toggled(bool)), mPicWidget, SLOT(showPicViewer(bool)));
-    mTogglePicV2A->setChecked(false);
-    mPicWidget->setPicViewerAction(mTogglePicV2A);
+    //picture widget
+        // delete + edit
+        mPWDeletePicFromA = new QAction(QIcon(":/huge_balls_pierced.png"), tr("Delete..."), this);
+        mPicWidget->picView()->addAction(mPWDeletePicFromA);
+        connect(mPWDeletePicFromA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(deletePics()));
+        mPWEditPicMappingsA = new QAction(QIcon(":/squirting_nipple.png"), tr("Edit mappings..."), this);
+        mPicWidget->picView()->addAction(mPWEditPicMappingsA);
+        connect(mPWEditPicMappingsA, SIGNAL(triggered()), mPicWidget->picView(), SIGNAL(editPicsMappings()));
+        QAction *pvSep1 = new QAction(this);
+        pvSep1->setSeparator(true);
+        mPicWidget->picView()->addAction(pvSep1);
+
+        // viewer actions
+        mPVToggleA = new QAction(QIcon(":/dick_in_cage.png"), tr("Show/Hide Picture Viewer"), this);
+        mPVToggleA->setCheckable(true);
+        connect(mPVToggleA, SIGNAL(toggled(bool)), mPicWidget, SLOT(showPicViewer(bool)));
+        mPVToggleA->setChecked(false);
+        mPicWidget->picView()->addAction(mPVToggleA);
+        QSignalMapper *PVAddMapper = new QSignalMapper(this);
+        mPVAddA = new QAction(QIcon(":/used_tampon.png"), tr("Add selected"), this);
+        connect(mPVAddA, SIGNAL(triggered()), PVAddMapper, SLOT(map()));
+        PVAddMapper->setMapping(mPVAddA, false);
+        mPicWidget->picView()->addAction(mPVAddA);
+        mPVReplaceA = new QAction(QIcon(":/clean_tampon.png"), tr("Replace with selected"), this);
+        connect(mPVReplaceA, SIGNAL(triggered()), PVAddMapper, SLOT(map()));
+        PVAddMapper->setMapping(mPVReplaceA, true);
+        mPicWidget->picView()->addAction(mPVReplaceA);
+        connect(PVAddMapper, SIGNAL(mapped(int)), mPicWidget->picView(), SLOT(setPVData(int)));
+        QAction *pvSep2 = new QAction(this);
+        pvSep2->setSeparator(true);
+        mPicWidget->picView()->addAction(pvSep2);
+
+        // refresh
+        mPWRefreshA = new QAction(QIcon(":/huge_bra.png"), tr("Refresh"), this);
+        mPicWidget->picView()->addAction(mPWRefreshA);
+        connect(mPWRefreshA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(refresh()));
+
+
+        mPicWidget->setPicViewerAction(mPVToggleA);
     //don't add actions with checkable(true) unless you know what you're doing!
     mPicActionGroup = new QActionGroup(this);
-    mPicActionGroup->addAction(mDeletePicFromA);
-    mPicActionGroup->addAction(mEditPicsMappingsA);
-    mPicActionGroup->addAction(mRefreshPicsA);
+    mPicActionGroup->addAction(mPWDeletePicFromA);
+    mPicActionGroup->addAction(mPWEditPicMappingsA);
+    mPicActionGroup->addAction(mPWRefreshA);
 
 	// misc
 	mOpenWithMapperFS = new QSignalMapper(this);
@@ -695,8 +719,8 @@ void SheMov::createMenus(){
 
     //Pictures edit menu
     mEditPicMenu = new QMenu(tr("&Edit"), this);
-    mEditPicMenu->addAction(mDeletePicFromA);
-    mEditPicMenu->addAction(mEditPicsMappingsA);
+    mEditPicMenu->addAction(mPWDeletePicFromA);
+    mEditPicMenu->addAction(mPWEditPicMappingsA);
     mEditPicMenuA = menuBar()->addMenu(mEditPicMenu);
 
 	//TreeView view menu
@@ -739,9 +763,11 @@ void SheMov::createMenus(){
 
     //Pictures view menu
     mPicViewMenu = new QMenu(tr("&View"), this);
-    mPicViewMenu->addAction(mTogglePicV2A);
+    mPicViewMenu->addAction(mPVToggleA);
+    mPicViewMenu->addAction(mPVAddA);
+    mPicViewMenu->addAction(mPVReplaceA);
     mPicViewMenu->addSeparator();
-    mPicViewMenu->addAction(mRefreshPicsA);
+    mPicViewMenu->addAction(mPWRefreshA);
     mViewPicMenuA = menuBar()->addMenu(mPicViewMenu);
 
 	QMenu *helpMenu = new QMenu(tr("&Help"), this);
@@ -921,7 +947,7 @@ void SheMov::createToolBar(){
 	toolBar->addAction(mFilterFavoritesA);
 	toolBar->addSeparator();
     toolBar->addActions(mPicActionGroup->actions());
-    toolBar->addAction(mTogglePicV2A);
+    toolBar->addAction(mPVToggleA);
     toolBar->addSeparator();
 	toolBar->addAction(mHoverPicsA);
 	toolBar->addAction(mHoverArchiveA);