paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-07 08:40:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

added double click for menu editor

Browse Source 
git-svn-id: trunk@5006 -
This commit is contained in:
mattias 2004-01-04 00:05:51 +00:00
parent 505247e781
commit c38db1c277
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
designer/designermenu.pp
View File

@ -125,7 +125,9 @@ type
function GetMaxCoordinates(DesignerMenuItem: PDesignerMenuItem; Max_Width, Max_Height: Integer): TRect; //width and height of all expanded menu items
// Event handling
procedure MenuItemMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
procedure MenuItemMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure MenuItemDblClick(Sender: TObject);
procedure AddNewItemBeforeClick(Sender: TObject);
procedure AddNewItemAfterClick(Sender: TObject);
procedure AddSubMenuClick(Sender: TObject);
@ -156,7 +158,8 @@ type
// update
procedure InitIndexSequence;
function CreateIndexSequence(MenuItem: PDesignerMenuItem; Ident: string; Ind: Integer): Boolean;
function UpdateMenu(MenuItem: TMenuItem; DesignerMenuItem: PDesignerMenuItem; Ind,Action: Integer): TMenuItem;
function UpdateMenu(MenuItem: TMenuItem;
DesignerMenuItem: PDesignerMenuItem; Ind,Action: Integer): TMenuItem;
procedure HideDesignerMenuItem(DesignerMenuItem: PDesignerMenuItem);
function GetDesignerMenuItem(DesignerMenuItem: PDesignerMenuItem; const Ident: string): PDesignerMenuItem;
@ -189,6 +192,7 @@ var
XMLConfig: TXMLConfig;
//
constructor TDesignerMainMenu.CreateWithMenu(aOwner: TComponent; aMenu: TMenu;
aEditor: TComponentEditor);
@ -319,7 +323,8 @@ begin
MenuItem^.SelfPanel.Caption:='';
MenuItem^.SelfPanel.Height:=DESIGNER_MENU_ITEM_HEIGHT;
Menuitem^.SelfPanel.OnMouseDown:=@MenuItemMouseDown;
Menuitem^.SelfPanel.OnDblClick:=@MenuItemDblClick;
MenuItem^.CaptionLabel:=TLabel.Create(self);
MenuItem^.CaptionLabel.Name:='CaptionLabel_' + MenuItem^.ID;
MenuItem^.CaptionLabel.Parent:=MenuItem^.SelfPanel;
@ -327,7 +332,8 @@ begin
MenuItem^.CaptionLabel.Top:=2;
MenuItem^.CaptionLabel.Height:=DESIGNER_MENU_ITEM_HEIGHT - 4;
MenuItem^.CaptionLabel.OnMouseDown:=@MenuItemMouseDown;
Menuitem^.CaptionLabel.OnDblClick:=@MenuItemDblClick;
MenuItem^.SubMenuArrow:=TArrow.Create(self);
MenuItem^.SubMenuArrow.Name:='SubMenuArrow_' + MenuItem^.ID;
MenuItem^.SubMenuArrow.Parent:=MenuItem^.SelfPanel;
@ -337,7 +343,8 @@ begin
MenuItem^.SubMenuArrow.ShadowType:=stout;
MenuItem^.SubMenuArrow.Visible:=false;
MenuItem^.SubMenuArrow.OnMouseDown:=@MenuItemMouseDown;
Menuitem^.SubMenuArrow.OnDblClick:=@MenuItemDblClick;
DesignerMenuItemIdent:=DesignerMenuItemIdent + 1;
inc(temp_newitemcounter);
end;
@ -701,7 +708,8 @@ end;
// -------------------------------------------------------------------------------------------------------------------//
// We have clicked on some DesignerMenuItem --------------------------------------------------------------------------//
// -------------------------------------------------------------------------------------------------------------------//
procedure TDesignerMainMenu.MenuItemMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
procedure TDesignerMainMenu.MenuItemMouseDown(Sender: TObject;
Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
begin
writeln ('<<-- CLICK -->>');
@ -730,6 +738,11 @@ begin
UpdateMenu(fMenu.Items, GetDesignerMenuItem(Root, SelectedDesignerMenuItem), 1, 9);
end;
procedure TDesignerMainMenu.MenuItemDblClick(Sender: TObject);
begin
HandleOnClickEventClick(Sender);
end;
// -------------------------------------------------------------//
// New Item (before) has been selected from context menu -------//
// -------------------------------------------------------------//
@ -781,8 +794,10 @@ procedure TDesignerMainMenu.HandleOnClickEventClick(Sender: TObject);
var
temp_menuitem: TMenuItem;
begin
temp_menuitem:=UpdateMenu(fMenu.Items, GetDesignerMenuItem(Root, SelectedDesignerMenuItem), 1, 10);
fDefaultComponentEditor:=TDefaultComponentEditor.Create(temp_menuitem, fEditor.GetDesigner);
temp_menuitem:=UpdateMenu(fMenu.Items,
GetDesignerMenuItem(Root, SelectedDesignerMenuItem), 1, 10);
fDefaultComponentEditor:=
TDefaultComponentEditor.Create(temp_menuitem, fEditor.GetDesigner);
fDefaultComponentEditor.Edit;
fDefaultComponentEditor.Free;
end;
@ -1672,7 +1687,8 @@ end;}
// ------------------------------------------------------------------
// UPDATE Menu (type of update is specified via the Action parameter)
// ------------------------------------------------------------------
function TDesignerMainMenu.UpdateMenu(MenuItem: TMenuItem; DesignerMenuItem: PDesignerMenuItem; Ind, Action: Integer): TMenuItem;
function TDesignerMainMenu.UpdateMenu(MenuItem: TMenuItem;
DesignerMenuItem: PDesignerMenuItem; Ind, Action: Integer): TMenuItem;
var
i: Integer;
temp_menuitem: TMenuItem;

