Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/Chat
This commit is contained in:
165
ChatController/ChatControlWaitLayer.xaml
Normal file
165
ChatController/ChatControlWaitLayer.xaml
Normal file
@@ -0,0 +1,165 @@
|
||||
<UserControl x:Class="BeWo.View.ChatControlWaitLayer"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:BeWo="clr-namespace:BeWo"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
mc:Ignorable="d"
|
||||
Foreground="{DynamicResource BSOrangeBrush}">
|
||||
<UserControl.Resources>
|
||||
|
||||
<Style TargetType="{x:Type Rectangle}">
|
||||
<Setter Property="Fill" Value="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" />
|
||||
<Setter Property="Width" Value="12" />
|
||||
<Setter Property="Height" Value="40" />
|
||||
</Style>
|
||||
|
||||
<Storyboard x:Key="OnLoaded1" RepeatBehavior="Forever">
|
||||
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00.1" Storyboard.TargetName="bSLogoControl" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" >
|
||||
<LinearDoubleKeyFrame KeyTime="0:0:0" Value="45" />
|
||||
</DoubleAnimationUsingKeyFrames>
|
||||
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00.2" Storyboard.TargetName="bSLogoControl" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" >
|
||||
<LinearDoubleKeyFrame KeyTime="0:0:0" Value="90" />
|
||||
</DoubleAnimationUsingKeyFrames>
|
||||
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00.3" Storyboard.TargetName="bSLogoControl" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" >
|
||||
<LinearDoubleKeyFrame KeyTime="0:0:0" Value="135" />
|
||||
</DoubleAnimationUsingKeyFrames>
|
||||
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00.4" Storyboard.TargetName="bSLogoControl" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" >
|
||||
<LinearDoubleKeyFrame KeyTime="0:0:0" Value="180" />
|
||||
</DoubleAnimationUsingKeyFrames>
|
||||
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00.5" Storyboard.TargetName="bSLogoControl" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" >
|
||||
<LinearDoubleKeyFrame KeyTime="0:0:0" Value="225" />
|
||||
</DoubleAnimationUsingKeyFrames>
|
||||
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00.6" Storyboard.TargetName="bSLogoControl" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" >
|
||||
<LinearDoubleKeyFrame KeyTime="0:0:0" Value="270" />
|
||||
</DoubleAnimationUsingKeyFrames>
|
||||
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00.7" Storyboard.TargetName="bSLogoControl" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" >
|
||||
<LinearDoubleKeyFrame KeyTime="0:0:0" Value="315" />
|
||||
</DoubleAnimationUsingKeyFrames>
|
||||
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00.8" Storyboard.TargetName="bSLogoControl" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" >
|
||||
<LinearDoubleKeyFrame KeyTime="0:0:0" Value="360" />
|
||||
</DoubleAnimationUsingKeyFrames>
|
||||
</Storyboard>
|
||||
</UserControl.Resources>
|
||||
<UserControl.Triggers>
|
||||
<EventTrigger RoutedEvent="FrameworkElement.Loaded">
|
||||
<BeginStoryboard Storyboard="{StaticResource OnLoaded1}" />
|
||||
</EventTrigger>
|
||||
</UserControl.Triggers>
|
||||
|
||||
<Grid>
|
||||
<Grid Background="White" Opacity="0.01" />
|
||||
<Border CornerRadius="5,5,5,5" Opacity="0.92" BorderThickness="1,1,1,1" Padding="5,5,5,5" BorderBrush="#FF606060" VerticalAlignment="Center" Width="250" Height="100" Background="#FFFFFFFF">
|
||||
<Border.OpacityMask>
|
||||
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
||||
<GradientStop Color="#F3FFFFFF" Offset="0.027" />
|
||||
<GradientStop Color="#D7FFFFFF" Offset="1" />
|
||||
</LinearGradientBrush>
|
||||
</Border.OpacityMask>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="2*" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Label Content="Daten werden übertragen. Bitte warten..." Foreground="#FF000000" FontSize="12" FontFamily="Microsoft Sans Serif" FontWeight="Normal" HorizontalAlignment="Center" VerticalAlignment="Center" />
|
||||
|
||||
<Grid Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="40" Height="40" x:Name="bSLogoControl" RenderTransformOrigin="0.5,0.5" Background="#00000000" >
|
||||
<Grid.RenderTransform>
|
||||
<TransformGroup>
|
||||
<ScaleTransform ScaleX="1" ScaleY="1" />
|
||||
<SkewTransform AngleX="0" AngleY="0" />
|
||||
<RotateTransform Angle="0" />
|
||||
<TranslateTransform X="0" Y="0" />
|
||||
</TransformGroup>
|
||||
</Grid.RenderTransform>
|
||||
<Viewbox StretchDirection="Both" Stretch="Fill" MaxWidth="{Binding Path=Width, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" MaxHeight="{Binding Path=Height, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
|
||||
<Canvas Width="100" Height="100">
|
||||
<Canvas Width="100" Height="100" Canvas.Left="0" Canvas.Top="0">
|
||||
<Rectangle Canvas.Left="44" Canvas.Top="0" RadiusX="6" RadiusY="6"/>
|
||||
</Canvas>
|
||||
<Canvas Width="100" Height="100" Canvas.Left="0" Canvas.Top="0" RenderTransformOrigin="0.5,0.5">
|
||||
<Canvas.RenderTransform>
|
||||
<TransformGroup>
|
||||
<ScaleTransform ScaleX="1" ScaleY="1" />
|
||||
<SkewTransform AngleX="0" AngleY="0" />
|
||||
<RotateTransform Angle="45" />
|
||||
<TranslateTransform X="0" Y="0" />
|
||||
</TransformGroup>
|
||||
</Canvas.RenderTransform>
|
||||
<Rectangle Canvas.Left="44" Canvas.Top="0" RadiusX="6" RadiusY="6" Opacity="0.875"/>
|
||||
</Canvas>
|
||||
<Canvas Width="100" Height="100" Canvas.Left="0" Canvas.Top="0" RenderTransformOrigin="0.5,0.5">
|
||||
<Canvas.RenderTransform>
|
||||
<TransformGroup>
|
||||
<ScaleTransform ScaleX="1" ScaleY="1" />
|
||||
<SkewTransform AngleX="0" AngleY="0" />
|
||||
<RotateTransform Angle="90" />
|
||||
<TranslateTransform X="0" Y="0" />
|
||||
</TransformGroup>
|
||||
</Canvas.RenderTransform>
|
||||
<Rectangle Canvas.Left="44" Canvas.Top="0" RadiusX="6" RadiusY="6" Opacity="0.75"/>
|
||||
</Canvas>
|
||||
<Canvas Width="100" Height="100" Canvas.Left="0" Canvas.Top="0" RenderTransformOrigin="0.5,0.5">
|
||||
<Canvas.RenderTransform>
|
||||
<TransformGroup>
|
||||
<ScaleTransform ScaleX="1" ScaleY="1" />
|
||||
<SkewTransform AngleX="0" AngleY="0" />
|
||||
<RotateTransform Angle="135" />
|
||||
<TranslateTransform X="0" Y="0" />
|
||||
</TransformGroup>
|
||||
</Canvas.RenderTransform>
|
||||
<Rectangle Canvas.Left="44" Canvas.Top="0" RadiusX="6" RadiusY="6" Opacity="0.625"/>
|
||||
</Canvas>
|
||||
|
||||
<Canvas Width="100" Height="100" Canvas.Left="0" Canvas.Top="0" RenderTransformOrigin="0.5,0.5">
|
||||
<Canvas.RenderTransform>
|
||||
<TransformGroup>
|
||||
<ScaleTransform ScaleX="1" ScaleY="1" />
|
||||
<SkewTransform AngleX="0" AngleY="0" />
|
||||
<RotateTransform Angle="180" />
|
||||
<TranslateTransform X="0" Y="0" />
|
||||
</TransformGroup>
|
||||
</Canvas.RenderTransform>
|
||||
<Rectangle Canvas.Left="44" Canvas.Top="0" RadiusX="6" RadiusY="6" Opacity="0.5"/>
|
||||
</Canvas>
|
||||
<Canvas Width="100" Height="100" Canvas.Left="0" Canvas.Top="0" RenderTransformOrigin="0.5,0.5">
|
||||
<Canvas.RenderTransform>
|
||||
<TransformGroup>
|
||||
<ScaleTransform ScaleX="1" ScaleY="1" />
|
||||
<SkewTransform AngleX="0" AngleY="0" />
|
||||
<RotateTransform Angle="225" />
|
||||
<TranslateTransform X="0" Y="0" />
|
||||
</TransformGroup>
|
||||
</Canvas.RenderTransform>
|
||||
<Rectangle Canvas.Left="44" Canvas.Top="0" RadiusX="6" RadiusY="6" Opacity="0.375"/>
|
||||
</Canvas>
|
||||
<Canvas Width="100" Height="100" Canvas.Left="0" Canvas.Top="0" RenderTransformOrigin="0.5,0.5">
|
||||
<Canvas.RenderTransform>
|
||||
<TransformGroup>
|
||||
<ScaleTransform ScaleX="1" ScaleY="1" />
|
||||
<SkewTransform AngleX="0" AngleY="0" />
|
||||
<RotateTransform Angle="270" />
|
||||
<TranslateTransform X="0" Y="0" />
|
||||
</TransformGroup>
|
||||
</Canvas.RenderTransform>
|
||||
<Rectangle Canvas.Left="44" Canvas.Top="0" RadiusX="6" RadiusY="6" Opacity="0.25"/>
|
||||
</Canvas>
|
||||
<Canvas Width="100" Height="100" Canvas.Left="0" Canvas.Top="0" RenderTransformOrigin="0.5,0.5">
|
||||
<Canvas.RenderTransform>
|
||||
<TransformGroup>
|
||||
<ScaleTransform ScaleX="1" ScaleY="1" />
|
||||
<SkewTransform AngleX="0" AngleY="0" />
|
||||
<RotateTransform Angle="315" />
|
||||
<TranslateTransform X="0" Y="0" />
|
||||
</TransformGroup>
|
||||
</Canvas.RenderTransform>
|
||||
<Rectangle Canvas.Left="44" Canvas.Top="0" RadiusX="6" RadiusY="6" Opacity="0.125"/>
|
||||
</Canvas>
|
||||
</Canvas>
|
||||
</Viewbox>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
15
ChatController/ChatControlWaitLayer.xaml.cs
Normal file
15
ChatController/ChatControlWaitLayer.xaml.cs
Normal file
@@ -0,0 +1,15 @@
|
||||
using System.Windows.Controls;
|
||||
|
||||
namespace BeWo.View
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for WaitLayer.xaml
|
||||
/// </summary>
|
||||
public partial class ChatControlWaitLayer : UserControl
|
||||
{
|
||||
public ChatControlWaitLayer()
|
||||
{
|
||||
this.InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -55,6 +55,7 @@
|
||||
<DependentUpon>ChatEmojiiControl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ChatKlassen\AktuellerKontakt.cs" />
|
||||
<Compile Include="ChatKlassen\ChatControlExtensions.cs" />
|
||||
<Compile Include="ChatKlassen\KontaktlistBuilder.cs" />
|
||||
<Compile Include="ChatKlassen\KontaktMessageBuilder.cs" />
|
||||
<Compile Include="ChatKlassen\MessageCounter.cs" />
|
||||
@@ -73,6 +74,9 @@
|
||||
<Compile Include="LoginKlassen\UserDaten.cs" />
|
||||
<Compile Include="LoginKlassen\UserMessages.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="ChatControlWaitLayer.xaml.cs">
|
||||
<DependentUpon>ChatControlWaitLayer.xaml</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Page Include="ChatEmojiiControl.xaml">
|
||||
@@ -87,6 +91,10 @@
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="ChatControlWaitLayer.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Ressourcen\BeyondsoftChat.jpg" />
|
||||
|
||||
16
ChatController/ChatKlassen/ChatControlExtensions.cs
Normal file
16
ChatController/ChatKlassen/ChatControlExtensions.cs
Normal file
@@ -0,0 +1,16 @@
|
||||
using System;
|
||||
using System.Windows.Threading;
|
||||
using System.Windows;
|
||||
|
||||
namespace ChatController.ChatKlassen
|
||||
{
|
||||
public static class ChatControlExtensions
|
||||
{
|
||||
private static Action EmptyDelegatee = delegate() { };
|
||||
|
||||
public static void RefreshChatUI(this UIElement uiElement)
|
||||
{
|
||||
uiElement.Dispatcher.Invoke(DispatcherPriority.Render, EmptyDelegatee);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -181,7 +181,7 @@
|
||||
|
||||
|
||||
<!-- ####################### Rechtes Panel ################################-->
|
||||
<Grid Grid.Column="1" Grid.Row="0">
|
||||
<Grid Grid.Column="1" Grid.Row="0" x:Name="GridRechts">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="10*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
@@ -254,7 +254,7 @@
|
||||
<StackPanel Orientation="Vertical">
|
||||
<Image Stretch="Uniform" MaxHeight="200" MaxWidth="300" Source="{Binding ImageSources}" RenderOptions.BitmapScalingMode="HighQuality" />
|
||||
|
||||
<TextBlock Text="{Binding UserMessage}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
|
||||
<!--<TextBlock Text="{Binding UserMessage}" VerticalAlignment="Center" HorizontalAlignment="Center"/>-->
|
||||
</StackPanel>
|
||||
</DockPanel>
|
||||
|
||||
@@ -276,11 +276,17 @@
|
||||
<!--Dokument bereich -->
|
||||
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding DokumentVisibility}" >
|
||||
<StackPanel Orientation="Vertical">
|
||||
<Image ToolTip="Dokument öffnen" Height="100" Width="150" Source="/BeWoPlaner;component/Ressources/Icons/ClipboardDisabled.png" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" />
|
||||
<Button HorizontalAlignment="Center" VerticalAlignment="Center" Content="Dokument Anzeigen" Height="25" Tag="{Binding Dokpfad}" Click="OpenDokument_OnClick " />
|
||||
</StackPanel>
|
||||
<!--
|
||||
<TextBlock Margin="2,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding UserMessage}"/>-->
|
||||
<Image ToolTip="Dokument öffnen" Height="100" Width="150" Source="pack://application:,,,/ChatController;component/Ressourcen/ClipboardDisabled.png" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" />
|
||||
<TextBlock Margin="2,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding UserMessage}"/>
|
||||
<Button HorizontalAlignment="Center" VerticalAlignment="Center" Content="Dokument Anzeigen" Height="25" Tag="{Binding Dokpfad}" Click="OpenDokument_OnClick " >
|
||||
<Button.Resources>
|
||||
<Style TargetType="{x:Type Border}">
|
||||
<Setter Property="CornerRadius" Value="3"/>
|
||||
<Setter Property="Padding" Value="1,1,1,1" />
|
||||
</Style>
|
||||
</Button.Resources>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</DockPanel>
|
||||
|
||||
|
||||
@@ -329,11 +335,11 @@
|
||||
</TextBox>
|
||||
|
||||
<Button Grid.Column="1" Style="{x:Null}" Height="25" Width="25" Background="Transparent" BorderThickness="0" Margin="1,0,0,0" VerticalAlignment="Bottom" ToolTip="Datei einfügen" Click="MediaButton_OnClick">
|
||||
<Image Height="15" Width="15" Source='Ressourcen/paperclip.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Right"/>
|
||||
<Image Height="15" Width="15" Source='pack://application:,,,/ChatController;component/Ressourcen/paperclip.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Right"/>
|
||||
</Button>
|
||||
|
||||
<Button Grid.Column="2" Style="{x:Null}" Height="25" Width="25" Background="Transparent" BorderThickness="0" x:Name="EmojiButton" Margin="1,0,0,0" VerticalAlignment="Bottom" ToolTip="Emoji einfügen" Click="EmojiButton_OnClick">
|
||||
<Image Height="15" Width="15" Source='Ressourcen/glucklicher.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Right"/>
|
||||
<Image Height="15" Width="15" Source='pack://application:,,,/ChatController;component/Ressourcen/glucklicher.png' Margin="3" RenderOptions.BitmapScalingMode="HighQuality" HorizontalAlignment="Right"/>
|
||||
</Button>
|
||||
|
||||
</Grid>
|
||||
|
||||
@@ -18,6 +18,7 @@ using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
using System.Windows.Threading;
|
||||
using BeWo.View;
|
||||
using ChatController.ChatKlassen;
|
||||
using ChatController.HauptKlassen;
|
||||
using ChatController.Klassen;
|
||||
@@ -77,7 +78,7 @@ namespace ChatController
|
||||
|
||||
HorcheAlleGruppenNachrichten();
|
||||
}
|
||||
|
||||
|
||||
public AktuellerKontakt GetAktuellenKontakt()
|
||||
{
|
||||
if (AktChatUser != null)
|
||||
@@ -129,7 +130,10 @@ namespace ChatController
|
||||
|
||||
private void Clientlist_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
if(Clientlist.SelectedItem != null) {
|
||||
if(Clientlist.SelectedItem != null)
|
||||
{
|
||||
|
||||
StartWaiting();
|
||||
|
||||
Cursor = Cursors.Wait;
|
||||
scrollPrueferAktivieren = false;
|
||||
@@ -163,6 +167,8 @@ namespace ChatController
|
||||
|
||||
HorcheAktivNachNachrichten();
|
||||
Cursor = Cursors.Arrow;
|
||||
|
||||
EndWaiting();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,11 +217,9 @@ namespace ChatController
|
||||
var kontakt = (AktuellerKontakt)AktChatUser.Items[0];
|
||||
_chat.Einfuegen(kontakt.GroupId);
|
||||
}
|
||||
|
||||
//Bug Wegen Klient und so
|
||||
|
||||
private void Chat_OnContextMenuOpening(object sender, ContextMenuEventArgs e)
|
||||
{
|
||||
//prüfe ob ein Bild angeclickt wurde
|
||||
var chatItems = Chat.SelectedItems;
|
||||
|
||||
if (chatItems.Count > 0)
|
||||
@@ -274,15 +278,21 @@ namespace ChatController
|
||||
ContextItemSpeichernUnter.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
|
||||
|
||||
//Bug prüfe ob der aktulle Chat partner ein Klient ist
|
||||
//prüfe ob dokumentation erlaubt
|
||||
var kontakt = (AktuellerKontakt)AktChatUser.Items[0];
|
||||
if (true && Chat.ContextMenu.Items.Count > 2)
|
||||
if (kontakt.CustomerPersonOid == null && Chat.ContextMenu.Items.Count > 2)
|
||||
{
|
||||
var contextItems = Chat.ContextMenu.Items;
|
||||
var ContextItemSpeichernUnter = (MenuItem)contextItems[2];
|
||||
ContextItemSpeichernUnter.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
else if(Chat.ContextMenu.Items.Count > 2)
|
||||
{
|
||||
var contextItems = Chat.ContextMenu.Items;
|
||||
var ContextItemSpeichernUnter = (MenuItem)contextItems[2];
|
||||
ContextItemSpeichernUnter.Visibility = Visibility.Visible;
|
||||
}
|
||||
|
||||
|
||||
if (Chat.ContextMenu.Items.Count == 0)
|
||||
{
|
||||
@@ -476,7 +486,9 @@ namespace ChatController
|
||||
//nix
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
Cursor = Cursors.Wait;
|
||||
//StartWaiting();
|
||||
scrollPrueferAktivieren = false;
|
||||
|
||||
Chat.Items.MoveCurrentToFirst();
|
||||
@@ -490,7 +502,9 @@ namespace ChatController
|
||||
|
||||
Chat.ItemsSource = xy;
|
||||
|
||||
Chat.ScrollIntoView(item);
|
||||
Chat.ScrollIntoView(item);
|
||||
//EndWaiting();
|
||||
Cursor = Cursors.Arrow;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -662,7 +676,8 @@ namespace ChatController
|
||||
{
|
||||
if (liste.GroupId == neu.GroupId)
|
||||
{
|
||||
if (!liste.ReceiveMs.Equals(neu.ReceiveMs)) {
|
||||
if (!liste.ReceiveMs.Equals(neu.ReceiveMs)) {
|
||||
|
||||
liste.ReceiveMs = neu.ReceiveMs;
|
||||
|
||||
if (neu.GroupId == aktuellerKontakt.GroupId)
|
||||
@@ -714,7 +729,7 @@ namespace ChatController
|
||||
|
||||
#endregion
|
||||
|
||||
#region Zeige Erhaltene Daten An In Dem Fall Bilder Zurzeit
|
||||
#region Zeige Erhaltene Daten per doppelclick An In Dem Fall Bilder Zurzeit
|
||||
|
||||
private void Chat_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
@@ -738,6 +753,7 @@ namespace ChatController
|
||||
#region Lade Dokument Herunter und Zeige es an
|
||||
private void OpenDokument_OnClick(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Cursor = Cursors.Wait;
|
||||
var btn = sender as System.Windows.Controls.Button;
|
||||
|
||||
if (btn.Tag != null)
|
||||
@@ -748,6 +764,8 @@ namespace ChatController
|
||||
|
||||
LoadDokument(link.ToString(),filename);
|
||||
}
|
||||
|
||||
Cursor = Cursors.Arrow;
|
||||
}
|
||||
|
||||
private void LoadDokument(string link, String filename)
|
||||
@@ -774,5 +792,43 @@ namespace ChatController
|
||||
|
||||
#endregion
|
||||
|
||||
#region Wait Layer
|
||||
|
||||
private ChatControlWaitLayer _waitLayer = null;
|
||||
|
||||
public void StartWaiting()
|
||||
{
|
||||
Dispatcher.BeginInvoke(DispatcherPriority.Background, (Action)StartWaitingImmediately);
|
||||
}
|
||||
|
||||
public void StartWaitingImmediately()
|
||||
{
|
||||
if (_waitLayer == null)
|
||||
{
|
||||
_waitLayer = new ChatControlWaitLayer();
|
||||
//Grid.SetColumnSpan(_waitLayer, 3);
|
||||
Grid.SetRowSpan(_waitLayer, 3);
|
||||
GridRechts.Children.Add(_waitLayer);
|
||||
Panel.SetZIndex(_waitLayer, int.MaxValue);
|
||||
_waitLayer.RefreshChatUI();
|
||||
}
|
||||
}
|
||||
|
||||
public void EndWaiting()
|
||||
{
|
||||
Dispatcher.BeginInvoke(
|
||||
DispatcherPriority.Background,
|
||||
(Action)delegate
|
||||
{
|
||||
if (_waitLayer != null)
|
||||
{
|
||||
GridRechts.Children.Remove(_waitLayer);
|
||||
_waitLayer = null;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,6 +64,7 @@ namespace ChatController.HauptKlassen
|
||||
|
||||
var lastMS = value.LastMessage;
|
||||
|
||||
|
||||
if (lastMS != null)
|
||||
{
|
||||
if (lastMS.Text != null)
|
||||
@@ -72,6 +73,12 @@ namespace ChatController.HauptKlassen
|
||||
timestamp = DateTime.Parse(lastMS.Timestamp.Date);
|
||||
}
|
||||
}
|
||||
|
||||
if (message.Equals("") && value.LastMessage != null && !value.LastMessage.File.Equals(""))
|
||||
{
|
||||
message = Path.GetFileName(value.LastMessage.File);
|
||||
}
|
||||
|
||||
//null steht für employee
|
||||
Kontaktliste.Add(new KontaktlistBuilder(value.Name, AvatarToImageSourceConverter(value.Avatar),
|
||||
message, timestamp, value.Oid, null));
|
||||
@@ -169,7 +176,7 @@ namespace ChatController.HauptKlassen
|
||||
|
||||
if (DokumentExtension.Contains(Path.GetExtension(ChatMessage.File).ToUpperInvariant()))
|
||||
{
|
||||
Messages.Add(new KontaktMessageBuilder(ChatMessage.User_Name, ChatMessage.Text,
|
||||
Messages.Add(new KontaktMessageBuilder(ChatMessage.User_Name, Path.GetFileName(ChatMessage.File),
|
||||
timeformated.ToString("dd MMMM yyyy HH:mm:ss"), true,ChatMessage.File,
|
||||
timeformated));
|
||||
}
|
||||
@@ -201,7 +208,7 @@ namespace ChatController.HauptKlassen
|
||||
if (DokumentExtension.Contains(Path.GetExtension(ChatMessage.File).ToUpperInvariant()))
|
||||
{
|
||||
//Dokument
|
||||
Messages.Add(new KontaktMessageBuilder(ChatMessage.User_Name, ChatMessage.Text,
|
||||
Messages.Add(new KontaktMessageBuilder(ChatMessage.User_Name,Path.GetFileName(ChatMessage.File),
|
||||
timeformated.ToString("dd MMMM yyyy HH:mm:ss"), false, ChatMessage.File,
|
||||
timeformated));
|
||||
}
|
||||
@@ -726,6 +733,12 @@ namespace ChatController.HauptKlassen
|
||||
timestamp = DateTime.Parse(lastMS.Timestamp.Date);
|
||||
}
|
||||
}
|
||||
|
||||
if (message.Equals("") && value.LastMessage != null && !value.LastMessage.File.Equals(""))
|
||||
{
|
||||
message = Path.GetFileName(value.LastMessage.File);
|
||||
}
|
||||
|
||||
//null steht für employee
|
||||
Kontakt.Add(new KontaktlistBuilder(value.Name, AvatarToImageSourceConverter(value.Avatar),
|
||||
message, timestamp, value.Oid, null));
|
||||
|
||||
@@ -142,35 +142,37 @@ namespace ChatController
|
||||
private void SpeichereDatenInDatei()
|
||||
{
|
||||
try
|
||||
{
|
||||
using (StreamWriter sw = new StreamWriter(_dateiPfad))
|
||||
{
|
||||
{
|
||||
if (!File.Exists(_dateiPfad)) {
|
||||
using (StreamWriter sw = new StreamWriter(_dateiPfad))
|
||||
{
|
||||
|
||||
Encoding enc = new UTF8Encoding();
|
||||
var byt = enc.GetBytes(TextBoxKundennummer.Text);
|
||||
var bytes = Convert.ToBase64String(byt);
|
||||
Encoding enc = new UTF8Encoding();
|
||||
var byt = enc.GetBytes(TextBoxKundennummer.Text);
|
||||
var bytes = Convert.ToBase64String(byt);
|
||||
|
||||
var byt2 = enc.GetBytes(TextBoxChatCode.Text);
|
||||
var bytes2 = Convert.ToBase64String(byt2);
|
||||
var byt2 = enc.GetBytes(TextBoxChatCode.Text);
|
||||
var bytes2 = Convert.ToBase64String(byt2);
|
||||
|
||||
var byt3 = enc.GetBytes(TextBoxBenutzerName.Text);
|
||||
var bytes3 = Convert.ToBase64String(byt3);
|
||||
var byt3 = enc.GetBytes(TextBoxBenutzerName.Text);
|
||||
var bytes3 = Convert.ToBase64String(byt3);
|
||||
|
||||
|
||||
var byt4 = enc.GetBytes(TextBoxPasswort.Password);
|
||||
var bytes4 = Convert.ToBase64String(byt4);
|
||||
var byt4 = enc.GetBytes(TextBoxPasswort.Password);
|
||||
var bytes4 = Convert.ToBase64String(byt4);
|
||||
|
||||
var byt5 = enc.GetBytes(Merken.IsChecked.ToString());
|
||||
var bytes5 = Convert.ToBase64String(byt5);
|
||||
var byt5 = enc.GetBytes(Merken.IsChecked.ToString());
|
||||
var bytes5 = Convert.ToBase64String(byt5);
|
||||
|
||||
|
||||
sw.WriteLine(bytes);
|
||||
sw.WriteLine(bytes2);
|
||||
sw.WriteLine(bytes3);
|
||||
sw.WriteLine(bytes4);
|
||||
sw.WriteLine(bytes5);
|
||||
sw.WriteLine(bytes);
|
||||
sw.WriteLine(bytes2);
|
||||
sw.WriteLine(bytes3);
|
||||
sw.WriteLine(bytes4);
|
||||
sw.WriteLine(bytes5);
|
||||
|
||||
File.SetAttributes(_dateiPfad, FileAttributes.ReadOnly);
|
||||
File.SetAttributes(_dateiPfad, FileAttributes.ReadOnly);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
|
||||
Reference in New Issue
Block a user