SourceControl high dpi improvements and defaults updated...

Author: Meychi

External/Plugins/SourceControl/Actions/ProjectWatcher.cs

@@ -9,6 +9,7 @@
 using System.Drawing;
 using System.Reflection;
 using PluginCore.Localization;
+using PluginCore.Helpers;
 
 namespace SourceControl.Actions
 {
@@ -37,11 +38,11 @@ public static void Init()
                 try
                 {
                     Assembly assembly = Assembly.GetExecutingAssembly();
-                    Skin = new Bitmap(assembly.GetManifestResourceStream("SourceControl.Resources.icons.png"));
+                    Skin = new Bitmap(assembly.GetManifestResourceStream(ScaleHelper.GetScale() > 1.5 ? "SourceControl.Resources.icons32.png" : "SourceControl.Resources.icons.png"));
                 }
                 catch
                 {
-                    Skin = new Bitmap(160, 16);
+                    Skin = ScaleHelper.GetScale() > 1.5 ? new Bitmap(320, 32) : new Bitmap(160, 16);
                 }
             }
 

External/Plugins/SourceControl/Managers/OverlayManager.cs

@@ -4,6 +4,8 @@
 using System.Windows.Forms;
 using ProjectManager.Controls.TreeView;
 using SourceControl.Actions;
+using PluginCore.Helpers;
+using System;
 
 namespace SourceControl.Managers
 {
@@ -201,12 +203,14 @@ static public void SetOverlay(VCItemStatus status, TreeNode node, TreeView tree)
 
             Image original = tree.ImageList.Images[node.ImageIndex];
             Bitmap composed = original.Clone() as Bitmap;
+            Int32 curSize = ScaleHelper.GetScale() > 1.5 ? 32 : 16;
             using (Graphics destination = Graphics.FromImage(composed))
             {
-                destination.DrawImage(iconSkin, new Rectangle(0, 0, 16, 16), 
-                    new Rectangle((int)status * 16, 0, 16, 16), GraphicsUnit.Pixel);
+                destination.DrawImage(iconSkin, new Rectangle(0, 0, composed.Width, composed.Height),
+                    new Rectangle((int)status * curSize, 0, curSize, curSize), GraphicsUnit.Pixel);
             }
             int index = tree.ImageList.Images.Count;
+            composed = (Bitmap)PluginCore.PluginBase.MainForm.ImageSetAdjust((Image)composed);
             tree.ImageList.Images.Add(composed);
             map[node.ImageIndex] = index;
             node.SelectedImageIndex = node.ImageIndex = index;

External/Plugins/SourceControl/Resources/PSD/icons.psd

@@ -61,25 +61,25 @@ public Boolean EnableGIT
             set { this.enableGIT = value; }
         }
 
-        [DefaultValue("git")]
+        [DefaultValue("git.exe")]
         [DisplayName("GIT Path")]
         [LocalizedCategory("SourceControl.Category.GIT")]
         [LocalizedDescription("SourceControl.Description.GITPath")]
         [Editor(typeof(FileNameEditor), typeof(UITypeEditor))]
         public String GITPath
         {
-            get { return this.gitPath ?? "git"; }
+            get { return this.gitPath ?? "git.exe"; }
             set { this.gitPath = value; }
         }
 
-        [DefaultValue("TortoiseProc.exe")]
+        [DefaultValue("TortoiseGitProc.exe")]
         [DisplayName("TortoiseGIT Proc Path")]
         [LocalizedCategory("SourceControl.Category.GIT")]
         [LocalizedDescription("SourceControl.Description.TortoiseGITProcPath")]
         [Editor(typeof(FileNameEditor), typeof(UITypeEditor))]
         public String TortoiseGITProcPath
         {
-            get { return this.tortoiseGitProcPath ?? "TortoiseProc.exe"; }
+            get { return this.tortoiseGitProcPath ?? "TortoiseGitProc.exe"; }
             set { this.tortoiseGitProcPath = value; }
         }
 
@@ -93,25 +93,25 @@ public Boolean EnableHG
             set { this.enableHG = value; }
         }
 
-        [DefaultValue("hg")]
+        [DefaultValue("hg.exe")]
         [DisplayName("HG Path")]
         [LocalizedCategory("SourceControl.Category.HG")]
         [LocalizedDescription("SourceControl.Description.HGPath")]
         [Editor(typeof(FileNameEditor), typeof(UITypeEditor))]
         public String HGPath
         {
-            get { return this.hgPath ?? "hg"; }
+            get { return this.hgPath ?? "hg.exe"; }
             set { this.hgPath = value; }
         }
 
-        [DefaultValue("thgw")]
+        [DefaultValue("thgw.exe")]
         [DisplayName("TortoiseHG Proc Path")]
         [LocalizedCategory("SourceControl.Category.HG")]
         [LocalizedDescription("SourceControl.Description.TortoiseHGProcPath")]
         [Editor(typeof(FileNameEditor), typeof(UITypeEditor))]
         public String TortoiseHGProcPath
         {
-            get { return this.tortoiseHGProcPath ?? "thgw"; }
+            get { return this.tortoiseHGProcPath ?? "thgw.exe"; }
             set { this.tortoiseHGProcPath = value; }
         }
 

External/Plugins/SourceControl/Resources/PSD/icons32.psd

@@ -158,4 +158,7 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\icons32.png" />
+  </ItemGroup>
 </Project>