Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Code/DDevExtensions/D_D110/DDevExtensions.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>..\bin\DDevExtensionsD110.dll</DCC_DependencyCheckOutputName>
<ProjectVersion>19.3</ProjectVersion>
<ProjectVersion>19.5</ProjectVersion>
<Config Condition="'$(Config)'==''">Release</Config>
<Basis>True</Basis>
<AppType>Library</AppType>
Expand Down
5 changes: 4 additions & 1 deletion Code/DDevExtensions/Installer/DDevExtensionsReg.dpr
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@ program DDevExtensionsReg;
uses
Forms,
Main in 'Main.pas' {FormMain},
AppConsts in '..\Source\AppConsts.pas';
AppConsts in '..\Source\AppConsts.pas',
Vcl.Themes,
Vcl.Styles;

{$R *.res}

begin
Application.Initialize;
TStyleManager.TrySetStyle('Windows10');
Application.Title := 'DDevExtensions Installer';
Application.CreateForm(TFormMain, FormMain);
Application.Run;
Expand Down
8 changes: 5 additions & 3 deletions Code/DDevExtensions/Installer/DDevExtensionsReg.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<MainSource>DDevExtensionsReg.dpr</MainSource>
<Config Condition="'$(Config)'==''">Release</Config>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<ProjectVersion>19.3</ProjectVersion>
<ProjectVersion>19.5</ProjectVersion>
<Basis>True</Basis>
<AppType>Application</AppType>
<FrameworkType>VCL</FrameworkType>
Expand Down Expand Up @@ -73,6 +73,7 @@
<DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
<DCC_DcuOutput>.</DCC_DcuOutput>
<SanitizedProjectName>DDevExtensionsReg</SanitizedProjectName>
<Custom_Styles>Windows10|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10.vsf;&quot;Windows10 SlateGray|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10SlateGray.vsf&quot;</Custom_Styles>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
Expand All @@ -91,6 +92,7 @@
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<BT_BuildType>Debug</BT_BuildType>
<Manifest_File>(Ohne)</Manifest_File>
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<VerInfo_MinorVer>7</VerInfo_MinorVer>
Expand Down Expand Up @@ -159,8 +161,8 @@
<VersionInfoKeys Name="Comments"/>
</VersionInfoKeys>
<Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
<Platforms>
Expand Down
Binary file modified Code/DDevExtensions/Installer/DDevExtensionsReg.res
Binary file not shown.
31 changes: 15 additions & 16 deletions Code/DDevExtensions/Installer/Main.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,24 @@ object FormMain: TFormMain
Left = 362
Top = 178
ActiveControl = btnInstall
AutoSize = True
BorderIcons = [biSystemMenu, biMinimize]
Caption = 'Install'
ClientHeight = 190
ClientWidth = 377
ClientHeight = 174
ClientWidth = 361
Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = []
OldCreateOrder = False
Position = poScreenCenter
OnCanResize = FormCanResize
OnCreate = FormCreate
PixelsPerInch = 96
TextHeight = 13
object Label1: TLabel
Left = 8
Top = 8
Left = 0
Top = 0
Width = 121
Height = 13
Caption = 'Install to / Uninstall from:'
Expand All @@ -32,8 +31,8 @@ object FormMain: TFormMain
ParentFont = False
end
object btnInstall: TButton
Left = 8
Top = 157
Left = 0
Top = 149
Width = 75
Height = 25
Caption = '&Install'
Expand All @@ -42,8 +41,8 @@ object FormMain: TFormMain
OnClick = btnInstallClick
end
object btnQuit: TButton
Left = 294
Top = 157
Left = 286
Top = 149
Width = 75
Height = 25
Cancel = True
Expand All @@ -52,25 +51,25 @@ object FormMain: TFormMain
OnClick = btnQuitClick
end
object btnUninstall: TButton
Left = 89
Top = 157
Left = 81
Top = 149
Width = 75
Height = 25
Caption = '&Uninstall'
TabOrder = 1
OnClick = btnUninstallClick
end
object cbxEnvs: TCheckListBox
Left = 8
Top = 24
Left = 0
Top = 16
Width = 361
Height = 110
ItemHeight = 13
TabOrder = 3
end
object pbProgress: TProgressBar
Left = 8
Top = 140
Left = 0
Top = 132
Width = 361
Height = 11
TabOrder = 4
Expand Down
29 changes: 28 additions & 1 deletion Code/DDevExtensions/Installer/Main.pas
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, CheckLst, Registry, ShlObj, ActiveX, AppConsts,
ExtCtrls, ComCtrls;
ExtCtrls, ComCtrls, Vcl.Themes, Vcl.Styles;

