From d1bd7d70681fabc9ad3708af1b513f7435bcc4c3 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 17 Oct 2017 15:01:02 +0200 Subject: [PATCH 1/5] hggh cb --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b460439..20537be 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /publish /BeWoPlanerChat/MyTestApplication /BeWoPlanerChat/bewoplaner-chat-android/app/*.apk +/PrototypChat/.vs/PrototypChat/v14 From 86bd67aaa253c977807597eab47efbfe2b8f180c Mon Sep 17 00:00:00 2001 From: Waldi Date: Wed, 18 Oct 2017 09:29:46 +0200 Subject: [PATCH 2/5] kurz update --- ChatController/LoginControl.xaml.cs | 6 +++--- PrototypChat/.vs/PrototypChat/v15/.suo | Bin 129536 -> 102912 bytes PrototypChat/PrototypChat.csproj | 6 ++++++ PrototypChat/ownchat_favicon.ico | Bin 0 -> 40046 bytes 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 PrototypChat/ownchat_favicon.ico diff --git a/ChatController/LoginControl.xaml.cs b/ChatController/LoginControl.xaml.cs index 4569b87..8e98d82 100644 --- a/ChatController/LoginControl.xaml.cs +++ b/ChatController/LoginControl.xaml.cs @@ -45,7 +45,7 @@ namespace ChatController private string _chatCode = ""; private string _kundennummer = ""; private string _authToken = ""; - + private string _version = "1.1"; public LoginControl() { @@ -54,8 +54,8 @@ namespace ChatController //encrypt verschlüsselte datei LeseDateiFallsVorhanden(); - var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; - lblVersion.Content = String.Format("Version: {0}", version); + //var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; + lblVersion.Content = String.Format("Version: {0}", _version); } private void AnmeldenButton_OnClick(object sender, RoutedEventArgs e) diff --git a/PrototypChat/.vs/PrototypChat/v15/.suo b/PrototypChat/.vs/PrototypChat/v15/.suo index 72086e01d03955907eb1252a79bc968a46b6276b..19b5baca61d7110f7f96114c0c38092c4fda2884 100644 GIT binary patch delta 6447 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 YzV#`kIAQjDvY#XKzjn-U^1(&@2U0-4_W%F@ delta 9120 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 diff --git a/PrototypChat/PrototypChat.csproj b/PrototypChat/PrototypChat.csproj index d361c74..934a447 100644 --- a/PrototypChat/PrototypChat.csproj +++ b/PrototypChat/PrototypChat.csproj @@ -67,6 +67,9 @@ true + + ownchat_favicon.ico + ..\libs\Newtonsoft.Json.dll @@ -166,5 +169,8 @@ false + + + \ No newline at end of file diff --git a/PrototypChat/ownchat_favicon.ico b/PrototypChat/ownchat_favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a0441f4989c25609a6542f0f0e9cfa44dd12af26 GIT binary patch literal 40046 zcmeHQUx*b|93I=sAVPYH-qxT8i8N8y$^wI+r+O%if(mgfwbimReK69yOSGvKy_K|u z^v~9!9zwGqx{(w;L{LQZ5(z<6KJ2}&x_5Wk)A!w(GhC;8_qx|R<2lD~mT%|&X7jy)e3eB#N$zqG%C-MbS}!%Ueyxm`G3zqycF_8juF00ck)Q zkOrgyX+Ro~2BZOLKpKz+qycF_8juF00coI{8o1?&YUC&`gJ0W#kAQE0Zym*V@T&~G z3ETy^8qZGrx&rMv0vHeRR6txj=VAPXsCLWv^V<{ip80-Fvd|*xx=?G){4cbZW2@!jq3}93gP8vatOGbkcP$UBKOyJCKE(YtV7|lg51EH? z#Qh!*VsAO%Jj8t1koU;=12*6?9{Q5;-}c-;%E2OjPM`mv3j0MA+a z5a-!^97Y?ctGvOO{T@KPW{YK~>wZ97E-rwB0UQ6mfvQ=yp<nDm=Fi6~I9+ z_E9AdE786OhsVvfeW%RRuepmmcbusEYPD0qyomEltVd=g@?g#2xH(>#!R2zdr(cgv zn>)6jFgI;3EH8@SVURp5U0*RTynotl0vfzyzOr@}kPF;L5j>PE4=;Y;4-Z?z<6)QO zVfcVQJOr2z&x(h({Y)oyX$j)`0I(V0{VIEa5rFqa9R|2fg4e!z4TEFjdjFt&Xvs$> zJn$L>k70jfd}qU|hV|^H#Y4+@b;5%^?&dl1HNeqkT->^)YL;)Tn#GS)>bUlyF;jY5 z{X?@@VcEIxVEMQR+gS_zVfVq~wfly~&FEJ(^VX4?897`tL+_k6hrXX|7#X_#(c^x) z7d#vw7poqR@$x}`^q*CQ$2{2l_}Fr>^wEkb?LTFvrn9Yd-wuEWp4O!3_?@gLr5@C_Rg% znd1l5rL%}x9)BVp@`&o(w<#Xx9fE;}9_AjiJiZYi4?{Qxs^3Sp+oR`p zpLzX^=coBz7JEG8>wF7&Sn*iZtlfRmOityY-tKOb?>xAB=Na#I;5%}BjlcDq=M-z? zg7Hv5kAAHwk{r)w+E8zw_C&c?*T?BpW zL+)CCG2aeYP5D0O`C^`Lr?z~-arnx<&B@rK66^o5D+bblG$0K~1JZyrAPq$`2&H(HN>y#4>%Wh^2&$@-p*-J7vjXY5@WJ8sWRluYwtI}QexC3YMP*hza+=kl?w zH+FwnyPPhF_n*3x_?NnG{muNn$=W5mAZbrIW2ZaFr@fX;+urkMCwfoYo8&`kua5N* h+db4FLzVdJuWggvwkNh1r0wH}WU9B<8kk=Q_J8!G3uXWS literal 0 HcmV?d00001 From bd73cb46eb5f79722e9aaae5072e0f1f3d0f885b Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 18 Oct 2017 09:33:13 +0200 Subject: [PATCH 3/5] cb --- PrototypChat/LoginMaske.xaml.cs | 2 +- PrototypChat/PrototypChat.csproj | 4 ++-- PrototypChat/PrototypChat.csproj.user | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/PrototypChat/LoginMaske.xaml.cs b/PrototypChat/LoginMaske.xaml.cs index fd182c5..624b9c1 100644 --- a/PrototypChat/LoginMaske.xaml.cs +++ b/PrototypChat/LoginMaske.xaml.cs @@ -30,7 +30,7 @@ namespace ownChat { InitializeComponent(); - this.Title = "ownChat Desktop Version " + typeof(LoginMaske).Assembly.GetName().Version; + this.Title = "ownChat Desktop"; } diff --git a/PrototypChat/PrototypChat.csproj b/PrototypChat/PrototypChat.csproj index d361c74..ae3c300 100644 --- a/PrototypChat/PrototypChat.csproj +++ b/PrototypChat/PrototypChat.csproj @@ -28,8 +28,8 @@ https://app5.bewoplaner.de/chat/ ownChat Desktop beyondSoft GmbH - 1.0.0.2 - 3 + 1.0.0.3 + 4 1.0.0.%2a false true diff --git a/PrototypChat/PrototypChat.csproj.user b/PrototypChat/PrototypChat.csproj.user index 2e3e041..5a15d15 100644 --- a/PrototypChat/PrototypChat.csproj.user +++ b/PrototypChat/PrototypChat.csproj.user @@ -2,5 +2,13 @@ false + D:\Projects\beyondSoft\Chat\publish\ + https://app5.bewoplaner.de/chat/ + + + + + de-DE + false \ No newline at end of file From e0b7cf789969ad75165dd0cba90c2a1930c2cea7 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 18 Oct 2017 09:35:17 +0200 Subject: [PATCH 4/5] cb --- .gitignore | 1 + PrototypChat/.vs/PrototypChat/v15/.suo | Bin 129536 -> 0 bytes 2 files changed, 1 insertion(+) delete mode 100644 PrototypChat/.vs/PrototypChat/v15/.suo diff --git a/.gitignore b/.gitignore index 20537be..6fbd3a9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /BeWoPlanerChat/MyTestApplication /BeWoPlanerChat/bewoplaner-chat-android/app/*.apk /PrototypChat/.vs/PrototypChat/v14 +/PrototypChat/.vs/PrototypChat/v15/sqlite3 diff --git a/PrototypChat/.vs/PrototypChat/v15/.suo b/PrototypChat/.vs/PrototypChat/v15/.suo deleted file mode 100644 index 72086e01d03955907eb1252a79bc968a46b6276b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129536 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 W$`$N-|KF_m8KVaMd=j-7QU4!vKr~1I From 723ea44448e27ffe3f5bff53a62cb5b2887c2393 Mon Sep 17 00:00:00 2001 From: Waldi Date: Wed, 18 Oct 2017 10:09:20 +0200 Subject: [PATCH 5/5] 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