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

Merge branch 'master' into 'master'

Settings editiert

See merge request !11
parents 9b4db0d0 13bbc89e
No related branches found
No related tags found
1 merge request!11Settings editiert
This diff is collapsed.
......@@ -207,5 +207,13 @@ namespace Wetterstation
{
}
private void BtSystemKnopf_Click(object sender, EventArgs e)
{
Form frm = new Settings();
// abhängig von Form1
frm.Show(this);
}
}
}
......@@ -18,8 +18,8 @@ namespace Wetterstation
static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
// Application.Run(new Hintergrund());
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new Hintergrund());
Application.Run(new Settings());
}
}
......
......@@ -119,5 +119,45 @@ namespace Wetterstation.Properties {
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Zahnrad {
get {
object obj = ResourceManager.GetObject("Zahnrad", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Zahnrad1 {
get {
object obj = ResourceManager.GetObject("Zahnrad1", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Zahnrad11 {
get {
object obj = ResourceManager.GetObject("Zahnrad11", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Zahnrad12 {
get {
object obj = ResourceManager.GetObject("Zahnrad12", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}
......@@ -118,22 +118,34 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<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>
</data>
<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>
</data>
<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>
</data>
<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>
<data name="Zahnrad" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Zahnrad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Zahnrad1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Zahnrad1.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">
<value>..\Resources\Bild_Dennis_Formatiert.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Systemknopf" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Systemknopf.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">
<value>..\Resources\Strand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Systemknopf" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Systemknopf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Zahnrad11" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Zahnrad11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Zahnrad12" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Zahnrad12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
Wetterstation/Resources/Zahnrad.png

548 B

Wetterstation/Resources/Zahnrad1.png

7.06 KiB

Wetterstation/Resources/Zahnrad11.png

3.5 KiB

Wetterstation/Resources/Zahnrad12.png

3.5 KiB

This diff is collapsed.
......@@ -19,7 +19,7 @@ namespace Wetterstation
InitializeComponent();
lblFrontendId.Text = "Frontend Id: " + generateId();
}
private void TextBox2_TextChanged(object sender, EventArgs e)
{
......@@ -82,6 +82,37 @@ namespace Wetterstation
{
}
private void TbSettingsClient_TextChanged(object sender, EventArgs e)
{
}
private void LbSettingsClient_Click(object sender, EventArgs e)
{
}
private void TbSettingsHost_TextChanged(object sender, EventArgs e)
{
}
private void LbSettingsHost_Click(object sender, EventArgs e)
{
}
private void LbSettingsUser_Click(object sender, EventArgs e)
{
}
private void BtSichern_Click(object sender, EventArgs e)
{
this.Close();
}
}
}
......@@ -138,6 +138,10 @@
<Content Include="Resources\13n%402x.png" />
<Content Include="Resources\50d%402x.png" />
<Content Include="Resources\50n%402x.png" />
<None Include="Resources\Zahnrad12.png" />
<None Include="Resources\Zahnrad11.png" />
<None Include="Resources\Zahnrad1.png" />
<None Include="Resources\Zahnrad.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment