Full-Install support and other minor changes

- Full-Install support - Error messages are easier to read
fileaes · Sep 3, 2020 · 2fd1967 · 2fd1967
1 parent 58c772f
commit 2fd1967
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 47 deletions.
diff --git a/FileAES/MenuPanels/DecryptPanel.Designer.cs b/FileAES/MenuPanels/DecryptPanel.Designer.cs
diff --git a/FileAES/MenuPanels/DecryptPanel.cs b/FileAES/MenuPanels/DecryptPanel.cs
@@ -91,22 +91,29 @@ public bool SetFileToDecrypt(FAES_File faesFile)
         private void SetNote(string note, int severity)
         {
             Logging.Log(String.Format("FAES_GUI(SetNote({1})): '{0}'", note, severity), Severity.DEBUG);
+            string message;
 
             switch (severity)
             {
                 case 1:
-                    statusInformation.Invoke(new MethodInvoker(delegate { this.statusInformation.Text = "Warning: " + note; }));
+                    message = "Warning: " + note;
                     break;
                 case 2:
-                    statusInformation.Invoke(new MethodInvoker(delegate { this.statusInformation.Text = "Important: " + note; }));
+                    message = "Important: " + note;
                     break;
                 case 3:
-                    statusInformation.Invoke(new MethodInvoker(delegate { this.statusInformation.Text = "Error: " + note; }));
+                    message = "Error: " + note;
                     break;
                 default:
-                    statusInformation.Invoke(new MethodInvoker(delegate { this.statusInformation.Text = "Note: " + note; }));
+                    message = "Note: " + note;
                     break;
             }
+
+            statusInformation.Invoke(new MethodInvoker(delegate
+            {
+                this.statusInformation.Text = message;
+                this.toolTip.SetToolTip(statusInformation, message);
+            }));
         }
 
         private void SetMetaData()
@@ -157,6 +164,7 @@ private void Decrypt()
                     FileAES_Decrypt decrypt = new FileAES_Decrypt(_fileToDecrypt, passTextbox.Text);
                     decrypt.SetDeleteAfterDecrypt(deleteOriginal.Checked);
                     decrypt.SetOverwriteDuplicate(overwriteDuplicate.Checked);
