Further installation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 0869bd56551a2dae7bc911dfb5fd48efa001a0ba..1d0ecd155f2d86ae945db5585453583aa07065cc 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -56,6 +56,9 @@ docs/html/*.png
 docs/html/icons/*.gif
 docs/html/icons/*.png
 docs/html/icons/*.jpg
+docs/html/images/*.gif
+docs/html/images/*.png
+docs/html/images/*.jpg
 docs/tech/*.txt
 docs/tech/*.htm
 

diff --git a/distrib/msw/innobott.txt b/distrib/msw/innobott.txt
index 473ec39de1d63e05c98e3c5a51e08f0cf6dd7818..4fda9d81133d633fa1aa3565bb204924c583b2ed 100644 (file)
--- a/distrib/msw/innobott.txt
+++ b/distrib/msw/innobott.txt
@@ -6,10 +6,11 @@
     Name: {group}\Tex2rtf Help; Filename: {app}\bin\tex2rtf.chm; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths
     Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-    Name: {group}\Debug View; Filename: {app}\bin\DBGVIEW.EXE; WorkingDir: {app}\bin; IconFilename: {app}\bin\DBGVIEW.EXE; IconIndex: 0
+;    Name: {group}\Debug View; Filename: {app}\bin\DBGVIEW.EXE; WorkingDir: {app}\bin; IconFilename: {app}\bin\DBGVIEW.EXE; IconIndex: 0
     Name: {group}\Compiling wxWindows; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-    Name: {group}\wxWindows Help; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-    Name: {group}\HTML Docs Index; Filename: {app}\docs\html\index.htm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+    Name: {group}\wxWindows Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+    Name: {group}\Tutorial; Filename: {app}\docs\pdf\wxTutorial.pdf; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+    Name: {group}\Document Index; Filename: {app}\docs\html\index.htm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Widgets Sample; Filename: {app}\bin\widgets.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\widgets.exe; IconIndex: 0
 
 [INI]

diff --git a/distrib/msw/innotop.txt b/distrib/msw/innotop.txt
index ecfe2891de6bcb2807c1a0c00d71112ea62e4973..790915d40b5a1d1be74a258f1f8b486ed929308f 100644 (file)
--- a/distrib/msw/innotop.txt
+++ b/distrib/msw/innotop.txt
@@ -30,7 +30,7 @@
     AlwaysCreateUninstallIcon=1
     UninstallIconName=Uninstall wxWindows 2.3.3
     Uninstallable=1
-    DefaultDirName=c:\wx233
+    DefaultDirName=c:\wxWindows-2.3.3
     DefaultGroupName=wxWindows 2.3.3
     LicenseFile=C:\wx2dev\wxWindows\docs\licence.txt
     InfoBeforeFile=C:\wx2dev\wxWindows\docs\readme.txt

diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index e2154bfdf6514ae0887dbe0811561f2687c9a482..fa30e6c69710660f25730f93c1a62025adb232d8 100755 (executable)
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -51,6 +51,7 @@ if not direxist %webfiles% goto end
 echo Copying FAQ and other files from %webfiles
 copy %webfiles%\site\faq*.htm %src\docs\html
 copy %webfiles%\site\platform.htm %src\docs\html
+copy %webfiles%\site\i18n.htm %src\docs\html
 
 cd %src
 echo Zipping...
@@ -153,10 +154,10 @@ zip32 -@ %dest\wxWindows-%version%-CW.zip < %src\distrib\msw\cw.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-CW.zip wxWindows-%version% %dest%
 
 rem Dialog Editor source and binary
-erase %dest\dialoged-source.zip
-zip32 -@ %dest\dialoged-source.zip < %src\distrib\msw\dialoged.rsp
-zip32 -j %dest\dialoged-%version%.zip %dest\dialoged-source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
-erase %dest\dialoged-source.zip
+Rem erase %dest\dialoged-source.zip
+Rem zip32 -@ %dest\dialoged-source.zip < %src\distrib\msw\dialoged.rsp
+Rem zip32 -j %dest\dialoged-%version%.zip %dest\dialoged-source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
+Rem erase %dest\dialoged-source.zip
 
 copy %src\docs\changes.txt %dest\changes-%version%.txt
 copy %src\docs\msw\install.txt %dest\install-msw-%version%.txt
@@ -180,10 +181,9 @@ if "%inno" == "0" goto end
 
 Rem Make dialoged-win32.zip and tex2rtf-win32.zip
 
-cd %src\bin
-
-zip32 %dest\dialoged-win32-%version%.zip dialoged.*
-zip32 %dest\tex2rtf-win32-%version%.zip tex2rtf.*
+Rem cd %src\bin
+Rem zip32 %dest\dialoged-win32-%version%.zip dialoged.*
+Rem zip32 %dest\tex2rtf-win32-%version%.zip tex2rtf.*
 
 cd %dest
 
@@ -230,6 +230,9 @@ copy %src\demos\life\breeder.lif bin
 copy %src\docs\htmlhelp\dialoged.chm bin
 copy %src\docs\htmlhelp\tex2rtf.chm bin
 
+if not direxist docs\pdf mkdir docs\pdf
+copy %src\docs\pdf\wxTutorial.pdf docs\pdf
+
 Rem Make wxMSW-xxx.zip
 cd %dest%
 zip32 -r wxMSW-%version%.zip wxWindows-%version%/*
@@ -253,6 +256,9 @@ cd %dest
 rem Put all the setup files into a single zip archive.
 zip32 wxMSW-%version%-setup.zip readme-%version%.txt setup*.*
 
+erase /Y wxWindows-%version%-win.zip
+erase /Y wxWindows-%version%-ExtraDoc.zip
+
 echo wxWindows archived.
 
 goto end

diff --git a/docs/html/i18n.htm b/docs/html/i18n.htm
index 36710c23167ecfc32770fdae43713a5ca63def31..b5fa8b7dd9c7752a9433709d8a5c98c9d7f300ef 100644 (file)
--- a/docs/html/i18n.htm
+++ b/docs/html/i18n.htm
@@ -6,28 +6,55 @@
 </head>
 <body>
 
-Below is the table containing the list of languages supported by wxWindows.
-The list is very short right now, please let
-<A HREF="mailto:vadim@wxwindows.org">me</A> know if you can do a translation
-for a language not mentioned here (or to help with one which already is - it
-is quite helpful to have several translators for one language at least for
-proof reading).
+<table width=100% border=0 cellpadding=3 cellspacing=0>
+<tr>
+<td bgcolor="#004080" align=left height=24 background="images/bluetitlegradient.gif">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+<b>wxWindows internationalization</b>
+</font>
+</td>
+</tr>
+</table>
+
 <p>
-The columns of this table have the obvious meaning: in each row you will see
-the language, the official translator (if any) for it and the status of the
-translations as of wxWindows 2.2.
+<center>
+    <a href="#available">Available translations</a> |
+    <a href="#howtohelp">How to help</a>
+</center>
+
+<p>
+wxWindows uses a certain number of user-readable strings such as
+<tt>"help"</tt> or <tt>"Load file"</tt> which should be translated to the
+users language if it is different from English. wxWindows has built in support
+for internationalization (i18n from now on) which allows for this to happen
+automatically if the translations to the current language are available.
+
 <p>
-Please subscribe to the
-<a href="http://wxwindows.org/mailman/listinfo/wx-translators">
-wxWindows translators</a> mailing list if you are interested in participating.
-Thanks!
+You may find here the list of all existing translations with the addresses of
+the official translators whom you should contact if you would like to submit
+any corrections to the translations for your language. Also, please
+<a href="#howtohelp">see below</a> if you would like to translate wxWindows to
+your language if it is not mentioned here (or to help with one which already
+is -- it is quite helpful to have several translators for one language at
+least for proof reading).
+
+<hr> 
+<center>
+<font size=+2><i><b><a name="available">Available translations</a></b></i></font>
+</center>
+<hr>
+
 <p>
-To help edit message catalogs, please see Vaclav Slavik's excellent <a href="http://www.volny.cz/v.slavik/poedit/" target=_top>poEdit</a> utility.<P>
+Below is the table containing the list of languages supported by wxWindows.
+The columns of this table have the obvious meaning: in each row you will see
+the language, the official translator (if any) for it and the status of the
+translations as of wxWindows 2.3.
 
+<p>
 <table width=100% border=4 cellpadding=5 cellspacing=0>
 
 <tr>
-<td bgcolor="#660000" colspan=3> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> Languages supported in wxWindows 2.2 </font> </td>
+<td bgcolor="#004080" colspan=3> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> Languages supported in wxWindows 2.x </font> </td>
 </tr>
 
 <tr>
@@ -38,41 +65,48 @@ To help edit message catalogs, please see Vaclav Slavik's excellent <a href="htt
 
 <tr>
     <td valign=center>Chinese</td>
-    <td align=center valign=center><IMG SRC="icons/yes.gif" ALT="Done"></td>
-    <td align=center valign=center><A HREF="mailto:mrfx@fm365.com">mrfx@fm365.com</A>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><A HREF="mailto:mrfx@fm365.com">mrfx</A>
                                    </td>
 </tr>
 
 <tr>
     <td valign=center>Czech</td>
-    <td align=center valign=center><IMG SRC="icons/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
     <td align=center valign=center><A HREF="mailto:v.slavik@volny.cz">Vaclav Slavik</A>
                                    </td>
 </tr>
 
 <tr>
     <td valign=center>Danish</td>
-    <td align=center valign=center><IMG SRC="icons/yes.gif" ALT="Done"></td>
-    <td align=center valign=center><A HREF="mailto:leif@danmos.dk">Leif Jensen</A>,
-                                   <A HREF="mailto:Henrik@fangorn.dk">Henrik Ræder Clausen</A>
-                                   </td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
+    <td align=center valign=center>
+        <A HREF="mailto:leif@danmos.dk">Leif Jensen</A>,
+        <A HREF="mailto:Henrik@fangorn.dk">Henrik Ræder Clausen</A>
+    </td>
 </tr>
 
 <tr>
     <td valign=center>Dutch</td>
-    <td align=center valign=center><IMG SRC="icons/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
     <td align=center valign=center><A HREF="mailto:phubers@solve-i-t.com">Patrick Hubers</A></td>
 </tr>
 
 <tr>
     <td valign=center>English (UK)</td>
-    <td align=center valign=center><IMG SRC="icons/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Ok"></td>
     <td align=center valign=center>n/a</td>
 </tr>
 
+<tr>
+    <td valign=center>Finnish</td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><A HREF="mailto:kgb@compart.fi">Kaj G Backas</A></td>
+</tr>
+
 <tr>
     <td valign=center>French (standard)</td>
-    <td align=center valign=center><IMG SRC="icons/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
     <td align=center valign=center><A HREF="mailto:Stephane.Junique@optics.kth.se">Stephane Junique</A>,
                                    <A HREF="mailto:lionel.allorge@lunerouge.com">Lionel Allorge</A>,
                                    <A HREF="mailto:Gilles.Guyot@Krypton.be">Gilles Guyot</A>
@@ -81,7 +115,7 @@ To help edit message catalogs, please see Vaclav Slavik's excellent <a href="htt
 
 <tr>
     <td valign=center>German</td>
-    <td align=center valign=center><IMG SRC="icons/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
     <td align=center valign=center><A HREF="mailto:DanR@gmx.de">Daniel Reith</A>,
                                    <A HREF="mailto:sparhawk@aon.at">Gerhard Gruber</A>,
                                    <A HREF="mailto:stefan@hedemann.de">Stefan Hedemann</A>,
@@ -92,48 +126,111 @@ To help edit message catalogs, please see Vaclav Slavik's excellent <a href="htt
 
 <tr>
     <td valign=center>Hungarian</td>
-    <td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
-    <td align=center valign=center><A HREF="mailto:janos.vegh@sysdata.siemens.hu">Végh János Dr.</A>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><A HREF="mailto:Janos_Vegh@users.sourceforge.net">Végh János Dr.</A>
                                    </td>
 </tr>
 
 <tr>
     <td valign=center>Italian</td>
-    <td align=center valign=center><IMG SRC="icons/yes.gif" ALT="Done"></td>
-    <td align=center valign=center><A HREF="mailto:mbarbon@dsi.unive.it">Mattia Barbon</A>
-                                   </td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
+    <td align=center valign=center>
+        <A HREF="mailto:m.cavallini@koansoftware.com">Marco Cavallini</A>
+        (<a href="http://www.koansoftware.com" target=_new>Koan Software</a>)
+    </td>
+</tr>
+
+<tr>
+    <td valign=center>Polish</td>
+    <td align=center valign=center><IMG SRC="images/no.gif" ALT="Not yet"></td>
+    <td align=center valign=center><A HREF="mailto:matiso@hoga.pl">Piotr Mackowiak</A></td>
 </tr>
 
 <tr>
     <td valign=center>Portuguese</td>
-    <td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
+    <td align=center valign=center><IMG SRC="images/no.gif" ALT="Not yet"></td>
     <td align=center valign=center><A HREF="mailto:bernardosw@terra.com.br">Bernardo Santos Wernesback</A></td>
 </tr>
 
 <tr>
     <td valign=center>Russian</td>
-    <td align=center valign=center><IMG SRC="icons/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Ok"></td>
     <td align=center valign=center><A HREF="mailto:rolinsky@mema.ucl.ac.be">Roman Rolinsky</A>,
                                    <A HREF="mailto:vadim@wxwindows.org">Vadim Zeitlin</A>
                                    </td>
 </tr>
 
+<tr>
+    <td valign=center>Serbian</td>
+    <td align=center valign=center><IMG SRC="images/no.gif" ALT="Not yet"></td>
+    <td align=center valign=center><A HREF="mailto:zlatkor@eunet.yu">Zlatko Rosandic</A></td>
+</tr>
+
 <tr>
     <td valign=center>Spanish</td>
-    <td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
+    <td align=center valign=center><IMG SRC="images/no.gif" ALT="Not yet"></td>
     <td align=center valign=center><A HREF="mailto:guille@iies.es">Guillermo Rodriguez Garcia</A></td>
 </tr>
 
 <tr>
     <td valign=center>Swedish</td>
-    <td align=center valign=center><IMG SRC="icons/yes.gif" ALT="Done"></td>
-    <td align=center valign=center><A HREF="mailto:jor@mindless.com">Jonas Rydberg</A>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Ok"></td>
+    <td align=center valign=center><A HREF="mailto:jor@mindless.com">Jonas Rydberg</A>,
+                                   <A HREF="mailto:kgb@compart.fi">Kaj G Backas</A></td>
 </tr>
 
 </table>
 
 <br>
 
+<hr> 
+<center>
+<font size=+2><i><b><a name="howtohelp">How to help</a></b></i></font>
+</center>
+<hr>
+
+<p>
+wxWindows uses the standard GNU gettext tools for i18n so if you are already
+familiar with them you shouldn&#39;t have any problems with working on wxWindows
+translations. Here are the the steps you should follow:
+<ol>
+    <li>Get the latest version of the file <tt>locale/wxstd.po</tt> from the
+        wxWindows source tree: if you&#39;re using <a href="cvs.htm">cvs</a>
+        or the <a href="http://wxwindows.sf.net/snapshots/">daily
+        snapshots</a>, you should already have it. Otherwise you can always
+        retrieve it directly from the cvs repository via the Web interface
+        <a href="http://cvs.wxwindows.org/cgi-bin/viewcvs.cgi/wxWindows/locale/wxstd.po">
+        here</a>.
+
+    <li>Rename it to <tt>XY.po</tt> where <tt>"XY"</tt> is the 2 letter
+        <a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">
+        ISO country code</a> for your language.
+
+    <li>Translate the strings in this file using either your favourite text
+        editor or a specialized tool such as Vaclav Slavik&#39;s excellent
+        <a href="http://poedit.sourceforge.net/" target=_top>poEdit</a>
+        utility.
+
+    <li>Verify that your translations can at least be compiled (even if they
+        are yet incomplete) by running <tt>msgfmt -v XY.po</tt> command:
+        please note that you <i>must</i> use the <tt>-v</tt> option. In
+        particular, please fill the header fields because msgfmt doesn&#39;t
+        accept the default values for them.
+
+    <li>Send the finished translation to
+        <a href="mailto:vadim@wxwindows.org">Vadim Zeitlin</a> and it will be
+        added to the next wxWindows release or snapshot.
+</ol>
+
+<p>
+In addition, please consider subscribing to the very low volume
+<a href="http://lists.wxwindows.org/mailman/listinfo/wx-translators">
+wxWindows translators</a> mailing list on which the news especially important
+for the translators are announced.
+
+<p>
+Thank you in advance for your help!
+
 <hr>
 Please contact <A HREF="mailto:vadim@wxwindows.org">me</A> with
 any comments/suggestions.
@@ -141,10 +238,4 @@ any comments/suggestions.
 </body>
 </html>
 
-<!--
-" this makes a translator entry from the address cut-&-pasted from email
-nmap <C-H> O<A HREF=""><Esc>jdT<k$hPJxf<Xa/A<Esc>
-!-->
-
-<!-- vi: set tw=0: !-->
 

diff --git a/docs/html/icons/no.gif b/docs/html/icons/no.gif
deleted file mode 100644 (file)
index 65fc311..0000000
Binary files a/docs/html/icons/no.gif and /dev/null differ

diff --git a/docs/html/icons/somewhat.gif b/docs/html/icons/somewhat.gif
deleted file mode 100644 (file)
index 11dd29b..0000000
Binary files a/docs/html/icons/somewhat.gif and /dev/null differ

diff --git a/docs/html/icons/yes.gif b/docs/html/icons/yes.gif
deleted file mode 100644 (file)
index 759fc9e..0000000
Binary files a/docs/html/icons/yes.gif and /dev/null differ

diff --git a/docs/html/images/bluetitlegradient.gif b/docs/html/images/bluetitlegradient.gif
new file mode 100644 (file)
index 0000000..7179384
Binary files /dev/null and b/docs/html/images/bluetitlegradient.gif differ

diff --git a/docs/html/index.htm b/docs/html/index.htm
index ddf36853ebed83e8a1765554b232a35f36a33a34..808bfe3bb28331ea85840f6749189a2c77f8926f 100644 (file)
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -13,7 +13,9 @@
 
 <IMG src="logo.gif" align=right hspace=10 vspace=0>
 
-Welcome to wxWindows 2, the premi&egrave;re cross-platform GUI C++ framework. This is an index of
+<b>Welcome to wxWindows 2, the premi&egrave;re cross-platform GUI C++ framework.</b><P>
+
+This is an index of
 the plain text, HTML, Windows Help and Acrobat documentation: availability depends on what you've
 downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<br clear=all><P>
 
@@ -42,6 +44,13 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<b
 
 <P>
 
+Unless you installed a binary version of wxWindows using RPMs,
+you will probably have to compile the wxWindows library first.
+Please read the platform-specific readme.txt and install.txt
+for how to do this.
+
+<P>
+
 <ul>
 <li>ReadMe: <a href="../readme.txt"><b>General ReadMe</b></a>,
 <a href="../gtk/readme.txt">wxGTK</a>,
@@ -77,7 +86,8 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<b
 <li>ToDo: <a href="../todo.txt"><b>General ToDo</b></a>,
 <a href="../gtk/todo.txt">wxGTK</a>,
 <a href="../motif/todo.txt">wxMotif</a>,
-<a href="../msw/todo.txt">wxMSW</a>
+<a href="../msw/todo.txt">wxMSW</a>,
+<a href="../mac/todo.txt">wxMac</a>
 <li>List of <a href="../symbols.txt">preprocessor symbols</a> used in wxWindows
 </ul>
 
@@ -297,7 +307,7 @@ by Franky Braem, in PDF format.<P>
 
 <P>
 
-Each of the following demonstrates one or more aspect of wxWindows.<P>
+Each of the following samples demonstrates one or more aspect of wxWindows.<P>
 
 <ul>
 <li><a href="../../samples/calendar">artprov</a>: shows how you can customize the look of standard