r16063 by jghali - merge trunk revisions up to r16061

scribus-commit scribus-commit at lists.scribus.net
Sun Dec 5 15:15:49 CET 2010


Author: jghali
Date: Sun Dec  5 14:15:49 2010
New Revision: 16063

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16063
Log:
merge trunk revisions up to r16061

Modified:
    branches/ScribusOIF/OSX-package/inputs/Info.plist
    branches/ScribusOIF/OSX-package/inputs/Scribus.pkg-Info.plist
    branches/ScribusOIF/doc/en/pagetemplate1.html
    branches/ScribusOIF/doc/en/psd.html
    branches/ScribusOIF/doc/en/releases.html
    branches/ScribusOIF/resources/templates/buscard_coll/business_card_collection.sla.gz
    branches/ScribusOIF/scribus/guidemanagercore.cpp
    branches/ScribusOIF/scribus/pdflib_core.cpp
    branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    branches/ScribusOIF/scribus/plugins/svgexplugin/svgexplugin.cpp
    branches/ScribusOIF/scribus/pslib.cpp
    branches/ScribusOIF/scribus/scribus.cpp
    branches/ScribusOIF/scribus/scribus.h
    branches/ScribusOIF/scribus/scribusXml.cpp
    branches/ScribusOIF/scribus/scribuscore.cpp
    branches/ScribusOIF/scribus/scribusdoc.cpp
    branches/ScribusOIF/scribus/scribusdoc.h
    branches/ScribusOIF/scribus/scribusview.cpp

Modified: branches/ScribusOIF/OSX-package/inputs/Info.plist
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/OSX-package/inputs/Info.plist
==============================================================================
--- branches/ScribusOIF/OSX-package/inputs/Info.plist (original)
+++ branches/ScribusOIF/OSX-package/inputs/Info.plist Sun Dec  5 14:15:49 2010
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+\<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
         <key>CFBundleGetInfoString</key>
-        <string>Scribus Installer 1.3.5</string>
+        <string>Scribus Installer 1.5.0</string>
         <key>CFBundleIdentifier</key>
         <string>net.scribus.osxinstaller</string>
         <key>CFBundleName</key>
         <string>Scribus</string>
         <key>CFBundleShortVersionString</key>
-        <string>1.3.5</string>
+        <string>1.5.0</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: branches/ScribusOIF/OSX-package/inputs/Scribus.pkg-Info.plist
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/OSX-package/inputs/Scribus.pkg-Info.plist
==============================================================================
--- branches/ScribusOIF/OSX-package/inputs/Scribus.pkg-Info.plist (original)
+++ branches/ScribusOIF/OSX-package/inputs/Scribus.pkg-Info.plist Sun Dec  5 14:15:49 2010
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
         <key>CFBundleGetInfoString</key>
-        <string>Scribus 1.3.5</string>
+        <string>Scribus 1.5.0</string>
         <key>CFBundleIdentifier</key>
         <string>net.scribus.aqua</string>
         <key>CFBundleName</key>
         <string>Scribus</string>
         <key>CFBundleShortVersionString</key>
-        <string>1.3.5</string>
+        <string>1.5.0</string>
 	<key>IFMajorVersion</key>
 	<integer>0</integer>
 	<key>IFMinorVersion</key>

Modified: branches/ScribusOIF/doc/en/pagetemplate1.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/doc/en/pagetemplate1.html
==============================================================================
--- branches/ScribusOIF/doc/en/pagetemplate1.html (original)
+++ branches/ScribusOIF/doc/en/pagetemplate1.html Sun Dec  5 14:15:49 2010
@@ -7,7 +7,7 @@
 	
 <h2>Working with Master Pages</h2>
 
