From b15eecb3cc645f662477305ae87af6d111e5f66a Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 2 Jun 2020 16:31:13 +0200 Subject: [PATCH] use connection id, clean up ribbon, move basic settings, move license management to admin --- app/DD_Clipboard_Searcher/ClassDragDrop.vb | 94 ++++++ .../DD_Clipboard_Watcher.vbproj | 7 +- .../My Project/licenses.licx | 10 +- .../frmAdministration.Designer.vb | 272 ++++++++++-------- .../frmAdministration.resx | 183 +++++++----- .../frmAdministration.vb | 78 ++++- app/DD_Clipboard_Searcher/frmStart.vb | 9 +- 7 files changed, 435 insertions(+), 218 deletions(-) create mode 100644 app/DD_Clipboard_Searcher/ClassDragDrop.vb diff --git a/app/DD_Clipboard_Searcher/ClassDragDrop.vb b/app/DD_Clipboard_Searcher/ClassDragDrop.vb new file mode 100644 index 0000000..c96a89b --- /dev/null +++ b/app/DD_Clipboard_Searcher/ClassDragDrop.vb @@ -0,0 +1,94 @@ +Imports DevExpress.XtraGrid +Imports DevExpress.XtraGrid.Views.Grid +Imports DevExpress.XtraGrid.Views.Grid.ViewInfo + +Public Class ClassDragDrop + Private downHitInfo As GridHitInfo = Nothing + + Public Sub New() + End Sub + + Public Sub AddGridView(view As GridView) + AddHandler view.MouseDown, AddressOf view_MouseDown + AddHandler view.MouseMove, AddressOf view_MouseMove + AddHandler view.GridControl.DragOver, AddressOf grid_DragOver + End Sub + + Private Sub view_MouseDown(sender As Object, e As MouseEventArgs) + Dim view As GridView = sender + Dim hitInfo As GridHitInfo = view.CalcHitInfo(New Point(e.X, e.Y)) + + downHitInfo = Nothing + + If Control.ModifierKeys <> Keys.None Then + Return + End If + + If e.Button = MouseButtons.Left And hitInfo.RowHandle >= 0 Then + downHitInfo = hitInfo + End If + End Sub + + Private Sub view_MouseMove(sender As Object, e As MouseEventArgs) + Try + Dim view As GridView = sender + Dim hitInfo As GridHitInfo = view.CalcHitInfo(New Point(e.X, e.Y)) + + If e.Button = MouseButtons.Left And Not IsNothing(downHitInfo) Then + Dim dragSize As Size = SystemInformation.DragSize + Dim dragRect As New Rectangle(New Point(downHitInfo.HitPoint.X - dragSize.Width / 2, downHitInfo.HitPoint.Y - dragSize.Height / 2), dragSize) + + ' DragRect ist ein kleines Rechteck, dessen Mitte der Punkt ist, wo die Maus geklickt wurde. + ' Es soll verhindern, dass durch schnelles Klicken unbeabsichtigt Drag'n'Drop Operationen initiiert werden + ' Siehe: https://msdn.microsoft.com/en-us/library/system.windows.forms.systeminformation.dragsize(v=vs.110).aspx + If Not dragRect.Contains(New Point(e.X, e.Y)) Then + ' dragDropData enhält eine einzelne Row oder den kompletten View, + ' jenachdem, wie die Drag'n'Drop Operation gestartet wurde. + Dim dragDropData As String + + ' Wenn keine Zeile markiert ist + If downHitInfo.RowHandle < 0 Then + Exit Sub + End If + + ' Wenn zwar eine Zeile markiert ist, aber keine über die Checkbox angehakt wurde, + ' wird die markierte Zeile übergeben. + ' Wenn 1 oder n Zeilen über die Checkbox angehakt wurde, werden diese übergeben + Dim row As DataRow = view.GetDataRow(downHitInfo.RowHandle) + Dim source As String = view.GridControl.Name + + If Not IsNothing(row) Then + Try + dragDropData = row.Item("GUID") & "|" & source + + view.GridControl.DoDragDrop(dragDropData, DragDropEffects.Move) + downHitInfo = Nothing + + DevExpress.Utils.DXMouseEventArgs.GetMouseArgs(e).Handled = True + Catch ex As Exception + Logger.Error(ex) + End Try + End If + End If + End If + Catch ex As Exception + Logger.Error(ex) + MsgBox("Error in view_MouseMove: " & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + Private Sub grid_DragOver(sender As Object, e As DragEventArgs) + If e.Data.GetDataPresent(DataFormats.Text) Then + Dim data As String = e.Data.GetData(DataFormats.Text) + Dim source = data.Split("|")(1) + + Dim grid As GridControl = sender + + If grid.Name <> source Then + e.Effect = DragDropEffects.Move + End If + Else + e.Effect = DragDropEffects.None + End If + End Sub +End Class diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj index b1e77ed..75f2a88 100644 --- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj +++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj @@ -83,12 +83,12 @@ P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\Controls\DigitalData.Controls.RegexEditor.dll + + ..\..\..\DDMonorepo\GUIs.ClipboardWatcher\bin\Debug\DigitalData.GUIs.ClipboardWatcher.dll + ..\..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll - - ..\..\..\DDMonorepo\GUIs.ClipboardWatcher\bin\Debug\DigitalData.Modules.ClipboardWatcher.dll - ..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll @@ -163,6 +163,7 @@ + diff --git a/app/DD_Clipboard_Searcher/My Project/licenses.licx b/app/DD_Clipboard_Searcher/My Project/licenses.licx index a767380..58e82e9 100644 --- a/app/DD_Clipboard_Searcher/My Project/licenses.licx +++ b/app/DD_Clipboard_Searcher/My Project/licenses.licx @@ -1,7 +1,9 @@ -DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemPopupGalleryEdit, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb index 9e8bb8d..7806cb1 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb @@ -48,9 +48,6 @@ Partial Class frmAdministration Me.textEdit4 = New DevExpress.XtraEditors.TextEdit() Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit() Me.RibbonControl2 = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components) - Me.BarButtonItem16 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem17 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() @@ -65,6 +62,8 @@ Partial Class frmAdministration Me.BarButtonItem12 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem13 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem14 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem16 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem17 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem15 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem18 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem19 = New DevExpress.XtraBars.BarButtonItem() @@ -77,6 +76,8 @@ Partial Class frmAdministration Me.BarButtonItem25 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem28 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem29 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonGroup_Profile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonGroup_DocSearch = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -86,6 +87,8 @@ Partial Class frmAdministration Me.RibbonGroup_Control = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonGroup_User = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonGroup_Group = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.textEdit2 = New DevExpress.XtraEditors.LookUpEdit() Me.TBWH_PROFILE_TYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -229,7 +232,6 @@ Partial Class frmAdministration CType(Me.textEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.textEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBWH_PROFILE_TYPEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit8.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -358,7 +360,7 @@ Partial Class frmAdministration Me.GridControlProfiles.Location = New System.Drawing.Point(0, 0) Me.GridControlProfiles.MainView = Me.GridViewProfiles Me.GridControlProfiles.Name = "GridControlProfiles" - Me.GridControlProfiles.Size = New System.Drawing.Size(237, 602) + Me.GridControlProfiles.Size = New System.Drawing.Size(237, 600) Me.GridControlProfiles.TabIndex = 18 Me.GridControlProfiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewProfiles}) ' @@ -457,7 +459,7 @@ Partial Class frmAdministration Me.XtraTabControl3.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl3.Name = "XtraTabControl3" Me.XtraTabControl3.SelectedTabPage = Me.TabPageGeneralSettings - Me.XtraTabControl3.Size = New System.Drawing.Size(1118, 602) + Me.XtraTabControl3.Size = New System.Drawing.Size(1118, 600) Me.XtraTabControl3.TabIndex = 21 Me.XtraTabControl3.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageGeneralSettings, Me.TabPageDocuments, Me.TabPageData, Me.TabPageProcessAssignment, Me.TabPageUserAssignment, Me.TabPageGroupAssignment}) ' @@ -468,7 +470,7 @@ Partial Class frmAdministration Me.TabPageGeneralSettings.ImageOptions.SvgImage = CType(resources.GetObject("TabPageGeneralSettings.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageGeneralSettings.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.TabPageGeneralSettings.Name = "TabPageGeneralSettings" - Me.TabPageGeneralSettings.Size = New System.Drawing.Size(1116, 570) + Me.TabPageGeneralSettings.Size = New System.Drawing.Size(1116, 568) Me.TabPageGeneralSettings.Text = "Allgemein" ' 'LayoutControl1 @@ -522,44 +524,20 @@ Partial Class frmAdministration ' 'RibbonControl2 ' - Me.RibbonControl2.ApplicationButtonDropDownControl = Me.ApplicationMenu1 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.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.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl2.MaxItemId = 14 + Me.RibbonControl2.MaxItemId = 16 Me.RibbonControl2.Name = "RibbonControl2" - Me.RibbonControl2.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage2}) + Me.RibbonControl2.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage2, Me.RibbonPage1}) + Me.RibbonControl2.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl2.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl2.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl2.ShowToolbarCustomizeItem = False Me.RibbonControl2.Size = New System.Drawing.Size(1365, 158) Me.RibbonControl2.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl2.Toolbar.ShowCustomizeItem = False Me.RibbonControl2.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden ' - 'ApplicationMenu1 - ' - Me.ApplicationMenu1.ItemLinks.Add(Me.BarButtonItem16) - Me.ApplicationMenu1.ItemLinks.Add(Me.BarButtonItem17) - Me.ApplicationMenu1.Name = "ApplicationMenu1" - Me.ApplicationMenu1.Ribbon = Me.RibbonControl2 - ' - 'BarButtonItem16 - ' - Me.BarButtonItem16.Caption = "Datenbank Verbindungen" - Me.BarButtonItem16.Id = 16 - Me.BarButtonItem16.ImageOptions.Image = CType(resources.GetObject("BarButtonItem16.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonItem16.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem16.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonItem16.Name = "BarButtonItem16" - ' - 'BarButtonItem17 - ' - Me.BarButtonItem17.Caption = "Lizenz Informationen" - Me.BarButtonItem17.Id = 17 - Me.BarButtonItem17.ImageOptions.Image = CType(resources.GetObject("BarButtonItem17.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonItem17.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem17.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonItem17.Name = "BarButtonItem17" - ' 'BarButtonItem1 ' Me.BarButtonItem1.Caption = "Neues Profil" @@ -573,6 +551,7 @@ Partial Class frmAdministration Me.BarButtonItem2.Id = 2 Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem2.Name = "BarButtonItem2" + Me.BarButtonItem2.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText ' 'BarButtonItem3 ' @@ -587,6 +566,7 @@ Partial Class frmAdministration Me.BarButtonItem4.Id = 4 Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem4.Name = "BarButtonItem4" + Me.BarButtonItem4.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText ' 'BarButtonItem5 ' @@ -657,6 +637,22 @@ Partial Class frmAdministration Me.BarButtonItem14.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem14.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem14.Name = "BarButtonItem14" ' + 'BarButtonItem16 + ' + Me.BarButtonItem16.Caption = "Datenbank Verbindungen" + Me.BarButtonItem16.Id = 16 + Me.BarButtonItem16.ImageOptions.Image = CType(resources.GetObject("BarButtonItem16.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem16.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem16.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem16.Name = "BarButtonItem16" + ' + 'BarButtonItem17 + ' + Me.BarButtonItem17.Caption = "Lizenz Informationen" + Me.BarButtonItem17.Id = 17 + Me.BarButtonItem17.ImageOptions.Image = CType(resources.GetObject("BarButtonItem17.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem17.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem17.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem17.Name = "BarButtonItem17" + ' 'BarButtonItem15 ' Me.BarButtonItem15.Caption = "Neue Suche" @@ -731,10 +727,11 @@ Partial Class frmAdministration ' 'BarButtonItem26 ' - Me.BarButtonItem26.Caption = "Profil duplizieren" + Me.BarButtonItem26.Caption = "Profil kopieren" Me.BarButtonItem26.Id = 11 Me.BarButtonItem26.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem26.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem26.Name = "BarButtonItem26" + Me.BarButtonItem26.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText ' 'BarButtonItem27 ' @@ -743,18 +740,32 @@ Partial Class frmAdministration Me.BarButtonItem27.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem27.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem27.Name = "BarButtonItem27" ' + 'BarButtonItem28 + ' + Me.BarButtonItem28.Caption = "SQL Verbindungen" + Me.BarButtonItem28.Id = 14 + Me.BarButtonItem28.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem28.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem28.Name = "BarButtonItem28" + ' + 'BarButtonItem29 + ' + Me.BarButtonItem29.Caption = "Lizenz Verwaltung" + Me.BarButtonItem29.Id = 15 + Me.BarButtonItem29.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem29.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem29.Name = "BarButtonItem29" + ' 'RibbonPage2 ' Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonGroup_Profile, Me.RibbonGroup_DocSearch, Me.RibbonGroup_DataSearch, Me.RibbonGroup_Process, Me.RibbonGroup_Window, Me.RibbonGroup_Control, Me.RibbonGroup_User, Me.RibbonGroup_Group}) Me.RibbonPage2.Name = "RibbonPage2" - Me.RibbonPage2.Text = "RibbonPage2" + Me.RibbonPage2.Text = "Start" ' 'RibbonGroup_Profile ' Me.RibbonGroup_Profile.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonGroup_Profile.ItemLinks.Add(Me.BarButtonItem3) - Me.RibbonGroup_Profile.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonGroup_Profile.ItemLinks.Add(Me.BarButtonItem4) + Me.RibbonGroup_Profile.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonGroup_Profile.ItemLinks.Add(Me.BarButtonItem26) Me.RibbonGroup_Profile.Name = "RibbonGroup_Profile" Me.RibbonGroup_Profile.Text = "Profil Verwaltung" @@ -820,13 +831,26 @@ Partial Class frmAdministration Me.RibbonGroup_Group.Name = "RibbonGroup_Group" Me.RibbonGroup_Group.Text = "Gruppen Zuordnung" ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "Grundeinstellungen" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem28) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem29) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 760) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 758) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl2 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1365, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1365, 24) ' 'textEdit2 ' @@ -1050,7 +1074,7 @@ Partial Class frmAdministration Me.TabPageDocuments.ImageOptions.SvgImage = CType(resources.GetObject("TabPageDocuments.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.TabPageDocuments.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20) Me.TabPageDocuments.Name = "TabPageDocuments" - Me.TabPageDocuments.Size = New System.Drawing.Size(1114, 568) + Me.TabPageDocuments.Size = New System.Drawing.Size(1116, 568) Me.TabPageDocuments.Text = "Dokument-Suchen" ' 'LayoutControlDocs @@ -1071,7 +1095,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(914, 568) + Me.LayoutControlDocs.Size = New System.Drawing.Size(916, 568) Me.LayoutControlDocs.TabIndex = 24 Me.LayoutControlDocs.Text = "LayoutControl2" ' @@ -1081,7 +1105,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(301, 20) + Me.CheckEdit3.Size = New System.Drawing.Size(302, 20) Me.CheckEdit3.StyleController = Me.LayoutControlDocs Me.CheckEdit3.TabIndex = 8 ' @@ -1101,7 +1125,7 @@ Partial Class frmAdministration Me.TextEdit15.Location = New System.Drawing.Point(141, 148) Me.TextEdit15.Name = "TextEdit15" Me.TextEdit15.Properties.ReadOnly = True - Me.TextEdit15.Size = New System.Drawing.Size(172, 20) + Me.TextEdit15.Size = New System.Drawing.Size(173, 20) Me.TextEdit15.StyleController = Me.LayoutControlDocs Me.TextEdit15.TabIndex = 5 ' @@ -1111,7 +1135,7 @@ Partial Class frmAdministration Me.TextEdit18.Location = New System.Drawing.Point(141, 188) Me.TextEdit18.Name = "TextEdit18" Me.TextEdit18.Properties.ReadOnly = True - Me.TextEdit18.Size = New System.Drawing.Size(172, 20) + Me.TextEdit18.Size = New System.Drawing.Size(173, 20) Me.TextEdit18.StyleController = Me.LayoutControlDocs Me.TextEdit18.TabIndex = 7 ' @@ -1131,7 +1155,7 @@ Partial Class frmAdministration Me.TextEdit16.EditValue = "" Me.TextEdit16.Location = New System.Drawing.Point(140, 60) Me.TextEdit16.Name = "TextEdit16" - Me.TextEdit16.Size = New System.Drawing.Size(173, 20) + Me.TextEdit16.Size = New System.Drawing.Size(174, 20) Me.TextEdit16.StyleController = Me.LayoutControlDocs Me.TextEdit16.TabIndex = 9 ' @@ -1148,7 +1172,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(173, 20) + Me.LookUpEdit1.Size = New System.Drawing.Size(174, 20) Me.LookUpEdit1.StyleController = Me.LayoutControlDocs Me.LookUpEdit1.TabIndex = 11 ' @@ -1160,22 +1184,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(317, 28) + Me.MemoEdit5.Location = New System.Drawing.Point(318, 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(585, 224) + Me.MemoEdit5.Size = New System.Drawing.Size(586, 224) 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(317, 272) + Me.MemoEdit6.Location = New System.Drawing.Point(318, 272) 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(585, 284) + Me.MemoEdit6.Size = New System.Drawing.Size(586, 284) Me.MemoEdit6.StyleController = Me.LayoutControlDocs Me.MemoEdit6.TabIndex = 13 ' @@ -1185,7 +1209,7 @@ Partial Class frmAdministration Me.txtDOC_GUID.Location = New System.Drawing.Point(140, 36) Me.txtDOC_GUID.Name = "txtDOC_GUID" Me.txtDOC_GUID.Properties.ReadOnly = True - Me.txtDOC_GUID.Size = New System.Drawing.Size(173, 20) + Me.txtDOC_GUID.Size = New System.Drawing.Size(174, 20) Me.txtDOC_GUID.StyleController = Me.LayoutControlDocs Me.txtDOC_GUID.TabIndex = 14 ' @@ -1203,7 +1227,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(173, 20) + Me.TextEdit19.Size = New System.Drawing.Size(174, 20) Me.TextEdit19.StyleController = Me.LayoutControlDocs Me.TextEdit19.TabIndex = 10 ' @@ -1218,7 +1242,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(914, 568) + Me.LayoutControlGroup2.Size = New System.Drawing.Size(916, 568) Me.LayoutControlGroup2.TextVisible = False ' 'LayoutControlItem29 @@ -1227,7 +1251,7 @@ Partial Class frmAdministration Me.LayoutControlItem29.CustomizationFormText = "Titel:" Me.LayoutControlItem29.Location = New System.Drawing.Point(0, 48) Me.LayoutControlItem29.Name = "LayoutControlItem29" - Me.LayoutControlItem29.Size = New System.Drawing.Size(305, 24) + Me.LayoutControlItem29.Size = New System.Drawing.Size(306, 24) Me.LayoutControlItem29.Text = "Titel:" Me.LayoutControlItem29.TextSize = New System.Drawing.Size(125, 13) ' @@ -1237,7 +1261,7 @@ Partial Class frmAdministration Me.LayoutControlItem30.CustomizationFormText = "Position:" Me.LayoutControlItem30.Location = New System.Drawing.Point(0, 72) Me.LayoutControlItem30.Name = "LayoutControlItem30" - Me.LayoutControlItem30.Size = New System.Drawing.Size(305, 24) + Me.LayoutControlItem30.Size = New System.Drawing.Size(306, 24) Me.LayoutControlItem30.Text = "Position/Reihenfolge:" Me.LayoutControlItem30.TextSize = New System.Drawing.Size(125, 13) ' @@ -1247,7 +1271,7 @@ Partial Class frmAdministration Me.LayoutControlItem31.CustomizationFormText = "Verbindung:" Me.LayoutControlItem31.Location = New System.Drawing.Point(0, 96) Me.LayoutControlItem31.Name = "LayoutControlItem31" - Me.LayoutControlItem31.Size = New System.Drawing.Size(305, 24) + Me.LayoutControlItem31.Size = New System.Drawing.Size(306, 24) Me.LayoutControlItem31.Text = "Datenbank-Verbindung:" Me.LayoutControlItem31.TextSize = New System.Drawing.Size(125, 13) ' @@ -1268,7 +1292,7 @@ Partial Class frmAdministration Me.LayoutControlItem27.CustomizationFormText = "layoutControlItem4" Me.LayoutControlItem27.Location = New System.Drawing.Point(129, 160) Me.LayoutControlItem27.Name = "LayoutControlItem27" - Me.LayoutControlItem27.Size = New System.Drawing.Size(176, 40) + Me.LayoutControlItem27.Size = New System.Drawing.Size(177, 40) Me.LayoutControlItem27.Text = "Geändert wann:" Me.LayoutControlItem27.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem27.TextSize = New System.Drawing.Size(125, 13) @@ -1279,7 +1303,7 @@ Partial Class frmAdministration Me.LayoutControlItem26.CustomizationFormText = "layoutControlItem2" Me.LayoutControlItem26.Location = New System.Drawing.Point(129, 120) Me.LayoutControlItem26.Name = "LayoutControlItem26" - Me.LayoutControlItem26.Size = New System.Drawing.Size(176, 40) + Me.LayoutControlItem26.Size = New System.Drawing.Size(177, 40) Me.LayoutControlItem26.Text = "Erstellt wann:" Me.LayoutControlItem26.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem26.TextSize = New System.Drawing.Size(125, 13) @@ -1289,16 +1313,16 @@ Partial Class frmAdministration Me.EmptySpaceItem2.AllowHotTrack = False Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 200) Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(305, 348) + Me.EmptySpaceItem2.Size = New System.Drawing.Size(306, 348) 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(305, 244) + Me.LayoutControlItem33.Location = New System.Drawing.Point(306, 244) Me.LayoutControlItem33.Name = "LayoutControlItem33" - Me.LayoutControlItem33.Size = New System.Drawing.Size(589, 304) + Me.LayoutControlItem33.Size = New System.Drawing.Size(590, 304) 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) @@ -1307,9 +1331,9 @@ Partial Class frmAdministration ' Me.LayoutControlItem32.Control = Me.MemoEdit5 Me.LayoutControlItem32.CustomizationFormText = "SQL für Suche:" - Me.LayoutControlItem32.Location = New System.Drawing.Point(305, 0) + Me.LayoutControlItem32.Location = New System.Drawing.Point(306, 0) Me.LayoutControlItem32.Name = "LayoutControlItem32" - Me.LayoutControlItem32.Size = New System.Drawing.Size(589, 244) + Me.LayoutControlItem32.Size = New System.Drawing.Size(590, 244) Me.LayoutControlItem32.Text = "SQL für Suche:" Me.LayoutControlItem32.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem32.TextSize = New System.Drawing.Size(125, 13) @@ -1320,7 +1344,7 @@ Partial Class frmAdministration Me.LayoutControlItem34.CustomizationFormText = "ID:" Me.LayoutControlItem34.Location = New System.Drawing.Point(0, 24) Me.LayoutControlItem34.Name = "LayoutControlItem34" - Me.LayoutControlItem34.Size = New System.Drawing.Size(305, 24) + Me.LayoutControlItem34.Size = New System.Drawing.Size(306, 24) Me.LayoutControlItem34.Text = "ID:" Me.LayoutControlItem34.TextSize = New System.Drawing.Size(125, 13) ' @@ -1330,7 +1354,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(305, 24) + Me.LayoutControlItem24.Size = New System.Drawing.Size(306, 24) Me.LayoutControlItem24.Text = "LayoutControlItem10" Me.LayoutControlItem24.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem24.TextVisible = False @@ -1387,7 +1411,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(20, 20) Me.TabPageData.Name = "TabPageData" - Me.TabPageData.Size = New System.Drawing.Size(1114, 568) + Me.TabPageData.Size = New System.Drawing.Size(1116, 568) Me.TabPageData.Text = "Daten-Suchen" ' 'LayoutControlData @@ -1408,7 +1432,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, 568) + Me.LayoutControlData.Size = New System.Drawing.Size(916, 568) Me.LayoutControlData.TabIndex = 26 Me.LayoutControlData.Text = "LayoutControl3" ' @@ -1428,7 +1452,7 @@ Partial Class frmAdministration Me.TextEdit13.Location = New System.Drawing.Point(141, 148) Me.TextEdit13.Name = "TextEdit13" Me.TextEdit13.Properties.ReadOnly = True - Me.TextEdit13.Size = New System.Drawing.Size(172, 20) + Me.TextEdit13.Size = New System.Drawing.Size(173, 20) Me.TextEdit13.StyleController = Me.LayoutControlData Me.TextEdit13.TabIndex = 5 ' @@ -1448,7 +1472,7 @@ Partial Class frmAdministration Me.TextEdit11.Location = New System.Drawing.Point(141, 188) Me.TextEdit11.Name = "TextEdit11" Me.TextEdit11.Properties.ReadOnly = True - Me.TextEdit11.Size = New System.Drawing.Size(172, 20) + Me.TextEdit11.Size = New System.Drawing.Size(173, 20) Me.TextEdit11.StyleController = Me.LayoutControlData Me.TextEdit11.TabIndex = 7 ' @@ -1459,7 +1483,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(301, 20) + Me.CheckEdit2.Size = New System.Drawing.Size(302, 20) Me.CheckEdit2.StyleController = Me.LayoutControlData Me.CheckEdit2.TabIndex = 8 ' @@ -1470,7 +1494,7 @@ Partial Class frmAdministration Me.TextEdit9.Location = New System.Drawing.Point(140, 60) Me.TextEdit9.MenuManager = Me.RibbonControl2 Me.TextEdit9.Name = "TextEdit9" - Me.TextEdit9.Size = New System.Drawing.Size(173, 20) + Me.TextEdit9.Size = New System.Drawing.Size(174, 20) Me.TextEdit9.StyleController = Me.LayoutControlData Me.TextEdit9.TabIndex = 9 ' @@ -1488,31 +1512,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(173, 20) + Me.ComboBoxEdit2.Size = New System.Drawing.Size(174, 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(317, 28) + Me.MemoEdit3.Location = New System.Drawing.Point(318, 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(585, 225) + Me.MemoEdit3.Size = New System.Drawing.Size(586, 225) 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, 273) + Me.MemoEdit4.Location = New System.Drawing.Point(318, 273) 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, 283) + Me.MemoEdit4.Size = New System.Drawing.Size(586, 283) Me.MemoEdit4.StyleController = Me.LayoutControlData Me.MemoEdit4.TabIndex = 13 ' @@ -1523,7 +1547,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(173, 20) + Me.txtDATAGUID.Size = New System.Drawing.Size(174, 20) Me.txtDATAGUID.StyleController = Me.LayoutControlData Me.txtDATAGUID.TabIndex = 14 ' @@ -1542,7 +1566,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(173, 20) + Me.TextEdit10.Size = New System.Drawing.Size(174, 20) Me.TextEdit10.StyleController = Me.LayoutControlData Me.TextEdit10.TabIndex = 10 ' @@ -1552,7 +1576,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(914, 568) + Me.LayoutControlGroup3.Size = New System.Drawing.Size(916, 568) Me.LayoutControlGroup3.TextVisible = False ' 'LayoutControlItem10 @@ -1560,7 +1584,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(305, 24) + Me.LayoutControlItem10.Size = New System.Drawing.Size(306, 24) Me.LayoutControlItem10.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem10.TextVisible = False ' @@ -1581,7 +1605,7 @@ Partial Class frmAdministration Me.LayoutControlItem15.CustomizationFormText = "layoutControlItem2" Me.LayoutControlItem15.Location = New System.Drawing.Point(129, 120) Me.LayoutControlItem15.Name = "LayoutControlItem15" - Me.LayoutControlItem15.Size = New System.Drawing.Size(176, 40) + Me.LayoutControlItem15.Size = New System.Drawing.Size(177, 40) Me.LayoutControlItem15.Text = "Erstellt wann:" Me.LayoutControlItem15.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem15.TextSize = New System.Drawing.Size(125, 13) @@ -1592,7 +1616,7 @@ Partial Class frmAdministration Me.LayoutControlItem17.CustomizationFormText = "layoutControlItem4" Me.LayoutControlItem17.Location = New System.Drawing.Point(129, 160) Me.LayoutControlItem17.Name = "LayoutControlItem17" - Me.LayoutControlItem17.Size = New System.Drawing.Size(176, 40) + Me.LayoutControlItem17.Size = New System.Drawing.Size(177, 40) Me.LayoutControlItem17.Text = "Geändert wann:" Me.LayoutControlItem17.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem17.TextSize = New System.Drawing.Size(125, 13) @@ -1613,7 +1637,7 @@ Partial Class frmAdministration Me.LayoutControlItem11.Control = Me.TextEdit9 Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 48) Me.LayoutControlItem11.Name = "LayoutControlItem11" - Me.LayoutControlItem11.Size = New System.Drawing.Size(305, 24) + Me.LayoutControlItem11.Size = New System.Drawing.Size(306, 24) Me.LayoutControlItem11.Text = "Titel:" Me.LayoutControlItem11.TextSize = New System.Drawing.Size(125, 13) ' @@ -1622,7 +1646,7 @@ Partial Class frmAdministration Me.LayoutControlItem12.Control = Me.TextEdit10 Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 72) Me.LayoutControlItem12.Name = "LayoutControlItem12" - Me.LayoutControlItem12.Size = New System.Drawing.Size(305, 24) + Me.LayoutControlItem12.Size = New System.Drawing.Size(306, 24) Me.LayoutControlItem12.Text = "Position/Reihenfolge:" Me.LayoutControlItem12.TextSize = New System.Drawing.Size(125, 13) ' @@ -1631,16 +1655,16 @@ Partial Class frmAdministration Me.LayoutControlItem13.Control = Me.ComboBoxEdit2 Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 96) Me.LayoutControlItem13.Name = "LayoutControlItem13" - Me.LayoutControlItem13.Size = New System.Drawing.Size(305, 24) + Me.LayoutControlItem13.Size = New System.Drawing.Size(306, 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(305, 0) + Me.LayoutControlItem21.Location = New System.Drawing.Point(306, 0) Me.LayoutControlItem21.Name = "LayoutControlItem21" - Me.LayoutControlItem21.Size = New System.Drawing.Size(589, 245) + Me.LayoutControlItem21.Size = New System.Drawing.Size(590, 245) Me.LayoutControlItem21.Text = "SQL für Suche:" Me.LayoutControlItem21.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem21.TextSize = New System.Drawing.Size(125, 13) @@ -1648,9 +1672,9 @@ Partial Class frmAdministration 'LayoutControlItem22 ' Me.LayoutControlItem22.Control = Me.MemoEdit4 - Me.LayoutControlItem22.Location = New System.Drawing.Point(305, 245) + Me.LayoutControlItem22.Location = New System.Drawing.Point(306, 245) Me.LayoutControlItem22.Name = "LayoutControlItem22" - Me.LayoutControlItem22.Size = New System.Drawing.Size(589, 303) + Me.LayoutControlItem22.Size = New System.Drawing.Size(590, 303) 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) @@ -1660,7 +1684,7 @@ Partial Class frmAdministration Me.EmptySpaceItem1.AllowHotTrack = False Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 200) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(305, 348) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(306, 348) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem23 @@ -1668,7 +1692,7 @@ Partial Class frmAdministration Me.LayoutControlItem23.Control = Me.txtDATAGUID Me.LayoutControlItem23.Location = New System.Drawing.Point(0, 24) Me.LayoutControlItem23.Name = "LayoutControlItem23" - Me.LayoutControlItem23.Size = New System.Drawing.Size(305, 24) + Me.LayoutControlItem23.Size = New System.Drawing.Size(306, 24) Me.LayoutControlItem23.Text = "ID:" Me.LayoutControlItem23.TextSize = New System.Drawing.Size(125, 13) ' @@ -1712,7 +1736,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(20, 20) Me.TabPageProcessAssignment.Name = "TabPageProcessAssignment" - Me.TabPageProcessAssignment.Size = New System.Drawing.Size(1114, 568) + Me.TabPageProcessAssignment.Size = New System.Drawing.Size(1116, 568) Me.TabPageProcessAssignment.Text = "Anwendungs Zuordnung" ' 'CtrlApplicationAssignment1 @@ -1724,7 +1748,7 @@ Partial Class frmAdministration Me.CtrlApplicationAssignment1.SelectedProcessId = 0 Me.CtrlApplicationAssignment1.SelectedProfileId = 0 Me.CtrlApplicationAssignment1.SelectedWindowId = 0 - Me.CtrlApplicationAssignment1.Size = New System.Drawing.Size(1114, 568) + Me.CtrlApplicationAssignment1.Size = New System.Drawing.Size(1116, 568) Me.CtrlApplicationAssignment1.TabIndex = 2 ' 'TabPageUserAssignment @@ -1733,7 +1757,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(20, 20) Me.TabPageUserAssignment.Name = "TabPageUserAssignment" - Me.TabPageUserAssignment.Size = New System.Drawing.Size(1114, 568) + Me.TabPageUserAssignment.Size = New System.Drawing.Size(1116, 568) Me.TabPageUserAssignment.Text = "Benutzer Zuordnung" ' 'SplitContainer1 @@ -1752,18 +1776,19 @@ 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, 568) + Me.SplitContainer1.Size = New System.Drawing.Size(1116, 568) Me.SplitContainer1.SplitterDistance = 277 Me.SplitContainer1.TabIndex = 98 ' 'GridControlUserInProfile ' + Me.GridControlUserInProfile.AllowDrop = True Me.GridControlUserInProfile.DataSource = Me.VWUSER_PROFILEBindingSource Me.GridControlUserInProfile.Dock = System.Windows.Forms.DockStyle.Fill 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, 252) + Me.GridControlUserInProfile.Size = New System.Drawing.Size(1116, 252) Me.GridControlUserInProfile.TabIndex = 93 Me.GridControlUserInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserInProfile}) ' @@ -1781,15 +1806,16 @@ Partial Class frmAdministration Me.GridViewUserInProfile.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID1, Me.colUSERNAME, Me.colNAME1, Me.colPRENAME}) Me.GridViewUserInProfile.GridControl = Me.GridControlUserInProfile Me.GridViewUserInProfile.Name = "GridViewUserInProfile" + Me.GridViewUserInProfile.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridViewUserInProfile.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewUserInProfile.OptionsBehavior.Editable = False + Me.GridViewUserInProfile.OptionsBehavior.ReadOnly = True Me.GridViewUserInProfile.OptionsSelection.MultiSelect = True - Me.GridViewUserInProfile.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect Me.GridViewUserInProfile.OptionsView.ColumnAutoWidth = False Me.GridViewUserInProfile.OptionsView.EnableAppearanceEvenRow = True Me.GridViewUserInProfile.OptionsView.ShowAutoFilterRow = True Me.GridViewUserInProfile.OptionsView.ShowDetailButtons = False Me.GridViewUserInProfile.OptionsView.ShowGroupPanel = False - Me.GridViewUserInProfile.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True] Me.GridViewUserInProfile.OptionsView.ShowVerticalLines = DevExpress.Utils.DefaultBoolean.[True] ' 'colGUID1 @@ -1805,7 +1831,7 @@ Partial Class frmAdministration Me.colUSERNAME.FieldName = "USERNAME" Me.colUSERNAME.Name = "colUSERNAME" Me.colUSERNAME.Visible = True - Me.colUSERNAME.VisibleIndex = 1 + Me.colUSERNAME.VisibleIndex = 0 Me.colUSERNAME.Width = 104 ' 'colNAME1 @@ -1814,7 +1840,7 @@ Partial Class frmAdministration Me.colNAME1.FieldName = "NAME" Me.colNAME1.Name = "colNAME1" Me.colNAME1.Visible = True - Me.colNAME1.VisibleIndex = 2 + Me.colNAME1.VisibleIndex = 1 Me.colNAME1.Width = 95 ' 'colPRENAME @@ -1823,7 +1849,7 @@ Partial Class frmAdministration Me.colPRENAME.FieldName = "PRENAME" Me.colPRENAME.Name = "colPRENAME" Me.colPRENAME.Visible = True - Me.colPRENAME.VisibleIndex = 3 + Me.colPRENAME.VisibleIndex = 2 Me.colPRENAME.Width = 86 ' 'Label1 @@ -1832,20 +1858,20 @@ 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(1114, 25) + Me.Label1.Size = New System.Drawing.Size(1116, 25) Me.Label1.TabIndex = 94 Me.Label1.Text = "Zugeordnete Benutzer:" Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'GridControlUserNotInProfile ' + Me.GridControlUserNotInProfile.AllowDrop = True Me.GridControlUserNotInProfile.DataSource = Me.TBWH_UserBindingSource Me.GridControlUserNotInProfile.Dock = System.Windows.Forms.DockStyle.Fill Me.GridControlUserNotInProfile.Location = New System.Drawing.Point(0, 25) Me.GridControlUserNotInProfile.MainView = Me.GridViewUserNotInProfile Me.GridControlUserNotInProfile.Name = "GridControlUserNotInProfile" - Me.GridControlUserNotInProfile.ShowOnlyPredefinedDetails = True - Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(1114, 262) + Me.GridControlUserNotInProfile.Size = New System.Drawing.Size(1116, 262) Me.GridControlUserNotInProfile.TabIndex = 96 Me.GridControlUserNotInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserNotInProfile}) ' @@ -1853,17 +1879,14 @@ Partial Class frmAdministration ' Me.GridViewUserNotInProfile.Appearance.EvenRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer)) Me.GridViewUserNotInProfile.Appearance.EvenRow.Options.UseBackColor = True - Me.GridViewUserNotInProfile.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia - Me.GridViewUserNotInProfile.Appearance.FocusedRow.Options.UseBackColor = True Me.GridViewUserNotInProfile.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSurname, Me.GridColumn2, Me.GridColumn3, Me.colID}) Me.GridViewUserNotInProfile.GridControl = Me.GridControlUserNotInProfile Me.GridViewUserNotInProfile.Name = "GridViewUserNotInProfile" Me.GridViewUserNotInProfile.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewUserNotInProfile.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] - Me.GridViewUserNotInProfile.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] - Me.GridViewUserNotInProfile.OptionsSelection.EnableAppearanceFocusedCell = False + Me.GridViewUserNotInProfile.OptionsBehavior.Editable = False + Me.GridViewUserNotInProfile.OptionsBehavior.ReadOnly = True Me.GridViewUserNotInProfile.OptionsSelection.MultiSelect = True - Me.GridViewUserNotInProfile.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect Me.GridViewUserNotInProfile.OptionsView.ColumnAutoWidth = False Me.GridViewUserNotInProfile.OptionsView.EnableAppearanceEvenRow = True Me.GridViewUserNotInProfile.OptionsView.ShowAutoFilterRow = True @@ -1875,7 +1898,7 @@ Partial Class frmAdministration Me.colSurname.FieldName = "Surname" Me.colSurname.Name = "colSurname" Me.colSurname.Visible = True - Me.colSurname.VisibleIndex = 1 + Me.colSurname.VisibleIndex = 0 ' 'GridColumn2 ' @@ -1883,7 +1906,7 @@ Partial Class frmAdministration Me.GridColumn2.Name = "GridColumn2" Me.GridColumn2.OptionsColumn.AllowEdit = False Me.GridColumn2.Visible = True - Me.GridColumn2.VisibleIndex = 2 + Me.GridColumn2.VisibleIndex = 1 Me.GridColumn2.Width = 107 ' 'GridColumn3 @@ -1892,7 +1915,7 @@ Partial Class frmAdministration Me.GridColumn3.Name = "GridColumn3" Me.GridColumn3.OptionsColumn.AllowEdit = False Me.GridColumn3.Visible = True - Me.GridColumn3.VisibleIndex = 3 + Me.GridColumn3.VisibleIndex = 2 Me.GridColumn3.Width = 102 ' 'colID @@ -1906,7 +1929,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(1114, 25) + Me.Label2.Size = New System.Drawing.Size(1116, 25) Me.Label2.TabIndex = 97 Me.Label2.Text = "Nicht zugeordnete Benutzer:" Me.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -1918,7 +1941,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(20, 20) Me.TabPageGroupAssignment.Name = "TabPageGroupAssignment" - Me.TabPageGroupAssignment.Size = New System.Drawing.Size(1114, 568) + Me.TabPageGroupAssignment.Size = New System.Drawing.Size(1116, 568) Me.TabPageGroupAssignment.Text = "Gruppen Zuordnung" ' 'SplitContainer2 @@ -1937,7 +1960,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, 568) + Me.SplitContainer2.Size = New System.Drawing.Size(1116, 568) Me.SplitContainer2.SplitterDistance = 274 Me.SplitContainer2.TabIndex = 0 ' @@ -1948,7 +1971,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(1114, 249) + Me.GridControlGroupInProfile.Size = New System.Drawing.Size(1116, 249) Me.GridControlGroupInProfile.TabIndex = 1 Me.GridControlGroupInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewGroupInProfile}) ' @@ -1998,7 +2021,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(1114, 25) + Me.Label9.Size = New System.Drawing.Size(1116, 25) Me.Label9.TabIndex = 0 Me.Label9.Text = "Zugeordnete Gruppen" Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -2010,7 +2033,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, 265) + Me.GridControlGroupNotInProfile.Size = New System.Drawing.Size(1116, 265) Me.GridControlGroupNotInProfile.TabIndex = 1 Me.GridControlGroupNotInProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewGroupNotInProfile}) ' @@ -2059,7 +2082,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(1114, 25) + Me.Label10.Size = New System.Drawing.Size(1116, 25) Me.Label10.TabIndex = 1 Me.Label10.Text = "Nicht zugeordnete Gruppen:" Me.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -2099,7 +2122,7 @@ Partial Class frmAdministration Me.SplitContainerControl1.Panel1.Text = "Panel1" Me.SplitContainerControl1.Panel2.Controls.Add(Me.XtraTabControl3) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(1365, 602) + Me.SplitContainerControl1.Size = New System.Drawing.Size(1365, 600) Me.SplitContainerControl1.SplitterPosition = 237 Me.SplitContainerControl1.TabIndex = 27 Me.SplitContainerControl1.Text = "SplitContainerControl1" @@ -2163,6 +2186,7 @@ Partial Class frmAdministration Me.Controls.Add(Me.RibbonControl2) Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.IconOptions.Icon = CType(resources.GetObject("frmAdministration.IconOptions.Icon"), System.Drawing.Icon) + Me.KeyPreview = True Me.Name = "frmAdministration" Me.Ribbon = Me.RibbonControl2 Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen @@ -2185,7 +2209,6 @@ Partial Class frmAdministration CType(Me.textEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.textEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBWH_PROFILE_TYPEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit8.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -2379,7 +2402,6 @@ Partial Class frmAdministration Friend WithEvents BarButtonItem14 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonGroup_User As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonGroup_Group As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents ApplicationMenu1 As DevExpress.XtraBars.Ribbon.ApplicationMenu Friend WithEvents BarButtonItem16 As DevExpress.XtraBars.BarButtonItem Friend WithEvents TBDD_CONNECTIONBindingSource As BindingSource Friend WithEvents TBDD_CONNECTIONTableAdapter As MyDatasetTableAdapters.TBDD_CONNECTIONTableAdapter @@ -2487,4 +2509,8 @@ Partial Class frmAdministration Friend WithEvents TBWHSEARCHPOSITIONBindingSource As BindingSource Friend WithEvents TextEdit10 As DevExpress.XtraEditors.LookUpEdit Friend WithEvents textEdit5 As DevExpress.XtraEditors.MemoEdit + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents BarButtonItem28 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem29 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/DD_Clipboard_Searcher/frmAdministration.resx b/app/DD_Clipboard_Searcher/frmAdministration.resx index 04f3aba..8fcdb23 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.resx +++ b/app/DD_Clipboard_Searcher/frmAdministration.resx @@ -123,6 +123,9 @@ 245, 17 + + 245, 17 + 122, 56 @@ -156,68 +159,6 @@ 578, 56 - - 1270, 95 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAtdEVYdFRpdGxlAERCO1NvdXJjZTtTdG9yO2RhdGFz - b3VyY2U7RGF0YWJhc2U7RWRpdCj2upwAAADNSURBVDhPrZOxDcIwEEUzAAVdpqBJpOyQIgtQUDIAHR1i - DJSWHTIANTMwgQsWMP9fsHU5GScIiicryf/PyiUuvPeCux3IGmzBBdzBU8Fr3udz5qSnBRW4Ar8A5ior - 6FVgCb0VOBOYw/1d8PMrNOCbITZWsActyH3GDjArWAFn8AAs78AGrBQlc915qIF/U2tBbgYnU44SLfg0 - A1uOu3PVgtQMjgilylGiBakZZMtg9j+gIIQnZXawTgSpwxQEWiLllIDY46wFQSLFkaF4AT8rvvl6+7Su - AAAAAElFTkSuQmCC - - - - - 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 - Mv35f8qlX/mA3Bh8eSxTAAAAAElFTkSuQmCC - - @@ -473,6 +414,65 @@ TTIzLjEsMjAuMmwtMi44LDIuOEwxNiwxOC44bC00LjIsNC4yICAgbC0yLjgtMi44bDQuMi00LjJsLTQu Mi00LjJsMi44LTIuOGw0LjIsNC4ybDQuMi00LjJsMi44LDIuOEwxOC44LDE2TDIzLjEsMjAuMnoiIGNs YXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAtdEVYdFRpdGxlAERCO1NvdXJjZTtTdG9yO2RhdGFz + b3VyY2U7RGF0YWJhc2U7RWRpdCj2upwAAADNSURBVDhPrZOxDcIwEEUzAAVdpqBJpOyQIgtQUDIAHR1i + DJSWHTIANTMwgQsWMP9fsHU5GScIiicryf/PyiUuvPeCux3IGmzBBdzBU8Fr3udz5qSnBRW4Ar8A5ior + 6FVgCb0VOBOYw/1d8PMrNOCbITZWsActyH3GDjArWAFn8AAs78AGrBQlc915qIF/U2tBbgYnU44SLfg0 + A1uOu3PVgtQMjgilylGiBakZZMtg9j+gIIQnZXawTgSpwxQEWiLllIDY46wFQSLFkaF4AT8rvvl6+7Su + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAtdEVYdFRpdGxlAERCO1NvdXJjZTtTdG9yO2RhdGFz + b3VyY2U7RGF0YWJhc2U7RWRpdCj2upwAAAGlSURBVFhHxZUxTsNAEEVT0CPRcQMKCiQoqBGUkGtQIqoU + IAWOQMdNkGgo0iKUjktAE6QUSCz/ITtydmZDvF7FxZOc2fn/TxyPMwgh9Ipb3CRucZO4xc/JdZNtcSKu + xKN4Fu/iQ3xXcE2NM3roRYN24eVlucVKsC9uxasImaDFAy83yy2qeSimwjPNAa+hl2UKUAk8oy5MvSxT + ADXPInEJZl6WKYCa55G4BHMvyxSA5khcglYD9P4T9P4Q9r6GI3EhSr2I8Bp5WaYAauYZeBN34lTkvorR + 4oFX9hp+iRfxIC7FmdgTO2KrgmtqnNFDLxq0tU/va3jjZZkCqPknEndlfH7/NBCHIlRwnRyg5AZ44Ysh + UgOUWsM43AyRGqDEGqa++dLn1ABd1/BY5qnbDos7khqgyxoeyXhVeA3nxddw1QPX5C8cUgPk/Bu2DofU + AG03YIyuMvdCa5bC0ZhwkGGbNcwKB3QmHGQK665hVjiQZcIB04pdcSBYxdQaYlaHxMF13YQDWSY8B5k1 + w9YKB7TGLAeZxaH/hgNaY5aDzJoDrBUOIYTBL0gqUmOSnmecAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAfdEVYdFRpdGxlAEN1cnJlbmN5O0RvbGxhcjtCdWNr + O0V1cm/480WPAAABg0lEQVQ4T33SzyvDYQDH8YUMmab8C5xJSfkR+QOcRElxnCgUFyuhJOxgK1JuDg6c + ttBmpLiNHOQiOTiJzMGPLcW8P+t56rsxh9f2fZ7n83y2Z89cybMJqw1hJPGBBHwogTOXwz6M4QsZPOEE + 92a8j1LkbLT00oJvKLwFN2rRbOYkgF+bRS8RKPSGKsybsY5hC1Lw4M8CnVmhLjPpRTWuYQukc2p73ZVP + G9SuwDQ0XsMGnqGjhc/j/uGFnWAvGzrgyS84hwpC0HgQi7g9jc0METpExiGNZbiRLdBV2a/ZhAZsHkdn + +wk8wm68RMgxjqJYBcWIQgUPGEUdizFHeAJeFKHPzIlPBaKrW0EamYu4f8QRuoHOG8QkrmDXErbA0lV1 + LO2u9jhC79A3qkE3XmHXUvkF9tfVldmQfGAOlajHJzSfLFSgq0qZkN73cIABaP0OWosUKpCACenTG1GG + coxD899o/a+gAkdQWBJYMs/arJvJ/g8KFUgJfLiAjvKCCNrB+rrrB+GDZXDkfIceAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAfdEVYdFRpdGxlAEN1cnJlbmN5O0RvbGxhcjtCdWNr + O0V1cm/480WPAAADBklEQVRYR8XWO2gUURTG8dVADD5QC23ECJbiCwQbBStFwQh5NomIjY2dYBpNoYUQ + LSzioxRBYpE0KYNpFCEWEUU0IQRMMMHOgAmSB+r6/5Y5cufmzMy6Cha/ZLlzzrlnZ++9M6X5l1c89ehA + P6axgkVMJGPtUIyXW7VyuVzyLjRjCuUCimmBV6MqcQN16IU3WR7lKDesVZW4gVomN8oNa1UlbKANXmH5 + iJvoxCVoDXhxqpGaoIg1oMU0C6+oJmtAmNgIL3YOf7QwrQF9M6/gOKxgF95iDHfgxYviUpPksQYG4BXT + 7db1E/iZjBUZRGqSPNbADOJCZ2C3fjv2JjQex4ZUKzVJHmtgGXGha7DAc9DdkBuIY0Mr3U8flqplDSxE + RWQE1sBdPEuMIo6dx32cRaM3URZrYBJx0QOwBn4nJOMWs4Rbr0eu7+RaB/oxDd2FRUwkY+2oR2pyyVuE + H3AUut4ErX7RuK7r+bCfIs2YQrmAYlrgNpC1DXVbdV2LcTgZ+4GhT8+791CgF95keZRTh1QDWQfRKo6h + Esz/XdiUJOdN/gBbo7GQclMNiB6vcQPyDT3Qb6/tqN+yLSkU+4rHOAnFXcUTaE3EsaqRakBuw2vCfBkb + 6dlB4mxQyLyCFmPlm0XeIY6fQ33cgB6pffAml3skdQZFQoegyU7jMjZjCBcwDi+nK27AtMJ7IWkiaSAq + YuzbatKiNWAGsxoQLUztDp3t2nJakLtJmomKmCNQA9ugNVBNAzN5DaQQbJaT5NgbaGta3DrocNJh5MXL + Si0NLCTJniU8wmFY/BaMwouvqYHJJDmP1oAW4Xko5yC8uJp+gqxF+D74bIvwBZSzEWGsyV2EKQSbrG14 + HPugLajnQwNOQTn67+VkbsM1CDY64byD6CLWI4wV7Q4vXgfRhloaED1e44LyGcNQM7rt+gm+w4tVjTVH + cSYFR27DKyxFB5FyK3X+pgE9UvvgTZBHx/max3EhS3C0otoXksoTMPQvGhAtTO2OQeiVbDWhzxrTtexX + Mv35f8qlX/mA3Bh8eSxTAAAAAElFTkSuQmCC @@ -687,6 +687,53 @@ eT0iMTMuNCIgd2lkdGg9IjE3LjYiIGhlaWdodD0iOC4yIiByeD0iMCIgcnk9IjAiIGNsYXNzPSJCbHVl IiB0cmFuc2Zvcm09Im1hdHJpeCgwLjcwNywgLTAuNzA3MiwgMC43MDcyLCAwLjcwNywgLTguMDcyMSwg MTUuNDA0OCkiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFgEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTWFuYWdlX0RhdGFfU291cmNlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91 + bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuWWVsbG93e2ZpbGw6 + I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMiwxMFY2 + YzAtMi4yLDQuNS00LDEwLTRzMTAsMS44LDEwLDR2NGMwLDIuMi00LjUsNC0xMCw0UzIsMTIuMiwyLDEw + eiBNMTIsMjB2LTAuN2wyLjUtMC40TDEzLDE2LjhsMS0wLjkgIEMxMy4zLDE2LDEyLjcsMTYsMTIsMTZj + LTUuNSwwLTEwLTEuOC0xMC00djRDMiwxOC4yLDYuNSwyMCwxMiwyMHogTTE0LjUsMjUuMUwxMiwyNC43 + VjIyYy01LjUsMC0xMC0xLjgtMTAtNHY0YzAsMi4yLDQuNSw0LDEwLDQgIGMwLjcsMCwxLjMsMCwxLjkt + MC4xTDE0LjUsMjUuMXoiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDxwYXRoIGQ9Ik0zMCwyM3YtMmwtMi4y + LTAuNGMtMC4yLTAuNi0wLjQtMS4zLTAuNy0xLjhsMS4zLTEuOGwtMS40LTEuNGwtMS44LDEuM2MtMC41 + LTAuMy0xLjItMC42LTEuOC0wLjdMMjMsMTRoLTIgIGwtMC40LDIuMmMtMC42LDAuMi0xLjMsMC40LTEu + OCwwLjdsLTEuOC0xLjNsLTEuNCwxLjRsMS4zLDEuOGMtMC4zLDAuNS0wLjYsMS4yLTAuNywxLjhMMTQs + MjF2MmwyLjIsMC40YzAuMiwwLjYsMC40LDEuMywwLjcsMS44ICBsLTEuMywxLjhsMS40LDEuNGwxLjgt + MS4zYzAuNSwwLjMsMS4yLDAuNiwxLjgsMC43TDIxLDMwaDJsMC40LTIuMmMwLjYtMC4yLDEuMy0wLjQs + MS44LTAuN2wxLjgsMS4zbDEuNC0xLjRsLTEuMy0xLjggIGMwLjMtMC41LDAuNi0xLjIsMC43LTEuOEwz + MCwyM3ogTTIyLDI0Yy0xLjEsMC0yLTAuOS0yLTJzMC45LTIsMi0yczIsMC45LDIsMlMyMy4xLDI0LDIy + LDI0eiIgY2xhc3M9IkJsdWUiIC8+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEcDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iRW5jcnlwdCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9Cjwvc3R5bGU+DQogIDxwYXRoIGQ9Ik0xNC4yLDIxYy0wLjEtMC42 + LTAuMi0xLjMtMC4yLTJjMC00LjQsMy4yLTguMSw3LjUtOC45QzIxLjMsMTAuMSwyMS4yLDEwLDIxLDEw + aC0xVjZjMC0zLjMtMi43LTYtNi02aC0yICBDOC43LDAsNiwyLjcsNiw2djRINWMtMC42LDAtMSwwLjQt + MSwxdjEyYzAsMC42LDAuNCwxLDEsMWg2LjJMMTQuMiwyMXogTTgsNmMwLTIuMiwxLjgtNCw0LTRoMmMy + LjIsMCw0LDEuOCw0LDR2NEg4VjZ6IiBjbGFzcz0iWWVsbG93IiAvPg0KICA8cGF0aCBkPSJNMjMsMTJj + LTMuOSwwLTcsMy4xLTcsN2MwLDAuOSwwLjIsMS43LDAuNSwyLjVMMTAsMjh2NGg0di0yaDJ2LTJoMmwy + LjUtMi41YzAuOCwwLjMsMS42LDAuNSwyLjUsMC41ICBjMy45LDAsNy0zLjEsNy03QzMwLDE1LjEsMjYu + OSwxMiwyMywxMnogTTI0LDIwYy0xLjEsMC0yLTAuOS0yLTJjMC0xLjEsMC45LTIsMi0yYzEuMSwwLDIs + MC45LDIsMkMyNiwxOS4xLDI1LjEsMjAsMjQsMjB6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L @@ -834,12 +881,6 @@ MjIuMywyMS40LDIwLDE4eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - 500, 95 - - - 290, 95 - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z @@ -867,6 +908,12 @@ MjEuNCwyMCwxOHoiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + 500, 95 + + + 290, 95 + 862, 56 diff --git a/app/DD_Clipboard_Searcher/frmAdministration.vb b/app/DD_Clipboard_Searcher/frmAdministration.vb index 1425f9d..ace0c84 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.vb @@ -1,6 +1,7 @@ Imports DigitalData.Modules.Database Public Class frmAdministration - Private SelectedProcessName As String + Private _SelectedProcessName As String + Private _DragDrop As ClassDragDrop Private Const MAX_DATA_SEARCHES = 5 Private Const MAX_DOC_SEARCHES = 5 @@ -11,7 +12,6 @@ Public Class frmAdministration Public Overrides Function ToString() As String Return Name - Return Name End Function End Class @@ -25,6 +25,12 @@ Public Class frmAdministration ' Select first tab to prevent profile textbox from being empty XtraTabControl3.SelectedTabPageIndex = 0 + _DragDrop = New ClassDragDrop() + '_DragDrop.AddGridView(GridViewGroupInProfile) + '_DragDrop.AddGridView(GridViewGroupNotInProfile) + _DragDrop.AddGridView(GridViewUserInProfile) + _DragDrop.AddGridView(GridViewUserNotInProfile) + Load_Profiles() Load_ProfileTypes() Load_SearchPositions() @@ -577,11 +583,6 @@ Public Class frmAdministration End Try End Sub - Private Sub BarButtonItem16_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem16.ItemClick - Dim oForm As New frmConnection() - oForm.ShowDialog() - End Sub - Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem9.ItemClick If CtrlApplicationAssignment1.Window_SaveAssignment() = False Then MsgBox("Error while saving window", MsgBoxStyle.Critical, Text) @@ -590,11 +591,6 @@ Public Class frmAdministration End If End Sub - Private Sub BarButtonItem17_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem17.ItemClick - Dim oform As New frmLicenseInfo() - oform.ShowDialog() - End Sub - Private Sub BarButtonItem15_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem15.ItemClick If TBCW_PROF_DOC_SEARCHBindingSource.Count = MAX_DOC_SEARCHES Then MsgBox($"Es können nicht mehr als {MAX_DOC_SEARCHES} Dokument-Suchen angelegt werden!", MsgBoxStyle.Exclamation, Text) @@ -729,4 +725,62 @@ Public Class frmAdministration MsgBox("Profile has been duplicated. Please check the dependencies!", MsgBoxStyle.Information) End If End Sub + + Private Sub BarButtonItem16_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem16.ItemClick + Dim oForm As New frmConnection() + oForm.ShowDialog() + End Sub + + Private Sub BarButtonItem17_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem17.ItemClick + + End Sub + + Private Sub BarButtonItem28_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem28.ItemClick + Dim oForm As New frmConnection() + oForm.ShowDialog() + End Sub + + Private Sub BarButtonItem29_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem29.ItemClick + Dim oform As New frmLicenseInfo() + oform.ShowDialog() + End Sub + + Private Sub frmAdministration_KeyUp(sender As Object, e As KeyEventArgs) Handles Me.KeyUp + If e.KeyCode = Keys.F12 And USER_IS_ADMIN = True Then + frmLicense.ShowDialog() + End If + End Sub + + Private Sub GridControlUserInProfile_DragDrop(sender As Object, e As DragEventArgs) Handles GridControlUserInProfile.DragDrop + 'Try + ' If PROFILE_IDTextBox.Text = String.Empty Then + ' Exit Sub + ' End If + + ' Dim oSelectedRows = GridViewUserNotInProfile.GetSelectedRows() + + ' For Each oRowHandle As Integer In oSelectedRows + ' Dim oRow As DataRow = GridViewUserNotInProfile.GetDataRow(oRowHandle) + ' Dim oGuid As Integer = oRow.Item("ID") + ' Dim insert = String.Format("INSERT INTO TBCW_USER_PROFILE (PROFILE_ID,USER_ID) VALUES ({0},{1})", PROFILE_IDTextBox.Text, oGuid) + ' If Database.ExecuteNonQuery(insert) = False Then + ' MsgBox("Error while adding user!", MsgBoxStyle.Exclamation) + ' End If + ' Next + + ' Refresh_Free_Users(PROFILE_IDTextBox.Text) + ' Refresh_ProfileData() + + ' GridViewUserNotInProfile.ClearSelection() + + ' Status_Changed($"{oSelectedRows.Count} Benutzer zugeordnet") + 'Catch ex As Exception + ' Logger.Error(ex) + ' MsgBox("Unexpected Error while adding user-rights: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + 'End Try + End Sub + + Private Sub GridControlUserNotInProfile_DragDrop(sender As Object, e As DragEventArgs) Handles GridControlUserNotInProfile.DragDrop + + End Sub End Class \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/frmStart.vb b/app/DD_Clipboard_Searcher/frmStart.vb index 0eb1121..4352426 100644 --- a/app/DD_Clipboard_Searcher/frmStart.vb +++ b/app/DD_Clipboard_Searcher/frmStart.vb @@ -4,8 +4,7 @@ Imports System.Globalization Imports DD_Clipboard_Watcher.ClassConstants Imports DD_Clipboard_Watcher.ClassWindowAPI Imports DigitalData.Modules.ZooFlow -Imports DigitalData.Modules.ClipboardWatcher -Imports DigitalData.Modules.Patterns +Imports DigitalData.GUIs.ClipboardWatcher Public Class frmStart Private WithEvents Hotkey As New ClassHotkey(Me) @@ -340,12 +339,6 @@ Public Class frmStart End If End Sub - Private Sub frmMain_KeyUp(sender As Object, e As KeyEventArgs) Handles MyBase.KeyUp - If e.KeyCode = Keys.F12 And USER_IS_ADMIN = True Then - frmLicense.ShowDialog() - End If - End Sub - Private Sub tsmiChangeState_Click(sender As Object, e As EventArgs) Handles tsmiChangeState.Click If tsmiChangeState.Tag = "stop" Then tsmiChangeState.Tag = "start"