diff --git a/app/ControlHelper.cs b/app/ControlHelper.cs index f362705f..aa5b04c5 100644 --- a/app/ControlHelper.cs +++ b/app/ControlHelper.cs @@ -10,7 +10,9 @@ public static class ControlHelper static Color formBack; static Color backMain; + static Color backSecond; static Color foreMain; + static Color foreAccent; static Color borderMain; static Color buttonMain; @@ -22,7 +24,10 @@ public static class ControlHelper { formBack = Color.FromArgb(255, 35, 35, 35); backMain = Color.FromArgb(255, 50, 50, 50); + backSecond = Color.FromArgb(255, 125, 125, 125); + foreMain = Color.White; + foreAccent = Color.FromArgb(255,100, 100, 100); borderMain = Color.FromArgb(255, 50, 50, 50); buttonMain = Color.FromArgb(255, 100, 100, 100); } @@ -30,7 +35,10 @@ public static class ControlHelper { formBack = SystemColors.Control; backMain = SystemColors.ControlLightLight; + backSecond = SystemColors.ButtonFace; + foreMain = SystemColors.ControlText; + foreAccent = Color.LightGray; borderMain = Color.LightGray; buttonMain = SystemColors.ControlLight; } @@ -48,7 +56,7 @@ public static class ControlHelper { foreach (Control control in controls) { - var button = control as Button; + var button = control as RButton; if (button != null) { button.BackColor = backMain; @@ -89,8 +97,8 @@ public static class ControlHelper { chart.BackColor = backMain; chart.ChartAreas[0].BackColor = backMain; - chart.ChartAreas[0].AxisX.MajorGrid.LineColor = foreMain; - chart.ChartAreas[0].AxisY.MajorGrid.LineColor = foreMain; + chart.ChartAreas[0].AxisX.MajorGrid.LineColor = foreAccent; + chart.ChartAreas[0].AxisY.MajorGrid.LineColor = foreAccent; chart.ChartAreas[0].AxisX.TitleForeColor = foreMain; chart.ChartAreas[0].AxisY.TitleForeColor = foreMain; @@ -101,8 +109,8 @@ public static class ControlHelper chart.ChartAreas[0].AxisX.MajorTickMark.LineColor = foreMain; chart.ChartAreas[0].AxisY.MajorTickMark.LineColor = foreMain; - chart.ChartAreas[0].AxisX.LineColor = foreMain; - chart.ChartAreas[0].AxisY.LineColor = foreMain; + chart.ChartAreas[0].AxisX.LineColor = foreAccent; + chart.ChartAreas[0].AxisY.LineColor = foreAccent; chart.Titles[0].ForeColor = foreMain; diff --git a/app/CustomControls.cs b/app/CustomControls.cs index 6f04c668..2ac36de3 100644 --- a/app/CustomControls.cs +++ b/app/CustomControls.cs @@ -221,10 +221,13 @@ namespace CustomControls { //Fields private int borderSize = 5; - private int borderRadius = 3; + private int borderRadius = 5; + private bool activated = false; + private Color borderColor = Color.Transparent; + public Color BorderColor { get { return borderColor; } diff --git a/app/CustomControls.resx b/app/CustomControls.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/app/CustomControls.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/app/Fans.cs b/app/Fans.cs index 68997d7b..c7cd38d5 100644 --- a/app/Fans.cs +++ b/app/Fans.cs @@ -35,9 +35,6 @@ namespace GHelper chart.Titles[0].Text = title; - chart.ChartAreas[0].AxisX.MajorGrid.LineColor = Color.LightGray; - chart.ChartAreas[0].AxisY.MajorGrid.LineColor = Color.LightGray; - chart.ChartAreas[0].AxisX.Minimum = 10; chart.ChartAreas[0].AxisX.Maximum = 100; chart.ChartAreas[0].AxisX.Interval = 10; diff --git a/app/GHelper.csproj b/app/GHelper.csproj index 5172bad3..d2cfbcc1 100644 --- a/app/GHelper.csproj +++ b/app/GHelper.csproj @@ -16,7 +16,7 @@ x64 False True - 0.34 + 0.33 diff --git a/docs/screenshot-dark.png b/docs/screenshot-dark.png new file mode 100644 index 00000000..d84d1f4a Binary files /dev/null and b/docs/screenshot-dark.png differ