Merge pull request #165 from MacTee/dev

Dev merge - Version 2.3.0.9
MacTee · Apr 26, 2019 · 9d5884a · 9d5884a
2 parents ec52a02 + cfe9995
commit 9d5884a
Show file tree

Hide file tree

Showing 27 changed files with 1,206 additions and 896 deletions.
diff --git a/KSPModAdmin.Core/Controller/MainController.cs b/KSPModAdmin.Core/Controller/MainController.cs
@@ -10,6 +10,7 @@
 using KSPModAdmin.Core.Utils;
 using KSPModAdmin.Core.Utils.Localization;
 using KSPModAdmin.Core.Utils.Logging;
+using KSPModAdmin.Core.Utils.SiteHandler;
 using KSPModAdmin.Core.Views;
 
 namespace KSPModAdmin.Core.Controller

diff --git a/KSPModAdmin.Core/Controller/ModSelectionController.cs b/KSPModAdmin.Core/Controller/ModSelectionController.cs
@@ -10,6 +10,7 @@
 using KSPModAdmin.Core.Model;
 using KSPModAdmin.Core.Utils;
 using KSPModAdmin.Core.Utils.Controls.Aga.Controls.Tree.Helper;
+using KSPModAdmin.Core.Utils.SiteHandler;
 using KSPModAdmin.Core.Views;
 using SharpCompress.Archive;
 
@@ -95,6 +96,7 @@ internal static void Initialize(ucModSelection view)
 
             View.AddActionKey(VirtualKey.VK_DELETE, DeleteMod);
             View.AddActionKey(VirtualKey.VK_BACK, DeleteMod);
+            View.AddActionKey(VirtualKey.VK_A, AddMod, new ModifierKey[] { ModifierKey.AnyControl });
         }
 
 
@@ -188,6 +190,17 @@ protected static bool DeleteMod(ActionKeyInfo keyState)
             return true;
         }
 
+        /// <summary>
+        /// ActionKey callback function to handle the keys control + a.
+        /// Opens the AddMod dialog.
+        /// </summary>
+        /// <returns>True, cause we have handled the key.</returns>
+        protected static bool AddMod(ActionKeyInfo keyState)
+        {
+            OpenAddModDialog();
+            return true;
+        }
+
         #endregion
 
 

diff --git a/KSPModAdmin.Core/Controller/OptionsController.cs b/KSPModAdmin.Core/Controller/OptionsController.cs
@@ -642,12 +642,16 @@ private static void HandleAdminVersionWebResponse(WebResponse response)
                 updateDLG.PostDownloadAction = PostDownloadAction;
                 updateDLG.Message = GetDownloadMSG(parameter);
 
-                if (updateDLG.ShowDialog(View.ParentForm) != DialogResult.OK)
-                    return;
+                View.InvokeIfRequired(() => {
 
-                DownloadPath = updateDLG.DownloadPath;
-                PostDownloadAction = updateDLG.PostDownloadAction;
-                DownloadNewAdminVersion();
+                    if (updateDLG.ShowDialog(View.ParentForm) != DialogResult.OK)
+                        return;
+
+                    DownloadPath = updateDLG.DownloadPath;
+                    PostDownloadAction = updateDLG.PostDownloadAction;
+                    DownloadNewAdminVersion();
+
+                });
             }
             else
             {

diff --git a/KSPModAdmin.Core/KSPModAdmin.Core.csproj b/KSPModAdmin.Core/KSPModAdmin.Core.csproj
@@ -133,11 +133,9 @@
     <Compile Include="Utils\ModPackHandler.cs" />
     <Compile Include="Utils\SiteHandler\CurseForgeHandler.cs" />
     <Compile Include="Utils\SiteHandler\CurseHandler.cs" />
-    <Compile Include="Utils\SiteHandler\BitbucketHandler.cs" />
+    <Compile Include="Utils\SiteHandler\GitHubHandler.cs" />
     <Compile Include="Utils\SiteHandler\SpacedockHandler.cs" />
     <Compile Include="Utils\SiteHandler\KSPForumHandler.cs" />
-    <Compile Include="Utils\SiteHandler\GitHubHandler.cs" />
-    <Compile Include="Utils\SiteHandler\KerbalStuffHandler.cs" />
     <Compile Include="Utils\SiteHandler\SiteHandlerManager.cs" />
     <Compile Include="Utils\SiteHandler\ISiteHandler.cs" />
     <Compile Include="Utils\ScanInfo.cs" />

diff --git a/KSPModAdmin.Core/Model/ModNode.cs b/KSPModAdmin.Core/Model/ModNode.cs
@@ -6,6 +6,7 @@
 using KSPModAdmin.Core.Properties;
 using KSPModAdmin.Core.Utils;
 using KSPModAdmin.Core.Utils.Controls.Aga.Controls.Tree;
+using KSPModAdmin.Core.Utils.SiteHandler;
 
 namespace KSPModAdmin.Core.Model
 {

diff --git a/KSPModAdmin.Core/Utils/ActionKeyManager/ActionKeyManager.cs b/KSPModAdmin.Core/Utils/ActionKeyManager/ActionKeyManager.cs
@@ -126,15 +126,14 @@ public bool HandleKeyMessage(ref Message msg)
             try
             {
                 key = (VirtualKey)msg.WParam.ToInt32();
-                kdLPHelper = new KeyDownLParamHelper(msg.LParam.ToInt32());
             }
             catch (Exception)
             {
                 return false;
             }
 
             if (msg.Msg == WM_KEYDOWN)
-                CaptureControlKeysState(key, true, kdLPHelper.Extended);
+                CaptureControlKeysState(key, true);
 
             if (msg.Msg == WM_KEYDOWN && mActionKeys.ContainsKey(key))
             {
@@ -147,7 +146,7 @@ public bool HandleKeyMessage(ref Message msg)
                 }
             }
             else if (msg.Msg == WM_KEYUP)
-                CaptureControlKeysState(key, false, kdLPHelper.Extended);
+                CaptureControlKeysState(key, false);
 
             return false;
         }
@@ -194,7 +193,7 @@ public void RemoveAllActionKeys()
         /// </summary>
         /// <param name="key">The control key to save the state for.</param>
         /// <param name="pressState">The state of control key.</param>
-        private void CaptureControlKeysState(VirtualKey key, bool pressState, bool right = false)
+        private void CaptureControlKeysState(VirtualKey key, bool pressState) //, bool right = false)
         {
             switch (key)
             {
@@ -211,9 +210,9 @@ private void CaptureControlKeysState(VirtualKey key, bool pressState, bool right
                 ////    break;
 
                 case VirtualKey.VK_CONTROL:
-                    if (right)
+                    //if (right)
                         mControlKeysState.RControl = pressState;
-                    else
+                    //else
                         mControlKeysState.LControl = pressState;
                     break;
 

diff --git a/KSPModAdmin.Core/Utils/ModPackHandler.cs b/KSPModAdmin.Core/Utils/ModPackHandler.cs
@@ -5,6 +5,7 @@
 using System.Xml;
 using KSPModAdmin.Core.Controller;
 using KSPModAdmin.Core.Model;
+using KSPModAdmin.Core.Utils.SiteHandler;
 using SharpCompress.Archive;
 using SharpCompress.Archive.Zip;
 using SharpCompress.Common;

diff --git a/KSPModAdmin.Core/Utils/SiteHandler/BitbucketHandler.cs b/KSPModAdmin.Core/Utils/SiteHandler/BitbucketHandler.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using HtmlAgilityPack;
 using KSPModAdmin.Core.Controller;
 using KSPModAdmin.Core.Model;