Skip to content

Commit 56ef7bc

Browse files
tomvdbtomvdb
committed
0.B release , started on dynamic settings test
1 parent 8f1fc05 commit 56ef7bc

12 files changed

+229
-25
lines changed

‎MainForm.Designer.cs

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

‎MainForm.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
using Serilog;
2626
using System.Runtime.CompilerServices;
2727
using System.Drawing;
28+
using opentuner.SettingsManagement;
2829

2930
namespace opentuner
3031
{
@@ -281,6 +282,9 @@ public MainForm(string[] args)
281282
Application.AddMessageFilter(this);
282283

283284
_settings = new MainSettings();
285+
286+
//SettingsFormBuilder test = new SettingsFormBuilder(_settings);
287+
284288
_settingsManager = new SettingsManager<MainSettings>("open_tuner_settings");
285289
_settings = (_settingsManager.LoadSettings(_settings));
286290

@@ -1181,6 +1185,11 @@ private void ExtraToolsTab_DrawItem(object sender, DrawItemEventArgs e)
11811185
{
11821186

11831187
}
1188+
1189+
private void LinkDatvReportMoreInfo_Click(object sender, EventArgs e)
1190+
{
1191+
System.Diagnostics.Process.Start("https://www.zr6tg.co.za/opentuner-datv-reporter/");
1192+
}
11841193
}
11851194

11861195

‎MainForm.resx

