mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Popup menu on the toolbar buttons.

Browse source
This commit is contained in:
cobines 2011-02-17 05:23:00 +00:00
commit 5fa46af89f
2 changed files with 62 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/fmain.lfm
View file

@ -36,6 +36,7 @@ object frmMain: TfrmMain
OnDragOver = MainToolBarDragOver
OnMouseUp = MainToolBarMouseUp
OnToolButtonClick = MainToolBarToolButtonClick
OnToolButtonMouseUp = MainToolBarToolButtonMouseUp
OnLoadButtonGlyph = MainToolBarLoadButtonGlyph
GlyphSize = 16
EnvVar = '%commander_path%'
@ -75,9 +76,9 @@ object frmMain: TfrmMain
Flat = True
ShowCaptions = True
TabOrder = 0
OnMouseUp = dskToolBarMouseUp
OnResize = dskLeftResize
OnToolButtonClick = dskToolButtonClick
OnToolButtonMouseUp = dskToolButtonMouseUp
RadioToolBar = True
GlyphSize = 16
end
@ -106,9 +107,9 @@ object frmMain: TfrmMain
Flat = True
ShowCaptions = True
TabOrder = 0
OnMouseUp = dskToolBarMouseUp
OnResize = dskRightResize
OnToolButtonClick = dskToolButtonClick
OnToolButtonMouseUp = dskToolButtonMouseUp
RadioToolBar = True
GlyphSize = 16
end
@ -167,7 +168,7 @@ object frmMain: TfrmMain
Align = alLeft
Constraints.MinHeight = 24
NumGlyphs = 0
OnMouseUp = dskToolBarMouseUp
OnMouseUp = btnDriveMouseUp
end
object btnLeftHome: TSpeedButton
Left = 465
@ -299,7 +300,7 @@ object frmMain: TfrmMain
Align = alLeft
Constraints.MinHeight = 24
NumGlyphs = 0
OnMouseUp = dskToolBarMouseUp
OnMouseUp = btnDriveMouseUp
end
object btnRightHome: TSpeedButton
Left = 201

98
src/fmain.pas
View file

@ -387,11 +387,14 @@ type
procedure btnLeftDirectoryHotlistClick(Sender: TObject);
procedure btnRightClick(Sender: TObject);
procedure btnRightDirectoryHotlistClick(Sender: TObject);
procedure btnDriveMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
procedure ConsoleSplitterCanResize(Sender: TObject; var NewSize: Integer;
var Accept: Boolean);
procedure dskLeftResize(Sender: TObject);
procedure dskRightResize(Sender: TObject);
procedure dskToolButtonMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer; NumberOfButton: Integer);
procedure lblAllProgressPctClick(Sender: TObject);
procedure MainToolBarToolButtonMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer; NumberOfButton: Integer);
procedure miLogMenuClick(Sender: TObject);
@ -401,8 +404,6 @@ type
procedure PanelButtonClick(Button: TSpeedButton; SourceFrame: TFileView;
PanelSelect: TFilePanelSelect);
procedure DeleteClick(Sender: TObject);
procedure dskToolBarMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure dskToolButtonClick(Sender: TObject; NumberOfButton: Integer);
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
@ -424,7 +425,7 @@ type
State: TDragState; var Accept: Boolean);
function MainToolBarLoadButtonGlyph(sIconFileName: String;
iIconSize: Integer; clBackColor: TColor): TBitmap;
procedure MainToolBarMouseUp(Sender: TOBject; Button: TMouseButton;
procedure MainToolBarMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure MainToolBarToolButtonClick(Sender: TObject; NumberOfButton : Integer);
procedure frmMainClose(Sender: TObject; var CloseAction: TCloseAction);
@ -815,6 +816,23 @@ begin
pmHotList.PopUp(P.x,P.y);
end;
procedure TfrmMain.btnDriveMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
var
pt: TPoint;
begin
if Button = mbRight then
with Sender as TSpeedButton do
begin
if (Tag >= 0) and (Tag < DrivesList.Count) then
begin
pt.X := X;
pt.Y := Y;
pt := ClientToScreen(pt);
ShowDriveContextMenu(Parent, DrivesList[Tag], pt.X, pt.Y, nil);
end;
end;
end;
procedure TfrmMain.ConsoleSplitterCanResize(Sender: TObject;
var NewSize: Integer; var Accept: Boolean);
begin
@ -836,6 +854,11 @@ begin
pnlDiskRightInner.ClientHeight := dskRight.Height + pnlDiskRightInner.BevelWidth * 2;
end;
procedure TfrmMain.dskToolButtonMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer; NumberOfButton: Integer);
begin
btnDriveMouseUp(Sender, Button, Shift, X, Y);
end;
procedure TfrmMain.lblAllProgressPctClick(Sender: TObject);
begin
if not Assigned(frmViewOperations) then
@ -844,6 +867,11 @@ begin
frmViewOperations.ShowOnTop;
end;
procedure TfrmMain.MainToolBarToolButtonMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer; NumberOfButton: Integer);
begin
MainToolBarMouseUp(Sender, Button, Shift, X, Y);
end;
procedure TfrmMain.miLogMenuClick(Sender: TObject);
begin
case (Sender as TMenuItem).Tag of
@ -1357,24 +1385,6 @@ begin
end;
end;
procedure TfrmMain.dskToolBarMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
var
pt: TPoint;
begin
if (Button = mbRight) and (Sender is TSpeedButton) then
with Sender as TSpeedButton do
begin
if (Tag >= 0) and (Tag < DrivesList.Count) then
begin
pt.X := X;
pt.Y := Y;
pt := ClientToScreen(pt);
ShowDriveContextMenu(Parent, DrivesList[Tag], pt.X, pt.Y, nil);
end;
end;
end;
procedure TfrmMain.dskToolButtonClick(Sender: TObject; NumberOfButton: Integer);
var
dskPanel : TKASToolBar;
@ -1406,33 +1416,39 @@ begin
SetActiveFrame(PanelSelected);
end;
procedure TfrmMain.MainToolBarMouseUp(Sender: TOBject; Button: TMouseButton;
procedure TfrmMain.MainToolBarMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
var
Point : TPoint;
Point : TPoint;
begin
if (Button = mbRight) then
begin
Point := Mouse.CursorPos;
if (Sender is TSpeedButton) then
begin
pmToolBar.Tag := (Sender as TSpeedButton).Tag;
tbDelete.Enabled := true;
end
else
begin
pmToolBar.Tag := -1;
tbDelete.Enabled := false;
end;
if (Sender is TSpeedButton) then
pmToolBar.Tag := (Sender as TSpeedButton).Tag
else
pmToolBar.Tag := -1;
pmToolBar.PopUp(Point.X, Point.Y);
end
else
if (Button = mbMiddle) then
case Button of
mbMiddle:
begin
tbEditClick(Sender)
tbEditClick(Sender);
end;
mbRight:
begin
Point.X := X;
Point.Y := Y;
Point := (Sender as TControl).ClientToScreen(Point);
if (Sender is TSpeedButton) then
begin
tbDelete.Enabled := True;
end
else
begin
tbDelete.Enabled := False;
end;
pmToolBar.PopUp(Point.X, Point.Y);
end;
end;
end;
procedure TfrmMain.MainToolBarToolButtonClick(Sender: TObject; NumberOfButton : Integer);