more scaling adjustments

lazproj/coedit.lpi

@@ -13,7 +13,7 @@
         <DpiAware Value="True/PM"/>
       </XPManifest>
       <Icon Value="0"/>
-      <Resources Count="364">
+      <Resources Count="373">
         <Resource_0 FileName="..\icons\arrow\arrow_up.png" Type="RCDATA" ResourceName="ARROW_UP"/>
         <Resource_1 FileName="..\icons\arrow\arrow_down.png" Type="RCDATA" ResourceName="ARROW_DOWN"/>
         <Resource_2 FileName="..\icons\arrow\arrow_divide.png" Type="RCDATA" ResourceName="ARROW_DIVIDE"/>
@@ -378,6 +378,15 @@
         <Resource_361 FileName="../icons/other/indent_less.png" Type="RCDATA" ResourceName="INDENT_LESS"/>
         <Resource_362 FileName="../icons/book/book_grey32.png" Type="RCDATA" ResourceName="BOOK_GREY32"/>
         <Resource_363 FileName="../icons/book/book_grey24.png" Type="RCDATA" ResourceName="BOOK_GREY24"/>
+        <Resource_364 FileName="../icons/other/shortcuts.png" Type="RCDATA" ResourceName="SHORTCUTS"/>
+        <Resource_365 FileName="../icons/other/shortcuts24.png" Type="RCDATA" ResourceName="SHORTCUTS24"/>
+        <Resource_366 FileName="../icons/other/shortcuts32.png" Type="RCDATA" ResourceName="SHORTCUTS32"/>
+        <Resource_367 FileName="../icons/other/html_go.png" Type="RCDATA" ResourceName="HTML_GO"/>
+        <Resource_368 FileName="../icons/other/html_go24.png" Type="RCDATA" ResourceName="HTML_GO24"/>
+        <Resource_369 FileName="../icons/other/html_go32.png" Type="RCDATA" ResourceName="HTML_GO32"/>
+        <Resource_370 FileName="../icons/folder/move_to_folder.png" Type="RCDATA" ResourceName="MOVE_TO_FOLDER"/>
+        <Resource_371 FileName="../icons/folder/move_to_folder24.png" Type="RCDATA" ResourceName="MOVE_TO_FOLDER24"/>
+        <Resource_372 FileName="../icons/folder/move_to_folder32.png" Type="RCDATA" ResourceName="MOVE_TO_FOLDER32"/>
       </Resources>
     </General>
     <i18n>

src/ce_d2synpresets.pas

@@ -101,6 +101,10 @@ type
     procedure updateEditor;
   protected
     procedure SetVisible(Value: Boolean); override;
+  private
+    fCloneBtn: TBitBtn;
+    fAddBtn: TBitBtn;
+    fDelBtn: TBitBtn;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -288,9 +292,30 @@ begin
     fEditor.Font.Assign(EditorOptions.font);
     fEditor.Font.Size:=12;
     fEditor.Font.Name:=EditorOptions.font.Name;
+    fEditor.Height:= scaleY(160,96);
     if firstTime then
       fList.ItemIndex := 0;
     lstBoxSelChange(nil);
+    case GetIconScaledSize of
+      iss16:
+      begin
+        AssignPng(fAddBtn, 'DOCUMENT_ADD');
+        AssignPng(fDelBtn, 'DOCUMENT_DELETE');
+        AssignPng(fCloneBtn, 'DOCUMENT_PLUS');
+      end;
+      iss24:
+      begin
+        AssignPng(fAddBtn, 'DOCUMENT_ADD24');
+        AssignPng(fDelBtn, 'DOCUMENT_DELETE24');
+        AssignPng(fCloneBtn, 'DOCUMENT_PLUS24');
+      end;
+      iss32:
+      begin
+        AssignPng(fAddBtn, 'DOCUMENT_ADD32');
+        AssignPng(fDelBtn, 'DOCUMENT_DELETE32');
+        AssignPng(fCloneBtn, 'DOCUMENT_PLUS32');
+      end;
+    end;
   end;
 end;
 
