diff --git a/GUIs.ZooFlow/Administration/ClassDetailForm.vb b/GUIs.ZooFlow/Administration/ClassDetailForm.vb index 2c2ea18b..5b139f67 100644 --- a/GUIs.ZooFlow/Administration/ClassDetailForm.vb +++ b/GUIs.ZooFlow/Administration/ClassDetailForm.vb @@ -49,12 +49,14 @@ Public Class ClassDetailForm {PAGE_IDB_ATTRIBUTE_REL, New DetailSettings With { .GridTitle = "Attribute-Relations", .[Module] = MODULE_IDB, - .Entity = PAGE_IDB_ATTRIBUTES + .Entity = PAGE_IDB_ATTRIBUTES, + .IsRelationPage = True }}, {PAGE_GI_RELATIONS, New DetailSettings With { .GridTitle = "Globix profile-relations", .[Module] = MODULE_GI, - .Entity = PAGE_GI_RELATIONS + .Entity = PAGE_GI_RELATIONS, + .IsRelationPage = True }}, {PAGE_IDB_DOCTYPE_CONFIG, New DetailSettings With { .GridTitle = "Detail Doctype Configuration", @@ -70,7 +72,8 @@ Public Class ClassDetailForm {PAGE_IDB_DOCTYPE_BE, New DetailSettings With { .GridTitle = "Doctype BE Relations", .[Module] = MODULE_IDB, - .Entity = PAGE_IDB_DOCTYPE_BE + .Entity = PAGE_IDB_DOCTYPE_BE, + .IsRelationPage = True }}, {PAGE_USERS_USERLIST, New DetailSettings With { .GridTitle = "User Overview", @@ -87,7 +90,8 @@ Public Class ClassDetailForm {PAGE_USERS_USER_GROUP_RELATIONS, New DetailSettings With { .GridTitle = "User Group Relations", .[Module] = MODULE_USERS, - .Entity = PAGE_USERS_USER_GROUP_RELATIONS + .Entity = PAGE_USERS_USER_GROUP_RELATIONS, + .IsRelationPage = True }} } @@ -194,11 +198,21 @@ Public Class ClassDetailForm End Try End Function + Public Function TestPageIsRelation(pPageName As String) As Boolean + Return DetailSettingsList.Any(Function(page) page.Key = pPageName And page.Value.IsRelationPage = True) + End Function + Public Class DetailSettings Public Property GridTitle As String Public Property [Module] As String Public Property Entity As String + ''' + ''' This makes sure that the page can be opened even if there are no entries + ''' + ''' + Public Property IsRelationPage As Boolean = False + ''' ''' If this is empty, the button "New Record will be hidden" ''' diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_User.Designer.vb b/GUIs.ZooFlow/Administration/Users/frmAdmin_User.Designer.vb index c64eecce..d37f553e 100644 --- a/GUIs.ZooFlow/Administration/Users/frmAdmin_User.Designer.vb +++ b/GUIs.ZooFlow/Administration/Users/frmAdmin_User.Designer.vb @@ -457,11 +457,12 @@ Partial Class frmAdmin_User Me.Controls.Add(Me.LayoutControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_user Me.KeyPreview = True Me.Name = "frmAdmin_User" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "Benutzer bearbeiten" + Me.Text = "Benutzer bearbeiten - Zooflow" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DSDD_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.Designer.vb b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.Designer.vb similarity index 98% rename from GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.Designer.vb rename to GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.Designer.vb index 7acbc68e..9b5e5912 100644 --- a/GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.Designer.vb +++ b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.Designer.vb @@ -1,5 +1,5 @@  -Partial Class frmAdmin_ImportUser +Partial Class frmAdmin_UserImport Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -247,7 +247,7 @@ Partial Class frmAdmin_ImportUser ' Me.SplashScreenManager1.ClosingDelay = 500 ' - 'frmAdmin_ImportUser + 'frmAdmin_UserImport ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -256,10 +256,10 @@ Partial Class frmAdmin_ImportUser Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.IconOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.text - Me.Name = "frmAdmin_ImportUser" + Me.Name = "frmAdmin_UserImport" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "Active Directory Import" + Me.Text = "Active Directory Import - Zooflow" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl1.Panel1.ResumeLayout(False) diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.resx b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.resx similarity index 100% rename from GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.resx rename to GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.resx diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.vb b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.vb similarity index 99% rename from GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.vb rename to GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.vb index 2aba2ce5..55cfcf97 100644 --- a/GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.vb +++ b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.vb @@ -4,7 +4,7 @@ Imports DigitalData.Modules.Logging Imports DigitalData.GUIs.Common Imports DevExpress.XtraGrid.Views.Grid -Public Class frmAdmin_ImportUser +Public Class frmAdmin_UserImport Private ReadOnly Logger As Logger = My.LogConfig.GetLogger Private ActiveDirectory As ActiveDirectoryInterface @@ -56,7 +56,7 @@ Public Class frmAdmin_ImportUser End Sub Private Sub btnImportUsers_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnImportUsers.ItemClick - Dim oForm As New frmAdmin_ImportUser() + Dim oForm As New frmAdmin_UserImport() oForm.ShowDialog() End Sub diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index 44862208..8f7e6116 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -424,22 +424,21 @@ Partial Class frmAdmin_Start Me.TreeListMenu.AppendNode(New Object() {"Attribute"}, 0, 2, 2, -1, "IDB_ATTRIBUTES") Me.TreeListMenu.AppendNode(New Object() {"Relation Business Entity"}, 1, 9, 9, -1, "ATTRIBUTE_RELATIONS") Me.TreeListMenu.AppendNode(New Object() {"Business Entities"}, 0, 1, 1, -1, "IDB_BUSINESS_ENTITIES") - Me.TreeListMenu.AppendNode(New Object() {Nothing}, 3) Me.TreeListMenu.AppendNode(New Object() {"Doctypes"}, 0, 10, 10, -1, "DOCTYPE_DEF") - Me.TreeListMenu.AppendNode(New Object() {"Configurations"}, 5, 10, 10, -1, "IDB_DOCTYPE_CONFIG") - Me.TreeListMenu.AppendNode(New Object() {"Relation Business Entity"}, 5, 9, 9, -1, "DOCTYPE_BE") + Me.TreeListMenu.AppendNode(New Object() {"Configurations"}, 4, 10, 10, -1, "IDB_DOCTYPE_CONFIG") + Me.TreeListMenu.AppendNode(New Object() {"Relation Business Entity"}, 4, 9, 9, -1, "DOCTYPE_BE") Me.TreeListMenu.AppendNode(New Object() {"Object Stores"}, 0, "IDB_OBJECT_STORES") Me.TreeListMenu.AppendNode(New Object() {"Global Indexer"}, -1, 6, 6, -1, "") - Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 9, 4, 4, -1, "GI_PROFILES") - Me.TreeListMenu.AppendNode(New Object() {"Profile Relations"}, 10, 9, 9, -1, "GI_RELATIONS") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 8, 4, 4, -1, "GI_PROFILES") + Me.TreeListMenu.AppendNode(New Object() {"Profile Relations"}, 9, 9, 9, -1, "GI_RELATIONS") Me.TreeListMenu.AppendNode(New Object() {"Clipboard Watcher"}, -1, 7, 7, -1, "") - Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 12, 4, 4, -1, "CW_PROFILES") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 11, 4, 4, -1, "CW_PROFILES") Me.TreeListMenu.AppendNode(New Object() {"Administration"}, -1) - Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 14, 3, 3, -1, "META_SOURCE_SQL") + Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 13, 3, 3, -1, "META_SOURCE_SQL") Me.TreeListMenu.AppendNode(New Object() {"User Management"}, -1, 11, 11, -1) - Me.TreeListMenu.AppendNode(New Object() {"User List"}, 16, 5, 5, -1, "USERS_USERLIST") - Me.TreeListMenu.AppendNode(New Object() {"Group List"}, 16, 12, 12, -1, "USERS_GROUPLIST") - Me.TreeListMenu.AppendNode(New Object() {"User To Group Relations"}, 16, "USERS_USER_GROUP_RELATIONS") + Me.TreeListMenu.AppendNode(New Object() {"User List"}, 15, 5, 5, -1, "USERS_USERLIST") + Me.TreeListMenu.AppendNode(New Object() {"Group List"}, 15, 12, 12, -1, "USERS_GROUPLIST") + Me.TreeListMenu.AppendNode(New Object() {"User Relations"}, 17, 9, 9, -1, "USERS_USER_GROUP_RELATIONS") Me.TreeListMenu.EndUnboundLoad() Me.TreeListMenu.OptionsBehavior.Editable = False Me.TreeListMenu.OptionsView.ShowColumns = False diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index abe6e38f..75f1592e 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -8,6 +8,7 @@ Imports DigitalData.Modules.Language.Utils Imports DigitalData.GUIs.ZooFlow.Administration.ClassConstants Imports DevExpress.XtraGrid Imports DevExpress.XtraBars +Imports DigitalData.Modules.Language Public Class frmAdmin_Start Private CurrentModule As String @@ -222,8 +223,13 @@ Public Class frmAdmin_Start Try Dim oView As GridView = ViewMain Dim oRowView As DataRowView = oView.GetRow(RowHandle) + + If oRowView Is Nothing Then + Return Nothing + End If + Dim oItem As ClassDetailForm.DetailData = CurrentItem - Dim oGuid = oRowView.Row.Item(oItem.PrimaryKey) + Dim oGuid = oRowView.Row.ItemEx(oItem.PrimaryKey, -1) Return oGuid Catch ex As Exception @@ -256,13 +262,15 @@ Public Class frmAdmin_Start Private Sub btnEditRecord_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnEditRecord.ItemClick Try - If ViewMain.FocusedRowHandle = GridControl.InvalidRowHandle Then + Dim oIsRelationPage = DetailForm.TestPageIsRelation(CurrentPage) + + If ViewMain.FocusedRowHandle = GridControl.InvalidRowHandle And Not oIsRelationPage Then Exit Sub End If Dim oPrimaryKey = Get_PrimaryKey(ViewMain.FocusedRowHandle) - If oPrimaryKey IsNot Nothing Or CurrentPage = PAGE_GI_RELATIONS Then + If oPrimaryKey IsNot Nothing Or oIsRelationPage Then DetailForm.Handle_OpenDetail(oPrimaryKey, CurrentPage, False) End If Catch ex As Exception @@ -271,7 +279,7 @@ Public Class frmAdmin_Start End Sub Private Sub BarButtonItem27_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem27.ItemClick - Dim oForm As New frmAdmin_ImportUser() + Dim oForm As New frmAdmin_UserImport() oForm.ShowDialog() End Sub diff --git a/GUIs.ZooFlow/ClassDragDrop.vb b/GUIs.ZooFlow/ClassDragDrop.vb index 721759a3..adcb3908 100644 --- a/GUIs.ZooFlow/ClassDragDrop.vb +++ b/GUIs.ZooFlow/ClassDragDrop.vb @@ -7,9 +7,22 @@ Imports DigitalData.Modules.Base Public Class ClassDragDrop Inherits BaseClass + Public Enum ResultType + PrimaryKey + RowHandle + End Enum + Private downHitInfo As GridHitInfo = Nothing + Private SelectedResultType As ResultType + Public Sub New(LogConfig As LogConfig) MyBase.New(LogConfig) + SelectedResultType = ResultType.PrimaryKey + End Sub + + Public Sub New(LogConfig As LogConfig, pResultType As ResultType) + MyBase.New(LogConfig) + SelectedResultType = pResultType End Sub Public Sub AddGridView(view As GridView) @@ -62,7 +75,16 @@ Public Class ClassDragDrop If Not IsNothing(row) Then Try - dragDropData = row.Item("GUID") & "|" & source + Dim oKey As String + + Select Case SelectedResultType + Case ResultType.RowHandle + oKey = downHitInfo.RowHandle + Case Else + oKey = row.Item("GUID") + End Select + + dragDropData = $"{oKey}|{source}" view.GridControl.DoDragDrop(dragDropData, DragDropEffects.Move) downHitInfo = Nothing diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index ee7d2f58..46219dd1 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -540,6 +540,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_user() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_user", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -550,6 +560,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property allowuserstoeditranges() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("allowuserstoeditranges", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index 29559b2d..4537a70d 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -121,6 +121,12 @@ ..\Resources\save8.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\editnames.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -142,8 +148,11 @@ ..\Resources\doublenext2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\Hamburger_icon.svg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -151,8 +160,11 @@ ..\Resources\servermode.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -190,8 +202,8 @@ ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -208,9 +220,6 @@ ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -313,14 +322,17 @@ ..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\allowuserstoeditranges.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\deletetable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -331,8 +343,8 @@ ..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -340,14 +352,11 @@ ..\Resources\ZooFlow_CW_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -397,14 +406,14 @@ ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\previousview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_check6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\Hamburger_icon.svg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -412,8 +421,8 @@ ..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -433,17 +442,14 @@ ..\Resources\save6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\deletetable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -481,8 +487,8 @@ ..\Resources\managedatasource2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -511,8 +517,8 @@ ..\Resources\windows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -520,13 +526,13 @@ ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\bo_validation1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\previousview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_user.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_user.svg b/GUIs.ZooFlow/Resources/actions_user.svg new file mode 100644 index 00000000..8c183040 --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_user.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/allowuserstoeditranges.svg b/GUIs.ZooFlow/Resources/allowuserstoeditranges.svg new file mode 100644 index 00000000..6497af97 --- /dev/null +++ b/GUIs.ZooFlow/Resources/allowuserstoeditranges.svg @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 4019d3b4..72dc453a 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -229,10 +229,10 @@ Form - - frmAdmin_ImportUser.vb + + frmAdmin_UserImport.vb - + Form @@ -479,8 +479,8 @@ frmSQLDesigner.vb - - frmAdmin_ImportUser.vb + + frmAdmin_UserImport.vb frmAdmin_User.vb @@ -1068,6 +1068,8 @@ + +