Changeset 71

Show
Ignore:
Timestamp:
Thu Mar 30 14:15:33 2006
Author:
mbutscher
Message:

Stable-1.6:
Support for wxPython-ansi version fixed (HTML renderer)

Files:

Legend:

Unmodified
Added
Removed
Modified

  • branches/stable-1.6/setup.py

    r52 r71  
    21 21  
    22 22 setup(name='WikidPadCompact',  
    23         version='1.6beta',  
      23       version='1.6rc',  
    23 23       author='Michael Butscher',  
    24 24       author_email='mbutscher@gmx.de',  
    …… 
    37 37                   ('WikidPadHelp', glob(os.path.join('WikidPadHelpOG-static', "*.wiki"))),  
    38 38                   (os.path.join('WikidPadHelp', 'data'),  
    39                      glob(os.path.join('WikidPadHelpOG-static', 'data', "*.*"))),  
      39                    glob(os.path.join('WikidPadHelpOG-static16', 'data', "*.*"))),  
    39 39                   ('export', [os.path.join('export', 'wikistyle.css')])]  
    40 40 )  

  • branches/stable-1.6/wikidpad_unicode.iss

    r60 r71  
    42 42 SolidCompression=true  
    43 43 AppName=WikidPad  
    44   AppVerName=WikidPad 1.6beta4  
      44 AppVerName=WikidPad 1.6urc1  
    44 44 DefaultDirName={pf}\WikidPad  
    45 45 DefaultGroupName=WikidPad  
    46 46 AppID={{22A83C29-58A8-4CAB-8EDC-918D74F8429E}  
    47 47 VersionInfoVersion=1.6  
    48   VersionInfoTextVersion=WikidPad 1.6beta4  
      48 VersionInfoTextVersion=WikidPad 1.6urc1  
    48 48 LicenseFile=C:\DATEN\Projekte\Wikidpad\Current\license.txt  
    49 49 AllowNoIcons=true  
    50 50 ShowLanguageDialog=yes  
    51 51 Compression=lzma/ultra  
    52   OutputBaseFilename=WikidPad-1.6beta4  
      52 OutputBaseFilename=WikidPad-1.6urc1  
    52 52 InternalCompressLevel=ultra  
    53 53 AppCopyright=© 2005-2006 Jason Horman, Michael Butscher, Gerhard Reitmayr  
    …… 
    96 96   end;  
    97 97 end;  
    98    

  • branches/stable-1.6/lib/pwiki/StringOps.py

    r56 r71  
    54 54  
    55 55  
      56  
    56 57 if isOSX():      # TODO Linux  
    57 58     # generate dependencies for py2app  
    …… 
    67 68 else:  
    68 69     # generate dependencies for py2exe  
      70     import encodings.ascii  
    69 71     import encodings.mbcs  
    70 72     mbcsEnc = codecs.getencoder("mbcs")  

  • branches/stable-1.6/lib/pwiki/AboutDialog.py

    r58 r71  
    14 14         <table bgcolor="#CCCCCC" width="100%%" cellspacing="0" cellpadding="0" border="1">  
    15 15             <tr>  
    16                   <td align="center"><h2>wikidPad 1.6beta</h2></td>  
      16                 <td align="center"><h2>wikidPad 1.6rc</h2></td>  
    16 16             </tr>  
    17 17         </table>  

  • branches/stable-1.6/lib/pwiki/Exporters.py

    r69 r71  
    8 8 import urllib_red as urllib  
    9 9  
      10 from wxPython.wx import *  
      11 import wxPython.xrc as xrc  
      12  
      13 from wxHelper import XrcControls  
      14  
    10 15  
      16 from WikiExceptions import WikiWordNotFoundException  
    11 17 import WikiFormatting  
    12 18 from StringOps import *  
    13 19  
    14   from WikiExceptions import WikiWordNotFoundException  
      20 from Configuration import isUnicode  
      21  
    15 22 import WikiFormatting  
    16 23 import PageAst  
    17 24  
    18   from wxPython.wx import *  
    19   import wxPython.xrc as xrc  
    20    
    21   from wxHelper import XrcControls  
    22 25  
    23 26  
    …… 
    75 78         Return sequence of tuples with the description of export types provided  
    76 79         by this object. A tuple has the form (<exp. type>,  
    77               <human readbale description>, <panel for add. options or None>)  
      80             <human readable description>, <panel for add. options or None>)  
    77 80         If panels for additional options must be created, they should use  
    78 81         guiparent as parent  
    …… 
    329 332         formattedContent = self.formatContent(word, content, formatDetails,  
    330 333                 links, asHtmlPreview=asHtmlPreview)  
    331           result.append(self.getFileHeader(word))  
      334          
      335         if isUnicode():  
      336             result.append(self.getFileHeader(word))  
      337         else:  
      338             # Retrieve file header without encoding mentioned  
      339             result.append(self.getFileHeaderNoCharset(word))  
      340  
    332 341         # if startFile is set then this is the only page being exported so  
    333 342         # do not include the parent header.  
    …… 
    343 352  
    344 353              
      354     def getFileHeaderNoCharset(self, title):  
      355         return u"""<html>  
      356     <head>  
      357         <meta http-equiv="content-type" content="text/html">  
      358         <title>%s</title>  
      359          <link type="text/css" rel="stylesheet" href="wikistyle.css">  
      360     </head>  
      361     <body>  
      362 """ % title  
      363  
    345 364     def getFileHeader(self, title):  
    346 365         return u"""<html>  
    …… 
    852 871         Return sequence of tuples with the description of export types provided  
    853 872         by this object. A tuple has the form (<exp. type>,  
    854               <human readable desctiption>, <panel for add. options or None>)  
      873             <human readable description>, <panel for add. options or None>)  
    854 873         If panels for additional options must be created, they should use  
    855 874         guiparent as parent