@@ -554,47 +579,29 @@ begin
   fList.AutoSize := true;
   updateList;
 
-  //TODO-cbugfix: always iss16 is returned at this point (order of init problem ?)
-  isc := GetIconScaledSize;
+  fAddBtn := TBitBtn.Create(self);
+  fAddBtn.Parent := pnl;
+  fAddBtn.AutoSize := true;
+  fAddBtn.Width:= ScaleX(28,96);
+  fAddBtn.Align:= alRight;
+  fAddBtn.OnClick:=@btnAddClick;
+  fAddBtn.Hint:='add preset';
 
-  btn := TBitBtn.Create(self);
-  btn.Parent := pnl;
-  btn.AutoSize := true;
-  btn.Width:= ScaleX(28,96);
-  btn.Align:= alRight;
-  btn.OnClick:=@btnAddClick;
-  btn.Hint:='add preset';
-  case isc of
-    iss16: AssignPng(btn, 'DOCUMENT_ADD');
-    iss24: AssignPng(btn, 'DOCUMENT_ADD24');
-    iss32: AssignPng(btn, 'DOCUMENT_ADD32');
-  end;
+  fDelBtn := TBitBtn.Create(self);
+  fDelBtn.Parent := pnl;
+  fDelBtn.AutoSize := true;
+  fDelBtn.Width:= ScaleX(28,96);
+  fDelBtn.Align:= alRight;
+  fDelBtn.OnClick:=@btnDelClick;
+  fDelBtn.Hint:='delete preset';
 
-  btn := TBitBtn.Create(self);
-  btn.Parent := pnl;
-  btn.AutoSize := true;
-  btn.Width:= ScaleX(28,96);
-  btn.Align:= alRight;
-  btn.OnClick:=@btnDelClick;
-  btn.Hint:='delete preset';
-  case isc of
-    iss16: AssignPng(btn, 'DOCUMENT_DELETE');
-    iss24: AssignPng(btn, 'DOCUMENT_DELETE24');
-    iss32: AssignPng(btn, 'DOCUMENT_DELETE32');
-  end;
-
-  btn := TBitBtn.Create(self);
-  btn.Parent := pnl;
-  btn.AutoSize := true;
-  btn.Width:= ScaleX(28,96);
-  btn.Align:= alRight;
-  btn.OnClick:=@btnCloneClick;
-  btn.Hint:='clone preset';
-  case isc of
-    iss16: AssignPng(btn, 'DOCUMENT_PLUS');
-    iss24: AssignPng(btn, 'DOCUMENT_PLUS24');
-    iss32: AssignPng(btn, 'DOCUMENT_PLUS32');
-  end;
+  fCloneBtn := TBitBtn.Create(self);
+  fCloneBtn.Parent := pnl;
+  fCloneBtn.AutoSize := true;
+  fCloneBtn.Width:= ScaleX(28,96);
+  fCloneBtn.Align:= alRight;
+  fCloneBtn.OnClick:=@btnCloneClick;
+  fCloneBtn.Hint:='clone preset';
 
   fPropEd := TTIPropertyGrid.Create(self);
   fPropEd.Parent := self;
@@ -603,7 +610,6 @@ begin
   fPropEd.OnModified:=@propEdModified;
   fPropEd.CheckboxForBoolean:=true;
   fPropEd.PropertyEditorHook.AddHandlerModified(@propEdModified);
-  fPropEd.DefaultItemHeight:=ScaleY(22, 96);
 
   fList.ItemIndex := 0;
   EntitiesConnector.addObserver(self);

src/ce_dfmt.lfm

@@ -17,6 +17,7 @@ inherited CEDfmtWidget: TCEDfmtWidget
     ClientWidth = 450
     inherited Content: TPanel
       Height = 321
