mini fixes

This commit is contained in:
Waldi
2017-09-15 11:23:03 +02:00
parent 5adfd83627
commit ea64707439
4 changed files with 20 additions and 5 deletions

View File

@@ -278,10 +278,15 @@
<StackPanel Orientation="Vertical">
<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 " />
</StackPanel>
<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>

View File

@@ -676,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)
@@ -752,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)
@@ -762,6 +764,8 @@ namespace ChatController
LoadDokument(link.ToString(),filename);
}
Cursor = Cursors.Arrow;
}
private void LoadDokument(string link, String filename)

View File

@@ -733,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));