Changeset 135

Show
Ignore:
Timestamp:
Sun Nov 25 07:12:37 2007
Author:
mbutscher
Message:

* Bug fixed: Bad HTML anchors for headings when exporting

to single HTML file
* Internal bug fixed: Deleting plugin modules from a plugin
API didn't work
* Bug fixed for Windows: An always visible taskbar could
partly hide popup and tooltip windows

Files:

Legend:

Unmodified
Added
Removed
Modified

  • branches/stable-1.8/setup.py

    r105 r135  
    24 24       author='Michael Butscher',  
    25 25       author_email='mbutscher@gmx.de',  
    26         url='http://www.mbutscher.nextdesigns.net/software.html',  
      26       url='http://www.mbutscher.de/software.html',  
    26 26       ## scripts=['WikidPad.py'],  
    27 27       windows=[wikidpad],  

  • branches/stable-1.8/WikidPadStarter.py

    r133 r135  
    25 25 # (2, 0, 200, 0) is 2.0final  
    26 26  
    27   VERSION_TUPLE = ("wikidPad", 1, 8, 110, 0)  
      27 VERSION_TUPLE = ("wikidPad", 1, 8, 111, 0)  
    27 27  
    28   VERSION_STRING = "wikidPad 1.8rc10"  
      28 VERSION_STRING = "wikidPad 1.8rc11"  
    28 28  
    29 29 if not hasattr(sys, 'frozen'):  

  • branches/stable-1.8/wikidpad_unicode.iss

    r133 r135  
    39 39 SolidCompression=true  
    40 40 AppName=WikidPad  
    41   AppVerName=WikidPad 1.8rc10  
      41 AppVerName=WikidPad 1.8rc11  
    41 41 DefaultDirName={pf}\WikidPad  
    42 42 DefaultGroupName=WikidPad  
    43 43 AppID={{22A83C29-58A8-4CAB-8EDC-918D74F8429E}  
    44   VersionInfoVersion=1.8.110.0  
    45   VersionInfoTextVersion=WikidPad 1.8rc10  
      44 VersionInfoVersion=1.8.111.0  
      45 VersionInfoTextVersion=WikidPad 1.8rc11  
    46 46 LicenseFile=C:\DATEN\Projekte\Wikidpad\Current\license.txt  
    47 47 AllowNoIcons=true  
    48 48 ShowLanguageDialog=yes  
    49 49 Compression=lzma/ultra  
    50   OutputBaseFilename=WikidPad-1.8rc10  
      50 OutputBaseFilename=WikidPad-1.8rc11  
    50 50 InternalCompressLevel=ultra  
    51 51 AppCopyright=© 2005-2007 Jason Horman, Michael Butscher, Gerhard Reitmayr  

  • branches/stable-1.8/WikidPadHelp/WikidPadHelp.wiki

    r133 r135  
    11 11 filestorage_identity_filenamemustmatch = False  
    12 12 filestorage_identity_moddateisenough = False  
    13   further_wiki_words =  
      13 further_wiki_words = BulletedLists  
    13 13 first_wiki_word = WikidPadHelp  
    14 14  

  • branches/stable-1.8/WikidPadHelp/data/BulletedLists.wiki

    r125 r135  
    1 1 ++ Bulleted Lists  
    2 2  
    3   To start a bulleted list type an asterisk at the beginning of the line.  
      3 To start a bulleted list the line must be indented with a tabulator.  
      4 After the tabulator type an asterisk followed by a space.  
    4 5 For example:  
    5 6  
    6 7     * Put your cursor at the end of this line and press enter.  
    7 8  
    8   The start a numbered bulleted list type a number followed by a period  
    9   at the beginning of the line. For example:  
      9 The start a numbered bulleted list type an indented number followed by a period at the beginning of the line. For example:  
    10 10  
    11 11     1. Put your cursor at the end of this line and press enter.  
    …… 
    19 19 You can also switch off the automatic indentation with "auto-indent" option:  
    20 20  
    21       If this line is indented and you press return, next will be as well.  
      21     If this line is indented and you press enter, next will be as well.  
    21 21  
    22 22  

  • branches/stable-1.8/WikidPadHelp/data/ChangeLog.wiki

    r133 r135  
    2 2  
    3 3  
    4   Oct. 26, 2007 (1.8rc10)  
      4 Nov. 25, 2007 (1.8rc11)  
      5  
      6     * Bug fixed: Bad HTML anchors for headings when exporting  
      7       to single HTML file  
      8     * Bug fixed for Windows: An always visible taskbar could  
      9       partly hide popup and tooltip windows  
      10     * Internal bug fixed: Deleting plugin modules from a plugin  
      11       API didn't work  
      12  
      13  
      14  
      15 Oct. 26, 2007 (1.8rc10, repository revision in "stable-1.8" branch: 133)  
    5 16  
    6 17     * When hiding the focused tree, focus is transferred to  

  • branches/stable-1.8/lib/pwiki/PluginManager.py

    r125 r135  
    91 91  
    92 92     def deleteModule(self, module):  
    93           for f in __functionNames:  
      93         for f in self.__functionNames:  
    93 93             if hasattr(module, f):  
    94 94                 self.__plugins[f].remove(getattr(module,f))  

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

    r128 r135  
    969 969                     self.mainControl.getFormatting().unescapeNormalText  
    970 970  
    971   #             lastLevel = 1  
    972   #             htmlContent = [u"<ul>\n"]  
    973    
    974 971             htmlContent = [u'<div class="page-toc">\n']  
    975 972  
    …… 
    994 991                             headLevel)  
    995 992                  
    996                   htmlContent.append(u'<a href="#.h%i">%s</a>' % (tok.start,  
      993                 if self.wordAnchor:  
      994                     anchor = self.wordAnchor + (u"#.h%i" % tok.start)  
      995                 else:  
      996                     anchor = u".h%i" % tok.start  
      997  
      998                 htmlContent.append(u'<a href="#%s">%s</a>' % (anchor,  
    997 999                         escapeHtml(unescapeNormalText(headContent))))  
    998 1000  
      1001 #                 htmlContent.append(u'<a href="#.h%i">%s</a>' % (tok.start,  
      1002 #                         escapeHtml(unescapeNormalText(headContent))))  
      1003  
    999 1004                 if self.asIntHtmlPreview:  
    1000 1005                     htmlContent.append(u'<br />\n')  

  • branches/stable-1.8/lib/pwiki/WindowLayout.py

    r125 r135  
    10 10     pass  
    11 11  
    12   def getOverallDisplaysSize():  
      12  
      13  
      14 # def getOverallDisplaysSize():  
      15 def getOverallDisplaysClientSize():  
    13 16     """  
    14       Estimate the width and height of the screen real estate with all  
      17     Estimate the rectangle of the screen real estate with all  
    14 17     available displays. This assumes that all displays have same  
    15 18     resolution and are positioned in a rectangular shape.  
    16 19     """  
      20     # TODO: Find solution for multiple displays with taskbar always visible  
      21  
      22     if wx.Display.GetCount() == 1:  
      23         return wx.GetClientDisplayRect()  
      24  
      25     # The following may be wrong if taskbar is always visible  
    17 26     width = 0  
    18 27     height = 0  
    19    
      28      
    19 28     for i in xrange(wx.Display.GetCount()):  
    20 29         d = wx.Display(i)  
    …… 
    26 35         height = max(height, rect.y + rect.height)  
    27 36  
    28       return (width, height)  
      37     return wx.Rect(0, 0, width, height)  
    28 37  
    29 38  
    …… 
    41 50         currentX, currentY = win.GetPositionTuple()  
    42 51          
    43   #     screenX = wxSystemSettings_GetMetric(wxSYS_SCREEN_X)  
    44   #     screenY = wxSystemSettings_GetMetric(wxSYS_SCREEN_Y)  
    45    
    46       screenX, screenY = getOverallDisplaysSize()  
      52 #     screenX, screenY = getOverallDisplaysSize()  
      53     clRect = getOverallDisplaysClientSize()  
    47 54      
    48 55     # fix any crazy screen positions  
    49       if currentX < 0:  
    50           currentX = 10  
    51       if currentY < 0:  
    52           currentY = 10  
    53       if currentX > screenX:  
    54           currentX = screenX-100  
    55       if currentY > screenY:  
    56           currentY = screenY-100  
    57            
      56     if currentX < clRect.x:  
      57         currentX = clRect.x + 10  
      58     if currentY < clRect.y:  
      59         currentY = clRect.y + 10  
      60     if currentX > clRect.width:  
      61         currentX = clRect.width - 100  
      62     if currentY > clRect.height:  
      63         currentY = clRect.height - 100  
      64  
    58 65     if fullVisible:  
    59 66         sizeX, sizeY = win.GetSizeTuple()  
    60           if currentX + sizeX > screenX:  
    61               currentX = screenX - sizeX  
    62           if currentY + sizeY > screenY:  
    63               currentY = screenY - sizeY  
      67         if (currentX - clRect.x) + sizeX > clRect.width:  
      68             currentX = clRect.width - sizeX + clRect.x  
      69         if (currentY - clRect.y) + sizeY > clRect.height:  
      70             currentY = clRect.height - sizeY + clRect.y  
    64 71  
    65 72     win.SetPosition((currentX, currentY))  
    66 73  
    67 74  
    68    
    69 75 def setWindowSize(win, size):  
    70 76     """  
    …… 
    73 79     sizeX, sizeY = size  
    74 80  
    75   #     screenX = wxSystemSettings_GetMetric(wxSYS_SCREEN_X)  
    76   #     screenY = wxSystemSettings_GetMetric(wxSYS_SCREEN_Y)  
    77    
    78       screenX, screenY = getOverallDisplaysSize()     
      81 #     screenX, screenY = getOverallDisplaysSize()     
      82     clRect = getOverallDisplaysClientSize()  
    79 83  
    80 84     # don't let the window be > than the size of the screen  
    81       if sizeX > screenX:  
    82           sizeX = screenX-20  
    83       if sizeY > screenY:  
    84           sizeY = screenY-20  
      85     if sizeX > clRect.width:  
      86         sizeX = clRect.width - 20  
      87     if sizeY > clRect.height:  
      88         sizeY = clRect.height - 20  
    85 89  
    86 90     # set the size  
    …… 
    88 92  
    89 93  
      94 def setWindowClientSize(win, size):  
      95     """  
      96     Similar to setWindowSize(), but sets the client size of the window  
      97     """  
      98     sizeX, sizeY = size  
      99  
      100 #     screenX, screenY = getOverallDisplaysSize()     
      101     clRect = getOverallDisplaysClientSize()  
      102  
      103     # don't let the window be > than the size of the screen  
      104     if sizeX > clRect.width:  
      105         sizeX = clRect.width - 20  
      106     if sizeY > clRect.height:  
      107         sizeY = clRect.height - 20  
      108  
      109     # set the size  
      110     win.SetClientSize((sizeX, sizeY))  
      111  
      112  
      113  
      114  
      115  
    90 116 class SmartSashLayoutWindow(wx.SashLayoutWindow):  
    91 117     def __init__(self, *args, **kwargs):