Changeset 93

Show
Ignore:
Timestamp:
Wed Oct 18 05:48:02 2006
Author:
mbutscher
Message:

branches/stable-1.7:
* Bug fixed: Pages were shown as parentless even if

an alias of the page had a parent
* Bug fixed: Detection of Linux OS failed due to a typo
* Bug fixed: Opening a particular page on startup by
mentioning the .wiki file on commandline did not work
* Bug fixed: Special URLs containing $ couldn't be
activated (further fixes may be necessary)


branches/mbutscher/work:
* HTML exporter insert a DOCTYPE statement (todo:
make configurable)
* List undefined pages (dead wiki links), also
appropriate insertion added
* Internal: Basic support for using a collator (sort
order) other than default "C".
* Internal: File Localization.py (officially) added
which contains collator classes for sorting right
* Internal: DocPagePresenter? python file and class
introduced to control the presentation (edit,
preview) of one page

* Bug fixed: Detection of Linux OS failed due to a typo
* Bug fixed: Pages were shown as parentless even if
an alias of the page had a parent
* Bug fixed: Opening a particular page on startup by
mentioning the .wiki file on commandline did not work
* Bug fixed: Special URLs containing $ couldn't be
activated (further fixes may be necessary)

Files:

Legend:

Unmodified
Added
Removed
Modified

  • branches/mbutscher/TodoList.txt

    r90 r93  
    1   +++ Special anchor: item (like todo items)  
    2   > maybe you can introduce one more special att like "anchor:" or  
    3   > something like that where we want to keep record of certain line in a  
    4   > text? So whenever we click on that att it takes us to certain line of  
    5   > the text?  
    6    
    7    
    8 1 +++ More shortcut customizations  
    9 2 > (Having mentioned shortcut keys: is there any ways to change ctrl-space  
    …… 
    27 20  
    28 21 > Thanks. I'd suggest adding:  
    29   >   
      22 >  
    29 22 > Wikize Selected Word  
    30 23 > Add Text Block >  
    31 24 > Rename Wiki  
    32   >   
      25 >  
    32 25 > Export Current Wiki...?  
    33 26 *Details*:  
    …… 
    43 36  
    44 37  
      38 > 1. When exporting a wiki tree (or the entire wiki) to a single HTML  
      39 > page, the first wiki entry should be the root entry. Ideally the HTML  
      40 > output would order the topics just like the Wiki tree.  
      41  
      42  
      43 >>Is there a way to export a View rather than a wiki tree?  The tree may  
      44 >>> > be a jumbled mess, but attributes put it all in a nice order, but then  
      45 >>> > there's no way to export that order.  
      46 >  
      47 >>  
      48 >> Export the tree as what? A HTML or plain text file showing the tree  
      49 >> structure?  
      50 >>  
      51 >>  
      52 >> Michael  
      53 >>  
      54 I'd say HTML - the idea is to have an organized but linked list  
      55 instead of the default disorganized (or organized in a different way)  
      56 linked list.  
      57  
      58  
      59 > > > Come to think of it , if we cannot get full indented text export, at  
      60 > > > least we may be able to get treeview exported? This way at least user  
      61 > > > will get information structure properly out of wikipad.  
      62 > > >  
      63 > > > I have 3 suggestions  
      64 > > >  
      65 > > > -can be indented text  
      66 > > > -can be hierarchy folder structure  
      67 > > > -can be firefox bookmark format  
      68 >  
      69 > First two are definitely possible.  
      70 > > > following on folder export style, for example if i have  
      71 > > >  
      72 > > > father  
      73 > > > --child1  
      74 > > > --child2  
      75 > > > ---grandson  
      76 > > >  
      77 > > > we can have a folder structure similar to above and those folders  
      78 > > > would have dummy .txt files named after the folder they belong.  
      79 > > > So, (extensionless words are folder names)  
      80 > > >  
      81 > > > father  
      82 > > > --father.txt  
      83 > > > --child1  
      84 > > > ---child1.txt  
      85 > > > --child2  
      86 > > > ---child2.txt  
      87 > > > ---grandson  
      88 > > > ----grandson.txt  
      89 > > >  
      90 > > > any ideas?  
      91  
      92  
      93 > In the single-page HTML export, the table of contents would appear  
      94 > first.  
      95 > In the multi-file HTML export, the table of contents would appear as  
      96 > index.html (it would be nicer again if the user could choose the name  
      97 > of the index file).  
      98  
      99 > The configuration option to control this might be called something like  
      100 > checkbox: "Output table of contents"  
      101  
      102  
    45 103 +++ Remember expanded nodes in tree  
    46 104 > Another SUGGESTION on the Collapse Tree theme:  
    …… 
    66 128 >> editor should be at the same position in the page where the preview was?  
    67 129 >> This would be nearly impossible.  
    68   >   
      130 >  
    68 130 > No, you've told me it was impossible. I just meant what you said (that  
    69 131 > you double-click anywhere in the Preview pane and it would switch to  
    …… 
    76 138 <<  
    77 139 So I would suggest:  
    78   >   
      140 >  
    78 140 > http://www.blahblah.com/thisisimage.jpg>s*2  
    79   >   
      141 >  
    79 141 > http://www.blahblah.com/thisisimage.jpg>s/2  
    80   >   
      142 >  
    80 142 > http://www.blahblah.com/thisisimage.jpg>s250x150  
    81   >  
    82   >  
      143 >  
      144 >  
    83 145 > as syntax.  
    84   >  
    85   >  
      146 >  
      147 >  
    86 148 > The 's' is there to allow to add other commands later (prefixed with  
    87 149 > other letters).  
    …… 
    94 156  
    95 157  
    96   +++ Including one wiki word content into another in preview  
    97   >>>>Have you an example link how the inclusion of one wiki page into  
    98   >>>Hmmm.. Well, in terms of wiki-code it might look like:  
    99   >>>[...]  
    100   >>>(AWikiword)  
    101   >>>[...]  
    102   >>  
    103   >>I think parentheses are not a good idea, they are used too often in  
    104   >>normal text.  
    105   > Well, yes, it was only an example for demonstration :)  
    106   >  
    107   > Maybe [(WikiWord)], or((WikiWord)) ?  
    108   *Details*:  
    109   Syntax to use:  
    110   \[:page: WikiWord]  
    111    
    112    
    113   +++ Dynamic creation of content sequences from e.g. searches  
    114   > 15. A way to lay out the contents of different wikiwords within  
    115   > another wikiword dynamically; in other words, a saved search or view  
    116   > which, instead of creating a list of pages, is itself an item that  
    117   > includes the contents of relevant pages in order within itself. This  
    118   > is something that tiddlywiki does to great effect (one can view more  
    119   > than one item at once sequentially on a web page).  
    120    
    121    
    122   +++ Dynamic creation of word lists/links from e.g. searches  
    123    
    124    
    125 158 +++ HTML export: Should export XHTML  
    126   > 1. Is there anyway to export wikis as XHTML files? It seems like the  
    127   > standard HTML export from wikidpad is pretty much consistent with  
    128   > the XHTML spec except that the <html> statement needs to specify a  
    129   > namespace (e.g. <html xmlns="http://www.w3.org/1999/xhtml">) and the  
    130   > <meta> and <link> statements are missing closing "/" characters. The  
    131   > reason I ask is that I want to be able to use MathML, but firefox  
      159 > 1. Is there anyway to export wikis as XHTML files? It seems like the  
      160 > standard HTML export from wikidpad is pretty much consistent with  
      161 > the XHTML spec except that the <html> statement needs to specify a  
      162 > namespace (e.g. <html xmlns="http://www.w3.org/1999/xhtml">) and the  
      163 > <meta> and <link> statements are missing closing "/" characters. The  
      164 > reason I ask is that I want to be able to use MathML, but firefox  
    132 165 > only runs MathML in XHTML. Which leads me to my second question  
    133 166  
    …… 
    137 170  
    138 171 +++ HTML import  
    139   This is one of the most important features for me. Perhaps it could be  
    140   implemented as a translation. Pasted HTML would be translated to  
    141   wikidPad equivalents. I currently use Zoot. I, and many others, are  
      172 This is one of the most important features for me. Perhaps it could be  
      173 implemented as a translation. Pasted HTML would be translated to  
      174 wikidPad equivalents. I currently use Zoot. I, and many others, are  
    142 175 looking for an alternative because Zoot does not handle HTML or images.  
    143 176 *Details*:  
    …… 
    146 179  
    147 180 +++ Timer hook  
    148   > 4.It'll be very useful to have one more hook function, which is called  
    149   > every x minutes. It helped to implement some PIM functionality for  
      181 > 4.It'll be very useful to have one more hook function, which is called  
      182 > every x minutes. It helped to implement some PIM functionality for  
    150 183 > example.  
    151 184  
    …… 
    174 207 > > > wikiword, shortest wikiword,  number of anything user defines or  
    175 208 > > > anything Michael thinks worth putting in maybe.  
    176   > > >   
      209 > > >  
    176 209 > > > I think that this can be per page attribute or global attribute that  
    177 210 > > > can be shown under "views".  
    178   > > >   
      211 > > >  
    178 211 > > > So if one puts [showstatistic!] in a page, there would be page under  
    179 212 > > > "views "  called "statistics" with the name of the page or global  
    180 213 > > > place. In that page one can check if there are repeats of the  
    181 214 > > > wikiwords etc to determine possible export problems?  
    182   > > >   
      215 > > >  
    182 215 > > > I also think that this can be a great helper for especially for  
    183 216 > > > writers who need to check their number of words etc.  
    184   >   
      217 >  
    184 217 > How about a third tab "Stats" after "Edit" and "Preview"? Clicking on it  
    185 218 > starts the calculation of per-page statistics and shows them if ready.  
    186   >   
      219 >  
    186 219 > As child of the "Views" tree node there could be an additional page for  
    187 220 > page-independent wiki-wide statistics.  
    …… 
    198 231  
    199 232 +++ Auto-complete closing bracket (as option)  
    200   > a) how come I have to insert the closing bracket ( ] ) whenever I   
      233 > a) how come I have to insert the closing bracket ( ] ) whenever I  
    200 233 > auto-insert any wikiword defined by brackets?  
    201 234  
    …… 
    218 251  
    219 252  
    220   +++ Select multiple tree nodes  
    221 253 > I see, thanks. I was trying under Views - parentless-nodes. I could use  
    222 254 > the same Ctrl/ShiftPress+click (is it called "sticky selection"?) in  
    …… 
    228 261 > similar to the HTML <pre> element. This can be seen in the preview and  
    229 262 > the HTML export.  
    230   >   
      263 >  
    230 263 > Motivation: Wikis (and HTML) usually ignore line-breaks; you have to  
    231 264 > either use a <br> element or enter a blank line to achieve a  
    232 265 > line-break.  
    233   >   
      266 >  
    233 266 > Since existing WikidPad users probably expect the current line-break  
    234 267 > behaviour, you probably don't want to change this; however it would be  
    …… 
    251 284 Sometimes it is very hard to keep tack of all special attributes and  
    252 285 their subgroups. It would be great to have auto completion for atts  
    253   too. That would keep things more ordered.   
      286 too. That would keep things more ordered.  
    253 286  
    254 287  
    …… 
    276 309  
    277 310 +++ Allow selection of page sets by view, by property  
    278   The way that I'm using it is to organize things by project, but to use  
    279   extensively the "View" at the bottom of the tree to group things by  
      311 The way that I'm using it is to organize things by project, but to use  
      312 extensively the "View" at the bottom of the tree to group things by  
    280 313 using WikidPad's attributes (e.g. \[Current: Today]).  
    281 314  
    282 315 This way I can see at a glance all items with the same attributes.  
    283 316  
    284   My question is: is there a way to copy to easily print in the same page   
      317 My question is: is there a way to copy to easily print in the same page  
    284 317 (and/or copy to the clipboard) all the items with the same attribute?  
    285 318  
    …… 
    292 325 +++ Allow to store selections in Export or Print dialog as presets  
    293 326  
    294      
      327  
    294 327 +++ System-wide hotkey  
    295 328 It would also be cool it WikiPad would support a hotkey to expand it.  
    …… 
    305 338 > Disable sync highlighting for pages larger than X bytes. X is value  
    306 339 > definable by the user.  
    307   >   
      340 >  
    307 340 > 5. Attributes: In terms of the sync. highlighting it would be fine if  
    308 341 > it would be possible to turn highlighting on or off using these or  
    …… 
    391 424 +++ Handle pasting of images into WikidPad  
    392 425 >  My proposal is that Wikipad would save the pasted image to current  
    393   > project folder(where open wiki file is from)  under " images "   
      426 > project folder(where open wiki file is from)  under " images "  
    393 426 > folder. If there is not one wikipad would create it. And it creates a  
    394   > relative or actual link to the image.   
      427 > relative or actual link to the image.  
    394 427  
    395 428  
    …… 
    415 448 > themselves). I WILL GIVE YOU AN EXAMPLE WHAT I MEAN BELOW. PLS JUST SKIP  
    416 449 > THE NEXT FEW PARAGRAPHS IF NOT INTERESTED.  
    417   >   
      450 >  
    417 450 > You assume that I only want to create links on purpose, but what if I  
    418 451 > don't?  
    419   >   
      452 >  
    419 452 > Let me give you an example: I'm making lots of research for a project  
    420 453 > and collect notes in wikidPad, but I have something like 100 different  
    …… 
    430 463 > keeps the flow of writing completely fluent, and it was what I wanted to  
    431 464 > achieve in point 5 above with "GranDolina".)  
    432   >   
      465 >  
    432 465 > It has other handy uses, like learning languages: e.g. you paste a  
    433 466 > target-language text into a TextWiki. You start reading and come across  
    …… 
    438 471 > would see all the words that you have covered and click on them if  
    439 472 > you're not sure what they mean, etc.  
    440   >   
      473 >  
    440 473 >> and on the other hand you may create undesired links because a typed  
    441 474 >> text incidentially matches a wiki word.  
    442   >   
      475 >  
    442 475 > That's true, but if I'm so stupid to wikize a word like "the", than I  
    443 476 > deserve to have undesired links... It needs some common sense to wikize  
    444 477 > a bit more unique words/word combinations.  
    445   >   
      478 >  
    445 478 > Anyway, suppose I wikize something more unique and still create an  
    446 479 > undesired link; you could surely escape it... Also, I could still choose  
    …… 
    453 486  
    454 487  
      488 > 2. Editor: SciTE offers auto completion. Right now Wikid Pad limits  
      489 > this feature to attribute names and wiki words. An option to turn this  
      490 > on for all words would be great.  
      491  
      492  
    455 493 +++ History of searches, opened wiki words, autocompleted terms and opened wikis  
    456 494 > * drop-down history of typed-in searches in Search Wiki? Same for Open  
    …… 
    467 506  
    468 507  
    469   +++ Autocompletion for all words  
    470   > 2. Editor: SciTE offers auto completion. Right now Wikid Pad limits  
    471   > this feature to attribute names and wiki words. An option to turn this  
    472   > on for all words would be great.  
    473    
    474    
    475 508 +++ Highlight search terms in preview  
    476 509 > When searching the search terms (when found) are highlighted in the  
    …… 
    507 540 > > > pages the wikiword is italicized. This is necessary to differentiate  
    508 541 > > > from pages that have no SingleParent. The View Parents dialog  
    509   > > > similarly !s the father and italicizes the uncles.   
      542 > > > similarly !s the father and italicizes the uncles.  
    509 542  
    510 543  
    …… 
    518 551  
    519 552  
    520   +++ Logical page order on single HTML-page export  
    521   > 1. When exporting a wiki tree (or the entire wiki) to a single HTML  
    522   > page, the first wiki entry should be the root entry. Ideally the HTML  
    523   > output would order the topics just like the Wiki tree.  
    524    
    525    
    526   +++ Exporting tree structure as HTML  
    527   >>Is there a way to export a View rather than a wiki tree?  The tree may  
    528   >>> > be a jumbled mess, but attributes put it all in a nice order, but then  
    529   >>> > there's no way to export that order.   
    530   >  
    531   >>  
    532   >> Export the tree as what? A HTML or plain text file showing the tree  
    533   >> structure?  
    534   >>  
    535   >>  
    536   >> Michael  
    537   >>  
    538   I'd say HTML - the idea is to have an organized but linked list  
    539   instead of the default disorganized (or organized in a different way)  
    540   linked list.  
    541    
    542    
    543   +++ Exporting tree structure  
    544   > > > Come to think of it , if we cannot get full indented text export, at  
    545   > > > least we may be able to get treeview exported? This way at least user  
    546   > > > will get information structure properly out of wikipad.  
    547   > > >  
    548   > > > I have 3 suggestions  
    549   > > >  
    550   > > > -can be indented text  
    551   > > > -can be hierarchy folder structure  
    552   > > > -can be firefox bookmark format  
    553   >  
    554   > First two are definitely possible.  
    555   > > > following on folder export style, for example if i have  
    556   > > >  
    557   > > > father  
    558   > > > --child1  
    559   > > > --child2  
    560   > > > ---grandson  
    561   > > >  
    562   > > > we can have a folder structure similar to above and those folders  
    563   > > > would have dummy .txt files named after the folder they belong.  
    564   > > > So, (extensionless words are folder names)  
    565   > > >  
    566   > > > father  
    567   > > > --father.txt  
    568   > > > --child1  
    569   > > > ---child1.txt  
    570   > > > --child2  
    571   > > > ---child2.txt  
    572   > > > ---grandson  
    573   > > > ----grandson.txt  
    574   > > >  
    575   > > > any ideas?  
    576    
    577    
    578   +++ Content table for HTML export  
    579   > In the single-page HTML export, the table of contents would appear  
    580   > first.  
    581   > In the multi-file HTML export, the table of contents would appear as  
    582   > index.html (it would be nicer again if the user could choose the name  
    583   > of the index file).  
    584    
    585   > The configuration option to control this might be called something like  
    586   > checkbox: "Output table of contents"  
    587    
    588    
    589 553 +++ date format with weekday between 1 and 7  
    590 554 I use the ISO-8601 format. http://www.saqqara.demon.co.uk/datefmt.htm  
    …… 
    601 565  
    602 566 +++ No more delayed respect of camelCaseWordsEnabled attribute  
    603   > (2) If I insert \[camelCaseWordsEnabled=false] in a page, in which  
    604   > camelcase words have been detected before, the links stay until I switch  
      567 > (2) If I insert \[camelCaseWordsEnabled=false] in a page, in which  
      568 > camelcase words have been detected before, the links stay until I switch  
    605 569 > to another page and switch back afterwards.  
    606 570  
    …… 
    629 593 For example  
    630 594  
    631   i have   
      595 i have  
    631 595 todo: please finish  
    632 596 and this is under lets say "dailies"  
    …… 
    636 600 "  todo and delete. But when i delete it it should not be deleting the  
    637 601 "dailies" page, it should just remove that "todo:please finish" from  
    638   the page it belongs (which is "dailies") .   
      602 the page it belongs (which is "dailies") .  
    638 602  
    639 603 In some cases todos may decribe a whole page , lets say  
    640   todo:true,   
      604 todo:true,  
    640 604 if that is the case then maybe we should be able to delete the whole page  
    641 605 >>  
    …… 
    648 612  
    649 613  
    650   +++ Popup attribute to show popups  
    651 614 Add an attribute called PopUp.  
    652 615 Its function would be if there is that attribute on a page,  
    …… 
    656 620 Example:  
    657 621 On the page RobertSmith I enter \[popup: 510-555-9898]  
    658   On any page where there is a link to [RobertSmith],   
      622 On any page where there is a link to [RobertSmith],  
    658 622 hovering on the link would show 510-555-9898  
    659 623 If the cursor/mouse is moved away the pop would disappear.  
    …… 
    665 629 there. It would be nice to have a right click tree menu item that is  
    666 630 "open url" .If there is any file and web url listed in the content  
    667   wikipad would launch the path when i select "open url" menu item.   
      631 wikipad would launch the path when i select "open url" menu item.  
    667 631  
    668 632 I understand that this can get very complicated and frustrating if one  
    …… 
    672 636 behave properly.  
    673 637  
    674   This will cut down steps of   
      638 This will cut down steps of  
    674 638  
    675 639 1 selecting the wikiword with url  
    …… 
    695 659  
    696 660 +++ Faster syntax highlighting  
    697   > I know that there's a thread that is supposed to work in background to   
      661 > I know that there's a thread that is supposed to work in background to  
    697 661 > create the format, but it's really slow for me.  
    698   >  
    699   > Maybe it's possible to compute format just before and after current  
      662 >  
      663 > Maybe it's possible to compute format just before and after current  
    700 664 > caret position, or maybe even just for the current visible page.  
    701 665  
    702 666  
    703   +++ Split view  
    704 667 > A related, but different, feature would be the ability split the edit  
    705 668 > pane to undependably display two pages, or different ranges of the same  
    …… 
    718 682 > wikiwords open and they would each have a tab (where Edit and Preview  
    719 683 > tabs are) on top with their names.  
    720   >   
      684 >  
    720 684 > PLUS: It could be also integrated into the tree. Let's say you want to  
    721   > open all pages tagged [CurrentProject:true] you right click on the  
      685 > open all pages tagged \[CurrentProject:true] you right click on the  
    721 685 > attribute under 'Views' and could choose to 'Open all wikis tagged  
    722 686 > 'CurrentProject'' in multiple tabs. By clever tagging you could open  
    723 687 > several pages in any combination you want.  
    724   >   
      688 >  
    724 688 > PLUS: You could also integrate this into the 'Open Wiki Word' (CTRL-O)  
    725 689 > window. If you name your wikiwords themed (I do that anyway) e.g.  
    …… 
    730 694 > type 'Spain' in the field, you could open all wikiwords themed 'Spain'.  
    731 695 > Also, the same could be integrated into Search Wiki (CTRL-ALT-F).  
    732   >   
      696 >  
    732 696 > PLUS: HoldDownCtrl+Click would also come in handy here. E.g. you pick  
    733 697 > several wikiwords in the tree (or in the 'Open Wiki Word' window or in  
    …… 
    736 700 > HoldDownCtrl+Click would also be handy to delete several wikis (once you  
    737 701 > mentioned deleting several wikis under 'parentless-nodes', but I don't  
    738   > seem to find any function like that. Or is it ‘Vacuum Wiki’?)  
    739    
      702 > seem to find any function like that. Or is it ‘Vacuum Wiki’?)  
      703 *Details*:  
      704 > Currently I'm thinking about the following possibilities:  
      705 > >  
      706 > > - "Edit" and "Preview" tabs for each page (might become a lot of tabs)  
      707 > >  
      708 > > - One "Preview" tab which always shows the text from the last used  
      709 edit tab  
      710 > >  
      711 > > - No more "Preview" and "Edit" tabs but an icon (or two) in toolbar (and  
      712 > > a key shortcut) to switch between edit and preview mode for a page (each  
      713 > > page has a tab, of course)  
      714 *Votes*:  
      715 1 for option 1 (page tabs at top, edit/preview at bottom)  
      716 3 for option 3  
    740 717  
    741 718  
    742 719  
    743 720 +++ Parentless words as family wiki-words  
    744   > Then a bug report: if a wikiword (e.g.: AaA) is the child of a parent-less  
    745   > wikiword (e.g.:BbB), AaA doesn't show up in the tree view. I expected to see  
      721 > Then a bug report: if a wikiword (e.g.: AaA) is the child of a parent-less  
      722 > wikiword (e.g.:BbB), AaA doesn't show up in the tree view. I expected to see  
    746 723 > AaA as the child of BbB, with BbB showed under the parent-less-nodes node.  
    747 724  
    …… 
    768 745 +++ Configurable delimiters to enclose wiki words instead of brackets  
    769 746 Using the same delimiters for wikiwords and properties makes sense to  
    770   me. More consistent, and doesn't require having to think about it.   
      747 me. More consistent, and doesn't require having to think about it.  
    770 747  
    771 748  
    …… 
    804 781  
    805 782 +++ Random word at startup  
    806   > Michael--Thanks for incorporating the "First word at startup" option  
    807   > in the latest release. As an extension (or antithesis) of that  
    808   > feature, might it also be possible to have an option to start on a  
    809   > random page? This would be amusing and useful in the sense of  
      783 > Michael--Thanks for incorporating the "First word at startup" option  
      784 > in the latest release. As an extension (or antithesis) of that  
      785 > feature, might it also be possible to have an option to start on a  
      786 > random page? This would be amusing and useful in the sense of  
    810 787 > reminding us of the existence of long-forgotten pages.  
    811    

  • branches/mbutscher/work/WikidPadStarter.py

    r90 r93  
    4 4 os.stat_float_times(True)  
    5 5  
    6   VERSION_STRING = "wikidPad 1.8beta2"  
      6 VERSION_STRING = "wikidPad 1.8beta3"  
    6 6  
    7 7 if not hasattr(sys, 'frozen'):  
    …… 
    45 45 from pwiki import Ipc  
    46 46 from pwiki.Configuration import createGlobalConfiguration  
      47 from pwiki.Localization import getCollatorByString  
    47 48  
    48 49  
    …… 
    216 217         else:  
    217 218             self.createDefaultGlobalConfig(globalConfigLoc)  
    218                
      219  
    218 219         self.lowResources = self.globalConfig.getboolean("main", "lowresources")  
    219 220  
    …… 
    222 223         iconDir = os.path.join(self.wikiAppDir, "icons")  
    223 224         self.iconCache = IconCache(iconDir, self.lowResources)  
      225          
      226         # self.collator = getCollatorByString("c")  
      227         self.collator = getCollatorByString("Python")  
      228         # self.collator = getCollatorByString("", True)  
    224 229  
    225 230         if self.globalConfig.getboolean("main", "single_process"):  
    …… 
    402 407         """  
    403 408         return self.iconCache  
      409          
      410     def getCollator(self):  
      411         return self.collator  
    404 412  
    405 413  

  • branches/mbutscher/work/lib/pwiki/WikiTxtCtrl.py

    r92 r93  
    58 58  
    59 59 class WikiTxtCtrl(wxStyledTextCtrl):  
    60       def __init__(self, pWiki, parent, ID):  
      60     def __init__(self, presenter, parent, ID):  
    60 60         wxStyledTextCtrl.__init__(self, parent, ID)  
    61           self.pWiki = pWiki  
      61         self.presenter = presenter  
    61 61         self.evalScope = None  
    62 62         self.stylebytes = None  
    …… 
    81 81          
    82 82         # configurable editor settings  
    83           config = self.pWiki.getConfig()  
      83         config = self.presenter.getConfig()  
    83 83         self.setWrapMode(config.getboolean("main", "wrap_mode"))  
    84 84         self.SetIndentationGuides(config.getboolean("main", "indentation_guides"))  
    …… 
    87 87         self.autoBullets = config.getboolean("main", "auto_bullets")  
    88 88         self.setShowLineNumbers(config.getboolean("main", "show_lineNumbers"))  
      89          
      90         self.defaultFont = config.get("main", "font",  
      91                 self.presenter.getDefaultFontFaces()["mono"])  
      92  
    89 93  
    90 94         # Self-modify to ansi/unicode version  
    …… 
    107 111  
    108 112         self.StyleSetSpec(wxSTC_STYLE_DEFAULT, "face:%(mono)s,size:%(size)d" %  
    109                   self.pWiki.presentationExt.faces)  
      113                 self.presenter.getDefaultFontFaces())  
    109 113  
    110 114         for i in xrange(32):  
    …… 
    144 148  
    145 149         # register some event handlers  
    146