Lines changed: 49 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,39 @@
447447
<data name="&gt;&gt;groupBox3.ZOrder" xml:space="preserve">
448448
<value>0</value>
449449
</data>
450+
<data name="LinkDatvReportMoreInfo.AutoSize" type="System.Boolean, mscorlib">
451+
<value>True</value>
452+
</data>
453+
<data name="LinkDatvReportMoreInfo.Font" type="System.Drawing.Font, System.Drawing">
454+
<value>Microsoft Sans Serif, 8.25pt, style=Underline</value>
455+
</data>
456+
<data name="LinkDatvReportMoreInfo.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
457+
<value>NoControl</value>
458+
</data>
459+
<data name="LinkDatvReportMoreInfo.Location" type="System.Drawing.Point, System.Drawing">
460+
<value>342, 180</value>
461+
</data>
462+
<data name="LinkDatvReportMoreInfo.Size" type="System.Drawing.Size, System.Drawing">
463+
<value>64, 13</value>
464+
</data>
465+
<data name="LinkDatvReportMoreInfo.TabIndex" type="System.Int32, mscorlib">
466+
<value>19</value>
467+
</data>
468+
<data name="LinkDatvReportMoreInfo.Text" xml:space="preserve">
469+
<value>More Info ...</value>
470+
</data>
471+
<data name="&gt;&gt;LinkDatvReportMoreInfo.Name" xml:space="preserve">
472+
<value>LinkDatvReportMoreInfo</value>
473+
</data>
474+
<data name="&gt;&gt;LinkDatvReportMoreInfo.Type" xml:space="preserve">
475+
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
476+
</data>
477+
<data name="&gt;&gt;LinkDatvReportMoreInfo.Parent" xml:space="preserve">
478+
<value>groupBox2</value>
479+
</data>
480+
<data name="&gt;&gt;LinkDatvReportMoreInfo.ZOrder" xml:space="preserve">
481+
<value>0</value>
482+
</data>
450483
<data name="linkDATVReporterSettings.AutoSize" type="System.Boolean, mscorlib">
451484
<value>True</value>
452485
</data>
@@ -478,7 +511,7 @@
478511
<value>groupBox2</value>
479512
</data>
480513
<data name="&gt;&gt;linkDATVReporterSettings.ZOrder" xml:space="preserve">
481-
<value>0</value>
514+
<value>1</value>
482515
</data>
483516
<data name="checkDATVReporter.AutoSize" type="System.Boolean, mscorlib">
484517
<value>True</value>
@@ -508,7 +541,7 @@
508541
<value>groupBox2</value>
509542
</data>
510543
<data name="&gt;&gt;checkDATVReporter.ZOrder" xml:space="preserve">
511-
<value>1</value>
544+
<value>2</value>
512545
</data>
513546
<data name="checkBox2.AutoSize" type="System.Boolean, mscorlib">
514547
<value>True</value>
@@ -541,7 +574,7 @@
541574
<value>groupBox2</value>
542575
</data>
543576
<data name="&gt;&gt;checkBox2.ZOrder" xml:space="preserve">
544-
<value>2</value>
577+
<value>3</value>
545578
</data>
546579
<data name="checkBox1.AutoSize" type="System.Boolean, mscorlib">
547580
<value>True</value>
@@ -574,7 +607,7 @@
574607
<value>groupBox2</value>
575608
</data>
576609
<data name="&gt;&gt;checkBox1.ZOrder" xml:space="preserve">
577-
<value>3</value>
610+
<value>4</value>
578611
</data>
579612
<data name="linkQuickTuneSettings.AutoSize" type="System.Boolean, mscorlib">
580613
<value>True</value>
@@ -607,7 +640,7 @@
607640
<value>groupBox2</value>
608641
</data>
609642
<data name="&gt;&gt;linkQuickTuneSettings.ZOrder" xml:space="preserve">
610-
<value>4</value>
643+
<value>5</value>
611644
</data>
612645
<data name="linkBatcWebchatSettings.AutoSize" type="System.Boolean, mscorlib">
613646
<value>True</value>
@@ -640,7 +673,7 @@
640673
<value>groupBox2</value>
641674
</data>
642675
<data name="&gt;&gt;linkBatcWebchatSettings.ZOrder" xml:space="preserve">
643-
<value>5</value>
676+
<value>6</value>
644677
</data>
645678
<data name="linkBatcSpectrumSettings.AutoSize" type="System.Boolean, mscorlib">
646679
<value>True</value>
@@ -676,7 +709,7 @@
676709
<value>groupBox2</value>
677710
</data>
678711
<data name="&gt;&gt;linkBatcSpectrumSettings.ZOrder" xml:space="preserve">
679-
<value>6</value>
712+
<value>7</value>
680713
</data>
681714
<data name="linkMqttSettings.AutoSize" type="System.Boolean, mscorlib">
682715
<value>True</value>
@@ -709,7 +742,7 @@
709742
<value>groupBox2</value>
710743
</data>
711744
<data name="&gt;&gt;linkMqttSettings.ZOrder" xml:space="preserve">
712-
<value>7</value>
745+
<value>8</value>
713746
</data>
714747
<data name="linkQuickTuneDocumentation.AutoSize" type="System.Boolean, mscorlib">
715748
<value>True</value>
@@ -742,7 +775,7 @@
742775
<value>groupBox2</value>
743776
</data>
744777
<data name="&gt;&gt;linkQuickTuneDocumentation.ZOrder" xml:space="preserve">
745-
<value>8</value>
778+
<value>9</value>
746779
</data>
747780
<data name="checkQuicktune.AutoSize" type="System.Boolean, mscorlib">
748781
<value>True</value>
@@ -769,7 +802,7 @@
769802
<value>groupBox2</value>
770803
</data>
771804
<data name="&gt;&gt;checkQuicktune.ZOrder" xml:space="preserve">
772-
<value>9</value>
805+
<value>10</value>
773806
</data>
774807
<data name="linkBatcWebchatDocumentation.AutoSize" type="System.Boolean, mscorlib">
775808
<value>True</value>
@@ -802,7 +835,7 @@
802835
<value>groupBox2</value>
803836
</data>
804837
<data name="&gt;&gt;linkBatcWebchatDocumentation.ZOrder" xml:space="preserve">
805-
<value>10</value>
838+
<value>11</value>
806839
</data>
807840
<data name="linkSpectrumDocumentation.AutoSize" type="System.Boolean, mscorlib">
808841
<value>True</value>
@@ -835,7 +868,7 @@
835868
<value>groupBox2</value>
836869
</data>
837870
<data name="&gt;&gt;linkSpectrumDocumentation.ZOrder" xml:space="preserve">
838-
<value>11</value>
871+
<value>12</value>
839872
</data>
840873
<data name="LinkMqttDocumentation.AutoSize" type="System.Boolean, mscorlib">
841874
<value>True</value>
@@ -865,7 +898,7 @@
865898
<value>groupBox2</value>
866899
</data>
867900
<data name="&gt;&gt;LinkMqttDocumentation.ZOrder" xml:space="preserve">
868-
<value>12</value>
901+
<value>13</value>
869902
</data>
870903
<data name="checkMqttClient.AutoSize" type="System.Boolean, mscorlib">
871904
<value>True</value>
@@ -892,7 +925,7 @@
892925
<value>groupBox2</value>
893926
</data>
894927
<data name="&gt;&gt;checkMqttClient.ZOrder" xml:space="preserve">
895-
<value>13</value>
928+
<value>14</value>
896929
</data>
897930
<data name="checkBatcChat.AutoSize" type="System.Boolean, mscorlib">
898931
<value>True</value>
@@ -922,7 +955,7 @@
922955
<value>groupBox2</value>
923956
</data>
924957
<data name="&gt;&gt;checkBatcChat.ZOrder" xml:space="preserve">
925-
<value>14</value>
958+
<value>15</value>
926959
</data>
927960
<data name="checkBatcSpectrum.AutoSize" type="System.Boolean, mscorlib">
928961
<value>True</value>
@@ -949,7 +982,7 @@
949982
<value>groupBox2</value>
950983
</data>
951984
<data name="&gt;&gt;checkBatcSpectrum.ZOrder" xml:space="preserve">
952-
<value>15</value>
985+
<value>16</value>
953986
</data>
954987
<data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
955988
<value>Top</value>

