diff --git a/ChatController/ChatMainControl.xaml b/ChatController/ChatMainControl.xaml
index 14d7613..e8850f3 100644
--- a/ChatController/ChatMainControl.xaml
+++ b/ChatController/ChatMainControl.xaml
@@ -295,14 +295,14 @@
-
diff --git a/ChatController/ChatMainControl.xaml.cs b/ChatController/ChatMainControl.xaml.cs
index 8bca996..383f8a6 100644
--- a/ChatController/ChatMainControl.xaml.cs
+++ b/ChatController/ChatMainControl.xaml.cs
@@ -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;
diff --git a/ChatController/HauptKlassen/Chat.cs b/ChatController/HauptKlassen/Chat.cs
index 1596640..2c7daf2 100644
--- a/ChatController/HauptKlassen/Chat.cs
+++ b/ChatController/HauptKlassen/Chat.cs
@@ -41,7 +41,7 @@ namespace ChatController.HauptKlassen
private bool _hasNextPage = false;
public static readonly List ImageExtensions = new List { ".JPG", ".JPE", ".BMP", ".GIF", ".PNG", ".JPEG" };
- public static readonly List DokumentExtension = new List { ".TXT", ".PPT", ".XLS", ".DOC" };
+ public static readonly List DokumentExtension = new List { ".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";