fixed jumping to bookmark via popupmenu

git-svn-id: trunk@7797 -
This commit is contained in:
mattias 2005-09-23 18:08:56 +00:00
parent 01160ee08a
commit e4411fa77d
2 changed files with 54 additions and 8 deletions

View File

@ -4296,10 +4296,10 @@ end;
Procedure TSourceNotebook.BookMarkGotoClicked(Sender: TObject); Procedure TSourceNotebook.BookMarkGotoClicked(Sender: TObject);
// popup menu goto bookmark clicked // popup menu goto bookmark clicked
var var
MenuItem: TMenuItem; MenuItem: TIDEMenuItem;
Begin Begin
MenuItem := TMenuItem(sender); MenuItem := Sender as TIDEMenuItem;
GotoBookMark(MenuItem.MenuIndex); GotoBookMark(MenuItem.SectionIndex);
end; end;
Procedure TSourceNotebook.ReadOnlyClicked(Sender: TObject); Procedure TSourceNotebook.ReadOnlyClicked(Sender: TObject);
@ -4362,12 +4362,12 @@ end;
Procedure TSourceNotebook.ToggleLineNumbersClicked(Sender: TObject); Procedure TSourceNotebook.ToggleLineNumbersClicked(Sender: TObject);
var var
MenuITem: TMenuItem; MenuITem: TIDEMenuCommand;
ActEdit:TSourceEditor; ActEdit:TSourceEditor;
i: integer; i: integer;
ShowLineNumbers: boolean; ShowLineNumbers: boolean;
begin begin
MenuItem := TMenuITem(Sender); MenuItem := Sender as TIDEMenuCommand;
ActEdit:=GetActiveSE; ActEdit:=GetActiveSE;
MenuItem.Checked := not(ActEdit.EditorComponent.Gutter.ShowLineNumbers); MenuItem.Checked := not(ActEdit.EditorComponent.Gutter.ShowLineNumbers);
ShowLineNumbers:=MenuItem.Checked; ShowLineNumbers:=MenuItem.Checked;
@ -4415,10 +4415,10 @@ end;
Procedure TSourceNotebook.BookMarkToggle(Value: Integer); Procedure TSourceNotebook.BookMarkToggle(Value: Integer);
var var
MenuItem: TMenuItem; MenuItem: TIDEMenuCommand;
ActEdit,AnEdit:TSourceEditor; ActEdit,AnEdit:TSourceEditor;
Begin Begin
MenuItem := SrcEditSubMenuSetBookmarks.Items[Value].MenuItem; MenuItem := SrcEditSubMenuSetBookmarks.Items[Value] as TIDEMenuCommand;
MenuItem.Checked := not MenuItem.Checked; MenuItem.Checked := not MenuItem.Checked;
ActEdit:=GetActiveSE; ActEdit:=GetActiveSE;

View File

@ -1172,9 +1172,55 @@ begin
end; end;
function TPkgManager.DoWriteMakefile(APackage: TLazPackage): TModalResult; function TPkgManager.DoWriteMakefile(APackage: TLazPackage): TModalResult;
var
s: String;
e: Char;
begin begin
Result:=mrCancel; Result:=mrCancel;
s:='';
e:=LineEnding;
s:=s+'# Makefile.fpc for '+APackage.IDAsString+e;
s:=s+''+e;
s:=s+'[package]'+e;
s:=s+'name='+lowercase(APackage.Name)+e;
s:=s+'version='+APackage.Version.AsString+e;
s:=s+''+e;
s:=s+'[compiler]'+e;
s:=s+'unittargetdir='+APackage.CompilerOptions.GetUnitOutPath(true)+e;
s:=s+'unitdir='+APackage.CompilerOptions.GetUnitPath(true)+e;
s:=s+'options=-gl'+e; // ToDo do the other options
s:=s+''+e;
s:=s+'[target]'+e;
s:=s+'units='+e;
s:=s+'implicitunits=syntextdrawer syneditkeycmds synedittypes syneditstrconst \'+e;
s:=s+' syneditsearch syneditmiscprocs syneditmiscclasses synedittextbuffer \'+e;
s:=s+' synedit synedithighlighter synhighlightermulti synregexpr synexporthtml \'+e;
s:=s+' syneditexport synmemo synmacrorecorder syneditplugins syneditregexsearch \'+e;
s:=s+' synhighlighterposition synhighlighterjava synhighlightercss \'+e;
s:=s+' synhighlighterphp synhighlightertex synhighlighterhashentries \'+e;
s:=s+' synhighlightersql'+e;
s:=s+''+e;
s:=s+'[require]'+e;
s:=s+'# Adding lcl does not work, because it adds the source path.'+e;
s:=s+'#packages=lcl'+e;
s:=s+'packages=fcl regexpr'+e;
s:=s+''+e;
s:=s+'[default]'+e;
s:=s+'#lcldir=../../lcl'+e;
s:=s+''+e;
s:=s+'[clean]'+e;
s:=s+'files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \'+e;
s:=s+' $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) \'+e;
s:=s+' $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \'+e;
s:=s+' $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))'+e;
s:=s+''+e;
s:=s+'[rules]'+e;
s:=s+'.PHONY: cleartarget all'+e;
s:=s+''+e;
s:=s+'cleartarget:'+e;
s:=s+' -$(DEL) $(COMPILER_UNITTARGETDIR)/allsyneditunits$(PPUEXT)'+e;
s:=s+''+e;
s:=s+'all: cleartarget $(COMPILER_UNITTARGETDIR) allsyneditunits$(PPUEXT)'+e;
end; end;
function TPkgManager.CompileRequiredPackages(APackage: TLazPackage; function TPkgManager.CompileRequiredPackages(APackage: TLazPackage;