opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-16 11:42:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Only check selected table node(s) in table tools tree, if table(s) were right clicked. Check db node if that db was right clicked. Fixes issue #1362.

Browse Source
This commit is contained in:
Ansgar Becker
2009-10-17 11:17:59 +00:00
parent d6a3eae380
commit 0790c125f4
3 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/main.pas
View File

@ -473,7 +473,7 @@ type
procedure actAboutBoxExecute(Sender: TObject);
procedure actApplyFilterExecute(Sender: TObject);
procedure actClearEditorExecute(Sender: TObject);
procedure actMaintenanceExecute(Sender: TObject);
procedure actTableToolsExecute(Sender: TObject);
procedure actCopyAsHTMLExecute(Sender: TObject);
procedure actCopyAsCSVExecute(Sender: TObject);
procedure actPrintListExecute(Sender: TObject);
@ -735,7 +735,6 @@ type
procedure comboOnlyDBsKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure actFilterPanelExecute(Sender: TObject);
procedure TimerFilterVTTimer(Sender: TObject);
procedure actFindTextOnServerExecute(Sender: TObject);
private
ReachedEOT : Boolean;
FDelimiter: String;
@ -1964,21 +1963,28 @@ begin
m.SelEnd := 0;
end;
procedure TMainForm.actMaintenanceExecute(Sender: TObject);
procedure TMainForm.actTableToolsExecute(Sender: TObject);
var
Act: TAction;
InDBTree: Boolean;
begin
// optimize / repair... tables
// Show table tools dialog
if TableToolsDialog = nil then
TableToolsDialog := TfrmTableTools.Create(Self);
TableToolsDialog.PageControlTools.ActivePage := TableToolsDialog.tabMaintenance;
TableToolsDialog.ShowModal;
end;
procedure TMainForm.actFindTextOnServerExecute(Sender: TObject);
begin
// Find text on server
if TableToolsDialog = nil then
TableToolsDialog := TfrmTableTools.Create(Self);
TableToolsDialog.PageControlTools.ActivePage := TableToolsDialog.tabFind;
Act := Sender as TAction;
InDBTree := (Act.ActionComponent is TMenuItem)
and (TPopupMenu((Act.ActionComponent as TMenuItem).GetParentMenu).PopupComponent = DBTree);
if InDBTree and (SelectedTable.NodeType in [lntTable, lntCrashedTable, lntView]) then
TableToolsDialog.SelectedTables.Text := SelectedTable.Text
else if not InDBTree then
TableToolsDialog.SelectedTables := GetVTCaptions(ListTables, True, 0, [lntTable, lntCrashedTable, lntView])
else
TableToolsDialog.SelectedTables.Clear;
logsql(TableToolsDialog.SelectedTables.CommaText);
if Sender = actMaintenance then
TableToolsDialog.PageControlTools.ActivePage := TableToolsDialog.tabMaintenance
else
TableToolsDialog.PageControlTools.ActivePage := TableToolsDialog.tabFind;
TableToolsDialog.ShowModal;
end;
@ -2464,11 +2470,11 @@ begin
end;
end else begin
// Invoked from database tab
Tables := GetVTCaptions(ListTables, True, 0, lntTable);
Tables.AddStrings(GetVTCaptions(ListTables, True, 0, lntCrashedTable));
Views := GetVTCaptions(ListTables, True, 0, lntView);
Procedures := GetVTCaptions(ListTables, True, 0, lntProcedure);
Functions := GetVTCaptions(ListTables, True, 0, lntFunction);
Tables := GetVTCaptions(ListTables, True, 0, [lntTable]);
Tables.AddStrings(GetVTCaptions(ListTables, True, 0, [lntCrashedTable]));
Views := GetVTCaptions(ListTables, True, 0, [lntView]);
Procedures := GetVTCaptions(ListTables, True, 0, [lntProcedure]);
Functions := GetVTCaptions(ListTables, True, 0, [lntFunction]);
end;
// Fix actions temporarily enabled for popup menu.