From 473f704c1a24a08c837c36f7081920804379ea71 Mon Sep 17 00:00:00 2001 From: sekelsenmat Date: Wed, 15 Feb 2012 17:15:51 +0000 Subject: [PATCH] lazedit: Many more translation improvements git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2295 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- applications/lazedit/editorpagecontrol.pp | 16 +- applications/lazedit/lazedit.lpi | 907 +----------------- applications/lazedit/lazedit.lpr | 3 +- applications/lazedit/lazedit_translations.pas | 165 +++- applications/lazedit/main.lfm | 6 +- applications/lazedit/main.pp | 123 ++- 6 files changed, 263 insertions(+), 957 deletions(-) diff --git a/applications/lazedit/editorpagecontrol.pp b/applications/lazedit/editorpagecontrol.pp index 8be63c3ca..25f2c6eb7 100644 --- a/applications/lazedit/editorpagecontrol.pp +++ b/applications/lazedit/editorpagecontrol.pp @@ -45,7 +45,7 @@ uses SynHighlighterPython, SynHighlighterBat, SynHighlighterIni, SynHighlighterJava, SynHighlighterUnixShellScript, SynHighLighterPo, SynEditMouseCmds, SynEditKeyCmds, - EPlus_Commons; + EPlus_Commons, lazedit_translations; @@ -153,6 +153,7 @@ type property HighLighters[Index: TEditorFileType]: TSynCustomHighlighter read GetHighLighter; //property FileTypeMaskList: TFileTypeMaskList read FFileTypeMaskList write SetFiletypeMaskList; public + IsCreating: Boolean; function AddPage: TEditor; function ClosePage(Index: Integer): Boolean; function EditorAtPage(const Index: Integer): TEditor; @@ -175,7 +176,6 @@ type const EmptyStr = ''; - NoName = 'Naamloos'; implementation @@ -233,7 +233,7 @@ begin if (Utf8Fn <> EmptyStr) then FPage.Caption := ExtractFileName(Utf8Fn) else - FPage.Caption := NoName; + FPage.Caption := vTranslations.NoName; //Debugln('TEditor.SetFileName: setting FPageCaption to ',FPage.Caption); end; //debugln('TEditor.SetFileName: calling DoOnStatusChange(scAll)'); @@ -602,7 +602,7 @@ begin if AsTemplate then begin//blank out internal filename and update caption FFileName := EmptyStr; - if Assigned(FPage) then FPage.Caption := NoName; + if Assigned(FPage) then FPage.Caption := vTranslations.NoName; DoOnStatusChange([scFileName]); end; //DebugLn('TEditor.LoadFromFile: FileType = ',eftNames[FileType]); @@ -923,7 +923,7 @@ begin NrOfNoNames := 0; Suffix := ''; for i := 0 to PageCount - 1 do - if Pos(NoName, Pages[i].Caption) = 1 then Inc(NrOfNoNames); + if Pos(vTranslations.NoName, Pages[i].Caption) = 1 then Inc(NrOfNoNames); if NrOfNoNames > 0 then Suffix := ' [' + IntToStr(NrOfNoNames + 1) + ']'; TS := TTabSheet.Create(Self); @@ -931,7 +931,7 @@ begin TS.PageControl := Self; PgIdx := TS.PageIndex; - TS.Caption := NoName + Suffix; + TS.Caption := vTranslations.NoName + Suffix; // exit;//<------------------------------------------------------------- @@ -990,6 +990,10 @@ begin InternalEditorStatusChange(E, [scCaretX,scCaretY,scModified,scInsertMode,scFileName]); ActivePage := Pages[PgIdx]; + + // Don't try to set focus when creating the first page in TForm.OnCreate or else an exception comes + if Self.IsCreating then Exit; + try E.SetFocus; except diff --git a/applications/lazedit/lazedit.lpi b/applications/lazedit/lazedit.lpi index 7ed377106..a429beb1b 100644 --- a/applications/lazedit/lazedit.lpi +++ b/applications/lazedit/lazedit.lpi @@ -4,11 +4,11 @@ + <ResourceType Value="res"/> <UseXPManifest Value="True"/> - <ActiveWindowIndexAtStart Value="0"/> </General> <i18n> <EnableI18N LFM="False"/> @@ -16,7 +16,7 @@ <VersionInfo> <StringTable ProductVersion=""/> </VersionInfo> - <BuildModes Count="2" Active="Debug"> + <BuildModes Count="2"> <Item1 Name="Debug" Default="True"/> <Item2 Name="Release"> <CompilerOptions> @@ -75,15 +75,11 @@ <PackageName Value="LCL"/> </Item2> </RequiredPackages> - <Units Count="98"> + <Units Count="15"> <Unit0> <Filename Value="lazedit.lpr"/> <IsPartOfProject Value="True"/> <UnitName Value="lazedit"/> - <WindowIndex Value="0"/> - <TopLine Value="1"/> - <CursorPos X="17" Y="10"/> - <UsageCount Value="176"/> </Unit0> <Unit1> <Filename Value="main.pp"/> @@ -91,917 +87,83 @@ <ComponentName Value="EPlusForm"/> <ResourceBaseClass Value="Form"/> <UnitName Value="main"/> - <IsVisibleTab Value="True"/> - <EditorIndex Value="0"/> - <WindowIndex Value="0"/> - <TopLine Value="628"/> - <CursorPos X="3" Y="630"/> - <UsageCount Value="176"/> - <Loaded Value="True"/> - <LoadedDesigner Value="True"/> </Unit1> <Unit2> - <Filename Value="H:\Programmas\SvnLaz\lcl\comctrls.pp"/> - <UnitName Value="ComCtrls"/> - <WindowIndex Value="0"/> - <TopLine Value="428"/> - <CursorPos X="15" Y="449"/> - <UsageCount Value="16"/> - </Unit2> - <Unit3> <Filename Value="test_ed.pp"/> <IsPartOfProject Value="True"/> <UnitName Value="test_ed"/> - <WindowIndex Value="0"/> - <TopLine Value="1"/> - <CursorPos X="41" Y="8"/> - <UsageCount Value="176"/> + </Unit2> + <Unit3> + <Filename Value="editorpagecontrol.pp"/> + <IsPartOfProject Value="True"/> + <UnitName Value="EditorPageControl"/> </Unit3> <Unit4> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\synmemo.pas"/> - <UnitName Value="SynMemo"/> - <WindowIndex Value="0"/> - <TopLine Value="52"/> - <CursorPos X="1" Y="1"/> - <UsageCount Value="6"/> - </Unit4> - <Unit5> - <Filename Value="H:\Programmas\SvnLaz\lcl\include\customnotebook.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="549"/> - <CursorPos X="23" Y="553"/> - <UsageCount Value="16"/> - </Unit5> - <Unit6> - <Filename Value="H:\Programmas\SvnLaz\lcl\controls.pp"/> - <UnitName Value="Controls"/> - <WindowIndex Value="0"/> - <TopLine Value="1330"/> - <CursorPos X="21" Y="1351"/> - <UsageCount Value="5"/> - </Unit6> - <Unit7> - <Filename Value="editorpagecontrol.pp"/> - <UnitName Value="EditorPageControl"/> - <EditorIndex Value="4"/> - <WindowIndex Value="0"/> - <TopLine Value="884"/> - <CursorPos X="45" Y="904"/> - <UsageCount Value="85"/> - <Loaded Value="True"/> - </Unit7> - <Unit8> - <Filename Value="H:\Programmas\fpc\Source\rtl\objpas\classes\classesh.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="595"/> - <CursorPos X="15" Y="616"/> - <UsageCount Value="5"/> - </Unit8> - <Unit9> - <Filename Value="H:\Programmas\fpc\Source\rtl\objpas\classes\compon.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="211"/> - <CursorPos X="3" Y="214"/> - <UsageCount Value="9"/> - </Unit9> - <Unit10> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\synedit.pp"/> - <UnitName Value="SynEdit"/> - <WindowIndex Value="0"/> - <TopLine Value="831"/> - <CursorPos X="15" Y="852"/> - <UsageCount Value="17"/> - </Unit10> - <Unit11> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\synedittypes.pp"/> - <UnitName Value="SynEditTypes"/> - <WindowIndex Value="0"/> - <TopLine Value="48"/> - <CursorPos X="20" Y="69"/> - <UsageCount Value="22"/> - </Unit11> - <Unit12> - <Filename Value="H:\Programmas\SvnLaz\lcl\graphics.pp"/> - <UnitName Value="Graphics"/> - <WindowIndex Value="0"/> - <TopLine Value="221"/> - <CursorPos X="1" Y="258"/> - <UsageCount Value="6"/> - </Unit12> - <Unit13> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\syngutter.pp"/> - <UnitName Value="SynGutter"/> - <WindowIndex Value="0"/> - <TopLine Value="29"/> - <CursorPos X="56" Y="50"/> - <UsageCount Value="8"/> - </Unit13> - <Unit14> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\synguttermarks.pp"/> - <UnitName Value="SynGutterMarks"/> - <WindowIndex Value="0"/> - <TopLine Value="1"/> - <CursorPos X="3" Y="15"/> - <UsageCount Value="4"/> - </Unit14> - <Unit15> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\syngutterlinenumber.pp"/> - <UnitName Value="SynGutterLineNumber"/> - <WindowIndex Value="0"/> - <TopLine Value="1"/> - <CursorPos X="3" Y="19"/> - <UsageCount Value="4"/> - </Unit15> - <Unit16> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\syngutterchanges.pas"/> - <UnitName Value="SynGutterChanges"/> - <WindowIndex Value="0"/> - <TopLine Value="1"/> - <CursorPos X="39" Y="13"/> - <UsageCount Value="8"/> - </Unit16> - <Unit17> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\synguttercodefolding.pp"/> - <UnitName Value="SynGutterCodeFolding"/> - <WindowIndex Value="0"/> - <TopLine Value="43"/> - <CursorPos X="3" Y="64"/> - <UsageCount Value="4"/> - </Unit17> - <Unit18> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\synhighlighterhtml.pp"/> - <UnitName Value="SynHighlighterHTML"/> - <WindowIndex Value="0"/> - <TopLine Value="214"/> - <CursorPos X="30" Y="235"/> - <UsageCount Value="10"/> - </Unit18> - <Unit19> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\synedithighlighterxmlbase.pas"/> - <UnitName Value="SynEditHighlighterXMLBase"/> - <WindowIndex Value="0"/> - <TopLine Value="40"/> - <CursorPos X="43" Y="61"/> - <UsageCount Value="10"/> - </Unit19> - <Unit20> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\synedithighlighterfoldbase.pas"/> - <UnitName Value="SynEditHighlighterFoldBase"/> - <WindowIndex Value="0"/> - <TopLine Value="134"/> - <CursorPos X="58" Y="155"/> - <UsageCount Value="10"/> - </Unit20> - <Unit21> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\synedithighlighter.pp"/> - <UnitName Value="SynEditHighlighter"/> - <WindowIndex Value="0"/> - <TopLine Value="1"/> - <CursorPos X="1" Y="1"/> - <UsageCount Value="10"/> - </Unit21> - <Unit22> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\syneditmiscclasses.pp"/> - <UnitName Value="SynEditMiscClasses"/> - <WindowIndex Value="0"/> - <TopLine Value="589"/> - <CursorPos X="3" Y="97"/> - <UsageCount Value="5"/> - </Unit22> - <Unit23> - <Filename Value="H:\Programmas\SvnLaz\lcl\include\pagecontrol.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="118"/> - <CursorPos X="3" Y="120"/> - <UsageCount Value="7"/> - </Unit23> - <Unit24> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\syneditkeycmds.pp"/> - <UnitName Value="SynEditKeyCmds"/> - <WindowIndex Value="0"/> - <TopLine Value="325"/> - <CursorPos X="14" Y="346"/> - <UsageCount Value="7"/> - </Unit24> - <Unit25> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\syneditmousecmds.pp"/> - <UnitName Value="SynEditMouseCmds"/> - <WindowIndex Value="0"/> - <TopLine Value="120"/> - <CursorPos X="32" Y="156"/> - <UsageCount Value="5"/> - </Unit25> - <Unit26> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\syngutterbase.pp"/> - <UnitName Value="SynGutterBase"/> - <WindowIndex Value="0"/> - <TopLine Value="25"/> - <CursorPos X="3" Y="94"/> - <UsageCount Value="5"/> - </Unit26> - <Unit27> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\synedittextbase.pas"/> - <UnitName Value="SynEditTextBase"/> - <WindowIndex Value="0"/> - <TopLine Value="240"/> - <CursorPos X="15" Y="261"/> - <UsageCount Value="4"/> - </Unit27> - <Unit28> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\synedittexttabexpander.pas"/> - <UnitName Value="SynEditTextTabExpander"/> - <WindowIndex Value="0"/> - <TopLine Value="42"/> - <CursorPos X="49" Y="54"/> - <UsageCount Value="4"/> - </Unit28> - <Unit29> - <Filename Value="H:\Programmas\fpc\Source\rtl\objpas\classes\stringl.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="766"/> - <CursorPos X="3" Y="770"/> - <UsageCount Value="3"/> - </Unit29> - <Unit30> - <Filename Value="H:\Programmas\SvnLaz\lcl\include\tabsheet.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="31"/> - <CursorPos X="5" Y="51"/> - <UsageCount Value="3"/> - </Unit30> - <Unit31> - <Filename Value="H:\Programmas\SvnLaz\lcl\include\wincontrol.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="6363"/> - <CursorPos X="3" Y="6375"/> - <UsageCount Value="5"/> - </Unit31> - <Unit32> - <Filename Value="H:\Programmas\fpc\Source\rtl\objpas\classes\lists.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="677"/> - <CursorPos X="3" Y="679"/> - <UsageCount Value="1"/> - </Unit32> - <Unit33> - <Filename Value="H:\Programmas\fpc\Source\rtl\inc\ustringh.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="77"/> - <CursorPos X="10" Y="104"/> - <UsageCount Value="1"/> - </Unit33> - <Unit34> - <Filename Value="H:\Programmas\fpc\Source\rtl\inc\ustrings.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="2257"/> - <CursorPos X="19" Y="2280"/> - <UsageCount Value="1"/> - </Unit34> - <Unit35> - <Filename Value="H:\Programmas\fpc\Source\rtl\inc\wstrings.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="1233"/> - <CursorPos X="10" Y="1254"/> - <UsageCount Value="1"/> - </Unit35> - <Unit36> <Filename Value="eplus_commons.pp"/> <IsPartOfProject Value="True"/> <UnitName Value="EPlus_Commons"/> - <EditorIndex Value="5"/> - <WindowIndex Value="0"/> - <TopLine Value="33"/> - <CursorPos X="31" Y="53"/> - <UsageCount Value="142"/> - <Loaded Value="True"/> - </Unit36> - <Unit37> + </Unit4> + <Unit5> <Filename Value="lazedit_constants.pp"/> <IsPartOfProject Value="True"/> <UnitName Value="lazedit_constants"/> - <EditorIndex Value="6"/> - <WindowIndex Value="0"/> - <TopLine Value="25"/> - <CursorPos X="8" Y="37"/> - <UsageCount Value="139"/> - <Loaded Value="True"/> - </Unit37> - <Unit38> + </Unit5> + <Unit6> <Filename Value="eplus_config.pp"/> <IsPartOfProject Value="True"/> <UnitName Value="EPlus_Config"/> - <EditorIndex Value="8"/> - <WindowIndex Value="0"/> - <TopLine Value="221"/> - <CursorPos X="58" Y="238"/> - <UsageCount Value="126"/> - <Loaded Value="True"/> - </Unit38> - <Unit39> - <Filename Value="..\MijnLib\fcl_misc.pp"/> - <UnitName Value="fcl_misc"/> - <WindowIndex Value="0"/> - <TopLine Value="102"/> - <CursorPos X="3" Y="104"/> - <UsageCount Value="31"/> - </Unit39> - <Unit40> - <Filename Value="H:\Programmas\fpc\Source\packages\fcl-base\src\inifiles.pp"/> - <UnitName Value="IniFiles"/> - <WindowIndex Value="0"/> - <TopLine Value="57"/> - <CursorPos X="3" Y="78"/> - <UsageCount Value="8"/> - </Unit40> - <Unit41> - <Filename Value="H:\Programmas\fpc\Source\rtl\objpas\sysutils\osutilsh.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="17"/> - <CursorPos X="10" Y="38"/> - <UsageCount Value="2"/> - </Unit41> - <Unit42> - <Filename Value="H:\Programmas\fpc\Source\rtl\win32\system.pp"/> - <UnitName Value="System"/> - <WindowIndex Value="0"/> - <TopLine Value="26"/> - <CursorPos X="2" Y="47"/> - <UsageCount Value="5"/> - </Unit42> - <Unit43> - <Filename Value="..\MijnLib\myfileutils.pp"/> - <UnitName Value="myfileutils"/> - <WindowIndex Value="0"/> - <TopLine Value="1"/> - <CursorPos X="1" Y="1"/> - <UsageCount Value="8"/> - </Unit43> - <Unit44> + </Unit6> + <Unit7> <Filename Value="htmlcharmap.pp"/> <IsPartOfProject Value="True"/> <ComponentName Value="HtmlCharmapForm"/> <ResourceBaseClass Value="Form"/> <UnitName Value="HtmlCharMap"/> - <WindowIndex Value="0"/> - <TopLine Value="178"/> - <CursorPos X="3" Y="181"/> - <UsageCount Value="116"/> - </Unit44> - <Unit45> - <Filename Value="H:\Programmas\SvnLaz\lcl\grids.pas"/> - <UnitName Value="Grids"/> - <WindowIndex Value="0"/> - <TopLine Value="6427"/> - <CursorPos X="3" Y="6431"/> - <UsageCount Value="6"/> - </Unit45> - <Unit46> - <Filename Value="H:\Programmas\SvnLaz\ide\charactermapdlg.pas"/> - <ComponentName Value="CharacterMapDialog"/> - <HasResources Value="True"/> - <ResourceBaseClass Value="Form"/> - <UnitName Value="CharacterMapDlg"/> - <WindowIndex Value="0"/> - <TopLine Value="156"/> - <CursorPos X="1" Y="160"/> - <UsageCount Value="4"/> - </Unit46> - <Unit47> - <Filename Value="H:\Programmas\fpc\Source\rtl\inc\objpash.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="166"/> - <CursorPos X="22" Y="187"/> - <UsageCount Value="4"/> - </Unit47> - <Unit48> - <Filename Value="H:\Programmas\fpc\Source\rtl\objpas\sysutils\finah.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="3"/> - <CursorPos X="11" Y="40"/> - <UsageCount Value="6"/> - </Unit48> - <Unit49> - <Filename Value="H:\Programmas\fpc\Source\rtl\objpas\sysutils\fina.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="194"/> - <CursorPos X="1" Y="194"/> - <UsageCount Value="6"/> - </Unit49> - <Unit50> - <Filename Value="H:\Programmas\fpc\Source\rtl\objpas\sysutils\sysstrh.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="82"/> - <CursorPos X="10" Y="103"/> - <UsageCount Value="5"/> - </Unit50> - <Unit51> - <Filename Value="H:\Programmas\fpc\Source\rtl\objpas\sysutils\sysstr.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="506"/> - <CursorPos X="7" Y="527"/> - <UsageCount Value="5"/> - </Unit51> - <Unit52> - <Filename Value="H:\Programmas\SvnLaz\lcl\dialogs.pp"/> - <UnitName Value="Dialogs"/> - <WindowIndex Value="0"/> - <TopLine Value="105"/> - <CursorPos X="15" Y="126"/> - <UsageCount Value="9"/> - </Unit52> - <Unit53> - <Filename Value="H:\Programmas\SvnLaz\lcl\include\filedialog.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="273"/> - <CursorPos X="1" Y="315"/> - <UsageCount Value="5"/> - </Unit53> - <Unit54> - <Filename Value="H:\Programmas\SvnLaz\lcl\include\control.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="4282"/> - <CursorPos X="3" Y="4296"/> - <UsageCount Value="5"/> - </Unit54> - <Unit55> - <Filename Value="H:\Programmas\SvnLaz\lcl\lclclasses.pp"/> - <UnitName Value="LCLClasses"/> - <WindowIndex Value="0"/> - <TopLine Value="116"/> - <CursorPos X="64" Y="120"/> - <UsageCount Value="5"/> - </Unit55> - <Unit56> - <Filename Value="H:\Programmas\SvnLaz\lcl\forms.pp"/> - <UnitName Value="Forms"/> - <WindowIndex Value="0"/> - <TopLine Value="1312"/> - <CursorPos X="15" Y="1333"/> - <UsageCount Value="6"/> - </Unit56> - <Unit57> - <Filename Value="H:\Programmas\SvnLaz\lcl\include\application.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="2312"/> - <CursorPos X="3" Y="2316"/> - <UsageCount Value="5"/> - </Unit57> - <Unit58> + </Unit7> + <Unit8> <Filename Value="htmlcode.pp"/> + <IsPartOfProject Value="True"/> <UnitName Value="HtmlCode"/> - <EditorIndex Value="2"/> - <WindowIndex Value="0"/> - <TopLine Value="381"/> - <CursorPos X="127" Y="398"/> - <UsageCount Value="42"/> - <Loaded Value="True"/> - </Unit58> - <Unit59> + </Unit8> + <Unit9> <Filename Value="htmldialogs.pp"/> <IsPartOfProject Value="True"/> <UnitName Value="HtmlDialogs"/> - <EditorIndex Value="1"/> - <WindowIndex Value="0"/> - <TopLine Value="1"/> - <CursorPos X="1" Y="1"/> - <UsageCount Value="87"/> - <Loaded Value="True"/> - </Unit59> - <Unit60> + </Unit9> + <Unit10> <Filename Value="newhtmldlgform.pp"/> <IsPartOfProject Value="True"/> <ComponentName Value="NewHtmlDlgForm"/> <ResourceBaseClass Value="Form"/> <UnitName Value="NewHtmlDlgForm"/> - <WindowIndex Value="0"/> - <TopLine Value="114"/> - <CursorPos X="24" Y="147"/> - <UsageCount Value="84"/> - </Unit60> - <Unit61> - <Filename Value="newhtmldlgform.lfm"/> - <WindowIndex Value="0"/> - <TopLine Value="1"/> - <CursorPos X="9" Y="1"/> - <UsageCount Value="6"/> - <DefaultSyntaxHighlighter Value="LFM"/> - </Unit61> - <Unit62> - <Filename Value="..\MijnLib\lcl_misc.pp"/> - <UnitName Value="Lcl_Misc"/> - <WindowIndex Value="0"/> - <TopLine Value="87"/> - <CursorPos X="13" Y="118"/> - <UsageCount Value="17"/> - </Unit62> - <Unit63> + </Unit10> + <Unit11> <Filename Value="anchordlgform.pp"/> <IsPartOfProject Value="True"/> <ComponentName Value="AnchorDlgForm"/> <ResourceBaseClass Value="Form"/> <UnitName Value="AnchorDlgForm"/> - <WindowIndex Value="0"/> - <TopLine Value="1"/> - <CursorPos X="31" Y="9"/> - <UsageCount Value="75"/> - </Unit63> - <Unit64> + </Unit11> + <Unit12> <Filename Value="picturedlgform.pp"/> <IsPartOfProject Value="True"/> <ComponentName Value="PictureDlgForm"/> <ResourceBaseClass Value="Form"/> <UnitName Value="PictureDlgForm"/> - <EditorIndex Value="3"/> - <WindowIndex Value="0"/> - <TopLine Value="73"/> - <CursorPos X="10" Y="99"/> - <UsageCount Value="68"/> - <Loaded Value="True"/> - </Unit64> - <Unit65> - <Filename Value="..\MijnLib\picslib.pp"/> - <UnitName Value="PicsLib"/> - <WindowIndex Value="0"/> - <TopLine Value="88"/> - <CursorPos X="44" Y="88"/> - <UsageCount Value="7"/> - </Unit65> - <Unit66> - <Filename Value="H:\Programmas\SvnLaz\lcl\actnlist.pas"/> - <UnitName Value="ActnList"/> - <WindowIndex Value="0"/> - <TopLine Value="210"/> - <CursorPos X="3" Y="231"/> - <UsageCount Value="7"/> - </Unit66> - <Unit67> + </Unit12> + <Unit13> <Filename Value="newtableform.pp"/> <IsPartOfProject Value="True"/> <ComponentName Value="NewTableForm"/> <ResourceBaseClass Value="Form"/> <UnitName Value="NewTableForm"/> - <WindowIndex Value="0"/> - <TopLine Value="42"/> - <CursorPos X="32" Y="58"/> - <UsageCount Value="58"/> - </Unit67> - <Unit68> - <Filename Value="..\MijnLib\mrulists.pas"/> - <UnitName Value="MruLists"/> - <WindowIndex Value="0"/> - <TopLine Value="302"/> - <CursorPos X="3" Y="310"/> - <UsageCount Value="11"/> - </Unit68> - <Unit69> - <Filename Value="H:\Programmas\SvnLaz\components\synedit\syneditstrconst.pp"/> - <UnitName Value="SynEditStrConst"/> - <WindowIndex Value="0"/> - <TopLine Value="346"/> - <CursorPos X="9" Y="379"/> - <UsageCount Value="8"/> - </Unit69> - <Unit70> - <Filename Value="E:\Lazarus\lcl\forms.pp"/> - <UnitName Value="Forms"/> - <WindowIndex Value="0"/> - <TopLine Value="582"/> - <CursorPos X="55" Y="602"/> - <UsageCount Value="8"/> - </Unit70> - <Unit71> - <Filename Value="..\MijnLib\mygetopt.pp"/> - <UnitName Value="MyGetOpt"/> - <WindowIndex Value="0"/> - <TopLine Value="280"/> - <CursorPos X="4" Y="281"/> - <UsageCount Value="11"/> - </Unit71> - <Unit72> - <Filename Value="E:\Lazarus\components\lazutils\fileutil.pas"/> - <UnitName Value="FileUtil"/> - <WindowIndex Value="0"/> - <TopLine Value="19"/> - <CursorPos X="26" Y="45"/> - <UsageCount Value="8"/> - </Unit72> - <Unit73> - <Filename Value="E:\Lazarus\components\lazutils\fileutil.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="78"/> - <CursorPos X="3" Y="89"/> - <UsageCount Value="8"/> - </Unit73> - <Unit74> - <Filename Value="E:\Fpc\source\rtl\objpas\sysutils\diskh.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="1"/> - <CursorPos X="10" Y="22"/> - <UsageCount Value="8"/> - </Unit74> - <Unit75> - <Filename Value="E:\Fpc\source\rtl\objpas\sysutils\sysutils.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="577"/> - <CursorPos X="3" Y="609"/> - <UsageCount Value="8"/> - </Unit75> - <Unit76> - <Filename Value="E:\Lazarus\components\synedit\synhighlightercpp.pp"/> - <UnitName Value="SynHighlighterCpp"/> - <WindowIndex Value="0"/> - <TopLine Value="247"/> - <CursorPos X="1" Y="1"/> - <UsageCount Value="8"/> - </Unit76> - <Unit77> - <Filename Value="E:\Lazarus\components\synedit\syneditstrconst.pp"/> - <UnitName Value="SynEditStrConst"/> - <WindowIndex Value="0"/> - <TopLine Value="295"/> - <CursorPos X="74" Y="294"/> - <UsageCount Value="8"/> - </Unit77> - <Unit78> - <Filename Value="E:\Fpc\source\rtl\inc\objpash.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="59"/> - <CursorPos X="8" Y="79"/> - <UsageCount Value="8"/> - </Unit78> - <Unit79> - <Filename Value="E:\Lazarus\components\synedit\synhighlighterhtml.pp"/> - <UnitName Value="SynHighlighterHTML"/> - <WindowIndex Value="0"/> - <TopLine Value="237"/> - <CursorPos X="15" Y="250"/> - <UsageCount Value="12"/> - </Unit79> - <Unit80> - <Filename Value="E:\Lazarus\components\synedit\synedithighlighterxmlbase.pas"/> - <UnitName Value="SynEditHighlighterXMLBase"/> - <WindowIndex Value="0"/> - <TopLine Value="41"/> - <CursorPos X="3" Y="61"/> - <UsageCount Value="8"/> - </Unit80> - <Unit81> - <Filename Value="E:\Lazarus\components\synedit\synedithighlighterfoldbase.pas"/> - <UnitName Value="SynEditHighlighterFoldBase"/> - <WindowIndex Value="0"/> - <TopLine Value="135"/> - <CursorPos X="3" Y="155"/> - <UsageCount Value="8"/> - </Unit81> - <Unit82> - <Filename Value="E:\Lazarus\components\synedit\synedithighlighter.pp"/> - <UnitName Value="SynEditHighlighter"/> - <WindowIndex Value="0"/> - <TopLine Value="396"/> - <CursorPos X="3" Y="416"/> - <UsageCount Value="8"/> - </Unit82> - <Unit83> - <Filename Value="E:\Lazarus\lcl\menus.pp"/> - <UnitName Value="Menus"/> - <WindowIndex Value="0"/> - <TopLine Value="208"/> - <CursorPos X="14" Y="339"/> - <UsageCount Value="9"/> - </Unit83> - <Unit84> - <Filename Value="E:\Lazarus\lcl\include\menuactionlink.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="100"/> - <CursorPos X="3" Y="126"/> - <UsageCount Value="9"/> - </Unit84> - <Unit85> - <Filename Value="E:\Lazarus\lcl\include\menuitem.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="1317"/> - <CursorPos X="3" Y="1326"/> - <UsageCount Value="9"/> - </Unit85> - <Unit86> - <Filename Value="E:\Fpc\source\rtl\objpas\classes\classesh.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="96"/> - <CursorPos X="3" Y="116"/> - <UsageCount Value="9"/> - </Unit86> - <Unit87> - <Filename Value="E:\Lazarus\lcl\include\menu.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="243"/> - <CursorPos X="3" Y="264"/> - <UsageCount Value="9"/> - </Unit87> - <Unit88> - <Filename Value="E:\Lazarus\lcl\lcltype.pp"/> - <UnitName Value="LCLType"/> - <WindowIndex Value="0"/> - <TopLine Value="2682"/> - <CursorPos X="14" Y="2711"/> - <UsageCount Value="10"/> - </Unit88> - <Unit89> - <Filename Value="E:\Lazarus\lcl\interfacebase.pp"/> - <UnitName Value="InterfaceBase"/> - <WindowIndex Value="0"/> - <TopLine Value="16"/> - <CursorPos X="36" Y="36"/> - <UsageCount Value="9"/> - </Unit89> - <Unit90> - <Filename Value="..\MijnLib\extabout.pp"/> - <UnitName Value="ExtAbout"/> - <WindowIndex Value="0"/> - <TopLine Value="221"/> - <CursorPos X="3" Y="237"/> - <UsageCount Value="11"/> - </Unit90> - <Unit91> - <Filename Value="..\MijnLib\gpl.pp"/> - <UnitName Value="GPL"/> - <WindowIndex Value="0"/> - <TopLine Value="1"/> - <CursorPos X="3" Y="6"/> - <UsageCount Value="11"/> - </Unit91> - <Unit92> - <Filename Value="..\MijnLib\extaboutform.pp"/> - <UnitName Value="ExtAboutForm"/> - <WindowIndex Value="0"/> - <TopLine Value="140"/> - <CursorPos X="3" Y="146"/> - <UsageCount Value="11"/> - </Unit92> - <Unit93> - <Filename Value="E:\Lazarus\lcl\clipbrd.pp"/> - <UnitName Value="Clipbrd"/> - <WindowIndex Value="0"/> - <TopLine Value="151"/> - <CursorPos X="14" Y="171"/> - <UsageCount Value="10"/> - </Unit93> - <Unit94> - <Filename Value="E:\Lazarus\lcl\include\clipbrd.inc"/> - <WindowIndex Value="0"/> - <TopLine Value="456"/> - <CursorPos X="3" Y="461"/> - <UsageCount Value="10"/> - </Unit94> - <Unit95> + </Unit13> + <Unit14> <Filename Value="lazedit_translations.pas"/> <IsPartOfProject Value="True"/> <UnitName Value="lazedit_translations"/> - <EditorIndex Value="7"/> - <WindowIndex Value="0"/> - <TopLine Value="444"/> - <CursorPos X="5" Y="455"/> - <UsageCount Value="23"/> - <Loaded Value="True"/> - </Unit95> - <Unit96> - <Filename Value="..\..\..\magnifier\translationsvmg.pas"/> - <UnitName Value="translationsvmg"/> - <WindowIndex Value="0"/> - <TopLine Value="865"/> - <CursorPos X="1" Y="898"/> - <UsageCount Value="10"/> - </Unit96> - <Unit97> - <Filename Value="main.lfm"/> - <WindowIndex Value="0"/> - <TopLine Value="1625"/> - <CursorPos X="5" Y="1652"/> - <UsageCount Value="10"/> - <DefaultSyntaxHighlighter Value="LFM"/> - </Unit97> + </Unit14> </Units> - <JumpHistory Count="30" HistoryIndex="29"> - <Position1> - <Filename Value="main.pp"/> - <Caret Line="627" Column="44" TopLine="624"/> - </Position1> - <Position2> - <Filename Value="main.pp"/> - <Caret Line="361" Column="37" TopLine="361"/> - </Position2> - <Position3> - <Filename Value="main.pp"/> - <Caret Line="395" Column="1" TopLine="378"/> - </Position3> - <Position4> - <Filename Value="lazedit_translations.pas"/> - <Caret Line="164" Column="51" TopLine="144"/> - </Position4> - <Position5> - <Filename Value="eplus_config.pp"/> - <Caret Line="266" Column="1" TopLine="240"/> - </Position5> - <Position6> - <Filename Value="eplus_config.pp"/> - <Caret Line="166" Column="15" TopLine="149"/> - </Position6> - <Position7> - <Filename Value="main.pp"/> - <Caret Line="1408" Column="1" TopLine="1397"/> - </Position7> - <Position8> - <Filename Value="main.pp"/> - <Caret Line="579" Column="27" TopLine="562"/> - </Position8> - <Position9> - <Filename Value="main.pp"/> - <Caret Line="580" Column="21" TopLine="563"/> - </Position9> - <Position10> - <Filename Value="main.pp"/> - <Caret Line="629" Column="16" TopLine="612"/> - </Position10> - <Position11> - <Filename Value="lazedit_translations.pas"/> - <Caret Line="23" Column="1" TopLine="6"/> - </Position11> - <Position12> - <Filename Value="lazedit_translations.pas"/> - <Caret Line="278" Column="43" TopLine="248"/> - </Position12> - <Position13> - <Filename Value="lazedit_translations.pas"/> - <Caret Line="153" Column="14" TopLine="122"/> - </Position13> - <Position14> - <Filename Value="lazedit_translations.pas"/> - <Caret Line="155" Column="33" TopLine="133"/> - </Position14> - <Position15> - <Filename Value="lazedit_translations.pas"/> - <Caret Line="154" Column="31" TopLine="129"/> - </Position15> - <Position16> - <Filename Value="lazedit_translations.pas"/> - <Caret Line="61" Column="5" TopLine="44"/> - </Position16> - <Position17> - <Filename Value="lazedit_translations.pas"/> - <Caret Line="214" Column="1" TopLine="180"/> - </Position17> - <Position18> - <Filename Value="lazedit_translations.pas"/> - <Caret Line="192" Column="29" TopLine="159"/> - </Position18> - <Position19> - <Filename Value="main.pp"/> - <Caret Line="1189" Column="8" TopLine="1185"/> - </Position19> - <Position20> - <Filename Value="main.pp"/> - <Caret Line="1" Column="1" TopLine="1"/> - </Position20> - <Position21> - <Filename Value="lazedit_translations.pas"/> - <Caret Line="146" Column="17" TopLine="120"/> - </Position21> - <Position22> - <Filename Value="main.pp"/> - <Caret Line="5" Column="9" TopLine="1"/> - </Position22> - <Position23> - <Filename Value="main.pp"/> - <Caret Line="1212" Column="53" TopLine="1195"/> - </Position23> - <Position24> - <Filename Value="main.pp"/> - <Caret Line="641" Column="29" TopLine="628"/> - </Position24> - <Position25> - <Filename Value="main.pp"/> - <Caret Line="19" Column="1" TopLine="18"/> - </Position25> - <Position26> - <Filename Value="main.pp"/> - <Caret Line="1675" Column="7" TopLine="1655"/> - </Position26> - <Position27> - <Filename Value="main.pp"/> - <Caret Line="630" Column="66" TopLine="628"/> - </Position27> - <Position28> - <Filename Value="lazedit_translations.pas"/> - <Caret Line="350" Column="12" TopLine="331"/> - </Position28> - <Position29> - <Filename Value="lazedit_translations.pas"/> - <Caret Line="189" Column="1" TopLine="162"/> - </Position29> - <Position30> - <Filename Value="main.pp"/> - <Caret Line="821" Column="10" TopLine="811"/> - </Position30> - </JumpHistory> </ProjectOptions> <CompilerOptions> <Version Value="11"/> @@ -1035,15 +197,6 @@ </Other> </CompilerOptions> <Debugging> - <BreakPoints Count="1"> - <Item1> - <Kind Value="bpkSource"/> - <WatchScope Value="wpsLocal"/> - <WatchKind Value="wpkWrite"/> - <Source Value="main.pp"/> - <Line Value="630"/> - </Item1> - </BreakPoints> <Exceptions Count="3"> <Item1> <Name Value="EAbort"/> diff --git a/applications/lazedit/lazedit.lpr b/applications/lazedit/lazedit.lpr index 6e8f307eb..4a1333af6 100644 --- a/applications/lazedit/lazedit.lpr +++ b/applications/lazedit/lazedit.lpr @@ -7,8 +7,7 @@ uses cthreads, {$ENDIF}{$ENDIF} Interfaces, // this includes the LCL widgetset - Forms, main, -lazedit_translations {,newtableform, test_ed, eplus_commons, CopyLeft, eplus_config, HtmlCharMap, + Forms, main, lazedit_translations, EditorPageControl, HtmlCode {,newtableform, test_ed, eplus_commons, CopyLeft, eplus_config, HtmlCharMap, HtmlDialogs, NewHtmlDlgForm, AnchorDlgForm, PictureDlgForm} { you can add units after this }; diff --git a/applications/lazedit/lazedit_translations.pas b/applications/lazedit/lazedit_translations.pas index 4d8707844..3ddde3810 100644 --- a/applications/lazedit/lazedit_translations.pas +++ b/applications/lazedit/lazedit_translations.pas @@ -94,20 +94,20 @@ type mnuLayoutH3: TMenuItem; mnuLayoutH4: TMenuItem; mnuLayoutH5: TMenuItem; - mnuLayoutH6: TMenuItem; - mnuLayoutAlign: TMenuItem; - mnuLayoutAlignLeft: TMenuItem; - mnuLayoutAlignRight: TMenuItem; - mnuLayoutAlignCenter: TMenuItem; - mnuLayoutCode: TMenuItem; - mnuLayoutQuote: TMenuItem; - mnuLayoutBlockQuote: TMenuItem; - mnuLayoutPreformatted: TMenuItem;} + mnuLayoutH6: TMenuItem;} + mnuLayoutAlign, + mnuLayoutAlignLeft, + mnuLayoutAlignRight, + mnuLayoutAlignCenter, + mnuLayoutCode, + mnuLayoutQuote, + mnuLayoutBlockQuote, + mnuLayoutPreformatted: string; //Grouping menu mnuGrouping, mnuGroupingParagraph, mnuGroupingDiv, - mnuGroupingSpan, + mnuGroupingSpan: string; //View menu mnuView, mnuViewFontsize: string; @@ -147,6 +147,21 @@ type mnuPopupLayoutH3: TMenuItem; mnuPopupLayoutH2: TMenuItem; mnuPopupLayoutH1: TMenuItem; } + // Other main.pp constants + SLine, SCol, SModified, SIns, SOvr, + msgOpenError, msgSaveError, msgSaveAllError, msgFileIsNotText, + msgFileNotFound, msgModifiedSave, msgMruIndexOutOfBound, + msgFileTypeNotForBrowser, msgFileHasNoName, msgErrorBrowser, + msgTextNotFound: string; + // main.pp hints in toolbar buttons + NewFromTemplateBtn, NewPlainBtn, OpenBtn, SaveBtn, SaveAllBtn, + CopyBtn, PasteBtn, FindBtn, InfoBtn, + AnchorBtn, ImageBtn, UListBtn, NListBtn, ListItemBtn, TableBtn, + BoldBtn, ItalicBtn, UnderlineBtn, EmBtn, StrongBtn, SupBtn, SubBtn, + HeadingBtn, LeftAlignBtn, RightAlignBtn, CenterAlignBtn, JustifyAlignBtn, + ParaBtn, DivBtn, SpanBtn: string; + // Other constants + NoName: string; { About box strings } // lpSupport, lpSupportInfo, lpLicense, lpLicenseInfo, lpAuthors, // lpContributorsTitle, lpAboutWindow, lpClose, lpInformation: string; @@ -241,16 +256,16 @@ begin mnuLayoutH3: TMenuItem; mnuLayoutH4: TMenuItem; mnuLayoutH5: TMenuItem; - mnuLayoutH6: TMenuItem; - mnuLayoutAlign: TMenuItem; - mnuLayoutAlignLeft: TMenuItem; - mnuLayoutAlignRight: TMenuItem; - mnuLayoutAlignCenter: TMenuItem; - mnuLayoutAlignJustify := 'Volledig uitlijnen'; - mnuLayoutCode: TMenuItem; - mnuLayoutQuote: TMenuItem; - mnuLayoutBlockQuote: TMenuItem; - mnuLayoutPreformatted: TMenuItem;} + mnuLayoutH6: TMenuItem;} + mnuLayoutAlign := 'Alignment'; + mnuLayoutAlignLeft := 'left aligned'; + mnuLayoutAlignRight := 'right aligned'; + mnuLayoutAlignCenter := 'Centralized'; + mnuLayoutAlignJustify := 'Justified'; + mnuLayoutCode := 'Code'; + mnuLayoutQuote := 'Quote'; + mnuLayoutBlockQuote := 'Block Quote'; + mnuLayoutPreformatted := 'Preformatted'; //Grouping menu mnuGrouping := '&Grouping'; mnuGroupingParagraph := 'Paragraph'; @@ -259,6 +274,60 @@ begin //View menu mnuView := '&View'; mnuViewFontsize := '&Font Size'; + + SLine := 'Line'; + SCol := 'Col'; + SModified := 'Modified'; + SIns := 'INS'; + SOvr := 'OVR'; + msgOpenError := 'The following open file error has occured:'^m'%s'; + msgSaveError := 'The following save file error has occured:'^m'%s'; + msgSaveAllError := 'The following save all error has occured:'^m'%s'; + msgFileIsNotText := 'The selected file '^m'%s'^m' does not seam to be a text file.'; + msgFileNotFound := 'File not found:'^m'%s'; + msgModifiedSave := 'The following file was modified:'^m'%s'^m'Should it be saved?'; + msgMruIndexOutOfBound := 'Index out of bounds [%d]'^m; + msgFileTypeNotForBrowser := 'The file type is not suited for a browser.'^m+'Continue anyway?'; + msgFileHasNoName := 'The file has no name.'^m + + 'U moet het bestand eerst opslaan om het in de browser te openen.'; + msgErrorBrowser := 'Er is een fout opgetreden tijdens het openen van'^m+ + '%s'^m'in de browser.'; + msgTextNotFound := 'Text not found:'^m'"%s"'; + + // main.pp hints in toolbar buttons + NewFromTemplateBtn := mnuFileNewFromTemplate; + NewPlainBtn := mnuFileNew; + OpenBtn := mnuFileOpen; + SaveBtn := mnuFileSave; + SaveAllBtn := mnuFileSaveAll; + CopyBtn := mnuEditCopy; + PasteBtn := 'Paste'; + FindBtn := 'Find'; + InfoBtn := 'Help'; + AnchorBtn := 'Insert Hyperlink'; + ImageBtn := 'Image'; + UListBtn := 'Bullets List'; + NListBtn := 'Numeric List'; + ListItemBtn := 'List item'; + TableBtn := 'Table'; + BoldBtn := mnuLayoutBold; + ItalicBtn := mnuLayoutItalic; + UnderlineBtn := mnuLayoutUnderline; + EmBtn := mnuLayoutEmphasis; + StrongBtn := mnuLayoutStrong; + SupBtn := mnuLayoutSub; + SubBtn := mnuLayoutSup; + HeadingBtn := 'Heading (H1..H6)'; + LeftAlignBtn := mnuLayoutAlignLeft; + RightAlignBtn:= mnuLayoutAlignRight; + CenterAlignBtn:= mnuLayoutAlignCenter; + JustifyAlignBtn:= mnuLayoutAlignJustify; + ParaBtn := mnuGroupingParagraph; + DivBtn := mnuGroupingDiv; + SpanBtn := mnuGroupingSpan; + + // Other constants + NoName := 'Untitled'; end; procedure TTranslations.TranslateToDutch; @@ -356,6 +425,62 @@ begin //View menu mnuView := 'Bee&ld'; mnuViewFontsize := '&Tekengrootte'; + + SLine := 'Rg'; + SCol := 'Kol'; + SModified := 'Gewijzigd'; + SIns := 'INS'; + SOvr := 'OVR'; + msgOpenError := 'Fout bij openen van bestand:'^m'%s'; + msgSaveError := 'Fout bij opslaan van bestand:'^m'%s'; + msgSaveAllError := 'De volgende bestanden zijn niet opgeslagen:'^m'%s'; + msgFileIsNotText := 'Dit bestand lijkt geen tekstbestand te zijn'^m'%s'^m'Wilt u het toch openen?'; + msgFileNotFound := 'Bestand niet gevonden:'^m'%s'; + msgModifiedSave := 'Bestand is gewijzigd:'^m'%s'^m'Bestand opslaan?'; + msgMruIndexOutOfBound := 'Index voor recent geopende bestanden ligt buiten de grenzen [%d]'^m+ + 'Dit is uiteraard een fout van de programmeur'; + msgFileTypeNotForBrowser := 'Dit bestandstype lijkt niet geschikt om te openen in een browser.'^m+ + 'Wilt u toch doorgaan?'; + msgFileHasNoName := 'Dit bestand heeft nog geen naam.'^m + + 'U moet het bestand eerst opslaan om het in de browser te openen.'; + msgErrorBrowser := 'Er is een fout opgetreden tijdens het openen van'^m+ + '%s'^m'in de browser.'; + msgTextNotFound := 'Tekst niet gevonden:'^m'"%s"'; + + // main.pp hints in toolbar buttons + NewFromTemplateBtn := mnuFileNewFromTemplate; + NewPlainBtn := mnuFileNew; + OpenBtn := mnuFileOpen; + SaveBtn := mnuFileSave; + SaveAllBtn := mnuFileSaveAll; + CopyBtn := mnuEditCopy; + PasteBtn := 'Paste'; + FindBtn := 'Find'; + InfoBtn := 'Help'; + AnchorBtn := 'Hyperlink invoegen'; + ImageBtn := 'Plaatje invoegen'; + UListBtn := 'Ongenummerde lijst'; + NListBtn := 'Genummerde ljst'; + ListItemBtn := 'Lijstitem invoegen ((on)genummerde lijst)'; + TableBtn := 'Tabel invoegen'; + BoldBtn := mnuLayoutBold; + ItalicBtn := mnuLayoutItalic; + UnderlineBtn := mnuLayoutUnderline; + EmBtn := mnuLayoutEmphasis; + StrongBtn := mnuLayoutStrong; + SupBtn := mnuLayoutSub; + SubBtn := mnuLayoutSup; + HeadingBtn := 'Heading (H1..H6)'; + LeftAlignBtn := mnuLayoutAlignLeft; + RightAlignBtn:= mnuLayoutAlignRight; + CenterAlignBtn:= mnuLayoutAlignCenter; + JustifyAlignBtn:= mnuLayoutAlignJustify; + ParaBtn := mnuGroupingParagraph; + DivBtn := mnuGroupingDiv; + SpanBtn := mnuGroupingSpan; + + // Other constants + NoName := 'Naamloos'; end; procedure TTranslations.TranslateToPortuguese; diff --git a/applications/lazedit/main.lfm b/applications/lazedit/main.lfm index 8d6e44ff6..1d7ecc24d 100644 --- a/applications/lazedit/main.lfm +++ b/applications/lazedit/main.lfm @@ -1,7 +1,7 @@ object EPlusForm: TEPlusForm - Left = 634 + Left = 286 Height = 418 - Top = 143 + Top = 121 Width = 575 AllowDropFiles = True Caption = 'Lazarus Text Editor' @@ -1486,7 +1486,7 @@ object EPlusForm: TEPlusForm end end object mnuHTMLTools: TMenuItem - Caption = '&Invoegen' + Caption = '&HTML Tools' OnClick = TopLevelMenuClick object mnuInsertAnchor: TMenuItem Action = acInsertAnchor diff --git a/applications/lazedit/main.pp b/applications/lazedit/main.pp index 1f2b4a26c..b9d944682 100644 --- a/applications/lazedit/main.pp +++ b/applications/lazedit/main.pp @@ -439,7 +439,9 @@ type MruMenuItems: Array[0..MruEntries-1] of TMenuItem; procedure SetUpAndConfigureLazEdit; - procedure DoTranslate; + procedure DoTranslateAll; + procedure DoTranslateMenus; + procedure DoTranslateHints; procedure SaveEplusConfiguration; procedure CleanUp; @@ -534,33 +536,11 @@ const pXY = 0; //Panels constanten pMod = 1; pIns = 2; pName = 3; - SLine = 'Rg'; - SCol = 'Kol'; - SModified = 'Gewijzigd'; - SIns = 'INS'; - SOvr = 'OVR'; tgNeedsEditor = $01; tgNeedsSelection = $02; tgNeedsClipPaste = $04; - - msgOpenError = 'Fout bij openen van bestand:'^m'%s'; - msgSaveError = 'Fout bij opslaan van bestand:'^m'%s'; - msgSaveAllError = 'De volgende bestanden zijn niet opgeslagen:'^m'%s'; - msgFileIsNotText = 'Dit bestand lijkt geen tekstbestand te zijn'^m'%s'^m'Wilt u het toch openen?'; - msgFileNotFound = 'Bestand niet gevonden:'^m'%s'; - msgModifiedSave = 'Bestand is gewijzigd:'^m'%s'^m'Bestand opslaan?'; - msgMruIndexOutOfBound = 'Index voor recent geopende bestanden ligt buiten de grenzen [%d]'^m+ - 'Dit is uiteraard een fout van de programmeur'; - msgFileTypeNotForBrowser = 'Dit bestandstype lijkt niet geschikt om te openen in een browser.'^m+ - 'Wilt u toch doorgaan?'; - msgFileHasNoName = 'Dit bestand heeft nog geen naam.'^m + - 'U moet het bestand eerst opslaan om het in de browser te openen.'; - msgErrorBrowser = 'Er is een fout opgetreden tijdens het openen van'^m+ - '%s'^m'in de browser.'; - msgTextNotFound = 'Tekst niet gevonden:'^m'"%s"'; - //Initial text for FileNew commands itXml = '<?xml version="1.0"?>'; itBat = '@echo off'; @@ -578,7 +558,10 @@ const pXY = 0; //Panels constanten procedure TEPlusForm.FormCreate(Sender: TObject); begin SetUpAndConfigureLazEdit; - Self.DoTranslate(); + DoTranslateAll(); + NoteBook.IsCreating := True; + DoFileNewByType(eftNone); + NoteBook.IsCreating := False; end; procedure TEPlusForm.FormDestroy(Sender: TObject); @@ -615,7 +598,7 @@ begin begin if not TryFileOpen(FileNames[i]) then ShowError(Format('Fout bij openen van bestand'^m,[FileNames[i]])); end - else ShowError(Format(msgFileNotFound,[FileNames[i]])); + else ShowError(Format(vTranslations.msgFileNotFound,[FileNames[i]])); end; end; @@ -628,7 +611,7 @@ end; procedure TEPlusForm.mnuLanguageChangeClick(Sender: TObject); begin vTranslations.TranslateToLanguageID(Abs(TMenuItem(Sender).Tag)); - DoTranslate(); + DoTranslateAll(); end; @@ -1163,8 +1146,15 @@ begin end; -procedure TEPlusForm.DoTranslate; +procedure TEPlusForm.DoTranslateAll; begin + DoTranslateMenus(); + DoTranslateHints(); +end; + +procedure TEPlusForm.DoTranslateMenus; +begin + { MENUS } { mnuEditPasteTableContentTab: TMenuItem; mnuEditPasteSpecial: TMenuItem; mnuAbout: TMenuItem; @@ -1300,6 +1290,41 @@ begin mnuPopupLayoutH1: TMenuItem; } end; +procedure TEPlusForm.DoTranslateHints; +begin + { HINTS } + NewFromTemplateBtn.Hint := vTranslations.NewFromTemplateBtn; + NewPlainBtn.Hint := vTranslations.NewPlainBtn; + OpenBtn.Hint := vTranslations.OpenBtn; + SaveBtn.Hint := vTranslations.SaveBtn; + SaveAllBtn.Hint := vTranslations.SaveAllBtn; + CopyBtn.Hint := vTranslations.CopyBtn; + PasteBtn.Hint := vTranslations.PasteBtn; + FindBtn.Hint := vTranslations.FindBtn; + InfoBtn.Hint := vTranslations.InfoBtn; + AnchorBtn.Hint := vTranslations.AnchorBtn; + ImageBtn.Hint := vTranslations.ImageBtn; + UListBtn.Hint := vTranslations.UListBtn; + NListBtn.Hint := vTranslations.NListBtn; + ListItemBtn.Hint := vTranslations.ListItemBtn; + TableBtn.Hint := vTranslations.TableBtn; + BoldBtn.Hint := vTranslations.BoldBtn; + ItalicBtn.Hint := vTranslations.ItalicBtn; + UnderlineBtn.Hint := vTranslations.UnderlineBtn; + EmBtn.Hint := vTranslations.EmBtn; + StrongBtn.Hint := vTranslations.StrongBtn; + SupBtn.Hint := vTranslations.SupBtn; + SubBtn.Hint := vTranslations.SubBtn; + HeadingBtn.Hint := vTranslations.HeadingBtn; + LeftAlignBtn.Hint := vTranslations.LeftAlignBtn; + RightAlignBtn.Hint := vTranslations.RightAlignBtn; + CenterAlignBtn.Hint := vTranslations.CenterAlignBtn; + JustifyAlignBtn.Hint := vTranslations.JustifyAlignBtn; + ParaBtn.Hint := vTranslations.ParaBtn; + DivBtn.Hint := vTranslations.DivBtn; + SpanBtn.Hint := vTranslations.SpanBtn; +end; + procedure TEPlusForm.SaveEplusConfiguration; begin GatherAppOptions(AppOptions); @@ -1702,7 +1727,7 @@ begin begin Fn := Ed.FileName; if Fn = EmptyStr then Fn := Sender.Caption; //this will differentiate between Noname and Noname [2] - Res := MessageDlg(AppName, Format(msgModifiedSave,[Fn]), mtConfirmation, [mbYes,mbNo,mbCancel], 0); + Res := MessageDlg(AppName, Format(vTranslations.msgModifiedSave,[Fn]), mtConfirmation, [mbYes,mbNo,mbCancel], 0); case Res of mrNo: Cancel := False; mrCancel: Cancel := True; @@ -1732,17 +1757,17 @@ begin begin Col := CaretX; Line := CaretY; - StatusBar.Panels[pXY].Text := Format('%s %-3d %s %-3d',[SLine,Line,SCol,Col]); + StatusBar.Panels[pXY].Text := Format('%s %-3d %s %-3d',[vTranslations.SLine,Line,vTranslations.SCol,Col]); end; if (scModified in Changes) then begin - if Modified then StatusBar.Panels[pMod].Text := SModified + if Modified then StatusBar.Panels[pMod].Text := vTranslations.SModified else StatusBar.Panels[pMod].Text := ''; end; if (scInsertMode in Changes) then begin - if InsertMode then StatusBar.Panels[pIns].Text := SIns - else StatusBar.Panels[pIns].Text := SOvr; + if InsertMode then StatusBar.Panels[pIns].Text := vTranslations.SIns + else StatusBar.Panels[pIns].Text := vTranslations.SOvr; end; if (scFileName in Changes) then begin @@ -1992,10 +2017,10 @@ begin if (Fn = EmptyStr) then Exit; if FileExistsUtf8(Fn) then begin - if not TryFileOpen(Fn, False) then ShowError(Format(msgOpenError,[Fn])); + if not TryFileOpen(Fn, False) then ShowError(Format(vTranslations.msgOpenError,[Fn])); end else - ShowError(Format(msgFileNotFound,[Fn])); + ShowError(Format(vTranslations.msgFileNotFound,[Fn])); end; procedure TEPlusForm.DoMruOpen(const Index: Integer); @@ -2004,12 +2029,12 @@ var begin if (Index < 0) or (Index > MruList.Count - 1) then begin - ShowError(Format(msgMruIndexOutOfBound,[Index])); + ShowError(Format(vTranslations.msgMruIndexOutOfBound,[Index])); end; Fn := MruList.Strings[Index]; if (Fn <> '') then begin - if not TryFileOpen(Fn, False) then ShowError(Format(msgOpenError,[Fn])); + if not TryFileOpen(Fn, False) then ShowError(Format(vTranslations.msgOpenError,[Fn])); end end; @@ -2021,17 +2046,17 @@ begin if (Fn = EmptyStr) then Exit; if FileExistsUtf8(Fn) then begin - if not TryFileOpen(Fn, True) then ShowError(Format(msgOpenError,[Fn])); + if not TryFileOpen(Fn, True) then ShowError(Format(vTranslations.msgOpenError,[Fn])); end else - ShowError(Format(msgFileNotFound,[Fn])); + ShowError(Format(vTranslations.msgFileNotFound,[Fn])); end; procedure TEPlusForm.DoFileSave(Editor: TEditor); begin if Assigned(Editor) then begin - if (TryFileSave(Editor, Editor.FileName) = IoFail) then ShowError(Format(msgSaveError,[Editor.FileName])); + if (TryFileSave(Editor, Editor.FileName) = IoFail) then ShowError(Format(vTranslations.msgSaveError,[Editor.FileName])); end; end; @@ -2044,7 +2069,7 @@ begin Fn := AskFileNameSave(Editor.FileName, Editor.FileType); if (Fn <> EmptyStr) then begin - if (TryFileSave(Editor, Fn) = IoFail) then ShowError(Format(msgSaveError,[Fn])); + if (TryFileSave(Editor, Fn) = IoFail) then ShowError(Format(vTranslations.msgSaveError,[Fn])); end; end; end; @@ -2058,7 +2083,7 @@ begin Fn := AskFileNameSaveTemplate; if (Fn <> EmptyStr) then begin - if (TryFileSave(Editor, Fn) = IoFail) then ShowError(Format(msgSaveError,[Fn])); + if (TryFileSave(Editor, Fn) = IoFail) then ShowError(Format(vTranslations.msgSaveError,[Fn])); end; end; end; @@ -2071,7 +2096,7 @@ begin if not TryFileSaveAll(S) then begin S := Trim(S); //get rid of trailing LineEndings - ShowError(Format(msgSaveAllError,[S])); + ShowError(Format(vTranslations.msgSaveAllError,[S])); end; end; @@ -2105,15 +2130,15 @@ begin begin if (Ed.FileName = EmptyStr) then begin - ShowError(msgFileHasNoName); + ShowError(vTranslations.msgFileHasNoName); Exit; end; if not (Ed.FileType in [eftHtml, eftXml]) then begin - if (MessageDlg(AppName, msgFileTypeNotForBrowser, mtConfirmation, [mbYes,mbNo], 0, mbNo) <> mrYes) then + if (MessageDlg(AppName, vTranslations.msgFileTypeNotForBrowser, mtConfirmation, [mbYes,mbNo], 0, mbNo) <> mrYes) then Exit; end; - if not OpenUrl(Ed.FileName) then ShowError(Format(msgErrorBrowser, [Ed.FileName])); + if not OpenUrl(Ed.FileName) then ShowError(Format(vTranslations.msgErrorBrowser, [Ed.FileName])); end; end; @@ -2213,7 +2238,7 @@ begin sOpt := FindOptions; sOpt := sOpt - [ssoBackWards]; if Ed.SearchReplace(FindText,'',sOpt) = 0 then - ShowError(Format(msgTextNotFound,[FindText])); + ShowError(Format(vTranslations.msgTextNotFound,[FindText])); end; end; @@ -2229,7 +2254,7 @@ begin sOpt := FindOptions; sOpt := sOpt + [ssoBackWards]; if Ed.SearchReplace(FindText,'',sOpt) = 0 then - ShowError(Format(msgTextNotFound,[FindText])); + ShowError(Format(vTranslations.msgTextNotFound,[FindText])); end; end; @@ -2282,7 +2307,7 @@ begin FindText := Dlg.FindText; if Ed.SearchReplace(FindText,'',FindOptions) = 0 then - ShowError(Format(msgTextNotFound,[FindText])); + ShowError(Format(vTranslations.msgTextNotFound,[FindText])); end; end; @@ -2309,7 +2334,7 @@ begin ReplaceText := Dlg.ReplaceText; if Ed.SearchReplace(FindText,ReplaceText,ReplaceOptions) = 0 then - ShowError(Format(msgTextNotFound,[FindText])) + ShowError(Format(vTranslations.msgTextNotFound,[FindText])) else if (ssoReplace in ReplaceOptions) and not (ssoReplaceAll in ReplaceOptions) then begin