+      Top = 36
       Width = 450
       ClientHeight = 321
       ClientWidth = 450
@@ -59,6 +60,7 @@ inherited CEDfmtWidget: TCEDfmtWidget
           AutoSize = True
           BorderSpacing.Left = 2
           BorderSpacing.Around = 2
+          Flat = True
         end
         object btnApply: TSpeedButton
           Left = 435
@@ -70,6 +72,7 @@ inherited CEDfmtWidget: TCEDfmtWidget
           AutoSize = True
           BorderSpacing.Left = 2
           BorderSpacing.Around = 2
+          Flat = True
         end
       end
     end

src/ce_dfmt.pas

@@ -128,6 +128,7 @@ begin
   end;
 
   dfmtOptionEditor.TIObject := fDmtWrapper;
+  dfmtOptionEditor.DefaultItemHeight:=scaleY(24,96);
 end;
 
 destructor TCEDfmtWidget.destroy;

src/ce_main.pas

@@ -145,7 +145,6 @@ type
     actEdUnIndent: TAction;
     Actions: TActionList;
     ApplicationProperties1: TApplicationProperties;
-    imgList: TImageList;
     mainMenu: TMainMenu;
     MenuItem1: TMenuItem;
     MenuItem10: TMenuItem;
@@ -1421,6 +1420,12 @@ begin
 
   i := LoadIcon('INDENT_LESS');
   actEdUnIndent.ImageIndex:= i;
+
+  i := LoadIcon('HTML_GO');
+  actFileHtmlExport.ImageIndex:=i;
+
+  i := LoadIcon('MOVE_TO_FOLDER');
+  actFileAddToProj.ImageIndex:=i;
 end;
 
 procedure TCEMainForm.InitWidgets;

src/ce_optionseditor.lfm

@@ -1,37 +1,38 @@
 inherited CEOptionEditorWidget: TCEOptionEditorWidget
   Left = 594
-  Height = 493
+  Height = 514
   Top = 257
-  Width = 575
+  Width = 637
   BorderIcons = [biSystemMenu, biMinimize, biMaximize]
   Caption = 'Options editor'
-  ClientHeight = 493
-  ClientWidth = 575
+  ClientHeight = 514
+  ClientWidth = 637
   OnCloseQuery = FormCloseQuery
   inherited Back: TPanel
-    Height = 493
-    Width = 575
-    ClientHeight = 493
-    ClientWidth = 575
+    Height = 514
+    Width = 637
+    ClientHeight = 514
+    ClientWidth = 637
     inherited Content: TPanel
-      Height = 457
-      Width = 575
-      ClientHeight = 457
-      ClientWidth = 575
+      Height = 478
+      Top = 36
+      Width = 637
+      ClientHeight = 478
+      ClientWidth = 637
       object pnlBody: TPanel[0]
         Left = 4
-        Height = 431
+        Height = 452
         Top = 4
-        Width = 567
+        Width = 629
         Align = alClient
         BorderSpacing.Around = 4
         BevelOuter = bvNone
-        ClientHeight = 431
-        ClientWidth = 567
+        ClientHeight = 452
+        ClientWidth = 629
         TabOrder = 0
         object selCat: TTreeView
           Left = 0
-          Height = 431
+          Height = 452
           Top = 0
           Width = 182
           Align = alLeft
@@ -48,19 +49,19 @@ inherited CEOptionEditorWidget: TCEOptionEditorWidget
         end
         object pnlEd: TPanel
           Left = 188
-          Height = 431
+          Height = 452
           Top = 0
-          Width = 379
+          Width = 441
           Align = alClient
           BevelOuter = bvNone
-          ClientHeight = 431
-          ClientWidth = 379
+          ClientHeight = 452
+          ClientWidth = 441
           TabOrder = 1
           object inspector: TTIPropertyGrid
             Left = 0
-            Height = 431
+            Height = 452
             Top = 0
