Import Assistent

Aviso/Anhänge/usrCntlSendungAnhangElement.vb

@@ -14,7 +14,7 @@ Public Class usrCntlSendungAnhangElement
     Property FILE_ANHID
 
 
-    Public Event ME_CLICK(STRG_PRESSED)
+    Public Event ME_CLICK(STRG_PRESSED, SHIFT_PRESSED)
     Public Event ME_DELETE(FILE_DOCID, FILE_ANHID)
     Public Event ME_COMPRESS(FILE_DOCID, FILE_ANHID)
 
@@ -111,11 +111,11 @@ Public Class usrCntlSendungAnhangElement
     'End Sub
     Private Sub pic_Click(sender As Object, e As MouseEventArgs) Handles pic.MouseClick, lbl.MouseClick, Me.MouseClick, lblSize.MouseClick
         If e.Button = MouseButtons.Left Then
-            RaiseEvent ME_CLICK((My.Computer.Keyboard.CtrlKeyDown Or My.Computer.Keyboard.ShiftKeyDown))
+            RaiseEvent ME_CLICK(My.Computer.Keyboard.CtrlKeyDown, My.Computer.Keyboard.ShiftKeyDown)
         End If
     End Sub
     Public Sub CLICK_Me()
-        RaiseEvent ME_CLICK(False) 'My.Computer.Keyboard.CtrlKeyDown Or My.Computer.Keyboard.ShiftKeyDown))
+        RaiseEvent ME_CLICK(False, False) 'My.Computer.Keyboard.CtrlKeyDown Or My.Computer.Keyboard.ShiftKeyDown))
     End Sub
 
     Private Sub pic_doubleClick(sender As Object, e As EventArgs) Handles pic.DoubleClick, lbl.DoubleClick, Me.DoubleClick, lblSize.DoubleClick
@@ -147,8 +147,14 @@ Public Class usrCntlSendungAnhangElement
             Dim ANH As New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(FILE_ANHID)
             Dim f As New frmSendungAnhangUmbenennenUmkateg(FILE_NAME, ANH.anh_Art)
             If f.ShowDialog = DialogResult.OK Then
+                Dim ext As String = IO.Path.GetExtension(originalName)
 
-                ANH.anh_Name = f.txtBezeichnung.Text
+                Dim name As String = f.txtBezeichnung.Text
+                If String.IsNullOrWhiteSpace(IO.Path.GetExtension(name)) AndAlso ext <> "" Then ' prüfen ob Benutzer schon eine Endung eingegeben hat
+                    name &= ext
+                End If
+
+                ANH.anh_Name = name
                 ANH.anh_Art = f.cboArt._value
                 ANH.SAVE()
                 FILE_NAME = f.txtBezeichnung.Text