Renamed colorDialog

This commit is contained in:
Alexander 2019-08-21 15:17:18 +03:00
parent d956c3dd3b
commit 1b37bd790b
3 changed files with 31 additions and 32 deletions

View file

@ -1,4 +1,4 @@
namespace Crypto_Notepad
namespace Crypto_Notepad
{
partial class SettingsForm
{
@ -28,10 +28,9 @@ protected override void Dispose(bool disposing)
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsForm));
this.FontColorLabel = new System.Windows.Forms.Label();
this.colorDialog1 = new System.Windows.Forms.ColorDialog();
this.colorDialog = new System.Windows.Forms.ColorDialog();
this.SaveSettingsButton = new System.Windows.Forms.Button();
this.FontNameLabel = new System.Windows.Forms.Label();
this.SettingsTabControl = new System.Windows.Forms.TabControl();
@ -106,10 +105,10 @@ private void InitializeComponent()
this.FontColorLabel.TabIndex = 0;
this.FontColorLabel.Text = "Font color";
//
// colorDialog1
// colorDialog
//
this.colorDialog1.AnyColor = true;
this.colorDialog1.FullOpen = true;
this.colorDialog.AnyColor = true;
this.colorDialog.FullOpen = true;
//
// SaveSettingsButton
//
@ -794,7 +793,7 @@ private void InitializeComponent()
private System.Windows.Forms.Label BackgroundColorLabel;
private System.Windows.Forms.Panel HighlightsColorPanel;
private System.Windows.Forms.Label HighlightsColorLabel;
private System.Windows.Forms.ColorDialog colorDialog1;
private System.Windows.Forms.ColorDialog colorDialog;
private System.Windows.Forms.TextBox SaltTextBox;
private System.Windows.Forms.ComboBox KeySizeComboBox;
private System.Windows.Forms.Label SaltLabel;

View file

@ -256,7 +256,7 @@ private void SettingsForm_Load(object sender, EventArgs e)
string custom_colors = ps.CustomColor;
int[] array_of_colors = custom_colors.Split(';').Select(n => Convert.ToInt32(n)).ToArray();
colorDialog1.CustomColors = array_of_colors;
colorDialog.CustomColors = array_of_colors;
}
/*Form Events*/
@ -285,32 +285,32 @@ private void SaveSettingsButton_Click(object sender, EventArgs e)
/*Settings Section*/
private void FontColorPanel_Click_1(object sender, EventArgs e)
{
colorDialog1.Color = FontColorPanel.BackColor;
colorDialog.Color = FontColorPanel.BackColor;
using (new CenterWinDialog(this))
{
colorDialog1.ShowDialog();
colorDialog.ShowDialog();
}
FontColorPanel.BackColor = colorDialog1.Color;
FontColorPanel.BackColor = colorDialog.Color;
}
private void BackgroundColorPanel_Click(object sender, EventArgs e)
{
colorDialog1.Color = BackgroundColorPanel.BackColor;
colorDialog.Color = BackgroundColorPanel.BackColor;
using (new CenterWinDialog(this))
{
colorDialog1.ShowDialog();
colorDialog.ShowDialog();
}
BackgroundColorPanel.BackColor = colorDialog1.Color;
BackgroundColorPanel.BackColor = colorDialog.Color;
}
private void HighlightsColorPanel_Click(object sender, EventArgs e)
{
colorDialog1.Color = HighlightsColorPanel.BackColor;
colorDialog.Color = HighlightsColorPanel.BackColor;
using (new CenterWinDialog(this))
{
colorDialog1.ShowDialog();
colorDialog.ShowDialog();
}
HighlightsColorPanel.BackColor = colorDialog1.Color;
HighlightsColorPanel.BackColor = colorDialog.Color;
}
private void ToolbarCheckBox_CheckedChanged(object sender, EventArgs e)
@ -328,47 +328,47 @@ private void ToolbarCheckBox_CheckedChanged(object sender, EventArgs e)
private void LNBackgroundColorPanel_Click(object sender, EventArgs e)
{
colorDialog1.Color = LNBackgroundColorPanel.BackColor;
colorDialog.Color = LNBackgroundColorPanel.BackColor;
using (new CenterWinDialog(this))
{
colorDialog1.ShowDialog();
colorDialog.ShowDialog();
}
LNBackgroundColorPanel.BackColor = colorDialog1.Color;
LNBackgroundColorPanel.BackColor = colorDialog.Color;
}
private void LNFontColorPanel_Click(object sender, EventArgs e)
{
colorDialog1.Color = LNFontColorPanel.BackColor;
colorDialog.Color = LNFontColorPanel.BackColor;
using (new CenterWinDialog(this))
{
colorDialog1.ShowDialog();
colorDialog.ShowDialog();
}
LNFontColorPanel.BackColor = colorDialog1.Color;
LNFontColorPanel.BackColor = colorDialog.Color;
}
private void BLColorPanel_Click(object sender, EventArgs e)
{
colorDialog1.Color = BLColorPanel.BackColor;
colorDialog.Color = BLColorPanel.BackColor;
using (new CenterWinDialog(this))
{
colorDialog1.ShowDialog();
colorDialog.ShowDialog();
}
BLColorPanel.BackColor = colorDialog1.Color;
BLColorPanel.BackColor = colorDialog.Color;
}
private void GLColorPanel_Click(object sender, EventArgs e)
{
colorDialog1.Color = GLColorPanel.BackColor;
colorDialog.Color = GLColorPanel.BackColor;
using (new CenterWinDialog(this))
{
colorDialog1.ShowDialog();
colorDialog.ShowDialog();
}
GLColorPanel.BackColor = colorDialog1.Color;
GLColorPanel.BackColor = colorDialog.Color;
}
private void SettingsForm_FormClosed(object sender, FormClosedEventArgs e)
{
string result = string.Join(";", colorDialog1.CustomColors);
string result = string.Join(";", colorDialog.CustomColors);
ps.CustomColor = result;
ps.Save();
}

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@ -117,7 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="colorDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">