-            Width = 379
+            Width = 441
             Align = alClient
             CheckboxForBoolean = False
             DefaultValueFont.Color = clWindowText
@@ -76,7 +77,7 @@ inherited CEOptionEditorWidget: TCEOptionEditorWidget
         end
         object Splitter1: TSplitter
           Left = 182
-          Height = 431
+          Height = 452
           Top = 0
           Width = 6
         end
@@ -84,17 +85,17 @@ inherited CEOptionEditorWidget: TCEOptionEditorWidget
       object pnlFooter: TPanel[1]
         Left = 4
         Height = 14
-        Top = 439
-        Width = 567
+        Top = 460
+        Width = 629
         Align = alBottom
         AutoSize = True
         BorderSpacing.Around = 4
         BevelOuter = bvLowered
         ClientHeight = 14
-        ClientWidth = 567
+        ClientWidth = 629
         TabOrder = 1
         object btnCancel: TSpeedButton
-          Left = 548
+          Left = 610
           Height = 4
           Hint = 'cancel and revert the modifications of the category'
           Top = 5
@@ -103,10 +104,11 @@ inherited CEOptionEditorWidget: TCEOptionEditorWidget
           AutoSize = True
           BorderSpacing.Left = 2
           BorderSpacing.Around = 4
+          Flat = True
           OnClick = btnCancelClick
         end
         object btnAccept: TSpeedButton
-          Left = 558
+          Left = 620
           Height = 4
           Hint = 'accept the modifications of the category'
           Top = 5
@@ -115,12 +117,13 @@ inherited CEOptionEditorWidget: TCEOptionEditorWidget
           AutoSize = True
           BorderSpacing.Left = 2
           BorderSpacing.Around = 4
+          Flat = True
           OnClick = btnAcceptClick
         end
       end
     end
     inherited toolbar: TCEToolBar
-      Width = 567
+      Width = 629
     end
   end
   inherited contextMenu: TPopupMenu

src/ce_optionseditor.pas

@@ -76,8 +76,6 @@ begin
   inspector.DefaultItemHeight := scaleY(22, 96);
   selCat.Width := ScaleX(180, 96);
   width := ScaleX(600, 96);
-  inspector.SplitterX := inspector.width div 2 + ScaleX(20, 96);
-  inspector.PreferredSplitterX := inspector.SplitterX;
 
   case GetIconScaledSize of
     iss16:
@@ -110,7 +108,12 @@ end;
 procedure TCEOptionEditorWidget.UpdateShowing;
 begin
   inherited;
-  if Visible then updateCategories;
+  if Visible then
+  begin
+    updateCategories;
+    inspector.SplitterX := inspector.width div 2;
+    inspector.PreferredSplitterX := inspector.SplitterX;
+  end;
 end;
 {$ENDREGION}
 

src/ce_shortcutseditor.lfm

@@ -1,26 +1,28 @@
 object CEShortcutEditor: TCEShortcutEditor
   Left = 0
-  Height = 432
+  Height = 449
   Top = 0
   Width = 424
-  ClientHeight = 432
+  AutoSize = True
+  ClientHeight = 449
   ClientWidth = 424
   TabOrder = 0
   DesignLeft = 1365
   DesignTop = 176
   object Panel1: TPanel
     Left = 0
-    Height = 432
+    Height = 449
     Top = 0
     Width = 424
     Align = alClient
+    AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 432
+    ClientHeight = 449
     ClientWidth = 424
     TabOrder = 0
     object fltItems: TTreeFilterEdit
       Left = 2
-      Height = 25
+      Height = 27
       Top = 2
       Width = 420
       OnFilterItem = fltItemsFilterItem
@@ -34,8 +36,8 @@ object CEShortcutEditor: TCEShortcutEditor
     end
     object tree: TTreeView
       Left = 2
-      Height = 347
-      Top = 31
+      Height = 373
+      Top = 33
       Width = 420
       Align = alClient
       AutoExpand = True
