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

uptoDate

Browse Source
This commit is contained in:
Waldi
2017-11-06 07:16:43 +01:00
parent b5bd3eb7b9
commit 8f070197f3
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChatController/ChatMainControl.xaml
View File

@@ -295,14 +295,14 @@
<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 " >
<!-- <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>
</Button>-->
</StackPanel>
</DockPanel>

27
ChatController/ChatMainControl.xaml.cs
View File

@@ -854,29 +854,38 @@ namespace ChatController
var item = items as KontaktMessageBuilder;
if (item != null && item.ImageSources != null)
{
_chat.ShowPicture(item);
EndWaiting();
Cursor = Cursors.Arrow;
{
_chat.ShowPicture(item);
}
else if(item != null && item.Dokpfad != null)
{
var filename = Path.GetFileName(item.Dokpfad.ToString());
LoadDokument(item.Dokpfad.ToString(), filename);
}
}
EndWaiting();
Cursor = Cursors.Arrow;
}
else
{
EndWaiting();
Cursor = Cursors.Arrow;
}
}
}
#endregion
#region Lade Dokument Herunter und Zeige es an
private void OpenDokument_OnClick(object sender, RoutedEventArgs e)
{
OpenDocument(sender);
}
private void OpenDocument(object sender)
{
Cursor = Cursors.Wait;
var btn = sender as System.Windows.Controls.Button;
if (btn.Tag != null)
@@ -885,7 +894,7 @@ namespace ChatController
var filename = Path.GetFileName(link.ToString());
LoadDokument(link.ToString(),filename);
LoadDokument(link.ToString(), filename);
}
Cursor = Cursors.Arrow;

4
ChatController/HauptKlassen/Chat.cs
View File

@@ -41,7 +41,7 @@ namespace ChatController.HauptKlassen
private bool _hasNextPage = false;
public static readonly List<string> ImageExtensions = new List<string> { ".JPG", ".JPE", ".BMP", ".GIF", ".PNG", ".JPEG" };
public static readonly List<string> DokumentExtension = new List<string> { ".TXT", ".PPT", ".XLS", ".DOC" };
public static readonly List<string> DokumentExtension = new List<string> { ".TXT", ".PPT", ".XLS", ".DOC",".PDF" };
private long lastTimeStamp=0;
@@ -836,7 +836,7 @@ namespace ChatController.HauptKlassen
OpenFileDialog openFileDialog1 = new OpenFileDialog();
//if (typ == 1)
openFileDialog1.Filter = "Office Dokumente |*.doc;*.xls;*.ppt;*.txt|Bilder |*.jpg;*.png;*.jpeg;*.jpe;*.gif;*.bmp";
openFileDialog1.Filter = "Office Dokumente |*.doc;*.xls;*.ppt;*.txt;*.pdf|Bilder |*.jpg;*.png;*.jpeg;*.jpe;*.gif;*.bmp";
//else
// openFileDialog1.Filter = "Office Dokumente |*.doc;*.xls;*.ppt;*.txt";