Release 2.10.3-beta

.github/ISSUE_TEMPLATE/bug_report.md

@@ -25,3 +25,6 @@ If applicable, add screenshots to help explain your problem.
 
 **Additional context**
 Add any other context about the problem here.
+
+**Log file**
+Please upload the latest log file (Help -> Export latest log)

ActionButton/ActionButton.cs

@@ -126,10 +126,10 @@ private void UpdateBindingState(Variables.Variable variable)
             }
         }
 
+        public string Guid { get; set; } = System.Guid.NewGuid().ToString();
 
         public event EventHandler StateChanged;
         public event EventHandler IconChanged;
-        public long ButtonId { get; set; }
 
         private bool _state = false;
         public bool State
@@ -181,6 +181,8 @@ public string IconOn
 
         public ButtonLabel LabelOff { get; set; } = new ButtonLabel();
         public ButtonLabel LabelOn { get; set; } = new ButtonLabel();
+        public Color BackColorOff = Color.FromArgb(35, 35, 35);
+        public Color BackColorOn = Color.FromArgb(35, 35, 35);
         public int Position_X { get; set; } = -1;
         public int Position_Y { get; set; } = -1;
         public string StateBindingVariable { get; set; } = string.Empty;

ActionButton/Plugin/ActionButtonPlugin.cs

@@ -15,8 +15,8 @@ namespace SuchByte.MacroDeck.ActionButton
 {
     public class ActionButtonPlugin : MacroDeckPlugin
     {
-        public override string Name => LanguageManager.Strings.PluginActionButton;
-        public override string Author => "Macro Deck";
+        internal override string Name => LanguageManager.Strings.PluginActionButton;
+        internal override string Author => "Macro Deck";
         public override void Enable()
         {
             this.Actions = new List<PluginAction>()

Backup/BackupManager.cs

@@ -247,9 +247,12 @@ public static void CreateBackup()
                         archive.CreateEntryFromFile(Path.Combine(MacroDeck.PluginCredentialsPath, file.Name), Path.Combine(pluginCredentialsDirectoryInfo.Name, file.Name));
                     }
                     DirectoryInfo iconPackDirectoryInfo = new DirectoryInfo(MacroDeck.IconPackDirectoryPath);
-                    foreach (FileInfo file in iconPackDirectoryInfo.GetFiles("*"))
+                    foreach (DirectoryInfo dir in iconPackDirectoryInfo.GetDirectories())
                     {
-                        archive.CreateEntryFromFile(Path.Combine(MacroDeck.IconPackDirectoryPath, file.Name), Path.Combine(iconPackDirectoryInfo.Name, file.Name));
+                        foreach (FileInfo iconPackFile in dir.GetFiles())
+                        {
+                            archive.CreateEntryFromFile(Path.Combine(MacroDeck.IconPackDirectoryPath, dir.Name, iconPackFile.Name), Path.Combine(iconPackDirectoryInfo.Name, dir.Name, iconPackFile.Name));
+                        }
                     }
 
                     MacroDeckLogger.Info("Backup successfully created: " + backupFileName);
@@ -289,7 +292,5 @@ public static void DeleteBackup(string fileName)
                 }
             }
         }
-
-
     }
 }

Device/DeviceManager.cs

@@ -44,6 +44,11 @@ public static void SaveKnownDevices()
                 {
                     serializer.Serialize(writer, _macroDeckDevices);
                 }
+
+                if (OnDevicesChange != null)
+                {
+                    OnDevicesChange(null, EventArgs.Empty);
+                }
             }
             catch (Exception ex)
             {
@@ -58,11 +63,6 @@ public static void AddKnownDevice(MacroDeckDevice macroDeckDevice)
                 _macroDeckDevices.Add(macroDeckDevice);
             }
             SaveKnownDevices();
-
-            if (OnDevicesChange != null)
-            {
-                OnDevicesChange(macroDeckDevice, EventArgs.Empty);
-            }
         }
 
         public static bool IsKnownDevice(string clientId)