type
TEnvKind = ({ekDelphi5, ekBCB5, ekDelphi6, ekBCB6, ekDelphi7,
Expand Down Expand Up @@ -87,6 +87,7 @@ TFormMain = class(TForm)
procedure UninstallFile(const InstallDir, FileName: string);
procedure UnregisterExpert(const EnvData: TEnvData; const Name: string);
function HasExpert(const EnvData: TEnvData; const Name: string): Boolean;
function IsDarkMode: Boolean;

procedure DoInstall(const EnvData: TEnvData);
procedure DoUninstall(const EnvData: TEnvData);
Expand Down Expand Up @@ -263,6 +264,9 @@ procedure TFormMain.FormCreate(Sender: TObject);
cbxEnvs.Checked[i] := True;

pbProgress.Max := cbxEnvs.Items.Count;

if IsDarkMode then
TStyleManager.TrySetStyle('Windows10 SlateGray', False);
end;

procedure TFormMain.InstallFile(const InstallDir, FileName: string; Force: Boolean);
Expand Down Expand Up @@ -353,6 +357,29 @@ function TFormMain.HasExpert(const EnvData: TEnvData;
end;
end;

function TFormMain.IsDarkMode: Boolean;
var
Reg: TRegistry;
begin
Result := False;
Reg := TRegistry.Create;
try
Reg.RootKey := HKEY_CURRENT_USER;
if Reg.OpenKeyReadOnly('\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize\') then begin
try
if Reg.ValueExists('AppsUseLightTheme') then
Result := Reg.ReadInteger('AppsUseLightTheme') = 0;
finally
Reg.CloseKey;
end;
end
else
Result := False;
finally
Reg.Free;
end;
end;

{------------------------------------------------------------------------------}

procedure TFormMain.DoInstall(const EnvData: TEnvData);
Expand Down
9 changes: 4 additions & 5 deletions Code/DDevExtensions/Source/ExcelExport/FrmExcelExport.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ object FormExcelExport: TFormExcelExport
BorderIcons = [biMinimize, biMaximize]
BorderStyle = bsDialog
Caption = 'Excel Export'
ClientHeight = 59
ClientWidth = 428
ClientHeight = 41
ClientWidth = 418
Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Segoe UI'
Font.Style = []
OldCreateOrder = False
Position = poScreenCenter
OnCloseQuery = FormCloseQuery
OnPaint = FormPaint
PixelsPerInch = 96
TextHeight = 13
object LblExportText: TLabel
Left = 8
Top = 8
Width = 99
Width = 101
Height = 13
Caption = 'Exporting to Excel...'
Transparent = False
Expand Down
45 changes: 26 additions & 19 deletions Code/DDevExtensions/Source/FileSelector/FrmFileSelector.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ inherited FormFileSelector: TFormFileSelector
ActiveControl = edtFilter
BorderIcons = [biSystemMenu]
Caption = 'Find/Use Unit'
ClientHeight = 535
ClientWidth = 770
ClientHeight = 517
ClientWidth = 760
Constraints.MinHeight = 300
Constraints.MinWidth = 500
OldCreateOrder = True
PopupMode = pmAuto
Position = poScreenCenter
OnCreate = FormCreate
OnDestroy = FormDestroy
OnResize = FormResize
PixelsPerInch = 96
ExplicitWidth = 782
ExplicitHeight = 573
TextHeight = 13
object ListView: TListView
Left = 0
Top = 25
Width = 770
Height = 405
Width = 760
Height = 387
Align = alClient
Columns = <
item
Expand Down Expand Up @@ -61,8 +60,8 @@ inherited FormFileSelector: TFormFileSelector
end
object StatusBar: TStatusBar
Left = 0
Top = 516
Width = 770
Top = 498
Width = 760
Height = 19
Panels = <
item
Expand All @@ -76,7 +75,7 @@ inherited FormFileSelector: TFormFileSelector
object ToolBar: TToolBar
Left = 0
Top = 0
Width = 770
Width = 760
Height = 25
BorderWidth = 1
ButtonHeight = 21
Expand Down Expand Up @@ -146,7 +145,7 @@ inherited FormFileSelector: TFormFileSelector
Left = 381
Top = 0
Width = 302
Height = 22
Height = 21
Style = csOwnerDrawFixed
DropDownCount = 25
TabOrder = 2
Expand All @@ -156,17 +155,17 @@ inherited FormFileSelector: TFormFileSelector
end
object PanelButtons: TPanel
Left = 0
Top = 485
Width = 770
Top = 467
Width = 760
Height = 31
Align = alBottom
BevelOuter = bvNone
TabOrder = 2
DesignSize = (
770
760
31)
object btnUseUnit: TButton
Left = 609
Left = 599
Top = 3
Width = 75
Height = 25
Expand All @@ -177,7 +176,7 @@ inherited FormFileSelector: TFormFileSelector
TabOrder = 3
end
object btnCancel: TButton
Left = 690
Left = 680
Top = 3
Width = 75
Height = 25
Expand All @@ -200,7 +199,7 @@ inherited FormFileSelector: TFormFileSelector
TabOrder = 0
end
object btnOpen: TButton
Left = 480
Left = 470
Top = 3
Width = 108
Height = 25
Expand All @@ -223,8 +222,8 @@ inherited FormFileSelector: TFormFileSelector
end
object PanelBottom: TPanel
Left = 0
Top = 430
Width = 770
Top = 412
Width = 760
Height = 55
Align = alBottom
BevelOuter = bvNone
Expand All @@ -250,6 +249,7 @@ inherited FormFileSelector: TFormFileSelector
OnDragOver = ListViewInsertUnitsDragOver
OnInfoTip = ListViewInfoTip
OnKeyDown = ListViewInsertUnitsKeyDown
ExplicitWidth = 646
end
object Panel1: TPanel
Left = 656
Expand All @@ -263,6 +263,7 @@ inherited FormFileSelector: TFormFileSelector
Padding.Right = 6
Padding.Bottom = 6
TabOrder = 1
ExplicitLeft = 646
object Label1: TLabel
Left = 6
Top = 4
Expand All @@ -271,6 +272,12 @@ inherited FormFileSelector: TFormFileSelector
Align = alClient
AutoSize = False
Caption = 'Use the [Insert] key or Drag&&Drop to add units to the list.'
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -10
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
WordWrap = True
end
end
Expand Down
Loading