From 442391b2723ebebdc185d09c0acb49eac529bd13 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Thu, 18 Jun 2020 10:09:45 +0300
Subject: [PATCH] Added dark theme compatible loading gif

---
 .../Properties/Resources.Designer.cs              |  14 ++++++++++++--
 ShareX.HelpersLib/Properties/Resources.resx       |   9 ++++++---
 .../{LoadingSmall.gif => LoadingSmallBlack.gif}   | Bin
 ShareX.HelpersLib/Resources/LoadingSmallWhite.gif | Bin 0 -> 847 bytes
 ShareX.HelpersLib/ShareX.HelpersLib.csproj        |   5 ++++-
 .../UpdateChecker/UpdateCheckerLabel.Designer.cs  |   2 +-
 .../UpdateChecker/UpdateCheckerLabel.cs           |  12 ++++++++++++
 ShareX/Forms/AboutForm.cs                         |   2 ++
 8 files changed, 37 insertions(+), 7 deletions(-)
 rename ShareX.HelpersLib/Resources/{LoadingSmall.gif => LoadingSmallBlack.gif} (100%)
 create mode 100644 ShareX.HelpersLib/Resources/LoadingSmallWhite.gif

diff --git a/ShareX.HelpersLib/Properties/Resources.Designer.cs b/ShareX.HelpersLib/Properties/Resources.Designer.cs
index fa8da4e66..bae32c7fe 100644
--- a/ShareX.HelpersLib/Properties/Resources.Designer.cs
+++ b/ShareX.HelpersLib/Properties/Resources.Designer.cs
@@ -2251,9 +2251,19 @@ internal static System.Drawing.Bitmap Loading {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap LoadingSmall {
+        internal static System.Drawing.Bitmap LoadingSmallBlack {
             get {
-                object obj = ResourceManager.GetObject("LoadingSmall", resourceCulture);
+                object obj = ResourceManager.GetObject("LoadingSmallBlack", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap LoadingSmallWhite {
+            get {
+                object obj = ResourceManager.GetObject("LoadingSmallWhite", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
diff --git a/ShareX.HelpersLib/Properties/Resources.resx b/ShareX.HelpersLib/Properties/Resources.resx
index 7876a7470..9500916ca 100644
--- a/ShareX.HelpersLib/Properties/Resources.resx
+++ b/ShareX.HelpersLib/Properties/Resources.resx
@@ -1193,9 +1193,6 @@ Would you like to download and install it?</value>
   <data name="AmazonS3StorageClass_STANDARD_IA" xml:space="preserve">
     <value>Amazon S3 Standard-Infrequent Access</value>
   </data>
-  <data name="LoadingSmall" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\LoadingSmall.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="RandomNonAmbiguousAlphanumericCharRepeatUsingN" xml:space="preserve">
     <value>Random non ambiguous alphanumeric char. Repeat using {n}</value>
   </data>
@@ -1250,4 +1247,10 @@ Would you like to download and install it?</value>
   <data name="AmazonS3StorageClass_ONEZONE_IA" xml:space="preserve">
     <value>Amazon S3 One Zone-Infrequent Access</value>
   </data>
+  <data name="LoadingSmallBlack" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LoadingSmallBlack.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LoadingSmallWhite" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LoadingSmallWhite.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX.HelpersLib/Resources/LoadingSmall.gif b/ShareX.HelpersLib/Resources/LoadingSmallBlack.gif
similarity index 100%
rename from ShareX.HelpersLib/Resources/LoadingSmall.gif
rename to ShareX.HelpersLib/Resources/LoadingSmallBlack.gif
diff --git a/ShareX.HelpersLib/Resources/LoadingSmallWhite.gif b/ShareX.HelpersLib/Resources/LoadingSmallWhite.gif
new file mode 100644
index 0000000000000000000000000000000000000000..dc6640f1c51cf354d68d7e86f3c51cff76b74f04
GIT binary patch
literal 847
zcmZ?wbhEHb6krfw_`(1J|NsAIV`DpZ>{wM*)sG)PZrr$`p`j5L7WU%Bi;j+t88c=`
zNlB%prCC^5Y}>YN#flYRO~ew4|GE8KLxP<h16+;t444^#`V{|3ITxiSmZYXAlxLP?
zC?sYjR^;R-rs!qnrR6gy{$%0g0;<vh*#L4R18abSLSIVeyrl*rIf_~>39Hu55IHtc
z%CzAF+s%%K=w22Zrp(rWi2|*Rovn-d)@bT9ct-tLq>}Vum&c?D7A-4G)nqF=O|unj
zghf78${u~+?}W{g3<ZTQ_e(t)T2e<JtXSco;#zy)z`<)rnK*i;G^A#T2=N>|px_|L
z<#V9nLvo;dGn3Pnr`rNdXDHaLG7U`$+@}3PY2V`XDF!RV)-77t@0cxcUfGd>+a|!=
zfZc|ZrNMwNlFdSkm$O}25u4=+Kp!f9o}h6{#6yegNPq~Z?vi%H_r{G}R?eply|;L@
zG(BYV(3_!hb7Lg~hrqszXIO7!aqBgPyExq8i)2`2;K3=@s$<aSbcL%gTfpntTb@vR
z({g5(8kKC`7)^ejZmgCDL4vhGVG5I>$WezC&CYUcYs8ObcQ?&pRCIchV9(IFooU|$
zW!EN)DyP7RhUDG3i^{l#lol$yJhV8WF`<n&)NPq$(H%*?r3J4wKd1d~z-kT1Z@}1F
z;lSf+C~)YcL~g9a@tqPLJr~+;Xs`=(v6wI^JlD{XSmvgf=)n*XJcFY#*L2BN#v~Vy
zEo=;{b|xn2aP_G+6c~#oA5q?*{)6|861$0+d4QT$gnolYPp=AAOXH!IdH_AfvCP4Q
z;n1dIj!K>rIX28%n80C|*UIW?pwc1HE9Y&#iPuAi{a~kVNwZc{v#XSdz>>qd7ZX-=
oBphJ+DPY*iA+ce)LqDIhc?O5RAxj!-jAnO_nj(WWD0zYb0L796mH+?%

literal 0
HcmV?d00001

diff --git a/ShareX.HelpersLib/ShareX.HelpersLib.csproj b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
index d36e1b73c..6f10e3d65 100644
--- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj
+++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
@@ -1473,7 +1473,10 @@
     <None Include="Resources\ShareX_Icon_White.ico" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\LoadingSmall.gif" />
+    <None Include="Resources\LoadingSmallBlack.gif" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\LoadingSmallWhite.gif" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.Designer.cs b/ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.Designer.cs
index e109e3419..dbf49fee1 100644
--- a/ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.Designer.cs
+++ b/ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.Designer.cs
@@ -38,7 +38,7 @@ private void InitializeComponent()
             // 
             // pbLoading
             // 
-            this.pbLoading.Image = global::ShareX.HelpersLib.Properties.Resources.LoadingSmall;
+            this.pbLoading.Image = global::ShareX.HelpersLib.Properties.Resources.LoadingSmallBlack;
             resources.ApplyResources(this.pbLoading, "pbLoading");
             this.pbLoading.Name = "pbLoading";
             this.pbLoading.TabStop = false;
diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.cs b/ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.cs
index 2745f85fc..962abf683 100644
--- a/ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.cs
+++ b/ShareX.HelpersLib/UpdateChecker/UpdateCheckerLabel.cs
@@ -60,6 +60,18 @@ public void CheckUpdate(UpdateChecker updateChecker)
             }
         }
 
+        public void UpdateLoadingImage()
+        {
+            if (ShareXResources.IsDarkTheme)
+            {
+                pbLoading.Image = Resources.LoadingSmallWhite;
+            }
+            else
+            {
+                pbLoading.Image = Resources.LoadingSmallBlack;
+            }
+        }
+
         private void CheckingUpdate()
         {
             updateChecker.CheckUpdate();
diff --git a/ShareX/Forms/AboutForm.cs b/ShareX/Forms/AboutForm.cs
index 9954e9562..e1afb21fc 100644
--- a/ShareX/Forms/AboutForm.cs
+++ b/ShareX/Forms/AboutForm.cs
@@ -61,6 +61,8 @@ public AboutForm()
 #else
             if (!Program.PortableApps)
             {
+                uclUpdate.UpdateLoadingImage();
+
                 UpdateChecker updateChecker = Program.UpdateManager.CreateUpdateChecker();
                 uclUpdate.CheckUpdate(updateChecker);
             }