2
0
Martijn Laan 1 сар өмнө
parent
commit
1a91612cd8

+ 1 - 0
Projects/Src/IDE.MainForm.dfm

@@ -399,6 +399,7 @@ object MainForm: TMainForm
       Margins.Right = 0
       Margins.Right = 0
       Margins.Bottom = 8
       Margins.Bottom = 8
       Align = alRight
       Align = alRight
+      Caption = 'Donate'
       Center = True
       Center = True
       ParentShowHint = False
       ParentShowHint = False
       ShowHint = True
       ShowHint = True

+ 0 - 1
Projects/Src/IDE.MainForm.pas

@@ -1011,7 +1011,6 @@ begin
   ToolBarPanel.ParentBackground := False;
   ToolBarPanel.ParentBackground := False;
   UpdatePanel.ParentBackground := False;
   UpdatePanel.ParentBackground := False;
   UpdatePanelDonateBitBtn.Hint := RemoveAccelChar(HDonate.Caption);
   UpdatePanelDonateBitBtn.Hint := RemoveAccelChar(HDonate.Caption);
-  UpdatePanelDonateBitBtn.Caption := UpdatePanelDonateBitBtn.Hint; { For accessibility }
 
 
   UpdateImages;
   UpdateImages;
 
 

+ 7 - 15
Projects/Src/IDE.RegistryDesignerForm.dfm

@@ -18,15 +18,14 @@ object RegistryDesignerForm: TRegistryDesignerForm
     496
     496
     347)
     347)
   TextHeight = 13
   TextHeight = 13
-  object AppRegistryMinVerDocImage: TImage
-    Left = 406
-    Top = 170
-    Width = 16
-    Height = 16
+  object AppRegistryMinVerDocBitBtn: TBitmapButton
+    Left = 404
+    Top = 168
+    Width = 22
+    Height = 22
     Anchors = [akTop, akRight]
     Anchors = [akTop, akRight]
     AutoSize = True
     AutoSize = True
-    Transparent = True
-    ExplicitLeft = 414
+    TabOrder = 9
   end
   end
   object Panel1: TPanel
   object Panel1: TPanel
     Left = 0
     Left = 0
@@ -35,9 +34,7 @@ object RegistryDesignerForm: TRegistryDesignerForm
     Height = 42
     Height = 42
     Align = alBottom
     Align = alBottom
     BevelOuter = bvNone
     BevelOuter = bvNone
-    TabOrder = 9
-    ExplicitTop = 320
-    ExplicitWidth = 500
+    TabOrder = 10
     DesignSize = (
     DesignSize = (
       496
       496
       42)
       42)
@@ -61,7 +58,6 @@ object RegistryDesignerForm: TRegistryDesignerForm
       ModalResult = 1
       ModalResult = 1
       TabOrder = 0
       TabOrder = 0
       OnClick = InsertButtonClick
       OnClick = InsertButtonClick
-      ExplicitLeft = 330
     end
     end
     object CancelButton: TButton
     object CancelButton: TButton
       Left = 406
       Left = 406
@@ -73,7 +69,6 @@ object RegistryDesignerForm: TRegistryDesignerForm
       Caption = 'Cancel'
       Caption = 'Cancel'
       ModalResult = 2
       ModalResult = 2
       TabOrder = 1
       TabOrder = 1
-      ExplicitLeft = 410
     end
     end
     object PrivilegesRequiredLabel: TNewStaticText
     object PrivilegesRequiredLabel: TNewStaticText
       Left = 8
       Left = 8
@@ -101,7 +96,6 @@ object RegistryDesignerForm: TRegistryDesignerForm
     Height = 21
     Height = 21
     Anchors = [akLeft, akTop, akRight]
     Anchors = [akLeft, akTop, akRight]
     TabOrder = 1
     TabOrder = 1
-    ExplicitWidth = 392
   end
   end
   object AppRegistryFileButton: TButton
   object AppRegistryFileButton: TButton
     Left = 406
     Left = 406
@@ -111,7 +105,6 @@ object RegistryDesignerForm: TRegistryDesignerForm
     Anchors = [akTop, akRight]
     Anchors = [akTop, akRight]
     Caption = '&Browse...'
     Caption = '&Browse...'
     TabOrder = 2
     TabOrder = 2
-    ExplicitLeft = 414
   end
   end
   object AppRegistrySettingsLabel: TNewStaticText
   object AppRegistrySettingsLabel: TNewStaticText
     Left = 8
     Left = 8
@@ -165,6 +158,5 @@ object RegistryDesignerForm: TRegistryDesignerForm
     Height = 21
     Height = 21
     Anchors = [akLeft, akTop, akRight]
     Anchors = [akLeft, akTop, akRight]
     TabOrder = 8
     TabOrder = 8
