From 9a514dcb4e1b5fc264cfcd4f082307ed2d814a12 Mon Sep 17 00:00:00 2001 From: "marcusferl@weifer.de" Date: Wed, 6 Apr 2022 09:06:42 +0200 Subject: [PATCH] 06.04.2022 --- Test_App/MainWindow.xaml.cs | 2 +- Test_App/Test_App.csproj | 48 ++++++++++++++++++++++++++++ Test_App/Views/Database.xaml.cs | 11 ++++--- Test_App/Views/Database_Info.xaml | 28 ++++++++++++++++ Test_App/Views/Database_Info.xaml.cs | 39 ++++++++++++++++++++++ 5 files changed, 123 insertions(+), 5 deletions(-) create mode 100644 Test_App/Views/Database_Info.xaml create mode 100644 Test_App/Views/Database_Info.xaml.cs diff --git a/Test_App/MainWindow.xaml.cs b/Test_App/MainWindow.xaml.cs index 2a62726..303acc0 100644 --- a/Test_App/MainWindow.xaml.cs +++ b/Test_App/MainWindow.xaml.cs @@ -80,7 +80,7 @@ namespace Test_App PingReply result = ping.Send(hostUrl); online_status.Fill = Brushes.Green; } - catch (Exception ex) + catch { online_status.Fill = Brushes.Red; MessageBox.Show("Bitte deine Internetverbindung Prüfen und das Programm neu starten"); diff --git a/Test_App/Test_App.csproj b/Test_App/Test_App.csproj index f568235..80e4948 100644 --- a/Test_App/Test_App.csproj +++ b/Test_App/Test_App.csproj @@ -14,6 +14,22 @@ 4 true true + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 1 + 1.0.0.%2a + false + true + true AnyCPU @@ -34,6 +50,18 @@ prompt 4 + + F428752E3690A0F5EA4BCE1CDFDE9E20C40F5A13 + + + Test_App_TemporaryKey.pfx + + + true + + + true + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll @@ -62,6 +90,9 @@ Database.xaml + + Database_Info.xaml + HomeView.xaml @@ -102,6 +133,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -143,6 +178,7 @@ Settings.Designer.cs + @@ -160,5 +196,17 @@ + + + False + Microsoft .NET Framework 4.7.2 %28x86 und x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + \ No newline at end of file diff --git a/Test_App/Views/Database.xaml.cs b/Test_App/Views/Database.xaml.cs index d4916f2..9c96a94 100644 --- a/Test_App/Views/Database.xaml.cs +++ b/Test_App/Views/Database.xaml.cs @@ -38,7 +38,7 @@ namespace Test_App.Views { json = webclient.DownloadString("https://git.weifer.org/weifer/Test_App/raw/branch/master/Test_App/Ressources/data.json"); } - catch (System.Net.WebException e) + catch { MainWindow.status.Fill = Brushes.Red; MessageBox.Show("Server nicht erreichbar"); @@ -63,8 +63,11 @@ namespace Test_App.Views private void itemOnClick(object sender, MouseButtonEventArgs e) { Ressources.Datas current = datalist.SelectedItem as Ressources.Datas; - - TextBox textBox = new TextBox(); + Database_Info window = new Database_Info(); + window.Show(); + + + /*TextBox textBox = new TextBox(); textBox.Style = (Style)FindResource("Custom_Window"); textBox.Text = "Antwort: \n" + current.Answer + "\n"; @@ -73,7 +76,7 @@ namespace Test_App.Views window.Height = 300; window.SizeToContent = SizeToContent.WidthAndHeight; window.Content = textBox; - window.Show(); + window.Show();*/ } } } diff --git a/Test_App/Views/Database_Info.xaml b/Test_App/Views/Database_Info.xaml new file mode 100644 index 0000000..153e048 --- /dev/null +++ b/Test_App/Views/Database_Info.xaml @@ -0,0 +1,28 @@ + + + + + + + + + +