From a0d9171ddf7a81268c53d4991afe8e01e99d4c43 Mon Sep 17 00:00:00 2001 From: christian_u Date: Fri, 6 Apr 2007 14:54:50 +0000 Subject: [PATCH] Fixed link setting git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@142 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- applications/wikihelp/src/umain.lfm | 24 +++++----- applications/wikihelp/src/umain.lrs | 12 ++--- applications/wikihelp/src/umain.pas | 4 +- applications/wikihelp/src/wikihelp.lpi | 64 +++----------------------- 4 files changed, 27 insertions(+), 77 deletions(-) diff --git a/applications/wikihelp/src/umain.lfm b/applications/wikihelp/src/umain.lfm index c465fca1e..da28322f2 100644 --- a/applications/wikihelp/src/umain.lfm +++ b/applications/wikihelp/src/umain.lfm @@ -11,45 +11,45 @@ object fWikiHelp: TfWikiHelp OnCreate = FormCreate object lWikiPage: TLabel Left = 8 - Height = 16 + Height = 14 Top = 8 - Width = 50 + Width = 44 Caption = 'WikiPage' Color = clNone ParentColor = False end object lPageOffset: TLabel Left = 8 - Height = 16 + Height = 14 Top = 60 - Width = 62 + Width = 58 Caption = 'lPageOffset' Color = clNone ParentColor = False end object eFoundPages: TLabel Left = 8 - Height = 16 + Height = 14 Top = 104 - Width = 72 + Width = 66 Caption = 'eFoundPages' Color = clNone ParentColor = False end object lOutputDir: TLabel Left = 8 - Height = 16 + Height = 14 Top = 240 - Width = 57 + Width = 51 Caption = 'Output Dir' Color = clNone ParentColor = False end object lLanguage: TLabel Left = 288 - Height = 16 + Height = 14 Top = 8 - Width = 53 + Width = 48 Caption = 'Language' Color = clNone ParentColor = False @@ -137,9 +137,9 @@ object fWikiHelp: TfWikiHelp end object cbAddLinkedPages: TCheckBox Left = 8 - Height = 15 + Height = 13 Top = 220 - Width = 105 + Width = 103 Caption = 'Add linked Pages' TabOrder = 7 end diff --git a/applications/wikihelp/src/umain.lrs b/applications/wikihelp/src/umain.lrs index 01be61331..a0cb397a7 100644 --- a/applications/wikihelp/src/umain.lrs +++ b/applications/wikihelp/src/umain.lrs @@ -5,15 +5,15 @@ LazarusResources.Add('TfWikiHelp','FORMDATA',[ +#221#0#5'Width'#3#172#1#18'HorzScrollBar.Page'#3#171#1#18'VertScrollBar.Page' +#3'A'#1#13'ActiveControl'#7#9'eWikiPage'#7'Caption'#6#8'WikiHelp'#7'OnClose' +#7#9'FormClose'#8'OnCreate'#7#10'FormCreate'#0#6'TLabel'#9'lWikiPage'#4'Left' - +#2#8#6'Height'#2#16#3'Top'#2#8#5'Width'#2'2'#7'Caption'#6#8'WikiPage'#5'Colo' + +#2#8#6'Height'#2#14#3'Top'#2#8#5'Width'#2','#7'Caption'#6#8'WikiPage'#5'Colo' +'r'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#11'lPageOffset'#4'Left'#2#8#6 - +'Height'#2#16#3'Top'#2'<'#5'Width'#2'>'#7'Caption'#6#11'lPageOffset'#5'Color' + +'Height'#2#14#3'Top'#2'<'#5'Width'#2':'#7'Caption'#6#11'lPageOffset'#5'Color' +#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#11'eFoundPages'#4'Left'#2#8#6'H' - +'eight'#2#16#3'Top'#2'h'#5'Width'#2'H'#7'Caption'#6#11'eFoundPages'#5'Color' + +'eight'#2#14#3'Top'#2'h'#5'Width'#2'B'#7'Caption'#6#11'eFoundPages'#5'Color' +#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#10'lOutputDir'#4'Left'#2#8#6'He' - +'ight'#2#16#3'Top'#3#240#0#5'Width'#2'9'#7'Caption'#6#10'Output Dir'#5'Color' + +'ight'#2#14#3'Top'#3#240#0#5'Width'#2'3'#7'Caption'#6#10'Output Dir'#5'Color' +#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#9'lLanguage'#4'Left'#3' '#1#6'H' - +'eight'#2#16#3'Top'#2#8#5'Width'#2'5'#7'Caption'#6#8'Language'#5'Color'#7#6 + +'eight'#2#14#3'Top'#2#8#5'Width'#2'0'#7'Caption'#6#8'Language'#5'Color'#7#6 +'clNone'#11'ParentColor'#8#0#0#5'TEdit'#9'eWikiPage'#4'Left'#2#8#6'Height'#2 +#23#3'Top'#2#28#5'Width'#3#12#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0 +#8'TabOrder'#2#0#4'Text'#6'!http://www.ullihome.de/index.php/'#0#0#5'TEdit' @@ -37,7 +37,7 @@ LazarusResources.Add('TfWikiHelp','FORMDATA',[ +'mplete'#20'cbactSearchAscending'#0#13'Items.Strings'#1#6#16'Special:Allpage' +'s'#6#16'Spezial:Allpages'#0#9'MaxLength'#2#0#8'OnSelect'#7#16'cbLanguageSel' +'ect'#8'TabOrder'#2#6#0#0#9'TCheckBox'#16'cbAddLinkedPages'#4'Left'#2#8#6'He' - +'ight'#2#15#3'Top'#3#220#0#5'Width'#2'i'#7'Caption'#6#16'Add linked Pages'#8 + +'ight'#2#13#3'Top'#3#220#0#5'Width'#2'g'#7'Caption'#6#16'Add linked Pages'#8 +'TabOrder'#2#7#0#0#15'TXMLPropStorage'#10'Properties'#12'StoredValues'#14#1#4 +'Name'#6#9'OUTPUTDIR'#0#1#4'Name'#6#8'WIKIPAGE'#0#1#4'Name'#6#10'PAGEOFFSET' +#0#0#4'left'#2#4#3'top'#2#4#0#0#0 diff --git a/applications/wikihelp/src/umain.pas b/applications/wikihelp/src/umain.pas index ce887e1d5..db8ee36c5 100644 --- a/applications/wikihelp/src/umain.pas +++ b/applications/wikihelp/src/umain.pas @@ -181,6 +181,8 @@ begin act_uls := 0; //Remove NOTOC istr := StringReplace(istr,'__NOTOC__','',[rfReplaceAll]); + //Remove TOC + istr := StringReplace(istr,'__TOC__','',[rfReplaceAll]); //Remove Templates while pos('{{',istr) > 0 do begin @@ -384,7 +386,7 @@ begin lbFoundPages.Items.Add(linkcontent); pbProgress.Max := pbProgress.Max+1; end; - if lbFoundPages.Items.IndexOf(linkcontent) > -1 then + if (lbFoundPages.Items.IndexOf(linkcontent) > -1) or (FileExists(AppendPathDelim(OutputDir)+ValidateFileName(lowercase(linkcontent)+'.html'))) then begin ostr := ostr+''; istr := copy(istr,pos('|',istr)+1,length(istr)); diff --git a/applications/wikihelp/src/wikihelp.lpi b/applications/wikihelp/src/wikihelp.lpi index f315f5ff8..54f826238 100644 --- a/applications/wikihelp/src/wikihelp.lpi +++ b/applications/wikihelp/src/wikihelp.lpi @@ -48,8 +48,8 @@ - - + + @@ -229,71 +229,19 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -