opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify more code using the new PopupComponent() function

Browse Source
This commit is contained in:
Ansgar Becker
2021-01-16 18:36:01 +01:00
parent b6c9cc1e02
commit 1a7cc67e37
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/main.pas
View File

@ -4704,20 +4704,17 @@ var
Comp: TComponent; Comp: TComponent;
Memo: TSynMemo; Memo: TSynMemo;
Dialog: TSaveDialog; Dialog: TSaveDialog;
Item: TMenuItem;
begin begin
// Save to textfile, from any TSynMemo (SQL log, "CREATE code" tab in editor, ...) // Save to textfile, from any TSynMemo (SQL log, "CREATE code" tab in editor, ...)
Item := (Sender as TAction).ActionComponent as TMenuItem; Memo := nil;
Comp := (Item.GetParentMenu as TPopupMenu).PopupComponent;
// Try to find memo from menu item's popup component, and if that fails, check ActiveControl. // Try to find memo from menu item's popup component, and if that fails, check ActiveControl.
// See #353 // See #353
if (Comp <> nil) and (Comp is TSynMemo) then begin Comp := PopupComponent(Sender);
Memo := Comp as TSynMemo; if Comp is TSynMemo then
end else if ActiveControl is TSynMemo then begin Memo := Comp as TSynMemo
else if ActiveControl is TSynMemo then
Memo := ActiveControl as TSynMemo; Memo := ActiveControl as TSynMemo;
end else if Assigned(Memo) then begin
Memo := nil;
if Memo <> nil then begin
Dialog := TSaveDialog.Create(Self); Dialog := TSaveDialog.Create(Self);
Dialog.Options := Dialog.Options + [ofOverwritePrompt]; Dialog.Options := Dialog.Options + [ofOverwritePrompt];
Dialog.Filter := _('SQL files')+' (*.sql)|*.sql|'+_('All files')+' (*.*)|*.*'; Dialog.Filter := _('SQL files')+' (*.sql)|*.sql|'+_('All files')+' (*.*)|*.*';

2
source/table_editor.pas
View File

@ -2383,7 +2383,7 @@ procedure TfrmTableEditor.popupPropertiesPopup(Sender: TObject);
var var
Comp: TComponent; Comp: TComponent;
begin begin
Comp := (Sender as TPopupMenu).PopupComponent; Comp := PopupComponent(Sender);
if Comp = treeIndexes then begin if Comp = treeIndexes then begin
menuRemoveProperty.Enabled := btnRemoveIndex.Enabled; menuRemoveProperty.Enabled := btnRemoveIndex.Enabled;
menuClearProperties.Enabled := btnClearIndexes.Enabled; menuClearProperties.Enabled := btnClearIndexes.Enabled;