From 5a77d5da5b9046d006eb0951e468960d0b8dca21 Mon Sep 17 00:00:00 2001 From: Waldi Date: Thu, 14 Sep 2017 12:36:48 +0200 Subject: [PATCH] Kom mit und Master --- .../ChatKlassen/KontaktMessageBuilder.cs | 35 ++- ChatController/ChatMainControl.xaml | 133 ++--------- ChatController/ChatMainControl.xaml.cs | 209 ++++++++++++++---- ChatController/HauptKlassen/Chat.cs | 197 +++++++++-------- ChatController/LoginControl.xaml.cs | 54 +++-- PrototypChat/.vs/PrototypChat/v15/.suo | Bin 137728 -> 97280 bytes PrototypChat/LoginMaske.xaml.cs | 1 - PrototypChat/MainWindow.xaml.cs | 3 +- PrototypChat/PrototypChat.csproj | 2 +- 9 files changed, 376 insertions(+), 258 deletions(-) diff --git a/ChatController/ChatKlassen/KontaktMessageBuilder.cs b/ChatController/ChatKlassen/KontaktMessageBuilder.cs index 5e3956b..f3e860b 100644 --- a/ChatController/ChatKlassen/KontaktMessageBuilder.cs +++ b/ChatController/ChatKlassen/KontaktMessageBuilder.cs @@ -11,8 +11,7 @@ namespace ChatController.ChatKlassen { public class KontaktMessageBuilder { - //kram für Die Dokumentation erstellen zb. MessagePersonOid - + //Chat Ansicht public KontaktMessageBuilder(string username, string message, string sendtime, bool isme, DateTime convertedSendTimeString) { Username = username; @@ -39,6 +38,7 @@ namespace ChatController.ChatKlassen _gifPictureVisibility = Visibility.Collapsed; } + // IMage Ansicht public KontaktMessageBuilder(string username, string message, string sendtime, bool isme, ImageSource image, DateTime convertedSendTimeString) { Username = username; @@ -47,6 +47,8 @@ namespace ChatController.ChatKlassen ImageSources = image; ConvertetSendtimeString = convertedSendTimeString; + // Dokpfad = + if (isme) { ChatColor = new BrushConverter().ConvertFromString("#ff5e00") as SolidColorBrush; @@ -77,6 +79,35 @@ namespace ChatController.ChatKlassen _herunterladen = Visibility.Collapsed; } + //Dokument Ansicht + public KontaktMessageBuilder(string username, string message, string sendtime, bool isme, string url, DateTime convertedSendTimeString) + { + Username = username; + UserMessage = message; + SendTime = sendtime; + ConvertetSendtimeString = convertedSendTimeString; + + Dokpfad = (object) url; + + if (isme) + { + ChatColor = new BrushConverter().ConvertFromString("#ff5e00") as SolidColorBrush; + Posi = "Right"; + } + else + { + ChatColor = new BrushConverter().ConvertFromString("#cccccc") as SolidColorBrush; + Posi = "Left"; + } + + + DokumentVisibility = Visibility.Visible; + + _pictureVisibility = Visibility.Collapsed; + ChatVisibility = Visibility.Collapsed; + SoundVisibility = Visibility.Collapsed; + _herunterladen = Visibility.Collapsed; + } #region kram der sortiert werden muss diff --git a/ChatController/ChatMainControl.xaml b/ChatController/ChatMainControl.xaml index f69822c..8c12616 100644 --- a/ChatController/ChatMainControl.xaml +++ b/ChatController/ChatMainControl.xaml @@ -40,15 +40,15 @@ - + + //Checked="ComboBox_SelectionChanged" - + //Checked="ComboBox_SelectionChanged" - - + //Checked="ComboBox_SelectionChanged" + --> @@ -70,23 +70,6 @@ - - - @@ -96,11 +79,10 @@ - - + + - @@ -210,8 +192,7 @@ - - + @@ -222,17 +203,15 @@ - + - - + - @@ -242,45 +221,9 @@ - - - - - - - - - - - - - - - - -