r18001 by craig - Clean up ScribusView::requestMode TODO

[scribus-commit]

Author: craig
Date: Fri Dec 28 17:38:20 2012
New Revision: 18001

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18001
Log:
Clean up ScribusView::requestMode TODO

Modified:
    trunk/Scribus/scribus/scribusview.cpp

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18001&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Fri Dec 28 17:38:20 2012
@@ -607,7 +607,6 @@
  - for submodes, activate the appropiate dialog or palette
  - set a new CanvasMode if necessary
  - call ScribusMainWindow::setAppMode(), which de/activates actions
- TODO:av make this simpler
  */
 void ScribusView::requestMode(int appMode)
 {
@@ -616,31 +615,15 @@
 	switch(appMode) // filter submodes
 	{
 		case submodePaintingDone:   // return to normal mode
-//			appMode = m_previousMode < 0 ? modeNormal : m_previousMode;
 			appMode = modeNormal;
 			m_previousMode = -1;
 			updateNecessary = true;
 			break;
 		case submodeEndNodeEdit:     // return from node/shape editing
-//			appMode = m_previousMode < 0 ? modeNormal : m_previousMode;
 			appMode = modeNormal;
 			m_previousMode = -1;
 			updateNecessary = true;
 			break;
-			/*
-			 case submodeToggleNodeEdit:
-				 if (Doc->appMode == modeEditClip)
-				 {
-					 m_ScMW->setAppMode(m_previousMode < 0 ? modeNormal : m_previousMode);
-					 m_previousMode = -1;
-				 }
-				 else
-				 {
-					 m_previousMode = Doc->appMode;
-					 m_ScMW->setAppMode(modeEditClip);
-				 }
-				 return;
-				 */
 		case submodeLoadPic:         // open GetImage dialog
 			m_ScMW->slotGetContent();
 			appMode = Doc->appMode;
@@ -697,10 +680,6 @@
 	}
 	else
 		m_ScMW->setAppMode(appMode);
-//	if (appMode == modeEdit)
-//	{
-//		m_ScMW->activateWindow();
-//	}
 	if (updateNecessary)
 		updateCanvas();
 }