This commit is contained in:
SchreiberM
2016-05-04 16:10:52 +02:00
parent 1c53e3e894
commit 2a07b5bd51
5 changed files with 43 additions and 28 deletions

View File

@@ -79,4 +79,17 @@ Public Class ClassHelper
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 Shared Function CleanFilename(ByVal sFilename As String, _
Optional ByVal REPLACEChar As String = "") As String
' alle nicht zulässigen Zeichen ersetzen
Return System.Text.RegularExpressions.Regex.Replace( _
sFilename, "[?*^""<>|]", REPLACEChar)
End Function
End Class

View File

@@ -300,6 +300,8 @@ Public Class ClassImport_Windream
End Select
Next
Try
'ungültige Zeichen entfernen
DATEINAME = ClassHelper.CleanFilename(DATEINAME, "")
Dim version As Integer = 2
Dim Stammname As String = DATEINAME.Replace(VERSION_DELIMITER, "")
Dim _neuername As String = DATEINAME.Replace(VERSION_DELIMITER, "")
@@ -320,6 +322,7 @@ Public Class ClassImport_Windream
err = True
End Try
CURRENT_NEWFILENAME = _NewFileString & extension
'False oder True zurückgeben
If err = False Then
Return True

View File

@@ -22,7 +22,6 @@ Partial Class frmConstructor_Main
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main))
Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
@@ -30,12 +29,12 @@ Partial Class frmConstructor_Main
Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl()
Me.TreeViewMain = New System.Windows.Forms.TreeView()
Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip()
Me.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.GridControlMain = New DevExpress.XtraGrid.GridControl()
Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip()
Me.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
Me.AnsichtUmschaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -59,7 +58,7 @@ Partial Class frmConstructor_Main
Me.pnlDetails = New System.Windows.Forms.Panel()
Me.TabWindream = New DevExpress.XtraTab.XtraTabPage()
Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl()
Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip()
Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator()
Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -94,7 +93,7 @@ Partial Class frmConstructor_Main
Me.Panel1 = New System.Windows.Forms.Panel()
Me.GridControlPos = New DevExpress.XtraGrid.GridControl()
Me.grvwGridPos = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator(Me.components)
Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator()
Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
@@ -130,7 +129,7 @@ Partial Class frmConstructor_Main
Me.GridControlParent = New DevExpress.XtraGrid.GridControl()
Me.GridViewParent = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.btnRelinkParentID = New System.Windows.Forms.Button()
Me.BindingSource_Entity = New System.Windows.Forms.BindingSource(Me.components)
Me.BindingSource_Entity = New System.Windows.Forms.BindingSource()
Me.NavPane = New DevExpress.XtraBars.Navigation.TileNavPane()
Me.NavButtonHome = New DevExpress.XtraBars.Navigation.NavButton()
Me.NavButtonRefresh = New DevExpress.XtraBars.Navigation.NavButton()
@@ -139,18 +138,18 @@ Partial Class frmConstructor_Main
Me.tsslblRecord = New System.Windows.Forms.ToolStripStatusLabel()
Me.tsslblWorkflowstate = New System.Windows.Forms.ToolStripStatusLabel()
Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components)
Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components)
Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.ImageCollection1 = New DevExpress.Utils.ImageCollection()
Me.ttToolTip = New System.Windows.Forms.ToolTip()
Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip()
Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource()
Me.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
Me.TBPMO_FILES_USERTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FILES_USERTableAdapter()
Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource()
Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components)
Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource()
Me.ToolTipController = New DevExpress.Utils.ToolTipController()
CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerMain.SuspendLayout()
CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit()

View File

@@ -298,7 +298,7 @@
<value>0, 0</value>
</data>
<data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing">
<value>795, 248</value>
<value>788, 248</value>
</data>
<data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -373,7 +373,7 @@
<value>0, 0</value>
</data>
<data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
<value>1072, 338</value>
<value>1069, 334</value>
</data>
<data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -391,7 +391,7 @@
<value>0</value>
</data>
<data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
<value>1072, 338</value>
<value>1069, 334</value>
</data>
<data name="TabDetails.Text" xml:space="preserve">
<value>Detailansicht</value>
@@ -409,7 +409,7 @@
<value>0</value>
</data>
<data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing">
<value>1078, 369</value>
<value>1071, 362</value>
</data>
<data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -469,7 +469,7 @@
<value>192, 255, 192</value>
</data>
<data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
<value>1072, 313</value>
<value>1069, 309</value>
</data>
<data name="GridControlDocSearch.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@@ -565,7 +565,7 @@
<value>0, 0</value>
</data>
<data name="ToolStripDokumente.Size" type="System.Drawing.Size, System.Drawing">
<value>1072, 25</value>
<value>1069, 25</value>
</data>
<data name="ToolStripDokumente.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -586,7 +586,7 @@
<value>2</value>
</data>
<data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing">
<value>1072, 338</value>
<value>1069, 334</value>
</data>
<data name="TabWindream.Text" xml:space="preserve">
<value>windream-Dateien</value>
@@ -1017,7 +1017,7 @@
<value>2</value>
</data>
<data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing">
<value>1072, 338</value>
<value>1069, 334</value>
</data>
<data name="TabFollowUp.Text" xml:space="preserve">
<value>Wiedervorlage</value>
@@ -1044,7 +1044,7 @@
<value>Cyan</value>
</data>
<data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
<value>1072, 313</value>
<value>1069, 309</value>
</data>
<data name="GridControlPos.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -1068,7 +1068,7 @@
<value>0, 25</value>
</data>
<data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>1072, 313</value>
<value>1069, 309</value>
</data>
<data name="Panel1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -1243,7 +1243,7 @@
<value>0, 0</value>
</data>
<data name="BindingNavigatorPOS.Size" type="System.Drawing.Size, System.Drawing">
<value>1072, 25</value>
<value>1069, 25</value>
</data>
<data name="BindingNavigatorPOS.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -1272,7 +1272,7 @@
</value>
</data>
<data name="TabPos.Size" type="System.Drawing.Size, System.Drawing">
<value>1072, 338</value>
<value>1069, 334</value>
</data>
<data name="TabPos.Text" xml:space="preserve">
<value>Positionen</value>
@@ -1472,7 +1472,7 @@
<value>0, 0</value>
</data>
<data name="ToolStripEdit.Size" type="System.Drawing.Size, System.Drawing">
<value>1078, 25</value>
<value>1071, 25</value>
</data>
<data name="ToolStripEdit.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -1577,7 +1577,7 @@
<value>Panel2</value>
</data>
<data name="SplitContainerBottom.Size" type="System.Drawing.Size, System.Drawing">
<value>1083, 394</value>
<value>1083, 387</value>
</data>
<data name="SplitContainerBottom.TabIndex" type="System.Int32, mscorlib">
<value>0</value>

View File

@@ -476,9 +476,9 @@ Public Class frmMain
Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
If ERROR_INIT <> "INVALID USER" Then
Refresh_TaskReminder()
If Task_Popup_minutes <> 0 Then
TimerTasks.Start()
Refresh_TaskReminder()
End If
RUN_TIMER()