Browse Source

fix variables' name: (first letter uppercase -> lowercase)

1. WrapTextTrigger -> wrapTextTrigger
2. WrapTextTriggerLock -> wrapTextTriggerLock
3. TopMostTrigger -> topMostTrigger
4. TopMostTriggerLock -> topMostTriggerLock
5. ShowToolbarTrigger -> toolbarTrigger
tags/3.0
kimw Gang Zhuo 9 years ago
parent
commit
f1019b4aad
1 changed files with 25 additions and 25 deletions
  1. +25
    -25
      shadowsocks-csharp/View/LogForm.cs

+ 25
- 25
shadowsocks-csharp/View/LogForm.cs View File

@@ -103,9 +103,9 @@ namespace Shadowsocks.View
timer.Interval = 300; timer.Interval = 300;
timer.Tick += Timer_Tick; timer.Tick += Timer_Tick;
timer.Start(); timer.Start();
this.TopMost = TopMostMenuItem.Checked = TopMostCheckBox.Checked = TopMostTrigger;
LogMessageTextBox.WordWrap = WrapTextCheckBox.Checked = WrapTextMenuItem.Checked = WrapTextTrigger;
ToolbarFlowLayoutPanel.Visible = ShowToolbarTrigger;
this.TopMost = TopMostMenuItem.Checked = TopMostCheckBox.Checked = topMostTrigger;
LogMessageTextBox.WordWrap = WrapTextCheckBox.Checked = WrapTextMenuItem.Checked = wrapTextTrigger;
ToolbarFlowLayoutPanel.Visible = toolbarTrigger;
} }
private void LogForm_FormClosing(object sender, FormClosingEventArgs e) private void LogForm_FormClosing(object sender, FormClosingEventArgs e)
@@ -178,24 +178,24 @@ namespace Shadowsocks.View
#endregion #endregion
#region Trigger the log messages wrapable, or not. #region Trigger the log messages wrapable, or not.
bool WrapTextTrigger = false;
bool WrapTextTriggerLock = false;
bool wrapTextTrigger = false;
bool wrapTextTriggerLock = false;
private void TriggerWrapText() private void TriggerWrapText()
{ {
WrapTextTriggerLock = true;
wrapTextTriggerLock = true;
WrapTextTrigger = !WrapTextTrigger;
LogMessageTextBox.WordWrap = WrapTextTrigger;
wrapTextTrigger = !wrapTextTrigger;
LogMessageTextBox.WordWrap = wrapTextTrigger;
LogMessageTextBox.ScrollToCaret(); LogMessageTextBox.ScrollToCaret();
WrapTextMenuItem.Checked = WrapTextCheckBox.Checked = WrapTextTrigger;
WrapTextMenuItem.Checked = WrapTextCheckBox.Checked = wrapTextTrigger;
WrapTextTriggerLock = false;
wrapTextTriggerLock = false;
} }
private void WrapTextMenuItem_Click(object sender, EventArgs e) private void WrapTextMenuItem_Click(object sender, EventArgs e)
{ {
if (!WrapTextTriggerLock)
if (!wrapTextTriggerLock)
{ {
TriggerWrapText(); TriggerWrapText();
} }
@@ -203,7 +203,7 @@ namespace Shadowsocks.View
private void WrapTextCheckBox_CheckedChanged(object sender, EventArgs e) private void WrapTextCheckBox_CheckedChanged(object sender, EventArgs e)
{ {
if (!WrapTextTriggerLock)
if (!wrapTextTriggerLock)
{ {
TriggerWrapText(); TriggerWrapText();
} }
@@ -211,23 +211,23 @@ namespace Shadowsocks.View
#endregion #endregion
#region Trigger this window top most, or not. #region Trigger this window top most, or not.
bool TopMostTrigger = false;
bool TopMostTriggerLock = false;
bool topMostTrigger = false;
bool topMostTriggerLock = false;
private void TriggerTopMost() private void TriggerTopMost()
{ {
TopMostTriggerLock = true;
topMostTriggerLock = true;
TopMostTrigger = !TopMostTrigger;
this.TopMost = TopMostTrigger;
TopMostMenuItem.Checked = TopMostCheckBox.Checked = TopMostTrigger;
topMostTrigger = !topMostTrigger;
this.TopMost = topMostTrigger;
TopMostMenuItem.Checked = TopMostCheckBox.Checked = topMostTrigger;
TopMostTriggerLock = false;
topMostTriggerLock = false;
} }
private void TopMostCheckBox_CheckedChanged(object sender, EventArgs e) private void TopMostCheckBox_CheckedChanged(object sender, EventArgs e)
{ {
if (!TopMostTriggerLock)
if (!topMostTriggerLock)
{ {
TriggerTopMost(); TriggerTopMost();
} }
@@ -235,19 +235,19 @@ namespace Shadowsocks.View
private void TopMostMenuItem_Click(object sender, EventArgs e) private void TopMostMenuItem_Click(object sender, EventArgs e)
{ {
if (!TopMostTriggerLock)
if (!topMostTriggerLock)
{ {
TriggerTopMost(); TriggerTopMost();
} }
} }
#endregion #endregion
private bool ShowToolbarTrigger = false;
private bool toolbarTrigger = false;
private void ShowToolbarMenuItem_Click(object sender, EventArgs e) private void ShowToolbarMenuItem_Click(object sender, EventArgs e)
{ {
ShowToolbarTrigger = !ShowToolbarTrigger;
ToolbarFlowLayoutPanel.Visible = ShowToolbarTrigger;
ShowToolbarMenuItem.Checked = ShowToolbarTrigger;
toolbarTrigger = !toolbarTrigger;
ToolbarFlowLayoutPanel.Visible = toolbarTrigger;
ShowToolbarMenuItem.Checked = toolbarTrigger;
} }
} }
} }

Loading…
Cancel
Save