+                    decrypt.DebugMode = FileAES_Utilities.GetVerboseLogging();
 
                     Thread dThread = new Thread(() =>
                     {

diff --git a/FileAES/MenuPanels/DecryptPanel.resx b/FileAES/MenuPanels/DecryptPanel.resx
@@ -123,4 +123,7 @@
   <metadata name="decryptionTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>592, 27</value>
   </metadata>
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>733, 27</value>
+  </metadata>
 </root>
diff --git a/FileAES/MenuPanels/EncryptPanel.Designer.cs b/FileAES/MenuPanels/EncryptPanel.Designer.cs
diff --git a/FileAES/MenuPanels/EncryptPanel.cs b/FileAES/MenuPanels/EncryptPanel.cs
@@ -94,22 +94,29 @@ public bool SetFileToEncrypt(FAES_File faesFile)
         private void SetNote(string note, int severity)
         {
             Logging.Log(String.Format("FAES_GUI(SetNote({1})): '{0}'", note, severity), Severity.DEBUG);
+            string message;
 
             switch (severity)
             {
                 case 1:
-                    statusInformation.Invoke(new MethodInvoker(delegate { this.statusInformation.Text = "Warning: " + note; }));
+                    message = "Warning: " + note;
                     break;
                 case 2:
-                    statusInformation.Invoke(new MethodInvoker(delegate { this.statusInformation.Text = "Important: " + note; }));
+                    message = "Important: " + note;
                     break;
                 case 3:
-                    statusInformation.Invoke(new MethodInvoker(delegate { this.statusInformation.Text = "Error: " + note; }));
+                    message = "Error: " + note;
                     break;
                 default:
-                    statusInformation.Invoke(new MethodInvoker(delegate { this.statusInformation.Text = "Note: " + note; }));
+                    message = "Note: " + note;
                     break;
             }
+
+            statusInformation.Invoke(new MethodInvoker(delegate
+            {
+                this.statusInformation.Text = message;
+                this.toolTip.SetToolTip(statusInformation, message);
+            }));
         }
 
         private void Locked(bool lockChanges)
@@ -150,10 +157,12 @@ private void Encrypt()
             {
                 try
                 {
+
                     FileAES_Encrypt encrypt = new FileAES_Encrypt(_fileToEncrypt, passTextbox.Text, passHintTextbox.Text);
                     encrypt.SetCompressionMode(FAES.Packaging.CompressionUtils.GetAllOptimiseModes()[compressMode.SelectedIndex]);
                     encrypt.SetDeleteAfterEncrypt(deleteOriginal.Checked);
                     encrypt.SetOverwriteDuplicate(overwriteDuplicate.Checked);
+                    encrypt.DebugMode = FileAES_Utilities.GetVerboseLogging();
 
                     Thread eThread = new Thread(() =>
                     {

diff --git a/FileAES/MenuPanels/EncryptPanel.resx b/FileAES/MenuPanels/EncryptPanel.resx
@@ -123,4 +123,7 @@
   <metadata name="encryptionTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>451, 27</value>
   </metadata>
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>592, 27</value>
+  </metadata>
 </root>
diff --git a/FileAES/Program.cs b/FileAES/Program.cs
@@ -13,8 +13,8 @@ namespace FAES_GUI
 {
     static class Program
     {
-        private const string devAppendTag = "BETA 4";
-        private const string betaAppendTag = "";
+        private const string devAppendTag = "";
+        private const string betaAppendTag = "BETA 5";
 
         private static bool _verbose = false;
         private static bool _purgeTemp = false;
@@ -24,6 +24,8 @@ static class Program
         private static bool _showProgress = false;
         private static bool _overwriteDuplicates = false;
         private static bool _deleteOriginalFile = true;
+        private static bool _genFullInstallConfig = false;
+        private static string _installBranch;
         private static string _directory = null;
         private static string _password;
         private static string _passwordHint = null;
@@ -74,6 +76,8 @@ static void Main(string[] args)
                 else if ((strippedArg == "level" || strippedArg == "compressionlevel" || strippedArg == "l") && !string.IsNullOrEmpty(args[i + 1])) Int32.TryParse(args[i + 1], out _compressionLevel);
                 else if (strippedArg == "overwrite" || strippedArg == "overwriteduplicates" || strippedArg == "o") _overwriteDuplicates = true;
                 else if (strippedArg == "preserveoriginal" || strippedArg == "original" || strippedArg == "po") _deleteOriginalFile = false;
+                else if (strippedArg == "genFullInstallConfig") _genFullInstallConfig = true;
+                else if (strippedArg == "installBranch" && !string.IsNullOrEmpty(args[i + 1])) _installBranch = args[i + 1];
 
                 _strippedArgs.Add(strippedArg);
             }
@@ -257,6 +261,11 @@ static void Main(string[] args)
                     HandleException(e);
                 }
             }
+            else if (_genFullInstallConfig)
+            {
+                programManager = new ProgramManager(ProgramManager.InstallType.FullInstall);
+                programManager.SetBranch(_installBranch);
+            }
             else
             {
                 programManager = new ProgramManager();
@@ -340,12 +349,12 @@ public static bool IsStableBuild()
 
         public static bool IsBetaBuild()
         {
-            return (!String.IsNullOrEmpty(devAppendTag) && String.IsNullOrEmpty(betaAppendTag));
+            return !String.IsNullOrWhiteSpace(betaAppendTag);
         }
 
         public static bool IsDevBuild()
         {
-            return !String.IsNullOrEmpty(devAppendTag);
+            return !String.IsNullOrWhiteSpace(devAppendTag);
         }
 
         public static string GetBuild()