r19616 by craig - #12796: Apply patch for modeEditClip

[scribus-commit]

Author: craig
Date: Tue Oct 28 21:54:37 2014
New Revision: 19616

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19616
Log:
#12796: Apply patch for modeEditClip

Modified:
    trunk/Scribus/scribus/appmodehelper.cpp
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19616&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Tue Oct 28 21:54:37 2014
@@ -100,11 +100,6 @@
 	if (!doc->m_Selection->isEmpty())
 		currItem = doc->m_Selection->itemAt(0);
 
-	if (oldMode == modeEditClip && newMode != modeEditClip)
-		scmw->NoFrameEdit();
-	else if (oldMode != modeEditClip && newMode == modeEditClip)
-		scmw->ToggleFrameEdit();
-
 	//Ugly hack but I have absolutly no idea about how to do this in another way
 	if(UndoManager::undoEnabled() && currItem && oldMode != newMode && (newMode == modeEditMeshPatch || oldMode == modeEditMeshPatch ||
 																		newMode == modeEditMeshGradient || oldMode == modeEditMeshGradient ||
@@ -133,7 +128,7 @@
 	{
 		case modeEdit:
 			{
-				if (newMode!=modeEdit)
+				if (newMode != modeEdit)
 					a_actMgr->restoreActionShortcutsPostEditMode();
 				scmw->zoomSpinBox->setFocusPolicy(Qt::ClickFocus);
 				scmw->pageSelector->setFocusPolicy(Qt::ClickFocus);
@@ -150,6 +145,12 @@
 				}
 				doc->view()->horizRuler->textMode(false);
 				doc->view()->horizRuler->update();
+			}
+			break;
+		case modeEditClip:
+			{
+				if (newMode != modeEditClip)
+					scmw->NoFrameEdit();
 			}
 			break;
 		case modeDrawBezierLine:
@@ -252,6 +253,12 @@
 				}
 			}
 			break;
+		case modeEditClip:
+			{
+				if (oldMode != modeEditClip)
+					scmw->ToggleFrameEdit();
+			}
+			break;
 		case modeDrawLine:
 			break;
 		case modeRotation:
@@ -312,8 +319,6 @@
 					(*a_scrActions)["toolsCopyProperties"]->setEnabled(true);
 				}
 			}
-			break;
-		case modeEditClip:
 			break;
 		case modeDrawLatex:
 			break;

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19616&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Tue Oct 28 21:54:37 2014
@@ -5693,12 +5693,6 @@
 	if (!doc)
 		return;
 
-	if (doc->appMode == modeEditClip)
-	{
-		NoFrameEdit();
-		return;
-	}
-
 	nodePalette->setDoc(doc, view);
 	nodePalette->MoveN();
 	nodePalette->HaveNode(false, false);