From 93f5588e48f17e872c04c2b0dbaf40e09b8a80be Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 12 Jan 2021 15:15:07 +0100 Subject: [PATCH] Translate copy profile strings, add icon to messagebox, remove inplace editor for regex & add ribbon button instead --- .../ctrlApplicationAssignment.Designer.vb | 48 +------ .../ctrlApplicationAssignment.vb | 31 ++-- .../frmAdministration.Designer.vb | 134 ++++++++++-------- .../frmAdministration.resx | 95 +++++++++---- .../frmAdministration.vb | 10 +- app/DD_Clipboard_Searcher/frmMain.Designer.vb | 4 + app/DD_Clipboard_Searcher/frmMain.resx | 2 +- 7 files changed, 178 insertions(+), 146 deletions(-) diff --git a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.Designer.vb b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.Designer.vb index 1fc0101..e321f50 100644 --- a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.Designer.vb +++ b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.Designer.vb @@ -31,8 +31,6 @@ Partial Class ctrlApplicationAssignment Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() Me.colDESCRIPTION = New DevExpress.XtraGrid.Columns.GridColumn() Me.colREGEX = New DevExpress.XtraGrid.Columns.GridColumn() - Me.RepositoryItemRegexEdit = New DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit() - Me.RepositoryItemSpinEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemSpinEdit() Me.Label1 = New System.Windows.Forms.Label() Me.GridControl_Control = New DevExpress.XtraGrid.GridControl() Me.TBCW_PROF_REL_CONTROLBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -42,8 +40,6 @@ Partial Class ctrlApplicationAssignment Me.colDESCRIPTION1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.RepositoryItemButtonEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit() - Me.RepositoryItemPopupGalleryEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemPopupGalleryEdit() Me.Label2 = New System.Windows.Forms.Label() Me.TBCW_PROF_DOC_SEARCHBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GridControl3 = New DevExpress.XtraGrid.GridControl() @@ -64,13 +60,9 @@ Partial Class ctrlApplicationAssignment CType(Me.TBCW_PROF_REL_WINDOWBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView_Window, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemRegexEdit, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemSpinEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl_Control, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROF_REL_CONTROLBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView_Control, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemButtonEdit1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemPopupGalleryEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROF_DOC_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBCW_PROFILE_PROCESSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -104,7 +96,6 @@ Partial Class ctrlApplicationAssignment Me.GridControl_Window.Location = New System.Drawing.Point(0, 25) Me.GridControl_Window.MainView = Me.GridView_Window Me.GridControl_Window.Name = "GridControl_Window" - Me.GridControl_Window.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemRegexEdit, Me.RepositoryItemSpinEdit1}) Me.GridControl_Window.Size = New System.Drawing.Size(915, 279) Me.GridControl_Window.TabIndex = 66 Me.GridControl_Window.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView_Window}) @@ -147,25 +138,14 @@ Partial Class ctrlApplicationAssignment 'colREGEX ' Me.colREGEX.Caption = "Fenster Titel Regex" - Me.colREGEX.ColumnEdit = Me.RepositoryItemRegexEdit Me.colREGEX.FieldName = "REGEX" Me.colREGEX.Name = "colREGEX" + Me.colREGEX.OptionsColumn.AllowEdit = False + Me.colREGEX.OptionsColumn.ReadOnly = True Me.colREGEX.Visible = True Me.colREGEX.VisibleIndex = 1 Me.colREGEX.Width = 410 ' - 'RepositoryItemRegexEdit - ' - Me.RepositoryItemRegexEdit.AutoHeight = False - Me.RepositoryItemRegexEdit.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton()}) - Me.RepositoryItemRegexEdit.Name = "RepositoryItemRegexEdit" - ' - 'RepositoryItemSpinEdit1 - ' - Me.RepositoryItemSpinEdit1.AutoHeight = False - Me.RepositoryItemSpinEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.RepositoryItemSpinEdit1.Name = "RepositoryItemSpinEdit1" - ' 'Label1 ' Me.Label1.Dock = System.Windows.Forms.DockStyle.Top @@ -184,7 +164,6 @@ Partial Class ctrlApplicationAssignment Me.GridControl_Control.Location = New System.Drawing.Point(0, 25) Me.GridControl_Control.MainView = Me.GridView_Control Me.GridControl_Control.Name = "GridControl_Control" - Me.GridControl_Control.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemButtonEdit1, Me.RepositoryItemPopupGalleryEdit1}) Me.GridControl_Control.Size = New System.Drawing.Size(915, 302) Me.GridControl_Control.TabIndex = 69 Me.GridControl_Control.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView_Control}) @@ -199,7 +178,7 @@ Partial Class ctrlApplicationAssignment Me.GridView_Control.Appearance.EvenRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer)) Me.GridView_Control.Appearance.EvenRow.Options.UseBackColor = True Me.GridView_Control.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID1, Me.GridColumn3, Me.colDESCRIPTION1, Me.GridColumn1, Me.GridColumn2}) - Me.GridView_Control.CustomizationFormBounds = New System.Drawing.Rectangle(902, 520, 252, 236) + Me.GridView_Control.CustomizationFormBounds = New System.Drawing.Rectangle(828, 520, 252, 236) Me.GridView_Control.GridControl = Me.GridControl_Control Me.GridView_Control.Name = "GridView_Control" Me.GridView_Control.OptionsView.EnableAppearanceEvenRow = True @@ -246,18 +225,6 @@ Partial Class ctrlApplicationAssignment Me.GridColumn2.Visible = True Me.GridColumn2.VisibleIndex = 2 ' - 'RepositoryItemButtonEdit1 - ' - Me.RepositoryItemButtonEdit1.AutoHeight = False - Me.RepositoryItemButtonEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton()}) - Me.RepositoryItemButtonEdit1.Name = "RepositoryItemButtonEdit1" - ' - 'RepositoryItemPopupGalleryEdit1 - ' - Me.RepositoryItemPopupGalleryEdit1.AutoHeight = False - Me.RepositoryItemPopupGalleryEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.RepositoryItemPopupGalleryEdit1.Name = "RepositoryItemPopupGalleryEdit1" - ' 'Label2 ' Me.Label2.Dock = System.Windows.Forms.DockStyle.Top @@ -368,13 +335,9 @@ Partial Class ctrlApplicationAssignment CType(Me.TBCW_PROF_REL_WINDOWBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView_Window, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemRegexEdit, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemSpinEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl_Control, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBCW_PROF_REL_CONTROLBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView_Control, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemButtonEdit1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemPopupGalleryEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBCW_PROF_DOC_SEARCHBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBCW_PROFILE_PROCESSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() @@ -399,9 +362,7 @@ Partial Class ctrlApplicationAssignment Friend WithEvents MyDataset As MyDataset Friend WithEvents TBCW_PROF_REL_WINDOWTableAdapter As MyDatasetTableAdapters.TBCW_PROF_REL_WINDOWTableAdapter Friend WithEvents TBCW_PROF_REL_WINDOWBindingSource As BindingSource - Friend WithEvents RepositoryItemRegexEdit As DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit Friend WithEvents colGUID As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents RepositoryItemSpinEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemSpinEdit Friend WithEvents Label1 As Label Friend WithEvents Label2 As Label Friend WithEvents TBCW_PROF_DOC_SEARCHBindingSource As BindingSource @@ -410,11 +371,8 @@ Partial Class ctrlApplicationAssignment Friend WithEvents TBCW_PROF_REL_CONTROLBindingSource As BindingSource Friend WithEvents TBCW_PROF_REL_CONTROLTableAdapter As MyDatasetTableAdapters.TBCW_PROF_REL_CONTROLTableAdapter Friend WithEvents colDESCRIPTION1 As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents RepositoryItemRegexEdit2 As DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit - Friend WithEvents RepositoryItemButtonEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit Friend WithEvents colGUID1 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents GridColumn3 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents RepositoryItemPopupGalleryEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemPopupGalleryEdit End Class diff --git a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb index 7e1cc77..bb0f178 100644 --- a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb +++ b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb @@ -35,11 +35,6 @@ Public Class ctrlApplicationAssignment TBCW_PROF_REL_CONTROLTableAdapter.Connection.ConnectionString = MyConnectionString End Sub - Private Sub ctrlApplicationAssignment_Load(sender As Object, e As EventArgs) Handles Me.Load - AddHandler RepositoryItemRegexEdit.ButtonClick, AddressOf RepositoryItemRegexEdit_Click - AddHandler RepositoryItemButtonEdit1.ButtonClick, AddressOf RepositoryItemRegexEdit_Click - End Sub - Public Function AssignProfileID(ProfileId As Integer) As Boolean Try SelectedProfileId = ProfileId @@ -132,10 +127,10 @@ Public Class ctrlApplicationAssignment Dim oRowHandle As Integer = oGridView.FocusedRowHandle Dim oForm As New frmRegexEditor(oButtonEdit.EditValue) - If oForm.ShowDialog() = DialogResult.OK Then - oButtonEdit.EditValue = oForm.RegexString - End If - Console.WriteLine() + + 'If oForm.ShowDialog() = DialogResult.OK Then + 'oButtonEdit.EditValue = oForm.RegexString + 'End If End Sub Public Function Window_CreateAssignment(ProfileId As Integer) As Boolean @@ -201,6 +196,24 @@ Public Class ctrlApplicationAssignment End Try End Function + Public Function Window_EditRegex() As Boolean + Try + Dim oRow = GridView_Window.GetDataRow(GridView_Window.FocusedRowHandle) + + If oRow IsNot Nothing Then + Dim oRegex = oRow.Item("REGEX") + + Dim oForm As New frmRegexEditor(oRegex) + If oForm.ShowDialog() = DialogResult.OK Then + oRow.Item("REGEX") = oForm.RegexString + End If + End If + Catch ex As Exception + Logger.Error(ex) + Return False + End Try + End Function + Public Function Control_Load() As Boolean Try TBCW_PROF_REL_CONTROLTableAdapter.Fill(MyDataset.TBCW_PROF_REL_CONTROL, SelectedWindowId) diff --git a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb index eb99edd..98db1e6 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb @@ -150,6 +150,9 @@ Partial Class frmAdministration Me.LayoutControlItem38 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem39 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem40 = New DevExpress.XtraLayout.LayoutControlItem() + Me.SimpleLabelItem1 = New DevExpress.XtraLayout.SimpleLabelItem() + Me.SimpleSeparator2 = New DevExpress.XtraLayout.SimpleSeparator() + Me.SimpleSeparator3 = New DevExpress.XtraLayout.SimpleSeparator() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colTAB_TITLE = New DevExpress.XtraGrid.Columns.GridColumn() @@ -238,9 +241,7 @@ Partial Class frmAdministration Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() Me.SimpleSeparator1 = New DevExpress.XtraLayout.SimpleSeparator() Me.BehaviorManager1 = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components) - Me.SimpleLabelItem1 = New DevExpress.XtraLayout.SimpleLabelItem() - Me.SimpleSeparator2 = New DevExpress.XtraLayout.SimpleSeparator() - Me.SimpleSeparator3 = New DevExpress.XtraLayout.SimpleSeparator() + Me.BarButtonItem30 = New DevExpress.XtraBars.BarButtonItem() CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlProfiles, System.ComponentModel.ISupportInitialize).BeginInit() @@ -319,6 +320,9 @@ Partial Class frmAdministration CType(Me.LayoutControlItem38, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem39, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem40, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SimpleLabelItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SimpleSeparator2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SimpleSeparator3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPageData.SuspendLayout() @@ -389,9 +393,6 @@ Partial Class frmAdministration CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SimpleSeparator1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SimpleLabelItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SimpleSeparator2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SimpleSeparator3, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'TBCW_PROFILESBindingSource @@ -595,9 +596,9 @@ Partial Class frmAdministration 'RibbonControl2 ' Me.RibbonControl2.ExpandCollapseItem.Id = 0 - Me.RibbonControl2.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl2.ExpandCollapseItem, Me.RibbonControl2.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem15, Me.BarButtonItem18, Me.BarButtonItem19, Me.BarButtonItem20, Me.BarButtonItem21, Me.BarButtonItem22, Me.labelStatus, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.BarButtonItem26, Me.BarButtonItem27, Me.BarButtonItem28, Me.BarButtonItem29}) + Me.RibbonControl2.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl2.ExpandCollapseItem, Me.RibbonControl2.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem15, Me.BarButtonItem18, Me.BarButtonItem19, Me.BarButtonItem20, Me.BarButtonItem21, Me.BarButtonItem22, Me.labelStatus, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.BarButtonItem26, Me.BarButtonItem27, Me.BarButtonItem28, Me.BarButtonItem29, Me.BarButtonItem30}) Me.RibbonControl2.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl2.MaxItemId = 16 + Me.RibbonControl2.MaxItemId = 17 Me.RibbonControl2.Name = "RibbonControl2" Me.RibbonControl2.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage2, Me.RibbonPage1}) Me.RibbonControl2.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -872,6 +873,7 @@ Partial Class frmAdministration Me.RibbonGroup_Window.ItemLinks.Add(Me.BarButtonItem7) Me.RibbonGroup_Window.ItemLinks.Add(Me.BarButtonItem9) Me.RibbonGroup_Window.ItemLinks.Add(Me.BarButtonItem8) + Me.RibbonGroup_Window.ItemLinks.Add(Me.BarButtonItem30) Me.RibbonGroup_Window.Name = "RibbonGroup_Window" Me.RibbonGroup_Window.Text = "Fenster Zuordnung" ' @@ -1537,6 +1539,32 @@ Partial Class frmAdministration Me.LayoutControlItem40.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem40.TextVisible = False ' + 'SimpleLabelItem1 + ' + Me.SimpleLabelItem1.AllowHotTrack = False + Me.SimpleLabelItem1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleLabelItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.SimpleLabelItem1.Location = New System.Drawing.Point(303, 209) + Me.SimpleLabelItem1.Name = "SimpleLabelItem1" + Me.SimpleLabelItem1.Size = New System.Drawing.Size(591, 36) + Me.SimpleLabelItem1.Text = "Die folgenden Spalten müssen existieren: DocId (Eindeutige Id) und FULL_FILENAME " & + "(Absoluter Pfad)" + Me.SimpleLabelItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize + Me.SimpleLabelItem1.TextSize = New System.Drawing.Size(524, 32) + ' + 'SimpleSeparator2 + ' + Me.SimpleSeparator2.AllowHotTrack = False + Me.SimpleSeparator2.Location = New System.Drawing.Point(303, 245) + Me.SimpleSeparator2.Name = "SimpleSeparator2" + Me.SimpleSeparator2.Size = New System.Drawing.Size(591, 1) + ' + 'SimpleSeparator3 + ' + Me.SimpleSeparator3.AllowHotTrack = False + Me.SimpleSeparator3.Location = New System.Drawing.Point(0, 526) + Me.SimpleSeparator3.Name = "SimpleSeparator3" + Me.SimpleSeparator3.Size = New System.Drawing.Size(303, 1) + ' 'GridControl1 ' Me.GridControl1.DataSource = Me.TBCW_PROF_DOC_SEARCHBindingSource @@ -1577,7 +1605,7 @@ Partial Class frmAdministration Me.TabPageData.ImageOptions.SvgImage = CType(resources.GetObject("TabPageData.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageData.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.TabPageData.Name = "TabPageData" - Me.TabPageData.Size = New System.Drawing.Size(1114, 545) + Me.TabPageData.Size = New System.Drawing.Size(1114, 547) Me.TabPageData.Text = "Daten-Suchen" ' 'LayoutControlData @@ -1602,7 +1630,7 @@ Partial Class frmAdministration Me.LayoutControlData.Name = "LayoutControlData" Me.LayoutControlData.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(-714, 293, 650, 400) Me.LayoutControlData.Root = Me.LayoutControlGroup3 - Me.LayoutControlData.Size = New System.Drawing.Size(914, 545) + Me.LayoutControlData.Size = New System.Drawing.Size(914, 547) Me.LayoutControlData.TabIndex = 27 Me.LayoutControlData.Text = "LayoutControl3" ' @@ -1694,19 +1722,19 @@ Partial Class frmAdministration Me.MemoEdit3.Name = "MemoEdit3" Me.MemoEdit3.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit3.Properties.Appearance.Options.UseFont = True - Me.MemoEdit3.Size = New System.Drawing.Size(585, 219) + Me.MemoEdit3.Size = New System.Drawing.Size(585, 220) Me.MemoEdit3.StyleController = Me.LayoutControlData Me.MemoEdit3.TabIndex = 12 ' 'MemoEdit4 ' Me.MemoEdit4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "COUNT_COMMAND", True)) - Me.MemoEdit4.Location = New System.Drawing.Point(317, 319) + Me.MemoEdit4.Location = New System.Drawing.Point(317, 320) Me.MemoEdit4.MenuManager = Me.RibbonControl2 Me.MemoEdit4.Name = "MemoEdit4" Me.MemoEdit4.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit4.Properties.Appearance.Options.UseFont = True - Me.MemoEdit4.Size = New System.Drawing.Size(585, 214) + Me.MemoEdit4.Size = New System.Drawing.Size(585, 215) Me.MemoEdit4.StyleController = Me.LayoutControlData Me.MemoEdit4.TabIndex = 13 ' @@ -1761,7 +1789,7 @@ Partial Class frmAdministration ' 'ComboBoxEdit6 ' - Me.ComboBoxEdit6.Location = New System.Drawing.Point(445, 277) + Me.ComboBoxEdit6.Location = New System.Drawing.Point(445, 278) Me.ComboBoxEdit6.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit6.Name = "ComboBoxEdit6" Me.ComboBoxEdit6.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) @@ -1771,7 +1799,7 @@ Partial Class frmAdministration ' 'SimpleButton5 ' - Me.SimpleButton5.Location = New System.Drawing.Point(800, 277) + Me.SimpleButton5.Location = New System.Drawing.Point(800, 278) Me.SimpleButton5.Name = "SimpleButton5" Me.SimpleButton5.Size = New System.Drawing.Size(102, 22) Me.SimpleButton5.StyleController = Me.LayoutControlData @@ -1784,7 +1812,7 @@ Partial Class frmAdministration Me.LayoutControlGroup3.GroupBordersVisible = False Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem17, Me.LayoutControlItem16, Me.LayoutControlItem11, Me.LayoutControlItem12, Me.LayoutControlItem13, Me.LayoutControlItem21, Me.LayoutControlItem22, Me.EmptySpaceItem1, Me.LayoutControlItem23, Me.LayoutControlItem41, Me.LayoutControlItem42, Me.LayoutControlItem43, Me.LayoutControlItem44}) Me.LayoutControlGroup3.Name = "Root" - Me.LayoutControlGroup3.Size = New System.Drawing.Size(914, 545) + Me.LayoutControlGroup3.Size = New System.Drawing.Size(914, 547) Me.LayoutControlGroup3.TextVisible = False ' 'LayoutControlItem10 @@ -1872,7 +1900,7 @@ Partial Class frmAdministration Me.LayoutControlItem21.Control = Me.MemoEdit3 Me.LayoutControlItem21.Location = New System.Drawing.Point(305, 26) Me.LayoutControlItem21.Name = "LayoutControlItem21" - Me.LayoutControlItem21.Size = New System.Drawing.Size(589, 239) + Me.LayoutControlItem21.Size = New System.Drawing.Size(589, 240) Me.LayoutControlItem21.Text = "SQL für Suche:" Me.LayoutControlItem21.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem21.TextSize = New System.Drawing.Size(125, 13) @@ -1880,9 +1908,9 @@ Partial Class frmAdministration 'LayoutControlItem22 ' Me.LayoutControlItem22.Control = Me.MemoEdit4 - Me.LayoutControlItem22.Location = New System.Drawing.Point(305, 291) + Me.LayoutControlItem22.Location = New System.Drawing.Point(305, 292) Me.LayoutControlItem22.Name = "LayoutControlItem22" - Me.LayoutControlItem22.Size = New System.Drawing.Size(589, 234) + Me.LayoutControlItem22.Size = New System.Drawing.Size(589, 235) Me.LayoutControlItem22.Text = "SQL für Ergebnis Zählung:" Me.LayoutControlItem22.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem22.TextSize = New System.Drawing.Size(125, 13) @@ -1892,7 +1920,7 @@ Partial Class frmAdministration Me.EmptySpaceItem1.AllowHotTrack = False Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 198) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(305, 327) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(305, 329) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem23 @@ -1925,7 +1953,7 @@ Partial Class frmAdministration 'LayoutControlItem43 ' Me.LayoutControlItem43.Control = Me.ComboBoxEdit6 - Me.LayoutControlItem43.Location = New System.Drawing.Point(305, 265) + Me.LayoutControlItem43.Location = New System.Drawing.Point(305, 266) Me.LayoutControlItem43.Name = "LayoutControlItem43" Me.LayoutControlItem43.Size = New System.Drawing.Size(483, 26) Me.LayoutControlItem43.Text = "Platzhalter" @@ -1934,7 +1962,7 @@ Partial Class frmAdministration 'LayoutControlItem44 ' Me.LayoutControlItem44.Control = Me.SimpleButton5 - Me.LayoutControlItem44.Location = New System.Drawing.Point(788, 265) + Me.LayoutControlItem44.Location = New System.Drawing.Point(788, 266) Me.LayoutControlItem44.Name = "LayoutControlItem44" Me.LayoutControlItem44.Size = New System.Drawing.Size(106, 26) Me.LayoutControlItem44.TextSize = New System.Drawing.Size(0, 0) @@ -1948,7 +1976,7 @@ Partial Class frmAdministration Me.GridControl2.MainView = Me.GridView3 Me.GridControl2.MenuManager = Me.RibbonControl2 Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(200, 545) + Me.GridControl2.Size = New System.Drawing.Size(200, 547) Me.GridControl2.TabIndex = 11 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) ' @@ -1979,7 +2007,7 @@ Partial Class frmAdministration Me.TabPageProcessAssignment.ImageOptions.SvgImage = CType(resources.GetObject("TabPageProcessAssignment.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageProcessAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.TabPageProcessAssignment.Name = "TabPageProcessAssignment" - Me.TabPageProcessAssignment.Size = New System.Drawing.Size(1114, 545) + Me.TabPageProcessAssignment.Size = New System.Drawing.Size(1114, 547) Me.TabPageProcessAssignment.Text = "Anwendungs-Zuordnung" ' 'CtrlApplicationAssignment1 @@ -1991,7 +2019,7 @@ Partial Class frmAdministration Me.CtrlApplicationAssignment1.SelectedProcessId = 0 Me.CtrlApplicationAssignment1.SelectedProfileId = 0 Me.CtrlApplicationAssignment1.SelectedWindowId = 0 - Me.CtrlApplicationAssignment1.Size = New System.Drawing.Size(1114, 545) + Me.CtrlApplicationAssignment1.Size = New System.Drawing.Size(1114, 547) Me.CtrlApplicationAssignment1.TabIndex = 3 ' 'TabPageProfileAssignment @@ -2000,7 +2028,7 @@ Partial Class frmAdministration Me.TabPageProfileAssignment.ImageOptions.SvgImage = CType(resources.GetObject("TabPageProfileAssignment.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageProfileAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.TabPageProfileAssignment.Name = "TabPageProfileAssignment" - Me.TabPageProfileAssignment.Size = New System.Drawing.Size(1116, 571) + Me.TabPageProfileAssignment.Size = New System.Drawing.Size(1116, 573) Me.TabPageProfileAssignment.Text = "Profil-Zuordnung" ' 'XtraTabControl2 @@ -2009,7 +2037,7 @@ Partial Class frmAdministration Me.XtraTabControl2.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.SelectedTabPage = Me.TabPageGroupAssignment - Me.XtraTabControl2.Size = New System.Drawing.Size(1116, 571) + Me.XtraTabControl2.Size = New System.Drawing.Size(1116, 573) Me.XtraTabControl2.TabIndex = 0 Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageUserAssignment, Me.TabPageGroupAssignment}) ' @@ -2019,7 +2047,7 @@ Partial Class frmAdministration Me.TabPageGroupAssignment.ImageOptions.SvgImage = CType(resources.GetObject("TabPageGroupAssignment.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageGroupAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.TabPageGroupAssignment.Name = "TabPageGroupAssignment" - Me.TabPageGroupAssignment.Size = New System.Drawing.Size(1114, 545) + Me.TabPageGroupAssignment.Size = New System.Drawing.Size(1114, 547) Me.TabPageGroupAssignment.Text = "Gruppen-Zuordnung" ' 'SplitContainer2 @@ -2038,7 +2066,7 @@ Partial Class frmAdministration ' Me.SplitContainer2.Panel2.Controls.Add(Me.GridControlGroupNotInProfile) Me.SplitContainer2.Panel2.Controls.Add(Me.Label10) - Me.SplitContainer2.Size = New System.Drawing.Size(1114, 545) + Me.SplitContainer2.Size = New System.Drawing.Size(1114, 547) Me.SplitContainer2.SplitterDistance = 261 Me.SplitContainer2.TabIndex = 1 ' @@ -2112,7 +2140,7 @@ Partial Class frmAdministration Me.GridControlGroupNotInProfile.Location = New System.Drawing.Point(0, 25) Me.GridControlGroupNotInProfile.MainView = Me.GridViewGroupNotInProfile Me.GridControlGroupNotInProfile.Name = "GridControlGroupNotInProfile" - Me.GridControlGroupNotInProfile.Size = New System.Drawing.Size(1114, 255) + Me.GridControlGroupNotInProfile.Size = New System.Drawing.Size(1114, 257) Me.GridControlGroupNotInProfile.TabIndex = 1 Me.GridControlGroupNotInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewGroupNotInProfile}) ' @@ -2171,7 +2199,7 @@ Partial Class frmAdministration Me.TabPageUserAssignment.ImageOptions.SvgImage = CType(resources.GetObject("TabPageUserAssignment.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageUserAssignment.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.TabPageUserAssignment.Name = "TabPageUserAssignment" - Me.TabPageUserAssignment.Size = New System.Drawing.Size(1114, 542) + Me.TabPageUserAssignment.Size = New System.Drawing.Size(1114, 545) Me.TabPageUserAssignment.Text = "Benutzer-Zuordnung" ' 'SplitContainer1 @@ -2190,8 +2218,8 @@ Partial Class frmAdministration ' Me.SplitContainer1.Panel2.Controls.Add(Me.GridControlUserNotInProfile) Me.SplitContainer1.Panel2.Controls.Add(Me.Label2) - Me.SplitContainer1.Size = New System.Drawing.Size(1114, 542) - Me.SplitContainer1.SplitterDistance = 263 + Me.SplitContainer1.Size = New System.Drawing.Size(1114, 545) + Me.SplitContainer1.SplitterDistance = 264 Me.SplitContainer1.TabIndex = 99 ' 'GridControlUserInProfile @@ -2202,7 +2230,7 @@ Partial Class frmAdministration Me.GridControlUserInProfile.Location = New System.Drawing.Point(0, 25) Me.GridControlUserInProfile.MainView = Me.GridViewUserInProfile Me.GridControlUserInProfile.Name = "GridControlUserInProfile" - Me.GridControlUserInProfile.Size = New System.Drawing.Size(1114, 238) + Me.GridControlUserInProfile.Size = New System.Drawing.Size(1114, 239) Me.GridControlUserInProfile.TabIndex = 93 Me.GridControlUserInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserInProfile}) ' @@ -2285,7 +2313,7 @@ Partial Class frmAdministration Me.GridControlUserNotInProfile.Location = New System.Drawing.Point(0, 25) Me.GridControlUserNotInProfile.MainView = Me.GridViewUserNotInProfile Me.GridControlUserNotInProfile.Name = "GridControlUserNotInProfile" - Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(1114, 250) + Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(1114, 252) Me.GridControlUserNotInProfile.TabIndex = 96 Me.GridControlUserNotInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserNotInProfile}) ' @@ -2438,31 +2466,12 @@ Partial Class frmAdministration Me.SimpleSeparator1.Name = "SimpleSeparator1" Me.SimpleSeparator1.Size = New System.Drawing.Size(280, 2) ' - 'SimpleLabelItem1 - ' - Me.SimpleLabelItem1.AllowHotTrack = False - Me.SimpleLabelItem1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleLabelItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SimpleLabelItem1.Location = New System.Drawing.Point(303, 209) - Me.SimpleLabelItem1.Name = "SimpleLabelItem1" - Me.SimpleLabelItem1.Size = New System.Drawing.Size(591, 36) - Me.SimpleLabelItem1.Text = "Die folgenden Spalten müssen existieren: DocId (Eindeutige Id) und FULL_FILENAME " & - "(Absoluter Pfad)" - Me.SimpleLabelItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize - Me.SimpleLabelItem1.TextSize = New System.Drawing.Size(524, 32) - ' - 'SimpleSeparator2 - ' - Me.SimpleSeparator2.AllowHotTrack = False - Me.SimpleSeparator2.Location = New System.Drawing.Point(303, 245) - Me.SimpleSeparator2.Name = "SimpleSeparator2" - Me.SimpleSeparator2.Size = New System.Drawing.Size(591, 1) + 'BarButtonItem30 ' - 'SimpleSeparator3 - ' - Me.SimpleSeparator3.AllowHotTrack = False - Me.SimpleSeparator3.Location = New System.Drawing.Point(0, 526) - Me.SimpleSeparator3.Name = "SimpleSeparator3" - Me.SimpleSeparator3.Size = New System.Drawing.Size(303, 1) + Me.BarButtonItem30.Caption = "Regex bearbeiten" + Me.BarButtonItem30.Id = 16 + Me.BarButtonItem30.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem30.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem30.Name = "BarButtonItem30" ' 'frmAdministration ' @@ -2559,6 +2568,9 @@ Partial Class frmAdministration CType(Me.LayoutControlItem38, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem39, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem40, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SimpleLabelItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SimpleSeparator2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SimpleSeparator3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPageData.ResumeLayout(False) @@ -2629,9 +2641,6 @@ Partial Class frmAdministration CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SimpleSeparator1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SimpleLabelItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SimpleSeparator2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SimpleSeparator3, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -2853,4 +2862,5 @@ Partial Class frmAdministration Friend WithEvents SimpleLabelItem1 As DevExpress.XtraLayout.SimpleLabelItem Friend WithEvents SimpleSeparator2 As DevExpress.XtraLayout.SimpleSeparator Friend WithEvents SimpleSeparator3 As DevExpress.XtraLayout.SimpleSeparator + Friend WithEvents BarButtonItem30 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/DD_Clipboard_Searcher/frmAdministration.resx b/app/DD_Clipboard_Searcher/frmAdministration.resx index 86e73fb..c4eab3c 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.resx +++ b/app/DD_Clipboard_Searcher/frmAdministration.resx @@ -160,29 +160,6 @@ 578, 56 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkhvbWUiPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iOCwy - OCA4LDE4IDIsMTggMTYsNCAzMCwxOCAyNCwxOCAyNCwyOCAxOCwyOCAxOCwxOCAxNCwxOCAxNCwyOCAg - IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - - 17, 134 - - - 499, 134 - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z @@ -759,6 +736,75 @@ MC45LDIsMkMyNiwxOS4xLDI1LjEsMjAsMjQsMjB6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEoIAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iRGVmaW5lZE5hbWVVc2VJbkZvcm11bGEiIHN0eWxlPSJlbmFibGUtYmFj + a2dyb3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbHVle2Zp + bGw6IzExNzdENzt9CgkuQmxhY2t7ZmlsbDojNzI3MjcyO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTcs + MjBsLTctN1Y5bDctN2gyMmMwLjYsMCwxLDAuNCwxLDF2MTZjMCwwLjYtMC40LDEtMSwxaC04LjRsMC41 + LTJoMi4zSDI4VjRINy44TDIsOS44djIuM0w3LjgsMThoMy44aDEuNiAgbC0wLjQsMkg3eiBNNiwxMWMw + LDEuMSwwLjksMiwyLDJzMi0wLjksMi0yYzAtMS4xLTAuOS0yLTItMlM2LDkuOSw2LDExeiIgY2xhc3M9 + IkJsYWNrIiAvPg0KICA8cGF0aCBkPSJNMTkuOSwxNGgyLjNsLTAuNSwyaC0yLjNsLTIuMSw4LjdjLTAu + MywxLjItMC43LDIuMi0xLjIsM2MtMC42LDAuOC0xLjIsMS40LTIsMS44Yy0wLjcsMC40LTEuNiwwLjYt + Mi42LDAuNiAgYy0xLDAtMS44LTAuMi0yLjMtMC42Yy0wLjctMC41LTEtMS0xLTEuNmMwLTAuNSwwLjIt + MC45LDAuNS0xLjJjMC4zLTAuMywwLjctMC41LDEuMi0wLjVjMC4yLDAsMC40LDAsMC42LDAuMSAgYzAu + MiwwLjEsMC40LDAuMiwwLjYsMC4zYzAuMSwwLjEsMC4zLDAuMywwLjYsMC43YzAuMSwwLjIsMC4zLDAu + MywwLjQsMC4zYzAuMSwwLjEsMC4yLDAuMSwwLjQsMC4xYzAuNSwwLDAuOS0wLjYsMS4xLTEuN2wyLjIt + OS45ICBoLTEuN2wwLjQtMmgxLjdsMC40LTEuN2MwLjMtMS40LDEtMi40LDItMy4yYzEtMC44LDIuMy0x + LjEsNC0xLjFjMC44LDAsMS41LDAuMSwxLjksMC4zYzAuNSwwLjIsMC44LDAuNSwxLjEsMC44ICBjMC4z + LDAuNCwwLjQsMC43LDAuNCwxLjFjMCwwLjMtMC4xLDAuNi0wLjIsMC45Yy0wLjIsMC4zLTAuNCwwLjUt + MC42LDAuNmMtMC4zLDAuMS0wLjYsMC4yLTAuOSwwLjJjLTAuMywwLTAuNi0wLjEtMC45LTAuMiAgYy0w + LjMtMC4xLTAuNS0wLjMtMC44LTAuNmMtMC4zLTAuMy0wLjUtMC41LTAuNi0wLjZjLTAuMS0wLjEtMC4z + LTAuMS0wLjQtMC4xYy0wLjMsMC0wLjYsMC4xLTAuOCwwLjRjLTAuMSwwLjItMC4zLDAuNi0wLjQsMS4z + ICBMMTkuOSwxNHogTTIyLjUsMjIuM2wxLjIsMi40YzAuNy0wLjksMS4xLTEuNSwxLjMtMS43YzAuMy0w + LjMsMC42LTAuNSwxLTAuN3MwLjYtMC4yLDAuOS0wLjJjMC4zLDAsMC42LDAuMSwwLjgsMC4zICBzMC4z + LDAuNCwwLjMsMC43YzAsMC4yLDAsMC40LTAuMSwwLjVzLTAuMiwwLjMtMC4zLDAuNHMtMC4zLDAuMi0w + LjQsMC4yYy0wLjEsMC0wLjIsMC0wLjUsMC4xYy0wLjMsMC0wLjUsMC0wLjYsMC4xICBjLTAuMSwwLTAu + MiwwLjEtMC40LDAuMmMtMC4yLDAuMS0wLjMsMC4zLTAuNSwwLjRjLTAuMSwwLjEtMC4zLDAuNC0wLjgs + MS4xbDAuNCwwLjhjMC4zLDAuNiwwLjYsMS4xLDAuOCwxLjIgIGMwLjIsMC4yLDAuNCwwLjMsMC42LDAu + M2MwLjMsMCwwLjctMC4yLDEuMS0wLjZsMC44LDFjLTAuOSwwLjgtMS44LDEuMi0yLjcsMS4yYy0wLjQs + MC0wLjctMC4xLTEtMC4yYy0wLjMtMC4xLTAuNi0wLjMtMC44LTAuNiAgYy0wLjItMC4yLTAuNS0wLjYt + MC43LTEuMWwtMC40LTAuOWMtMC40LDAuNy0wLjgsMS4yLTEuMiwxLjZjLTAuNCwwLjQtMC44LDAuNy0x + LjEsMC45Yy0wLjMsMC4yLTAuNiwwLjItMC45LDAuMiAgYy0wLjIsMC0wLjQsMC0wLjYtMC4xYy0wLjEt + MC4xLTAuMy0wLjItMC40LTAuNEMxOCwyOS4zLDE4LDI5LjIsMTgsMjljMC0wLjIsMC4xLTAuNCwwLjIt + MC42YzAuMS0wLjIsMC4zLTAuMywwLjQtMC40ICBjMC4yLTAuMSwwLjUtMC4xLDAuOS0wLjFjMC4zLDAs + MC41LTAuMSwwLjctMC4yYzAuMi0wLjEsMC40LTAuMiwwLjYtMC41YzAuMi0wLjIsMC41LTAuNywxLTEu + NEwyMSwyNC4zaC0xLjFsMC4zLTEuNCAgYzAuNi0wLjEsMS4yLTAuMywxLjctMC42SDIyLjV6IiBjbGFz + cz0iQmx1ZSIgLz4NCjwvc3ZnPgs= + + + + 1024, 95 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkhvbWUiPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iOCwy + OCA4LDE4IDIsMTggMTYsNCAzMCwxOCAyNCwxOCAyNCwyOCAxOCwyOCAxOCwxOCAxNCwxOCAxNCwyOCAg + IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + 17, 134 + + + 499, 134 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z @@ -882,9 +928,6 @@ Zz4L - - 1024, 95 - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z diff --git a/app/DD_Clipboard_Searcher/frmAdministration.vb b/app/DD_Clipboard_Searcher/frmAdministration.vb index 0960992..e8e386c 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.vb @@ -386,7 +386,7 @@ Public Class frmAdministration Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick Dim swl = String.Format("EXEC PRCW_DELETE_PROFILE {0}", PROFILE_IDTextBox.Text) - Dim result As MsgBoxResult = MsgBox("Sind Sie sicher, dass Sie das Profil löschen wollen?", MsgBoxStyle.YesNo, Text) + Dim result As MsgBoxResult = MsgBox("Sind Sie sicher, dass Sie das Profil löschen wollen?", MsgBoxStyle.YesNo Or MsgBoxStyle.Question, Text) ' wenn Speichern ja If result = MsgBoxResult.Yes Then If Database.ExecuteNonQuery(swl) = True Then @@ -687,10 +687,10 @@ Public Class frmAdministration Dim oSQL As String = $"EXEC PRCW_COPY_PROFILE {PROFILE_IDTextBox.Text}, '{USER_USERNAME}'" If Database.ExecuteNonQuery(oSQL) = False Then - MsgBox("Could not duplicate the profile...Check the logfile!", MsgBoxStyle.Exclamation) + MsgBox("Profil konnte nicht kopiert werden! Mehr Informationen im Log.", MsgBoxStyle.Exclamation, Text) Else Refresh_ProfileScreen() - MsgBox("Profile has been duplicated. Please check the dependencies!", MsgBoxStyle.Information) + MsgBox("Profil kopiert! Bitte die Abhängigkeiten überprüfen!", MsgBoxStyle.Information, Text) End If End Sub @@ -886,4 +886,8 @@ Public Class frmAdministration CtrlApplicationAssignment1.Process_Load(PROFILE_IDTextBox.Text) End If End Sub + + Private Sub BarButtonItem30_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem30.ItemClick + CtrlApplicationAssignment1.Window_EditRegex() + End Sub End Class \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/frmMain.Designer.vb b/app/DD_Clipboard_Searcher/frmMain.Designer.vb index 0bc61e4..df13746 100644 --- a/app/DD_Clipboard_Searcher/frmMain.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmMain.Designer.vb @@ -71,8 +71,10 @@ Partial Class frmMain Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide + Me.RibbonControl1.ShowToolbarCustomizeItem = False Me.RibbonControl1.Size = New System.Drawing.Size(478, 66) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' 'lblUser ' @@ -88,6 +90,7 @@ Partial Class frmMain Me.lblVersion.Id = 2 Me.lblVersion.ImageOptions.SvgImage = CType(resources.GetObject("lblVersion.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.lblVersion.Name = "lblVersion" + Me.lblVersion.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' 'lblApplicationServer ' @@ -117,6 +120,7 @@ Partial Class frmMain Me.lblRefresh.Id = 6 Me.lblRefresh.ImageOptions.SvgImage = CType(resources.GetObject("lblRefresh.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.lblRefresh.Name = "lblRefresh" + Me.lblRefresh.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' 'RibbonPage1 ' diff --git a/app/DD_Clipboard_Searcher/frmMain.resx b/app/DD_Clipboard_Searcher/frmMain.resx index 1143c93..35ad437 100644 --- a/app/DD_Clipboard_Searcher/frmMain.resx +++ b/app/DD_Clipboard_Searcher/frmMain.resx @@ -4803,7 +4803,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU - CwAAAk1TRnQBSQFMAgEBBQEAAZgBAAGYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBQEAAaABAAGgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA