From 2a07b5bd513996d887879d614b9ae6b0497c6887 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Wed, 4 May 2016 16:10:52 +0200 Subject: [PATCH] MS2 --- app/DD-Record-Organiser/ClassHelper.vb | 13 +++++++++ .../ClassImport_Windream.vb | 3 ++ .../frmConstructor_Main.Designer.vb | 25 ++++++++--------- .../frmConstructor_Main.resx | 28 +++++++++---------- app/DD-Record-Organiser/frmMain.vb | 2 +- 5 files changed, 43 insertions(+), 28 deletions(-) diff --git a/app/DD-Record-Organiser/ClassHelper.vb b/app/DD-Record-Organiser/ClassHelper.vb index 17796c4..79ccff3 100644 --- a/app/DD-Record-Organiser/ClassHelper.vb +++ b/app/DD-Record-Organiser/ClassHelper.vb @@ -79,4 +79,17 @@ Public Class ClassHelper End Try End Function + '' + ''' Ersetzt alle nicht zulässigen Zeichen im angegebenen Dateinamen + ''' + ''' Dateiname ohne Pfadangabe + ''' Ersatzzeichen für alle unzulässigen Zeichen + ''' im Dateinamen + 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 diff --git a/app/DD-Record-Organiser/ClassImport_Windream.vb b/app/DD-Record-Organiser/ClassImport_Windream.vb index 35bdcf9..2103e47 100644 --- a/app/DD-Record-Organiser/ClassImport_Windream.vb +++ b/app/DD-Record-Organiser/ClassImport_Windream.vb @@ -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 diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index c12faf6..1824153 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -22,7 +22,6 @@ Partial Class frmConstructor_Main 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ 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() diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 5b2585d..4fe07e8 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -298,7 +298,7 @@ 0, 0 - 795, 248 + 788, 248 0 @@ -373,7 +373,7 @@ 0, 0 - 1072, 338 + 1069, 334 0 @@ -391,7 +391,7 @@ 0 - 1072, 338 + 1069, 334 Detailansicht @@ -409,7 +409,7 @@ 0 - 1078, 369 + 1071, 362 1 @@ -469,7 +469,7 @@ 192, 255, 192 - 1072, 313 + 1069, 309 7 @@ -565,7 +565,7 @@ 0, 0 - 1072, 25 + 1069, 25 2 @@ -586,7 +586,7 @@ 2 - 1072, 338 + 1069, 334 windream-Dateien @@ -1017,7 +1017,7 @@ 2 - 1072, 338 + 1069, 334 Wiedervorlage @@ -1044,7 +1044,7 @@ Cyan - 1072, 313 + 1069, 309 0 @@ -1068,7 +1068,7 @@ 0, 25 - 1072, 313 + 1069, 309 2 @@ -1243,7 +1243,7 @@ 0, 0 - 1072, 25 + 1069, 25 1 @@ -1272,7 +1272,7 @@ - 1072, 338 + 1069, 334 Positionen @@ -1472,7 +1472,7 @@ 0, 0 - 1078, 25 + 1071, 25 0 @@ -1577,7 +1577,7 @@ Panel2 - 1083, 394 + 1083, 387 0 diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb index fbf45ce..d7ce9b1 100644 --- a/app/DD-Record-Organiser/frmMain.vb +++ b/app/DD-Record-Organiser/frmMain.vb @@ -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()