[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]

[XaraXtreme-dev] Patches for Xara: Browser patch, --help patch, "?" -> "(c)" patch, some de_DE translation work

Hello,

seemingly my patches sent yesterday didn't come through. (I was not yet
subscribed.)
Here come all patches again plus some more.
Comments at the top of the diffs, encoded in UTF-8.

I included a very preliminary de.po file (310 translated messages), but
as untranslated strings are replaced by the strings in the source code,
this should be no problem. (As I wrote in BZ # 1119, the .po template
file should really contain only "" that way one can get a nice statistic
with msgfmt --statistics and finds untranslated strings much easier.)
Having the incomplete de.po file in SVN makes live for me easier (then
it is your task to do msgmerge ;-) and also helps others to send
corrections.

Tobias


CCamApp::LaunchWebBrowser: Added SUSE's desktop-launch (runs $BROWSER
or kfmclient or gnome-open or (list of browsers) depending on the
desktop running and on the environment variables set).
Added (but out commented) the Freedesktop.org's xdg-open, which
may become the future, but is not yet used. (See also links in the
comments of the sourcecode.)
Index: wxOil/camelot.cpp
===================================================================
--- wxOil/camelot.cpp	(Revision 1199)
+++ wxOil/camelot.cpp	(Arbeitskopie)
@@ -1382,6 +1389,14 @@
 	//
 	BOOL ok;
 
+	// http://portland.freedesktop.org/wiki/TaskOpenURL
+	// ok = LaunchBrowserApp(_T("xdg-open"), strUrl);
+	// if (ok) return ok;
+
+	// http://lists.freedesktop.org/pipermail/xdg/2004-August/004489.html
+	ok = LaunchBrowserApp(_T("desktop-launch"), strUrl);
+	if (ok) return ok;
+
 	ok = LaunchBrowserApp(_T("htmlview"), strUrl);
 	if (ok) return ok;
 

Index: wxOil/xrc/EN/nev-strings.xrc
===================================================================
--- wxOil/xrc/EN/nev-strings.xrc	(Revision 1199)
+++ wxOil/xrc/EN/nev-strings.xrc	(Arbeitskopie)
@@ -133,7 +133,7 @@
 			<object class="sizeritem">
 				<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
 				<object class="wxStaticText" name="IDS_SPLASHBOX_COPYRIGHT">
-					<label>? Xara Ltd 1995</label>
+					<label>© Xara Ltd 1995</label>
 				</object>
 			</object>
 			<object class="sizeritem">

Add a help option to Xara. This is not well tested as I didn't compile it;
furthermore, I don't know much about wx.
Index: wxOil/camelot.cpp
===================================================================
--- wxOil/camelot.cpp	(Revision 1199)
+++ wxOil/camelot.cpp	(Arbeitskopie)
@@ -382,6 +382,7 @@
 		{ wxCMD_LINE_SWITCH, _T("x"), _T("xrccheckgen"), _T("generate xrc.check file") },
 		{ wxCMD_LINE_OPTION, _T("l"), _T("listdebug"), _T("list debug level") , wxCMD_LINE_VAL_NUMBER },
 #endif