-<p>Master Pages are the means to add content to pages which have repeating content like page numbers, chapter names, section heads and the like. Users of other page layout applications might be familiar with this concept of a6 static page backgrounds. Fundamental to understanding how they work is that these pages are not editable from the normal page canvas. All items except page numbers are static background items.</p>
+<p>Master Pages are the means to add content to pages which have repeating content like page numbers, chapter names, section heads and the like. Users of other page layout applications might be familiar with this concept of static page backgrounds. Fundamental to understanding how they work is that these pages are not editable from the normal page canvas. All items except page numbers are static background items.</p>
 
 <p>Thoughtful creation of master pages can vastly simplify and speed up the creation of complex documents &ndash; the more complex, the more essential they are. There are several reasons to use Master Pages, among them the ability to automatically add <a href="pagenumber.html">page numbers</a> or avoiding the hassle of inserting objects that are repeatedly used in the same place over and over again.</p>
 

Modified: branches/ScribusOIF/doc/en/psd.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/doc/en/psd.html
==============================================================================
--- branches/ScribusOIF/doc/en/psd.html (original)
+++ branches/ScribusOIF/doc/en/psd.html Sun Dec  5 14:15:49 2010
@@ -23,7 +23,7 @@
 <li>Clipping paths in PSD files will be recognized and can be used for text flow.</li>
 <li>Blending modes which are in the image file can be used to affect the way the image displays and prints. It's also possible to modify blending or to apply other modes between PSD layers. This won't affect the original file.</li>
 <li>In almost all cases Scribus will automatically detect the file encoding, whether it is ASCII, Binary or Binary with JPEG.</li>
-<li>Scribus will handle both PSD and TIFF files, no matter what byte order is used &ndash; PPC Mac/SPARC or PC. If Scribus is run from the command line, you may see harmless error messages about tags in wrong order. Ignore them. </li>
+<!--<li>Scribus will handle both PSD and TIFF files, no matter what byte order is used &ndash; PPC Mac/SPARC or PC. If Scribus is run from the command line, you may see harmless error messages about tags in wrong order. Ignore them. </li>-->
 </ul>
 <p><b>Potential Issues</b></p>
 <ul>

Modified: branches/ScribusOIF/doc/en/releases.html
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/doc/en/releases.html
==============================================================================
--- branches/ScribusOIF/doc/en/releases.html (original)
+++ branches/ScribusOIF/doc/en/releases.html Sun Dec  5 14:15:49 2010
@@ -6,6 +6,7 @@
 <body>
 <h2>Release History</h2>
 <ul>
+<li><b>27/10/2010</b> - Scribus 1.3.9 (devel)  </li>
 <li><b>23/07/2010</b> - Scribus 1.3.8 (devel)  </li>
 <li><b>05/06/2010</b> - Scribus 1.3.7 (devel)  </li>
 <li><b>22/03/2010</b> - Scribus 1.3.6 (devel)  </li>

Modified: branches/ScribusOIF/resources/templates/buscard_coll/business_card_collection.sla.gz
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/resources/templates/buscard_coll/business_card_collection.sla.gz
==============================================================================
Binary files - no diff available.

Modified: branches/ScribusOIF/scribus/guidemanagercore.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/scribus/guidemanagercore.cpp
==============================================================================
--- branches/ScribusOIF/scribus/guidemanagercore.cpp (original)
+++ branches/ScribusOIF/scribus/guidemanagercore.cpp Sun Dec  5 14:15:49 2010
@@ -73,7 +73,7 @@
 				horizontalStdG.append(value);
 				if (UndoManager::undoEnabled())
 				{
-					SimpleState* ss = new SimpleState(Um::AddVGuide, 0, Um::IGuides);
+					SimpleState* ss = new SimpleState(Um::AddHGuide, 0, Um::IGuides);
 					ss->set("ADD_H", value);
 					undoManager->action(m_page, ss);
 				}
@@ -153,7 +153,7 @@
 			horizontalStdG.removeAt(horizontalStdG.indexOf(value));
 			if (UndoManager::undoEnabled())
 			{
-				SimpleState* ss = new SimpleState(Um::DelVGuide, 0, Um::IGuides);
+				SimpleState* ss = new SimpleState(Um::DelHGuide, 0, Um::IGuides);
 				ss->set("REMOVE_H", value);
 				undoManager->action(m_page, ss);
 			}
