Bladeren bron

Add dark versions of isdonate.bmp and ismail.bmp.

Martijn Laan 4 weken geleden
bovenliggende
commit
a75a2bf09d
5 gewijzigde bestanden met toevoegingen van 111 en 4 verwijderingen
  1. 92 0
      Projects/Src/IDE.StartupForm.dfm
  2. 9 1
      Projects/Src/IDE.StartupForm.pas
  3. BIN
      isdonate_dark.bmp
  4. 10 3
      isdonateandmail.iss
  5. BIN
      ismail_dark.bmp

+ 92 - 0
Projects/Src/IDE.StartupForm.dfm

@@ -18,6 +18,98 @@ object StartupForm: TStartupForm
     579
     419)
   TextHeight = 13
+  object DonateImageDark: TBitmapImage
+    Left = 176
+    Top = 385
+    Width = 62
+    Height = 31
+    AutoSize = True
+    PngImage.Data = {
+      89504E470D0A1A0A0000000D494844520000003E0000001F080300000088EF8E
+      E500000276504C544595CCFF94A9BE93CBFE8BC4FA84C0F84E4E4E7EBBF578B7
+      F33C6A9A3673B43772B13772B23A6EA5465A6E4D78914CB0EB4CACE54CA7DD4D
+      7F9D4D4E4E4D5A624CAAE14CB1ED4C99C64B51563674B73478C03477BD485563
+      4C95C04CBAFB4D7D994D6E824C8FB64857673772AF4757674757683A6DA44260
+      7F4954603F648C3B6C9F396EA63A6DA33F658E49545F445C753D699849556141
+      61843C69993D67944A555F4CA8DD4CB8F84D748B4D626E4C8AAE4C9ECE4D5458
+      4D7E9B4C95BF4CA1D24CA1D34C96C24C85A64D758D3D6895406387445D773C6A
+      9B4C5054455C754758693B689A4D5D664CB6F44D50524D626F4C96C14D72874C
+      9CCB4D616C3C69984260804857663673B33576BB4A535D445D79465A70495562
+      396EA748576847596B435F7D494F584D70844D50514D585F4D768E4D65734D79
+      934D63704D5C654D81A04C97C34D51524CAEE84CABE34D52544D4E503871AE36
+      74B63773B23477BE4161824955633B6B9F3476BC4A535B416284455B71406489
+      4C89AC4CB5F34CB4F24C9CCC4D565C4D778F4C99C74CA3D74C84A54D5F6A4C98
+      C44A545E3477BF3476BB3575BA386FAA445D784063893871AD4B51573870AA4C
+      50554C9FD04CB7F64CB6F54CB5F44C88AA4D69794D6B7C4D809E455B734B5259
+      4A525B4D4E4F4856663B6CA146596C3870AC445E794D565B4CB0EC4D59604D5A
+      614D52554D4F504CB2EE4CA2D54D585E4D697A3F658C3E67924A535C3D68964D
+      66764CA5D94CA6DB4CA5DA4D575D396FA84856653F668F47586B4C90B94C91B9
+      4D595F4CB9FA3F648B4B5158455B72465A6F435E7B4162864063884D70854D66
+      754D5E684C8EB54D6A7B4C89AD4D71863576BA3E66913772B0FFFFFF69ABEC22
+      24CB52000000B86558496649492A000800000005001A010500010000004A0000
+      001B010500010000005200000028010300010000000200000031010200110000
+      005A00000069870400010000006C000000000000000C770100E80300000C7701
+      00E80300005061696E742E4E455420352E312E31310000030000900700040000
+      003032333001A00300010000000100000005A004000100000096000000000000
+      0002000100020004000000523938000200070004000000303130300000000082
+      B0FCB2D2FA63BC0000027D4944415478DACD957F48535114C7BF678B96D58A15
+      8C46096508214934B63F225A4259698A15045214DBFA6163C22A73CDD445B4B2
+      675A4DD80AA19651828954CEB0D806D920A86D98948414DA1FA28BC0E614F28F
+      CADE7B9BF24CC239FFF13CDE7DF7DCEFF99C7BEFE15E1E81C691A4898848244E
+      96666D8EB888C4A279808BD932707B199B1E93C229AC44D18991E5AC3324C457
+      F2215CD0B758C4B2C958ACA2789D06264656FF81B85F88A78E7193D028A414B3
+      4F193D1BE82332B97E58C136FD488D293F43D8F605E9AF8578DA08323A90D58D
+      8DF481F37F6CEF1BC1266FF67B6C26EA8A6ADA733BA1A4507C15F941C59A5621
+      5EF0065B9FEE27BF864D1F52910F3BC9835D8FD68D6A52C80B958CDC12ECE627
+      6F433ED1B37DE414E0466A422151230EDF3AE34D5B5F273B4A4FF21AB5E4829E
+      B134405B67627B572AC8A5A77A14D11D18ACC2CA5F8E3C30D1105B3F0B53031C
+      6A44A9AD92A1218619AE2AB9711D66A20B5541B57511148340F9E3CFA8300A71
+      E745AC384DE3A2A2FA725C7DB9276C97771B9516360DA37751996E308BE8C8C3
+      53D21AB34D52629197FEC6CD4221DE548C73E739FF5A2D1C4406487B911E0164
+      E1684B311C0738A9A1C715DD1159DCE57C9163A8595A20C45B8F4157CDF96E3D
+      60B2034BBEA24D07DCDF0B870D77733929E704BB607335EE11694F5E9A72EA32
+      6B3B95D9FC80F7ACCC4ADFE5361F5E1D84BC1BE86847AE8697FC64E96D0EA97E
+      F50D0F146C99E9CC7B6EFBDD9ECAA4AFCCDB3C3467257C65FEB5B5C7EDCFCB7C
+      49E389D9BCC203ECABE63F6A04B8CEA4C3A9EAB8FC7F9C47E26D2CC56496F88B
+      4471FE89CF2B5848C2380298E5ECD3F73E059F61EFB3AFFC029A13BE30E93F24
+      6B4192E0DD1CF8BF4C9BD589676A35870000000049454E44AE426082}
+    Visible = False
+  end
+  object MailingListImageDark: TBitmapImage
+    Left = 244
+    Top = 385
+    Width = 62
+    Height = 31
+    AutoSize = True
+    PngImage.Data = {
+      89504E470D0A1A0A0000000D494844520000003E0000001F080300000088EF8E
+      E500000105504C544595CCFF94A9BE93CBFE8BC4FA84C0F84E4E4E7EBBF578B7
+      F34CB8F84D9FD44D99CA4D9BCE4D98CA4DA1D74CB9FA4CA8E14D96C64E677C4E
+      3B144E45384E463A4E44374E6D864D97C84CABE54D94C34E5D6C4D9BCD4D85AC
+      4E4A454E4B474E4D4B4D8AB34E59634D97C74E40284E4F504D8DB84E5C684E47
+      3D4E463B4E61714D99CB4D88B14E4C494E42304D9ED14D96C74E45394E453A4D
+      76944D9ED24E74924E4E4F4E4C4A4E463C4D7A9B4E708C4E4D4C4D9DD14E5D6A
+      4D98C84D8CB64E52564D90BD4D95C44E58624E473F4E4A464D86AE4D76964D81
+      A64E48414E4B484E4D4D4E6E894D98C94E69804E4E4D4E473E4E3A094E3B154D
+      9CCF4CACE74CAFEAFFFFFF69ABECAA86AB90000000B86558496649492A000800
+      000005001A010500010000004A0000001B010500010000005200000028010300
+      010000000200000031010200110000005A00000069870400010000006C000000
+      000000000C770100E80300000C770100E80300005061696E742E4E455420352E
+      312E31310000030000900700040000003032333001A003000100000001000000
+      05A0040001000000960000000000000002000100020004000000523938000200
+      070004000000303130300000000082B0FCB2D2FA63BC000001204944415478DA
+      636460FCCF40266062646464622657371050A89D89919989FADA9981BE427524
+      E37712B47331322219C0F8978591F12D09DA45C0DA9F4338124C8CAFC45FFD22
+      41BB2C50F3277EC67B20B632D828C6EB2468D7627C2F04D4F2E7BD1890FCC6FD
+      9DEB2FCB2952B43FF9C4A0240A0CAFDFFC209B0F311891AC9D41528DF1A9CC51
+      1B46C63D0CE46867707D26CDC8F8586E3B0379DA81816EF4F52098419E763818
+      4ADA6DF81FA0F01FDB316E2641BBDF1D595481C7AA1B49D04E2C180EDA038078
+      43C00620630398091501911B104C901A24365C3B4823840CD880205145903144
+      16C5F60D0CE8B66F80190BB52A00D951601124BF23DB0BB39B48DB516C44361F
+      CD5538FC4E41C8B33052A49D8DEC1A12080219D919FC29D00F00EA1574936972
+      4CDD0000000049454E44AE426082}
+    Visible = False
+  end
   object DonateBitBtn: TBitmapButton
     Left = 6
     Top = 381

