Added custom progress bar with text (to please Lazar)

Author: Lothindir

ThemePacker/CustomProgressBar.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ThemePacker
+{
+    public enum ProgressBarDisplayText
+    {
+        Percentage,
+        CustomText
+    }
+
+    class CustomProgressBar : ProgressBar
+    {
+        //Property to set to decide whether to print a % or Text
+        public ProgressBarDisplayText DisplayStyle { get; set; }
+
+        //Property to hold the custom text
+        public string CustomText { get; set; }
+
+        public CustomProgressBar()
+        {
+            // Modify the ControlStyles flags
+            //http://msdn.microsoft.com/en-us/library/system.windows.forms.controlstyles.aspx
+            SetStyle(ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint, true);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Rectangle rect = ClientRectangle;
+            Graphics g = e.Graphics;
+
+            ProgressBarRenderer.DrawHorizontalBar(g, rect);
+            rect.Inflate(-3, -3);
+            if (Value > 0)
+            {
+                // As we doing this ourselves we need to draw the chunks on the progress bar
+                Rectangle clip = new Rectangle(rect.X, rect.Y, (int)Math.Round(((float)Value / Maximum) * rect.Width), rect.Height);
+                ProgressBarRenderer.DrawHorizontalChunks(g, clip);
+            }
+
+            // Set the Display text (Either a % amount or our custom text
+            string text = DisplayStyle == ProgressBarDisplayText.Percentage ? Value.ToString() + '%' : CustomText;
+
+
+            using (Font f = SystemFonts.DefaultFont)
+            {
+
+                SizeF len = g.MeasureString(text, f);
+                // Calculate the location of the text (the middle of progress bar)
+                // Point location = new Point(Convert.ToInt32((rect.Width / 2) - (len.Width / 2)), Convert.ToInt32((rect.Height / 2) - (len.Height / 2)));
+                Point location = new Point(Convert.ToInt32((Width / 2) - len.Width / 2), Convert.ToInt32((Height / 2) - len.Height / 2));
+                // The commented-out code will centre the text into the highlighted area only. This will centre the text regardless of the highlighted area.
+                // Draw the custom text
+                g.DrawString(text, f, Brushes.Black, location);
+            }
+        }
+    }
+}

ThemePacker/MainForm.Designer.cs

@@ -9,26 +9,41 @@
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace ThemePacker
 {
     public partial class ThemePacker : Form
     {
+
+        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+        static extern uint SendMessage(IntPtr hWnd, uint Msg, uint wParam, uint lParam);
+
         private List<string> _likeds;
         private Dictionary<string, Image> _pictures;
         private string _path;
         private int _currentPic;
         private bool _isFolderBased;
 
+        private CustomProgressBar pbProgression;
+
         private EventHandler _btnNextClick;
 
         private ImageList _imageList;
 
         public ThemePacker()
         {
             InitializeComponent();
+            pbProgression = new CustomProgressBar(); pbProgression.Location = new Point(69, 496);
+            pbProgression.MarqueeAnimationSpeed = 0;
+            pbProgression.Name = "pbProgression";
+            pbProgression.Size = new Size(400, 28);
+            pbProgression.Style = ProgressBarStyle.Continuous;
+            pbProgression.TabIndex = 16;
+            pbProgression.DisplayStyle = ProgressBarDisplayText.CustomText;
+            Controls.Add(pbProgression);
         }
 
         private void ThemePacker_Load(object sender, EventArgs e)
@@ -152,7 +167,9 @@ private void BtnPrevious_Click(object sender, EventArgs e)
         private void UpdatePic()
         {
             pbWallpaper.Image = _pictures.ElementAt(_currentPic).Value;
-            pbProgression.Value = (int) Math.Ceiling((_currentPic * 100) / (decimal)(_pictures.Count));
+            pbProgression.Value = (int)Math.Ceiling(((_currentPic + 1) * 100) / (decimal)(_pictures.Count));
+            pbProgression.CustomText = $"{_currentPic + 1} / {_pictures.Count}";
+            pbProgression.Refresh();
         }
 
         private void BtnNext_Click(object sender, EventArgs e)
@@ -252,7 +269,7 @@ private void CreateDirectory(string path)
 
         private void PicturesLsv_Click(object sender, EventArgs e)
         {
-            if(picturesLsv.SelectedItems.Count > 0)
+            if (picturesLsv.SelectedItems.Count > 0)
             {
                 pbWallpaper.Image = _pictures[picturesLsv.SelectedItems[0].ImageKey];
             }
@@ -330,17 +347,12 @@ private async Task GetImageFromInspirobot()
         private void ThemePacker_FormClosed(object sender, FormClosedEventArgs e)
         {
             ClearPictures();
-            if(Directory.Exists("temp"))
+            if (Directory.Exists("temp"))
             {
                 Directory.Delete("temp", true);
             }
         }
 
-        ~ThemePacker()
-        {
-            ClearPictures();
-        }
-
         private void ImportThemepackToolStripMenuItem_Click(object sender, EventArgs e)
         {
 
@@ -350,5 +362,10 @@ private void AsImageFolderToolStripMenuItem_Click(object sender, EventArgs e)
         {
 
         }
+
+        ~ThemePacker()
+        {
+            ClearPictures();
+        }
     }
 }

ThemePacker/MainForm.cs

@@ -52,6 +52,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CustomProgressBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
     </Compile>