@@ -345,7 +345,7 @@
 			{
 				for (int i = 0; i < horizontalStdG.count(); ++i)
 				{
-					SimpleState* ss = new SimpleState(Um::DelVGuide, 0, Um::IGuides);
+					SimpleState* ss = new SimpleState(Um::DelHGuide, 0, Um::IGuides);
 					ss->set("REMOVE_H", horizontalStdG[i]);
 					undoManager->action(m_page, ss);
 				}
@@ -412,7 +412,7 @@
 			horizontalStdG.append(to);
 			if (UndoManager::undoEnabled())
 			{
-				SimpleState* ss = new SimpleState(Um::MoveVGuide, 0, Um::IGuides);
+				SimpleState* ss = new SimpleState(Um::MoveHGuide, 0, Um::IGuides);
 				ss->set("MOVE_H_FROM", from);
 				ss->set("MOVE_H_TO", to);
 				undoManager->action(m_page, ss);

Modified: branches/ScribusOIF/scribus/pdflib_core.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/scribus/pdflib_core.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pdflib_core.cpp (original)
+++ branches/ScribusOIF/scribus/pdflib_core.cpp Sun Dec  5 14:15:49 2010
@@ -1016,7 +1016,7 @@
 	{
 		StdFonts.insert("/Helvetica", "");
 	} */
-	QStringList patterns = doc.getUsedPatterns();
+	QStringList patterns = doc.getPatternDependencyList(doc.getUsedPatterns());
 	for (int c = 0; c < patterns.count(); ++c)
 	{
 		ScPattern pa = doc.docPatterns[patterns[c]];

Modified: branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp Sun Dec  5 14:15:49 2010
@@ -913,12 +913,12 @@
 
 void Scribus150Format::writePatterns(ScXmlStreamWriter & docu, const QString& baseDir) 
 {
-	QMap<QString, ScPattern>::Iterator itPat;
-	for (itPat = m_Doc->docPatterns.begin(); itPat != m_Doc->docPatterns.end(); ++itPat)
+	QStringList patterns = m_Doc->getPatternDependencyList(m_Doc->docPatterns.keys());
+	for (int a = 0; a < patterns.count(); a++)
 	{
 		docu.writeStartElement("Pattern");
-		docu.writeAttribute("Name",itPat.key());
-		ScPattern pa = itPat.value();
+		docu.writeAttribute("Name", patterns[a]);
+		ScPattern pa = m_Doc->docPatterns[patterns[a]];
 		docu.writeAttribute("width", pa.width);
 		docu.writeAttribute("height", pa.height);
 		docu.writeAttribute("scaleX", pa.scaleX);

Modified: branches/ScribusOIF/scribus/plugins/svgexplugin/svgexplugin.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/scribus/plugins/svgexplugin/svgexplugin.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/svgexplugin/svgexplugin.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/svgexplugin/svgexplugin.cpp Sun Dec  5 14:15:49 2010
@@ -1957,7 +1957,7 @@
 
 void SVGExPlug::writeBasePatterns()
 {
-	QStringList patterns = m_Doc->getUsedPatterns();
+	QStringList patterns = m_Doc->getPatternDependencyList(m_Doc->getUsedPatterns());
 	for (int c = 0; c < patterns.count(); ++c)
 	{
 		QStack<PageItem*> groupStack;

Modified: branches/ScribusOIF/scribus/pslib.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/scribus/pslib.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pslib.cpp (original)
+++ branches/ScribusOIF/scribus/pslib.cpp Sun Dec  5 14:15:49 2010
@@ -463,7 +463,7 @@
 		PutStream(GrayCalc);
 	Optimization optim = optimization;
 	optimization = OptimizeSize;
-	QStringList patterns = m_Doc->getUsedPatterns();
+	QStringList patterns = m_Doc->getPatternDependencyList(m_Doc->getUsedPatterns());
 	for (int c = 0; c < patterns.count(); ++c)
 	{
 		ScPattern pa = m_Doc->docPatterns[patterns[c]];

Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Sun Dec  5 14:15:49 2010
@@ -8501,7 +8501,7 @@
 		scrActions["toolsPDFAnnot3D"]->setEnabled(false);
 #endif
 		pagePalette->enablePalette(false);
-		QStringList patterns2Del;
+		patternsDependingOnThis.clear();
 		QStringList mainPatterns = doc->docPatterns.keys();
 		for (int a = 0; a < mainPatterns.count(); a++)
 		{
@@ -8510,20 +8510,19 @@
 				QStringList subPatterns;
 				subPatterns = doc->getUsedPatternsHelper(mainPatterns[a], subPatterns);
 				if (subPatterns.contains(temp))
-					patterns2Del.append(mainPatterns[a]);
-			}
-		}
-		patterns2Del.append(temp);
-		symbolPalette->editingStart(patterns2Del);
-		propertiesPalette->Cpal->hideEditedPatterns(patterns2Del);
-		propertiesPalette->Tpal->hideEditedPatterns(patterns2Del);
+					patternsDependingOnThis.prepend(mainPatterns[a]);
+			}
+		}
+		patternsDependingOnThis.prepend(temp);
+		symbolPalette->editingStart(patternsDependingOnThis);
+		propertiesPalette->Cpal->hideEditedPatterns(patternsDependingOnThis);
+		propertiesPalette->Tpal->hideEditedPatterns(patternsDependingOnThis);
 		updateActiveWindowCaption( tr("Editing Symbol: %1").arg(temp));
 	}
 }
 
 void ScribusMainWindow::editSymbolEnd()
 {
-	view->setScale(storedViewScale);
 	view->hideSymbolPage();
 	slotSelect();
 	scrActions["editMasterPages"]->setEnabled(true);
@@ -8563,6 +8562,7 @@
 #endif
 	pagePalette->enablePalette(true);
 	pagePalette->rebuildMasters();
+	view->setScale(storedViewScale);
 	doc->setCurrentPage(doc->DocPages.at(storedPageNum));
 	view->setContentsPos(static_cast<int>(storedViewXCoor * storedViewScale), static_cast<int>(storedViewYCoor * storedViewScale));
 	view->DrawNew();

Modified: branches/ScribusOIF/scribus/scribus.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/scribus/scribus.h
==============================================================================
--- branches/ScribusOIF/scribus/scribus.h (original)
+++ branches/ScribusOIF/scribus/scribus.h Sun Dec  5 14:15:49 2010
@@ -254,6 +254,7 @@
 	ScMWMenuManager* scrMenuMgr;
 	ActionManager* actionManager;
 	QStringList RecentDocs;
+	QStringList patternsDependingOnThis;
 
 public slots:
 	void languageChange();

Modified: branches/ScribusOIF/scribus/scribusXml.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/scribus/scribusXml.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribusXml.cpp (original)
+++ branches/ScribusOIF/scribus/scribusXml.cpp Sun Dec  5 14:15:49 2010
@@ -2450,7 +2450,7 @@
 			}
 		}
 	}
-	QStringList patterns = doc->getUsedPatternsSelection(selection);
+	QStringList patterns = doc->getPatternDependencyList(doc->getUsedPatternsSelection(selection));
 	for (int c = 0; c < patterns.count(); ++c)
 	{
 		ScPattern& pa = doc->docPatterns[patterns[c]];

Modified: branches/ScribusOIF/scribus/scribuscore.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/scribus/scribuscore.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribuscore.cpp (original)
+++ branches/ScribusOIF/scribus/scribuscore.cpp Sun Dec  5 14:15:49 2010
@@ -360,7 +360,7 @@
 		if (profileName.isEmpty())
 		{
 			if (showInfo)
-				sDebug(QString("Color profile %s is broken : no valid description").arg(profInfo.file));
+				sDebug(QString("Color profile %1 is broken : no valid description").arg(profInfo.file));
 			continue;
 		}
 		if (!profInfo.debug.isEmpty())

Modified: branches/ScribusOIF/scribus/scribusdoc.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/scribus/scribusdoc.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribusdoc.cpp (original)
+++ branches/ScribusOIF/scribus/scribusdoc.cpp Sun Dec  5 14:15:49 2010
@@ -2831,11 +2831,23 @@
 				results.append(FrameItems.at(c)->patternMask());
 		}
 	}
