r15551 by jghali - merge trunk revisions up to r15550

scribus-commit scribus-commit at lists.scribus.net
Sat Oct 16 14:11:00 CEST 2010


Author: jghali
Date: Sat Oct 16 12:11:00 2010
New Revision: 15551

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

Modified:
    branches/ScribusOIF/resources/swatches/CMakeLists.txt
    branches/ScribusOIF/scribus/colorsetmanager.cpp
    branches/ScribusOIF/scribus/pslib.cpp
    branches/ScribusOIF/scribus/pslib.h
    branches/ScribusOIF/scribus/scprintengine_gdi.cpp
    branches/ScribusOIF/scribus/scribus.cpp
    branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp
    branches/ScribusOIF/win32/vc8/Scribus.vcproj

Modified: branches/ScribusOIF/resources/swatches/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15551&path=/branches/ScribusOIF/resources/swatches/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/resources/swatches/CMakeLists.txt (original)
+++ branches/ScribusOIF/resources/swatches/CMakeLists.txt Sat Oct 16 12:11:00 2010
@@ -6,5 +6,5 @@
 FILE( GLOB XML_PALLETES *.xml )
 
 INSTALL(FILES ${GIMP_STYLE_PALETTES} ${XML_PALLETES}
- DESTINATION ${SHAREDIR}swatches
+  DESTINATION ${SHAREDIR}swatches
 )