@@ -111,10 +111,6 @@ public static void SetProfile(MacroDeckDevice macroDeckDevice, MacroDeckProfile
             if (macroDeckDevice.Available)
             {
                 MacroDeckServer.SetProfile(MacroDeckServer.GetMacroDeckClient(macroDeckDevice.ClientId), macroDeckProfile);
-            }   
-            if (OnDevicesChange != null)
-            {
-                OnDevicesChange(macroDeckDevice, EventArgs.Empty);
             }
         }
 
@@ -129,10 +125,6 @@ public static void SetBlocked(MacroDeckDevice macroDeckDevice, bool blocked)
             {
                 MacroDeckServer.GetMacroDeckClient(macroDeckDevice.ClientId).SocketConnection.Close();
             }
-            if (OnDevicesChange != null)
-            {
-                OnDevicesChange(macroDeckDevice, EventArgs.Empty);
-            }
         }
 
         public static void RenameMacroDeckDevice(MacroDeckDevice macroDeckDevice, string displayName)
@@ -142,10 +134,6 @@ public static void RenameMacroDeckDevice(MacroDeckDevice macroDeckDevice, string
                 macroDeckDevice.DisplayName = displayName;
                 SaveKnownDevices();
             }
-            if (OnDevicesChange != null)
-            {
-                OnDevicesChange(macroDeckDevice, EventArgs.Empty);
-            }
         }
 
         public static void RemoveKnownDevice(MacroDeckDevice macroDeckDevice)
@@ -155,10 +143,6 @@ public static void RemoveKnownDevice(MacroDeckDevice macroDeckDevice)
                 _macroDeckDevices.Remove(macroDeckDevice);
                 SaveKnownDevices();
             }
-            if (OnDevicesChange != null)
-            {
-                OnDevicesChange(macroDeckDevice, EventArgs.Empty);
-            }
         }
 
         public static bool IsDisplayNameAvailable(string displayName)

Extension/IMacroDeckExtension.cs

@@ -0,0 +1,17 @@
+using SuchByte.MacroDeck.ExtensionStore;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SuchByte.MacroDeck.Extension
+{
+    public interface IMacroDeckExtension
+    {
+        public ExtensionType ExtensionType { get; }
+        public string ExtensionTypeDisplayName { get; }
+        public object ExtensionObject { get; }
+        public bool Configurable { get; }
+        public void Uninstall();
+
+    }
+}

Extension/IconPackExtension.cs

@@ -0,0 +1,27 @@
+using SuchByte.MacroDeck.ExtensionStore;
+using SuchByte.MacroDeck.Icons;
+using SuchByte.MacroDeck.Language;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SuchByte.MacroDeck.Extension
+{
+    public class IconPackExtension : IMacroDeckExtension
+    {
+        public ExtensionType ExtensionType => ExtensionType.IconPack;
+        public string ExtensionTypeDisplayName => LanguageManager.Strings.IconPack;
+        public object ExtensionObject { get; set; }
+        public bool Configurable => false;
+
+        public IconPackExtension(IconPack iconPack)
+        {
+            this.ExtensionObject = iconPack;
+        }
+
+        public void Uninstall()
+        {
+
+        }
+    }
+}

Extension/PluginExtension.cs

@@ -0,0 +1,28 @@
+using SuchByte.MacroDeck.ExtensionStore;
+using SuchByte.MacroDeck.Language;
+using SuchByte.MacroDeck.Plugins;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SuchByte.MacroDeck.Extension
+{
+    public class PluginExtension : IMacroDeckExtension
+    {
+        public ExtensionType ExtensionType => ExtensionType.Plugin;
+        public string ExtensionTypeDisplayName => LanguageManager.Strings.Plugin;
+        public object ExtensionObject { get; set; }
+
+        public bool Configurable => this.ExtensionObject != null && (this.ExtensionObject as MacroDeckPlugin).CanConfigure;
+
+        public PluginExtension(MacroDeckPlugin macroDeckPlugin)
+        {
+            this.ExtensionObject = macroDeckPlugin;
+        }
+
+        public void Uninstall()
+        {
+
+        }
+    }
+}