-	for (int c = 0; c < results.count(); ++c)
-	{
-		QStringList pats = getUsedPatternsHelper(results[c], results);
-		if (!pats.isEmpty())
-			results += pats;
+	for (QMap<QString, ScPattern>::Iterator it = docPatterns.begin(); it != docPatterns.end(); ++it)
+	{
+		for (int c = 0; c < it.value().items.count(); ++c)
+		{
+			if ((it.value().items.at(c)->GrType == 8) || (it.value().items.at(c)->itemType() == PageItem::Symbol))
+			{
+				const QString& patName = it.value().items.at(c)->pattern();
+				if (!patName.isEmpty() && !results.contains(patName))
+					results.append(patName);
+			}
+			const QString& pat2 = it.value().items.at(c)->strokePattern();
+			if (!pat2.isEmpty() && !results.contains(pat2))
+				results.append(pat2);
+			const QString& pat3 = it.value().items.at(c)->patternMask();
+			if (!pat3.isEmpty() && !results.contains(pat3))
+				results.append(pat3);
+		}
 	}
 	return results;
 }
@@ -2863,13 +2875,20 @@
 			if (!pat3.isEmpty() && !results.contains(pat3))
 				results.append(currItem->patternMask());
 		}
+		QStringList results2 = results;
 		for (int c = 0; c < results.count(); ++c)
 		{
-			QStringList pats = getUsedPatternsHelper(results[c], results);
+			QStringList pats = getUsedPatternsHelper(results[c], results2);
 			if (!pats.isEmpty())
-				results += pats;
-		}
-		return results;
+			{
+				for (int cc = 0; cc < pats.count(); cc++)
+				{
+					if (!results2.contains(pats[cc]))
+						results2.append(pats[cc]);
+				}
+			}
+		}
+		return results2;
 	}
 	else
 		return QStringList();
