From 723ea44448e27ffe3f5bff53a62cb5b2887c2393 Mon Sep 17 00:00:00 2001 From: Waldi Date: Wed, 18 Oct 2017 10:09:20 +0200 Subject: [PATCH] mini update --- ChatController/ChatMainControl.xaml.cs | 39 ++++++++++++++++++-------- ChatController/HauptKlassen/Chat.cs | 11 ++++++-- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/ChatController/ChatMainControl.xaml.cs b/ChatController/ChatMainControl.xaml.cs index 81b738f..9ebb344 100644 --- a/ChatController/ChatMainControl.xaml.cs +++ b/ChatController/ChatMainControl.xaml.cs @@ -63,6 +63,8 @@ namespace ChatController public delegate void CloseDelegate(); public event CloseDelegate OnClose; + + private bool _isDesktopVersion = true; #endregion public ChatMainControl() @@ -133,6 +135,7 @@ namespace ChatController EmojiButton.Style = null; MediaButton.Style = null; ReloadGruppen.Visibility = Visibility.Visible; + _isDesktopVersion = false; } public void SynchronisationVeranlassen() @@ -951,10 +954,33 @@ namespace ChatController Cursor = Cursors.Wait; //StartWaiting(); + if (_isDesktopVersion) + { + var doSync = _chat.DoSynchronisation(_chatDaten.ApiKey, _chatDaten.Kundennummer); - var doSync = _chat.DoSynchronisation(_chatDaten.ApiKey, _chatDaten.Kundennummer); + if (doSync) + { + var aktuelleGruppen = _chat.GruppenAktuallisieren(); - if (doSync) + var x = _chat.GroupklassenAktuallisieren(aktuelleGruppen); + + _kontaktlist = x; + + Clientlist.Items.Refresh(); + + Cursor = Cursors.Arrow; + } + else + { + Cursor = Cursors.Arrow; + // EndWaiting(); + if (OnClose != null) + { + OnClose(); + } + } + } + else { var aktuelleGruppen = _chat.GruppenAktuallisieren(); @@ -966,15 +992,6 @@ namespace ChatController Cursor = Cursors.Arrow; } - else - { - Cursor = Cursors.Arrow; - // EndWaiting(); - if (OnClose != null) - { - OnClose(); - } - } } catch (Exception e) { diff --git a/ChatController/HauptKlassen/Chat.cs b/ChatController/HauptKlassen/Chat.cs index e1024ff..de049f4 100644 --- a/ChatController/HauptKlassen/Chat.cs +++ b/ChatController/HauptKlassen/Chat.cs @@ -1129,6 +1129,8 @@ namespace ChatController.HauptKlassen form.StartPosition = FormStartPosition.CenterScreen; form.Size = imgbit.Size; + form.MinimumSize = new Size(150,150); + form.MaximumSize = new Size(500,500); form.FormBorderStyle = FormBorderStyle.Sizable; PictureBox pb = new PictureBox(); @@ -1137,6 +1139,7 @@ namespace ChatController.HauptKlassen pb.SizeMode = PictureBoxSizeMode.StretchImage; + pb.MaximumSize = new Size(500,500); form.Controls.Add(pb); form.ShowDialog(); @@ -1191,6 +1194,8 @@ namespace ChatController.HauptKlassen form.StartPosition = FormStartPosition.CenterScreen; form.Size = imgbit.Size; + form.MinimumSize = new Size(150,150); + form.MaximumSize = new Size(500,500); form.FormBorderStyle = FormBorderStyle.Sizable; PictureBox pb = new PictureBox(); @@ -1198,7 +1203,7 @@ namespace ChatController.HauptKlassen pb.Image = imgbit; pb.SizeMode = PictureBoxSizeMode.StretchImage; - + //pb.MaximumSize = new Size(500,500); form.Controls.Add(pb); form.ShowDialog(); @@ -1213,7 +1218,7 @@ namespace ChatController.HauptKlassen #endregion //Neu - #region Synchronisation Veranlassen + #region Synchronisation Veranlassen für Bewoplaner OwnChat Version //sync für alles und jeden //public bool DoSync = true; @@ -1265,7 +1270,7 @@ namespace ChatController.HauptKlassen #endregion - #region Neue Gruppen Holen + #region Neue Gruppen Holen für OwnChatDesktop public ChatGruppenDaten GruppenAktuallisieren() { try