Modified: branches/ScribusOIF/scribus/colorsetmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15551&path=/branches/ScribusOIF/scribus/colorsetmanager.cpp
==============================================================================
--- branches/ScribusOIF/scribus/colorsetmanager.cpp (original)
+++ branches/ScribusOIF/scribus/colorsetmanager.cpp Sat Oct 16 12:11:00 2010
@@ -28,7 +28,7 @@
 
 void ColorSetManager::initialiseDefaultPrefs(struct ApplicationPrefs& appPrefs)
 {
-	QString defaultSwatch = ScPaths::instance().libDir() + "swatches/" + "Scribus_Basic.xml";
+	QString defaultSwatch = ScPaths::instance().shareDir() + "swatches/" + "Scribus_Basic.xml";
 	QFile fiC(defaultSwatch);
 	if (!fiC.exists())
 	{

Modified: branches/ScribusOIF/scribus/pslib.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15551&path=/branches/ScribusOIF/scribus/pslib.cpp
==============================================================================
--- branches/ScribusOIF/scribus/pslib.cpp (original)
+++ branches/ScribusOIF/scribus/pslib.cpp Sat Oct 16 12:11:00 2010
@@ -77,7 +77,7 @@
 	Header = psart ? "%!PS-Adobe-3.0\n" : "%!PS-Adobe-3.0 EPSF-3.0\n";
 	BBox = "";
 	BBoxH = "";
-	Art = psart;
+	psExport = psart;
 	isPDF = pdf;
 	UsedFonts.clear();
 	Fonts = "";
@@ -427,7 +427,7 @@
 	PutStream("%%Title: " + Titel + "\n");
 	PutStream("%%Creator: " + Creator + "\n");
 	PutStream("%%Pages: " + IToStr(numpage) + "\n");
-	if(breite<hoehe)
+	if(breite < hoehe || !psExport)
 	{
 		BBox = "%%BoundingBox: " + IToStr(qRound(x)) + " " + IToStr(qRound(y)) + " " + IToStr(qRound(breite)) + " " + IToStr(qRound(hoehe)) + "\n";
 		BBoxH = "%%HiResBoundingBox: " + ToStr(x) + " " + ToStr(y) + " " + ToStr(breite) + " " + ToStr(hoehe) + "\n";
@@ -624,7 +624,7 @@
 	PutStream("%%Page: " + IToStr(Seiten) + " " + IToStr(Seiten) + "\n");
 	PutStream("%%PageOrientation: ");
 // when creating EPS files determine the orientation from the bounding box
-  	if (!Art)
+  	if (!psExport)
 	{
 		if ((pg->width() - Ma->Left - Ma->Right) <= (pg->height() - Ma->Bottom - Ma->Top))
 			PutStream("Portrait\n");
@@ -647,13 +647,13 @@
 		}
 	}
 	PutStream("Scribusdict begin\n");
-	if ((Art) && (Options.setDevParam))
+	if ((psExport) && (Options.setDevParam))
   	{
 		PutStream("<< /PageSize [ "+ToStr(maxBoxX)+" "+ToStr(maxBoxY)+" ]\n");
 		PutStream(">> setpagedevice\n");
 	}
 	PutStream("save\n");
-	if(pg->orientation() == 1)
+	if (pg->orientation() == 1 && psExport)
 		PutStream("90 rotate 0 "+IToStr(qRound(maxBoxY))+" neg translate\n");
   	PutStream("/DeviceCMYK setcolorspace\n");
 	PutStream(ToStr(bleedLeft+markOffs)+" "+ToStr(Options.bleeds.Bottom+markOffs)+" tr\n");
@@ -1498,7 +1498,7 @@
 	if (usingGUI)
 	{
 		QString title=QObject::tr("Exporting PostScript File");
-		if (Art)
+		if (psExport)
 			title=QObject::tr("Printing File");
 		progressDialog=new MultiProgressDialog(title, CommonStrings::tr_Cancel, Doc->scMW());
 		if (progressDialog==0)
@@ -1524,7 +1524,7 @@
 	}
 	//if ((!Art) && (view->SelItem.count() != 0))
 	uint docSelectionCount=Doc->m_Selection->count();
-	if ((!Art) && (docSelectionCount != 0))
+	if ((!psExport) && (docSelectionCount != 0))
 	{
 		double minx = 999999.9;
 		double miny = 999999.9;
@@ -1650,7 +1650,7 @@
 		a = pageNs[aa]-1;
 		Page* page = Doc->Pages->at(a);
 		//if ((!Art) && (view->SelItem.count() != 0))
-		if ((!Art) && (Doc->m_Selection->count() != 0))
+		if ((!psExport) && (Doc->m_Selection->count() != 0))
 		{
 			MarginStruct Ma;
 			Ma.Left = gx;
@@ -2742,7 +2742,7 @@
 				if ((!a->pageName().isEmpty()) && (c->asImageFrame()) && ((sep) || (!farb)))
 					continue;
 				//if ((!Art) && (view->SelItem.count() != 0) && (!c->Select))
-				if ((!Art) && (!c->isSelected()) && (Doc->m_Selection->count() != 0))
+				if ((!psExport) && (!c->isSelected()) && (Doc->m_Selection->count() != 0))
 					continue;
 				double bLeft, bRight, bBottom, bTop;
 				GetBleeds(a, bLeft, bRight, bBottom, bTop);
@@ -3088,7 +3088,7 @@
 			if ((!page->pageName().isEmpty()) && (item->asImageFrame()) && ((sep) || (!farb)))
 				continue;
 			//if ((!Art) && (view->SelItem.count() != 0) && (!c->Select))
-			if ((!Art) && (!item->isSelected()) && (Doc->m_Selection->count() != 0))
+			if ((!psExport) && (!item->isSelected()) && (Doc->m_Selection->count() != 0))
 				continue;
 			double bLeft, bRight, bBottom, bTop;
 			GetBleeds(page, bLeft, bRight, bBottom, bTop);

Modified: branches/ScribusOIF/scribus/pslib.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15551&path=/branches/ScribusOIF/scribus/pslib.h
==============================================================================
--- branches/ScribusOIF/scribus/pslib.h (original)
+++ branches/ScribusOIF/scribus/pslib.h Sat Oct 16 12:11:00 2010
@@ -140,7 +140,7 @@
 		virtual void SetColor(const ScColor& color, double shade, int *h, int *s, int *v, int *k, bool gcr);
 		virtual void setTextSt(ScribusDoc* Doc, PageItem* ite, bool gcr, uint a, Page* pg, bool sep, bool farb, bool ic, bool master);
 		virtual void setTextCh(ScribusDoc* Doc, PageItem* ite, double x, double y, bool gcr, uint a, uint d, ScText *hl, const ParagraphStyle& pstyle, Page* pg, bool sep, bool farb, bool ic, bool master);
-		bool Art;
+		bool psExport;
 
 	private:
 

Modified: branches/ScribusOIF/scribus/scprintengine_gdi.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15551&path=/branches/ScribusOIF/scribus/scprintengine_gdi.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scprintengine_gdi.cpp (original)
+++ branches/ScribusOIF/scribus/scprintengine_gdi.cpp Sat Oct 16 12:11:00 2010
@@ -561,7 +561,7 @@
 
 	// In case of landscape printing, pslib will rotate the page
 	// we must take that into account
-	if (landscape)
+	/*if (landscape)
 	{
 		sprintf( (char*) sps.data, "-90 rotate %0.3f %0.3f translate\n", (double) -pageHeight, 0.0);
 		sps.numBytes = strlen( (char*) sps.data );
@@ -570,7 +570,7 @@
 		transx = ( physicalHeight - pageHeight ) / -2.0;
 		transy = ( physicalWidth  - pageWidth ) / 2.0;
 	}
-	else
+	else*/
 	{
 		transx = ( physicalWidth  - pageWidth ) / 2.0;
 		transy = ( physicalHeight - pageHeight ) / 2.0;

Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15551&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Sat Oct 16 12:11:00 2010
@@ -3261,6 +3261,7 @@
 			b->OldB2 = b->width();
 			b->OldH2 = b->height();
 			b->updateClip();
+			b->AdjustPictScale();
 		}
 		else
 		{

Modified: branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15551&path=/branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp (original)
+++ branches/ScribusOIF/scribus/ui/scrapbookpalette.cpp Sat Oct 16 12:11:00 2010
@@ -818,7 +818,7 @@
 	{
 		if (itf.value().isDir)
 		{
-			itf.value().Preview = itf.value().Preview.scaled(60, 60, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+//			itf.value().Preview = itf.value().Preview.scaled(60, 60, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 			QPixmap pm(60, 60);
 			pm.fill(palette().color(QPalette::Base));
 			QPainter p;

Modified: branches/ScribusOIF/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15551&path=/branches/ScribusOIF/win32/vc8/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc8/Scribus.vcproj Sat Oct 16 12:11:00 2010
@@ -9470,44 +9470,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
-						Description="Moc&apos;ing $(InputFileName)"
-						CommandLine="$(QT4_DIR)\bin\moc.exe &quot;$(InputPath)&quot; -o  &quot;$(InputDir)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
-						AdditionalDependencies="$(QT4_DIR)\bin\moc.exe"
-						Outputs="$(InputDir)\moc_$(InputName).cpp"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Moc&apos;ing $(InputFileName)"
-						CommandLine="$(QT4_DIR)\bin\moc.exe &quot;$(InputPath)&quot; -o  &quot;$(InputDir)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
-						AdditionalDependencies="$(QT4_DIR)\bin\moc.exe"
-						Outputs="$(InputDir)\moc_$(InputName).cpp"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug-arthur|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Moc&apos;ing $(InputFileName)"
-						CommandLine="$(QT4_DIR)\bin\moc.exe &quot;$(InputPath)&quot; -o  &quot;$(InputDir)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
-						AdditionalDependencies="$(QT4_DIR)\bin\moc.exe"
-						Outputs="$(InputDir)\moc_$(InputName).cpp"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-arthur|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Moc&apos;ing $(InputFileName)"
-						CommandLine="$(QT4_DIR)\bin\moc.exe &quot;$(InputPath)&quot; -o  &quot;$(InputDir)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
-						AdditionalDependencies="$(QT4_DIR)\bin\moc.exe"
-						Outputs="$(InputDir)\moc_$(InputName).cpp"
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug-arthur|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-arthur|Win32"
+					>
+					<Tool
+						Name="moc.exe"
 					/>
 				</FileConfiguration>
 			</File>




More information about the scribus-commit mailing list