@@ -2877,6 +2896,8 @@
 
 QStringList ScribusDoc::getUsedPatternsHelper(QString pattern, QStringList &results)
 {
+	if (!docPatterns.contains(pattern))
+		return QStringList();
 	ScPattern *pat = &docPatterns[pattern];
 	QStringList pats;
 	pats.clear();
@@ -2897,11 +2918,54 @@
 	}
 	if (!pats.isEmpty())
 	{
-		results = pats;
+		results += pats;
 		for (int c = 0; c < pats.count(); ++c)
 		{
-			getUsedPatternsHelper(pats[c], results);
-		}
+			QStringList pp = getUsedPatternsHelper(pats[c], results);
+			if (!pp.isEmpty())
+			{
+				for (int cc = 0; cc < pp.count(); cc++)
+				{
+					if (!results.contains(pp[cc]))
+						results.append(pp[cc]);
+				}
+			}
+		}
+	}
+	return results;
+}
+
+QStringList ScribusDoc::getPatternDependencyList(QStringList used)
+{
+	QStringList results;
+	QStringList pp;
+	QStringList pats = used;
+	QStack<QStringList> patternStack;
+	patternStack.push(pats);
+	while (!pats.isEmpty())
+	{
+		for (int c = 0; c < pats.count(); ++c)
+		{
+			pp = getUsedPatternsHelper(pats[c], results);
+			if (!pp.isEmpty())
+				results += pp;
+		}
+		pats = results;
+		results.clear();
+		if (!pats.isEmpty())
+			patternStack.push(pats);
+	}
+	results.clear();
+	while (patternStack.count() != 0)
+	{
+		pp = patternStack.pop();
+		for (int c = 0; c < pp.count(); c++)
+		{
+			if (!results.contains(pp[c]))
+				results.append(pp[c]);
+		}
+		if (patternStack.count() == 0)
+			break;
 	}
 	return results;
 }