-    ExplicitWidth = 140
   end
   end
 end
 end

+ 3 - 3
Projects/Src/IDE.RegistryDesignerForm.pas

@@ -16,7 +16,7 @@ interface
 uses
 uses
   SysUtils, Classes,
   SysUtils, Classes,
   Forms, Controls, StdCtrls, ExtCtrls,
   Forms, Controls, StdCtrls, ExtCtrls,
-  IDE.Wizard.WizardFormRegistryHelper, NewStaticText;
+  IDE.Wizard.WizardFormRegistryHelper, NewStaticText, BitmapButton;
 
 
 type
 type
   TRegistryDesignerForm = class(TForm)
   TRegistryDesignerForm = class(TForm)
@@ -34,7 +34,7 @@ type
     AppRegistryMinVerCheck: TCheckBox;
     AppRegistryMinVerCheck: TCheckBox;
     AppRegistryMinVerEdit: TEdit;
     AppRegistryMinVerEdit: TEdit;
     PrivilegesRequiredLabel: TNewStaticText;
     PrivilegesRequiredLabel: TNewStaticText;
-    AppRegistryMinVerDocImage: TImage;
+    AppRegistryMinVerDocBitBtn: TBitmapButton;
     procedure InsertButtonClick(Sender: TObject);
     procedure InsertButtonClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -74,7 +74,7 @@ begin
   FRegistryHelper := TWizardFormRegistryHelper.Create(Self, AppRegistryFileEdit,
   FRegistryHelper := TWizardFormRegistryHelper.Create(Self, AppRegistryFileEdit,
     AppRegistryFileButton, AppRegistryUninsDeleteKeyCheck,
     AppRegistryFileButton, AppRegistryUninsDeleteKeyCheck,
     AppRegistryUninsDeleteKeyIfEmptyCheck, AppRegistryUninsDeleteValueCheck,
     AppRegistryUninsDeleteKeyIfEmptyCheck, AppRegistryUninsDeleteValueCheck,
-    AppRegistryMinVerCheck, AppRegistryMinVerEdit, AppRegistryMinVerDocImage);
+    AppRegistryMinVerCheck, AppRegistryMinVerEdit, AppRegistryMinVerDocBitBtn);
 end;
 end;
 
 
 procedure TRegistryDesignerForm.FormDestroy(Sender: TObject);
 procedure TRegistryDesignerForm.FormDestroy(Sender: TObject);

+ 6 - 6
Projects/Src/IDE.Wizard.WizardForm.dfm

@@ -1054,14 +1054,14 @@ object WizardForm: TWizardForm
           DesignSize = (
           DesignSize = (
             485
             485
             245)
             245)
-          object AppRegistryMinVerDocImage: TImage
-            Left = 360
-            Top = 161
-            Width = 16
-            Height = 16
+          object AppRegistryMinVerDocBitBtn: TBitmapButton
+            Left = 358
+            Top = 159
+            Width = 22
+            Height = 22
             Anchors = [akTop, akRight]
             Anchors = [akTop, akRight]
             AutoSize = True
             AutoSize = True
-            Transparent = True
+            TabOrder = 9
           end
           end
           object AppRegistryFileLabel: TNewStaticText
           object AppRegistryFileLabel: TNewStaticText
             Left = 36
             Left = 36

+ 3 - 3
Projects/Src/IDE.Wizard.WizardForm.pas

@@ -14,7 +14,7 @@ interface
 uses
 uses
   Windows, Forms, Classes, Graphics, StdCtrls, ExtCtrls, Controls, Dialogs, pngimage,
   Windows, Forms, Classes, Graphics, StdCtrls, ExtCtrls, Controls, Dialogs, pngimage,
   UIStateForm, NewStaticText, DropListBox, NewCheckListBox, NewNotebook,
   UIStateForm, NewStaticText, DropListBox, NewCheckListBox, NewNotebook,
