From dbe4abfb399bfeaaa6b25ad4c02f6d87f9500b04 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 25 Oct 2019 16:09:17 +0200 Subject: [PATCH] fixes --- .../ctrlApplicationAssignment.vb | 43 ++--- .../frmAdministration.Designer.vb | 178 +++++++++--------- .../frmAdministration.resx | 27 ++- .../frmAdministration.vb | 10 +- 4 files changed, 118 insertions(+), 140 deletions(-) diff --git a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb index 5d09d1c..72a58d0 100644 --- a/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb +++ b/app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb @@ -7,11 +7,10 @@ Imports DigitalData.Controls.RegexEditor Imports DigitalData.Modules.Windows.Window Public Class ctrlApplicationAssignment - Public AppSelectionString As String - Private Current_ProfileId As Integer - Private Current_WindowId As Integer - Private Current_ProcessGUID As Integer - Private Current_ControlId As Integer + Public SelectedProfileId As Integer = 0 + Public SelectedProcessId As Integer = 0 + Public SelectedWindowId As Integer = 0 + Public SelectedControlId As Integer = 0 Private Sub ctrlApplicationAssignment_Load(sender As Object, e As EventArgs) Handles Me.Load TBCW_PROFILE_PROCESSTableAdapter.Connection.ConnectionString = MyConnectionString @@ -24,7 +23,7 @@ Public Class ctrlApplicationAssignment Public Function AssignProfileID(ProfileId As Integer) As Boolean Try - Current_ProfileId = ProfileId + SelectedProfileId = ProfileId Return True Catch ex As Exception Logger.Error(ex) @@ -33,8 +32,6 @@ Public Class ctrlApplicationAssignment End Function Public Function Process_Load(ProfileId As Integer) As Boolean Try - - TBCW_PROFILE_PROCESSTableAdapter.Fill(MyDataset.TBCW_PROFILE_PROCESS, ProfileId) Return True Catch ex As Exception @@ -66,7 +63,7 @@ Public Class ctrlApplicationAssignment End If End If - Process_Load(Current_ProfileId) + Process_Load(SelectedProfileId) Return True Catch ex As Exception Logger.Error(ex) @@ -82,7 +79,7 @@ Public Class ctrlApplicationAssignment Dim oProcessId = GridViewProcessProfile.GetFocusedRowCellValue(GridViewProcessProfile.Columns("GUID")) Dim oSQL = String.Format("EXEC PRCW_DELETE_PROCESS {0}", oProcessId) If Database.ExecuteNonQuery(oSQL) Then - Process_Load(Current_ProfileId) + Process_Load(SelectedProfileId) Return True End If @@ -152,7 +149,7 @@ Public Class ctrlApplicationAssignment Dim oGuid = GridView_Window.GetFocusedRowCellValue(GridView_Window.Columns("GUID")) Dim oSQL = String.Format("EXEC PRCW_DELETE_WINDOW {0}", oGuid) If Database.ExecuteNonQuery(oSQL) Then - Process_Load(Current_ProfileId) + Process_Load(SelectedProfileId) Return True End If @@ -182,7 +179,7 @@ Public Class ctrlApplicationAssignment Public Function Control_Load() As Boolean Try - TBCW_PROF_REL_CONTROLTableAdapter.Fill(MyDataset.TBCW_PROF_REL_CONTROL, Current_WindowId) + TBCW_PROF_REL_CONTROLTableAdapter.Fill(MyDataset.TBCW_PROF_REL_CONTROL, SelectedWindowId) Return True Catch ex As Exception @@ -205,7 +202,7 @@ Public Class ctrlApplicationAssignment ,[BOTTOMLEFT_TOP],[BOTTOMLEFT_LEFT],[BOTTOMLEFT_RIGHT],[BOTTOMLEFT_BOTTOM] ,[BOTTOMRIGHT_TOP],[BOTTOMRIGHT_LEFT],[BOTTOMRIGHT_RIGHT],[BOTTOMRIGHT_BOTTOM] ) VALUES ( - {Current_WindowId}, 'Beispiel Beschreibung', '{oForm.ControlName}', '{Environment.UserName}', + {SelectedWindowId}, 'Beispiel Beschreibung', '{oForm.ControlName}', '{Environment.UserName}', {oForm.TopLeft.Top}, {oForm.TopLeft.Left}, {oForm.TopLeft.Right}, {oForm.TopLeft.Bottom}, {oForm.TopRight.Top}, {oForm.TopRight.Left}, {oForm.TopRight.Right}, {oForm.TopRight.Bottom}, {oForm.TopLeft.Top}, {oForm.TopLeft.Left}, {oForm.TopLeft.Right}, {oForm.TopLeft.Bottom}, @@ -299,7 +296,7 @@ Public Class ctrlApplicationAssignment [BOTTOMRIGHT_BOTTOM] = {oForm.BottomRight.Bottom}, [BOTTOMRIGHT_LEFT] = {oForm.BottomRight.Left}, [BOTTOMRIGHT_RIGHT] = {oForm.BottomRight.Right} - WHERE GUID = {Current_ControlId} + WHERE GUID = {SelectedControlId} " If Database.ExecuteNonQuery(oSql) = False Then @@ -360,11 +357,12 @@ Public Class ctrlApplicationAssignment Dim oSelectedRow As DataRow = GridViewProcessProfile.GetDataRow(e.FocusedRowHandle) Dim oProcessName As String = oSelectedRow.Item("PROC_NAME") - Dim oPRocessGUID = oSelectedRow.Item("GUID") - AppSelectionString = $"Selected Profile: {oPRocessGUID}-{oProcessName}" - CURRENT_PROCESSID = oPRocessGUID + Dim oProcessGUID = oSelectedRow.Item("GUID") + CURRENT_PROCESSID = oProcessGUID CURRENT_PROCESSNAME = oProcessName + SelectedProcessId = oProcessGUID + If Window_Load() = False Then MsgBox($"Error while loading windows for process {oProcessName}", vbCritical, "") End If @@ -384,27 +382,26 @@ Public Class ctrlApplicationAssignment Dim oSelectedRow As DataRow = GridView_Window.GetDataRow(e.FocusedRowHandle) Dim oWindowId As String = oSelectedRow.Item("GUID") - Current_WindowId = oWindowId - AppSelectionString = AppSelectionString & $" / WindowID: {oWindowId}" If Control_Load() = False Then MsgBox($"Error while loading controls for window {oWindowId}", vbCritical, "") End If + + SelectedWindowId = oWindowId Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical) End Try - End Sub Private Sub GridView_Control_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridView_Control.FocusedRowChanged If e.FocusedRowHandle < 0 Then - Current_ControlId = Nothing + SelectedControlId = Nothing Exit Sub End If Dim oSelectedRow As DataRow = GridView_Control.GetDataRow(e.FocusedRowHandle) Dim oControlGUID = oSelectedRow.Item("GUID") - Current_ControlId = oSelectedRow.Item("GUID") - AppSelectionString = AppSelectionString & $" - Selected ControlGUID: {oControlGUID}" + + SelectedControlId = oControlGUID End Sub End Class diff --git a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb index ef1fe3d..cc85e81 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb @@ -77,7 +77,6 @@ Partial Class frmAdministration Me.BarButtonItem24 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem25 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem() - Me.labelSelection = New DevExpress.XtraBars.BarStaticItem() Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonGroup_Profile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -397,7 +396,7 @@ Partial Class frmAdministration Me.colNAME.FieldName = "NAME" Me.colNAME.Name = "colNAME" Me.colNAME.Visible = True - Me.colNAME.VisibleIndex = 1 + Me.colNAME.VisibleIndex = 0 Me.colNAME.Width = 100 ' 'TBWH_UserBindingSource @@ -533,7 +532,7 @@ Partial Class frmAdministration ' Me.RibbonControl2.ApplicationButtonDropDownControl = Me.ApplicationMenu1 Me.RibbonControl2.ExpandCollapseItem.Id = 0 - Me.RibbonControl2.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl2.ExpandCollapseItem, 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.labelSelection, Me.BarButtonItem27}) + Me.RibbonControl2.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl2.ExpandCollapseItem, 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.RibbonControl2.Location = New System.Drawing.Point(0, 0) Me.RibbonControl2.MaxItemId = 14 Me.RibbonControl2.Name = "RibbonControl2" @@ -727,7 +726,7 @@ Partial Class frmAdministration ' 'labelStatus ' - Me.labelStatus.Caption = "BarStaticItem1" + Me.labelStatus.Caption = "labelStatus" Me.labelStatus.Id = 7 Me.labelStatus.ImageOptions.Image = CType(resources.GetObject("labelStatus.ImageOptions.Image"), System.Drawing.Image) Me.labelStatus.Name = "labelStatus" @@ -765,11 +764,6 @@ Partial Class frmAdministration Me.BarButtonItem26.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem26.ImageOptions.LargeImage"), System.Drawing.Image) Me.BarButtonItem26.Name = "BarButtonItem26" ' - 'labelSelection - ' - Me.labelSelection.Id = 12 - Me.labelSelection.Name = "labelSelection" - ' 'BarButtonItem27 ' Me.BarButtonItem27.Caption = "Zuordnung bearbeiten" @@ -858,7 +852,6 @@ Partial Class frmAdministration 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) - Me.RibbonStatusBar1.ItemLinks.Add(Me.labelSelection) Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 761) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl2 @@ -1076,7 +1069,7 @@ Partial Class frmAdministration Me.TabPageDocuments.Controls.Add(Me.GridControl1) Me.TabPageDocuments.ImageOptions.Image = CType(resources.GetObject("TabPageDocuments.ImageOptions.Image"), System.Drawing.Image) Me.TabPageDocuments.Name = "TabPageDocuments" - Me.TabPageDocuments.Size = New System.Drawing.Size(1192, 587) + Me.TabPageDocuments.Size = New System.Drawing.Size(1202, 587) Me.TabPageDocuments.Text = "Dokument-Suchen" ' 'LayoutControlDocs @@ -1097,7 +1090,7 @@ Partial Class frmAdministration Me.LayoutControlDocs.Name = "LayoutControlDocs" Me.LayoutControlDocs.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(-854, 328, 650, 400) Me.LayoutControlDocs.Root = Me.LayoutControlGroup2 - Me.LayoutControlDocs.Size = New System.Drawing.Size(992, 587) + Me.LayoutControlDocs.Size = New System.Drawing.Size(1002, 587) Me.LayoutControlDocs.TabIndex = 24 Me.LayoutControlDocs.Text = "LayoutControl2" ' @@ -1107,7 +1100,7 @@ Partial Class frmAdministration Me.CheckEdit3.Location = New System.Drawing.Point(12, 12) Me.CheckEdit3.Name = "CheckEdit3" Me.CheckEdit3.Properties.Caption = "Suche Aktiv" - Me.CheckEdit3.Size = New System.Drawing.Size(328, 19) + Me.CheckEdit3.Size = New System.Drawing.Size(331, 19) Me.CheckEdit3.StyleController = Me.LayoutControlDocs Me.CheckEdit3.TabIndex = 8 ' @@ -1117,27 +1110,27 @@ Partial Class frmAdministration Me.TextEdit17.Location = New System.Drawing.Point(12, 147) Me.TextEdit17.Name = "TextEdit17" Me.TextEdit17.Properties.ReadOnly = True - Me.TextEdit17.Size = New System.Drawing.Size(127, 20) + Me.TextEdit17.Size = New System.Drawing.Size(128, 20) Me.TextEdit17.StyleController = Me.LayoutControlDocs Me.TextEdit17.TabIndex = 4 ' 'TextEdit15 ' Me.TextEdit15.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHEN", True)) - Me.TextEdit15.Location = New System.Drawing.Point(143, 147) + Me.TextEdit15.Location = New System.Drawing.Point(144, 147) Me.TextEdit15.Name = "TextEdit15" Me.TextEdit15.Properties.ReadOnly = True - Me.TextEdit15.Size = New System.Drawing.Size(197, 20) + Me.TextEdit15.Size = New System.Drawing.Size(199, 20) Me.TextEdit15.StyleController = Me.LayoutControlDocs Me.TextEdit15.TabIndex = 5 ' 'TextEdit18 ' Me.TextEdit18.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit18.Location = New System.Drawing.Point(143, 187) + Me.TextEdit18.Location = New System.Drawing.Point(144, 187) Me.TextEdit18.Name = "TextEdit18" Me.TextEdit18.Properties.ReadOnly = True - Me.TextEdit18.Size = New System.Drawing.Size(197, 20) + Me.TextEdit18.Size = New System.Drawing.Size(199, 20) Me.TextEdit18.StyleController = Me.LayoutControlDocs Me.TextEdit18.TabIndex = 7 ' @@ -1147,7 +1140,7 @@ Partial Class frmAdministration Me.CHANGED_WHOTextBox2.Location = New System.Drawing.Point(12, 187) Me.CHANGED_WHOTextBox2.Name = "CHANGED_WHOTextBox2" Me.CHANGED_WHOTextBox2.Properties.ReadOnly = True - Me.CHANGED_WHOTextBox2.Size = New System.Drawing.Size(127, 20) + Me.CHANGED_WHOTextBox2.Size = New System.Drawing.Size(128, 20) Me.CHANGED_WHOTextBox2.StyleController = Me.LayoutControlDocs Me.CHANGED_WHOTextBox2.TabIndex = 6 ' @@ -1157,7 +1150,7 @@ Partial Class frmAdministration Me.TextEdit16.EditValue = "" Me.TextEdit16.Location = New System.Drawing.Point(140, 59) Me.TextEdit16.Name = "TextEdit16" - Me.TextEdit16.Size = New System.Drawing.Size(200, 20) + Me.TextEdit16.Size = New System.Drawing.Size(203, 20) Me.TextEdit16.StyleController = Me.LayoutControlDocs Me.TextEdit16.TabIndex = 9 ' @@ -1174,7 +1167,7 @@ Partial Class frmAdministration Me.LookUpEdit1.Properties.PopupSizeable = False Me.LookUpEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard Me.LookUpEdit1.Properties.ValueMember = "GUID" - Me.LookUpEdit1.Size = New System.Drawing.Size(200, 20) + Me.LookUpEdit1.Size = New System.Drawing.Size(203, 20) Me.LookUpEdit1.StyleController = Me.LayoutControlDocs Me.LookUpEdit1.TabIndex = 11 ' @@ -1186,22 +1179,22 @@ Partial Class frmAdministration 'MemoEdit5 ' Me.MemoEdit5.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "SQL_COMMAND", True)) - Me.MemoEdit5.Location = New System.Drawing.Point(344, 28) + Me.MemoEdit5.Location = New System.Drawing.Point(347, 28) Me.MemoEdit5.Name = "MemoEdit5" Me.MemoEdit5.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit5.Properties.Appearance.Options.UseFont = True - Me.MemoEdit5.Size = New System.Drawing.Size(636, 232) + Me.MemoEdit5.Size = New System.Drawing.Size(643, 232) Me.MemoEdit5.StyleController = Me.LayoutControlDocs Me.MemoEdit5.TabIndex = 12 ' 'MemoEdit6 ' Me.MemoEdit6.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "COUNT_COMMAND", True)) - Me.MemoEdit6.Location = New System.Drawing.Point(344, 280) + Me.MemoEdit6.Location = New System.Drawing.Point(347, 280) Me.MemoEdit6.Name = "MemoEdit6" Me.MemoEdit6.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit6.Properties.Appearance.Options.UseFont = True - Me.MemoEdit6.Size = New System.Drawing.Size(636, 295) + Me.MemoEdit6.Size = New System.Drawing.Size(643, 295) Me.MemoEdit6.StyleController = Me.LayoutControlDocs Me.MemoEdit6.TabIndex = 13 ' @@ -1211,7 +1204,7 @@ Partial Class frmAdministration Me.txtDOC_GUID.Location = New System.Drawing.Point(140, 35) Me.txtDOC_GUID.Name = "txtDOC_GUID" Me.txtDOC_GUID.Properties.ReadOnly = True - Me.txtDOC_GUID.Size = New System.Drawing.Size(200, 20) + Me.txtDOC_GUID.Size = New System.Drawing.Size(203, 20) Me.txtDOC_GUID.StyleController = Me.LayoutControlDocs Me.txtDOC_GUID.TabIndex = 14 ' @@ -1229,7 +1222,7 @@ Partial Class frmAdministration Me.TextEdit19.Properties.PopupSizeable = False Me.TextEdit19.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard Me.TextEdit19.Properties.ValueMember = "POSITION_INDEX" - Me.TextEdit19.Size = New System.Drawing.Size(200, 20) + Me.TextEdit19.Size = New System.Drawing.Size(203, 20) Me.TextEdit19.StyleController = Me.LayoutControlDocs Me.TextEdit19.TabIndex = 10 ' @@ -1244,7 +1237,7 @@ Partial Class frmAdministration Me.LayoutControlGroup2.GroupBordersVisible = False Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem29, Me.LayoutControlItem30, Me.LayoutControlItem31, Me.LayoutControlItem25, Me.LayoutControlItem27, Me.LayoutControlItem26, Me.EmptySpaceItem2, Me.LayoutControlItem33, Me.LayoutControlItem32, Me.LayoutControlItem34, Me.LayoutControlItem24, Me.LayoutControlItem28}) Me.LayoutControlGroup2.Name = "Root" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(992, 587) + Me.LayoutControlGroup2.Size = New System.Drawing.Size(1002, 587) Me.LayoutControlGroup2.TextVisible = False ' 'LayoutControlItem29 @@ -1253,7 +1246,7 @@ Partial Class frmAdministration Me.LayoutControlItem29.CustomizationFormText = "Titel:" Me.LayoutControlItem29.Location = New System.Drawing.Point(0, 47) Me.LayoutControlItem29.Name = "LayoutControlItem29" - Me.LayoutControlItem29.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem29.Size = New System.Drawing.Size(335, 24) Me.LayoutControlItem29.Text = "Titel:" Me.LayoutControlItem29.TextSize = New System.Drawing.Size(125, 13) ' @@ -1263,7 +1256,7 @@ Partial Class frmAdministration Me.LayoutControlItem30.CustomizationFormText = "Position:" Me.LayoutControlItem30.Location = New System.Drawing.Point(0, 71) Me.LayoutControlItem30.Name = "LayoutControlItem30" - Me.LayoutControlItem30.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem30.Size = New System.Drawing.Size(335, 24) Me.LayoutControlItem30.Text = "Position/Reihenfolge:" Me.LayoutControlItem30.TextSize = New System.Drawing.Size(125, 13) ' @@ -1273,7 +1266,7 @@ Partial Class frmAdministration Me.LayoutControlItem31.CustomizationFormText = "Verbindung:" Me.LayoutControlItem31.Location = New System.Drawing.Point(0, 95) Me.LayoutControlItem31.Name = "LayoutControlItem31" - Me.LayoutControlItem31.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem31.Size = New System.Drawing.Size(335, 24) Me.LayoutControlItem31.Text = "Datenbank-Verbindung:" Me.LayoutControlItem31.TextSize = New System.Drawing.Size(125, 13) ' @@ -1283,7 +1276,7 @@ Partial Class frmAdministration Me.LayoutControlItem25.CustomizationFormText = "layoutControlItem1" Me.LayoutControlItem25.Location = New System.Drawing.Point(0, 119) Me.LayoutControlItem25.Name = "LayoutControlItem25" - Me.LayoutControlItem25.Size = New System.Drawing.Size(131, 40) + Me.LayoutControlItem25.Size = New System.Drawing.Size(132, 40) Me.LayoutControlItem25.Text = "Erstellt wer:" Me.LayoutControlItem25.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem25.TextSize = New System.Drawing.Size(125, 13) @@ -1292,9 +1285,9 @@ Partial Class frmAdministration ' Me.LayoutControlItem27.Control = Me.TextEdit18 Me.LayoutControlItem27.CustomizationFormText = "layoutControlItem4" - Me.LayoutControlItem27.Location = New System.Drawing.Point(131, 159) + Me.LayoutControlItem27.Location = New System.Drawing.Point(132, 159) Me.LayoutControlItem27.Name = "LayoutControlItem27" - Me.LayoutControlItem27.Size = New System.Drawing.Size(201, 40) + Me.LayoutControlItem27.Size = New System.Drawing.Size(203, 40) Me.LayoutControlItem27.Text = "Geändert wann:" Me.LayoutControlItem27.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem27.TextSize = New System.Drawing.Size(125, 13) @@ -1303,9 +1296,9 @@ Partial Class frmAdministration ' Me.LayoutControlItem26.Control = Me.TextEdit15 Me.LayoutControlItem26.CustomizationFormText = "layoutControlItem2" - Me.LayoutControlItem26.Location = New System.Drawing.Point(131, 119) + Me.LayoutControlItem26.Location = New System.Drawing.Point(132, 119) Me.LayoutControlItem26.Name = "LayoutControlItem26" - Me.LayoutControlItem26.Size = New System.Drawing.Size(201, 40) + Me.LayoutControlItem26.Size = New System.Drawing.Size(203, 40) Me.LayoutControlItem26.Text = "Erstellt wann:" Me.LayoutControlItem26.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem26.TextSize = New System.Drawing.Size(125, 13) @@ -1315,16 +1308,16 @@ Partial Class frmAdministration Me.EmptySpaceItem2.AllowHotTrack = False Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 199) Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(332, 368) + Me.EmptySpaceItem2.Size = New System.Drawing.Size(335, 368) Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem33 ' Me.LayoutControlItem33.Control = Me.MemoEdit6 Me.LayoutControlItem33.CustomizationFormText = "SQL für Ergebnis Zählung:" - Me.LayoutControlItem33.Location = New System.Drawing.Point(332, 252) + Me.LayoutControlItem33.Location = New System.Drawing.Point(335, 252) Me.LayoutControlItem33.Name = "LayoutControlItem33" - Me.LayoutControlItem33.Size = New System.Drawing.Size(640, 315) + Me.LayoutControlItem33.Size = New System.Drawing.Size(647, 315) Me.LayoutControlItem33.Text = "SQL für Ergebnis Zählung:" Me.LayoutControlItem33.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem33.TextSize = New System.Drawing.Size(125, 13) @@ -1333,9 +1326,9 @@ Partial Class frmAdministration ' Me.LayoutControlItem32.Control = Me.MemoEdit5 Me.LayoutControlItem32.CustomizationFormText = "SQL für Suche:" - Me.LayoutControlItem32.Location = New System.Drawing.Point(332, 0) + Me.LayoutControlItem32.Location = New System.Drawing.Point(335, 0) Me.LayoutControlItem32.Name = "LayoutControlItem32" - Me.LayoutControlItem32.Size = New System.Drawing.Size(640, 252) + Me.LayoutControlItem32.Size = New System.Drawing.Size(647, 252) Me.LayoutControlItem32.Text = "SQL für Suche:" Me.LayoutControlItem32.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem32.TextSize = New System.Drawing.Size(125, 13) @@ -1346,7 +1339,7 @@ Partial Class frmAdministration Me.LayoutControlItem34.CustomizationFormText = "ID:" Me.LayoutControlItem34.Location = New System.Drawing.Point(0, 23) Me.LayoutControlItem34.Name = "LayoutControlItem34" - Me.LayoutControlItem34.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem34.Size = New System.Drawing.Size(335, 24) Me.LayoutControlItem34.Text = "ID:" Me.LayoutControlItem34.TextSize = New System.Drawing.Size(125, 13) ' @@ -1356,7 +1349,7 @@ Partial Class frmAdministration Me.LayoutControlItem24.CustomizationFormText = "LayoutControlItem10" Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem24.Name = "LayoutControlItem24" - Me.LayoutControlItem24.Size = New System.Drawing.Size(332, 23) + Me.LayoutControlItem24.Size = New System.Drawing.Size(335, 23) Me.LayoutControlItem24.Text = "LayoutControlItem10" Me.LayoutControlItem24.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem24.TextVisible = False @@ -1367,7 +1360,7 @@ Partial Class frmAdministration Me.LayoutControlItem28.CustomizationFormText = "layoutControlItem3" Me.LayoutControlItem28.Location = New System.Drawing.Point(0, 159) Me.LayoutControlItem28.Name = "LayoutControlItem28" - Me.LayoutControlItem28.Size = New System.Drawing.Size(131, 40) + Me.LayoutControlItem28.Size = New System.Drawing.Size(132, 40) Me.LayoutControlItem28.Text = "Geändert wer:" Me.LayoutControlItem28.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem28.TextSize = New System.Drawing.Size(125, 13) @@ -1411,7 +1404,7 @@ Partial Class frmAdministration Me.TabPageData.Controls.Add(Me.GridControl2) Me.TabPageData.ImageOptions.Image = CType(resources.GetObject("TabPageData.ImageOptions.Image"), System.Drawing.Image) Me.TabPageData.Name = "TabPageData" - Me.TabPageData.Size = New System.Drawing.Size(1192, 587) + Me.TabPageData.Size = New System.Drawing.Size(1202, 587) Me.TabPageData.Text = "Daten-Suchen" ' 'LayoutControlData @@ -1432,7 +1425,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(992, 587) + Me.LayoutControlData.Size = New System.Drawing.Size(1002, 587) Me.LayoutControlData.TabIndex = 26 Me.LayoutControlData.Text = "LayoutControl3" ' @@ -1442,17 +1435,17 @@ Partial Class frmAdministration Me.TextEdit12.Location = New System.Drawing.Point(12, 147) Me.TextEdit12.Name = "TextEdit12" Me.TextEdit12.Properties.ReadOnly = True - Me.TextEdit12.Size = New System.Drawing.Size(127, 20) + Me.TextEdit12.Size = New System.Drawing.Size(128, 20) Me.TextEdit12.StyleController = Me.LayoutControlData Me.TextEdit12.TabIndex = 4 ' 'TextEdit13 ' Me.TextEdit13.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "ADDED_WHEN", True)) - Me.TextEdit13.Location = New System.Drawing.Point(143, 147) + Me.TextEdit13.Location = New System.Drawing.Point(144, 147) Me.TextEdit13.Name = "TextEdit13" Me.TextEdit13.Properties.ReadOnly = True - Me.TextEdit13.Size = New System.Drawing.Size(197, 20) + Me.TextEdit13.Size = New System.Drawing.Size(199, 20) Me.TextEdit13.StyleController = Me.LayoutControlData Me.TextEdit13.TabIndex = 5 ' @@ -1462,17 +1455,17 @@ Partial Class frmAdministration Me.CHANGED_WHOTextBox1.Location = New System.Drawing.Point(12, 187) Me.CHANGED_WHOTextBox1.Name = "CHANGED_WHOTextBox1" Me.CHANGED_WHOTextBox1.Properties.ReadOnly = True - Me.CHANGED_WHOTextBox1.Size = New System.Drawing.Size(127, 20) + Me.CHANGED_WHOTextBox1.Size = New System.Drawing.Size(128, 20) Me.CHANGED_WHOTextBox1.StyleController = Me.LayoutControlData Me.CHANGED_WHOTextBox1.TabIndex = 6 ' 'TextEdit11 ' Me.TextEdit11.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit11.Location = New System.Drawing.Point(143, 187) + Me.TextEdit11.Location = New System.Drawing.Point(144, 187) Me.TextEdit11.Name = "TextEdit11" Me.TextEdit11.Properties.ReadOnly = True - Me.TextEdit11.Size = New System.Drawing.Size(197, 20) + Me.TextEdit11.Size = New System.Drawing.Size(199, 20) Me.TextEdit11.StyleController = Me.LayoutControlData Me.TextEdit11.TabIndex = 7 ' @@ -1483,7 +1476,7 @@ Partial Class frmAdministration Me.CheckEdit2.MenuManager = Me.RibbonControl2 Me.CheckEdit2.Name = "CheckEdit2" Me.CheckEdit2.Properties.Caption = "Suche Aktiv" - Me.CheckEdit2.Size = New System.Drawing.Size(328, 19) + Me.CheckEdit2.Size = New System.Drawing.Size(331, 19) Me.CheckEdit2.StyleController = Me.LayoutControlData Me.CheckEdit2.TabIndex = 8 ' @@ -1494,7 +1487,7 @@ Partial Class frmAdministration Me.TextEdit9.Location = New System.Drawing.Point(140, 59) Me.TextEdit9.MenuManager = Me.RibbonControl2 Me.TextEdit9.Name = "TextEdit9" - Me.TextEdit9.Size = New System.Drawing.Size(200, 20) + Me.TextEdit9.Size = New System.Drawing.Size(203, 20) Me.TextEdit9.StyleController = Me.LayoutControlData Me.TextEdit9.TabIndex = 9 ' @@ -1512,31 +1505,31 @@ Partial Class frmAdministration Me.ComboBoxEdit2.Properties.PopupSizeable = False Me.ComboBoxEdit2.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard Me.ComboBoxEdit2.Properties.ValueMember = "GUID" - Me.ComboBoxEdit2.Size = New System.Drawing.Size(200, 20) + Me.ComboBoxEdit2.Size = New System.Drawing.Size(203, 20) Me.ComboBoxEdit2.StyleController = Me.LayoutControlData Me.ComboBoxEdit2.TabIndex = 11 ' 'MemoEdit3 ' Me.MemoEdit3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "SQL_COMMAND", True)) - Me.MemoEdit3.Location = New System.Drawing.Point(344, 28) + Me.MemoEdit3.Location = New System.Drawing.Point(347, 28) Me.MemoEdit3.MenuManager = Me.RibbonControl2 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(636, 233) + Me.MemoEdit3.Size = New System.Drawing.Size(643, 233) 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(344, 281) + Me.MemoEdit4.Location = New System.Drawing.Point(347, 281) 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(636, 294) + Me.MemoEdit4.Size = New System.Drawing.Size(643, 294) Me.MemoEdit4.StyleController = Me.LayoutControlData Me.MemoEdit4.TabIndex = 13 ' @@ -1547,7 +1540,7 @@ Partial Class frmAdministration Me.txtDATAGUID.MenuManager = Me.RibbonControl2 Me.txtDATAGUID.Name = "txtDATAGUID" Me.txtDATAGUID.Properties.ReadOnly = True - Me.txtDATAGUID.Size = New System.Drawing.Size(200, 20) + Me.txtDATAGUID.Size = New System.Drawing.Size(203, 20) Me.txtDATAGUID.StyleController = Me.LayoutControlData Me.txtDATAGUID.TabIndex = 14 ' @@ -1566,7 +1559,7 @@ Partial Class frmAdministration Me.TextEdit10.Properties.PopupSizeable = False Me.TextEdit10.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard Me.TextEdit10.Properties.ValueMember = "POSITION_INDEX" - Me.TextEdit10.Size = New System.Drawing.Size(200, 20) + Me.TextEdit10.Size = New System.Drawing.Size(203, 20) Me.TextEdit10.StyleController = Me.LayoutControlData Me.TextEdit10.TabIndex = 10 ' @@ -1576,7 +1569,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.LayoutControlGroup3.Name = "Root" - Me.LayoutControlGroup3.Size = New System.Drawing.Size(992, 587) + Me.LayoutControlGroup3.Size = New System.Drawing.Size(1002, 587) Me.LayoutControlGroup3.TextVisible = False ' 'LayoutControlItem10 @@ -1584,7 +1577,7 @@ Partial Class frmAdministration Me.LayoutControlItem10.Control = Me.CheckEdit2 Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem10.Name = "LayoutControlItem10" - Me.LayoutControlItem10.Size = New System.Drawing.Size(332, 23) + Me.LayoutControlItem10.Size = New System.Drawing.Size(335, 23) Me.LayoutControlItem10.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem10.TextVisible = False ' @@ -1594,7 +1587,7 @@ Partial Class frmAdministration Me.LayoutControlItem14.CustomizationFormText = "layoutControlItem1" Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 119) Me.LayoutControlItem14.Name = "LayoutControlItem14" - Me.LayoutControlItem14.Size = New System.Drawing.Size(131, 40) + Me.LayoutControlItem14.Size = New System.Drawing.Size(132, 40) Me.LayoutControlItem14.Text = "Erstellt wer:" Me.LayoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem14.TextSize = New System.Drawing.Size(125, 13) @@ -1603,9 +1596,9 @@ Partial Class frmAdministration ' Me.LayoutControlItem15.Control = Me.TextEdit13 Me.LayoutControlItem15.CustomizationFormText = "layoutControlItem2" - Me.LayoutControlItem15.Location = New System.Drawing.Point(131, 119) + Me.LayoutControlItem15.Location = New System.Drawing.Point(132, 119) Me.LayoutControlItem15.Name = "LayoutControlItem15" - Me.LayoutControlItem15.Size = New System.Drawing.Size(201, 40) + Me.LayoutControlItem15.Size = New System.Drawing.Size(203, 40) Me.LayoutControlItem15.Text = "Erstellt wann:" Me.LayoutControlItem15.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem15.TextSize = New System.Drawing.Size(125, 13) @@ -1614,9 +1607,9 @@ Partial Class frmAdministration ' Me.LayoutControlItem17.Control = Me.TextEdit11 Me.LayoutControlItem17.CustomizationFormText = "layoutControlItem4" - Me.LayoutControlItem17.Location = New System.Drawing.Point(131, 159) + Me.LayoutControlItem17.Location = New System.Drawing.Point(132, 159) Me.LayoutControlItem17.Name = "LayoutControlItem17" - Me.LayoutControlItem17.Size = New System.Drawing.Size(201, 40) + Me.LayoutControlItem17.Size = New System.Drawing.Size(203, 40) Me.LayoutControlItem17.Text = "Geändert wann:" Me.LayoutControlItem17.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem17.TextSize = New System.Drawing.Size(125, 13) @@ -1627,7 +1620,7 @@ Partial Class frmAdministration Me.LayoutControlItem16.CustomizationFormText = "layoutControlItem3" Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 159) Me.LayoutControlItem16.Name = "LayoutControlItem16" - Me.LayoutControlItem16.Size = New System.Drawing.Size(131, 40) + Me.LayoutControlItem16.Size = New System.Drawing.Size(132, 40) Me.LayoutControlItem16.Text = "Geändert wer:" Me.LayoutControlItem16.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem16.TextSize = New System.Drawing.Size(125, 13) @@ -1637,7 +1630,7 @@ Partial Class frmAdministration Me.LayoutControlItem11.Control = Me.TextEdit9 Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 47) Me.LayoutControlItem11.Name = "LayoutControlItem11" - Me.LayoutControlItem11.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem11.Size = New System.Drawing.Size(335, 24) Me.LayoutControlItem11.Text = "Titel:" Me.LayoutControlItem11.TextSize = New System.Drawing.Size(125, 13) ' @@ -1646,7 +1639,7 @@ Partial Class frmAdministration Me.LayoutControlItem12.Control = Me.TextEdit10 Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 71) Me.LayoutControlItem12.Name = "LayoutControlItem12" - Me.LayoutControlItem12.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem12.Size = New System.Drawing.Size(335, 24) Me.LayoutControlItem12.Text = "Position/Reihenfolge:" Me.LayoutControlItem12.TextSize = New System.Drawing.Size(125, 13) ' @@ -1655,16 +1648,16 @@ Partial Class frmAdministration Me.LayoutControlItem13.Control = Me.ComboBoxEdit2 Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 95) Me.LayoutControlItem13.Name = "LayoutControlItem13" - Me.LayoutControlItem13.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem13.Size = New System.Drawing.Size(335, 24) Me.LayoutControlItem13.Text = "Datenbank-Verbindung:" Me.LayoutControlItem13.TextSize = New System.Drawing.Size(125, 13) ' 'LayoutControlItem21 ' Me.LayoutControlItem21.Control = Me.MemoEdit3 - Me.LayoutControlItem21.Location = New System.Drawing.Point(332, 0) + Me.LayoutControlItem21.Location = New System.Drawing.Point(335, 0) Me.LayoutControlItem21.Name = "LayoutControlItem21" - Me.LayoutControlItem21.Size = New System.Drawing.Size(640, 253) + Me.LayoutControlItem21.Size = New System.Drawing.Size(647, 253) Me.LayoutControlItem21.Text = "SQL für Suche:" Me.LayoutControlItem21.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem21.TextSize = New System.Drawing.Size(125, 13) @@ -1672,9 +1665,9 @@ Partial Class frmAdministration 'LayoutControlItem22 ' Me.LayoutControlItem22.Control = Me.MemoEdit4 - Me.LayoutControlItem22.Location = New System.Drawing.Point(332, 253) + Me.LayoutControlItem22.Location = New System.Drawing.Point(335, 253) Me.LayoutControlItem22.Name = "LayoutControlItem22" - Me.LayoutControlItem22.Size = New System.Drawing.Size(640, 314) + Me.LayoutControlItem22.Size = New System.Drawing.Size(647, 314) 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) @@ -1684,7 +1677,7 @@ Partial Class frmAdministration Me.EmptySpaceItem1.AllowHotTrack = False Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 199) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(332, 368) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(335, 368) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem23 @@ -1692,7 +1685,7 @@ Partial Class frmAdministration Me.LayoutControlItem23.Control = Me.txtDATAGUID Me.LayoutControlItem23.Location = New System.Drawing.Point(0, 23) Me.LayoutControlItem23.Name = "LayoutControlItem23" - Me.LayoutControlItem23.Size = New System.Drawing.Size(332, 24) + Me.LayoutControlItem23.Size = New System.Drawing.Size(335, 24) Me.LayoutControlItem23.Text = "ID:" Me.LayoutControlItem23.TextSize = New System.Drawing.Size(125, 13) ' @@ -1734,7 +1727,7 @@ Partial Class frmAdministration Me.TabPageProcessAssignment.Controls.Add(Me.CtrlApplicationAssignment1) Me.TabPageProcessAssignment.ImageOptions.Image = CType(resources.GetObject("TabPageProcessAssignment.ImageOptions.Image"), System.Drawing.Image) Me.TabPageProcessAssignment.Name = "TabPageProcessAssignment" - Me.TabPageProcessAssignment.Size = New System.Drawing.Size(1192, 587) + Me.TabPageProcessAssignment.Size = New System.Drawing.Size(1202, 587) Me.TabPageProcessAssignment.Text = "Anwendungs Zuordnung" ' 'CtrlApplicationAssignment1 @@ -1742,7 +1735,7 @@ Partial Class frmAdministration Me.CtrlApplicationAssignment1.Dock = System.Windows.Forms.DockStyle.Fill Me.CtrlApplicationAssignment1.Location = New System.Drawing.Point(0, 0) Me.CtrlApplicationAssignment1.Name = "CtrlApplicationAssignment1" - Me.CtrlApplicationAssignment1.Size = New System.Drawing.Size(1192, 587) + Me.CtrlApplicationAssignment1.Size = New System.Drawing.Size(1202, 587) Me.CtrlApplicationAssignment1.TabIndex = 2 ' 'TabPageUserAssignment @@ -1750,7 +1743,7 @@ Partial Class frmAdministration Me.TabPageUserAssignment.Controls.Add(Me.SplitContainer1) Me.TabPageUserAssignment.ImageOptions.Image = CType(resources.GetObject("TabPageUserAssignment.ImageOptions.Image"), System.Drawing.Image) Me.TabPageUserAssignment.Name = "TabPageUserAssignment" - Me.TabPageUserAssignment.Size = New System.Drawing.Size(1192, 587) + Me.TabPageUserAssignment.Size = New System.Drawing.Size(1202, 587) Me.TabPageUserAssignment.Text = "Benutzer Zuordnung" ' 'SplitContainer1 @@ -1769,7 +1762,7 @@ Partial Class frmAdministration ' Me.SplitContainer1.Panel2.Controls.Add(Me.GridControlUserNotInProfile) Me.SplitContainer1.Panel2.Controls.Add(Me.Label2) - Me.SplitContainer1.Size = New System.Drawing.Size(1192, 587) + Me.SplitContainer1.Size = New System.Drawing.Size(1202, 587) Me.SplitContainer1.SplitterDistance = 287 Me.SplitContainer1.TabIndex = 98 ' @@ -1780,7 +1773,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(1192, 262) + Me.GridControlUserInProfile.Size = New System.Drawing.Size(1202, 262) Me.GridControlUserInProfile.TabIndex = 93 Me.GridControlUserInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserInProfile}) ' @@ -1849,7 +1842,7 @@ Partial Class frmAdministration Me.Label1.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label1.Location = New System.Drawing.Point(0, 0) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(1192, 25) + Me.Label1.Size = New System.Drawing.Size(1202, 25) Me.Label1.TabIndex = 94 Me.Label1.Text = "Zugeordnete Benutzer:" Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1862,7 +1855,7 @@ Partial Class frmAdministration Me.GridControlUserNotInProfile.MainView = Me.GridViewUserNotInProfile Me.GridControlUserNotInProfile.Name = "GridControlUserNotInProfile" Me.GridControlUserNotInProfile.ShowOnlyPredefinedDetails = True - Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(1192, 271) + Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(1202, 271) Me.GridControlUserNotInProfile.TabIndex = 96 Me.GridControlUserNotInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserNotInProfile}) ' @@ -1923,7 +1916,7 @@ Partial Class frmAdministration Me.Label2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label2.Location = New System.Drawing.Point(0, 0) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(1192, 25) + Me.Label2.Size = New System.Drawing.Size(1202, 25) Me.Label2.TabIndex = 97 Me.Label2.Text = "Nicht zugeordnete Benutzer:" Me.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1934,7 +1927,7 @@ Partial Class frmAdministration Me.TabPageGroupAssignment.Controls.Add(Me.SplitContainer2) Me.TabPageGroupAssignment.ImageOptions.Image = CType(resources.GetObject("TabPageGroupAssignment.ImageOptions.Image"), System.Drawing.Image) Me.TabPageGroupAssignment.Name = "TabPageGroupAssignment" - Me.TabPageGroupAssignment.Size = New System.Drawing.Size(1192, 587) + Me.TabPageGroupAssignment.Size = New System.Drawing.Size(1202, 587) Me.TabPageGroupAssignment.Text = "Gruppen Zuordnung" ' 'SplitContainer2 @@ -1953,7 +1946,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(1192, 587) + Me.SplitContainer2.Size = New System.Drawing.Size(1202, 587) Me.SplitContainer2.SplitterDistance = 284 Me.SplitContainer2.TabIndex = 0 ' @@ -1964,7 +1957,7 @@ Partial Class frmAdministration Me.GridControlGroupInProfile.Location = New System.Drawing.Point(0, 25) Me.GridControlGroupInProfile.MainView = Me.GridViewGroupInProfile Me.GridControlGroupInProfile.Name = "GridControlGroupInProfile" - Me.GridControlGroupInProfile.Size = New System.Drawing.Size(1192, 259) + Me.GridControlGroupInProfile.Size = New System.Drawing.Size(1202, 259) Me.GridControlGroupInProfile.TabIndex = 1 Me.GridControlGroupInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewGroupInProfile}) ' @@ -2014,7 +2007,7 @@ Partial Class frmAdministration Me.Label9.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label9.Location = New System.Drawing.Point(0, 0) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(1192, 25) + Me.Label9.Size = New System.Drawing.Size(1202, 25) Me.Label9.TabIndex = 0 Me.Label9.Text = "Zugeordnete Gruppen" Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -2026,7 +2019,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(1192, 274) + Me.GridControlGroupNotInProfile.Size = New System.Drawing.Size(1202, 274) Me.GridControlGroupNotInProfile.TabIndex = 1 Me.GridControlGroupNotInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewGroupNotInProfile}) ' @@ -2075,7 +2068,7 @@ Partial Class frmAdministration Me.Label10.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label10.Location = New System.Drawing.Point(0, 0) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(1192, 25) + Me.Label10.Size = New System.Drawing.Size(1202, 25) Me.Label10.TabIndex = 1 Me.Label10.Text = "Nicht zugeordnete Gruppen:" Me.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -2499,7 +2492,6 @@ Partial Class frmAdministration Friend WithEvents BarButtonItem24 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem25 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem26 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents labelSelection As DevExpress.XtraBars.BarStaticItem Friend WithEvents BarButtonItem27 As DevExpress.XtraBars.BarButtonItem Friend WithEvents TextEdit19 As DevExpress.XtraEditors.LookUpEdit Friend WithEvents TBWHSEARCHPOSITIONBindingSource As BindingSource diff --git a/app/DD_Clipboard_Searcher/frmAdministration.resx b/app/DD_Clipboard_Searcher/frmAdministration.resx index cefe338..a254e58 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.resx +++ b/app/DD_Clipboard_Searcher/frmAdministration.resx @@ -123,9 +123,6 @@ 245, 17 - - 245, 17 - 122, 56 @@ -785,6 +782,12 @@ FtOzTIXqGncE2vMKPAQLxvAKgukI/oOiH3DIH9LquF+BAAAAAElFTkSuQmCC + + 17, 134 + + + 499, 134 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -823,6 +826,12 @@ tQHvKFEAAAAASUVORK5CYII= + + 500, 95 + + + 290, 95 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -834,18 +843,6 @@ 5HqnEtCca30Bw6t+WSTe8moAAAAASUVORK5CYII= - - 17, 134 - - - 499, 134 - - - 500, 95 - - - 290, 95 - 862, 56 diff --git a/app/DD_Clipboard_Searcher/frmAdministration.vb b/app/DD_Clipboard_Searcher/frmAdministration.vb index 76343c4..6b7bd96 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.vb @@ -118,7 +118,6 @@ Public Class frmAdministration End Sub Private Sub GUIDTextBox_TextChanged(sender As Object, e As EventArgs) Handles PROFILE_IDTextBox.TextChanged - If PROFILE_IDTextBox.Text <> "" Then If CtrlApplicationAssignment1.AssignProfileID(PROFILE_IDTextBox.Text) = False Then MsgBox("Unexpected Error while assigning ProfileID!", MsgBoxStyle.Critical) @@ -130,16 +129,9 @@ Public Class frmAdministration Refresh_Free_Groups(PROFILE_IDTextBox.Text) Load_Profile_Process() - If LogConfig.Debug = True Then - labelSelection.Caption = CtrlApplicationAssignment1.AppSelectionString - labelSelection.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - Else - labelSelection.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - End If - End If - End Sub + Sub Refresh_ProfileData() Try VWUSER_PROFILETableAdapter.Connection.ConnectionString = MyConnectionString