@@ -2941,11 +3005,18 @@
 				results.append(FrameItems.at(c)->strokePattern());
 		}
 	}
-	for (int c = 0; c < results.count(); ++c)
-	{
-		QStringList pats = getUsedSymbolsHelper(results[c], results);
-		if (!pats.isEmpty())
-			results += pats;
+	for (QMap<QString, ScPattern>::Iterator it = docPatterns.begin(); it != docPatterns.end(); ++it)
+	{
+		for (int c = 0; c < it.value().items.count(); ++c)
+		{
+			if ((!results.contains(it.value().items.at(c)->pattern())) && (it.value().items.at(c)->itemType() == PageItem::Symbol) && (!it.value().items.at(c)->pattern().isEmpty()))
+				results.append(it.value().items.at(c)->pattern());
+			if ((!it.value().items.at(c)->strokePattern().isEmpty()) && (it.value().items.at(c)->patternStrokePath))
+			{
+				if (!results.contains(it.value().items.at(c)->strokePattern()))
+					results.append(it.value().items.at(c)->strokePattern());
+			}
+		}
 	}
 	return results;
 }
@@ -5499,6 +5570,16 @@
 		docPatterns[currentEditedSymbol].pattern = currItem->DrawObj_toImage();
 		docPatterns[currentEditedSymbol].width = currItem->gWidth;
 		docPatterns[currentEditedSymbol].height = currItem->gHeight;
+		if (m_ScMW->patternsDependingOnThis.count() > 1)
+		{
+			for (int a = 1; a < m_ScMW->patternsDependingOnThis.count(); a++)
+			{
+				Items = &docPatterns[m_ScMW->patternsDependingOnThis[a]].items;
+				renumberItemsInListOrder();
+				currItem = Items->at(0);
+				docPatterns[m_ScMW->patternsDependingOnThis[a]].pattern = currItem->DrawObj_toImage();
+			}
+		}
 		if (masterPageMode())
 		{
 			Pages = &MasterPages;

Modified: branches/ScribusOIF/scribus/scribusdoc.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/scribus/scribusdoc.h
==============================================================================
--- branches/ScribusOIF/scribus/scribusdoc.h (original)
+++ branches/ScribusOIF/scribus/scribusdoc.h Sun Dec  5 14:15:49 2010
@@ -623,6 +623,7 @@
 	QStringList getUsedPatterns();
 	QStringList getUsedPatternsSelection(Selection* customSelection);
 	QStringList getUsedPatternsHelper(QString pattern, QStringList &results);
+	QStringList getPatternDependencyList(QStringList used);
 	/*!
 	* @brief Builds a QStringList of the symbols used within the document
 	*/

Modified: branches/ScribusOIF/scribus/scribusview.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16063&path=/branches/ScribusOIF/scribus/scribusview.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribusview.cpp (original)
+++ branches/ScribusOIF/scribus/scribusview.cpp Sun Dec  5 14:15:49 2010
@@ -2883,10 +2883,12 @@
 
 void ScribusView::hideSymbolPage()
 {
+	updatesOn(false);
 	Deselect(true);
 	if (Doc->symbolEditMode())
 		this->requestMode(modeNormal);
 	Doc->setSymbolEditMode(false);
+	updatesOn(true);
 	Doc->setCurrentPage(Doc->Pages->at(0));
 	pageSelector->setEnabled(true);
 	resizeContents(qRound((Doc->maxCanvasCoordinate.x() - Doc->minCanvasCoordinate.x()) * m_canvas->scale()), qRound((Doc->maxCanvasCoordinate.y() - Doc->minCanvasCoordinate.y()) * m_canvas->scale()));




More information about the scribus-commit mailing list