Zooflow: WIP
This commit is contained in:
@@ -240,29 +240,29 @@ Public Class ClassFilehandle
|
||||
End Try
|
||||
|
||||
End Function
|
||||
'' <summary>
|
||||
''' Ersetzt alle nicht zulässigen Zeichen im angegebenen Dateinamen
|
||||
''' </summary>
|
||||
''' <param name="sFilename">Dateiname ohne Pfadangabe</param>
|
||||
''' <param name="sChar">Ersatzzeichen für alle unzulässigen Zeichen
|
||||
''' im Dateinamen</param>
|
||||
Public Function CleanFilename(ByVal sFilename As String, Optional ByVal REPLACEChar As String = "") As String
|
||||
_LOGGER.Info(" Filename before CleanFilename: '" & sFilename & "'")
|
||||
If sFilename.Contains(".\") Then
|
||||
sFilename = sFilename.Replace(".\", "\")
|
||||
End If
|
||||
'If sFilename.Contains("'") Then
|
||||
' sFilename = sFilename.Replace("'", "")
|
||||
'End If
|
||||
'If sFilename.Contains("..") Then
|
||||
' sFilename = sFilename.Replace("..", ".")
|
||||
'End If
|
||||
' alle nicht zulässigen Zeichen ersetzen
|
||||
sFilename = System.Text.RegularExpressions.Regex.Replace(sFilename, My.Application.Globix.REGEX_CLEAN_FILENAME, REPLACEChar)
|
||||
sFilename = System.Text.RegularExpressions.Regex.Replace(sFilename, "[\\/:*?""<>|\r\n]", "", System.Text.RegularExpressions.RegexOptions.Singleline)
|
||||
'Dim oCleanFileName As String = String.Join(REPLACEChar, sFilename.Split(Path.GetInvalidFileNameChars()))
|
||||
Dim oCleanFileName As New System.IO.FileInfo(System.Text.RegularExpressions.Regex.Replace(sFilename, String.Format("[{0}]", String.Join(String.Empty, Path.GetInvalidFileNameChars)), REPLACEChar))
|
||||
_LOGGER.Info("Filename after CleanFilename: '" & sFilename & "'")
|
||||
Return sFilename
|
||||
End Function
|
||||
''' <summary>
|
||||
'''' Ersetzt alle nicht zulässigen Zeichen im angegebenen Dateinamen
|
||||
'''' </summary>
|
||||
'''' <param name="sFilename">Dateiname ohne Pfadangabe</param>
|
||||
'''' <param name="sChar">Ersatzzeichen für alle unzulässigen Zeichen
|
||||
'''' im Dateinamen</param>
|
||||
'Public Function CleanFilename(ByVal sFilename As String, Optional ByVal REPLACEChar As String = "") As String
|
||||
' _LOGGER.Info(" Filename before CleanFilename: '" & sFilename & "'")
|
||||
' If sFilename.Contains(".\") Then
|
||||
' sFilename = sFilename.Replace(".\", "\")
|
||||
' End If
|
||||
' 'If sFilename.Contains("'") Then
|
||||
' ' sFilename = sFilename.Replace("'", "")
|
||||
' 'End If
|
||||
' 'If sFilename.Contains("..") Then
|
||||
' ' sFilename = sFilename.Replace("..", ".")
|
||||
' 'End If
|
||||
' ' alle nicht zulässigen Zeichen ersetzen
|
||||
' sFilename = System.Text.RegularExpressions.Regex.Replace(sFilename, My.Application.Globix.REGEX_CLEAN_FILENAME, REPLACEChar)
|
||||
' sFilename = System.Text.RegularExpressions.Regex.Replace(sFilename, "[\\/:*?""<>|\r\n]", "", System.Text.RegularExpressions.RegexOptions.Singleline)
|
||||
' 'Dim oCleanFileName As String = String.Join(REPLACEChar, sFilename.Split(Path.GetInvalidFileNameChars()))
|
||||
' Dim oCleanFileName As New System.IO.FileInfo(System.Text.RegularExpressions.Regex.Replace(sFilename, String.Format("[{0}]", String.Join(String.Empty, Path.GetInvalidFileNameChars)), REPLACEChar))
|
||||
' _LOGGER.Info("Filename after CleanFilename: '" & sFilename & "'")
|
||||
' Return sFilename
|
||||
'End Function
|
||||
End Class
|
||||
|
||||
14
GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb
generated
14
GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb
generated
@@ -247,7 +247,7 @@ Partial Class frmGlobix_Index
|
||||
Me.SplitContainerControl1.Panel2.Controls.Add(Me.DocumentViewer1)
|
||||
Me.SplitContainerControl1.Panel2.Text = "Panel2"
|
||||
Me.SplitContainerControl1.Size = New System.Drawing.Size(1005, 508)
|
||||
Me.SplitContainerControl1.SplitterPosition = 591
|
||||
Me.SplitContainerControl1.SplitterPosition = 522
|
||||
Me.SplitContainerControl1.TabIndex = 2
|
||||
'
|
||||
'pnlIndex
|
||||
@@ -258,7 +258,7 @@ Partial Class frmGlobix_Index
|
||||
Me.pnlIndex.ForeColor = System.Drawing.SystemColors.ControlText
|
||||
Me.pnlIndex.Location = New System.Drawing.Point(0, 33)
|
||||
Me.pnlIndex.Name = "pnlIndex"
|
||||
Me.pnlIndex.Size = New System.Drawing.Size(591, 400)
|
||||
Me.pnlIndex.Size = New System.Drawing.Size(522, 400)
|
||||
Me.pnlIndex.TabIndex = 3
|
||||
'
|
||||
'Panel3
|
||||
@@ -267,7 +267,7 @@ Partial Class frmGlobix_Index
|
||||
Me.Panel3.Dock = System.Windows.Forms.DockStyle.Bottom
|
||||
Me.Panel3.Location = New System.Drawing.Point(0, 433)
|
||||
Me.Panel3.Name = "Panel3"
|
||||
Me.Panel3.Size = New System.Drawing.Size(591, 75)
|
||||
Me.Panel3.Size = New System.Drawing.Size(522, 75)
|
||||
Me.Panel3.TabIndex = 2
|
||||
'
|
||||
'btnAblageFlow
|
||||
@@ -278,7 +278,7 @@ Partial Class frmGlobix_Index
|
||||
Me.btnAblageFlow.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
Me.btnAblageFlow.Location = New System.Drawing.Point(0, 0)
|
||||
Me.btnAblageFlow.Name = "btnAblageFlow"
|
||||
Me.btnAblageFlow.Size = New System.Drawing.Size(591, 75)
|
||||
Me.btnAblageFlow.Size = New System.Drawing.Size(522, 75)
|
||||
Me.btnAblageFlow.TabIndex = 1
|
||||
Me.btnAblageFlow.Text = "Starte Ablage"
|
||||
Me.btnAblageFlow.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
@@ -291,7 +291,7 @@ Partial Class frmGlobix_Index
|
||||
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
|
||||
Me.Panel1.Location = New System.Drawing.Point(0, 0)
|
||||
Me.Panel1.Name = "Panel1"
|
||||
Me.Panel1.Size = New System.Drawing.Size(591, 33)
|
||||
Me.Panel1.Size = New System.Drawing.Size(522, 33)
|
||||
Me.Panel1.TabIndex = 0
|
||||
'
|
||||
'ComboBoxEdit1
|
||||
@@ -306,7 +306,7 @@ Partial Class frmGlobix_Index
|
||||
Me.ComboBoxEdit1.Properties.ButtonsStyle = DevExpress.XtraEditors.Controls.BorderStyles.UltraFlat
|
||||
Me.ComboBoxEdit1.Properties.NullText = "Bitte wählen Sie ein Profil"
|
||||
Me.ComboBoxEdit1.Properties.Padding = New System.Windows.Forms.Padding(5)
|
||||
Me.ComboBoxEdit1.Size = New System.Drawing.Size(591, 30)
|
||||
Me.ComboBoxEdit1.Size = New System.Drawing.Size(522, 30)
|
||||
Me.ComboBoxEdit1.TabIndex = 4
|
||||
'
|
||||
'DocumentViewer1
|
||||
@@ -315,7 +315,7 @@ Partial Class frmGlobix_Index
|
||||
Me.DocumentViewer1.FileLoaded = False
|
||||
Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0)
|
||||
Me.DocumentViewer1.Name = "DocumentViewer1"
|
||||
Me.DocumentViewer1.Size = New System.Drawing.Size(404, 508)
|
||||
Me.DocumentViewer1.Size = New System.Drawing.Size(473, 508)
|
||||
Me.DocumentViewer1.TabIndex = 0
|
||||
'
|
||||
'GlobixDataset
|
||||
|
||||
Reference in New Issue
Block a user