r14723 by cbradney - Only reenable Undo Manager after running the sample item if it was enabled

scribus-commit scribus-commit at lists.scribus.net
Mon Feb 15 00:10:52 CET 2010


Revision: 14723
Author: cbradney
Date: 2010-02-14T23:04:17.770156Z
Commit message: Only reenable Undo Manager after running the sample item if it was enabled

Changeset: 
M  /branches/Version135/Scribus/scribus/sampleitem.cpp

Diffs:
Index: scribus/sampleitem.cpp
===================================================================
--- scribus/sampleitem.cpp	(revision 14722)
+++ scribus/sampleitem.cpp	(revision 14723)
@@ -312,7 +312,7 @@
 
 	if (tmpStyle.charStyle().font().isNone())
 		return QPixmap();
-
+	bool oldUndoEnabled=UndoManager::instance()->undoEnabled();
 	UndoManager::instance()->setUndoEnabled(false); // disable undo
 
 	PageItem_TextFrame *previewItem = new PageItem_TextFrame(m_Doc, 0, 0, width, height, 0, "__whiteforpreviewbg__", "__whiteforpreview__");
@@ -363,7 +363,7 @@
 		m_Doc->view()->setScale(sca);
 	m_Doc->appMode = userAppMode;
 //	m_Doc->docParagraphStyles.remove(tmpIndex);
-	UndoManager::instance()->setUndoEnabled(true);
+	UndoManager::instance()->setUndoEnabled(oldUndoEnabled);
 	return QPixmap::fromImage(pm);
 }
 




More information about the scribus-commit mailing list