Tweaks

Author: ollydev

Source/ide/simba.form_functionlist.pas

@@ -57,6 +57,7 @@   TSimbaFunctionListPage = class(TSimbaPage)
     procedure DoOpenContextMenu(Sender: TObject);
     procedure DoUpdateHiddenSections(Sender: TObject);
     procedure DoMouseOverTooltipClick(Sender: TObject);
+    procedure DoCollapseAllClick(Sender: TObject);
     procedure DoShowAllClick(Sender: TObject);
     procedure DoHideAllClick(Sender: TObject);
     procedure DoDragDrop(Sender, Source: TObject; X, Y: Integer);
@@ -173,7 +174,7 @@ procedure TSimbaFunctionListPage.AddDecl(ParentNode: TTreeNode; Decl: TDeclarati
 begin
   if (Decl.Name = '') then
     Exit;
-  if (ANodeType = ntSimbaDecl) and ((Decl is TDeclaration_Method) and ((Decl.Name[1] = '_') or TDeclaration_Method(Decl).isOverride)) then
+  if (ANodeType = ntSimbaDecl) and ((Decl is TDeclaration_Method) and ((Decl.Name[1] = '_') or TDeclaration_Method(Decl).isOverride or TDeclaration_Method(Decl).isOperator)) then
     Exit;
 
   Node := FTreeView.AddNode(ParentNode, Decl.Name);
@@ -222,7 +223,7 @@ procedure TSimbaFunctionListPage.AddSimbaNode;
       AddDecl(ParentNode, Decl, ntSimbaDecl);
   end;
 
-  FSimbaNode.AlphaSort();
+  //FSimbaNode.AlphaSort();
   FSimbaNode.Expanded := True;
 
   DoHiddenSimbaSectionsChange(SimbaSettings.FunctionList.HiddenSimbaSections);
@@ -359,16 +360,9 @@ procedure TSimbaFunctionListPage.DoCustomOrderChange(Setting: TSimbaSetting);
   I: Integer;
 begin
   Order := String(Setting.Value).Split(',');
-
-  // will need to be re done when anything changes, just easier
-  if (Length(Order) <> FSimbaNode.Count) then
-    Exit;
   for I := 0 to High(Order) do
-    if (FSimbaNode.FindNode(Order[I]) = nil) then
-      Exit;
-
-  for I := 0 to High(Order) do
-    FSimbaNode.FindNode(Order[I]).Index := I;
+    if (FSimbaNode.FindNode(Order[I]) <> nil) and (I < FSimbaNode.Count) then
+      FSimbaNode.FindNode(Order[I]).Index := I;
 end;
 
 procedure TSimbaFunctionListPage.DoEditorModified(Sender: TObject);
@@ -471,6 +465,16 @@ procedure TSimbaFunctionListPage.DoMouseOverTooltipClick(Sender: TObject);
   SimbaSettings.FunctionList.ShowMouseoverHint.Value := TMenuItem(Sender).Checked;
 end;
 
+procedure TSimbaFunctionListPage.DoCollapseAllClick(Sender: TObject);
+begin
+  FTreeView.FullCollapse();
+
+  FScriptNode.Expanded := True;
+  FIncludesNode.Expanded := True;
+  FPluginsNode.Expanded := True;
+  FSimbaNode.Expanded := True;
+end;
+
 procedure TSimbaFunctionListPage.DoShowAllClick(Sender: TObject);
 begin
   SimbaSettings.FunctionList.HiddenSimbaSections.Value := '';
@@ -592,6 +596,7 @@ constructor TSimbaFunctionListPage.Create(AOwner: TComponent);
   Add('Open Simba Documentation', @DoOpenSimbaDocClick, False, False, IMG_SIMBA);
   Add('Show Mouse-over tooltip', @DoMouseOverTooltipClick, True, SimbaSettings.FunctionList.ShowMouseoverHint.Value);
   AddLine();
+  Add('Collapse all', @DoCollapseAllClick);
   Add('Show all', @DoShowAllClick);
   Add('Hide all', @DoHideAllClick);
 
@@ -826,4 +831,3 @@ procedure TSimbaFunctionListForm.DoDoubleClickSplitter(Sender: TObject);
 {$R *.lfm}
 
 end.
-

Source/ide/simba.form_main.pas

@@ -609,7 +609,7 @@ procedure TSimbaMainForm.Setup;
   BeginFormUpdate();
   try
     DockMaster.BeginUpdate();
-    DockMaster.SplitterWidth := Scale96ToScreen(8);
+    DockMaster.SplitterWidth := Scale96ToScreen(6);
     DockMaster.HeaderClass := TSimbaAnchorDockHeader;
     DockMaster.SplitterClass := TSimbaAnchorDockSplitter;
     DockMaster.SiteClass := TSimbaAnchorDockHostSite;

Source/ide/simba.frame_settings_general.lfm

@@ -1,11 +1,11 @@
 object SimbaGeneralFrame: TSimbaGeneralFrame
   Left = 0
-  Height = 784
+  Height = 1045
   Top = 0
-  Width = 1121
-  ClientHeight = 784
-  ClientWidth = 1121
-  DesignTimePPI = 144
+  Width = 1495
+  ClientHeight = 1045
+  ClientWidth = 1495
+  DesignTimePPI = 192
   ParentFont = False
   TabOrder = 0
   DesignLeft = 3939
@@ -18,19 +18,19 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Side = asrBottom
-    Left = 234
+    Left = 215
     Height = 31
-    Top = 129
-    Width = 869
+    Top = 134
+    Width = 1256
     Max = 32
     Min = 12
     PageSize = 1
     Position = 12
     OnChange = ToolbarSizeTrackBarChange
     Align = alCustom
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Top = 12
-    BorderSpacing.Right = 18
+    BorderSpacing.Top = 16
+    BorderSpacing.Right = 24
     Color = 3487029
     ParentColor = False
     TabOrder = 0
@@ -43,17 +43,17 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = FontSizeLabel
     AnchorSideBottom.Side = asrBottom
-    Left = 234
+    Left = 215
     Height = 31
     Top = 0
-    Width = 869
+    Width = 1256
     Max = 24
-    Min = 8
+    Min = 7
     Position = 8
     OnChange = FontSizeTrackBarChange
     Align = alCustom
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Right = 18
+    BorderSpacing.Right = 24
     Color = 3487029
     ParentColor = False
     TabOrder = 1
@@ -66,7 +66,7 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     Left = 0
     Height = 31
     Top = 0
-    Width = 107
+    Width = 98
     Align = alCustom
     Anchors = [akTop, akLeft, akBottom]
     Caption = 'Font Size'
@@ -80,8 +80,8 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideBottom.Side = asrBottom
     Left = 0
     Height = 31
-    Top = 129
-    Width = 47
+    Top = 134
+    Width = 43
     Anchors = [akTop, akLeft, akBottom]
     Caption = 'Size'
     Layout = tlCenter
@@ -94,17 +94,17 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 234
-    Height = 37
-    Top = 335
-    Width = 857
+    Left = 215
+    Height = 49
+    Top = 341
+    Width = 1240
     Max = 38
     Min = 8
     Position = 10
     OnChange = ToolbarSizeTrackBarChange
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Top = 12
-    BorderSpacing.Right = 30
+    BorderSpacing.Top = 16
+    BorderSpacing.Right = 40
     Color = 3487029
     ParentColor = False
     TabOrder = 2
@@ -116,16 +116,16 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 234
-    Height = 37
-    Top = 384
-    Width = 857
+    Left = 215
+    Height = 49
+    Top = 406
+    Width = 1240
     Min = 1
     Position = 10
     OnChange = DoScrollBarArrowTrackBarChange
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Top = 12
-    BorderSpacing.Right = 30
+    BorderSpacing.Top = 16
+    BorderSpacing.Right = 40
     Color = 3487029
     ParentColor = False
     TabOrder = 3
@@ -136,9 +136,9 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideBottom.Control = ScrollBarSizeTrackBar
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 37
-    Top = 335
-    Width = 47
+    Height = 49
+    Top = 341
+    Width = 43
     Anchors = [akTop, akLeft, akBottom]
     Caption = 'Size'
     Layout = tlCenter
@@ -150,9 +150,9 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideBottom.Control = ScrollBarArrowSizeTrackBar
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 37
-    Top = 384
-    Width = 125
+    Height = 49
+    Top = 406
+    Width = 112
     Anchors = [akTop, akLeft, akBottom]
     Caption = 'Arrow Size'
     Layout = tlCenter
@@ -165,21 +165,21 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 37
-    Top = 286
-    Width = 1121
+    Height = 32
+    Top = 293
+    Width = 1495
     Caption = 'Scroll Bar'
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Top = 12
+    BorderSpacing.Top = 16
     Style = gsHorLines
   end
   object PlaceholderLabel: TLabel
     AnchorSideLeft.Control = Owner
     Left = 0
-    Height = 37
-    Top = 720
-    Width = 227
-    BorderSpacing.Right = 7
+    Height = 32
+    Top = 960
+    Width = 206
+    BorderSpacing.Right = 9
     Caption = 'Image Size: Default'
     ParentColor = False
   end
@@ -190,24 +190,24 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 37
-    Top = 80
-    Width = 1121
+    Height = 32
+    Top = 86
+    Width = 1495
     Caption = 'Tool Bar'
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Top = 6
+    BorderSpacing.Top = 8
     Style = gsHorLines
   end
   object ToolbarPositionComboBox: TComboBox
     AnchorSideLeft.Control = ToolbarSizeTrackBar
     AnchorSideTop.Control = ToolbarSizeTrackBar
     AnchorSideTop.Side = asrBottom
-    Left = 234
-    Height = 45
-    Top = 172
-    Width = 302
-    BorderSpacing.Top = 12
-    ItemHeight = 37
+    Left = 215
+    Height = 40
+    Top = 181
+    Width = 403
+    BorderSpacing.Top = 16
+    ItemHeight = 32
     ItemIndex = 0
     Items.Strings = (
       'Top (Default)'
@@ -224,9 +224,9 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideBottom.Control = ToolbarPositionComboBox
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 45
-    Top = 172
-    Width = 95
+    Height = 40
+    Top = 181
+    Width = 84
     Anchors = [akTop, akLeft, akBottom]
     Caption = 'Position'
     Layout = tlCenter
@@ -238,12 +238,12 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = ToolbarPositionComboBox
     AnchorSideRight.Side = asrBottom
-    Left = 234
-    Height = 45
-    Top = 229
-    Width = 302
+    Left = 215
+    Height = 40
+    Top = 237
+    Width = 403
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Top = 12
+    BorderSpacing.Top = 16
     MaxValue = 40
     TabOrder = 5
     OnChange = ToolbarSpacingSpinEditChange
@@ -254,9 +254,9 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideBottom.Control = ToolbarSpacingSpinEdit
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 45
-    Top = 229
-    Width = 94
+    Height = 40
+    Top = 237
+    Width = 84
     Anchors = [akTop, akLeft, akBottom]
     Caption = 'Spacing'
     Layout = tlCenter
@@ -269,8 +269,8 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideBottom.Side = asrBottom
     Left = 0
     Height = 31
-    Top = 43
-    Width = 128
+    Top = 47
+    Width = 116
     Align = alCustom
     Anchors = [akTop, akLeft, akBottom]
     Caption = 'Image Size'
@@ -286,18 +286,18 @@ object SimbaGeneralFrame: TSimbaGeneralFrame
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = ImageSizeLabel
     AnchorSideBottom.Side = asrBottom
-    Left = 234
+    Left = 215
     Height = 31
-    Top = 43
-    Width = 869
+    Top = 47
+    Width = 1256
     Max = 32
     Min = 15
     Position = 15
     OnChange = ImageSizeTrackBarChange
     Align = alCustom
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Top = 12
-    BorderSpacing.Right = 18
+    BorderSpacing.Top = 16
+    BorderSpacing.Right = 24
     Color = 3487029
     ParentColor = False
     TabOrder = 6