opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-14 10:02:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Group tree options in popup submenu, and introduce new option "Auto expand on click". Fixes issue #3061.

Browse Source
This commit is contained in:
Ansgar Becker
2012-12-26 08:14:10 +00:00
parent e25ea34794
commit 39b69226e1
3 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/helpers.pas
View File

@ -172,7 +172,7 @@ type
asFieldEditorSet, asFieldNullBackground, asGroupTreeObjects, asDisplayObjectSizeColumn, asSQLfile,
asActionShortcut1, asActionShortcut2, asHighlighterForeground, asHighlighterBackground, asHighlighterStyle,
asListColWidths, asListColsVisible, asListColPositions, asListColSort, asSessionFolder,
asRecentFilter, asDateTimeEditorCursorPos, asAppLanguage);
asRecentFilter, asDateTimeEditorCursorPos, asAppLanguage, asAutoExpand);
TAppSetting = record
Name: String;
Session: Boolean;
@ -3152,6 +3152,7 @@ begin
InitSetting(asRecentFilter, '%s', 0, False, '', True);
InitSetting(asDateTimeEditorCursorPos, 'DateTimeEditor_CursorPos_Type%s', 0);
InitSetting(asAppLanguage, 'Language', 0, False, '');
InitSetting(asAutoExpand, 'AutoExpand', 0, False);
end;

28
source/main.dfm
View File

@ -448,6 +448,7 @@ object MainForm: TMainForm
item
Alignment = taRightJustify
MinWidth = 0
Options = [coAllowClick, coDraggable, coEnabled, coParentBidiMode, coParentColor, coResizable, coShowDropMark, coAllowFocus]
Position = 1
Width = 55
WideText = 'Size'
@ -8767,16 +8768,23 @@ object MainForm: TMainForm
ImageIndex = 88
OnClick = menuTreeCollapseAllClick
end
object menuGroupObjects: TMenuItem
Action = actGroupObjects
AutoCheck = True
end
object menuShowSizeColumn: TMenuItem
Caption = 'Display size of objects'
OnClick = menuShowSizeColumnClick
end
object menuSelectBGColor: TMenuItem
Action = actSelectTreeBackground
object menuTreeOptions: TMenuItem
Caption = 'Tree style options'
object menuGroupObjects: TMenuItem
Action = actGroupObjects
AutoCheck = True
end
object menuShowSizeColumn: TMenuItem
Caption = 'Display size of objects'
OnClick = menuShowSizeColumnClick
end
object menuAutoExpand: TMenuItem
Caption = 'Auto expand on click'
OnClick = menuAutoExpandClick
end
object menuSelectBGColor: TMenuItem
Action = actSelectTreeBackground
end
end
object menuPrint: TMenuItem
Action = actPrintList

60
source/main.pas
View File

