Skip to content

Commit 0dd2351

Browse files
csbernathcsbernath
committed
Creating Options dialog, moving color theme to options dialog
1 parent 972473c commit 0dd2351

File tree

8 files changed

+366
-77
lines changed

8 files changed

+366
-77
lines changed

‎DataCommander.Providers/DataCommander.Providers.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,12 @@
244244
<Compile Include="IStringMatcher.cs" />
245245
<Compile Include="ITreeNode.cs" />
246246
<Compile Include="ObjectName.cs" />
247+
<Compile Include="OptionsForm.cs">
248+
<SubType>Form</SubType>
249+
</Compile>
250+
<Compile Include="OptionsForm.Designer.cs">
251+
<DependentUpon>OptionsForm.cs</DependentUpon>
252+
</Compile>
247253
<Compile Include="ProviderName.cs" />
248254
<Compile Include="DataParameterBase.cs" />
249255
<Compile Include="FieldNamespace\BinaryDataFieldReader.cs" />
@@ -421,6 +427,9 @@
421427
<EmbeddedResource Include="AboutForm.resx">
422428
<DependentUpon>AboutForm.cs</DependentUpon>
423429
</EmbeddedResource>
430+
<EmbeddedResource Include="OptionsForm.resx">
431+
<DependentUpon>OptionsForm.cs</DependentUpon>
432+
</EmbeddedResource>
424433
<EmbeddedResource Include="Properties\Resources.resx">
425434
<Generator>ResXFileCodeGenerator</Generator>
426435
<LastGenOutput>Resources.Designer.cs</LastGenOutput>

‎DataCommander.Providers/DataCommanderApplication.cs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,7 @@ public ConfigurationNode ConnectionsConfigurationNode
6666

6767
public void Run()
6868
{
69-
var darkColorTheme = Settings.CurrentType.Attributes["DarkColorTheme"].GetValue<bool>();
70-
var colorTheme = darkColorTheme
71-
? new ColorTheme(
72-
Color.FromArgb(220, 220, 220),
73-
Color.FromArgb(30, 30, 30),
74-
Color.DarkOliveGreen,
75-
Color.FromArgb(86, 156, 214),
76-
Color.FromArgb(203, 65, 65))
77-
: null;
78-
MainForm = new MainForm(colorTheme);
69+
MainForm = new MainForm();
7970

8071
Task.Delay(1000).ContinueWith(task =>
8172
{

‎DataCommander.Providers/MainForm.cs‎

Lines changed: 104 additions & 55 deletions
Large diffs are not rendered by default.

‎DataCommander.Providers/OptionsForm.Designer.cs‎

Lines changed: 108 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DataCommander.Providers/OptionsForm.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System.Windows.Forms;
2+
3+
namespace DataCommander.Providers
4+
{
5+
public partial class OptionsForm : Form
6+
{
7+
private bool _darkColorTheme;
8+
9+
public OptionsForm(bool darkColorTheme)
10+
{
11+
InitializeComponent();
12+
13+
_darkColorTheme = darkColorTheme;
14+
colorThemeComboBox.SelectedIndex = _darkColorTheme ? 1 : 0;
15+
}
16+
17+
public bool DarkColorTheme => _darkColorTheme;
18+
19+
private void okButton_Click(object sender, System.EventArgs e)
20+
{
21+
_darkColorTheme = colorThemeComboBox.SelectedIndex != 0;
22+
}
23+
}
24+
}

‎DataCommander.Providers/OptionsForm.resx‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎DataCommander/App.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
</Foundation>
3535
<DataCommander>
3636
<Providers>
37-
<DataCommanderApplication>
38-
<attribute name="DarkColorTheme" type="bool" value="true"/>
39-
</DataCommanderApplication>
4037
<Query>
4138
<QueryForm>
4239
<attribute name="CommandTimeout" type="int" value="0"/>

‎Foundation.NetStandard-2.0/Configuration/ApplicationData.cs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,8 @@ public sealed class ApplicationData
1717
private string _fileName;
1818
private string _sectionName;
1919

20-
/// <summary>
21-
///
22-
/// </summary>
2320
public ConfigurationNode RootNode { get; private set; }
2421

25-
/// <summary>
26-
///
27-
/// </summary>
2822
public ConfigurationNode CurrentNamespace
2923
{
3024
get
@@ -36,9 +30,6 @@ public ConfigurationNode CurrentNamespace
3630
}
3731
}
3832

39-
/// <summary>
40-
///
41-
/// </summary>
4233
public ConfigurationNode CurrentType
4334
{
4435
get

0 commit comments

Comments
 (0)