+		{ wxCMD_LINE_SWITCH, _T("h"), _T("help"),	_T("Display this help") },
 		{ wxCMD_LINE_SWITCH, _T("v"), _T("version"),	_T("Display the version information") },
 		{ wxCMD_LINE_OPTION, _T("r"), _T("resource"),	_T("resource directory") },
 		{ wxCMD_LINE_PARAM, NULL, NULL, _T("input file"), wxCMD_LINE_VAL_STRING, 
@@ -393,6 +394,12 @@
 	parser.Parse();
 
 	wxString ResourceDir = _T("");
+	if (parser.Found(_T("h"), &ResourceDir))
+	{
+		parser.Usage();
+		return false;
+	}
+
 	if (parser.Found(_T("r"), &ResourceDir))
 	{
 		if (!ResourceDir.IsEmpty())

I assume that the question mark should be rather a (c) symbol.
Encoding: UTF-8
Index: wxOil/xrc/EN/aboutres.xrc
===================================================================
--- wxOil/xrc/EN/aboutres.xrc	(Revision 1199)
+++ wxOil/xrc/EN/aboutres.xrc	(Arbeitskopie)
@@ -24,7 +24,7 @@
 		</object>
 		<object class="wxStaticText" name="IDC_STATIC">
 			 <pos>29,14d</pos> <size>131,8d</size>
-			<label>Copyright ? 1994-2005 Xara Group Ltd.</label>
+			<label>Copyright © 1994-2005 Xara Group Ltd.</label>
 		</object>
 		<object class="wxCamDrawControl" name="IDC_STRIPE1">
 			 <pos>4,40d</pos> <size>216,1d</size>
@@ -83,7 +83,7 @@
 		</object>
 		<object class="wxStaticText" name="IDC_STATIC">
 			 <pos>29,14d</pos> <size>131,8d</size>
-			<label>Copyright ? 1994-2005 Xara Group Ltd.</label>
+			<label>Copyright © 1994-2005 Xara Group Ltd.</label>
 		</object>
 		<object class="wxCamDrawControl" name="IDC_STRIPE1">
 			 <pos>4,40d</pos> <size>216,1d</size>
@@ -150,7 +150,7 @@
 		</object>
 		<object class="wxStaticText" name="IDC_STATIC">
 			 <pos>29,14d</pos> <size>131,8d</size>
-			<label>Copyright ? 1994-2005 Xara Group Ltd.</label>
+			<label>Copyright © 1994-2005 Xara Group Ltd.</label>
 		</object>
 		<object class="wxCamDrawControl" name="IDC_STRIPE1">
 			 <pos>4,40d</pos> <size>216,1d</size>

Attachment: de-po-patch.diff.gz
Description: GNU Zip compressed data

Add German description to .desktop file
Index: xaralx.desktop
===================================================================
--- xaralx.desktop	(Revision 1199)
+++ xaralx.desktop	(Arbeitskopie)
@@ -3,6 +3,7 @@
 Encoding=UTF-8
 Name=Xara LX
 Comment=Versatile vector graphics program
+Comment[de_DE]=Vielseitiges Vektorgraphik-Programm
 Comment[pt_BR]=Versátil programa para gráficos vetoriais
 Icon=xaralx.png
 Terminal=false

Add German manpage. Encoding: UTF-8. Based on manpage-options-patch.diff
--- /dev/null	2006-03-17 21:11:57.000000000 +0100
+++ doc/XaraLX.1.de	2006-05-27 10:22:13.000000000 +0200
@@ -0,0 +1,44 @@
+.TH XARALX 1 "May 16, 2006" XaraLX
+.SH NAME
+XaraLX - ein schnelles und flexibles Vektorgraphik-Programm
+
+.SH SYNTAX
+.B XaraLX
+[\fIOPTIONEN\fR] [\fIDateinname\fR ...]
+
+.SH BESCHREIBUNG
+\fBXaraLX\fR ist ein Open-Source-Vektorgraphik-Programm,
+entwickelt in Hinblick auf Geschwindigkeit, Flexibilität und Eleganz
+der Benutzeroberfläche.
+
+.SH AUFRUF
+\fBXaraLX\fR startet die XaraLX-Anwendung.
+
+.SH OPTIONEN
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+gibt die Aufrufoptionen aus
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+gibt die Version und das Erstelldatum aus
+.TP
+\fB\-r\fR, \fB\-\-resources=\fR\fIdirectory\fR
+Resourcen enthalten Dialoge und Zeichenkettentabellen von XaraLX.
+Normalerweise benutzt XaraLX die im Programm enthaltenen.
+Siehe auch \fIhttp://www.xaraxtreme.org/developers/documentation/resource_system_introduction.html\fR
+
+.SH DATEIEN
+\fI${HOME}/.XaraLX\fR - Datei enthält die Optionen für XaraLX
+
+.SH FEHLER
+Um einen Fehler zu melden, gehen Sie zu
+\fIhttp://bugzilla.xaralx.org/\fR
+
+.SH AUTOREN
+.TP
+.B Copyright (C) 1993-2006 Xara Group Ltd.
+Gewisse weitere Personen können an gewissen Dateien
+ein Copyright besitzen.
+Für Lizenzdetails siehe die LICENSE-Datei, die mit
+XaraLX geliefert wurde.
+.I http://www.xaralx.org/

List the options explicitly. I only took the non-debug options.
Note: This patch assumes that camelot-help-patch.diff has been
applied first.
Index: doc/XaraLX.1
===================================================================
--- doc/XaraLX.1	(Revision 1199)
+++ doc/XaraLX.1	(Arbeitskopie)
@@ -14,8 +14,17 @@
 \fBXaraLX\fR will start the XaraLX application.
 
 .SH OPTIONS
-A summary of the options supported by \fBXaraLX\fR is available
-at http://www.xaralx.org/
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+prints out the usage and exits
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+prints out the version and build date and exits
+.TP
+\fB\-r\fR, \fB\-\-resources=\fR\fIdirectory\fR
+Resources contain dialogs and string tables used by XaraLX. 
+Normally XaraLX uses those linked into the executable.
+See \fIhttp://www.xaraxtreme.org/developers/documentation/resource_system_introduction.html\fR
 
 .SH FILES
 \fI${HOME}/.XaraLX\fR - file containing options for XaraLX

Add German README. Encoding: ASCII (I replaced "ä" [UTF-8] by "ae" etc to make it compatible
with all encodings.)
--- /dev/null	2006-03-17 21:11:57.000000000 +0100
+++ README.de	2006-05-27 10:15:23.000000000 +0200
@@ -0,0 +1,5 @@
+Xara LX ist hauptsaechlich ein Vektorgraphik-Prorgamm (Zeichnungen, Illustrationen),
+aber es zaehlt zu der neuen Generation der Hybridprogramme, die Fotos und
+Zeichnungen gleichermaszen meistern. Fuer Details siehe xaralx.org. Xara LX ist
+noch unvollstaendig, da die Portierung des fertigen Produktes Xara Xtreme noch
+andauert. (Siehe www.xara.com/xtreme.)