@ -562,6 +562,8 @@ type
actExplainAnalyzeCurrentQuery: TAction;
Explaincurrentquery1: TMenuItem;
Explainanalyzerforcurrentquery1: TMenuItem;
menuAutoExpand: TMenuItem;
menuTreeOptions: TMenuItem;
procedure actCreateDBObjectExecute(Sender: TObject);
procedure menuConnectionsPopup(Sender: TObject);
procedure actExitApplicationExecute(Sender: TObject);
@ -888,6 +890,7 @@ type
procedure popupSqlLogPopup(Sender: TObject);
procedure actExplainAnalyzeCurrentQueryExecute(Sender: TObject);
procedure menuQueryExplainClick(Sender: TObject);
procedure menuAutoExpandClick(Sender: TObject);
private
FLastHintMousepos: TPoint;
FLastHintControlIndex: Integer;
@ -1531,11 +1534,10 @@ begin
// Database tree options
actGroupObjects.Checked := AppSettings.ReadBool(asGroupTreeObjects);
menuShowSizeColumn.Checked := AppSettings.ReadBool(asDisplayObjectSizeColumn);
if menuShowSizeColumn.Checked then
DBtree.Header.Columns[1].Options := DBtree.Header.Columns[1].Options + [coVisible]
else
DBtree.Header.Columns[1].Options := DBtree.Header.Columns[1].Options - [coVisible];
if AppSettings.ReadBool(asDisplayObjectSizeColumn) then
menuShowSizeColumn.Click;
if AppSettings.ReadBool(asAutoExpand) then
menuAutoExpand.Click;
// Restore width of columns of all VirtualTrees
RestoreListSetup(ListDatabases);
@ -5607,12 +5609,10 @@ begin
actEmptyTables.Enabled := Obj.NodeType in [lntTable, lntView];
actRunRoutines.Enabled := Obj.NodeType in [lntProcedure, lntFunction];
menuEditObject.Enabled := IsDbOrObject;
// Show certain items which are valid only here
menuTreeExpandAll.Visible := True;
menuTreeCollapseAll.Visible := True;
actGroupObjects.Visible := True;
menuShowSizeColumn.Visible := True;
actSelectTreeBackground.Visible := True;
// Enable certain items which are valid only here
menuTreeExpandAll.Enabled := True;
menuTreeCollapseAll.Enabled := True;
menuTreeOptions.Enabled := True;
end else begin
HasFocus := Assigned(ListTables.FocusedNode);
actCreateDatabase.Enabled := False;
@ -5630,11 +5630,9 @@ begin
Obj := ListTables.GetNodeData(ListTables.FocusedNode);
actCopyTable.Enabled := Obj.NodeType in [lntTable, lntView];
end;
menuTreeExpandAll.Visible := False;
menuTreeCollapseAll.Visible := False;
actGroupObjects.Visible := False;
menuShowSizeColumn.Visible := False;
actSelectTreeBackground.Visible := False;
menuTreeExpandAll.Enabled := False;
menuTreeCollapseAll.Enabled := False;
menuTreeOptions.Enabled := False;
end;
actCreateView.Enabled := actCreateView.Enabled and (ActiveConnection.ServerVersionInt >= 50001);
actCreateRoutine.Enabled := actCreateRoutine.Enabled and (ActiveConnection.ServerVersionInt >= 50003);
@ -8029,16 +8027,32 @@ end;
procedure TMainForm.menuShowSizeColumnClick(Sender: TObject);
var
NewVal: Boolean;
Item: TMenuItem;
begin
NewVal := not TMenuItem(Sender).Checked;
TMenuItem(Sender).Checked := newVal;
if NewVal then
DBtree.Header.Columns[1].Options := DBtree.Header.Columns[1].Options + [coVisible]
if coVisible in DBtree.Header.Columns[1].Options then
DBtree.Header.Columns[1].Options := DBtree.Header.Columns[1].Options - [coVisible]
else
DBtree.Header.Columns[1].Options := DBtree.Header.Columns[1].Options - [coVisible];
DBtree.Header.Columns[1].Options := DBtree.Header.Columns[1].Options + [coVisible];
Item := Sender as TMenuItem;
Item.Checked := coVisible in DBtree.Header.Columns[1].Options;
AppSettings.ResetPath;
AppSettings.WriteBool(asDisplayObjectSizeColumn, NewVal);
AppSettings.WriteBool(asDisplayObjectSizeColumn, Item.Checked);
end;
procedure TMainForm.menuAutoExpandClick(Sender: TObject);
var
Item: TMenuItem;
begin
// Activate expand on click tree feature
if toAutoExpand in DBtree.TreeOptions.AutoOptions then
DBtree.TreeOptions.AutoOptions := DBtree.TreeOptions.AutoOptions - [toAutoExpand]
else
DBtree.TreeOptions.AutoOptions := DBtree.TreeOptions.AutoOptions + [toAutoExpand];
Item := Sender as TMenuItem;
Item.Checked := toAutoExpand in DBtree.TreeOptions.AutoOptions;
AppSettings.ResetPath;
AppSettings.WriteBool(asAutoExpand, Item.Checked);
end;