diff --git a/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb b/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb index 8d7faafe..2d1e9d57 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb @@ -51,7 +51,7 @@ Public Class ClassFolderwatcher Logger.Error(ex.Message) End Try End Sub - Public Sub StartStop_FolderWatch() + Public Function StartStop_FolderWatch() Try If FWFolderWatcher Is Nothing OrElse FWFolderWatcher.EnableRaisingEvents = False Then ' Folderwatch neu instanzieren @@ -59,7 +59,7 @@ Public Class ClassFolderwatcher My.Application.Globix.Folderwatchstarted = True My.UIConfig.Globix.FolderWatchStarted = True My.UIConfigManager.Save() - + Return 1 End If If FWFolderWatcher.EnableRaisingEvents = True Then @@ -69,12 +69,13 @@ Public Class ClassFolderwatcher Logger.Info(" >> FolderWatch gestoppt") My.UIConfig.Globix.FolderWatchStarted = False My.UIConfigManager.Save() + Return 0 End If Catch ex As Exception Logger.Error(ex.Message) MsgBox("Error in StartStop_FolderWatch:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - End Sub + End Function Public Function StartStop_FolderWatchSCAN() As Integer Try If My.Application.Globix.CURRENT_SCAN_FOLDERWATCH = "" Then diff --git a/GUIs.ZooFlow/Modules/Globix/Models/WorkFile.vb b/GUIs.ZooFlow/Modules/Globix/Models/WorkFile.vb index a2409b7d..ed7ffa85 100644 --- a/GUIs.ZooFlow/Modules/Globix/Models/WorkFile.vb +++ b/GUIs.ZooFlow/Modules/Globix/Models/WorkFile.vb @@ -3,7 +3,7 @@ Public FilePath As String Public Id As Integer Public IsAttachment As Boolean = False - + Public HotfolderFile As Boolean = False Public Overrides Function ToString() As String Return FilePath End Function diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.Designer.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.Designer.vb index 28b9c28d..0018fdb5 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.Designer.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.Designer.vb @@ -22,60 +22,60 @@ Partial Class frmGlobixBasicConfig 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGlobixBasicConfig)) Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.DataGridView1 = New System.Windows.Forms.DataGridView() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() + Me.ToggleSwitchDropArea = New DevExpress.XtraEditors.ToggleSwitch() Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() - Me.btnScanfolder = New DevExpress.XtraEditors.SimpleButton() - Me.btnHotfolder = New DevExpress.XtraEditors.SimpleButton() - Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() - Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() - Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() - Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() - Me.tsinfo = New System.Windows.Forms.ToolStripStatusLabel() Me.ToggleSwitchHotfolder = New DevExpress.XtraEditors.ToggleSwitch() Me.ToggleSwitchScanfolder = New DevExpress.XtraEditors.ToggleSwitch() + Me.btnScanfolder = New DevExpress.XtraEditors.SimpleButton() Me.TextEditScanfolder = New DevExpress.XtraEditors.TextEdit() + Me.btnHotfolder = New DevExpress.XtraEditors.SimpleButton() Me.TextEditHotfolder = New DevExpress.XtraEditors.TextEdit() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() - Me.ToggleSwitchDropArea = New DevExpress.XtraEditors.ToggleSwitch() - Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() - Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() - Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() + Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() + Me.tsinfo = New System.Windows.Forms.ToolStripStatusLabel() CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() - CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() - Me.StatusStrip1.SuspendLayout() + CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchDropArea.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ToggleSwitchHotfolder.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ToggleSwitchScanfolder.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEditScanfolder.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEditHotfolder.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ToggleSwitchDropArea.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit() + Me.StatusStrip1.SuspendLayout() Me.SuspendLayout() ' 'OpenFileDialog1 @@ -84,14 +84,14 @@ Partial Class frmGlobixBasicConfig ' 'DataGridView1 ' - DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.DataGridView1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DataGridView1.Location = New System.Drawing.Point(24, 143) Me.DataGridView1.Name = "DataGridView1" - Me.DataGridView1.Size = New System.Drawing.Size(234, 235) + Me.DataGridView1.Size = New System.Drawing.Size(312, 481) Me.DataGridView1.TabIndex = 7 ' 'LayoutControl1 @@ -112,117 +112,47 @@ Partial Class frmGlobixBasicConfig Me.LayoutControl1.Location = New System.Drawing.Point(0, -9) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(798, 442) + Me.LayoutControl1.Size = New System.Drawing.Size(1030, 688) Me.LayoutControl1.TabIndex = 17 Me.LayoutControl1.Text = "LayoutControl1" ' + 'PictureEdit1 + ' + Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW_DROP3 + Me.PictureEdit1.Location = New System.Drawing.Point(364, 166) + Me.PictureEdit1.Name = "PictureEdit1" + Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] + Me.PictureEdit1.Size = New System.Drawing.Size(642, 458) + Me.PictureEdit1.StyleController = Me.LayoutControl1 + Me.PictureEdit1.TabIndex = 11 + ' + 'ToggleSwitchDropArea + ' + Me.ToggleSwitchDropArea.Location = New System.Drawing.Point(364, 143) + Me.ToggleSwitchDropArea.Name = "ToggleSwitchDropArea" + Me.ToggleSwitchDropArea.Properties.OffText = "Progressiv" + Me.ToggleSwitchDropArea.Properties.OnText = "Gemässigt" + Me.ToggleSwitchDropArea.Size = New System.Drawing.Size(642, 19) + Me.ToggleSwitchDropArea.StyleController = Me.LayoutControl1 + Me.ToggleSwitchDropArea.TabIndex = 10 + ' 'SimpleButton1 ' Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SimpleButton1.Location = New System.Drawing.Point(12, 394) + Me.SimpleButton1.Location = New System.Drawing.Point(12, 640) Me.SimpleButton1.Name = "SimpleButton1" - Me.SimpleButton1.Size = New System.Drawing.Size(258, 36) + Me.SimpleButton1.Size = New System.Drawing.Size(336, 36) Me.SimpleButton1.StyleController = Me.LayoutControl1 Me.SimpleButton1.TabIndex = 8 Me.SimpleButton1.Text = "Speichern" ' - 'btnScanfolder - ' - Me.btnScanfolder.Location = New System.Drawing.Point(577, 61) - Me.btnScanfolder.Name = "btnScanfolder" - Me.btnScanfolder.Size = New System.Drawing.Size(209, 22) - Me.btnScanfolder.StyleController = Me.LayoutControl1 - Me.btnScanfolder.TabIndex = 5 - Me.btnScanfolder.Text = "..." - ' - 'btnHotfolder - ' - Me.btnHotfolder.Location = New System.Drawing.Point(577, 12) - Me.btnHotfolder.Name = "btnHotfolder" - Me.btnHotfolder.Size = New System.Drawing.Size(209, 22) - Me.btnHotfolder.StyleController = Me.LayoutControl1 - Me.btnHotfolder.TabIndex = 2 - Me.btnHotfolder.Text = "..." - ' - 'Root - ' - Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] - Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.EmptySpaceItem1, Me.LayoutControlItem2, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.LayoutControlGroup1, Me.LayoutControlGroup2}) - Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(798, 442) - Me.Root.TextVisible = False - ' - 'EmptySpaceItem1 - ' - Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(262, 382) - Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(516, 40) - Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) - ' - 'LayoutControlItem2 - ' - Me.LayoutControlItem2.Control = Me.btnHotfolder - Me.LayoutControlItem2.Location = New System.Drawing.Point(565, 0) - Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(213, 26) - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem2.TextVisible = False - ' - 'LayoutControlItem5 - ' - Me.LayoutControlItem5.Control = Me.btnScanfolder - Me.LayoutControlItem5.Location = New System.Drawing.Point(565, 49) - Me.LayoutControlItem5.Name = "LayoutControlItem5" - Me.LayoutControlItem5.Size = New System.Drawing.Size(213, 26) - Me.LayoutControlItem5.Text = "..." - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem5.TextVisible = False - ' - 'LayoutControlItem3 - ' - Me.LayoutControlItem3.AppearanceItemCaption.Options.UseTextOptions = True - Me.LayoutControlItem3.AppearanceItemCaption.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center - Me.LayoutControlItem3.Control = Me.DataGridView1 - Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItem3.Name = "LayoutControlItem3" - Me.LayoutControlItem3.Size = New System.Drawing.Size(238, 239) - Me.LayoutControlItem3.Text = "Blacklist Folderwatchfiles" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem3.TextVisible = False - ' - 'LayoutControlItem8 - ' - Me.LayoutControlItem8.Control = Me.SimpleButton1 - Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 382) - Me.LayoutControlItem8.Name = "LayoutControlItem8" - Me.LayoutControlItem8.Size = New System.Drawing.Size(262, 40) - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem8.TextVisible = False - ' - 'StatusStrip1 - ' - Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsinfo}) - Me.StatusStrip1.Location = New System.Drawing.Point(0, 428) - Me.StatusStrip1.Name = "StatusStrip1" - Me.StatusStrip1.Size = New System.Drawing.Size(800, 22) - Me.StatusStrip1.TabIndex = 18 - Me.StatusStrip1.Text = "StatusStrip1" - ' - 'tsinfo - ' - Me.tsinfo.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.StatusAnnotations_Information_16xLG_color - Me.tsinfo.Name = "tsinfo" - Me.tsinfo.Size = New System.Drawing.Size(16, 17) - ' 'ToggleSwitchHotfolder ' Me.ToggleSwitchHotfolder.Location = New System.Drawing.Point(12, 38) Me.ToggleSwitchHotfolder.Name = "ToggleSwitchHotfolder" Me.ToggleSwitchHotfolder.Properties.OffText = "Überwachung starten" Me.ToggleSwitchHotfolder.Properties.OnText = "Überwachung aktiv" - Me.ToggleSwitchHotfolder.Size = New System.Drawing.Size(774, 19) + Me.ToggleSwitchHotfolder.Size = New System.Drawing.Size(1006, 19) Me.ToggleSwitchHotfolder.StyleController = Me.LayoutControl1 Me.ToggleSwitchHotfolder.TabIndex = 3 ' @@ -232,50 +162,104 @@ Partial Class frmGlobixBasicConfig Me.ToggleSwitchScanfolder.Name = "ToggleSwitchScanfolder" Me.ToggleSwitchScanfolder.Properties.OffText = "Scanfolder überwachen" Me.ToggleSwitchScanfolder.Properties.OnText = "Überwachung aktiv" - Me.ToggleSwitchScanfolder.Size = New System.Drawing.Size(774, 19) + Me.ToggleSwitchScanfolder.Size = New System.Drawing.Size(1006, 19) Me.ToggleSwitchScanfolder.StyleController = Me.LayoutControl1 Me.ToggleSwitchScanfolder.TabIndex = 6 ' + 'btnScanfolder + ' + Me.btnScanfolder.Location = New System.Drawing.Point(963, 61) + Me.btnScanfolder.Name = "btnScanfolder" + Me.btnScanfolder.Size = New System.Drawing.Size(55, 22) + Me.btnScanfolder.StyleController = Me.LayoutControl1 + Me.btnScanfolder.TabIndex = 5 + Me.btnScanfolder.Text = "..." + ' 'TextEditScanfolder ' Me.TextEditScanfolder.Location = New System.Drawing.Point(96, 61) Me.TextEditScanfolder.Name = "TextEditScanfolder" - Me.TextEditScanfolder.Size = New System.Drawing.Size(477, 20) + Me.TextEditScanfolder.Size = New System.Drawing.Size(863, 20) Me.TextEditScanfolder.StyleController = Me.LayoutControl1 Me.TextEditScanfolder.TabIndex = 4 ' + 'btnHotfolder + ' + Me.btnHotfolder.Location = New System.Drawing.Point(963, 12) + Me.btnHotfolder.Name = "btnHotfolder" + Me.btnHotfolder.Size = New System.Drawing.Size(55, 22) + Me.btnHotfolder.StyleController = Me.LayoutControl1 + Me.btnHotfolder.TabIndex = 2 + Me.btnHotfolder.Text = "..." + ' 'TextEditHotfolder ' Me.TextEditHotfolder.Location = New System.Drawing.Point(96, 12) Me.TextEditHotfolder.Name = "TextEditHotfolder" - Me.TextEditHotfolder.Size = New System.Drawing.Size(477, 20) + Me.TextEditHotfolder.Size = New System.Drawing.Size(863, 20) Me.TextEditHotfolder.StyleController = Me.LayoutControl1 Me.TextEditHotfolder.TabIndex = 0 ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.EmptySpaceItem1, Me.LayoutControlItem2, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.LayoutControlGroup1, Me.LayoutControlGroup2}) + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(1030, 688) + Me.Root.TextVisible = False + ' 'LayoutControlItem1 ' Me.LayoutControlItem1.Control = Me.TextEditHotfolder Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Size = New System.Drawing.Size(565, 26) + Me.LayoutControlItem1.Size = New System.Drawing.Size(951, 26) Me.LayoutControlItem1.Text = "Ihr Hotfolder" Me.LayoutControlItem1.TextSize = New System.Drawing.Size(72, 13) ' + 'EmptySpaceItem1 + ' + Me.EmptySpaceItem1.AllowHotTrack = False + Me.EmptySpaceItem1.Location = New System.Drawing.Point(340, 628) + Me.EmptySpaceItem1.Name = "EmptySpaceItem1" + Me.EmptySpaceItem1.Size = New System.Drawing.Size(670, 40) + Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) + ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.btnHotfolder + Me.LayoutControlItem2.Location = New System.Drawing.Point(951, 0) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Size = New System.Drawing.Size(59, 26) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem2.TextVisible = False + ' 'LayoutControlItem4 ' Me.LayoutControlItem4.Control = Me.TextEditScanfolder Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 49) Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Size = New System.Drawing.Size(565, 26) + Me.LayoutControlItem4.Size = New System.Drawing.Size(951, 26) Me.LayoutControlItem4.Text = "Ihr Scanfolder" Me.LayoutControlItem4.TextSize = New System.Drawing.Size(72, 13) ' + 'LayoutControlItem5 + ' + Me.LayoutControlItem5.Control = Me.btnScanfolder + Me.LayoutControlItem5.Location = New System.Drawing.Point(951, 49) + Me.LayoutControlItem5.Name = "LayoutControlItem5" + Me.LayoutControlItem5.Size = New System.Drawing.Size(59, 26) + Me.LayoutControlItem5.Text = "..." + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem5.TextVisible = False + ' 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.ToggleSwitchScanfolder Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 75) Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Size = New System.Drawing.Size(778, 23) + Me.LayoutControlItem6.Size = New System.Drawing.Size(1010, 23) Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem6.TextVisible = False ' @@ -284,39 +268,56 @@ Partial Class frmGlobixBasicConfig Me.LayoutControlItem7.Control = Me.ToggleSwitchHotfolder Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 26) Me.LayoutControlItem7.Name = "LayoutControlItem7" - Me.LayoutControlItem7.Size = New System.Drawing.Size(778, 23) + Me.LayoutControlItem7.Size = New System.Drawing.Size(1010, 23) Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem7.TextVisible = False ' - 'ToggleSwitchDropArea + 'LayoutControlItem8 ' - Me.ToggleSwitchDropArea.Location = New System.Drawing.Point(286, 143) - Me.ToggleSwitchDropArea.Name = "ToggleSwitchDropArea" - Me.ToggleSwitchDropArea.Properties.OffText = "Progressiv" - Me.ToggleSwitchDropArea.Properties.OnText = "Gemässigt" - Me.ToggleSwitchDropArea.Size = New System.Drawing.Size(488, 19) - Me.ToggleSwitchDropArea.StyleController = Me.LayoutControl1 - Me.ToggleSwitchDropArea.TabIndex = 10 + Me.LayoutControlItem8.Control = Me.SimpleButton1 + Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 628) + Me.LayoutControlItem8.Name = "LayoutControlItem8" + Me.LayoutControlItem8.Size = New System.Drawing.Size(340, 40) + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem8.TextVisible = False + ' + 'LayoutControlGroup1 + ' + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem3}) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 98) + Me.LayoutControlGroup1.Name = "LayoutControlGroup1" + Me.LayoutControlGroup1.Size = New System.Drawing.Size(340, 530) + Me.LayoutControlGroup1.Text = "Blacklist Folderwatch-Files" + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.AppearanceItemCaption.Options.UseTextOptions = True + Me.LayoutControlItem3.AppearanceItemCaption.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center + Me.LayoutControlItem3.Control = Me.DataGridView1 + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Size = New System.Drawing.Size(316, 485) + Me.LayoutControlItem3.Text = "Blacklist Folderwatchfiles" + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem3.TextVisible = False + ' + 'LayoutControlGroup2 + ' + Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem11}) + Me.LayoutControlGroup2.Location = New System.Drawing.Point(340, 98) + Me.LayoutControlGroup2.Name = "LayoutControlGroup2" + Me.LayoutControlGroup2.Size = New System.Drawing.Size(670, 530) + Me.LayoutControlGroup2.Text = "Darstellung Drop-Area" ' 'LayoutControlItem10 ' Me.LayoutControlItem10.Control = Me.ToggleSwitchDropArea Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem10.Name = "LayoutControlItem10" - Me.LayoutControlItem10.Size = New System.Drawing.Size(492, 23) + Me.LayoutControlItem10.Size = New System.Drawing.Size(646, 23) Me.LayoutControlItem10.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem10.TextVisible = False ' - 'PictureEdit1 - ' - Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW_DROP3 - Me.PictureEdit1.Location = New System.Drawing.Point(286, 166) - Me.PictureEdit1.Name = "PictureEdit1" - Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] - Me.PictureEdit1.Size = New System.Drawing.Size(488, 212) - Me.PictureEdit1.StyleController = Me.LayoutControl1 - Me.PictureEdit1.TabIndex = 11 - ' 'LayoutControlItem11 ' Me.LayoutControlItem11.AppearanceItemCaption.Options.UseTextOptions = True @@ -324,33 +325,32 @@ Partial Class frmGlobixBasicConfig Me.LayoutControlItem11.Control = Me.PictureEdit1 Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 23) Me.LayoutControlItem11.Name = "LayoutControlItem11" - Me.LayoutControlItem11.Size = New System.Drawing.Size(492, 216) + Me.LayoutControlItem11.Size = New System.Drawing.Size(646, 462) Me.LayoutControlItem11.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize Me.LayoutControlItem11.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem11.TextToControlDistance = 0 Me.LayoutControlItem11.TextVisible = False ' - 'LayoutControlGroup1 + 'StatusStrip1 ' - Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem3}) - Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 98) - Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(262, 284) - Me.LayoutControlGroup1.Text = "Blacklist Folderwatch-Files" + Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsinfo}) + Me.StatusStrip1.Location = New System.Drawing.Point(0, 674) + Me.StatusStrip1.Name = "StatusStrip1" + Me.StatusStrip1.Size = New System.Drawing.Size(1032, 22) + Me.StatusStrip1.TabIndex = 18 + Me.StatusStrip1.Text = "StatusStrip1" ' - 'LayoutControlGroup2 + 'tsinfo ' - Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem11}) - Me.LayoutControlGroup2.Location = New System.Drawing.Point(262, 98) - Me.LayoutControlGroup2.Name = "LayoutControlGroup2" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(516, 284) - Me.LayoutControlGroup2.Text = "Darstellung Drop-Area" + Me.tsinfo.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.StatusAnnotations_Information_16xLG_color + Me.tsinfo.Name = "tsinfo" + Me.tsinfo.Size = New System.Drawing.Size(16, 17) ' 'frmGlobixBasicConfig ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 450) + Me.ClientSize = New System.Drawing.Size(1032, 696) Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.LayoutControl1) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D @@ -363,28 +363,28 @@ Partial Class frmGlobixBasicConfig CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) - CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() - Me.StatusStrip1.ResumeLayout(False) - Me.StatusStrip1.PerformLayout() + CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchDropArea.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ToggleSwitchHotfolder.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ToggleSwitchScanfolder.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEditScanfolder.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEditHotfolder.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ToggleSwitchDropArea.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit() + Me.StatusStrip1.ResumeLayout(False) + Me.StatusStrip1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb index d46dbf9f..b4167e10 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb @@ -100,12 +100,12 @@ Public Class frmGlobixBasicConfig If Not ClassFolderwatcher.FWFolderWatcher Is Nothing Then If ClassFolderwatcher.FWFolderWatcher.EnableRaisingEvents = True Then - ToggleSwitchScanfolder.IsOn = True + ToggleSwitchHotfolder.IsOn = True Else - ToggleSwitchScanfolder.IsOn = False + ToggleSwitchHotfolder.IsOn = False End If Else - ToggleSwitchScanfolder.IsOn = False + ToggleSwitchHotfolder.IsOn = False End If If Not ClassFolderwatcher.FWScan Is Nothing Then @@ -132,7 +132,14 @@ Public Class frmGlobixBasicConfig End Sub - + Sub CheckFWHF_State() + Select Case clsFW.StartStop_FolderWatch() + Case 1 + ToggleSwitchHotfolder.IsOn = True + Case 0 + ToggleSwitchHotfolder.IsOn = False + End Select + End Sub Sub CheckFWSCAN_State() @@ -202,4 +209,13 @@ Public Class frmGlobixBasicConfig End If End If End Sub + + Private Sub ToggleSwitchHotfolder_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchHotfolder.Toggled + Dim oToggle As ToggleSwitch = TryCast(sender, ToggleSwitch) + If oToggle.IsOn Then + If My.Application.Globix.CurrentFolderWatchPath <> "" Then + CheckFWHF_State() + End If + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb index 11b22c7e..d428938a 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb @@ -137,7 +137,9 @@ Public Class frmGlobix_Index chkMultiindexing.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End If - + If My.UIConfig.Globix.DeleteOriginalFile Then + SourceDeleteItem.Checked = True + End If ' Letzte Auswahl merken überschreibt die automatische selektion If My.UIConfig.Globix.ProfilePreselection Then checkItemPreselection.Checked = True @@ -788,7 +790,7 @@ Public Class frmGlobix_Index Catch ex As Exception Logger.Error(ex) - MsgBox("Indexierung fehlgeschlagen!", MsgBoxStyle.Critical, Text) + MsgBox("Ablage fehlgeschlagen!", MsgBoxStyle.Critical, Text) Return False Finally @@ -809,12 +811,25 @@ Public Class frmGlobix_Index If oResult = True Then Dim oArgs = GetMessageBoxArgs() Dim oMessageResult = XtraMessageBox.Show(oArgs) + Dim oDEL As String = "DELETE FROM TBGI_FILES_USER WHERE GUID = " & My.Application.Globix.CurrentWorkfile.Id + My.DatabaseECM.ExecuteNonQuery(oDEL) + DocumentViewer1.CloseDocument() DocumentViewer1.Done() CancelAttempts = MAX_CANCEL_ATTEMPTS + + If My.Application.Globix.DeleteOriginalFile = True Or My.Application.Globix.CurrentWorkfile.HotfolderFile = True Then + Logger.Info("File [" & My.Application.Globix.CurrentWorkfile.FilePath & "] will be deleted...") + Try + System.IO.File.Delete(My.Application.Globix.CurrentWorkfile.FilePath) + Catch ex As Exception + Logger.Error(ex) + End Try + Logger.Info("File [" & My.Application.Globix.CurrentWorkfile.FilePath & "] has been deleted.") + End If Close() End If End Sub @@ -855,4 +870,6 @@ Public Class frmGlobix_Index Private Sub MessageboxLoad(sender As Object, e As XtraMessageBoxLoadArgs) e.Visible = My.UIConfig.Globix.ShowSuccessMessageBox End Sub + + End Class diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index becf265b..8cfcf14e 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -215,6 +215,8 @@ Public Class frmFlowForm Environment = My.Application.GetEnvironment() ErrorHandler = New BaseErrorHandler(My.LogConfig, Logger, Me) + + FileEx = New Filesystem.File(My.LogConfig) ' === Initialize Theming === If My.Application.Palette = "" Then UserLookAndFeel.Default.SetSkinStyle(My.Application.Skin) @@ -885,7 +887,8 @@ Public Class frmFlowForm If fileexists = True Then My.Application.Globix.CurrentWorkfile = New Globix.Models.WorkFile With { .Id = DirectCast(row.Item("GUID"), Integer), - .FilePath = FileForWork + .FilePath = FileForWork, + .HotfolderFile = True } Globix_Open_IndexDialog()