Menu
▾
▴
[GExperts-Checkins] SF.net SVN: gexperts:[4283] branches/dark-mode
|
From: <aka...@us...> - 2024-07-06 20:25:02
|
Revision: 4283
http://sourceforge.net/p/gexperts/code/4283
Author: akalwahome
Date: 2024-07-06 20:24:59 +0000 (Sat, 06 Jul 2024)
Log Message:
-----------
Merged changes from trunk.
Some more changes to support dark mode.
Modified Paths:
--------------
branches/dark-mode/ExternalSource/FileView.pas
branches/dark-mode/Source/Editor/GX_eAlign.pas
branches/dark-mode/Source/Editor/GX_eConvertStrings.pas
branches/dark-mode/Source/Editor/GX_eDate.dfm
branches/dark-mode/Source/Editor/GX_eSort.pas
branches/dark-mode/Source/Editor/GX_eSortOptions.dfm
branches/dark-mode/Source/Editor/GX_eSortOptions.pas
branches/dark-mode/Source/FavoriteFiles/GX_FavFileProp.dfm
branches/dark-mode/Source/FavoriteFiles/GX_FavFileProp.pas
branches/dark-mode/Source/FavoriteFiles/GX_FavFiles.dfm
branches/dark-mode/Source/FavoriteFiles/GX_FavFiles.pas
branches/dark-mode/Source/FavoriteFiles/GX_FavFolderProp.dfm
branches/dark-mode/Source/FavoriteFiles/GX_FavNewFolder.pas
branches/dark-mode/Source/FilterExceptions/GX_FilterExceptionsNotification.pas
branches/dark-mode/Source/Framework/GX_BaseForm.pas
branches/dark-mode/Source/Framework/GX_ConfigurationInfo.pas
branches/dark-mode/Source/Grep/GX_GrepSearch.dfm
branches/dark-mode/Source/Grep/GX_GrepSearch.pas
branches/dark-mode/Source/IDE/GX_IdeSearchPathEnhancer.pas
branches/dark-mode/Source/Include/GX_CondDefine.inc
branches/dark-mode/Source/MacroLibrary/GX_MacroLibrary.dfm
branches/dark-mode/Source/MacroLibrary/GX_MacroLibrary.pas
branches/dark-mode/Source/ReplaceComponents/GX_ReplaceComp.dfm
branches/dark-mode/Source/ReplaceComponents/GX_ReplaceComp.pas
branches/dark-mode/Source/Utils/GX_OtaUtils.pas
Property Changed:
----------------
branches/dark-mode/
Index: branches/dark-mode
===================================================================
--- branches/dark-mode 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode 2024-07-06 20:24:59 UTC (rev 4283)
Property changes on: branches/dark-mode
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4085-4273
\ No newline at end of property
+/trunk:4085-4282
\ No newline at end of property
Modified: branches/dark-mode/ExternalSource/FileView.pas
===================================================================
--- branches/dark-mode/ExternalSource/FileView.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/ExternalSource/FileView.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -36,7 +36,8 @@
implementation
uses
- Controls, Forms, Graphics, StdCtrls, SysUtils, GX_OtaUtils, GX_StringList;
+ Controls, Forms, Graphics, StdCtrls, SysUtils,
+ GX_OtaUtils, GX_StringList;
constructor TFileViewer.Create(AOwner: TComponent);
begin
@@ -77,6 +78,7 @@
Gutter.Width := 0;
Visible := False;
end;
+ GxOtaGetEditorFont(FEditor.Font, -1);
{$ENDIF SYNEDIT}
end;
end;
@@ -124,10 +126,11 @@
finally
FreeAndNil(Strings);
end;
- begin
- SetSynEditHighlighter(FEditor, Parser);
- FGXSyntaxParser := Parser;
- end;
+ if Parser > gxpNone then
+ GxOtaGetEditorFont(FEditor.Font, -1);
+
+ SetSynEditHighlighter(FEditor, Parser);
+ FGXSyntaxParser := Parser;
FEditor.Visible := True;
end;
{$ENDIF SYNEDIT}
@@ -174,6 +177,9 @@
{$IFDEF SYNEDIT}
FEditor.Visible := False;
{$ENDIF SYNEDIT}
+// TODO: Use IDE's editor font?
+// FRichEdit.Font.Name := '';
+// FRichEdit.DefAttributes.Name := '';
FRichEdit.Lines.LoadFromFile(FileName);
FRichEdit.Visible := True;
end
Modified: branches/dark-mode/Source/Editor/GX_eAlign.pas
===================================================================
--- branches/dark-mode/Source/Editor/GX_eAlign.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/Editor/GX_eAlign.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -19,6 +19,7 @@
cbxMode: TComboBox;
procedure lstTokensDblClick(Sender: TObject);
procedure btnConfigClick(Sender: TObject);
+ procedure FormCreate(Sender: TObject);
public
constructor Create(_Owner: TComponent); override;
end;
@@ -269,6 +270,12 @@
InitDpiScaler;
end;
+procedure TfmAlign.FormCreate(Sender: TObject);
+begin
+ inherited;
+ SetDefaultFont(Self);
+end;
+
procedure TfmAlign.lstTokensDblClick(Sender: TObject);
begin
ModalResult := mrOk;
@@ -283,6 +290,9 @@
frm := TfmAlign.Create(nil);
try
+ if frm.lstTokens.Count > 0 then
+ frm.ActiveControl := frm.lstTokens;
+ frm.btnOK.Default := True;
LoadConfiguration(frm);
if frm.lstTokens.Items.Count > 0 then
frm.ActiveControl := frm.lstTokens;
Modified: branches/dark-mode/Source/Editor/GX_eConvertStrings.pas
===================================================================
--- branches/dark-mode/Source/Editor/GX_eConvertStrings.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/Editor/GX_eConvertStrings.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -149,10 +149,10 @@
inherited;
TControl_SetMinConstraints(Self);
+ InitDpiScaler;
+
GxOtaGetEditorFont(m_Input.Font, 0);
GxOtaGetEditorFont(m_Output.Font, 0);
-
- InitDpiScaler;
end;
destructor TfmEConvertStrings.Destroy;
Modified: branches/dark-mode/Source/Editor/GX_eDate.dfm
===================================================================
--- branches/dark-mode/Source/Editor/GX_eDate.dfm 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/Editor/GX_eDate.dfm 2024-07-06 20:24:59 UTC (rev 4283)
@@ -1,4 +1,4 @@
-object fmDateFormat: TfmDateFormat
+inherited fmDateFormat: TfmDateFormat
Left = 285
Top = 201
BorderStyle = bsDialog
@@ -5,21 +5,15 @@
Caption = 'Insert Date/Time Configuration'
ClientHeight = 74
ClientWidth = 337
- Color = clBtnFace
- Font.Charset = ANSI_CHARSET
- Font.Color = clWindowText
- Font.Height = -12
- Font.Name = 'Tahoma'
- Font.Style = []
- Position = poScreenCenter
- Scaled = False
+ Position = poOwnerFormCenter
+ StyleElements = [seFont, seClient, seBorder]
PixelsPerInch = 96
- TextHeight = 14
+ TextHeight = 15
object lblFormat: TLabel
- Left = 17
+ Left = 20
Top = 13
- Width = 95
- Height = 14
+ Width = 92
+ Height = 15
Alignment = taRightJustify
Caption = 'Date/time &format'
FocusControl = cbFormat
@@ -26,11 +20,10 @@
end
object cbFormat: TComboBox
Left = 120
- Top = 9
+ Top = 10
Width = 209
- Height = 22
+ Height = 23
DropDownCount = 18
- ItemHeight = 14
TabOrder = 0
Text = 'cbFormat'
Items.Strings = (
Modified: branches/dark-mode/Source/Editor/GX_eSort.pas
===================================================================
--- branches/dark-mode/Source/Editor/GX_eSort.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/Editor/GX_eSort.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -65,8 +65,13 @@
end;
constructor TfmeSortConfig.Create(_Owner: TComponent);
+var
+ LSpacer : Integer;
begin
inherited;
+ LSpacer := grpSort.Left;
+ Self.ClientWidth := grpSort.Width + (2 * LSpacer);
+ Self.ClientHeight := btnCancel.Top + btnCancel.Height + LSpacer;
TControl_SetMinConstraints(Self);
InitDpiScaler;
Modified: branches/dark-mode/Source/Editor/GX_eSortOptions.dfm
===================================================================
--- branches/dark-mode/Source/Editor/GX_eSortOptions.dfm 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/Editor/GX_eSortOptions.dfm 2024-07-06 20:24:59 UTC (rev 4283)
@@ -20,6 +20,7 @@
ItemHeight = 13
TabOrder = 0
OnClick = lbxGroupOrderClick
+ OnKeyDown = lbxGroupOrderKeyDown
end
object btnUp: TBitBtn
Left = 168
Modified: branches/dark-mode/Source/Editor/GX_eSortOptions.pas
===================================================================
--- branches/dark-mode/Source/Editor/GX_eSortOptions.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/Editor/GX_eSortOptions.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -27,6 +27,7 @@
procedure btnUpClick(Sender: TObject);
procedure btnDownClick(Sender: TObject);
procedure lbxGroupOrderClick(Sender: TObject);
+ procedure lbxGroupOrderKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
private
procedure GetData(_CustomPrefixOrder: TGXUnicodeStringList);
procedure SetData(_CustomPrefixOrder: TGXUnicodeStringList);
@@ -84,10 +85,16 @@
end;
constructor TfrmSortOptions.Create(_Owner: TComponent);
+var
+ LSpacer : Integer;
begin
inherited;
TControl_SetMinConstraints(Self);
+ LSpacer := grpSortOrder.Left;
+ Self.ClientWidth := grpSortOrder.Width + (2 * LSpacer);
+ Self.ClientHeight := btnCancel.Top + btnCancel.Height + LSpacer;
+
InitDpiScaler;
end;
@@ -114,5 +121,17 @@
EnableButtons;
end;
+procedure TfrmSortOptions.lbxGroupOrderKeyDown(Sender: TObject; var Key: Word;
+ Shift: TShiftState);
+begin
+ inherited;
+ if Shift = [ssCtrl] then begin
+ case Key of
+ VK_UP : begin btnUpClick(nil); Key := 0; end;
+ VK_DOWN : begin btnDownClick(nil); Key := 0; end;
+ end;
+ end;
+end;
+
end.
Modified: branches/dark-mode/Source/FavoriteFiles/GX_FavFileProp.dfm
===================================================================
--- branches/dark-mode/Source/FavoriteFiles/GX_FavFileProp.dfm 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/FavoriteFiles/GX_FavFileProp.dfm 2024-07-06 20:24:59 UTC (rev 4283)
@@ -3,54 +3,47 @@
Top = 192
BorderStyle = bsDialog
Caption = 'File Properties'
- ClientHeight = 249
+ ClientHeight = 272
ClientWidth = 464
Color = clBtnFace
- Font.Charset = ANSI_CHARSET
- Font.Color = clWindowText
- Font.Height = -12
- Font.Name = 'Tahoma'
- Font.Style = []
+ ParentFont = True
KeyPreview = True
- OldCreateOrder = False
Position = poScreenCenter
Scaled = False
OnActivate = FormActivate
DesignSize = (
464
- 249)
- PixelsPerInch = 96
- TextHeight = 14
+ 272)
+ TextHeight = 15
object pgeProperties: TPageControl
Left = 8
Top = 8
- Width = 447
- Height = 201
+ Width = 443
+ Height = 225
ActivePage = tabProperties
Anchors = [akLeft, akTop, akRight]
MultiLine = True
- TabIndex = 0
TabOrder = 0
TabStop = False
object tabProperties: TTabSheet
Caption = 'Properties'
DesignSize = (
- 439
- 172)
+ 435
+ 195)
object lblFile: TLabel
- Left = 71
- Top = 12
- Width = 17
- Height = 14
+ Left = 70
+ Top = 13
+ Width = 18
+ Height = 15
Alignment = taRightJustify
Caption = '&File'
FocusControl = edtFilename
end
object lblName: TLabel
- Left = 57
- Top = 76
- Width = 31
- Height = 14
+ Left = 56
+ Top = 78
+ Width = 32
+ Height = 15
Alignment = taRightJustify
Caption = '&Name'
FocusControl = edtName
@@ -57,9 +50,9 @@
end
object lblDescription: TLabel
Left = 28
- Top = 100
+ Top = 107
Width = 60
- Height = 14
+ Height = 15
Alignment = taRightJustify
Caption = '&Description'
FocusControl = edtDescription
@@ -66,7 +59,7 @@
end
object imgFileIcon: TImage
Left = 96
- Top = 34
+ Top = 37
Width = 32
Height = 32
Center = True
@@ -73,34 +66,34 @@
Transparent = True
end
object lblIcon: TLabel
- Left = 64
- Top = 44
- Width = 24
- Height = 14
+ Left = 65
+ Top = 45
+ Width = 23
+ Height = 15
Alignment = taRightJustify
Caption = 'Icon'
end
object lblExecuteType: TLabel
- Left = 14
- Top = 124
- Width = 74
- Height = 14
+ Left = 21
+ Top = 136
+ Width = 67
+ Height = 15
Alignment = taRightJustify
Caption = 'Execute &type'
FocusControl = cbxExecuteType
end
object lblExecuteUsing: TLabel
- Left = 11
- Top = 148
- Width = 77
- Height = 14
+ Left = 15
+ Top = 165
+ Width = 73
+ Height = 15
Alignment = taRightJustify
Caption = 'Execute &using'
FocusControl = edtExecuteUsing
end
object sbnFile: TButton
- Left = 412
- Top = 8
+ Left = 408
+ Top = 7
Width = 20
Height = 20
Anchors = [akTop, akRight]
@@ -109,8 +102,8 @@
OnClick = sbnFileClick
end
object sbnExecute: TButton
- Left = 412
- Top = 144
+ Left = 408
+ Top = 161
Width = 20
Height = 20
Anchors = [akTop, akRight]
@@ -120,27 +113,26 @@
end
object edtName: TEdit
Left = 96
- Top = 72
- Width = 316
- Height = 22
+ Top = 75
+ Width = 312
+ Height = 23
Anchors = [akLeft, akTop, akRight]
TabOrder = 2
end
object edtDescription: TEdit
Left = 96
- Top = 96
- Width = 316
- Height = 22
+ Top = 104
+ Width = 312
+ Height = 23
Anchors = [akLeft, akTop, akRight]
TabOrder = 3
end
object cbxExecuteType: TComboBox
Left = 96
- Top = 120
+ Top = 133
Width = 145
- Height = 22
+ Height = 23
Style = csDropDownList
- ItemHeight = 14
TabOrder = 4
OnClick = cbxExecuteTypeClick
Items.Strings = (
@@ -152,8 +144,8 @@
object edtFilename: TEdit
Left = 96
Top = 8
- Width = 316
- Height = 22
+ Width = 312
+ Height = 23
Anchors = [akLeft, akTop, akRight]
TabOrder = 0
OnExit = edtFilenameExit
@@ -160,9 +152,9 @@
end
object edtExecuteUsing: TEdit
Left = 96
- Top = 144
- Width = 316
- Height = 22
+ Top = 162
+ Width = 312
+ Height = 23
Anchors = [akLeft, akTop, akRight]
Enabled = False
TabOrder = 5
@@ -170,8 +162,8 @@
end
end
object btnCancel: TButton
- Left = 380
- Top = 216
+ Left = 376
+ Top = 239
Width = 75
Height = 26
Anchors = [akRight, akBottom]
@@ -181,8 +173,8 @@
TabOrder = 2
end
object btnOK: TButton
- Left = 299
- Top = 216
+ Left = 295
+ Top = 239
Width = 75
Height = 26
Anchors = [akRight, akBottom]
Modified: branches/dark-mode/Source/FavoriteFiles/GX_FavFileProp.pas
===================================================================
--- branches/dark-mode/Source/FavoriteFiles/GX_FavFileProp.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/FavoriteFiles/GX_FavFileProp.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -55,7 +55,11 @@
{$R *.dfm}
uses
- GX_FavFiles, GX_GenericUtils, GX_IdeUtils, u_dzVclUtils;
+ GX_FavFiles,
+ GX_GenericUtils,
+ GX_GxUtils,
+ GX_IdeUtils,
+ u_dzVclUtils;
{ TfmFavFileProp }
@@ -79,9 +83,10 @@
constructor TfmFavFileProp.Create(_Owner: TComponent);
begin
inherited;
-
TControl_SetMinConstraints(Self);
InitDpiScaler;
+ GxSetDefaultFont(Self);
+
InitializeForm;
end;
@@ -198,6 +203,9 @@
cbxExecuteType.Items.Clear;
for ExecType := Low(TExecType) to High(TExecType) do
cbxExecuteType.Items.AddObject(ExecTypeNames[ExecType], TObject(Ord(ExecType)));
+
+ TButton_AlignVerticallyTo(sbnFile, edtFilename);
+ TButton_AlignVerticallyTo(sbnExecute, edtExecuteUsing);
end;
end.
Modified: branches/dark-mode/Source/FavoriteFiles/GX_FavFiles.dfm
===================================================================
--- branches/dark-mode/Source/FavoriteFiles/GX_FavFiles.dfm 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/FavoriteFiles/GX_FavFiles.dfm 2024-07-06 20:24:59 UTC (rev 4283)
@@ -2,18 +2,17 @@
Left = 402
Top = 273
Caption = 'Favorite Files'
- ClientHeight = 342
- ClientWidth = 495
+ ClientHeight = 334
+ ClientWidth = 493
Color = clBtnFace
DefaultMonitor = dmDesktop
Font.Charset = ANSI_CHARSET
Font.Color = clWindowText
- Font.Height = -12
+ Font.Height = -15
Font.Name = 'Tahoma'
Font.Style = []
KeyPreview = True
Menu = MainMenu
- OldCreateOrder = False
Position = poDesigned
Scaled = False
OnClose = FormClose
@@ -20,20 +19,17 @@
OnHide = FormHide
OnKeyPress = FormKeyPress
OnShow = FormShow
- PixelsPerInch = 96
- TextHeight = 14
+ TextHeight = 18
object splTreeView: TSplitter
Left = 121
Top = 22
- Width = 3
- Height = 301
- Cursor = crHSplit
+ Height = 293
end
object tvFolders: TTreeView
Left = 0
Top = 22
Width = 121
- Height = 301
+ Height = 293
Align = alLeft
DragMode = dmAutomatic
HideSelection = False
@@ -53,8 +49,8 @@
end
object StatusBar: TStatusBar
Left = 0
- Top = 323
- Width = 495
+ Top = 315
+ Width = 493
Height = 19
Panels = <>
ParentFont = True
@@ -64,15 +60,15 @@
object pnlFiles: TPanel
Left = 124
Top = 22
- Width = 371
- Height = 301
+ Width = 369
+ Height = 293
Align = alClient
BevelOuter = bvNone
TabOrder = 2
object splFileView: TSplitter
Left = 0
- Top = 151
- Width = 371
+ Top = 143
+ Width = 369
Height = 3
Cursor = crVSplit
Align = alBottom
@@ -80,8 +76,8 @@
object ListView: TListView
Left = 0
Top = 0
- Width = 371
- Height = 151
+ Width = 369
+ Height = 143
Align = alClient
Columns = <
item
@@ -118,8 +114,8 @@
end
object pnlFileView: TPanel
Left = 0
- Top = 154
- Width = 371
+ Top = 146
+ Width = 369
Height = 147
Align = alBottom
BevelOuter = bvNone
@@ -131,12 +127,10 @@
object ToolBar: TToolBar
Left = 0
Top = 0
- Width = 495
+ Width = 493
Height = 22
AutoSize = True
DisabledImages = dmSharedImages.DisabledImages
- EdgeBorders = []
- Flat = True
Images = dmSharedImages.Images
ParentShowHint = False
ShowHint = True
Modified: branches/dark-mode/Source/FavoriteFiles/GX_FavFiles.pas
===================================================================
--- branches/dark-mode/Source/FavoriteFiles/GX_FavFiles.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/FavoriteFiles/GX_FavFiles.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -1763,12 +1763,11 @@
FRootFolder := TGXFolder.Create(nil);
FOptions := _Options;
+ TControl_SetMinConstraints(Self);
+ InitDpiScaler;
SetupSystemImageLists;
- InitDpiScaler;
GxSetDefaultFont(Self);
- TControl_SetMinConstraints(Self);
-
SetToolbarGradient(ToolBar);
pnlFileView.Caption := '';
SetNonModalFormPopupMode(Self);
Modified: branches/dark-mode/Source/FavoriteFiles/GX_FavFolderProp.dfm
===================================================================
--- branches/dark-mode/Source/FavoriteFiles/GX_FavFolderProp.dfm 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/FavoriteFiles/GX_FavFolderProp.dfm 2024-07-06 20:24:59 UTC (rev 4283)
@@ -1,8 +1,42 @@
inherited fmFavFolderProperties: TfmFavFolderProperties
Caption = 'Folder Properties'
PixelsPerInch = 96
- TextHeight = 13
+ ClientHeight = 135
+ ClientWidth = 295
+ ParentFont = True
+ TextHeight = 15
inherited gbxNewFolder: TGroupBox
+ Height = 88
Caption = ' Folder Properties '
+ inherited lblFolderName: TLabel
+ Left = 15
+ Top = 23
+ Width = 66
+ Height = 15
+ StyleElements = [seFont, seClient, seBorder]
+ end
+ inherited lblFolderType: TLabel
+ Left = 22
+ Top = 55
+ Width = 59
+ Height = 15
+ StyleElements = [seFont, seClient, seBorder]
+ end
+ inherited edtFolderName: TEdit
+ Height = 23
+ StyleElements = [seFont, seClient, seBorder]
+ end
+ inherited cbxFolderType: TComboBox
+ Top = 51
+ StyleElements = [seFont, seClient, seBorder]
+ end
end
+ inherited btnCancel: TButton
+ Left = 212
+ Top = 102
+ end
+ inherited btnOK: TButton
+ Left = 132
+ Top = 102
+ end
end
Modified: branches/dark-mode/Source/FavoriteFiles/GX_FavNewFolder.pas
===================================================================
--- branches/dark-mode/Source/FavoriteFiles/GX_FavNewFolder.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/FavoriteFiles/GX_FavNewFolder.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -44,6 +44,7 @@
u_dzDpiScaleUtils,
{$ENDIF}
u_dzVclUtils,
+ GX_GxUtils,
GX_IdeUtils,
GX_FavFiles;
@@ -68,7 +69,7 @@
constructor TfmFavNewFolder.Create(_Owner: TComponent);
begin
inherited;
-
+ TControl_SetMinConstraints(Self);
InitDpiScaler;
InitializeForm;
@@ -83,6 +84,7 @@
var
i: TFolderType;
begin
+ GxSetDefaultFont(Self);
for i := Low(TFolderType) to High(TFolderType) do
cbxFolderType.Items.AddObject(FolderNames[i], Pointer(i));
cbxFolderType.ItemIndex := 0;
Modified: branches/dark-mode/Source/FilterExceptions/GX_FilterExceptionsNotification.pas
===================================================================
--- branches/dark-mode/Source/FilterExceptions/GX_FilterExceptionsNotification.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/FilterExceptions/GX_FilterExceptionsNotification.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -109,6 +109,7 @@
frm := TfmExceptionNotification.Create(_Owner);
{$IFEND}
try
+ GxSetDefaultFont(frm);
TForm_CenterOn(frm, _Owner);
frm.SetData(_OnAddException, _Project, _Exception, _Message, _AdditionalData, _ConfigurationKey);
Result := (frm.ShowModal = mrOk);
@@ -122,7 +123,6 @@
inherited Create(_Owner);
TControl_SetMinConstraints(Self);
InitDpiScaler;
- GxSetDefaultFont(Self);
end;
destructor TfmExceptionNotification.Destroy;
Modified: branches/dark-mode/Source/Framework/GX_BaseForm.pas
===================================================================
--- branches/dark-mode/Source/Framework/GX_BaseForm.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/Framework/GX_BaseForm.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -32,11 +32,16 @@
FGxHintCustomDataRec: TGxHintCustomDataRec;
FScaler: TFormDpiScaler;
FApplicationEvents: TApplicationEvents;
+ {$IFDEF GX_SUPPORTS_THEMING}
+ //FThemeChangedNotifier: TThemeChangedNotifier;
+ procedure InitTheming; virtual;
+ {$ENDIF}
procedure HandleApplicationEventsShowHint(var HintStr: string; var CanShow: Boolean;
var HintInfo: THintInfo);
procedure WMDpiChanged(var _Msg: TWMDpi); message WM_DPICHANGED;
procedure ApplyDpi(_NewDpi: Integer; _NewBounds: PRect); virtual;
procedure ArrangeControls; virtual;
+
protected
procedure InitDpiScaler;
public
@@ -91,6 +96,12 @@
_Msg.Result := 0;
end;
+{$IFDEF GX_SUPPORTS_THEMING}
+procedure TfmBaseForm.InitTheming;
+begin
+end;
+{$ENDIF}
+
procedure TfmBaseForm.HandleApplicationEventsShowHint(var HintStr: string; var CanShow: Boolean;
var HintInfo: THintInfo);
begin
@@ -127,7 +138,7 @@
constructor TfmBaseForm.Create(AOwner: TComponent);
begin
inherited;
-
+ //FThemeChangedNotifier := nil;
FApplicationEvents := TApplicationEvents.Create(Self);
FApplicationEvents.OnShowHint := HandleApplicationEventsShowHint;
Modified: branches/dark-mode/Source/Framework/GX_ConfigurationInfo.pas
===================================================================
--- branches/dark-mode/Source/Framework/GX_ConfigurationInfo.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/Framework/GX_ConfigurationInfo.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -1018,10 +1018,12 @@
OrigTop: Integer;
OrigWidth: Integer;
OrigHeight: Integer;
+ OrigDpi: Integer;
NewLeft: Integer;
NewTop: Integer;
NewWidth: Integer;
NewHeight: Integer;
+ NewDpi: Integer;
begin
if Section = '' then
StorageSection := Form.ClassName
@@ -1028,11 +1030,19 @@
else
StorageSection := Section;
+{$IFDEF GX_IDE_IS_HIDPI_AWARE}
+ OrigDpi := TScreen_GetDpiForForm(Form);
+{$ELSE}
+ OrigDpi := USER_DEFAULT_SCREEN_DPI; // 96
+{$ENDIF}
+ NewDPI := OrigDPI;
+
R := Form.BoundsRect;
OrigLeft := R.Left;
OrigTop := R.Top;
OrigWidth := R.Right - OrigLeft;
OrigHeight := R.Bottom - OrigTop;
+
// we assign NewXxx to OrigXxx which will 1. prevent a compiler warning and 2. save some checks
// below
NewLeft := OrigLeft;
@@ -1043,6 +1053,11 @@
PosChanged := False;
SizeChanged := False;
+{$IFDEF GX_IDE_IS_HIDPI_AWARE}
+ if (FormSaveFlags <> []) and ValueExists(StorageSection, 'DPi') then
+ NewDpi := ReadInteger(StorageSection, 'Dpi', OrigDpi);
+{$ENDIF}
+
if (fsPosition in FormSaveFlags) and ValueExists(StorageSection, 'Left') then
begin
NewLeft := ReadInteger(StorageSection, 'Left', OrigLeft);
@@ -1057,6 +1072,15 @@
SizeChanged := True;
end;
+{$IFDEF GX_IDE_IS_HIDPI_AWARE}
+ if (NewDpi > 0) and (OrigDpi > 0) and (NewDpi<> OrigDpi) then begin
+ NewLeft := MulDiv(NewLeft, NewDpi, OrigDpi);
+ NewTop := MulDiv(NewTop, NewDpi, OrigDpi);
+ NewWidth := MulDiv(NewWidth, NewDpi, OrigDpi);
+ NewHeight := MulDiv(NewHeight, NewDpi, OrigDpi);
+ end;
+{$ENDIF}
+
if PosChanged then begin
R.Left := NewLeft;
R.Top := NewTop;
@@ -1095,6 +1119,12 @@
StorageSection := Form.ClassName
else
StorageSection := Section;
+{$IFDEF GX_IDE_IS_HIDPI_AWARE}
+ if FormSaveFlags <> [] then
+ begin
+ WriteInteger(StorageSection, 'Dpi', TScreen_GetDpiForForm(Form));
+ end;
+{$ENDIF}
if fsPosition in FormSaveFlags then
begin
WriteInteger(StorageSection, 'Left', Form.Left);
Modified: branches/dark-mode/Source/Grep/GX_GrepSearch.dfm
===================================================================
--- branches/dark-mode/Source/Grep/GX_GrepSearch.dfm 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/Grep/GX_GrepSearch.dfm 2024-07-06 20:24:59 UTC (rev 4283)
@@ -18,15 +18,15 @@
ShowHint = True
OnClose = FormClose
DesignSize = (
- 681
- 588)
+ 679
+ 580)
PixelsPerInch = 96
- TextHeight = 15
+ TextHeight = 14
object lblFind: TLabel
- Left = 21
+ Left = 14
Top = 12
- Width = 59
- Height = 15
+ Width = 66
+ Height = 14
Alignment = taRightJustify
Caption = '&Text to find'
FocusControl = cbText
@@ -34,11 +34,10 @@
object cbText: TComboBox
Left = 85
Top = 8
- Width = 589
+ Width = 585
Height = 22
Anchors = [akLeft, akTop, akRight]
DropDownCount = 15
- ItemHeight = 0
TabOrder = 0
OnKeyDown = ComboKeyDown
end
@@ -216,8 +215,8 @@
object txt_NoMapFile: TStaticText
Left = 43
Top = 79
- Width = 117
- Height = 19
+ Width = 116
+ Height = 18
Hint =
'Parses the .map file to get the unit names of all units used in ' +
'the project.'#13#10'You must enable generating a map file with publics' +
@@ -230,18 +229,18 @@
object gbxContentTypes: TGroupBox
Left = 488
Top = 40
- Width = 185
+ Width = 181
Height = 81
Anchors = [akLeft, akTop, akRight]
Caption = 'Delphi Code Content Types'
TabOrder = 3
DesignSize = (
- 185
+ 181
81)
object cbGrepCode: TCheckBox
Left = 10
Top = 18
- Width = 168
+ Width = 164
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Code'
@@ -251,7 +250,7 @@
object cbGrepStrings: TCheckBox
Left = 10
Top = 38
- Width = 168
+ Width = 164
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Strings'
@@ -261,7 +260,7 @@
object cbGrepComments: TCheckBox
Left = 10
Top = 58
- Width = 168
+ Width = 164
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Comments'
@@ -269,7 +268,7 @@
OnClick = cbGrepCommentsClick
end
object btnGrepAll: TButton
- Left = 134
+ Left = 130
Top = 48
Width = 43
Height = 25
@@ -282,18 +281,18 @@
object gbxUnitSections: TGroupBox
Left = 488
Top = 128
- Width = 185
+ Width = 181
Height = 105
Anchors = [akLeft, akTop, akRight]
Caption = 'Delphi Code Sections'
TabOrder = 4
DesignSize = (
- 185
+ 181
105)
object cbSectionInterface: TCheckBox
Left = 10
Top = 18
- Width = 168
+ Width = 164
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Interface'
@@ -303,7 +302,7 @@
object cbSectionImplementation: TCheckBox
Left = 10
Top = 38
- Width = 168
+ Width = 164
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Implementation'
@@ -313,7 +312,7 @@
object cbSectionInitialization: TCheckBox
Left = 10
Top = 58
- Width = 168
+ Width = 164
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Initialization'
@@ -323,7 +322,7 @@
object cbSectionFinalization: TCheckBox
Left = 10
Top = 78
- Width = 168
+ Width = 164
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Finalization'
@@ -331,7 +330,7 @@
OnClick = cbSectionFinalizationClick
end
object btnSectionAll: TButton
- Left = 134
+ Left = 130
Top = 72
Width = 43
Height = 25
@@ -344,19 +343,19 @@
object gbxDirectories: TGroupBox
Left = 8
Top = 240
- Width = 666
+ Width = 662
Height = 217
Anchors = [akLeft, akTop, akRight]
Caption = 'Directory Search'
TabOrder = 5
DesignSize = (
- 666
+ 662
217)
object lblMasks: TLabel
Left = 8
Top = 72
- Width = 183
- Height = 15
+ Width = 188
+ Height = 14
Caption = 'File mas&ks (separate by semicolon)'
FocusControl = cbMasks
end
@@ -363,8 +362,8 @@
object lblDirectory: TLabel
Left = 8
Top = 24
- Width = 185
- Height = 15
+ Width = 192
+ Height = 14
Caption = 'Di&rectories (separate by semicolon)'
FocusControl = cbDirectory
end
@@ -371,8 +370,8 @@
object lblExcludeDirs: TLabel
Left = 24
Top = 168
- Width = 192
- Height = 15
+ Width = 200
+ Height = 14
Caption = 'Exclude Dirs (separate by semicolon)'
FocusControl = cbExcludedDirs
end
@@ -379,18 +378,17 @@
object l_MinMaxDepth: TLabel
Left = 176
Top = 121
- Width = 89
- Height = 15
+ Width = 90
+ Height = 14
Caption = 'Min / Max Depth'
end
object cbMasks: TComboBox
Left = 8
Top = 88
- Width = 617
+ Width = 613
Height = 22
Anchors = [akLeft, akTop, akRight]
DropDownCount = 15
- ItemHeight = 0
TabOrder = 2
OnKeyDown = ComboKeyDown
end
@@ -406,7 +404,7 @@
object cbInclude: TCheckBox
Left = 8
Top = 128
- Width = 149
+ Width = 145
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Search su&bdirectories'
@@ -416,18 +414,17 @@
object cbDirectory: TComboBox
Left = 8
Top = 40
- Width = 617
+ Width = 613
Height = 22
Hint = 'Separate multiple directories by semicolon'
Anchors = [akLeft, akTop, akRight]
DropDownCount = 15
- ItemHeight = 14
TabOrder = 0
OnDropDown = cbDirectoryDropDown
OnKeyDown = ComboKeyDown
end
object btnBrowse: TButton
- Left = 632
+ Left = 628
Top = 39
Width = 25
Height = 25
@@ -442,11 +439,10 @@
object cbExcludedDirs: TComboBox
Left = 24
Top = 184
- Width = 601
+ Width = 597
Height = 22
Anchors = [akLeft, akTop, akRight]
DropDownCount = 15
- ItemHeight = 14
TabOrder = 6
OnDropDown = cbExcludedDirsDropDown
OnKeyDown = ComboKeyDown
@@ -474,16 +470,16 @@
end
object pnlBottom: TPanel
Left = 0
- Top = 553
- Width = 681
+ Top = 545
+ Width = 679
Height = 35
Align = alBottom
TabOrder = 7
DesignSize = (
- 681
+ 679
35)
object btnOK: TButton
- Left = 436
+ Left = 432
Top = 2
Width = 75
Height = 25
@@ -494,7 +490,7 @@
OnClick = btnOKClick
end
object btnCancel: TButton
- Left = 516
+ Left = 512
Top = 2
Width = 75
Height = 25
@@ -505,7 +501,7 @@
TabOrder = 3
end
object btnHelp: TButton
- Left = 596
+ Left = 592
Top = 2
Width = 75
Height = 25
@@ -537,7 +533,7 @@
object rgSaveOption: TRadioGroup
Left = 8
Top = 464
- Width = 666
+ Width = 662
Height = 81
Anchors = [akLeft, akTop, akRight]
Caption = 'Save Search History'
Modified: branches/dark-mode/Source/Grep/GX_GrepSearch.pas
===================================================================
--- branches/dark-mode/Source/Grep/GX_GrepSearch.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/Grep/GX_GrepSearch.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -809,14 +809,10 @@
procedure TfmGrepSearch.FormShow(Sender: TObject);
begin
inherited;
- {$IFDEF GX_IDE_IS_HIDPI_AWARE}
- if IsThemesEnabled and (Self.CurrentPPI > 110) then
- Self.Font.Height := Self.Font.Height + 1;
- {$ENDIF}
TControl_SetConstraints(Self, [ccMinWidth, ccMinHeight, ccMaxHeight]);
if not IsStandAlone then
- InitTheming(Self);
+ InitTheming;
FixComboBoxSelections(Self);
end;
Modified: branches/dark-mode/Source/IDE/GX_IdeSearchPathEnhancer.pas
===================================================================
--- branches/dark-mode/Source/IDE/GX_IdeSearchPathEnhancer.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/IDE/GX_IdeSearchPathEnhancer.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -814,7 +814,9 @@
var
LineIdx: Integer;
YPos: Integer;
+{$IFNDEF GX_VER350_up}
LSelected: Boolean;
+{$ENDIF}
begin
if FPageControl.ActivePage = FTabSheetMemo then begin
FMemo.BeginUpdate;
@@ -835,9 +837,14 @@
end;
SetFocusTo(FMemo);
end else begin
+{$IFDEF GX_VER350_up}
+ FUpClick(FUpBtn);
+{$ELSE}
+ // FIX RSP-32650:
LSelected := FListbox.Selected[FListbox.ItemIndex];
FUpClick(FUpBtn);
FListbox.Selected[FListbox.ItemIndex] := LSelected;
+{$ENDIF}
end;
end;
@@ -845,7 +852,9 @@
var
LineCnt: Integer;
YPos: Integer;
+{$IFNDEF GX_VER350_up}
LSelected: Boolean;
+{$ENDIF}
begin
if FPageControl.ActivePage = FTabSheetMemo then begin
FMemo.BeginUpdate;
@@ -867,9 +876,14 @@
end;
SetFocusTo(FMemo);
end else begin
+{$IFDEF GX_VER350_up}
+ FDownClick(FDownBtn);
+{$ELSE}
+ // FIX RSP-32650:
LSelected := FListbox.Selected[FListbox.ItemIndex];
FDownClick(FDownBtn);
FListbox.Selected[FListbox.ItemIndex] := LSelected;
+{$ENDIF}
end;
end;
Modified: branches/dark-mode/Source/Include/GX_CondDefine.inc
===================================================================
--- branches/dark-mode/Source/Include/GX_CondDefine.inc 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/Include/GX_CondDefine.inc 2024-07-06 20:24:59 UTC (rev 4283)
@@ -261,6 +261,7 @@
// Define UniSynEdit if SynEdit is available
{$IFDEF SYNEDIT}
{$DEFINE UniSynEdit}
+ {$DEFINE GX_ENHANCED_EDITOR}
{$ELSE}
GExperts now requires SynEdit.
{$ENDIF SYNEDIT}
Modified: branches/dark-mode/Source/MacroLibrary/GX_MacroLibrary.dfm
===================================================================
--- branches/dark-mode/Source/MacroLibrary/GX_MacroLibrary.dfm 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/MacroLibrary/GX_MacroLibrary.dfm 2024-07-06 20:24:59 UTC (rev 4283)
@@ -2,7 +2,6 @@
Left = 326
Top = 252
ActiveControl = lvMacros
- AutoScroll = False
Caption = 'Keyboard Macro Library'
ClientHeight = 218
ClientWidth = 314
@@ -12,12 +11,10 @@
Font.Height = -12
Font.Name = 'Tahoma'
Font.Style = []
- OldCreateOrder = False
Position = poScreenCenter
Scaled = False
OnClose = FormClose
OnResize = FormResize
- PixelsPerInch = 96
TextHeight = 14
object Splitter: TSplitter
Left = 0
@@ -69,8 +66,6 @@
Width = 314
Height = 22
AutoSize = True
- EdgeBorders = []
- Flat = True
Images = dmSharedImages.Images
ParentShowHint = False
ShowHint = True
Modified: branches/dark-mode/Source/MacroLibrary/GX_MacroLibrary.pas
===================================================================
--- branches/dark-mode/Source/MacroLibrary/GX_MacroLibrary.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/MacroLibrary/GX_MacroLibrary.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -201,6 +201,7 @@
procedure ApplyDpi(_NewDpi: Integer; _NewBounds: PRect); override;
{$ENDIF}
procedure AddToMacroLibrary(CR: IOTARecord);
+ procedure FormShow(Sender: TObject);
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
@@ -680,6 +681,8 @@
procedure TfmMacroLibrary.FormClose(Sender: TObject; var Action: TCloseAction);
begin
+ if Self.Floating then
+ SaveSettings;
Action := caHide;
end;
@@ -758,6 +761,7 @@
FDataList := TList.Create;
LoadSettings;
FSBWidth := GetSystemMetrics(SM_CXVSCROLL);
+ OnShow := FormShow;
ResizeColumns;
InitializeForm;
@@ -1032,9 +1036,16 @@
procedure TfmMacroLibrary.ResizeColumns;
var
+ DummyTimeStamp : TDateTime;
ColWidth: Integer;
begin
- ColWidth := Max(lvMacros.Width - fSBWidth - 6 - lvMacros.Columns[1].MinWidth, NameColMinMidth);
+ // calculate needed with for the timestamp
+ DummyTimeStamp := EncodeDate(2000, 12, 31) + EncodeTime(23, 53, 55, 0);
+ ColWidth := lvMacros.Canvas.TextWidth(DateTimeToStr(DummyTimeStamp)) + FSBWidth;
+ lvMacros.Columns[1].MinWidth := ColWidth;
+ lvMacros.Columns[1].Width := ColWidth;
+
+ ColWidth := Max(lvMacros.Width - FSBWidth - 6 - lvMacros.Columns[1].MinWidth, NameColMinMidth);
lvMacros.Columns[0].MaxWidth := ColWidth;
lvMacros.Columns[0].MinWidth := ColWidth;
lvMacros.Columns[0].Width := ColWidth;
@@ -1228,6 +1239,12 @@
Result := pnlDescription.Visible;
end;
+procedure TfmMacroLibrary.FormShow(Sender: TObject);
+begin
+ if Self.Floating then
+ LoadSettings;
+end;
+
{ TMacroLibraryExpert }
constructor TMacroLibraryExpert.Create;
Modified: branches/dark-mode/Source/ReplaceComponents/GX_ReplaceComp.dfm
===================================================================
--- branches/dark-mode/Source/ReplaceComponents/GX_ReplaceComp.dfm 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/ReplaceComponents/GX_ReplaceComp.dfm 2024-07-06 20:24:59 UTC (rev 4283)
@@ -38,7 +38,7 @@
FocusControl = cbReplace
end
object btnOK: TButton
- Left = 150
+ Left = 144
Top = 190
Width = 75
Height = 25
@@ -50,7 +50,7 @@
OnClick = btnOKClick
end
object btnCancel: TButton
- Left = 233
+ Left = 227
Top = 190
Width = 75
Height = 25
@@ -61,7 +61,7 @@
TabOrder = 5
end
object btnHelp: TButton
- Left = 398
+ Left = 392
Top = 190
Width = 75
Height = 25
@@ -73,11 +73,10 @@
object cbSearch: TComboBox
Left = 111
Top = 12
- Width = 314
+ Width = 308
Height = 22
Anchors = [akLeft, akTop, akRight]
DropDownCount = 18
- ItemHeight = 14
Sorted = True
TabOrder = 0
OnChange = cbSearchChange
@@ -85,12 +84,11 @@
end
object cbReplace: TComboBox
Left = 111
- Top = 36
- Width = 314
+ Top = 37
+ Width = 308
Height = 22
Anchors = [akLeft, akTop, akRight]
DropDownCount = 18
- ItemHeight = 14
Sorted = True
TabOrder = 1
OnChange = cbSearchChange
@@ -97,7 +95,7 @@
OnKeyDown = cbSearchKeyDown
end
object gbxScope: TGroupBox
- Left = 188
+ Left = 182
Top = 70
Width = 285
Height = 108
@@ -186,7 +184,7 @@
end
end
object btnSettings: TButton
- Left = 316
+ Left = 310
Top = 190
Width = 75
Height = 25
Modified: branches/dark-mode/Source/ReplaceComponents/GX_ReplaceComp.pas
===================================================================
--- branches/dark-mode/Source/ReplaceComponents/GX_ReplaceComp.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/ReplaceComponents/GX_ReplaceComp.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -447,6 +447,7 @@
constructor TfmReplaceComp.Create(AOwner: TComponent);
begin
inherited Create(AOwner);
+ TControl_SetMinConstraints(Self);
LoadFormSettings;
SetupControls;
Modified: branches/dark-mode/Source/Utils/GX_OtaUtils.pas
===================================================================
--- branches/dark-mode/Source/Utils/GX_OtaUtils.pas 2024-07-06 20:01:13 UTC (rev 4282)
+++ branches/dark-mode/Source/Utils/GX_OtaUtils.pas 2024-07-06 20:24:59 UTC (rev 4283)
@@ -834,7 +834,19 @@
const FileName: string; var Cancel: Boolean); override;
end;
+(*
type
+ TThemeChangedNotifier = class(TBaseIdeNotifier, INTAIDEThemingServicesNotifier)
+ private
+ FOnThemeChanged : TNotifyEvent;
+ public
+ constructor Create(_OnThemeChanged: TNotifyEvent);
+ procedure ChangingTheme;
+ procedure ChangedTheme;
+ end;
+*)
+
+type
EStandAloneUsage = class(Exception);
const
@@ -4096,6 +4108,7 @@
{$IFDEF GX_SUPPORTS_THEMING}
var
LService : IOTAIDEThemingServices;
+// LNotifier : TThemeChangedNotifier;
begin
Result := False;
LService := GxOtaGetIDEThemingServices;
@@ -4103,6 +4116,10 @@
begin
LService.RegisterFormClass(TCustomFormClass(AForm.ClassType));
LService.ApplyTheme(AForm);
+
+// LNotifier := TThemeChangedNotifier.Create(AForm);
+// LNotifier.AddNotifierToIDE;
+
Result := True;
end;
end;
@@ -5996,6 +6013,41 @@
end;
end;
+{ TThemeChangedNotifier }
+
+(*
+function TThemeChangedNotifier.AddNotifierToIDE: Boolean;
+var
+ LService: IOTAIDEThemingServices;
+begin
+ Result := False;
+ LService := GxOtaGetIDEThemingServices;
+ if Assigned(LService) and (LService.IDEThemingEnabled) then
+ begin
+ FNotifierIndex := LService.AddNotifier(Self);
+ Result := (FNotifierIndex <> InvalidNotifierIndex);
+ end;
+end;
+
+procedure TThemeChangedNotifier.ChangedTheme;
+begin
+ if Assigned(FOnThemeChanged) then
+ FOnThemeChanged(Self);
+end;
+
+procedure TThemeChangedNotifier.ChangingTheme;
+begin
+ // not implemented.
+end;
+
+constructor TThemeChangedNotifier.Create(_OnThemeChanged: TNotifyEvent);
+begin
+ inherited Create;
+ Assert(Assigned(_OnThemeChanged);
+ FOnThemeChanged := _OnThemeChanged;
+end;
+*)
+
initialization
finalization
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|