@@ -51,19 +53,18 @@ object CEShortcutEditor: TCEShortcutEditor
     end
     object Panel2: TPanel
       Left = 2
-      Height = 50
-      Top = 380
+      Height = 39
+      Top = 408
       Width = 420
       Align = alBottom
-      AutoSize = True
       BorderSpacing.Around = 2
       BevelOuter = bvNone
-      ClientHeight = 50
+      ClientHeight = 39
       ClientWidth = 420
       TabOrder = 2
       object btnClear: TSpeedButton
         Left = 2
-        Height = 46
+        Height = 35
         Hint = 'clear shortcut'
         Top = 2
         Width = 4
@@ -75,7 +76,7 @@ object CEShortcutEditor: TCEShortcutEditor
       end
       object propedit: TTIPropertyGrid
         Left = 14
-        Height = 50
+        Height = 39
         Top = 0
         Width = 406
         Align = alClient
@@ -85,11 +86,13 @@ object CEShortcutEditor: TCEShortcutEditor
         Indent = 10
         NameFont.Color = clWindowText
         OnModified = propeditModified
+        PreferredSplitterX = 200
+        SplitterX = 200
         ValueFont.Color = clMaroon
       end
       object btnEdit: TSpeedButton
         Left = 8
-        Height = 46
+        Height = 35
         Hint = 'edit selected shortcut'
         Top = 2
         Width = 4

src/ce_shortcutseditor.pas

@@ -76,7 +76,9 @@ type
     fBackup: TShortCutCollection;
     fHasChanged: boolean;
     propvalue: TEditableShortcut;
+    fHasScaled: boolean;
     //
+    procedure updateScaling;
     function optionedWantCategory(): string;
     function optionedWantEditorKind: TOptionEditorKind;
     function optionedWantContainer: TPersistent;
@@ -185,12 +187,9 @@ begin
   fObservers := TCEEditableShortCutSubject.create;
   fShortcuts := TShortCutCollection.create(self);
   fBackup := TShortCutCollection.create(self);
-  AssignPng(btnClear, 'CLEAN');
-  AssignPng(btnEdit, 'KEYBOARD_PENCIL');
   EntitiesConnector.addObserver(self);
   propedit.TIObject := propvalue;
   propedit.PropertyEditorHook.AddHandlerModified(@propeditModified);
-  propedit.DefaultItemHeight:= scaleY(22, 96);
 end;
 
 destructor TCEShortcutEditor.destroy;
@@ -200,6 +199,36 @@ begin
   inherited;
 end;
 
+procedure TCEShortcutEditor.updateScaling;
+begin
+  if fHasScaled then
+    exit;
+  fHasScaled := true;
+  case GetIconScaledSize of
+    iss16:
+    begin
+      AssignPng(btnClear, 'CLEAN');
+      AssignPng(btnEdit, 'SHORTCUTS');
+      AssignPng(fltItems.Glyph, 'FILTER_CLEAR')
+    end;
+    iss24:
+    begin
+      AssignPng(btnClear, 'CLEAN24');
+      AssignPng(btnEdit, 'SHORTCUTS24');
+      AssignPng(fltItems.Glyph, 'FILTER_CLEAR24')
+    end;
+    iss32:
+    begin
+      AssignPng(btnClear, 'CLEAN32');
+      AssignPng(btnEdit, 'SHORTCUTS32');
+      AssignPng(fltItems.Glyph, 'FILTER_CLEAR32')
+    end;
+  end;
+  panel2.Height:=scaleY(30, 96);
+  propedit.DefaultItemHeight:= scaleY(26, 96);
+  propedit.BuildPropertyList();
+end;
+
 function TCEShortcutEditor.anItemIsSelected: boolean;
 begin
   result := true;
@@ -221,6 +250,7 @@ end;
 
 function TCEShortcutEditor.optionedWantContainer: TPersistent;
 begin
+  updateScaling;
   receiveShortcuts;
   exit(self);
 end;