+ 9 - 1
Projects/Src/IDE.StartupForm.pas

@@ -13,7 +13,7 @@ interface
 
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  UIStateForm, StdCtrls, ExtCtrls, BitmapButton;
+  UIStateForm, StdCtrls, ExtCtrls, BitmapButton, BitmapImage;
 
 type
   TStartupFormResult = (srNone, srEmpty, srWizard, srOpenFile, srOpenDialog,
@@ -33,6 +33,8 @@ type
     OpenImage: TImage;
     DonateBitBtn: TBitmapButton;
     MailingListBitBtn: TBitmapButton;
+    DonateImageDark: TBitmapImage;
+    MailingListImageDark: TBitmapImage;
     procedure RadioButtonClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure DblClick_(Sender: TObject);
@@ -110,6 +112,12 @@ begin
   end else
 	  DonateBitBtn.Hint := MainForm.UpdatePanelDonateBitBtn.Hint;
 
+  if InitFormThemeIsDark then begin
+    if DonateBitBtn.Visible then
+      DonateBitBtn.Bitmap := DonateImageDark.Bitmap;
+    MailingListBitBtn.Bitmap := MailingListImageDark.Bitmap;
+  end;
+
   UpdateImages;
 
   OpenListBox.Items.Add(SCompilerExampleScripts);

BIN
isdonate_dark.bmp


+ 10 - 3
isdonateandmail.iss

@@ -3,7 +3,9 @@
 //
 [Files]
 Source: "{#__DIR__}\isdonate.bmp"; Flags: dontcopy noencryption
+Source: "{#__DIR__}\isdonate_dark.bmp"; Flags: dontcopy noencryption
 Source: "{#__DIR__}\ismail.bmp"; Flags: dontcopy noencryption
+Source: "{#__DIR__}\ismail_dark.bmp"; Flags: dontcopy noencryption
 
 [CustomMessages]
 ; No need to localize: The IS website is in English only
@@ -30,14 +32,19 @@ end;
 <event('InitializeWizard')>
 procedure IsDonateAndMailInitializeWizard;
 var
-  ImageFileName: String;
+  ImageFileName, ImageFileNamePostfix: String;
   DonateBitmapButton, MailBitmapButton: TBitmapButton;
   BevelTop: Integer;
 begin
   if WizardSilent then
     Exit;
+    
+  if IsDarkInstallMode then
+    ImageFileNamePostfix := '_dark'
+  else
+    ImageFileNamePostfix := '';
 
-  ImageFileName := ExpandConstant('{tmp}\isdonate.bmp');
+  ImageFileName := ExpandConstant(Format('{tmp}\isdonate%s.bmp', [ImageFileNamePostfix]));
   ExtractTemporaryFile(ExtractFileName(ImageFileName));
 
   DonateBitmapButton := TBitmapButton.Create(WizardForm);
@@ -53,7 +60,7 @@ begin
   DonateBitmapButton.OnClick := @DonateBitmapButtonOnClick;
   DonateBitmapButton.Parent := WizardForm;
 
-  ImageFileName := ExpandConstant('{tmp}\ismail.bmp');
+  ImageFileName := ExpandConstant(Format('{tmp}\ismail%s.bmp', [ImageFileNamePostfix]));
   ExtractTemporaryFile(ExtractFileName(ImageFileName));
 
   MailBitmapButton := TBitmapButton.Create(WizardForm);

BIN
ismail_dark.bmp