View Issue Details

Jump to NotesJump to History
IDProjectCategoryView StatusDate SubmittedLast Update
0012793ScribusGeneralpublic2014-10-26 22:272014-10-27 19:08
ReporterFirasH Assigned ToFirasH  
PrioritynormalSeveritycrashReproducibilityalways
Status closedResolutionfixed 
Platformx86_64OSopenSUSEOS Version13.2
Product Version1.5.0svn 
Target Version1.5.0Fixed in Version1.5.0svn 
Summary0012793: [TESTED-PATCH] Scribus ui/menu entries might cause crash while drawing a Bezier Curve
DescriptionScribus ui/menu entries might cause crash while drawing a Bezier Curve.
I'll probably upload a patch tomorrow...
Steps To Reproduce0) Create a new document
1) Go to: Insert > Bezier Curve
2) Start drawing a Bezier Curve (2 nodes at least)
3) Go to: Item > Send to Layer > Background (or from lower UI)
          Item > Send to > Patterns/Inline Items
          Item > Convert to > Polygon/Symbol
          Page > Insert...

(and other ones, probably the same that triggered crashes with nodes/polygon)
Now Bezier Curve is active.

4) Click on canvas

Scribus crashes due to Signal 11

(possible fix: setSpecialEditMode(true) while in modeDrawBezierLine?)
          
Additional Information1.5.0.svn (19610)
TagsNo tags attached.
PatchYes

Relationships

related to 0012760 closedFirasH Node edit mode does not manage correctly enabled/disabled menu entries 

Activities

FirasH

2014-10-27 14:00

reporter  

12793-Patch.diff (2,317 bytes)    
Index: scribus/appmodehelper.cpp
===================================================================
--- scribus/appmodehelper.cpp	(revisione 19611)
+++ scribus/appmodehelper.cpp	(copia locale)
@@ -147,6 +147,9 @@
				doc->view()->horizRuler->update();
			}
			break;
+		case modeDrawBezierLine:
+			setSpecialEditMode(false);
+			break;
		case modeEditTable:
			if (newMode != modeEditTable)
			{
@@ -255,6 +258,7 @@
			break;
		case modeDrawBezierLine:
			{
+				setSpecialEditMode(true);
				if ((doc->m_Selection->count() != 0) && (!PrefsManager::instance()->appPrefs.uiPrefs.stickyTools))
					doc->view()->Deselect(true);
				doc->view()->FirstPoly = true;
@@ -325,13 +329,11 @@
			break;
		case modeEditSpiral:
			setSpecialEditMode(true);
-			scmw->outlinePalette->setEnabled(false);
			break;
		case modeEditTable:
			{
				if (oldMode != modeEditTable)
				{
-					scmw->outlinePalette->setEnabled(false);
					scmw->charPalette->setEnabled(true, currItem);
					(*a_scrActions)["insertSampleText"]->setEnabled(true);
					(*a_scrActions)["toolsEditWithStoryEditor"]->setEnabled(true);
@@ -356,9 +358,10 @@
		(*a_scrActions)["itemSendToPattern"]->setEnabled(false);
		(*a_scrActions)["itemSendToInline"]->setEnabled(false);
	}
-	scmw->enablePalettes(!doc->inAnEditMode());
-	scmw->pageSelector->setEnabled(!doc->inAnEditMode());
-	scmw->layerMenu->setEnabled(!doc->inAnEditMode());
+	bool setter = (doc->inAnEditMode() || doc->appMode == modeDrawBezierLine) ? false : true;
+	scmw->enablePalettes(setter);
+	scmw->pageSelector->setEnabled(setter);
+	scmw->layerMenu->setEnabled(setter);
	emit AppModeChanged(oldMode, newMode);
	a_actMgr->connectModeActions();
	PluginManager::instance().enablePluginActionsForSelection(scmw);
@@ -897,9 +900,10 @@
		(*a_scrActions)["itemLock"]->setChecked(currItem->locked());
		(*a_scrActions)["itemLockSize"]->setChecked(currItem->sizeLocked());
		(*a_scrActions)["itemPrintingEnabled"]->setChecked(currItem->printEnabled());
-		scmw->enablePalettes(!inAnEditMode);
-		scmw->pageSelector->setEnabled(!inAnEditMode);
-		scmw->layerMenu->setEnabled(!inAnEditMode);
+		bool setter = (inAnEditMode || doc->appMode == modeDrawBezierLine) ? false : true;
+		scmw->enablePalettes(setter);
+		scmw->pageSelector->setEnabled(setter);
+		scmw->layerMenu->setEnabled(setter);
	}

 }
12793-Patch.diff (2,317 bytes)   

FirasH

2014-10-27 14:04

reporter   ~0034158

Last edited: 2014-10-27 14:30

 The patch is working, but as soon as a Bezier node is added menu entries are re-enabled (palettes are ok)... This is the same behaviour as in 0012760, so no idea how to fix the second part, likely somewhere outside of appmodehelper.cpp

Edit: not all the menu entries, investigating...

FirasH

2014-10-27 14:27

reporter  

12793-PatchVersion2.diff (2,855 bytes)    
Index: scribus/appmodehelper.cpp
===================================================================
--- scribus/appmodehelper.cpp	(revisione 19611)
+++ scribus/appmodehelper.cpp	(copia locale)
@@ -147,6 +147,9 @@
				doc->view()->horizRuler->update();
			}
			break;
