diff --git a/Crypto Notepad/App.config b/Crypto Notepad/App.config index bb9430b..44b5a46 100644 --- a/Crypto Notepad/App.config +++ b/Crypto Notepad/App.config @@ -30,9 +30,6 @@ 11 - - 172, 87, 11 - False diff --git a/Crypto Notepad/Properties/Settings.Designer.cs b/Crypto Notepad/Properties/Settings.Designer.cs index 0ac4d85..f485095 100644 --- a/Crypto Notepad/Properties/Settings.Designer.cs +++ b/Crypto Notepad/Properties/Settings.Designer.cs @@ -101,19 +101,6 @@ public int RichTextSize { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("172, 87, 11")] - public global::System.Drawing.Color HighlightsColor { - get { - return ((global::System.Drawing.Color)(this["HighlightsColor"])); - } - set { - this["HighlightsColor"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/Crypto Notepad/Properties/Settings.settings b/Crypto Notepad/Properties/Settings.settings index 2c85910..2cf87ac 100644 --- a/Crypto Notepad/Properties/Settings.settings +++ b/Crypto Notepad/Properties/Settings.settings @@ -20,9 +20,6 @@ 11 - - 172, 87, 11 - False diff --git a/Crypto Notepad/SettingsForm.Designer.cs b/Crypto Notepad/SettingsForm.Designer.cs index ac457d3..e002da5 100644 --- a/Crypto Notepad/SettingsForm.Designer.cs +++ b/Crypto Notepad/SettingsForm.Designer.cs @@ -57,9 +57,7 @@ private void InitializeComponent() this.EditorGroupBox = new System.Windows.Forms.GroupBox(); this.InserKeyComboBox = new System.Windows.Forms.ComboBox(); this.InsertKeyLabel = new System.Windows.Forms.Label(); - this.HighlightsColorPanel = new System.Windows.Forms.Panel(); this.FontNameComboBox = new System.Windows.Forms.ComboBox(); - this.HighlightsColorLabel = new System.Windows.Forms.Label(); this.FontColorPanel = new System.Windows.Forms.Panel(); this.FontSizeComboBox = new System.Windows.Forms.ComboBox(); this.BackgroundColorPanel = new System.Windows.Forms.Panel(); @@ -179,7 +177,7 @@ private void InitializeComponent() this.LineNumbersGroupBox.Controls.Add(this.LNFontColorLabel); this.LineNumbersGroupBox.Controls.Add(this.LNBackgroundColor); this.LineNumbersGroupBox.Controls.Add(this.LNVisibleLabel); - this.LineNumbersGroupBox.Location = new System.Drawing.Point(2, 236); + this.LineNumbersGroupBox.Location = new System.Drawing.Point(2, 215); this.LineNumbersGroupBox.Name = "LineNumbersGroupBox"; this.LineNumbersGroupBox.Size = new System.Drawing.Size(249, 283); this.LineNumbersGroupBox.TabIndex = 14; @@ -379,9 +377,7 @@ private void InitializeComponent() this.EditorGroupBox.Controls.Add(this.InsertKeyLabel); this.EditorGroupBox.Controls.Add(this.FontNameLabel); this.EditorGroupBox.Controls.Add(this.FontColorLabel); - this.EditorGroupBox.Controls.Add(this.HighlightsColorPanel); this.EditorGroupBox.Controls.Add(this.FontNameComboBox); - this.EditorGroupBox.Controls.Add(this.HighlightsColorLabel); this.EditorGroupBox.Controls.Add(this.FontColorPanel); this.EditorGroupBox.Controls.Add(this.FontSizeComboBox); this.EditorGroupBox.Controls.Add(this.BackgroundColorPanel); @@ -389,7 +385,7 @@ private void InitializeComponent() this.EditorGroupBox.Controls.Add(this.FontSizeLabel); this.EditorGroupBox.Location = new System.Drawing.Point(6, 12); this.EditorGroupBox.Name = "EditorGroupBox"; - this.EditorGroupBox.Size = new System.Drawing.Size(249, 205); + this.EditorGroupBox.Size = new System.Drawing.Size(249, 183); this.EditorGroupBox.TabIndex = 13; this.EditorGroupBox.TabStop = false; this.EditorGroupBox.Text = "Editor"; @@ -401,7 +397,7 @@ private void InitializeComponent() this.InserKeyComboBox.Items.AddRange(new object[] { "Enable", "Disable"}); - this.InserKeyComboBox.Location = new System.Drawing.Point(137, 165); + this.InserKeyComboBox.Location = new System.Drawing.Point(137, 138); this.InserKeyComboBox.Name = "InserKeyComboBox"; this.InserKeyComboBox.Size = new System.Drawing.Size(100, 23); this.InserKeyComboBox.TabIndex = 14; @@ -409,22 +405,12 @@ private void InitializeComponent() // InsertKeyLabel // this.InsertKeyLabel.AutoSize = true; - this.InsertKeyLabel.Location = new System.Drawing.Point(9, 165); + this.InsertKeyLabel.Location = new System.Drawing.Point(9, 138); this.InsertKeyLabel.Name = "InsertKeyLabel"; this.InsertKeyLabel.Size = new System.Drawing.Size(58, 15); this.InsertKeyLabel.TabIndex = 13; this.InsertKeyLabel.Text = "Insert key"; // - // HighlightsColorPanel - // - this.HighlightsColorPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.HighlightsColorPanel.Cursor = System.Windows.Forms.Cursors.Hand; - this.HighlightsColorPanel.Location = new System.Drawing.Point(137, 138); - this.HighlightsColorPanel.Name = "HighlightsColorPanel"; - this.HighlightsColorPanel.Size = new System.Drawing.Size(100, 21); - this.HighlightsColorPanel.TabIndex = 12; - this.HighlightsColorPanel.Click += new System.EventHandler(this.HighlightsColorPanel_Click); - // // FontNameComboBox // this.FontNameComboBox.FormattingEnabled = true; @@ -433,15 +419,6 @@ private void InitializeComponent() this.FontNameComboBox.Size = new System.Drawing.Size(100, 23); this.FontNameComboBox.TabIndex = 5; // - // HighlightsColorLabel - // - this.HighlightsColorLabel.AutoSize = true; - this.HighlightsColorLabel.Location = new System.Drawing.Point(9, 138); - this.HighlightsColorLabel.Name = "HighlightsColorLabel"; - this.HighlightsColorLabel.Size = new System.Drawing.Size(92, 15); - this.HighlightsColorLabel.TabIndex = 11; - this.HighlightsColorLabel.Text = "Highlights color"; - // // FontColorPanel // this.FontColorPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -790,8 +767,6 @@ private void InitializeComponent() private System.Windows.Forms.Panel BackgroundColorPanel; private System.Windows.Forms.Label FontSizeLabel; private System.Windows.Forms.Label BackgroundColorLabel; - private System.Windows.Forms.Panel HighlightsColorPanel; - private System.Windows.Forms.Label HighlightsColorLabel; private System.Windows.Forms.ColorDialog colorDialog; private System.Windows.Forms.TextBox SaltTextBox; private System.Windows.Forms.ComboBox KeySizeComboBox; diff --git a/Crypto Notepad/SettingsForm.cs b/Crypto Notepad/SettingsForm.cs index f43f90c..c9f6838 100644 --- a/Crypto Notepad/SettingsForm.cs +++ b/Crypto Notepad/SettingsForm.cs @@ -41,7 +41,6 @@ private void SetSettings(string value) ps.RichForeColor = FontColorPanel.BackColor; ps.RichBackColor = BackgroundColorPanel.BackColor; - ps.HighlightsColor = HighlightsColorPanel.BackColor; ps.RichTextFont = FontNameComboBox.Text; ps.RichTextSize = Convert.ToInt32(FontSizeComboBox.Text.ToString()); ps.AssociateCheck = AssociateCheckBox.Checked; @@ -114,7 +113,6 @@ private void SetSettings(string value) { FontColorPanel.BackColor = Color.FromArgb(228, 228, 228); BackgroundColorPanel.BackColor = Color.FromArgb(56, 56, 56); - HighlightsColorPanel.BackColor = Color.FromArgb(101, 51, 6); FontNameComboBox.Text = "Consolas"; FontSizeComboBox.Text = 11.ToString(); AssociateCheckBox.Checked = false; @@ -221,7 +219,6 @@ private void SettingsForm_Load(object sender, EventArgs e) PwdIterationsTextBox.Text = ps.PasswordIterations.ToString(); FontColorPanel.BackColor = ps.RichForeColor; BackgroundColorPanel.BackColor = ps.RichBackColor; - HighlightsColorPanel.BackColor = ps.HighlightsColor; AssociateCheckBox.Checked = ps.AssociateCheck; UpdatesCheckBox.Checked = ps.AutoCheckUpdate; ToolbarCheckBox.Checked = ps.ShowToolbar; @@ -305,12 +302,7 @@ private void BackgroundColorPanel_Click(object sender, EventArgs e) private void HighlightsColorPanel_Click(object sender, EventArgs e) { - colorDialog.Color = HighlightsColorPanel.BackColor; - using (new CenterWinDialog(this)) - { - colorDialog.ShowDialog(); - } - HighlightsColorPanel.BackColor = colorDialog.Color; + } private void ToolbarCheckBox_CheckedChanged(object sender, EventArgs e)