-  IDE.Wizard.WizardFormFilesHelper, IDE.Wizard.WizardFormRegistryHelper;
+  IDE.Wizard.WizardFormFilesHelper, IDE.Wizard.WizardFormRegistryHelper, BitmapButton;
 
 
 type
 type
   TWizardPage = (wpWelcome, wpAppInfo, wpAppDir, wpAppFiles, wpAppAssoc, wpAppIcons,
   TWizardPage = (wpWelcome, wpAppInfo, wpAppDir, wpAppFiles, wpAppAssoc, wpAppIcons,
@@ -139,7 +139,7 @@ type
     AppRegistryUninsDeleteValueCheck: TCheckBox;
     AppRegistryUninsDeleteValueCheck: TCheckBox;
     AppRegistryMinVerCheck: TCheckBox;
     AppRegistryMinVerCheck: TCheckBox;
     AppRegistryMinVerEdit: TEdit;
     AppRegistryMinVerEdit: TEdit;
-    AppRegistryMinVerDocImage: TImage;
+    AppRegistryMinVerDocBitBtn: TBitmapButton;
     WelcomeImageDark: TImage;
     WelcomeImageDark: TImage;
     InnerImageDark: TImage;
     InnerImageDark: TImage;
     procedure FormCreate(Sender: TObject);
     procedure FormCreate(Sender: TObject);
@@ -289,7 +289,7 @@ begin
   FRegistryHelper := TWizardFormRegistryHelper.Create(Self, AppRegistryFileEdit,
   FRegistryHelper := TWizardFormRegistryHelper.Create(Self, AppRegistryFileEdit,
     AppRegistryFileButton, AppRegistryUninsDeleteKeyCheck,
     AppRegistryFileButton, AppRegistryUninsDeleteKeyCheck,
     AppRegistryUninsDeleteKeyIfEmptyCheck, AppRegistryUninsDeleteValueCheck,
     AppRegistryUninsDeleteKeyIfEmptyCheck, AppRegistryUninsDeleteValueCheck,
-    AppRegistryMinVerCheck, AppRegistryMinVerEdit, AppRegistryMinVerDocImage);
+    AppRegistryMinVerCheck, AppRegistryMinVerEdit, AppRegistryMinVerDocBitBtn);
 
 
   FLanguages := TStringList.Create;
   FLanguages := TStringList.Create;
   FLanguages.Sorted := True;
   FLanguages.Sorted := True;

+ 11 - 11
Projects/Src/IDE.Wizard.WizardFormRegistryHelper.pas

@@ -12,7 +12,7 @@ unit IDE.Wizard.WizardFormRegistryHelper;
 interface
 interface
 
 
 uses
 uses
-  Forms, StdCtrls, ExtCtrls;
+  Forms, StdCtrls, ExtCtrls, BitmapButton;
 
 
 type
 type
   TPrivilegesRequired = (prAdmin, prLowest, prDynamic);
   TPrivilegesRequired = (prAdmin, prLowest, prDynamic);
@@ -24,7 +24,7 @@ type
       FUninsDeleteKeyCheck, FUninsDeleteKeyIfEmptyCheck,
       FUninsDeleteKeyCheck, FUninsDeleteKeyIfEmptyCheck,
       FUninsDeleteValueCheck, FMinVerCheck: TCheckBox;
       FUninsDeleteValueCheck, FMinVerCheck: TCheckBox;
       FMinVerEdit: TEdit;
       FMinVerEdit: TEdit;
-      FMinVerDocImage: TImage;
+      FMinVerDocBitBtn: TBitmapButton;
       FPrivilegesRequired: TPrivilegesRequired;
       FPrivilegesRequired: TPrivilegesRequired;
       procedure SetPrivilegesRequired(const Value: TPrivilegesRequired);
       procedure SetPrivilegesRequired(const Value: TPrivilegesRequired);
       procedure UpdateImages;
       procedure UpdateImages;
@@ -32,12 +32,12 @@ type
       procedure FileButtonClick(Sender: TObject);
       procedure FileButtonClick(Sender: TObject);
       procedure UninsDeleteKeyIfEmptyCheckClick(Sender: TObject);
       procedure UninsDeleteKeyIfEmptyCheckClick(Sender: TObject);
       procedure MinVerCheckClick(Sender: TObject);
       procedure MinVerCheckClick(Sender: TObject);
-      procedure MinVerDocImageClick(Sender: TObject);
+      procedure MinVerDocBitBtnClick(Sender: TObject);
     public
     public
       constructor Create(const Form: TForm; const FileEdit: TEdit;
       constructor Create(const Form: TForm; const FileEdit: TEdit;
         const FileButton: TButton; const UninsDeleteKeyCheck,
         const FileButton: TButton; const UninsDeleteKeyCheck,
         UninsDeleteKeyIfEmptyCheck, UninsDeleteValueCheck, MinVerCheck: TCheckBox;
         UninsDeleteKeyIfEmptyCheck, UninsDeleteValueCheck, MinVerCheck: TCheckBox;
-        const MinVerEdit: TEdit; const MinVerDocImage: TImage);
+        const MinVerEdit: TEdit; const MinVerDocBitBtn: TBitmapButton);
       procedure AddScript(var Registry: String; const AllowException: Boolean);
       procedure AddScript(var Registry: String; const AllowException: Boolean);
       property PrivilegesRequired: TPrivilegesRequired write SetPrivilegesRequired;
       property PrivilegesRequired: TPrivilegesRequired write SetPrivilegesRequired;
     end;
     end;
@@ -67,13 +67,13 @@ procedure TWizardFormRegistryHelper.UpdateImages;
 begin
 begin
  { After a DPI change the button's Width and Height isn't yet updated, so calculate it ourselves }
  { After a DPI change the button's Width and Height isn't yet updated, so calculate it ourselves }
   var WH := MulDiv(16, FForm.CurrentPPI, 96);
   var WH := MulDiv(16, FForm.CurrentPPI, 96);
-  FMinVerDocImage.Picture.Graphic:= GetImage(MainForm.HelpButton, WH);
+  FMinVerDocBitBtn.Bitmap:= GetImage(MainForm.HelpButton, WH).Bitmap;
 end;
 end;
 
 
 constructor TWizardFormRegistryHelper.Create(const Form: TForm;
 constructor TWizardFormRegistryHelper.Create(const Form: TForm;
   const FileEdit: TEdit; const FileButton: TButton; const UninsDeleteKeyCheck,
   const FileEdit: TEdit; const FileButton: TButton; const UninsDeleteKeyCheck,
   UninsDeleteKeyIfEmptyCheck, UninsDeleteValueCheck, MinVerCheck: TCheckBox;
   UninsDeleteKeyIfEmptyCheck, UninsDeleteValueCheck, MinVerCheck: TCheckBox;
-  const MinVerEdit: TEdit; const MinVerDocImage: TImage);
+  const MinVerEdit: TEdit; const MinVerDocBitBtn: TBitmapButton);
 begin
 begin
   FForm := Form;
   FForm := Form;
   FFileEdit := FileEdit;
   FFileEdit := FileEdit;
@@ -82,14 +82,14 @@ begin
   FUninsDeleteValueCheck := UninsDeleteValueCheck;
   FUninsDeleteValueCheck := UninsDeleteValueCheck;
   FMinVerCheck := MinVerCheck;
   FMinVerCheck := MinVerCheck;
   FMinVerEdit := MinVerEdit;
   FMinVerEdit := MinVerEdit;
-  FMinVerDocImage := MinVerDocImage;
+  FMinVerDocBitBtn := MinVerDocBitBtn;
 
 
   FileButton.OnClick := FileButtonClick;
   FileButton.OnClick := FileButtonClick;
   UninsDeleteKeyIfEmptyCheck.OnClick := UninsDeleteKeyIfEmptyCheckClick;
   UninsDeleteKeyIfEmptyCheck.OnClick := UninsDeleteKeyIfEmptyCheckClick;
   MinVerCheck.OnClick := MinVerCheckClick;
   MinVerCheck.OnClick := MinVerCheckClick;
   MinVerCheck.OnClick(nil);
   MinVerCheck.OnClick(nil);
-  MinVerDocImage.OnClick := MinVerDocImageClick;
-  MinVerDocImage.Cursor := crHandPoint;
+  MinVerDocBitBtn.OnClick := MinVerDocBitBtnClick;
+  MinVerDocBitBtn.Cursor := crHandPoint;
 
 
   TryEnableAutoCompleteFileSystem(FileEdit.Handle);
   TryEnableAutoCompleteFileSystem(FileEdit.Handle);
 
 
@@ -119,12 +119,12 @@ end;
 procedure TWizardFormRegistryHelper.MinVerCheckClick(Sender: TObject);
 procedure TWizardFormRegistryHelper.MinVerCheckClick(Sender: TObject);
 begin
 begin
   FMinVerEdit.Enabled := FMinVerCheck.Checked;
   FMinVerEdit.Enabled := FMinVerCheck.Checked;
-  FMinVerDocImage.Visible := FMinVerCheck.Checked;
+  FMinVerDocBitBtn.Visible := FMinVerCheck.Checked;
   if FMinVerEdit.Enabled then
   if FMinVerEdit.Enabled then
     FForm.ActiveControl := FMinVerEdit;
     FForm.ActiveControl := FMinVerEdit;
 end;
 end;
 
 
-procedure TWizardFormRegistryHelper.MinVerDocImageClick(Sender: TObject);
+procedure TWizardFormRegistryHelper.MinVerDocBitBtnClick(Sender: TObject);
 begin
 begin
   if Assigned(HtmlHelp) then
   if Assigned(HtmlHelp) then
     HtmlHelp(GetDesktopWindow, PChar(GetHelpFile), HH_DISPLAY_TOPIC, Cardinal(PChar('topic_winvernotes.htm')));
     HtmlHelp(GetDesktopWindow, PChar(GetHelpFile), HH_DISPLAY_TOPIC, Cardinal(PChar('topic_winvernotes.htm')));