From e85dbfa970cdd08b24c1b81438bb5fa3fcdd82be Mon Sep 17 00:00:00 2001 From: Waldi Date: Fri, 6 Oct 2017 12:08:05 +0200 Subject: [PATCH 1/3] Neu ist Immer Besser --- ChatController/ChatController.csproj | 6 + .../ChatKlassen/AktuellerKontakt.cs | 4 +- .../ChatKlassen/KontaktMessageBuilder.cs | 9 +- ChatController/ChatMainControl.xaml | 47 +- ChatController/ChatMainControl.xaml.cs | 110 ++++ ChatController/HauptKlassen/Chat.cs | 602 ++++++++++-------- ChatController/HauptKlassen/Login.cs | 166 +++-- ChatController/LoginControl.xaml | 5 +- ChatController/LoginControl.xaml.cs | 416 ++++++++---- .../LoginKlassen/AuthentifizierungsDaten.cs | 15 +- .../LoginKlassen/ChatDatenUebergabe.cs | 16 +- ChatController/LoginKlassen/UserMessages.cs | 2 +- ChatController/Ressourcen/SymbolRefresh32.png | Bin 0 -> 3019 bytes ChatController/Ressourcen/paperclip2.png | Bin 0 -> 1192 bytes PrototypChat/.vs/PrototypChat/v15/.suo | Bin 136704 -> 121344 bytes PrototypChat/MainWindow.xaml | 2 +- PrototypChat/MainWindow.xaml.cs | 13 +- 17 files changed, 939 insertions(+), 474 deletions(-) create mode 100644 ChatController/Ressourcen/SymbolRefresh32.png create mode 100644 ChatController/Ressourcen/paperclip2.png diff --git a/ChatController/ChatController.csproj b/ChatController/ChatController.csproj index a6893d8..d963002 100644 --- a/ChatController/ChatController.csproj +++ b/ChatController/ChatController.csproj @@ -104,5 +104,11 @@ + + + + + + \ No newline at end of file diff --git a/ChatController/ChatKlassen/AktuellerKontakt.cs b/ChatController/ChatKlassen/AktuellerKontakt.cs index 2d6049d..d58cefd 100644 --- a/ChatController/ChatKlassen/AktuellerKontakt.cs +++ b/ChatController/ChatKlassen/AktuellerKontakt.cs @@ -16,8 +16,8 @@ namespace ChatController.ChatKlassen public DateTime TimeStamp { get; set; } public long GroupId { get; set; } public long? CustomerPersonOid { get; set; } - - + + public AktuellerKontakt(KontaktlistBuilder kontakt) { if(kontakt != null) { diff --git a/ChatController/ChatKlassen/KontaktMessageBuilder.cs b/ChatController/ChatKlassen/KontaktMessageBuilder.cs index c08e849..d516ab1 100644 --- a/ChatController/ChatKlassen/KontaktMessageBuilder.cs +++ b/ChatController/ChatKlassen/KontaktMessageBuilder.cs @@ -12,6 +12,9 @@ namespace ChatController.ChatKlassen { public class KontaktMessageBuilder { + + public string OriginalImage { get; private set; } + //Chat Ansicht public KontaktMessageBuilder(string username, string message, string sendtime, bool isme, DateTime convertedSendTimeString) { @@ -48,16 +51,16 @@ namespace ChatController.ChatKlassen _herunterladen = Visibility.Collapsed; _gifPictureVisibility = Visibility.Collapsed; } - + // IMage Ansicht - public KontaktMessageBuilder(string username, string message, string sendtime, bool isme, ImageSource image, DateTime convertedSendTimeString) + public KontaktMessageBuilder(string username, string message, string sendtime, bool isme, ImageSource image, DateTime convertedSendTimeString,string originalImage) { Username = username; UserMessage = message; SendTime = sendtime; ImageSources = image; ConvertetSendtimeString = convertedSendTimeString; - + OriginalImage = originalImage; // Dokpfad = if (isme) diff --git a/ChatController/ChatMainControl.xaml b/ChatController/ChatMainControl.xaml index 2fa5877..28588e6 100644 --- a/ChatController/ChatMainControl.xaml +++ b/ChatController/ChatMainControl.xaml @@ -37,7 +37,8 @@ - + + + / Style="{DynamicResource IconButtonStyle}" /--> - - - + + + - + - - - + + + + +