‎MainSettings.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
using System;
1+
using opentuner.SettingsManagement;
2+
using System;
23
using System.Collections.Generic;
34
using System.Linq;
45
using System.Text;
56
using System.Threading.Tasks;
67

78
namespace opentuner
89
{
9-
public class MainSettings
10+
public class MainSettings : GenericSettings
1011
{
12+
[Group("Settings 1")]
13+
[FriendlyName("Media Path")]
1114
public string media_path = "";
1215

16+
[Group("Settings 2")]
1317
public bool enable_spectrum_checkbox = true;
1418
public bool enable_chatform_checkbox = true;
1519
public bool enable_mqtt_checkbox = true;

‎Resources/BuildDate.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024/07/13 18:17:53.68
1+
2024/07/14 13:06:17.88

‎SettingsManagement/FriendlyNameAttribute.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace opentuner.SettingsManagement
8+
{
9+
[AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
10+
public class FriendlyNameAttribute : Attribute
11+
{
12+
public string FriendlyName { get; }
13+
14+
public FriendlyNameAttribute(string friendlyName)
15+
{
16+
FriendlyName = friendlyName;
17+
}
18+
}
19+
}

‎SettingsManagement/GenericSettings.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace opentuner.SettingsManagement
8+
{
9+
public class GenericSettings
10+
{
11+
}
12+
}

‎SettingsManagement/GroupAttribute.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace opentuner.SettingsManagement
8+
{
9+
10+
[AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
11+
public class GroupAttribute : Attribute
12+
{
13+
public string GroupName { get; }
14+
15+
public GroupAttribute(string groupName)
16+
{
17+
GroupName = groupName;
18+
}
19+
}
20+
}

‎SettingsManagement/SelectionAttribute.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
7+
namespace opentuner.SettingsManagement
8+
{
9+
[AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
10+
public class SelectionAttribute : Attribute
11+
{
12+
13+
public SelectionAttribute(string[] options)
14+
{
15+
16+
}
17+
}
18+
}

0 commit comments

Comments
 (0)