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

Alpha/ halb Beta Status Chat im Bewoplaner

Browse Source
This commit is contained in:
Waldi
2017-09-08 15:09:48 +02:00
parent 1b38ce2f94
commit 69438635c0
6 changed files with 72 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BeWo/BeWo.csproj
View File

@@ -272,7 +272,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\ChatService.xaml">
<Page Include="View\ChatView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -730,8 +730,8 @@
<Compile Include="View\ChatEmojiView.xaml.cs">
<DependentUpon>ChatEmojiView.xaml</DependentUpon>
</Compile>
<Compile Include="View\ChatService.xaml.cs">
<DependentUpon>ChatService.xaml</DependentUpon>
<Compile Include="View\ChatView.xaml.cs">
<DependentUpon>ChatView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordRTFWindowView.xaml.cs">
<DependentUpon>ServiceRecordRTFWindowView.xaml</DependentUpon>

25
BeWo/MainControl.xaml.cs
View File

@@ -869,7 +869,30 @@ namespace BeWo
trans.BeginAnimation(TranslateTransform.XProperty, animation);
ClearDetailFrame();
}
}
//Hier das mit Chat Refreshen
if (BeWoApp.MainControl != null && BeWoApp.MainControl.HomeView.ServiceChatView != null)
{
if (BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl != null &&
BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread != null)
{
BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread = null;
BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.threadBool = false;
}
if (BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView != null)
{
BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView.Close();
BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView = null;
}
BeWoApp.MainControl.HomeView.ServiceChatView.Close();
BeWoApp.MainControl.HomeView.ServiceChatView = null;
}
//Ende
}
private void button_Organisation_Click(object sender, RoutedEventArgs e)
{

19
BeWo/MainWindow.xaml.cs
View File

@@ -81,7 +81,24 @@ namespace BeWo
}
}
if(BeWoApp.MainControl != null && BeWoApp.MainControl.HomeView.ServiceChatView != null) {
if (BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl != null &&
BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread != null)
{
BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread = null;
BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.threadBool = false;
}
if (BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView != null) {
BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView.Close();
BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView = null;
}
BeWoApp.MainControl.HomeView.ServiceChatView.Close();
BeWoApp.MainControl.HomeView.ServiceChatView = null;
}
BeWoApp.CurrentBeWo.DocumentWatcher.LoescheTempDateien();
Application.Current.Shutdown();

2
BeWo/View/ChatService.xaml → BeWo/View/ChatView.xaml
View File

@@ -1,4 +1,4 @@
<Window x:Class="BeWo.View.ChatService"
<Window x:Class="BeWo.View.ChatView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

29
BeWo/View/ChatService.xaml.cs → BeWo/View/ChatView.xaml.cs
View File

@@ -21,12 +21,12 @@ namespace BeWo.View
/// <summary>
/// Interaktionslogik für ChatService.xaml
/// </summary>
public partial class ChatService : Window
public partial class ChatView : Window
{
private ChatEmojiView _emojiView;
public ChatEmojiView _emojiView;
public ChatService(ChatDatenUebergabe chatDaten)
public ChatView(ChatDatenUebergabe chatDaten)
{
InitializeComponent();
CloseWindow();
@@ -53,7 +53,7 @@ namespace BeWo.View
if (_emojiView != null)
{
_emojiView.Visibility = Visibility.Collapsed;
_emojiView.Close(); // hidden
}
}));
@@ -76,20 +76,25 @@ namespace BeWo.View
}
else
{
if (_emojiView.Visibility == Visibility.Visible)
{
_emojiView.Visibility = Visibility.Collapsed;
}
else
{
_emojiView.Visibility = Visibility.Visible;
//if (_emojiView.Visibility == Visibility.Visible)
//{
// _emojiView.Visibility = Visibility.Hidden; // hidden
//}
//else
//{
_emojiView.Close();
_emojiView = null;
_emojiView = new ChatEmojiView(ChatMainControl);
var x = emojiButton.PointToScreen(new Point(0, 0));
PresentationSource source = PresentationSource.FromVisual(emojiButton);
_emojiView.Top = (x.Y / source.CompositionTarget.TransformToDevice.M22) - _emojiView.Height - 5;
_emojiView.Left = x.X / source.CompositionTarget.TransformToDevice.M11;
}
_emojiView.Show();
//}
}
}

18
BeWo/View/HomeDragPanelView.xaml.cs
View File

@@ -1300,11 +1300,11 @@ namespace BeWo.View
//####### Connection with Server ###########
//---------------------------------------------------------------------------------------------------------------------------
private ChatService ServiceChat;
public ChatView ServiceChatView;
private void HyperlinkChat_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
{
if (ServiceChat == null)
if (ServiceChatView == null)
{
//Tu hier anmeldung starten
//Cursor = Cursors.Wait;
@@ -1314,20 +1314,20 @@ namespace BeWo.View
var x = _login.AnmeldevorgangDurchFuehren();
if (x != null) {
ServiceChat = new ChatService(x);
ServiceChat.Show();
if (x != null) {
ServiceChatView = new ChatView(x);
ServiceChatView.Show();
}
//Cursor = Cursors.Arrow;
}
else if (ServiceChat.Visibility == Visibility.Visible)
else if (ServiceChatView.Visibility == Visibility.Visible)
{
ServiceChat.Visibility = Visibility.Hidden;
ServiceChatView.Visibility = Visibility.Hidden;
}
else if (ServiceChat.Visibility == Visibility.Hidden)
else if (ServiceChatView.Visibility == Visibility.Hidden)
{
ServiceChat.Visibility = Visibility.Visible;
ServiceChatView.Visibility = Visibility.Visible;
}
}
}