diff --git a/FileAES/App.config b/FileAES/App.config
index 8e15646..2d2a12d 100644
--- a/FileAES/App.config
+++ b/FileAES/App.config
@@ -1,6 +1,6 @@
-
+
-
+
-
\ No newline at end of file
+
diff --git a/FileAES/CustomControls/SettingsControls/SettingDropDown.Designer.cs b/FileAES/CustomControls/SettingsControls/SettingDropDown.Designer.cs
index ec7ea12..7a5b7fe 100644
--- a/FileAES/CustomControls/SettingsControls/SettingDropDown.Designer.cs
+++ b/FileAES/CustomControls/SettingsControls/SettingDropDown.Designer.cs
@@ -48,9 +48,10 @@ private void InitializeComponent()
//
// dropDownBox
//
- this.dropDownBox.BackColor = System.Drawing.SystemColors.Window;
+ this.dropDownBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
this.dropDownBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.dropDownBox.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.dropDownBox.ForeColor = System.Drawing.Color.Black;
this.dropDownBox.FormattingEnabled = true;
this.dropDownBox.Location = new System.Drawing.Point(3, 74);
this.dropDownBox.Name = "dropDownBox";
diff --git a/FileAES/CustomControls/SettingsControls/SettingIncrementBox.Designer.cs b/FileAES/CustomControls/SettingsControls/SettingIncrementBox.Designer.cs
index 8ac9b82..8cfd65b 100644
--- a/FileAES/CustomControls/SettingsControls/SettingIncrementBox.Designer.cs
+++ b/FileAES/CustomControls/SettingsControls/SettingIncrementBox.Designer.cs
@@ -80,10 +80,10 @@ private void InitializeComponent()
//
// numericTextbox
//
- this.numericTextbox.BackColor = System.Drawing.SystemColors.Control;
+ this.numericTextbox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
this.numericTextbox.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.numericTextbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.numericTextbox.ForeColor = System.Drawing.SystemColors.WindowText;
+ this.numericTextbox.ForeColor = System.Drawing.Color.Black;
this.numericTextbox.Location = new System.Drawing.Point(3, 75);
this.numericTextbox.Name = "numericTextbox";
this.numericTextbox.Size = new System.Drawing.Size(342, 22);
diff --git a/FileAES/CustomControls/SettingsControls/SettingTextInput.Designer.cs b/FileAES/CustomControls/SettingsControls/SettingTextInput.Designer.cs
index 0a580d1..97b93a0 100644
--- a/FileAES/CustomControls/SettingsControls/SettingTextInput.Designer.cs
+++ b/FileAES/CustomControls/SettingsControls/SettingTextInput.Designer.cs
@@ -48,10 +48,10 @@ private void InitializeComponent()
//
// textBox
//
- this.textBox.BackColor = System.Drawing.SystemColors.Control;
+ this.textBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
this.textBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.textBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.textBox.ForeColor = System.Drawing.SystemColors.WindowText;
+ this.textBox.ForeColor = System.Drawing.Color.Black;
this.textBox.Location = new System.Drawing.Point(3, 75);
this.textBox.Name = "textBox";
this.textBox.Size = new System.Drawing.Size(393, 22);
diff --git a/FileAES/CustomControls/SubMenuButton.Designer.cs b/FileAES/CustomControls/SubMenuButton.Designer.cs
index dee5e98..f1189b4 100644
--- a/FileAES/CustomControls/SubMenuButton.Designer.cs
+++ b/FileAES/CustomControls/SubMenuButton.Designer.cs
@@ -83,6 +83,7 @@ private void InitializeComponent()
this.BackColor = System.Drawing.Color.Transparent;
this.Controls.Add(this.selectedIndicator);
this.Controls.Add(this.mainButton);
+ this.ForeColor = System.Drawing.Color.Black;
this.Name = "SubMenuButton";
this.Size = new System.Drawing.Size(147, 66);
this.mainButton.ResumeLayout(false);
diff --git a/FileAES/CustomControls/TextProgressBar.cs b/FileAES/CustomControls/TextProgressBar.cs
index e3497b4..2a84ccd 100644
--- a/FileAES/CustomControls/TextProgressBar.cs
+++ b/FileAES/CustomControls/TextProgressBar.cs
@@ -175,5 +175,17 @@ public new void Dispose()
_progressColourBrush.Dispose();
base.Dispose();
}
+
+ private void InitializeComponent()
+ {
+ this.SuspendLayout();
+ //
+ // TextProgressBar
+ //
+ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
+ this.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(153)))), ((int)(((byte)(255)))));
+ this.ResumeLayout(false);
+
+ }
}
}
diff --git a/FileAES/CustomControls/TextProgressBar.resx b/FileAES/CustomControls/TextProgressBar.resx
new file mode 100644
index 0000000..e5858cc
--- /dev/null
+++ b/FileAES/CustomControls/TextProgressBar.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ False
+
+
\ No newline at end of file
diff --git a/FileAES/DecryptForm.Designer.cs b/FileAES/DecryptForm.Designer.cs
index b626054..4d20584 100644
--- a/FileAES/DecryptForm.Designer.cs
+++ b/FileAES/DecryptForm.Designer.cs
@@ -105,7 +105,7 @@ private void InitializeComponent()
//
// decryptPanel
//
- this.decryptPanel.BackColor = System.Drawing.SystemColors.ControlDark;
+ this.decryptPanel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(160)))), ((int)(((byte)(160)))));
this.decryptPanel.Location = new System.Drawing.Point(1, -21);
this.decryptPanel.Name = "decryptPanel";
this.decryptPanel.Size = new System.Drawing.Size(414, 357);
@@ -115,10 +115,11 @@ private void InitializeComponent()
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.Color.Black;
+ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(160)))), ((int)(((byte)(160)))));
this.ClientSize = new System.Drawing.Size(416, 337);
this.Controls.Add(this.titleBar);
this.Controls.Add(this.decryptPanel);
+ this.ForeColor = System.Drawing.Color.Black;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "DecryptForm";
diff --git a/FileAES/DevForm.Designer.cs b/FileAES/DevForm.Designer.cs
index e4626ff..c6c3994 100644
--- a/FileAES/DevForm.Designer.cs
+++ b/FileAES/DevForm.Designer.cs
@@ -204,7 +204,7 @@ private void InitializeComponent()
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.SystemColors.ControlDark;
+ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(160)))), ((int)(((byte)(160)))));
this.ClientSize = new System.Drawing.Size(416, 337);
this.Controls.Add(this.sendInputButton);
this.Controls.Add(this.consoleInputTextBox);
@@ -212,6 +212,7 @@ private void InitializeComponent()
this.Controls.Add(this.clearConsole);
this.Controls.Add(this.consoleTextBox);
this.Controls.Add(this.titleBar);
+ this.ForeColor = System.Drawing.Color.Black;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "DevForm";
diff --git a/FileAES/EncryptForm.Designer.cs b/FileAES/EncryptForm.Designer.cs
index 8e46a48..3ec6737 100644
--- a/FileAES/EncryptForm.Designer.cs
+++ b/FileAES/EncryptForm.Designer.cs
@@ -105,7 +105,7 @@ private void InitializeComponent()
//
// encryptPanel
//
- this.encryptPanel.BackColor = System.Drawing.SystemColors.ControlDark;
+ this.encryptPanel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(160)))), ((int)(((byte)(160)))));
this.encryptPanel.Location = new System.Drawing.Point(1, -21);
this.encryptPanel.Name = "encryptPanel";
this.encryptPanel.Size = new System.Drawing.Size(414, 357);
@@ -115,10 +115,11 @@ private void InitializeComponent()
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.Color.Black;
+ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(160)))), ((int)(((byte)(160)))));
this.ClientSize = new System.Drawing.Size(416, 337);
this.Controls.Add(this.titleBar);
this.Controls.Add(this.encryptPanel);
+ this.ForeColor = System.Drawing.Color.Black;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "EncryptForm";
diff --git a/FileAES/FileAES.csproj b/FileAES/FileAES.csproj
index ec57e96..e07f80f 100644
--- a/FileAES/FileAES.csproj
+++ b/FileAES/FileAES.csproj
@@ -9,10 +9,11 @@
WinExe
FAES_GUI
FileAES
- v4.5
+ v4.6
512
+
AnyCPU
@@ -223,12 +224,12 @@
-
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+
+
\ No newline at end of file
diff --git a/FileAES/FodyWeavers.xml b/FileAES/FodyWeavers.xml
index 7249046..81f5f2c 100644
--- a/FileAES/FodyWeavers.xml
+++ b/FileAES/FodyWeavers.xml
@@ -2,8 +2,8 @@
- FAES
- SSM
-
+ FAES
+ SimpleSettingsManager
+
\ No newline at end of file
diff --git a/FileAES/MainForm.Designer.cs b/FileAES/MainForm.Designer.cs
index a73d5b4..6ce38af 100644
--- a/FileAES/MainForm.Designer.cs
+++ b/FileAES/MainForm.Designer.cs
@@ -169,7 +169,7 @@ private void InitializeComponent()
this.copyrightLabel.Name = "copyrightLabel";
this.copyrightLabel.Size = new System.Drawing.Size(146, 21);
this.copyrightLabel.TabIndex = 2;
- this.copyrightLabel.Text = "© - 2019 | mullak99";
+ this.copyrightLabel.Text = "© - 2020 | mullak99";
this.copyrightLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.copyrightLabel.Click += new System.EventHandler(this.CopyrightLabel_Click);
//
@@ -229,6 +229,7 @@ private void InitializeComponent()
this.autoDetect.Cursor = System.Windows.Forms.Cursors.Hand;
this.autoDetect.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.autoDetect.ForeColor = System.Drawing.Color.White;
+ this.autoDetect.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(160)))), ((int)(((byte)(160)))));
this.autoDetect.Location = new System.Drawing.Point(149, 25);
this.autoDetect.Name = "autoDetect";
this.autoDetect.Size = new System.Drawing.Size(414, 357);
@@ -245,7 +246,6 @@ private void InitializeComponent()
//
// decryptPanel
//
- this.decryptPanel.BackColor = System.Drawing.SystemColors.ControlDark;
this.decryptPanel.Location = new System.Drawing.Point(149, 25);
this.decryptPanel.Name = "decryptPanel";
this.decryptPanel.Size = new System.Drawing.Size(414, 357);
@@ -253,7 +253,6 @@ private void InitializeComponent()
//
// encryptPanel
//
- this.encryptPanel.BackColor = System.Drawing.SystemColors.ControlDark;
this.encryptPanel.Location = new System.Drawing.Point(149, 25);
this.encryptPanel.Name = "encryptPanel";
this.encryptPanel.Size = new System.Drawing.Size(414, 357);
@@ -261,7 +260,7 @@ private void InitializeComponent()
//
// aboutPanel
//
- this.aboutPanel.BackColor = System.Drawing.SystemColors.ControlDark;
+ this.aboutPanel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(160)))), ((int)(((byte)(160)))));
this.aboutPanel.Location = new System.Drawing.Point(149, 25);
this.aboutPanel.Name = "aboutPanel";
this.aboutPanel.Size = new System.Drawing.Size(414, 357);
diff --git a/FileAES/MenuPanels/DecryptPanel.Designer.cs b/FileAES/MenuPanels/DecryptPanel.Designer.cs
index af3436f..12ccd9f 100644
--- a/FileAES/MenuPanels/DecryptPanel.Designer.cs
+++ b/FileAES/MenuPanels/DecryptPanel.Designer.cs
@@ -90,6 +90,7 @@ private void InitializeComponent()
this.passTextbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.passTextbox.Enabled = false;
this.passTextbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.passTextbox.ForeColor = System.Drawing.Color.Black;
this.passTextbox.Location = new System.Drawing.Point(137, 81);
this.passTextbox.Name = "passTextbox";
this.passTextbox.PasswordChar = '*';
@@ -125,6 +126,7 @@ private void InitializeComponent()
this.passHintTextbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.passHintTextbox.Enabled = false;
this.passHintTextbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.passHintTextbox.ForeColor = System.Drawing.Color.Black;
this.passHintTextbox.Location = new System.Drawing.Point(137, 111);
this.passHintTextbox.MaxLength = 64;
this.passHintTextbox.Multiline = true;
@@ -227,7 +229,7 @@ private void InitializeComponent()
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.SystemColors.ControlDark;
+ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(160)))), ((int)(((byte)(160)))));
this.Controls.Add(this.overwriteDuplicate);
this.Controls.Add(this.deleteOriginal);
this.Controls.Add(this.progressBar);
diff --git a/FileAES/MenuPanels/EncryptPanel.Designer.cs b/FileAES/MenuPanels/EncryptPanel.Designer.cs
index 1faa850..59157d7 100644
--- a/FileAES/MenuPanels/EncryptPanel.Designer.cs
+++ b/FileAES/MenuPanels/EncryptPanel.Designer.cs
@@ -93,6 +93,7 @@ private void InitializeComponent()
this.passTextbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.passTextbox.Enabled = false;
this.passTextbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.passTextbox.ForeColor = System.Drawing.Color.Black;
this.passTextbox.Location = new System.Drawing.Point(137, 81);
this.passTextbox.Name = "passTextbox";
this.passTextbox.PasswordChar = '*';
@@ -130,6 +131,7 @@ private void InitializeComponent()
this.passConfTextbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.passConfTextbox.Enabled = false;
this.passConfTextbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.passConfTextbox.ForeColor = System.Drawing.Color.Black;
this.passConfTextbox.Location = new System.Drawing.Point(137, 111);
this.passConfTextbox.Name = "passConfTextbox";
this.passConfTextbox.PasswordChar = '*';
@@ -155,6 +157,7 @@ private void InitializeComponent()
this.passHintTextbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.passHintTextbox.Enabled = false;
this.passHintTextbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.passHintTextbox.ForeColor = System.Drawing.Color.Black;
this.passHintTextbox.Location = new System.Drawing.Point(137, 141);
this.passHintTextbox.MaxLength = 0;
this.passHintTextbox.Multiline = true;
@@ -211,6 +214,7 @@ private void InitializeComponent()
//
this.compressMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.compressMode.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.compressMode.ForeColor = System.Drawing.Color.Black;
this.compressMode.FormattingEnabled = true;
this.compressMode.Location = new System.Drawing.Point(137, 196);
this.compressMode.Name = "compressMode";
@@ -268,7 +272,7 @@ private void InitializeComponent()
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.SystemColors.ControlDark;
+ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(160)))), ((int)(((byte)(160)))));
this.Controls.Add(this.overwriteDuplicate);
this.Controls.Add(this.deleteOriginal);
this.Controls.Add(this.progressBar);
@@ -284,6 +288,7 @@ private void InitializeComponent()
this.Controls.Add(this.passTextbox);
this.Controls.Add(this.selectEncryptButton);
this.Controls.Add(this.fileInfoPanel);
+ this.ForeColor = System.Drawing.Color.Black;
this.Name = "encryptPanel";
this.Size = new System.Drawing.Size(414, 357);
this.fileInfoPanel.ResumeLayout(false);
diff --git a/FileAES/MenuPanels/SettingsPanel.Designer.cs b/FileAES/MenuPanels/SettingsPanel.Designer.cs
index d70d83a..bc3b1f5 100644
--- a/FileAES/MenuPanels/SettingsPanel.Designer.cs
+++ b/FileAES/MenuPanels/SettingsPanel.Designer.cs
@@ -48,7 +48,7 @@ private void InitializeComponent()
//
// settingsScrollPanel
//
- this.settingsScrollPanel.BackColor = System.Drawing.SystemColors.ControlDark;
+ this.settingsScrollPanel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(160)))), ((int)(((byte)(160)))));
this.settingsScrollPanel.Controls.Add(this.ignoreUpdatesSetting);
this.settingsScrollPanel.Controls.Add(this.branchSelection);
this.settingsScrollPanel.Controls.Add(this.developerSetting);
@@ -71,6 +71,7 @@ private void InitializeComponent()
this.ignoreUpdatesSetting.Name = "ignoreUpdatesSetting";
this.ignoreUpdatesSetting.Size = new System.Drawing.Size(400, 100);
this.ignoreUpdatesSetting.TabIndex = 6;
+ this.ignoreUpdatesSetting.Toggled = true;
//
// branchSelection
//
@@ -144,7 +145,7 @@ private void InitializeComponent()
this.saveSettings.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.saveSettings.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.saveSettings.ForeColor = System.Drawing.Color.White;
- this.saveSettings.Location = new System.Drawing.Point(252, 6);
+ this.saveSettings.Location = new System.Drawing.Point(240, 6);
this.saveSettings.Name = "saveSettings";
this.saveSettings.Size = new System.Drawing.Size(170, 32);
this.saveSettings.TabIndex = 5;
@@ -158,7 +159,7 @@ private void InitializeComponent()
this.resetButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.resetButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.resetButton.ForeColor = System.Drawing.Color.White;
- this.resetButton.Location = new System.Drawing.Point(107, 6);
+ this.resetButton.Location = new System.Drawing.Point(95, 6);
this.resetButton.Name = "resetButton";
this.resetButton.Size = new System.Drawing.Size(139, 32);
this.resetButton.TabIndex = 6;
@@ -168,12 +169,13 @@ private void InitializeComponent()
//
// buttonPanel
//
+ this.buttonPanel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(160)))), ((int)(((byte)(160)))));
this.buttonPanel.Controls.Add(this.cancelButton);
this.buttonPanel.Controls.Add(this.resetButton);
this.buttonPanel.Controls.Add(this.saveSettings);
- this.buttonPanel.Location = new System.Drawing.Point(-11, 316);
+ this.buttonPanel.Location = new System.Drawing.Point(0, 316);
this.buttonPanel.Name = "buttonPanel";
- this.buttonPanel.Size = new System.Drawing.Size(438, 51);
+ this.buttonPanel.Size = new System.Drawing.Size(414, 41);
this.buttonPanel.TabIndex = 7;
this.buttonPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.buttonPanel_Paint);
//
@@ -183,7 +185,7 @@ private void InitializeComponent()
this.cancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.cancelButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cancelButton.ForeColor = System.Drawing.Color.White;
- this.cancelButton.Location = new System.Drawing.Point(16, 6);
+ this.cancelButton.Location = new System.Drawing.Point(4, 6);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(85, 32);
this.cancelButton.TabIndex = 6;
diff --git a/FileAES/MenuPanels/aboutPanel.Designer.cs b/FileAES/MenuPanels/aboutPanel.Designer.cs
index c3ea521..b0739f0 100644
--- a/FileAES/MenuPanels/aboutPanel.Designer.cs
+++ b/FileAES/MenuPanels/aboutPanel.Designer.cs
@@ -31,17 +31,17 @@ private void InitializeComponent()
this.components = new System.ComponentModel.Container();
this.versionLabel = new System.Windows.Forms.Label();
this.updatePanel = new System.Windows.Forms.Panel();
- this.updateDescLabel = new System.Windows.Forms.Label();
- this.currentVerLabel = new System.Windows.Forms.Label();
+ this.warnLabel = new System.Windows.Forms.Label();
+ this.reinstallCurrentButton = new System.Windows.Forms.Button();
+ this.forceUpdateButton = new System.Windows.Forms.Button();
+ this.ignoreUpdatesButton = new System.Windows.Forms.Button();
+ this.updateButton = new System.Windows.Forms.Button();
+ this.checkForUpdateButton = new System.Windows.Forms.Button();
this.latestVerLabel = new System.Windows.Forms.Label();
+ this.currentVerLabel = new System.Windows.Forms.Label();
+ this.updateDescLabel = new System.Windows.Forms.Label();
this.miscVersionLabel = new System.Windows.Forms.Label();
- this.checkForUpdateButton = new System.Windows.Forms.Button();
- this.updateButton = new System.Windows.Forms.Button();
- this.ignoreUpdatesButton = new System.Windows.Forms.Button();
- this.forceUpdateButton = new System.Windows.Forms.Button();
- this.reinstallCurrentButton = new System.Windows.Forms.Button();
this.Runtime = new System.Windows.Forms.Timer(this.components);
- this.warnLabel = new System.Windows.Forms.Label();
this.updatePanel.SuspendLayout();
this.SuspendLayout();
//
@@ -76,51 +76,73 @@ private void InitializeComponent()
this.updatePanel.TabIndex = 2;
this.updatePanel.Paint += new System.Windows.Forms.PaintEventHandler(this.UpdatePanel_Paint);
//
- // updateDescLabel
+ // warnLabel
//
- this.updateDescLabel.BackColor = System.Drawing.Color.Transparent;
- this.updateDescLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.updateDescLabel.ForeColor = System.Drawing.Color.White;
- this.updateDescLabel.Location = new System.Drawing.Point(5, 4);
- this.updateDescLabel.Name = "updateDescLabel";
- this.updateDescLabel.Size = new System.Drawing.Size(407, 44);
- this.updateDescLabel.TabIndex = 2;
- this.updateDescLabel.Text = "An update is available...";
- this.updateDescLabel.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+ this.warnLabel.BackColor = System.Drawing.Color.Transparent;
+ this.warnLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.warnLabel.ForeColor = System.Drawing.Color.White;
+ this.warnLabel.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.warnLabel.Location = new System.Drawing.Point(5, 142);
+ this.warnLabel.Name = "warnLabel";
+ this.warnLabel.Size = new System.Drawing.Size(407, 47);
+ this.warnLabel.TabIndex = 11;
+ this.warnLabel.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
//
- // currentVerLabel
+ // reinstallCurrentButton
//
- this.currentVerLabel.BackColor = System.Drawing.Color.Transparent;
- this.currentVerLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.currentVerLabel.ForeColor = System.Drawing.Color.White;
- this.currentVerLabel.Location = new System.Drawing.Point(179, 50);
- this.currentVerLabel.Name = "currentVerLabel";
- this.currentVerLabel.Size = new System.Drawing.Size(208, 40);
- this.currentVerLabel.TabIndex = 3;
- this.currentVerLabel.Text = "v2.0.0";
+ this.reinstallCurrentButton.BackColor = System.Drawing.Color.DarkGoldenrod;
+ this.reinstallCurrentButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.reinstallCurrentButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.reinstallCurrentButton.ForeColor = System.Drawing.Color.White;
+ this.reinstallCurrentButton.Location = new System.Drawing.Point(210, 229);
+ this.reinstallCurrentButton.Name = "reinstallCurrentButton";
+ this.reinstallCurrentButton.Size = new System.Drawing.Size(202, 30);
+ this.reinstallCurrentButton.TabIndex = 10;
+ this.reinstallCurrentButton.Text = "Reinstall";
+ this.reinstallCurrentButton.UseVisualStyleBackColor = false;
+ this.reinstallCurrentButton.Click += new System.EventHandler(this.ReinstallCurrentButton_Click);
//
- // latestVerLabel
+ // forceUpdateButton
//
- this.latestVerLabel.BackColor = System.Drawing.Color.Transparent;
- this.latestVerLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.latestVerLabel.ForeColor = System.Drawing.Color.White;
- this.latestVerLabel.Location = new System.Drawing.Point(179, 90);
- this.latestVerLabel.Name = "latestVerLabel";
- this.latestVerLabel.Size = new System.Drawing.Size(208, 40);
- this.latestVerLabel.TabIndex = 4;
- this.latestVerLabel.Text = "v2.0.0";
+ this.forceUpdateButton.BackColor = System.Drawing.Color.MediumSeaGreen;
+ this.forceUpdateButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.forceUpdateButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.forceUpdateButton.ForeColor = System.Drawing.Color.White;
+ this.forceUpdateButton.Location = new System.Drawing.Point(4, 229);
+ this.forceUpdateButton.Name = "forceUpdateButton";
+ this.forceUpdateButton.Size = new System.Drawing.Size(202, 30);
+ this.forceUpdateButton.TabIndex = 9;
+ this.forceUpdateButton.Text = "Force Update";
+ this.forceUpdateButton.UseVisualStyleBackColor = false;
+ this.forceUpdateButton.Click += new System.EventHandler(this.ForceUpdateButton_Click);
//
- // miscVersionLabel
+ // ignoreUpdatesButton
//
- this.miscVersionLabel.BackColor = System.Drawing.Color.Transparent;
- this.miscVersionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.miscVersionLabel.ForeColor = System.Drawing.Color.White;
- this.miscVersionLabel.Location = new System.Drawing.Point(4, 4);
- this.miscVersionLabel.Name = "miscVersionLabel";
- this.miscVersionLabel.Size = new System.Drawing.Size(407, 54);
- this.miscVersionLabel.TabIndex = 3;
- this.miscVersionLabel.Text = "FAES Version:\r\nSSM Version:";
- this.miscVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.ignoreUpdatesButton.BackColor = System.Drawing.Color.Chocolate;
+ this.ignoreUpdatesButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.ignoreUpdatesButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.ignoreUpdatesButton.ForeColor = System.Drawing.Color.White;
+ this.ignoreUpdatesButton.Location = new System.Drawing.Point(210, 195);
+ this.ignoreUpdatesButton.Name = "ignoreUpdatesButton";
+ this.ignoreUpdatesButton.Size = new System.Drawing.Size(202, 30);
+ this.ignoreUpdatesButton.TabIndex = 8;
+ this.ignoreUpdatesButton.Text = "Ignore Updates";
+ this.ignoreUpdatesButton.UseVisualStyleBackColor = false;
+ this.ignoreUpdatesButton.Click += new System.EventHandler(this.IgnoreUpdatesButton_Click);
+ //
+ // updateButton
+ //
+ this.updateButton.BackColor = System.Drawing.Color.ForestGreen;
+ this.updateButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.updateButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.updateButton.ForeColor = System.Drawing.Color.White;
+ this.updateButton.Location = new System.Drawing.Point(4, 195);
+ this.updateButton.Name = "updateButton";
+ this.updateButton.Size = new System.Drawing.Size(202, 30);
+ this.updateButton.TabIndex = 7;
+ this.updateButton.Text = "Update Now";
+ this.updateButton.UseVisualStyleBackColor = false;
+ this.updateButton.Click += new System.EventHandler(this.UpdateButton_Click);
//
// checkForUpdateButton
//
@@ -136,84 +158,62 @@ private void InitializeComponent()
this.checkForUpdateButton.UseVisualStyleBackColor = false;
this.checkForUpdateButton.Click += new System.EventHandler(this.CheckForUpdateButton_Click);
//
- // updateButton
+ // latestVerLabel
//
- this.updateButton.BackColor = System.Drawing.Color.ForestGreen;
- this.updateButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.updateButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.updateButton.ForeColor = System.Drawing.Color.White;
- this.updateButton.Location = new System.Drawing.Point(4, 195);
- this.updateButton.Name = "updateButton";
- this.updateButton.Size = new System.Drawing.Size(202, 30);
- this.updateButton.TabIndex = 7;
- this.updateButton.Text = "Update Now";
- this.updateButton.UseVisualStyleBackColor = false;
- this.updateButton.Click += new System.EventHandler(this.UpdateButton_Click);
+ this.latestVerLabel.BackColor = System.Drawing.Color.Transparent;
+ this.latestVerLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.latestVerLabel.ForeColor = System.Drawing.Color.White;
+ this.latestVerLabel.Location = new System.Drawing.Point(179, 90);
+ this.latestVerLabel.Name = "latestVerLabel";
+ this.latestVerLabel.Size = new System.Drawing.Size(208, 40);
+ this.latestVerLabel.TabIndex = 4;
+ this.latestVerLabel.Text = "v2.0.0";
//
- // ignoreUpdatesButton
+ // currentVerLabel
//
- this.ignoreUpdatesButton.BackColor = System.Drawing.Color.Chocolate;
- this.ignoreUpdatesButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.ignoreUpdatesButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.ignoreUpdatesButton.ForeColor = System.Drawing.Color.White;
- this.ignoreUpdatesButton.Location = new System.Drawing.Point(210, 195);
- this.ignoreUpdatesButton.Name = "ignoreUpdatesButton";
- this.ignoreUpdatesButton.Size = new System.Drawing.Size(202, 30);
- this.ignoreUpdatesButton.TabIndex = 8;
- this.ignoreUpdatesButton.Text = "Ignore Updates";
- this.ignoreUpdatesButton.UseVisualStyleBackColor = false;
- this.ignoreUpdatesButton.Click += new System.EventHandler(this.IgnoreUpdatesButton_Click);
+ this.currentVerLabel.BackColor = System.Drawing.Color.Transparent;
+ this.currentVerLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.currentVerLabel.ForeColor = System.Drawing.Color.White;
+ this.currentVerLabel.Location = new System.Drawing.Point(179, 50);
+ this.currentVerLabel.Name = "currentVerLabel";
+ this.currentVerLabel.Size = new System.Drawing.Size(208, 40);
+ this.currentVerLabel.TabIndex = 3;
+ this.currentVerLabel.Text = "v2.0.0";
//
- // forceUpdateButton
+ // updateDescLabel
//
- this.forceUpdateButton.BackColor = System.Drawing.Color.MediumSeaGreen;
- this.forceUpdateButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.forceUpdateButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.forceUpdateButton.ForeColor = System.Drawing.Color.White;
- this.forceUpdateButton.Location = new System.Drawing.Point(4, 229);
- this.forceUpdateButton.Name = "forceUpdateButton";
- this.forceUpdateButton.Size = new System.Drawing.Size(202, 30);
- this.forceUpdateButton.TabIndex = 9;
- this.forceUpdateButton.Text = "Force Update";
- this.forceUpdateButton.UseVisualStyleBackColor = false;
- this.forceUpdateButton.Click += new System.EventHandler(this.ForceUpdateButton_Click);
+ this.updateDescLabel.BackColor = System.Drawing.Color.Transparent;
+ this.updateDescLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.updateDescLabel.ForeColor = System.Drawing.Color.White;
+ this.updateDescLabel.Location = new System.Drawing.Point(5, 4);
+ this.updateDescLabel.Name = "updateDescLabel";
+ this.updateDescLabel.Size = new System.Drawing.Size(407, 44);
+ this.updateDescLabel.TabIndex = 2;
+ this.updateDescLabel.Text = "An update is available...";
+ this.updateDescLabel.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
- // reinstallCurrentButton
+ // miscVersionLabel
//
- this.reinstallCurrentButton.BackColor = System.Drawing.Color.DarkGoldenrod;
- this.reinstallCurrentButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.reinstallCurrentButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.reinstallCurrentButton.ForeColor = System.Drawing.Color.White;
- this.reinstallCurrentButton.Location = new System.Drawing.Point(210, 229);
- this.reinstallCurrentButton.Name = "reinstallCurrentButton";
- this.reinstallCurrentButton.Size = new System.Drawing.Size(202, 30);
- this.reinstallCurrentButton.TabIndex = 10;
- this.reinstallCurrentButton.Text = "Reinstall";
- this.reinstallCurrentButton.UseVisualStyleBackColor = false;
- this.reinstallCurrentButton.Click += new System.EventHandler(this.ReinstallCurrentButton_Click);
+ this.miscVersionLabel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(160)))), ((int)(((byte)(160)))));
+ this.miscVersionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.miscVersionLabel.ForeColor = System.Drawing.Color.White;
+ this.miscVersionLabel.Location = new System.Drawing.Point(4, 4);
+ this.miscVersionLabel.Name = "miscVersionLabel";
+ this.miscVersionLabel.Size = new System.Drawing.Size(407, 54);
+ this.miscVersionLabel.TabIndex = 3;
+ this.miscVersionLabel.Text = "FAES Version:\r\nSSM Version:";
+ this.miscVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// Runtime
//
this.Runtime.Enabled = true;
this.Runtime.Tick += new System.EventHandler(this.Runtime_Tick);
//
- // warnLabel
- //
- this.warnLabel.BackColor = System.Drawing.Color.Transparent;
- this.warnLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.warnLabel.ForeColor = System.Drawing.Color.White;
- this.warnLabel.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.warnLabel.Location = new System.Drawing.Point(5, 142);
- this.warnLabel.Name = "warnLabel";
- this.warnLabel.Size = new System.Drawing.Size(407, 47);
- this.warnLabel.TabIndex = 11;
- this.warnLabel.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- //
// aboutPanel
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.SystemColors.ControlDark;
+ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(160)))), ((int)(((byte)(160)))), ((int)(((byte)(160)))));
this.Controls.Add(this.miscVersionLabel);
this.Controls.Add(this.updatePanel);
this.Name = "aboutPanel";
diff --git a/FileAES/Program.cs b/FileAES/Program.cs
index ec21607..154cd1b 100644
--- a/FileAES/Program.cs
+++ b/FileAES/Program.cs
@@ -13,7 +13,7 @@ namespace FAES_GUI
{
static class Program
{
- private const string devAppendTag = "BETA 3";
+ private const string devAppendTag = "BETA 4";
private const string betaAppendTag = "";
private static bool _verbose = false;
diff --git a/FileAES/Properties/Resources.Designer.cs b/FileAES/Properties/Resources.Designer.cs
index db81078..a66919b 100644
--- a/FileAES/Properties/Resources.Designer.cs
+++ b/FileAES/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace FAES_GUI.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
diff --git a/FileAES/Properties/Settings.Designer.cs b/FileAES/Properties/Settings.Designer.cs
index 704dbc2..4277749 100644
--- a/FileAES/Properties/Settings.Designer.cs
+++ b/FileAES/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace FAES_GUI.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/FileAES/packages.config b/FileAES/packages.config
index ffdd4ff..b5a2ce0 100644
--- a/FileAES/packages.config
+++ b/FileAES/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file