9
ide/main.pp
View File

@ -7457,10 +7457,8 @@ begin
MessagesView.SelectedMessageIndex:=Index;
end;
MessagesView.GetVisibleMessageAt(Index,CurMsg,CurDir);
writeln('TMainIDE.DoJumpToCompilerMessage A ');
if TheOutputFilter.GetSourcePosition(CurMsg,Filename,CaretXY,MsgType)
then begin
writeln('TMainIDE.DoJumpToCompilerMessage B ');
if (not FilenameIsAbsolute(Filename)) and (CurDir<>'') then begin
// the directory was just hidden, re-append it
NewFilename:=AppendPathDelim(CurDir)+Filename;
@ -7468,23 +7466,19 @@ writeln('TMainIDE.DoJumpToCompilerMessage B ');
Filename:=NewFilename;
end;
writeln('TMainIDE.DoJumpToCompilerMessage C ');
OpenFlags:=[ofOnlyIfExists,ofRegularFile];
if IsTestUnitFilename(Filename) then begin
SearchedFilename := ExtractFileName(Filename);
Include(OpenFlags,ofVirtualFile);
end else begin
SearchedFilename := FindUnitFile(Filename);
writeln('TMainIDE.DoJumpToCompilerMessage D ',SearchedFilename);
if not FilenameIsAbsolute(SearchedFilename) then
Include(OpenFlags,ofVirtualFile);
end;
writeln('TMainIDE.DoJumpToCompilerMessage E ',SearchedFilename);
if SearchedFilename<>'' then begin
// open the file in the source editor
Result:=(DoOpenEditorFile(SearchedFilename,-1,OpenFlags)=mrOk);
writeln('TMainIDE.DoJumpToCompilerMessage F ',Result);
if Result then begin
// set caret position
SourceNotebook.AddJumpPointClicked(Self);
@ -10270,6 +10264,9 @@ end.
{ =============================================================================
$Log$
Revision 1.692 2004/01/04 00:05:51 mattias
added double click for menu editor
Revision 1.691 2004/01/03 20:19:22 mattias
fixed reopening virtual files