View Issue Details

IDProjectCategoryView StatusLast Update
0002446ScribusOS-Win32public2005-09-25 20:52
Reporterjghali Assigned Tofschmid  
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
PlatformWindowsOSWindowsOS Version2000 SP4
Product Version1.3.1cvs 
Fixed in Version1.3.1cvs 
Summary0002446: Patch for gettext plugins and printpreview (win32 compatibility)
DescriptionThe attached patches correct compatilibity issues in following plugins ;
- printpreview : some commande line adjustments when calling ghostscript
- gettext-cvsim : behavior of QString operator+=(char c)
- gettext-textfilter : behavior of QString operator+=(char c)
- gettext-txtim : behavior of QString operator+=(char c)

TagsNo tags attached.
Patch

Relationships

related to 0000015 closedjghali Windows Port 

Activities

2005-08-18 16:11

 

gettext_printpreview_win32compat.diff (2,905 bytes)   
Index: gettext/csvim/csvim.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/gettext/csvim/csvim.cpp,v
retrieving revision 1.5.2.4
diff -u -r1.5.2.4 csvim.cpp
--- gettext/csvim/csvim.cpp	11 Aug 2005 16:48:03 -0000	1.5.2.4
+++ gettext/csvim/csvim.cpp	17 Aug 2005 21:32:51 -0000
@@ -94,7 +94,7 @@
 		f.readBlock(bb.data(), f.size());
 		f.close();
 		for (posi = 0; posi < bb.size(); ++posi)
-			text += bb[posi];
+			text += QChar(bb[posi]);
 	}
 	text = toUnicode(text);
 	QStringList lines = QStringList::split("\n", text);
Index: gettext/textfilter/textfilter.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/gettext/textfilter/textfilter.cpp,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 textfilter.cpp
--- gettext/textfilter/textfilter.cpp	25 Jul 2005 22:28:44 -0000	1.2.2.4
+++ gettext/textfilter/textfilter.cpp	17 Aug 2005 21:32:49 -0000
@@ -66,7 +66,7 @@
 		f.readBlock(bb.data(), f.size());
 		f.close();
 		for (posi = 0; posi < bb.size(); ++posi)
-			text += bb[posi];
+			text += QChar(bb[posi]);
 	}
 }
 
Index: gettext/txtim/txtim.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/gettext/txtim/txtim.cpp,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 txtim.cpp
--- gettext/txtim/txtim.cpp	11 Aug 2005 16:48:04 -0000	1.2.2.4
+++ gettext/txtim/txtim.cpp	17 Aug 2005 21:32:47 -0000
@@ -55,7 +55,7 @@
 		f.readBlock(bb.data(), f.size());
 		f.close();
 		for (posi = 0; posi < bb.size(); ++posi)
-			text += bb[posi];
+			text += QChar(bb[posi]);
 	}
 }
 
Index: printpreview/preview.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/plugins/printpreview/preview.cpp,v
retrieving revision 1.28.2.26
diff -u -r1.28.2.26 preview.cpp
--- printpreview/preview.cpp	8 Aug 2005 21:43:04 -0000	1.28.2.26
+++ printpreview/preview.cpp	18 Aug 2005 13:31:31 -0000
@@ -392,7 +392,7 @@
 int PPreview::RenderPreview(int Seite, int Res)
 {
 	bool ret = -1;
-	QString cmd1, cmd2;
+	QString cmd1, cmd2, cmd3;
 	QMap<QString,QFont> ReallyUsed;
 	// Recreate Postscript-File only when the actual Page has changed
 	if ((Seite != APage)  || (EnableGCR->isChecked() != GMode))
@@ -472,9 +472,10 @@
 		cmd1 += QString(";\"%1\"").arg(extraFonts->get(i,0));
 #endif
 	// then add any final args and call gs
-	cmd1 += " -sOutputFile="+app->PrefsPfad+"/sc.png ";
-	cmd2 = " -c showpage -c quit";
-	ret = system(cmd1 + app->PrefsPfad+"/tmp.ps" + cmd2);
+	cmd1 += " -sOutputFile=\"" + QDir::convertSeparators(app->PrefsPfad+"/sc.png") + "\" ";
+	cmd2 = "\"" + QDir::convertSeparators(app->PrefsPfad+"/tmp.ps") + "\"";
+	cmd3 = " -c showpage -c quit";
+	ret = system(cmd1 + cmd2 + cmd3);
 	return ret;
 }
 

Issue History

Date Modified Username Field Change
2005-08-18 16:11 jghali New Issue
2005-08-18 16:11 jghali File Added: gettext_printpreview_win32compat.diff
2005-08-18 22:25 jghali Relationship added related to 0000015
2005-08-19 00:27 plinnell Status new => assigned
2005-08-19 00:27 plinnell Assigned To => fschmid
2005-08-19 23:02 fschmid Status assigned => resolved
2005-08-19 23:02 fschmid Fixed in Version => 1.3.1
2005-08-19 23:02 fschmid Resolution open => fixed
2005-08-25 20:19 jghali Status resolved => closed
2005-08-25 20:19 jghali Fixed in Version 1.3.1 => 1.3.1cvs
2005-09-25 20:52 cbradney Category Internal => Win32
2014-10-08 18:38 Kunda Category Win32 => OS-Win32