ExtensionStore/ExtensionStoreHelper.cs

@@ -0,0 +1,114 @@
+using SuchByte.MacroDeck.GUI.Dialogs;
+using SuchByte.MacroDeck.Icons;
+using SuchByte.MacroDeck.Model;
+using SuchByte.MacroDeck.Plugins;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SuchByte.MacroDeck.ExtensionStore
+{
+    public class ExtensionStoreHelper
+    {
+        public static event EventHandler OnUpdateCheckFinished;
+
+        private static ExtensionStoreDownloader extensionStoreDownloader;
+
+        public static void InstallPluginById(string packageId)
+        {
+            InstallPackages(new List<ExtensionStoreDownloaderPackageInfoModel> { new ExtensionStoreDownloaderPackageInfoModel() { PackageId = packageId, ExtensionType = ExtensionType.Plugin } });
+        }
+
+        public static void InstallIconPackById(string packageId)
+        {
+            InstallPackages(new List<ExtensionStoreDownloaderPackageInfoModel> { new ExtensionStoreDownloaderPackageInfoModel() { PackageId = packageId, ExtensionType = ExtensionType.IconPack } });
+        }
+
+        internal static void InstallById(string packageId)
+        {
+            InstallPackages(new List<ExtensionStoreDownloaderPackageInfoModel> { new ExtensionStoreDownloaderPackageInfoModel() { PackageId = packageId } });
+        }
+
+        public static void InstallPackages(List<ExtensionStoreDownloaderPackageInfoModel> packages)
+        {
+            if (MacroDeck.MainWindow == null) return;
+            MacroDeck.MainWindow.Invoke(new Action(() =>
+            {
+                extensionStoreDownloader = new ExtensionStoreDownloader(packages)
+                {
+                    Owner = MacroDeck.MainWindow,
+                };
+                extensionStoreDownloader.Show();
+            }));
+        }
+
+        public static string GetPackageId(MacroDeckPlugin macroDeckPlugin)
+        {
+            return new DirectoryInfo(PluginManager.PluginDirectories[macroDeckPlugin]).Name;
+        }
+
+        public static void SearchUpdatesAsync()
+        {
+            PluginManager.PluginsUpdateAvailable.Clear();
+            IconManager.IconPacksUpdateAvailable.Clear();
+            Task.Run(() =>
+            {
+                foreach (MacroDeckPlugin plugin in PluginManager.Plugins.Values)
+                {
+                    PluginManager.SearchUpdate(plugin);
+                }
+                foreach (MacroDeckPlugin plugin in PluginManager.PluginsNotLoaded.Values)
+                {
+                    PluginManager.SearchUpdate(plugin);
+                }
+                foreach (IconPack iconPack in IconManager.IconPacks.FindAll(iP => iP.ExtensionStoreManaged && !iP.Hidden))
+                {
+                    IconManager.SearchUpdate(iconPack);
+                }
+
+                if (OnUpdateCheckFinished != null)
+                {
+                    OnUpdateCheckFinished(null, EventArgs.Empty);
+                }
+            });
+        }
+
+
+
+        public static string InstalledIconPacksAsString
+        {
+            get
+            {
+                string installedPlugins = "";
+                foreach (var iconPack in IconManager.IconPacks.FindAll(x => x.ExtensionStoreManaged))
+                {
+                    installedPlugins += $"{iconPack.PackageId.ToLower()}%20";
+                }
+
+                return installedPlugins;
+            }
+        }
+
+        public static string InstalledPluginsAsString
+        {
+            get
+            {
+                string installedPlugins = "";
+                foreach (var path in PluginManager.PluginDirectories.Values)
+                {
+                    installedPlugins += $"{new DirectoryInfo(path).Name.ToLower()}%20";
+                }
+
+                return installedPlugins;
+            }
+        }
+    }
+
+    public enum ExtensionType
+    {
+        Plugin,
+        IconPack,
+    }
+}