First draft of PictureViewer2

Doesn't do much other than showing a default picture, but it behaves
like a QDialog and positions itself correctly. It's quite a pain in the
ass with a tiling window manager...

1 files changed, 15 insertions, 7 deletions

diff --git a/shemov.cpp b/shemov.cpp
index 63dfd51..0635db3 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -612,6 +612,11 @@ void SheMov::createActions(){
     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);
+    //don't add actions with checkable(true) unless you know what you're doing!
     mPicActionGroup = new QActionGroup(this);
     mPicActionGroup->addAction(mDeletePicFromA);
     mPicActionGroup->addAction(mEditPicsMappingsA);
@@ -733,6 +738,8 @@ void SheMov::createMenus(){
 
     //Pictures view menu
     mPicViewMenu = new QMenu(tr("&View"), this);
+    mPicViewMenu->addAction(mTogglePicV2A);
+    mPicViewMenu->addSeparator();
     mPicViewMenu->addAction(mRefreshPicsA);
     mViewPicMenuA = menuBar()->addMenu(mPicViewMenu);
 
@@ -913,6 +920,7 @@ void SheMov::createToolBar(){
 	toolBar->addAction(mFilterFavoritesA);
 	toolBar->addSeparator();
     toolBar->addActions(mPicActionGroup->actions());
+    toolBar->addAction(mTogglePicV2A);
     toolBar->addSeparator();
 	toolBar->addAction(mHoverPicsA);
 	toolBar->addAction(mHoverArchiveA);
@@ -944,14 +952,14 @@ void SheMov::writeSettings(){
 
 void SheMov::readSettings(){
 	QSettings s;
-	QPoint winPos = s.value("windows/mainpos").toPoint();
-	QSize winSize = s.value("windows/mainsize").toSize();
-	bool winState = s.value("windows/maximized", false).toBool();
-	resize(winSize);
-	move(winPos);
-	if(winState){
+    QPoint winPos = s.value("windows/mainpos").toPoint();
+    QSize winSize = s.value("windows/mainsize").toSize();
+    bool winState = s.value("windows/maximized", false).toBool();
+    resize(winSize);
+    move(winPos);
+    if(winState){
 		setWindowState(Qt::WindowMaximized);
-	}
+    }
 	int currentTab = s.value("ui/selectedtab", 0).toInt();
 	if(currentTab < mTab->count() && currentTab != mTab->currentIndex()){
 		mTab->setCurrentIndex(currentTab);