+		case modeDrawBezierLine:
+			setSpecialEditMode(false);
+			break;
		case modeEditTable:
			if (newMode != modeEditTable)
			{
@@ -255,6 +258,7 @@
			break;
		case modeDrawBezierLine:
			{
+				setSpecialEditMode(true);
				if ((doc->m_Selection->count() != 0) && (!PrefsManager::instance()->appPrefs.uiPrefs.stickyTools))
					doc->view()->Deselect(true);
				doc->view()->FirstPoly = true;
@@ -325,13 +329,11 @@
			break;
		case modeEditSpiral:
			setSpecialEditMode(true);
-			scmw->outlinePalette->setEnabled(false);
			break;
		case modeEditTable:
			{
				if (oldMode != modeEditTable)
				{
-					scmw->outlinePalette->setEnabled(false);
					scmw->charPalette->setEnabled(true, currItem);
					(*a_scrActions)["insertSampleText"]->setEnabled(true);
					(*a_scrActions)["toolsEditWithStoryEditor"]->setEnabled(true);
@@ -351,14 +353,12 @@
			//No doc open?
			break;
	}
-	if (doc->inAnEditMode())
-	{
-		(*a_scrActions)["itemSendToPattern"]->setEnabled(false);
-		(*a_scrActions)["itemSendToInline"]->setEnabled(false);
-	}
-	scmw->enablePalettes(!doc->inAnEditMode());
-	scmw->pageSelector->setEnabled(!doc->inAnEditMode());
-	scmw->layerMenu->setEnabled(!doc->inAnEditMode());
+	bool setter = (doc->inAnEditMode() || doc->appMode == modeDrawBezierLine) ? false : true;
+	(*a_scrActions)["itemSendToPattern"]->setEnabled(setter);
+	(*a_scrActions)["itemSendToInline"]->setEnabled(setter);
+	scmw->enablePalettes(setter);
+	scmw->pageSelector->setEnabled(setter);
+	scmw->layerMenu->setEnabled(setter);
	emit AppModeChanged(oldMode, newMode);
	a_actMgr->connectModeActions();
	PluginManager::instance().enablePluginActionsForSelection(scmw);
@@ -889,17 +889,15 @@
				(*a_scrActions)["itemLowerToBottom"]->setEnabled(haveSameParent);
			}
		}
-		if (inAnEditMode)
-		{
-			(*a_scrActions)["itemSendToPattern"]->setEnabled(false);
-			(*a_scrActions)["itemSendToInline"]->setEnabled(false);
-		}
		(*a_scrActions)["itemLock"]->setChecked(currItem->locked());
		(*a_scrActions)["itemLockSize"]->setChecked(currItem->sizeLocked());
		(*a_scrActions)["itemPrintingEnabled"]->setChecked(currItem->printEnabled());
-		scmw->enablePalettes(!inAnEditMode);
-		scmw->pageSelector->setEnabled(!inAnEditMode);
-		scmw->layerMenu->setEnabled(!inAnEditMode);
+		bool setter = (inAnEditMode || doc->appMode == modeDrawBezierLine) ? false : true;
+		(*a_scrActions)["itemSendToPattern"]->setEnabled(setter);
+		(*a_scrActions)["itemSendToInline"]->setEnabled(setter);
+		scmw->enablePalettes(setter);
+		scmw->pageSelector->setEnabled(setter);
+		scmw->layerMenu->setEnabled(setter);
	}

 }
12793-PatchVersion2.diff (2,855 bytes)   

FirasH

2014-10-27 14:37

reporter   ~0034159

"12793-PatchVersion2" fixes Item > Send to > re-enabled entries.

