Skip to content

Commit 314db47

Browse files
committed
fix: re-enable dropping sql files on main form
1 parent 7dfad02 commit 314db47

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

source/main.lfm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ object MainForm: TMainForm
33
Height = 380
44
Top = 272
55
Width = 798
6+
AllowDropFiles = True
67
Caption = 'MainForm'
78
ClientHeight = 380
89
ClientWidth = 798
@@ -14,6 +15,7 @@ object MainForm: TMainForm
1415
OnCloseQuery = FormCloseQuery
1516
OnCreate = FormCreate
1617
OnDestroy = FormDestroy
18+
OnDropFiles = FormDropFiles
1719
OnShow = FormShow
1820
object StatusBar: TStatusBar
1921
Left = 0
@@ -3436,7 +3438,6 @@ object MainForm: TMainForm
34363438
MouseLinkColor.Foreground = clBlue
34373439
LineHighlightColor.Background = clNone
34383440
LineHighlightColor.Foreground = clNone
3439-
OnDropFiles = SynMemoQueryDropFiles
34403441
OnProcessCommand = SynMemoQueryProcessCommand
34413442
OnReplaceText = SynMemoQueryReplaceText
34423443
OnShowHint = SynMemoQueryShowHint

source/main.pas

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ TMainForm = class(TExtForm)
906906
procedure SynMemoQueryDragOver(Sender, Source: TObject; X, Y: Integer;
907907
State: TDragState; var Accept: Boolean);
908908
procedure SynMemoQueryDragDrop(Sender, Source: TObject; X, Y: Integer);
909-
procedure SynMemoQueryDropFiles(Sender: TObject; X, Y: Integer; AFiles: TStrings);
909+
procedure FormDropFiles(Sender: TObject; const FileNames: array of string);
910910
procedure popupHostPopup(Sender: TObject);
911911
procedure popupDBPopup(Sender: TObject);
912912
procedure popupDataGridPopup(Sender: TObject);
@@ -7748,20 +7748,24 @@ procedure TMainForm.SynMemoQueryDragDrop(Sender, Source: TObject; X,
77487748

77497749

77507750

7751-
procedure TMainForm.SynMemoQueryDropFiles(Sender: TObject; X, Y: Integer;
7752-
AFiles: TStrings);
7751+
procedure TMainForm.FormDropFiles(Sender: TObject;
7752+
const FileNames: array of string);
77537753
var
77547754
i: Integer;
77557755
Tab: TQueryTab;
7756+
Files: TStringList;
77567757
begin
77577758
// One or more files from explorer or somewhere else was dropped onto the
77587759
// query-memo - load their contents into seperate tabs
7759-
if not RunQueryFiles(AFiles, nil, False) then begin
7760-
for i:=0 to AFiles.Count-1 do begin
7760+
Files := TStringList.Create;
7761+
Files.AddStrings(FileNames);
7762+
if not RunQueryFiles(Files, nil, False) then begin
7763+
for i:=0 to Files.Count-1 do begin
77617764
Tab := GetOrCreateEmptyQueryTab(True);
7762-
Tab.LoadContents(AFiles[i], False, nil);
7765+
Tab.LoadContents(Files[i], False, nil);
77637766
end;
77647767
end;
7768+
Files.Free;
77657769
end;
77667770

77677771

0 commit comments

Comments
 (0)