From ccced6256069a5019856f3a534c2a0005038dc97 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Wed, 23 Feb 2022 13:06:50 +0100 Subject: [PATCH] ms globix config --- GUIs.ZooFlow/ClassConstants.vb | 1 + GUIs.ZooFlow/ClassInit.vb | 2 + .../Globix/frmGlobixBasicConfig.Designer.vb | 527 +++++++++--------- .../Modules/Globix/frmGlobixBasicConfig.resx | 22 +- .../Modules/Globix/frmGlobixBasicConfig.vb | 176 +++--- GUIs.ZooFlow/My Project/Resources.Designer.vb | 10 + GUIs.ZooFlow/My Project/Resources.resx | 163 +++--- GUIs.ZooFlow/MyApplication.vb | 1 + ...tusAnnotations_Information_16xLG_color.png | Bin 0 -> 338 bytes GUIs.ZooFlow/ZooFlow.vbproj | 1 + GUIs.ZooFlow/frmFlowForm.Designer.vb | 83 +-- GUIs.ZooFlow/frmFlowForm.resx | 24 + GUIs.ZooFlow/frmFlowForm.vb | 11 +- 13 files changed, 531 insertions(+), 490 deletions(-) create mode 100644 GUIs.ZooFlow/Resources/StatusAnnotations_Information_16xLG_color.png diff --git a/GUIs.ZooFlow/ClassConstants.vb b/GUIs.ZooFlow/ClassConstants.vb index 2504c04d..35682897 100644 --- a/GUIs.ZooFlow/ClassConstants.vb +++ b/GUIs.ZooFlow/ClassConstants.vb @@ -9,6 +9,7 @@ Public Const USER_CATALOG_APPLICATION_THEME = "APPLICATION_THEME" Public Const USER_CATALOG_QUICKSEARCH1_TITLE = "QUICKSEARCH1_TITLE" Public Const USER_CATALOG_QUICKSEARCH1_POS = "QUICKSEARCH1_POS" + Public Const USER_CATALOG_GLOBIX_DROPAREA = "GLOBIX_DROPAREA" Public Const FOLDER_NAME_LAYOUT = "Layout" diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 297e17cb..fe58fd37 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -240,6 +240,8 @@ Public Class ClassInit MyApplication.Skin = oThemeName MyApplication.Palette = "" End If + ElseIf oRow.Item("CAT_TITLE") = ClassConstants.USER_CATALOG_GLOBIX_DROPAREA Then + My.Application.GlobixDropAreaStyle = oRow.Item("CAT_STRING") End If Next diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.Designer.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.Designer.vb index 5dae5849..28b9c28d 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.Designer.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.Designer.vb @@ -22,351 +22,337 @@ Partial Class frmGlobixBasicConfig 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGlobixBasicConfig)) - Me.Label1 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() - Me.txtFolderWatch = New System.Windows.Forms.TextBox() - Me.txtScanFolderWatch = New System.Windows.Forms.TextBox() - Me.Button1 = New System.Windows.Forms.Button() - Me.Button2 = New System.Windows.Forms.Button() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() - Me.Label8 = New System.Windows.Forms.Label() Me.DataGridView1 = New System.Windows.Forms.DataGridView() - Me.btnSaveExclusionFiles = New System.Windows.Forms.Button() - Me.btnstartstop2 = New System.Windows.Forms.Button() - Me.btnstartstop1 = New System.Windows.Forms.Button() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + 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.TextEditHotfolder = New DevExpress.XtraEditors.TextEdit() - Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() - Me.btnHotfolder = New DevExpress.XtraEditors.SimpleButton() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() - Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() + Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() - Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + 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.TextEditScanfolder = New DevExpress.XtraEditors.TextEdit() + Me.TextEditHotfolder = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() - Me.btnScanfolder = New DevExpress.XtraEditors.SimpleButton() - Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() - Me.ToggleSwitch1 = New DevExpress.XtraEditors.ToggleSwitch() Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() - Me.ToggleSwitch2 = New DevExpress.XtraEditors.ToggleSwitch() 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.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() 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.TextEditHotfolder.Properties, 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.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() + Me.StatusStrip1.SuspendLayout() + 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.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ToggleSwitch1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ToggleSwitch2.Properties, 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.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(9, 13) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(295, 13) - Me.Label1.TabIndex = 0 - Me.Label1.Text = "Definieren Sie hier den Ordner welcher überwacht wird:" - ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(12, 93) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(392, 13) - Me.Label2.TabIndex = 1 - Me.Label2.Text = "Definieren Sie hier den Ordner der für Scan2Folder verwendet werden soll:" - ' - 'txtFolderWatch - ' - Me.txtFolderWatch.Location = New System.Drawing.Point(12, 30) - Me.txtFolderWatch.Name = "txtFolderWatch" - Me.txtFolderWatch.Size = New System.Drawing.Size(679, 22) - Me.txtFolderWatch.TabIndex = 2 - ' - 'txtScanFolderWatch - ' - Me.txtScanFolderWatch.Location = New System.Drawing.Point(12, 109) - Me.txtScanFolderWatch.Name = "txtScanFolderWatch" - Me.txtScanFolderWatch.Size = New System.Drawing.Size(679, 22) - Me.txtScanFolderWatch.TabIndex = 3 - ' - 'Button1 - ' - Me.Button1.Location = New System.Drawing.Point(697, 30) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(29, 23) - Me.Button1.TabIndex = 4 - Me.Button1.Text = "..." - Me.Button1.UseVisualStyleBackColor = True - ' - 'Button2 - ' - Me.Button2.Location = New System.Drawing.Point(697, 107) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(29, 23) - Me.Button2.TabIndex = 5 - Me.Button2.Text = "..." - Me.Button2.UseVisualStyleBackColor = True - ' 'OpenFileDialog1 ' Me.OpenFileDialog1.FileName = "OpenFileDialog1" - ' - 'Label8 - ' - Me.Label8.AutoSize = True - Me.Label8.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label8.Location = New System.Drawing.Point(9, 186) - Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(453, 26) - Me.Label8.TabIndex = 16 - Me.Label8.Text = "Definieren Sie hier Inhalte von Dateinamen welche von der Folderwatch-Überwachung" & - "" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "ausgenommen werden sollen:" ' 'DataGridView1 ' - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 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(12, 215) + Me.DataGridView1.Location = New System.Drawing.Point(24, 143) Me.DataGridView1.Name = "DataGridView1" - Me.DataGridView1.Size = New System.Drawing.Size(192, 223) - Me.DataGridView1.TabIndex = 14 - ' - 'btnSaveExclusionFiles - ' - Me.btnSaveExclusionFiles.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.save_16xLG - Me.btnSaveExclusionFiles.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSaveExclusionFiles.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnSaveExclusionFiles.Location = New System.Drawing.Point(210, 215) - Me.btnSaveExclusionFiles.Name = "btnSaveExclusionFiles" - Me.btnSaveExclusionFiles.Size = New System.Drawing.Size(94, 29) - Me.btnSaveExclusionFiles.TabIndex = 15 - Me.btnSaveExclusionFiles.Text = "Speichern" - Me.btnSaveExclusionFiles.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnSaveExclusionFiles.UseVisualStyleBackColor = True - ' - 'btnstartstop2 - ' - Me.btnstartstop2.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.bell_go - Me.btnstartstop2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnstartstop2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnstartstop2.Location = New System.Drawing.Point(518, 138) - Me.btnstartstop2.Margin = New System.Windows.Forms.Padding(4) - Me.btnstartstop2.Name = "btnstartstop2" - Me.btnstartstop2.Size = New System.Drawing.Size(173, 25) - Me.btnstartstop2.TabIndex = 10 - Me.btnstartstop2.Text = "Überwachung starten" - Me.btnstartstop2.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnstartstop2.UseVisualStyleBackColor = True - ' - 'btnstartstop1 - ' - Me.btnstartstop1.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.bell_go - Me.btnstartstop1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnstartstop1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnstartstop1.Location = New System.Drawing.Point(518, 59) - Me.btnstartstop1.Margin = New System.Windows.Forms.Padding(4) - Me.btnstartstop1.Name = "btnstartstop1" - Me.btnstartstop1.Size = New System.Drawing.Size(173, 25) - Me.btnstartstop1.TabIndex = 6 - Me.btnstartstop1.Text = "Überwachung starten" - Me.btnstartstop1.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnstartstop1.UseVisualStyleBackColor = True + Me.DataGridView1.Size = New System.Drawing.Size(234, 235) + Me.DataGridView1.TabIndex = 7 ' 'LayoutControl1 ' - Me.LayoutControl1.Controls.Add(Me.ToggleSwitch2) - Me.LayoutControl1.Controls.Add(Me.ToggleSwitch1) - Me.LayoutControl1.Controls.Add(Me.btnScanfolder) - Me.LayoutControl1.Controls.Add(Me.TextEdit1) + Me.LayoutControl1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.LayoutControl1.Controls.Add(Me.PictureEdit1) + Me.LayoutControl1.Controls.Add(Me.ToggleSwitchDropArea) Me.LayoutControl1.Controls.Add(Me.SimpleButton1) + Me.LayoutControl1.Controls.Add(Me.ToggleSwitchHotfolder) + Me.LayoutControl1.Controls.Add(Me.ToggleSwitchScanfolder) + Me.LayoutControl1.Controls.Add(Me.DataGridView1) + Me.LayoutControl1.Controls.Add(Me.btnScanfolder) + Me.LayoutControl1.Controls.Add(Me.TextEditScanfolder) Me.LayoutControl1.Controls.Add(Me.btnHotfolder) Me.LayoutControl1.Controls.Add(Me.TextEditHotfolder) - Me.LayoutControl1.Location = New System.Drawing.Point(357, 214) + 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(340, 205) + Me.LayoutControl1.Size = New System.Drawing.Size(798, 442) Me.LayoutControl1.TabIndex = 17 Me.LayoutControl1.Text = "LayoutControl1" ' + '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.Name = "SimpleButton1" + Me.SimpleButton1.Size = New System.Drawing.Size(258, 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.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7}) + 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(340, 205) + Me.Root.Size = New System.Drawing.Size(798, 442) Me.Root.TextVisible = False ' - 'TextEditHotfolder - ' - Me.TextEditHotfolder.Location = New System.Drawing.Point(96, 12) - Me.TextEditHotfolder.Name = "TextEditHotfolder" - Me.TextEditHotfolder.Size = New System.Drawing.Size(146, 20) - Me.TextEditHotfolder.StyleController = Me.LayoutControl1 - Me.TextEditHotfolder.TabIndex = 4 - ' - '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(234, 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(0, 138) + Me.EmptySpaceItem1.Location = New System.Drawing.Point(262, 382) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(320, 47) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(516, 40) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' - 'btnHotfolder - ' - Me.btnHotfolder.Location = New System.Drawing.Point(246, 12) - Me.btnHotfolder.Name = "btnHotfolder" - Me.btnHotfolder.Size = New System.Drawing.Size(82, 22) - Me.btnHotfolder.StyleController = Me.LayoutControl1 - Me.btnHotfolder.TabIndex = 5 - Me.btnHotfolder.Text = "..." - ' 'LayoutControlItem2 ' Me.LayoutControlItem2.Control = Me.btnHotfolder - Me.LayoutControlItem2.Location = New System.Drawing.Point(234, 0) + Me.LayoutControlItem2.Location = New System.Drawing.Point(565, 0) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(86, 26) + Me.LayoutControlItem2.Size = New System.Drawing.Size(213, 26) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem2.TextVisible = False ' - 'SimpleButton1 + 'LayoutControlItem5 ' - Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SimpleButton1.Location = New System.Drawing.Point(12, 38) - Me.SimpleButton1.Name = "SimpleButton1" - Me.SimpleButton1.Size = New System.Drawing.Size(316, 36) - Me.SimpleButton1.StyleController = Me.LayoutControl1 - Me.SimpleButton1.TabIndex = 6 - Me.SimpleButton1.Text = "Überwachung Hofolder starten" + 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.Control = Me.SimpleButton1 - Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 26) + 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(320, 40) + 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 ' - 'TextEdit1 + 'LayoutControlItem8 ' - Me.TextEdit1.Location = New System.Drawing.Point(96, 101) - Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Size = New System.Drawing.Size(146, 20) - Me.TextEdit1.StyleController = Me.LayoutControl1 - Me.TextEdit1.TabIndex = 7 + 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 ' - 'LayoutControlItem4 + 'StatusStrip1 ' - Me.LayoutControlItem4.Control = Me.TextEdit1 - Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 89) - Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Size = New System.Drawing.Size(234, 26) - Me.LayoutControlItem4.Text = "Ihr Scanfolder" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(72, 13) + 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" ' - 'btnScanfolder + 'tsinfo ' - Me.btnScanfolder.Location = New System.Drawing.Point(246, 101) - Me.btnScanfolder.Name = "btnScanfolder" - Me.btnScanfolder.Size = New System.Drawing.Size(82, 22) - Me.btnScanfolder.StyleController = Me.LayoutControl1 - Me.btnScanfolder.TabIndex = 8 - Me.btnScanfolder.Text = "..." + 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) ' - 'LayoutControlItem5 + 'ToggleSwitchHotfolder ' - Me.LayoutControlItem5.Control = Me.btnScanfolder - Me.LayoutControlItem5.Location = New System.Drawing.Point(234, 89) - Me.LayoutControlItem5.Name = "LayoutControlItem5" - Me.LayoutControlItem5.Size = New System.Drawing.Size(86, 26) - Me.LayoutControlItem5.Text = "..." - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem5.TextVisible = False + 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.StyleController = Me.LayoutControl1 + Me.ToggleSwitchHotfolder.TabIndex = 3 + ' + 'ToggleSwitchScanfolder + ' + Me.ToggleSwitchScanfolder.Location = New System.Drawing.Point(12, 87) + 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.StyleController = Me.LayoutControl1 + Me.ToggleSwitchScanfolder.TabIndex = 6 + ' + 'TextEditScanfolder ' - 'ToggleSwitch1 + Me.TextEditScanfolder.Location = New System.Drawing.Point(96, 61) + Me.TextEditScanfolder.Name = "TextEditScanfolder" + Me.TextEditScanfolder.Size = New System.Drawing.Size(477, 20) + Me.TextEditScanfolder.StyleController = Me.LayoutControl1 + Me.TextEditScanfolder.TabIndex = 4 ' - Me.ToggleSwitch1.Location = New System.Drawing.Point(12, 127) - Me.ToggleSwitch1.Name = "ToggleSwitch1" - Me.ToggleSwitch1.Properties.OffText = "Scanfolder überwachen" - Me.ToggleSwitch1.Properties.OnText = "Überwachung aktiv" - Me.ToggleSwitch1.Size = New System.Drawing.Size(316, 19) - Me.ToggleSwitch1.StyleController = Me.LayoutControl1 - Me.ToggleSwitch1.TabIndex = 9 + '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.StyleController = Me.LayoutControl1 + Me.TextEditHotfolder.TabIndex = 0 + ' + '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.Text = "Ihr Hotfolder" + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(72, 13) + ' + '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.Text = "Ihr Scanfolder" + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(72, 13) ' 'LayoutControlItem6 ' - Me.LayoutControlItem6.Control = Me.ToggleSwitch1 - Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 115) + 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(320, 23) + Me.LayoutControlItem6.Size = New System.Drawing.Size(778, 23) Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem6.TextVisible = False ' - 'ToggleSwitch2 - ' - Me.ToggleSwitch2.Location = New System.Drawing.Point(12, 78) - Me.ToggleSwitch2.Name = "ToggleSwitch2" - Me.ToggleSwitch2.Properties.OffText = "Überwachung starten" - Me.ToggleSwitch2.Properties.OnText = "Überwachung aktiv" - Me.ToggleSwitch2.Size = New System.Drawing.Size(316, 19) - Me.ToggleSwitch2.StyleController = Me.LayoutControl1 - Me.ToggleSwitch2.TabIndex = 10 - ' 'LayoutControlItem7 ' - Me.LayoutControlItem7.Control = Me.ToggleSwitch2 - Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 66) + 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(320, 23) + Me.LayoutControlItem7.Size = New System.Drawing.Size(778, 23) Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem7.TextVisible = False ' + 'ToggleSwitchDropArea + ' + 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 + ' + '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.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 + Me.LayoutControlItem11.AppearanceItemCaption.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center + 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.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize + Me.LayoutControlItem11.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem11.TextToControlDistance = 0 + Me.LayoutControlItem11.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(262, 284) + Me.LayoutControlGroup1.Text = "Blacklist Folderwatch-Files" + ' + 'LayoutControlGroup2 + ' + 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" + ' '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.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.LayoutControl1) - Me.Controls.Add(Me.Label8) - Me.Controls.Add(Me.DataGridView1) - Me.Controls.Add(Me.btnSaveExclusionFiles) - Me.Controls.Add(Me.btnstartstop2) - Me.Controls.Add(Me.btnstartstop1) - Me.Controls.Add(Me.Button2) - Me.Controls.Add(Me.Button1) - Me.Controls.Add(Me.txtScanFolderWatch) - Me.Controls.Add(Me.txtFolderWatch) - Me.Controls.Add(Me.Label2) - Me.Controls.Add(Me.Label1) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D Me.IconOptions.SvgImage = CType(resources.GetObject("frmGlobixBasicConfig.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.MaximizeBox = False @@ -378,50 +364,57 @@ Partial Class frmGlobixBasicConfig CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEditHotfolder.Properties, 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.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() + Me.StatusStrip1.ResumeLayout(False) + Me.StatusStrip1.PerformLayout() + 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.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ToggleSwitch1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ToggleSwitch2.Properties, 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.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents Label1 As Label - Friend WithEvents Label2 As Label - Friend WithEvents txtFolderWatch As TextBox - Friend WithEvents txtScanFolderWatch As TextBox - Friend WithEvents Button1 As Button - Friend WithEvents Button2 As Button Friend WithEvents OpenFileDialog1 As OpenFileDialog - Friend WithEvents btnstartstop1 As Button - Friend WithEvents btnstartstop2 As Button - Friend WithEvents Label8 As Label Friend WithEvents DataGridView1 As DataGridView - Friend WithEvents btnSaveExclusionFiles As Button Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl - Friend WithEvents ToggleSwitch2 As DevExpress.XtraEditors.ToggleSwitch - Friend WithEvents ToggleSwitch1 As DevExpress.XtraEditors.ToggleSwitch + Friend WithEvents ToggleSwitchHotfolder As DevExpress.XtraEditors.ToggleSwitch + Friend WithEvents ToggleSwitchScanfolder As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents btnScanfolder As DevExpress.XtraEditors.SimpleButton - Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit - Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton + Friend WithEvents TextEditScanfolder As DevExpress.XtraEditors.TextEdit Friend WithEvents btnHotfolder As DevExpress.XtraEditors.SimpleButton Friend WithEvents TextEditHotfolder As DevExpress.XtraEditors.TextEdit Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton + Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents StatusStrip1 As StatusStrip + Friend WithEvents tsinfo As ToolStripStatusLabel + Friend WithEvents ToggleSwitchDropArea As DevExpress.XtraEditors.ToggleSwitch + Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents PictureEdit1 As DevExpress.XtraEditors.PictureEdit + Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlGroup2 As DevExpress.XtraLayout.LayoutControlGroup End Class diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.resx b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.resx index 86113c7d..7747cb32 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.resx +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.resx @@ -125,22 +125,24 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPICAAAC77u/ + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMICAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku - QmxhY2t7ZmlsbDojNzI3MjcyO30KPC9zdHlsZT4NCiAgPGcgaWQ9Ik5vdFN0YXJ0ZWQiPg0KICAgIDxw - YXRoIGQ9Ik0xNiwxNC4yVjhoLTJ2Ni4yYy0xLjIsMC40LTIsMS41LTIsMi44YzAsMS43LDEuMywzLDMs - M3MzLTEuMywzLTNDMTgsMTUuNywxNy4yLDE0LjYsMTYsMTQuMnoiIGNsYXNzPSJCbGFjayIgLz4NCiAg - ICA8cGF0aCBkPSJNMTcuNyw0LjNDMTcuOSwzLjksMTgsMy41LDE4LDNjMC0xLjctMS4zLTMtMy0zcy0z - LDEuMy0zLDNjMCwwLjUsMC4xLDAuOSwwLjMsMS4zQzYuNCw1LjUsMiwxMC43LDIsMTcgICBjMCw3LjIs - NS44LDEzLDEzLDEzczEzLTUuOCwxMy0xM0MyOCwxMC43LDIzLjYsNS41LDE3LjcsNC4zeiBNMTUsMjhD - OC45LDI4LDQsMjMuMSw0LDE3UzguOSw2LDE1LDZzMTEsNC45LDExLDExUzIxLjEsMjgsMTUsMjh6IiBj - bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzczNzM3NDt9Cgku + WWVsbG93e2ZpbGw6I0ZDQjAxQjt9CgkuR3JlZW57ZmlsbDojMTI5QzQ5O30KCS5CbHVle2ZpbGw6IzM4 + N0NCNzt9CgkuUmVke2ZpbGw6I0QwMjEyNzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tk + aXNwbGF5Om5vbmU7ZmlsbDojNzM3Mzc0O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI3LDRoLTN2MTBI + OFY0SDVDNC40LDQsNCw0LjQsNCw1djIyYzAsMC42LDAuNCwxLDEsMWgyMmMwLjYsMCwxLTAuNCwxLTFW + NUMyOCw0LjQsMjcuNiw0LDI3LDR6IE0yNCwyNEg4di02ICBoMTZWMjR6IE0xMCw0djhoMTBWNEgxMHog + TTE0LDEwaC0yVjZoMlYxMHoiIGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs= + + 159, 17 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb index 687baae0..d46dbf9f 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb @@ -1,4 +1,5 @@ -Imports DigitalData.Modules.Logging +Imports DevExpress.XtraEditors +Imports DigitalData.Modules.Logging Public Class frmGlobixBasicConfig Private Logger As Logger @@ -13,25 +14,8 @@ Public Class frmGlobixBasicConfig End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - Dim fbdialog As New FolderBrowserDialog - If txtFolderWatch.Text <> "" Then - fbdialog.SelectedPath = txtFolderWatch.Text - End If - If fbdialog.ShowDialog() = DialogResult.OK Then - CheckFolder(fbdialog.SelectedPath, "DEFAULT") - End If - End Sub - Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click - Dim fbdialog As New FolderBrowserDialog - If txtScanFolderWatch.Text <> "" Then - fbdialog.SelectedPath = txtScanFolderWatch.Text - End If - If fbdialog.ShowDialog() = DialogResult.OK Then - CheckFolder(fbdialog.SelectedPath, "SCAN") - End If - End Sub + Sub CheckFolder(pMypath As String, FOLDER_TYPE As String) Try If pMypath = "" Then @@ -79,10 +63,10 @@ Public Class frmGlobixBasicConfig If FOLDER_TYPE = "SCAN" Then My.Application.Globix.CURRENT_SCAN_FOLDERWATCH = folderwatch - Me.txtScanFolderWatch.Text = My.Application.Globix.CURRENT_SCAN_FOLDERWATCH + Me.TextEditScanfolder.Text = My.Application.Globix.CURRENT_SCAN_FOLDERWATCH Else My.Application.Globix.CurrentFolderWatchPath = folderwatch - Me.txtFolderWatch.Text = My.Application.Globix.CurrentFolderWatchPath + Me.TextEditHotfolder.Text = My.Application.Globix.CurrentFolderWatchPath End If End If If My.Application.Globix.Folderwatchstarted = True And FOLDER_TYPE = "DEFAULT" Then @@ -106,114 +90,116 @@ Public Class frmGlobixBasicConfig If oFolderwatch IsNot Nothing Then My.Application.Globix.CurrentFolderWatchPath = oFolderwatch End If - Me.txtFolderWatch.Text = My.Application.Globix.CurrentFolderWatchPath + Me.TextEditHotfolder.Text = My.Application.Globix.CurrentFolderWatchPath Dim oSCANFolderwatch = My.DatabaseECM.GetScalarValue("SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & My.Application.User.UserId) If oSCANFolderwatch IsNot Nothing Then My.Application.Globix.CURRENT_SCAN_FOLDERWATCH = oSCANFolderwatch End If - Me.txtFolderWatch.Text = My.Application.Globix.CurrentFolderWatchPath - Me.txtScanFolderWatch.Text = My.Application.Globix.CURRENT_SCAN_FOLDERWATCH + Me.TextEditHotfolder.Text = My.Application.Globix.CurrentFolderWatchPath + Me.TextEditScanfolder.Text = My.Application.Globix.CURRENT_SCAN_FOLDERWATCH If Not ClassFolderwatcher.FWFolderWatcher Is Nothing Then If ClassFolderwatcher.FWFolderWatcher.EnableRaisingEvents = True Then - If My.Application.User.Language = "de-DE" Then - btnstartstop1.Text = "Überwachung stoppen" - Else - btnstartstop1.Text = "Stop hotfolder" - End If - - btnstartstop1.Image = My.Resources.bell_delete + ToggleSwitchScanfolder.IsOn = True Else - If My.Application.User.Language = "de-DE" Then - btnstartstop1.Text = "Überwachung starten" - Else - btnstartstop1.Text = "Start hotfolder" - End If - - btnstartstop1.Image = My.Resources.bell_go + ToggleSwitchScanfolder.IsOn = False End If Else - If My.Application.User.Language = "de-DE" Then - btnstartstop1.Text = "Überwachung starten" - Else - btnstartstop1.Text = "Start hotfolder" - End If - - - btnstartstop1.Image = My.Resources.bell_go + ToggleSwitchScanfolder.IsOn = False End If If Not ClassFolderwatcher.FWScan Is Nothing Then If ClassFolderwatcher.FWScan.EnableRaisingEvents = True Then - If My.Application.User.Language = "de-DE" Then - btnstartstop2.Text = "Überwachung stoppen" - Else - btnstartstop2.Text = "Stop hotfolder" - End If - - btnstartstop2.Image = My.Resources.bell_delete + ToggleSwitchScanfolder.IsOn = True Else - If My.Application.User.Language = "de-DE" Then - btnstartstop2.Text = "Überwachung starten" - Else - btnstartstop2.Text = "Stop hotfolder" - End If - - btnstartstop2.Image = My.Resources.bell_go + ToggleSwitchScanfolder.IsOn = False End If Else - If My.Application.User.Language = "de-DE" Then - btnstartstop2.Text = "Überwachung starten" - Else - btnstartstop2.Text = "Stop hotfolder" - End If - - btnstartstop2.Image = My.Resources.bell_go + ToggleSwitchScanfolder.IsOn = False End If oReload = False Me.DataGridView1.DataSource = My.Application.Globix.DTEXCLUDE_FILES + If My.Application.GlobixDropAreaStyle = "PROGRESSIVE" Then + Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW_DROP3 + ToggleSwitchDropArea.IsOn = False + Else + Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW_DROP2 + ToggleSwitchDropArea.IsOn = True + End If Catch ex As Exception End Try End Sub - Private Sub txtFolderWatch_TextChanged(sender As Object, e As EventArgs) Handles txtFolderWatch.TextChanged - If oReload = True Then Exit Sub - CheckFolder(txtFolderWatch.Text, "DEFAULT") - End Sub - Private Sub txtScanFolderWatch_TextChanged(sender As Object, e As EventArgs) Handles txtScanFolderWatch.TextChanged - If oReload = True Then Exit Sub - CheckFolder(txtScanFolderWatch.Text, "SCAN") + + + + Sub CheckFWSCAN_State() + Select Case clsFW.StartStop_FolderWatchSCAN() + Case 1 + ToggleSwitchHotfolder.IsOn = True + Case 0 + ToggleSwitchHotfolder.IsOn = False + End Select End Sub - Private Sub btnSaveExclusionFiles_Click(sender As Object, e As EventArgs) Handles btnSaveExclusionFiles.Click + Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click My.Application.Globix.DTEXCLUDE_FILES.AcceptChanges() My.Application.Globix.DTEXCLUDE_FILES.WriteXml(My.Application.Globix.PATH_FileExclusions) MsgBox("Changes saved.", MsgBoxStyle.Information) End Sub - Private Sub btnstartstop2_Click(sender As Object, e As EventArgs) Handles btnstartstop2.Click - If My.Application.Globix.CURRENT_SCAN_FOLDERWATCH <> "" Then - CheckFWSCAN_State() + + Private Sub btnScanfolder_Click(sender As Object, e As EventArgs) Handles btnScanfolder.Click + Dim fbdialog As New FolderBrowserDialog + If TextEditScanfolder.Text <> "" Then + fbdialog.SelectedPath = TextEditScanfolder.Text + End If + If fbdialog.ShowDialog() = DialogResult.OK Then + CheckFolder(fbdialog.SelectedPath, "SCAN") End If End Sub - Sub CheckFWSCAN_State() - Select Case clsFW.StartStop_FolderWatchSCAN() - Case 1 - If My.Application.User.Language = "de-DE" Then - btnstartstop2.Text = "Überwachung stoppen" - Else - btnstartstop2.Text = "Stop Hotfolder" - End If - btnstartstop2.Image = My.Resources.bell_delete - Case 0 - If My.Application.User.Language = "de-DE" Then - btnstartstop2.Text = "Überwachung starten" - Else - btnstartstop2.Text = "Start Hotfolder" - End If - btnstartstop2.Image = My.Resources.bell_go - End Select + + + Private Sub ToggleSwitch1_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchScanfolder.Toggled + Dim oToggle As ToggleSwitch = TryCast(sender, ToggleSwitch) + If oToggle.IsOn Then + If My.Application.Globix.CURRENT_SCAN_FOLDERWATCH <> "" Then + CheckFWSCAN_State() + End If + End If + + End Sub + + Private Sub btnHotfolder_Click(sender As Object, e As EventArgs) Handles btnHotfolder.Click + Dim fbdialog As New FolderBrowserDialog + If TextEditHotfolder.Text <> "" Then + fbdialog.SelectedPath = TextEditHotfolder.Text + End If + If fbdialog.ShowDialog() = DialogResult.OK Then + CheckFolder(fbdialog.SelectedPath, "DEFAULT") + End If + End Sub + + Private Sub ToggleSwitch1_Toggled_1(sender As Object, e As EventArgs) Handles ToggleSwitchDropArea.Toggled + Dim oToggle As ToggleSwitch = TryCast(sender, ToggleSwitch) + If oToggle.IsOn Then + Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW_DROP2 + Dim oUpd = $"UPDATE TBIDB_CATALOG_USER SET CHANGED_WHO = '{My.Application.User.UserName}', CAT_STRING = 'ALTERNATIVE' + WHERE USR_ID = {My.Application.User.UserId} AND CAT_TITLE = '{ClassConstants.USER_CATALOG_GLOBIX_DROPAREA}'" + If My.Database.ExecuteNonQuery(oUpd, DigitalData.Modules.EDMI.API.Constants.DatabaseType.IDB) = True Then + My.Application.GlobixDropAreaStyle = "ALTERNATIVE" + tsinfo.Text = "DropArea-Theme saved!" + End If + Else + Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW_DROP3 + Dim oUpd = $"UPDATE TBIDB_CATALOG_USER SET CHANGED_WHO = '{My.Application.User.UserName}', CAT_STRING = 'PROGRESSIVE' + WHERE USR_ID = {My.Application.User.UserId} AND CAT_TITLE = '{ClassConstants.USER_CATALOG_GLOBIX_DROPAREA}'" + If My.Database.ExecuteNonQuery(oUpd, DigitalData.Modules.EDMI.API.Constants.DatabaseType.IDB) = True Then + My.Application.GlobixDropAreaStyle = "PROGRESSIVE" + tsinfo.Text = "DropArea-Theme saved to progressive!" + End If + End If End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 14343c96..4a2bb023 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -1180,6 +1180,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property StatusAnnotations_Information_16xLG_color() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("StatusAnnotations_Information_16xLG_color", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index c87da5a9..519dc4d0 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -118,8 +118,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -151,6 +151,12 @@ ..\Resources\servermode.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -160,9 +166,6 @@ ..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\gear_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -181,21 +184,15 @@ ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\cancel.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_check5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -205,6 +202,9 @@ ..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\ZOO_FLOW_ sysicon_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -220,6 +220,9 @@ ..\Resources\CW_GEFUNDEN_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\Close_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -232,9 +235,6 @@ ..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\1_LOGO_ZOO_FLOW_DROP3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -265,56 +265,44 @@ ..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\del1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\scatterchartlabeloptions.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\properties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_check.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\editnames.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_addcircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\deletetable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_deletecircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -331,6 +319,9 @@ ..\Resources\ZooFlow_CW_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -340,17 +331,17 @@ ..\Resources\insertsheet.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\managedatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_edit2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\managedatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\scatterchartlabeloptions.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\managedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -364,8 +355,8 @@ ..\Resources\about3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_add1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -376,26 +367,32 @@ ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\actions_check6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\Hamburger_icon.svg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\bo_document.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_refresh.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -406,35 +403,35 @@ ..\Resources\save6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\deletetable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -442,11 +439,17 @@ ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\managedatasource2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -460,8 +463,8 @@ ..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -481,10 +484,10 @@ ..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\managedatasource2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/GUIs.ZooFlow/MyApplication.vb b/GUIs.ZooFlow/MyApplication.vb index 4877de5f..6b07924f 100644 --- a/GUIs.ZooFlow/MyApplication.vb +++ b/GUIs.ZooFlow/MyApplication.vb @@ -47,6 +47,7 @@ Namespace My Partial Friend Class MyApplication Public Property Skin As String = "" Public Property Palette As String = "" + Public Property GlobixDropAreaStyle As String = "PROGRESSIVE" Public Property Settings As New State.SettingsState Public Property User As New State.UserState diff --git a/GUIs.ZooFlow/Resources/StatusAnnotations_Information_16xLG_color.png b/GUIs.ZooFlow/Resources/StatusAnnotations_Information_16xLG_color.png new file mode 100644 index 0000000000000000000000000000000000000000..fc631e2b8adebc8f1ecb7133059f1074f329fea7 GIT binary patch literal 338 zcmV-Y0j>UtP)S` zFasu%8~!9bEAVdgd9S1}9qxhwD6#Wn>>Md3V8CJmI}84pZc&*gU}0dUA52|A6*Hz3 zCG|fH0)(WfmON>MD;Q#;t07*qoM6N<$g4*zlqyPW_ literal 0 HcmV?d00001 diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index a7b0784a..02194f61 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -986,6 +986,7 @@ + diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 33111977..16d304bd 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -46,14 +46,15 @@ Partial Class frmFlowForm Me.PictureBoxAbo = New System.Windows.Forms.PictureBox() Me.PictureBoxPM = New DevExpress.XtraEditors.SvgImageBox() Me.PictureBoxDragDrop = New System.Windows.Forms.PictureBox() + Me.PictureBoxSearch1 = New DevExpress.XtraEditors.SvgImageBox() Me.TimerFolderwatch = New System.Windows.Forms.Timer(Me.components) Me.pnlQuicksearch1 = New System.Windows.Forms.Panel() Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() Me.lblQuicksearch1 = New DevExpress.XtraEditors.LabelControl() Me.PictureBoxGlobix = New DevExpress.XtraEditors.SvgImageBox() - Me.PictureBoxSearch1 = New DevExpress.XtraEditors.SvgImageBox() Me.Panel1 = New System.Windows.Forms.Panel() + Me.Panel2 = New System.Windows.Forms.Panel() Me.PopupMenu1 = New DevExpress.XtraBars.PopupMenu(Me.components) Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) Me.Bar3 = New DevExpress.XtraBars.Bar() @@ -71,20 +72,20 @@ Partial Class frmFlowForm Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() - Me.Panel2 = New System.Windows.Forms.Panel() + Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem() Me.ContextMenuSystray.SuspendLayout() CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlQuicksearch1.SuspendLayout() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() + Me.Panel2.SuspendLayout() CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.Panel2.SuspendLayout() Me.SuspendLayout() ' 'SplashScreenManager @@ -116,7 +117,7 @@ Partial Class frmFlowForm 'TsiGlobixConfig ' Me.TsiGlobixConfig.Name = "TsiGlobixConfig" - Me.TsiGlobixConfig.Size = New System.Drawing.Size(178, 22) + Me.TsiGlobixConfig.Size = New System.Drawing.Size(180, 22) Me.TsiGlobixConfig.Text = "Grundeinstellungen" ' 'UserKonfigurationToolStripMenuItem @@ -213,6 +214,22 @@ Partial Class frmFlowForm Me.PictureBoxDragDrop.TabStop = False Me.ToolTip1.SetToolTip(Me.PictureBoxDragDrop, "Drag and Drop files here") ' + 'PictureBoxSearch1 + ' + Me.PictureBoxSearch1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.PictureBoxSearch1.Cursor = System.Windows.Forms.Cursors.Hand + Me.PictureBoxSearch1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) + Me.PictureBoxSearch1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark + Me.PictureBoxSearch1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox + Me.PictureBoxSearch1.Location = New System.Drawing.Point(54, 3) + Me.PictureBoxSearch1.Name = "PictureBoxSearch1" + Me.PictureBoxSearch1.Size = New System.Drawing.Size(90, 90) + Me.PictureBoxSearch1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Stretch + Me.PictureBoxSearch1.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_CW_DevExpress + Me.PictureBoxSearch1.TabIndex = 13 + Me.PictureBoxSearch1.Text = "SvgImageBox1" + Me.ToolTip1.SetToolTip(Me.PictureBoxSearch1, "FlowSearch öffnen") + ' 'TimerFolderwatch ' Me.TimerFolderwatch.Interval = 2000 @@ -279,22 +296,6 @@ Partial Class frmFlowForm Me.PictureBoxGlobix.Text = "SvgImageBox1" Me.PictureBoxGlobix.Visible = False ' - 'PictureBoxSearch1 - ' - Me.PictureBoxSearch1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.PictureBoxSearch1.Cursor = System.Windows.Forms.Cursors.Hand - Me.PictureBoxSearch1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) - Me.PictureBoxSearch1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark - Me.PictureBoxSearch1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxSearch1.Location = New System.Drawing.Point(54, 3) - Me.PictureBoxSearch1.Name = "PictureBoxSearch1" - Me.PictureBoxSearch1.Size = New System.Drawing.Size(90, 90) - Me.PictureBoxSearch1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Stretch - Me.PictureBoxSearch1.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_CW_DevExpress - Me.PictureBoxSearch1.TabIndex = 13 - Me.PictureBoxSearch1.Text = "SvgImageBox1" - Me.ToolTip1.SetToolTip(Me.PictureBoxSearch1, "FlowSearch öffnen") - ' 'Panel1 ' Me.Panel1.Controls.Add(Me.Panel2) @@ -305,6 +306,19 @@ Partial Class frmFlowForm Me.Panel1.Size = New System.Drawing.Size(202, 462) Me.Panel1.TabIndex = 18 ' + 'Panel2 + ' + Me.Panel2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Panel2.Controls.Add(Me.PictureBoxSearch1) + Me.Panel2.Controls.Add(Me.PictureBoxGlobix) + Me.Panel2.Controls.Add(Me.PictureBoxAbo) + Me.Panel2.Controls.Add(Me.PictureBoxPM) + Me.Panel2.Location = New System.Drawing.Point(3, 126) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(196, 330) + Me.Panel2.TabIndex = 17 + ' 'PopupMenu1 ' Me.PopupMenu1.Manager = Me.BarManager1 @@ -318,8 +332,8 @@ Partial Class frmFlowForm Me.BarManager1.DockControls.Add(Me.barDockControlLeft) Me.BarManager1.DockControls.Add(Me.barDockControlRight) Me.BarManager1.Form = Me - Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarSubItem1, Me.buttonExitZooflow, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem1, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8}) - Me.BarManager1.MaxItemId = 10 + Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarSubItem1, Me.buttonExitZooflow, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem1, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9}) + Me.BarManager1.MaxItemId = 11 Me.BarManager1.StatusBar = Me.Bar3 ' 'Bar3 @@ -344,7 +358,7 @@ Partial Class frmFlowForm Me.BarSubItem1.Caption = "Menu" Me.BarSubItem1.Id = 0 Me.BarSubItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.scatterchartlabeloptions - Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem6), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem7), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonExitZooflow)}) + Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem9), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem6), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem7), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonExitZooflow)}) Me.BarSubItem1.Name = "BarSubItem1" Me.BarSubItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' @@ -441,18 +455,12 @@ Partial Class frmFlowForm Me.BarButtonItem5.Id = 5 Me.BarButtonItem5.Name = "BarButtonItem5" ' - 'Panel2 + 'BarButtonItem9 ' - Me.Panel2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Panel2.Controls.Add(Me.PictureBoxSearch1) - Me.Panel2.Controls.Add(Me.PictureBoxGlobix) - Me.Panel2.Controls.Add(Me.PictureBoxAbo) - Me.Panel2.Controls.Add(Me.PictureBoxPM) - Me.Panel2.Location = New System.Drawing.Point(3, 126) - Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(196, 330) - Me.Panel2.TabIndex = 17 + Me.BarButtonItem9.Caption = "Einstellungen Globix" + Me.BarButtonItem9.Id = 10 + Me.BarButtonItem9.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem9.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem9.Name = "BarButtonItem9" ' 'frmFlowForm ' @@ -481,16 +489,16 @@ Partial Class frmFlowForm CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlQuicksearch1.ResumeLayout(False) Me.pnlQuicksearch1.PerformLayout() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) + Me.Panel2.ResumeLayout(False) CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() - Me.Panel2.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -539,4 +547,5 @@ Partial Class frmFlowForm Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem Friend WithEvents Panel2 As Panel + Friend WithEvents BarButtonItem9 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index ea541636..ea0bfb2d 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -1998,4 +1998,28 @@ 983, 17 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iUHJvcGVydGllcyI+DQogICAgPHBhdGggZD0iTTMwLDE4di00bC00LjQtMC43Yy0w + LjItMC44LTAuNS0xLjUtMC45LTIuMWwyLjYtMy42bC0yLjgtMi44bC0zLjYsMi42Yy0wLjctMC40LTEu + NC0wLjctMi4xLTAuOUwxOCwyaC00ICAgbC0wLjcsNC40Yy0wLjgsMC4yLTEuNSwwLjUtMi4xLDAuOUw3 + LjUsNC43TDQuNyw3LjVsMi42LDMuNmMtMC40LDAuNy0wLjcsMS40LTAuOSwyLjFMMiwxNHY0bDQuNCww + LjdjMC4yLDAuOCwwLjUsMS41LDAuOSwyLjEgICBsLTIuNiwzLjZsMi44LDIuOGwzLjYtMi42YzAuNyww + LjQsMS40LDAuNywyLjEsMC45TDE0LDMwaDRsMC43LTQuNGMwLjgtMC4yLDEuNS0wLjUsMi4xLTAuOWwz + LjYsMi42bDIuOC0yLjhsLTIuNi0zLjYgICBjMC40LTAuNywwLjctMS40LDAuOS0yLjFMMzAsMTh6IE0x + NiwyMGMtMi4yLDAtNC0xLjgtNC00YzAtMi4yLDEuOC00LDQtNHM0LDEuOCw0LDRDMjAsMTguMiwxOC4y + LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 9684fc2c..8cde35a6 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -508,7 +508,12 @@ Public Class frmFlowForm End Sub Private Sub frmFlowForm_DragEnter(sender As Object, e As DragEventArgs) Handles MyBase.DragEnter - PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP3 + If My.Application.GlobixDropAreaStyle = "PROGRESSIVE" Then + PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP3 + Else + PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP2 + End If + e.Effect = DragDropEffects.Copy Drag_Enter(sender, e) @@ -1236,5 +1241,9 @@ Public Class frmFlowForm frmConfigBasic.ShowDialog() Quicksearch1(True) End Sub + + Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem9.ItemClick + frmGlobixBasicConfig.ShowDialog() + End Sub End Class