FirasH

2014-10-27 18:41

reporter   ~0034161

Worked a bit on this issue and ended up with "12793-FinalPatch".
Its tested and fixes completely the issue reported here and in 0012760.

FirasH

2014-10-27 18:42

reporter  

12793-FinalPatch.diff (13,539 bytes)    
Index: scribus/appmodehelper.cpp
===================================================================
--- scribus/appmodehelper.cpp	(revisione 19611)
+++ scribus/appmodehelper.cpp	(copia locale)
@@ -147,6 +147,9 @@
				doc->view()->horizRuler->update();
			}
			break;
+		case modeDrawBezierLine:
+			setSpecialEditMode(false);
+			break;
		case modeEditTable:
			if (newMode != modeEditTable)
			{
@@ -255,6 +258,7 @@
			break;
		case modeDrawBezierLine:
			{
+				setSpecialEditMode(true);
				if ((doc->m_Selection->count() != 0) && (!PrefsManager::instance()->appPrefs.uiPrefs.stickyTools))
					doc->view()->Deselect(true);
				doc->view()->FirstPoly = true;
@@ -325,13 +329,11 @@
			break;
		case modeEditSpiral:
			setSpecialEditMode(true);
-			scmw->outlinePalette->setEnabled(false);
			break;
		case modeEditTable:
			{
				if (oldMode != modeEditTable)
				{
-					scmw->outlinePalette->setEnabled(false);
					scmw->charPalette->setEnabled(true, currItem);
					(*a_scrActions)["insertSampleText"]->setEnabled(true);
					(*a_scrActions)["toolsEditWithStoryEditor"]->setEnabled(true);
@@ -473,8 +475,8 @@
			(*a_scrActions)["fileImportText"]->setEnabled(false);
			(*a_scrActions)["fileImportText2"]->setEnabled(false);
			(*a_scrActions)["fileImportImage"]->setEnabled(true);
-			(*a_scrActions)["editCut"]->setEnabled(true);
-			(*a_scrActions)["editCopy"]->setEnabled(true);
+			(*a_scrActions)["editCut"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["editCopy"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["editClearContents"]->setEnabled(true);
			(*a_scrActions)["editTruncateContents"]->setEnabled(true);
			(*a_scrActions)["editSearchReplace"]->setEnabled(false);
@@ -483,13 +485,13 @@
			(*a_scrActions)["itemDuplicate"]->setEnabled(true);
			(*a_scrActions)["itemMulDuplicate"]->setEnabled(true);
			(*a_scrActions)["itemTransform"]->setEnabled(true);
-			(*a_scrActions)["itemDelete"]->setEnabled(true);
+			(*a_scrActions)["itemDelete"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["itemRaise"]->setEnabled(true);
			(*a_scrActions)["itemLower"]->setEnabled(true);
			(*a_scrActions)["itemRaiseToTop"]->setEnabled(true);
			(*a_scrActions)["itemLowerToBottom"]->setEnabled(true);
-			(*a_scrActions)["itemSendToPattern"]->setEnabled(true);
-			(*a_scrActions)["itemSendToInline"]->setEnabled(true);
+			(*a_scrActions)["itemSendToPattern"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["itemSendToInline"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["itemAdjustFrameToImage"]->setEnabled(true);
			(*a_scrActions)["itemAdjustImageToFrame"]->setEnabled(true);
			(*a_scrActions)["itemExtendedImageProperties"]->setEnabled(currItem->pixm.imgInfo.valid);
@@ -510,8 +512,8 @@
			(*a_scrActions)["toolsLinkTextFrame"]->setEnabled(false);
			(*a_scrActions)["toolsEditContents"]->setEnabled(currItem->ScaleType);
			(*a_scrActions)["toolsEditWithStoryEditor"]->setEnabled(false);
-			(*a_scrActions)["toolsRotate"]->setEnabled(true);
-			(*a_scrActions)["toolsCopyProperties"]->setEnabled(true);
+			(*a_scrActions)["toolsRotate"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["toolsCopyProperties"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["itemImageIsVisible"]->setChecked(currItem->imageShown());
			(*a_scrActions)["itemToggleInlineImage"]->setChecked(currItem->isImageInline());
			(*a_scrActions)["itemPreviewFull"]->setChecked(currItem->pixm.imgInfo.lowResType==(*a_scrActions)["itemPreviewFull"]->actionInt());
@@ -525,8 +527,8 @@
			(*a_scrActions)["fileImportImage"]->setEnabled(false);
			(*a_scrActions)["fileImportAppendText"]->setEnabled(true);
			(*a_scrActions)["fileExportText"]->setEnabled(true);
-			(*a_scrActions)["editCut"]->setEnabled(true);
-			(*a_scrActions)["editCopy"]->setEnabled(true);
+			(*a_scrActions)["editCut"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["editCopy"]->setEnabled(!inAnEditMode);
			//scrMenuMgr->setMenuEnabled("EditContents", true);
			(*a_scrActions)["editClearContents"]->setEnabled(true);
			(*a_scrActions)["editTruncateContents"]->setEnabled(true);
@@ -537,14 +539,14 @@
			(*a_scrActions)["itemDuplicate"]->setEnabled(true);
			(*a_scrActions)["itemMulDuplicate"]->setEnabled(true);
			(*a_scrActions)["itemTransform"]->setEnabled(true);
-			(*a_scrActions)["itemDelete"]->setEnabled(true);
+			(*a_scrActions)["itemDelete"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["itemRaise"]->setEnabled(true);
			(*a_scrActions)["itemLower"]->setEnabled(true);
			(*a_scrActions)["itemRaiseToTop"]->setEnabled(true);
			(*a_scrActions)["itemLowerToBottom"]->setEnabled(true);
			//scrMenuMgr->setMenuEnabled("itemSendToScrapbook", true);
-			(*a_scrActions)["itemSendToPattern"]->setEnabled(true);
-			(*a_scrActions)["itemSendToInline"]->setEnabled(true);
+			(*a_scrActions)["itemSendToPattern"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["itemSendToInline"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["itemAdjustFrameToImage"]->setEnabled(false);
			(*a_scrActions)["itemAdjustImageToFrame"]->setEnabled(false);
			(*a_scrActions)["itemExtendedImageProperties"]->setEnabled(false);
@@ -561,8 +563,8 @@
			(*a_scrActions)["itemConvertToTextFrame"]->setEnabled(false);
			(*a_scrActions)["itemConvertToSymbolFrame"]->setEnabled(!inAnEditMode);

-			(*a_scrActions)["toolsRotate"]->setEnabled(true);
-			(*a_scrActions)["toolsCopyProperties"]->setEnabled(true);
+			(*a_scrActions)["toolsRotate"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["toolsCopyProperties"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["toolsEditWithStoryEditor"]->setEnabled(true);
			(*a_scrActions)["insertSampleText"]->setEnabled(true);
			//scrMenuMgr->setMenuEnabled("InsertMark",true);
@@ -609,9 +611,9 @@

			break;
		case PageItem::Table:
-			(*a_scrActions)["editCut"]->setEnabled(true);
-			(*a_scrActions)["editCopy"]->setEnabled(true);
-			(*a_scrActions)["toolsRotate"]->setEnabled(true);
+			(*a_scrActions)["editCut"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["editCopy"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["toolsRotate"]->setEnabled(!inAnEditMode);
			if (doc->appMode == modeEditTable)
			{
				PageItem *i2 = currItem->asTable()->activeCell().textFrame();
@@ -627,8 +629,8 @@
			(*a_scrActions)["fileImportImage"]->setEnabled(false);
			(*a_scrActions)["fileImportAppendText"]->setEnabled(true);
			(*a_scrActions)["fileExportText"]->setEnabled(true);
-			(*a_scrActions)["editCut"]->setEnabled(true);
-			(*a_scrActions)["editCopy"]->setEnabled(true);
+			(*a_scrActions)["editCut"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["editCopy"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["editClearContents"]->setEnabled(false);
			(*a_scrActions)["editTruncateContents"]->setEnabled(false);
			(*a_scrActions)["editSearchReplace"]->setEnabled(false);
@@ -638,14 +640,14 @@
			(*a_scrActions)["itemDuplicate"]->setEnabled(true);
			(*a_scrActions)["itemMulDuplicate"]->setEnabled(true);
			(*a_scrActions)["itemTransform"]->setEnabled(true);
-			(*a_scrActions)["itemDelete"]->setEnabled(true);
+			(*a_scrActions)["itemDelete"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["itemRaise"]->setEnabled(true);
			(*a_scrActions)["itemLower"]->setEnabled(true);
			(*a_scrActions)["itemRaiseToTop"]->setEnabled(true);
			(*a_scrActions)["itemLowerToBottom"]->setEnabled(true);
			//		(*a_scrActions)["itemSendToScrapbook"]->setEnabled(true);
-			(*a_scrActions)["itemSendToPattern"]->setEnabled(true);
-			(*a_scrActions)["itemSendToInline"]->setEnabled(true);
+			(*a_scrActions)["itemSendToPattern"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["itemSendToInline"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["itemAdjustFrameToImage"]->setEnabled(false);
			(*a_scrActions)["itemAdjustImageToFrame"]->setEnabled(false);
			(*a_scrActions)["itemExtendedImageProperties"]->setEnabled(false);
@@ -664,8 +666,8 @@
			(*a_scrActions)["itemConvertToTextFrame"]->setEnabled(false);
			(*a_scrActions)["itemConvertToSymbolFrame"]->setEnabled(true);

-			(*a_scrActions)["toolsRotate"]->setEnabled(true);
-			(*a_scrActions)["toolsCopyProperties"]->setEnabled(true);
+			(*a_scrActions)["toolsRotate"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["toolsCopyProperties"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["toolsEditContents"]->setEnabled(false);
			(*a_scrActions)["toolsEditWithStoryEditor"]->setEnabled(true);
			(*a_scrActions)["toolsLinkTextFrame"]->setEnabled(false);
@@ -679,8 +681,8 @@
			(*a_scrActions)["fileImportImage"]->setEnabled(false);
			(*a_scrActions)["fileImportAppendText"]->setEnabled(false);
			(*a_scrActions)["fileExportText"]->setEnabled(false);
-			(*a_scrActions)["editCut"]->setEnabled(true);
-			(*a_scrActions)["editCopy"]->setEnabled(true);
+			(*a_scrActions)["editCut"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["editCopy"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["editClearContents"]->setEnabled(false);
			(*a_scrActions)["editTruncateContents"]->setEnabled(false);
			(*a_scrActions)["editSearchReplace"]->setEnabled(false);
@@ -690,13 +692,13 @@
			(*a_scrActions)["itemDuplicate"]->setEnabled(true);
			(*a_scrActions)["itemMulDuplicate"]->setEnabled(true);
			(*a_scrActions)["itemTransform"]->setEnabled(true);
-			(*a_scrActions)["itemDelete"]->setEnabled(true);
+			(*a_scrActions)["itemDelete"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["itemRaise"]->setEnabled(true);
			(*a_scrActions)["itemLower"]->setEnabled(true);
			(*a_scrActions)["itemRaiseToTop"]->setEnabled(true);
			(*a_scrActions)["itemLowerToBottom"]->setEnabled(true);
-			(*a_scrActions)["itemSendToPattern"]->setEnabled(true);
-			(*a_scrActions)["itemSendToInline"]->setEnabled(true);
+			(*a_scrActions)["itemSendToPattern"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["itemSendToInline"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["itemAdjustFrameToImage"]->setEnabled(false);
			(*a_scrActions)["itemAdjustImageToFrame"]->setEnabled(false);
			(*a_scrActions)["itemExtendedImageProperties"]->setEnabled(false);
@@ -760,8 +762,8 @@
			(*a_scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(false);
			(*a_scrActions)["toolsUnlinkTextFrameWithTextCut"]->setEnabled(false);
			(*a_scrActions)["toolsLinkTextFrame"]->setEnabled(false);
-			(*a_scrActions)["toolsRotate"]->setEnabled(true);
-			(*a_scrActions)["toolsCopyProperties"]->setEnabled(true);
+			(*a_scrActions)["toolsRotate"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["toolsCopyProperties"]->setEnabled(!inAnEditMode);
			break;
	}

@@ -825,7 +827,7 @@

	if (docSelectionCount != 0)
	{
-		(*a_scrActions)["itemLock"]->setEnabled(true);
+		(*a_scrActions)["itemLock"]->setEnabled(!inAnEditMode);
		(*a_scrActions)["itemLockSize"]->setEnabled(true);
		(*a_scrActions)["itemPrintingEnabled"]->setEnabled(true);
		if (currItem->isGroup())
@@ -856,8 +858,8 @@
			(*a_scrActions)["itemRaiseToTop"]->setEnabled(false);
			(*a_scrActions)["itemRaise"]->setEnabled(false);
			(*a_scrActions)["itemLower"]->setEnabled(false);
-			(*a_scrActions)["itemSendToPattern"]->setEnabled(true);
-			(*a_scrActions)["itemSendToInline"]->setEnabled(true);
+			(*a_scrActions)["itemSendToPattern"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["itemSendToInline"]->setEnabled(!inAnEditMode);
			(*a_scrActions)["editCut"]->setEnabled(false);
			(*a_scrActions)["editClearContents"]->setEnabled(false);
			(*a_scrActions)["editTruncateContents"]->setEnabled(false);
@@ -868,9 +870,9 @@
			(*a_scrActions)["itemDuplicate"]->setEnabled(true);
			(*a_scrActions)["itemMulDuplicate"]->setEnabled(true);
			(*a_scrActions)["itemTransform"]->setEnabled(true);
-			(*a_scrActions)["itemDelete"]->setEnabled(true);
-			(*a_scrActions)["itemSendToPattern"]->setEnabled(true);
-			(*a_scrActions)["itemSendToInline"]->setEnabled(true);
+			(*a_scrActions)["itemDelete"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["itemSendToPattern"]->setEnabled(!inAnEditMode);
+			(*a_scrActions)["itemSendToInline"]->setEnabled(!inAnEditMode);
			if (docSelectionCount > 1)
			{
				bool haveSameParent = true;
@@ -1065,6 +1067,9 @@
 #ifdef HAVE_OSG
	(*a_scrActions)["toolsPDFAnnot3D"]->setEnabled(b2);
 #endif
+	(*a_scrActions)["editCopy"]->setEnabled(b2);
+	(*a_scrActions)["editCut"]->setEnabled(b2);
+	(*a_scrActions)["editPaste"]->setEnabled(b2);
	(*a_scrActions)["itemDelete"]->setEnabled(b2);
	(*a_scrActions)["itemLock"]->setEnabled(b2);
	(*a_scrActions)["itemConvertToTextFrame"]->setEnabled(b2);
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp	(revisione 19611)
+++ scribus/scribusdoc.cpp	(copia locale)
@@ -757,21 +757,19 @@

 bool ScribusDoc::inAnEditMode() const
 {
-	bool inEditMode=false;
+	bool inEditMode = (appMode == modeEdit ||
+					   appMode == modeEditTable ||
+					   appMode == modeEditSpiral ||
+					   appMode == modeEditGradientVectors ||
+					   appMode == modeEditClip ||
+					   appMode == modeEditMeshGradient ||
+					   appMode == modeEditArc ||
+					   appMode == modeEditMeshPatch ||
+					   appMode == modeEditWeldPoint ||
+					   appMode == modeEditPolygon ||
+					   appMode == modeDrawBezierLine
+					   ) ? true : false;

-	if (appMode == modeEdit ||
-		appMode == modeEditTable ||
-		appMode == modeEditSpiral ||
-		appMode == modeEditGradientVectors ||
-		appMode == modeEditClip ||
-		appMode == modeEditMeshGradient ||
-		appMode == modeEditArc ||
-		appMode == modeEditMeshPatch ||
-		appMode == modeEditWeldPoint ||
-		appMode == modeEditPolygon
-		)
-		inEditMode=true;
-
	return inEditMode;
 }
12793-FinalPatch.diff (13,539 bytes)   

FirasH

2014-10-27 19:08

reporter   ~0034163

Thanks cbradney!
Fixed in 1.5.0.svn (19612).

Issue History

Date Modified Username Field Change
2014-10-26 22:27 FirasH New Issue
2014-10-26 22:27 FirasH Status new => assigned
2014-10-26 22:27 FirasH Assigned To => FirasH
2014-10-27 13:59 FirasH Relationship added related to 0012760
2014-10-27 14:00 FirasH File Added: 12793-Patch.diff
2014-10-27 14:04 FirasH Patch No => Yes
2014-10-27 14:04 FirasH Note Added: 0034158
2014-10-27 14:06 FirasH Note Edited: 0034158
2014-10-27 14:27 FirasH File Added: 12793-PatchVersion2.diff
2014-10-27 14:30 FirasH Note Edited: 0034158
2014-10-27 14:37 FirasH Note Added: 0034159
2014-10-27 18:41 FirasH Note Added: 0034161
2014-10-27 18:42 FirasH Summary Scribus ui/menu entries might cause crash while drawing a Bezier Curve => [TESTED-PATCH] Scribus ui/menu entries might cause crash while drawing a Bezier Curve
2014-10-27 18:42 FirasH File Added: 12793-FinalPatch.diff
2014-10-27 18:51 cbradney Status assigned => resolved
2014-10-27 18:51 cbradney Resolution open => fixed
2014-10-27 19:08 FirasH Note Added: 0034163
2014-10-27 19:08 FirasH Status resolved => closed
2014-10-27 19:08 FirasH Fixed in Version => 1.5.0svn