Skip to content
Snippets Groups Projects
Commit 9c03c667 authored by Dennis Eisold's avatar Dennis Eisold
Browse files

Merge branch 'master' into 'master' 

removed old files and updated resources

See merge request wetterstation/frontend!6
parents 45266314 a9daa082
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 221 additions and 223 deletions
Wetterstation/Form1.Designer.cs
+ 115
− 81
View file @ 9c03c667
This diff is collapsed.
Wetterstation/Properties/Resources.Designer.cs
+ 0
− 70
View file @ 9c03c667
...@@ -60,46 +60,6 @@ namespace Wetterstation.Properties { ...@@ -60,46 +60,6 @@ namespace Wetterstation.Properties {
} }
} }
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _02d_small {
get {
object obj = ResourceManager.GetObject("02d_small", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _03n_small {
get {
object obj = ResourceManager.GetObject("03n_small", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _11d_small {
get {
object obj = ResourceManager.GetObject("11d_small", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _13n_small {
get {
object obj = ResourceManager.GetObject("13n_small", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary> /// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary> /// </summary>
...@@ -120,16 +80,6 @@ namespace Wetterstation.Properties { ...@@ -120,16 +80,6 @@ namespace Wetterstation.Properties {
} }
} }
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap histogramm {
get {
object obj = ResourceManager.GetObject("histogramm", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary> /// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary> /// </summary>
...@@ -140,26 +90,6 @@ namespace Wetterstation.Properties { ...@@ -140,26 +90,6 @@ namespace Wetterstation.Properties {
} }
} }
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Kompassrose1 {
get {
object obj = ResourceManager.GetObject("Kompassrose1", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Kompassrose2 {
get {
object obj = ResourceManager.GetObject("Kompassrose2", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary> /// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary> /// </summary>
......
Wetterstation/Properties/Resources.resx
+ 0
− 21
View file @ 9c03c667
...@@ -118,39 +118,18 @@ ...@@ -118,39 +118,18 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="03n_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\03n_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Kompassrose" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Kompassrose" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Kompassrose.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\Kompassrose.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="saturn" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="saturn" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\saturn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\saturn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="Kompassrose2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Kompassrose1.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Kompassrose1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Kompassrose.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="histogramm" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\histogramm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="13n_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\13n_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="earth" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="earth" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\earth.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\earth.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="02d_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\02d_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bild_Dennis_Formatiert" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Bild_Dennis_Formatiert" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Bild_Dennis_Formatiert.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\Bild_Dennis_Formatiert.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="11d_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\11d_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Strand" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Strand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Strand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\Strand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
......
Wetterstation/Resources/Kompassrose.gif deleted 100644 → 0
+ 0
− 0
View file @ 45266314
Wetterstation/Resources/Kompassrose.gif

57.9 KiB

Wetterstation/Resources/Kompassrose1.gif deleted 100644 → 0
+ 0
− 0
View file @ 45266314
Wetterstation/Resources/Kompassrose1.gif

4.14 KiB

Wetterstation/Resources/histogramm.png deleted 100644 → 0
+ 0
− 0
View file @ 45266314
Wetterstation/Resources/histogramm.png

20.4 KiB

Wetterstation/Settings.Designer.cs
+ 83
− 50
View file @ 9c03c667
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
this.textBox3 = new System.Windows.Forms.TextBox(); this.textBox3 = new System.Windows.Forms.TextBox();
this.lbSettingsLand = new System.Windows.Forms.Label(); this.lbSettingsLand = new System.Windows.Forms.Label();
this.tbSettingsLand = new System.Windows.Forms.TextBox(); this.tbSettingsLand = new System.Windows.Forms.TextBox();
this.lblFrontendId = new System.Windows.Forms.Label();
this.SuspendLayout(); this.SuspendLayout();
// //
// lbSettingsHost // lbSettingsHost
...@@ -54,9 +55,10 @@ ...@@ -54,9 +55,10 @@
this.lbSettingsHost.BackColor = System.Drawing.Color.Transparent; this.lbSettingsHost.BackColor = System.Drawing.Color.Transparent;
this.lbSettingsHost.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbSettingsHost.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbSettingsHost.ForeColor = System.Drawing.Color.White; this.lbSettingsHost.ForeColor = System.Drawing.Color.White;
this.lbSettingsHost.Location = new System.Drawing.Point(20, 34); this.lbSettingsHost.Location = new System.Drawing.Point(31, 70);
this.lbSettingsHost.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbSettingsHost.Name = "lbSettingsHost"; this.lbSettingsHost.Name = "lbSettingsHost";
this.lbSettingsHost.Size = new System.Drawing.Size(55, 19); this.lbSettingsHost.Size = new System.Drawing.Size(68, 24);
this.lbSettingsHost.TabIndex = 0; this.lbSettingsHost.TabIndex = 0;
this.lbSettingsHost.Text = "Host()"; this.lbSettingsHost.Text = "Host()";
// //
...@@ -64,10 +66,11 @@ ...@@ -64,10 +66,11 @@
// //
this.tbSettingsHost.Anchor = System.Windows.Forms.AnchorStyles.None; this.tbSettingsHost.Anchor = System.Windows.Forms.AnchorStyles.None;
this.tbSettingsHost.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tbSettingsHost.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tbSettingsHost.Location = new System.Drawing.Point(7, 55); this.tbSettingsHost.Location = new System.Drawing.Point(13, 96);
this.tbSettingsHost.MinimumSize = new System.Drawing.Size(300, 30); this.tbSettingsHost.Margin = new System.Windows.Forms.Padding(4);
this.tbSettingsHost.MinimumSize = new System.Drawing.Size(399, 30);
this.tbSettingsHost.Name = "tbSettingsHost"; this.tbSettingsHost.Name = "tbSettingsHost";
this.tbSettingsHost.Size = new System.Drawing.Size(300, 30); this.tbSettingsHost.Size = new System.Drawing.Size(399, 35);
this.tbSettingsHost.TabIndex = 4; this.tbSettingsHost.TabIndex = 4;
// //
// lbSettingsPort // lbSettingsPort
...@@ -76,9 +79,10 @@ ...@@ -76,9 +79,10 @@
this.lbSettingsPort.BackColor = System.Drawing.Color.Transparent; this.lbSettingsPort.BackColor = System.Drawing.Color.Transparent;
this.lbSettingsPort.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbSettingsPort.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbSettingsPort.ForeColor = System.Drawing.Color.White; this.lbSettingsPort.ForeColor = System.Drawing.Color.White;
this.lbSettingsPort.Location = new System.Drawing.Point(20, 98); this.lbSettingsPort.Location = new System.Drawing.Point(31, 149);
this.lbSettingsPort.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbSettingsPort.Name = "lbSettingsPort"; this.lbSettingsPort.Name = "lbSettingsPort";
this.lbSettingsPort.Size = new System.Drawing.Size(91, 19); this.lbSettingsPort.Size = new System.Drawing.Size(114, 24);
this.lbSettingsPort.TabIndex = 5; this.lbSettingsPort.TabIndex = 5;
this.lbSettingsPort.Text = "Port (1883)"; this.lbSettingsPort.Text = "Port (1883)";
// //
...@@ -86,10 +90,11 @@ ...@@ -86,10 +90,11 @@
// //
this.tbSettingsPort.Anchor = System.Windows.Forms.AnchorStyles.None; this.tbSettingsPort.Anchor = System.Windows.Forms.AnchorStyles.None;
this.tbSettingsPort.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tbSettingsPort.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tbSettingsPort.Location = new System.Drawing.Point(7, 117); this.tbSettingsPort.Location = new System.Drawing.Point(13, 172);
this.tbSettingsPort.MinimumSize = new System.Drawing.Size(300, 30); this.tbSettingsPort.Margin = new System.Windows.Forms.Padding(4);
this.tbSettingsPort.MinimumSize = new System.Drawing.Size(399, 30);
this.tbSettingsPort.Name = "tbSettingsPort"; this.tbSettingsPort.Name = "tbSettingsPort";
this.tbSettingsPort.Size = new System.Drawing.Size(300, 30); this.tbSettingsPort.Size = new System.Drawing.Size(399, 35);
this.tbSettingsPort.TabIndex = 6; this.tbSettingsPort.TabIndex = 6;
// //
// lbSettingsClient // lbSettingsClient
...@@ -98,9 +103,10 @@ ...@@ -98,9 +103,10 @@
this.lbSettingsClient.BackColor = System.Drawing.Color.Transparent; this.lbSettingsClient.BackColor = System.Drawing.Color.Transparent;
this.lbSettingsClient.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbSettingsClient.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbSettingsClient.ForeColor = System.Drawing.Color.White; this.lbSettingsClient.ForeColor = System.Drawing.Color.White;
this.lbSettingsClient.Location = new System.Drawing.Point(20, 163); this.lbSettingsClient.Location = new System.Drawing.Point(31, 229);
this.lbSettingsClient.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbSettingsClient.Name = "lbSettingsClient"; this.lbSettingsClient.Name = "lbSettingsClient";
this.lbSettingsClient.Size = new System.Drawing.Size(173, 19); this.lbSettingsClient.Size = new System.Drawing.Size(212, 24);
this.lbSettingsClient.TabIndex = 7; this.lbSettingsClient.TabIndex = 7;
this.lbSettingsClient.Text = "Client (DVES 06236C)"; this.lbSettingsClient.Text = "Client (DVES 06236C)";
// //
...@@ -108,20 +114,22 @@ ...@@ -108,20 +114,22 @@
// //
this.tbSettingsClient.Anchor = System.Windows.Forms.AnchorStyles.None; this.tbSettingsClient.Anchor = System.Windows.Forms.AnchorStyles.None;
this.tbSettingsClient.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tbSettingsClient.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tbSettingsClient.Location = new System.Drawing.Point(8, 182); this.tbSettingsClient.Location = new System.Drawing.Point(15, 252);
this.tbSettingsClient.MinimumSize = new System.Drawing.Size(300, 30); this.tbSettingsClient.Margin = new System.Windows.Forms.Padding(4);
this.tbSettingsClient.MinimumSize = new System.Drawing.Size(399, 30);
this.tbSettingsClient.Name = "tbSettingsClient"; this.tbSettingsClient.Name = "tbSettingsClient";
this.tbSettingsClient.Size = new System.Drawing.Size(300, 30); this.tbSettingsClient.Size = new System.Drawing.Size(399, 35);
this.tbSettingsClient.TabIndex = 8; this.tbSettingsClient.TabIndex = 8;
// //
// tbSettingsUser // tbSettingsUser
// //
this.tbSettingsUser.Anchor = System.Windows.Forms.AnchorStyles.None; this.tbSettingsUser.Anchor = System.Windows.Forms.AnchorStyles.None;
this.tbSettingsUser.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tbSettingsUser.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tbSettingsUser.Location = new System.Drawing.Point(8, 248); this.tbSettingsUser.Location = new System.Drawing.Point(15, 333);
this.tbSettingsUser.MinimumSize = new System.Drawing.Size(300, 30); this.tbSettingsUser.Margin = new System.Windows.Forms.Padding(4);
this.tbSettingsUser.MinimumSize = new System.Drawing.Size(399, 30);
this.tbSettingsUser.Name = "tbSettingsUser"; this.tbSettingsUser.Name = "tbSettingsUser";
this.tbSettingsUser.Size = new System.Drawing.Size(300, 30); this.tbSettingsUser.Size = new System.Drawing.Size(399, 35);
this.tbSettingsUser.TabIndex = 9; this.tbSettingsUser.TabIndex = 9;
// //
// lbSettingsUser // lbSettingsUser
...@@ -130,9 +138,10 @@ ...@@ -130,9 +138,10 @@
this.lbSettingsUser.BackColor = System.Drawing.Color.Transparent; this.lbSettingsUser.BackColor = System.Drawing.Color.Transparent;
this.lbSettingsUser.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbSettingsUser.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbSettingsUser.ForeColor = System.Drawing.Color.White; this.lbSettingsUser.ForeColor = System.Drawing.Color.White;
this.lbSettingsUser.Location = new System.Drawing.Point(20, 227); this.lbSettingsUser.Location = new System.Drawing.Point(31, 307);
this.lbSettingsUser.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbSettingsUser.Name = "lbSettingsUser"; this.lbSettingsUser.Name = "lbSettingsUser";
this.lbSettingsUser.Size = new System.Drawing.Size(144, 19); this.lbSettingsUser.Size = new System.Drawing.Size(177, 24);
this.lbSettingsUser.TabIndex = 10; this.lbSettingsUser.TabIndex = 10;
this.lbSettingsUser.Text = "User (DVES User)"; this.lbSettingsUser.Text = "User (DVES User)";
// //
...@@ -142,9 +151,10 @@ ...@@ -142,9 +151,10 @@
this.lbSettingsPasswort.BackColor = System.Drawing.Color.Transparent; this.lbSettingsPasswort.BackColor = System.Drawing.Color.Transparent;
this.lbSettingsPasswort.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbSettingsPasswort.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbSettingsPasswort.ForeColor = System.Drawing.Color.White; this.lbSettingsPasswort.ForeColor = System.Drawing.Color.White;
this.lbSettingsPasswort.Location = new System.Drawing.Point(20, 294); this.lbSettingsPasswort.Location = new System.Drawing.Point(31, 390);
this.lbSettingsPasswort.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbSettingsPasswort.Name = "lbSettingsPasswort"; this.lbSettingsPasswort.Name = "lbSettingsPasswort";
this.lbSettingsPasswort.Size = new System.Drawing.Size(99, 19); this.lbSettingsPasswort.Size = new System.Drawing.Size(120, 24);
this.lbSettingsPasswort.TabIndex = 11; this.lbSettingsPasswort.TabIndex = 11;
this.lbSettingsPasswort.Text = "Password #"; this.lbSettingsPasswort.Text = "Password #";
// //
...@@ -152,10 +162,11 @@ ...@@ -152,10 +162,11 @@
// //
this.textBox1.Anchor = System.Windows.Forms.AnchorStyles.None; this.textBox1.Anchor = System.Windows.Forms.AnchorStyles.None;
this.textBox1.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBox1.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBox1.Location = new System.Drawing.Point(7, 314); this.textBox1.Location = new System.Drawing.Point(13, 414);
this.textBox1.MinimumSize = new System.Drawing.Size(300, 30); this.textBox1.Margin = new System.Windows.Forms.Padding(4);
this.textBox1.MinimumSize = new System.Drawing.Size(399, 30);
this.textBox1.Name = "textBox1"; this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(300, 30); this.textBox1.Size = new System.Drawing.Size(399, 35);
this.textBox1.TabIndex = 12; this.textBox1.TabIndex = 12;
// //
// lbSettingsTopic // lbSettingsTopic
...@@ -164,9 +175,10 @@ ...@@ -164,9 +175,10 @@
this.lbSettingsTopic.BackColor = System.Drawing.Color.Transparent; this.lbSettingsTopic.BackColor = System.Drawing.Color.Transparent;
this.lbSettingsTopic.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbSettingsTopic.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbSettingsTopic.ForeColor = System.Drawing.Color.White; this.lbSettingsTopic.ForeColor = System.Drawing.Color.White;
this.lbSettingsTopic.Location = new System.Drawing.Point(20, 367); this.lbSettingsTopic.Location = new System.Drawing.Point(31, 480);
this.lbSettingsTopic.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbSettingsTopic.Name = "lbSettingsTopic"; this.lbSettingsTopic.Name = "lbSettingsTopic";
this.lbSettingsTopic.Size = new System.Drawing.Size(251, 19); this.lbSettingsTopic.Size = new System.Drawing.Size(311, 24);
this.lbSettingsTopic.TabIndex = 13; this.lbSettingsTopic.TabIndex = 13;
this.lbSettingsTopic.Text = "Topic = %topic% (wetterstation)"; this.lbSettingsTopic.Text = "Topic = %topic% (wetterstation)";
// //
...@@ -174,10 +186,11 @@ ...@@ -174,10 +186,11 @@
// //
this.tbSettingsTopic.Anchor = System.Windows.Forms.AnchorStyles.None; this.tbSettingsTopic.Anchor = System.Windows.Forms.AnchorStyles.None;
this.tbSettingsTopic.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tbSettingsTopic.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tbSettingsTopic.Location = new System.Drawing.Point(7, 386); this.tbSettingsTopic.Location = new System.Drawing.Point(13, 503);
this.tbSettingsTopic.MinimumSize = new System.Drawing.Size(300, 30); this.tbSettingsTopic.Margin = new System.Windows.Forms.Padding(4);
this.tbSettingsTopic.MinimumSize = new System.Drawing.Size(399, 30);
this.tbSettingsTopic.Name = "tbSettingsTopic"; this.tbSettingsTopic.Name = "tbSettingsTopic";
this.tbSettingsTopic.Size = new System.Drawing.Size(300, 30); this.tbSettingsTopic.Size = new System.Drawing.Size(399, 35);
this.tbSettingsTopic.TabIndex = 14; this.tbSettingsTopic.TabIndex = 14;
// //
// lbStettingsFullTopic // lbStettingsFullTopic
...@@ -186,9 +199,10 @@ ...@@ -186,9 +199,10 @@
this.lbStettingsFullTopic.BackColor = System.Drawing.Color.Transparent; this.lbStettingsFullTopic.BackColor = System.Drawing.Color.Transparent;
this.lbStettingsFullTopic.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbStettingsFullTopic.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbStettingsFullTopic.ForeColor = System.Drawing.Color.White; this.lbStettingsFullTopic.ForeColor = System.Drawing.Color.White;
this.lbStettingsFullTopic.Location = new System.Drawing.Point(19, 444); this.lbStettingsFullTopic.Location = new System.Drawing.Point(29, 574);
this.lbStettingsFullTopic.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbStettingsFullTopic.Name = "lbStettingsFullTopic"; this.lbStettingsFullTopic.Name = "lbStettingsFullTopic";
this.lbStettingsFullTopic.Size = new System.Drawing.Size(250, 19); this.lbStettingsFullTopic.Size = new System.Drawing.Size(303, 24);
this.lbStettingsFullTopic.TabIndex = 15; this.lbStettingsFullTopic.TabIndex = 15;
this.lbStettingsFullTopic.Text = "Full Topic (%prefix%/%topic%/)"; this.lbStettingsFullTopic.Text = "Full Topic (%prefix%/%topic%/)";
// //
...@@ -196,10 +210,11 @@ ...@@ -196,10 +210,11 @@
// //
this.textBox2.Anchor = System.Windows.Forms.AnchorStyles.None; this.textBox2.Anchor = System.Windows.Forms.AnchorStyles.None;
this.textBox2.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBox2.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBox2.Location = new System.Drawing.Point(6, 462); this.textBox2.Location = new System.Drawing.Point(12, 597);
this.textBox2.MinimumSize = new System.Drawing.Size(300, 30); this.textBox2.Margin = new System.Windows.Forms.Padding(4);
this.textBox2.MinimumSize = new System.Drawing.Size(399, 30);
this.textBox2.Name = "textBox2"; this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(300, 30); this.textBox2.Size = new System.Drawing.Size(399, 35);
this.textBox2.TabIndex = 16; this.textBox2.TabIndex = 16;
this.textBox2.TextChanged += new System.EventHandler(this.TextBox2_TextChanged); this.textBox2.TextChanged += new System.EventHandler(this.TextBox2_TextChanged);
// //
...@@ -209,9 +224,10 @@ ...@@ -209,9 +224,10 @@
this.lbSettingsOrt.BackColor = System.Drawing.Color.Transparent; this.lbSettingsOrt.BackColor = System.Drawing.Color.Transparent;
this.lbSettingsOrt.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbSettingsOrt.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbSettingsOrt.ForeColor = System.Drawing.Color.White; this.lbSettingsOrt.ForeColor = System.Drawing.Color.White;
this.lbSettingsOrt.Location = new System.Drawing.Point(18, 520); this.lbSettingsOrt.Location = new System.Drawing.Point(28, 668);
this.lbSettingsOrt.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbSettingsOrt.Name = "lbSettingsOrt"; this.lbSettingsOrt.Name = "lbSettingsOrt";
this.lbSettingsOrt.Size = new System.Drawing.Size(91, 19); this.lbSettingsOrt.Size = new System.Drawing.Size(114, 24);
this.lbSettingsOrt.TabIndex = 17; this.lbSettingsOrt.TabIndex = 17;
this.lbSettingsOrt.Text = "Stadt / PLZ"; this.lbSettingsOrt.Text = "Stadt / PLZ";
// //
...@@ -219,10 +235,11 @@ ...@@ -219,10 +235,11 @@
// //
this.textBox3.Anchor = System.Windows.Forms.AnchorStyles.None; this.textBox3.Anchor = System.Windows.Forms.AnchorStyles.None;
this.textBox3.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBox3.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBox3.Location = new System.Drawing.Point(8, 539); this.textBox3.Location = new System.Drawing.Point(15, 691);
this.textBox3.MinimumSize = new System.Drawing.Size(300, 30); this.textBox3.Margin = new System.Windows.Forms.Padding(4);
this.textBox3.MinimumSize = new System.Drawing.Size(399, 30);
this.textBox3.Name = "textBox3"; this.textBox3.Name = "textBox3";
this.textBox3.Size = new System.Drawing.Size(300, 30); this.textBox3.Size = new System.Drawing.Size(399, 35);
this.textBox3.TabIndex = 18; this.textBox3.TabIndex = 18;
// //
// lbSettingsLand // lbSettingsLand
...@@ -231,9 +248,10 @@ ...@@ -231,9 +248,10 @@
this.lbSettingsLand.BackColor = System.Drawing.Color.Transparent; this.lbSettingsLand.BackColor = System.Drawing.Color.Transparent;
this.lbSettingsLand.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbSettingsLand.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbSettingsLand.ForeColor = System.Drawing.Color.White; this.lbSettingsLand.ForeColor = System.Drawing.Color.White;
this.lbSettingsLand.Location = new System.Drawing.Point(25, 590); this.lbSettingsLand.Location = new System.Drawing.Point(37, 754);
this.lbSettingsLand.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbSettingsLand.Name = "lbSettingsLand"; this.lbSettingsLand.Name = "lbSettingsLand";
this.lbSettingsLand.Size = new System.Drawing.Size(168, 19); this.lbSettingsLand.Size = new System.Drawing.Size(205, 24);
this.lbSettingsLand.TabIndex = 19; this.lbSettingsLand.TabIndex = 19;
this.lbSettingsLand.Text = "Länderkennung (DE)"; this.lbSettingsLand.Text = "Länderkennung (DE)";
this.lbSettingsLand.Click += new System.EventHandler(this.Label1_Click); this.lbSettingsLand.Click += new System.EventHandler(this.Label1_Click);
...@@ -242,19 +260,33 @@ ...@@ -242,19 +260,33 @@
// //
this.tbSettingsLand.Anchor = System.Windows.Forms.AnchorStyles.None; this.tbSettingsLand.Anchor = System.Windows.Forms.AnchorStyles.None;
this.tbSettingsLand.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tbSettingsLand.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tbSettingsLand.Location = new System.Drawing.Point(13, 612); this.tbSettingsLand.Location = new System.Drawing.Point(21, 781);
this.tbSettingsLand.MinimumSize = new System.Drawing.Size(300, 30); this.tbSettingsLand.Margin = new System.Windows.Forms.Padding(4);
this.tbSettingsLand.MinimumSize = new System.Drawing.Size(399, 30);
this.tbSettingsLand.Name = "tbSettingsLand"; this.tbSettingsLand.Name = "tbSettingsLand";
this.tbSettingsLand.Size = new System.Drawing.Size(300, 30); this.tbSettingsLand.Size = new System.Drawing.Size(399, 35);
this.tbSettingsLand.TabIndex = 20; this.tbSettingsLand.TabIndex = 20;
// //
// lblFrontendId
//
this.lblFrontendId.AutoSize = true;
this.lblFrontendId.BackColor = System.Drawing.Color.Transparent;
this.lblFrontendId.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblFrontendId.ForeColor = System.Drawing.Color.White;
this.lblFrontendId.Location = new System.Drawing.Point(31, 29);
this.lblFrontendId.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblFrontendId.Name = "lblFrontendId";
this.lblFrontendId.Size = new System.Drawing.Size(126, 24);
this.lblFrontendId.TabIndex = 21;
this.lblFrontendId.Text = "Frontend Id:";
//
// Settings // Settings
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White; this.BackColor = System.Drawing.SystemColors.ScrollBar;
this.BackgroundImage = global::Wetterstation.Properties.Resources.earth; this.ClientSize = new System.Drawing.Size(757, 858);
this.ClientSize = new System.Drawing.Size(568, 697); this.Controls.Add(this.lblFrontendId);
this.Controls.Add(this.tbSettingsLand); this.Controls.Add(this.tbSettingsLand);
this.Controls.Add(this.lbSettingsLand); this.Controls.Add(this.lbSettingsLand);
this.Controls.Add(this.textBox3); this.Controls.Add(this.textBox3);
...@@ -273,7 +305,7 @@ ...@@ -273,7 +305,7 @@
this.Controls.Add(this.lbSettingsPort); this.Controls.Add(this.lbSettingsPort);
this.Controls.Add(this.tbSettingsHost); this.Controls.Add(this.tbSettingsHost);
this.Controls.Add(this.lbSettingsHost); this.Controls.Add(this.lbSettingsHost);
this.Margin = new System.Windows.Forms.Padding(2); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "Settings"; this.Name = "Settings";
this.Text = "Settings"; this.Text = "Settings";
this.ResumeLayout(false); this.ResumeLayout(false);
...@@ -301,5 +333,6 @@ ...@@ -301,5 +333,6 @@
private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.Label lbSettingsLand; private System.Windows.Forms.Label lbSettingsLand;
private System.Windows.Forms.TextBox tbSettingsLand; private System.Windows.Forms.TextBox tbSettingsLand;
private System.Windows.Forms.Label lblFrontendId;
} }
} }
\ No newline at end of file
Wetterstation/Settings.cs
+ 22
− 1
View file @ 9c03c667
...@@ -4,6 +4,7 @@ using System.ComponentModel; ...@@ -4,6 +4,7 @@ using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Management;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
...@@ -15,6 +16,7 @@ namespace Wetterstation ...@@ -15,6 +16,7 @@ namespace Wetterstation
public Settings() public Settings()
{ {
InitializeComponent(); InitializeComponent();
generateId();
} }
private void TextBox2_TextChanged(object sender, EventArgs e) private void TextBox2_TextChanged(object sender, EventArgs e)
...@@ -26,6 +28,25 @@ namespace Wetterstation ...@@ -26,6 +28,25 @@ namespace Wetterstation
{ {
} }
private void generateId() {
try {
ManagementObjectSearcher searcher = new ManagementObjectSearcher("root\\CIMV2", "SELECT * FROM Win32_Processor");
foreach (ManagementObject queryObj in searcher.Get()) {
Console.WriteLine("-----------------------------------");
Console.WriteLine("Win32_Processor instance");
Console.WriteLine("-----------------------------------");
Console.WriteLine("Architecture: {0}", queryObj["Architecture"]);
Console.WriteLine("Caption: {0}", queryObj["Caption"]);
Console.WriteLine("Family: {0}", queryObj["Family"]);
Console.WriteLine("ProcessorId: {0}", queryObj["ProcessorId"]);
}
}
catch (ManagementException e) {
MessageBox.Show("An error occurred while querying for WMI data: " + e.Message);
}
}
} }
} }
Wetterstation/Wetterstation.csproj
+ 1
− 0
View file @ 9c03c667
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Management" />
<Reference Include="System.Windows.Forms.DataVisualization" /> <Reference Include="System.Windows.Forms.DataVisualization" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment