ownSoft/Chat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mini update

Browse Source
This commit is contained in:
Waldi
2017-10-18 10:09:20 +02:00
parent fb14888b96
commit 723ea44448
2 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ChatController/ChatMainControl.xaml.cs
View File

@@ -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)
{

11
ChatController/HauptKlassen/Chat.cs
View File

@@ -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