diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index cba27296..e2a874b6 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -370,5 +370,8 @@ + + + \ No newline at end of file diff --git a/GUIs.Common/My Project/Resources.Designer.vb b/GUIs.Common/My Project/Resources.Designer.vb index d9a2e0e5..8c3a8099 100644 --- a/GUIs.Common/My Project/Resources.Designer.vb +++ b/GUIs.Common/My Project/Resources.Designer.vb @@ -260,6 +260,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property insertpagecount() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("insertpagecount", 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.Common/My Project/Resources.resx b/GUIs.Common/My Project/Resources.resx index 74e4d2ef..752211a8 100644 --- a/GUIs.Common/My Project/Resources.resx +++ b/GUIs.Common/My Project/Resources.resx @@ -145,9 +145,6 @@ ..\Resources\ZooFlow-Vergroessern.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 - ..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -160,15 +157,24 @@ ..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\copy.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\refreshallpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\enablescrolling.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -199,14 +205,11 @@ ..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -226,13 +229,13 @@ ..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\insertpagecount.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.Common/My Project/licenses.licx b/GUIs.Common/My Project/licenses.licx index d8909bca..a411537a 100644 --- a/GUIs.Common/My Project/licenses.licx +++ b/GUIs.Common/My Project/licenses.licx @@ -1,9 +1,10 @@ -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb index b2b29418..788532c8 100644 --- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb +++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb @@ -31,6 +31,7 @@ Partial Class ctrlObjectPropertyDialog Me.ViewObjectHistory = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.RepositoryItemDateEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemDateEdit() Me.progressLifecycle = New DevExpress.XtraEditors.ProgressBarControl() Me.txtObjectId = New DevExpress.XtraEditors.TextEdit() Me.txtCreatedWhen = New DevExpress.XtraEditors.TextEdit() @@ -57,6 +58,11 @@ Partial Class ctrlObjectPropertyDialog Me.XtraTabPageAttributeHistory = New DevExpress.XtraTab.XtraTabPage() Me.GridValueHistory = New DevExpress.XtraGrid.GridControl() Me.ViewValueHistory = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridColumn3 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn() Me.XtraTabPageVersions = New DevExpress.XtraTab.XtraTabPage() Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) Me.d = New DevExpress.XtraBars.Bar() @@ -74,6 +80,8 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControl1.SuspendLayout() CType(Me.GridObjectHistory, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewObjectHistory, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemDateEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemDateEdit1.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.progressLifecycle.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtObjectId.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtCreatedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -149,10 +157,11 @@ Partial Class ctrlObjectPropertyDialog ' 'GridObjectHistory ' - Me.GridObjectHistory.Location = New System.Drawing.Point(22, 265) + Me.GridObjectHistory.Location = New System.Drawing.Point(22, 269) Me.GridObjectHistory.MainView = Me.ViewObjectHistory Me.GridObjectHistory.Name = "GridObjectHistory" - Me.GridObjectHistory.Size = New System.Drawing.Size(459, 285) + Me.GridObjectHistory.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemDateEdit1}) + Me.GridObjectHistory.Size = New System.Drawing.Size(459, 282) Me.GridObjectHistory.TabIndex = 9 Me.GridObjectHistory.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewObjectHistory}) ' @@ -175,16 +184,26 @@ Partial Class ctrlObjectPropertyDialog 'GridColumn2 ' Me.GridColumn2.Caption = "Datum" + Me.GridColumn2.DisplayFormat.FormatString = "g" + Me.GridColumn2.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime Me.GridColumn2.FieldName = "ADDED_WHEN" Me.GridColumn2.Name = "GridColumn2" Me.GridColumn2.Visible = True Me.GridColumn2.VisibleIndex = 1 ' + 'RepositoryItemDateEdit1 + ' + Me.RepositoryItemDateEdit1.AutoHeight = False + Me.RepositoryItemDateEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemDateEdit1.Name = "RepositoryItemDateEdit1" + Me.RepositoryItemDateEdit1.UseMaskAsDisplayFormat = True + ' 'progressLifecycle ' - Me.progressLifecycle.Location = New System.Drawing.Point(24, 630) + Me.progressLifecycle.Location = New System.Drawing.Point(24, 631) Me.progressLifecycle.Name = "progressLifecycle" - Me.progressLifecycle.Size = New System.Drawing.Size(455, 14) + Me.progressLifecycle.Size = New System.Drawing.Size(455, 13) Me.progressLifecycle.StyleController = Me.LayoutControl1 Me.progressLifecycle.TabIndex = 7 ' @@ -255,10 +274,10 @@ Partial Class ctrlObjectPropertyDialog 'LayoutControlGroup1 ' Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2}) - Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 222) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 226) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" Me.LayoutControlGroup1.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) - Me.LayoutControlGroup1.Size = New System.Drawing.Size(483, 330) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(483, 327) Me.LayoutControlGroup1.Text = "Objekt Historie" ' 'LayoutControlItem2 @@ -267,7 +286,7 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(9, 9, 9, 9) - Me.LayoutControlItem2.Size = New System.Drawing.Size(477, 303) + Me.LayoutControlItem2.Size = New System.Drawing.Size(477, 300) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem2.TextVisible = False ' @@ -276,7 +295,7 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.EmptySpaceItem1, Me.LayoutControlItem1, Me.LayoutControlItem3, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7}) Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup2.Name = "LayoutControlGroup2" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(483, 222) + Me.LayoutControlGroup2.Size = New System.Drawing.Size(483, 226) Me.LayoutControlGroup2.Text = "Eigenschaften" ' 'EmptySpaceItem1 @@ -284,7 +303,7 @@ Partial Class ctrlObjectPropertyDialog Me.EmptySpaceItem1.AllowHotTrack = False Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 90) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(459, 87) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(459, 91) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem1 @@ -350,9 +369,9 @@ Partial Class ctrlObjectPropertyDialog 'LayoutControlGroup3 ' Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem4, Me.lbLifecycleStart, Me.lbLifecycleEnd}) - Me.LayoutControlGroup3.Location = New System.Drawing.Point(0, 552) + Me.LayoutControlGroup3.Location = New System.Drawing.Point(0, 553) Me.LayoutControlGroup3.Name = "LayoutControlGroup3" - Me.LayoutControlGroup3.Size = New System.Drawing.Size(483, 96) + Me.LayoutControlGroup3.Size = New System.Drawing.Size(483, 95) Me.LayoutControlGroup3.Text = "Lebenszyklus" ' 'LayoutControlItem4 @@ -360,7 +379,7 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControlItem4.Control = Me.progressLifecycle Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 33) Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Size = New System.Drawing.Size(459, 18) + Me.LayoutControlItem4.Size = New System.Drawing.Size(459, 17) Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem4.TextVisible = False ' @@ -416,7 +435,6 @@ Partial Class ctrlObjectPropertyDialog ' Me.XtraTabPageAttributeHistory.Controls.Add(Me.GridValueHistory) Me.XtraTabPageAttributeHistory.Name = "XtraTabPageAttributeHistory" - Me.XtraTabPageAttributeHistory.PageEnabled = False Me.XtraTabPageAttributeHistory.Size = New System.Drawing.Size(503, 668) Me.XtraTabPageAttributeHistory.Text = "Attribut Historie" ' @@ -432,11 +450,52 @@ Partial Class ctrlObjectPropertyDialog ' 'ViewValueHistory ' + Me.ViewValueHistory.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn4, Me.GridColumn5, Me.GridColumn6, Me.GridColumn7}) Me.ViewValueHistory.GridControl = Me.GridValueHistory Me.ViewValueHistory.Name = "ViewValueHistory" Me.ViewValueHistory.OptionsView.ShowGroupPanel = False Me.ViewValueHistory.OptionsView.ShowIndicator = False ' + 'GridColumn3 + ' + Me.GridColumn3.Caption = "Attribut" + Me.GridColumn3.FieldName = "Attribute" + Me.GridColumn3.Name = "GridColumn3" + Me.GridColumn3.Visible = True + Me.GridColumn3.VisibleIndex = 0 + ' + 'GridColumn4 + ' + Me.GridColumn4.Caption = "Alter Wert" + Me.GridColumn4.FieldName = "Old value" + Me.GridColumn4.Name = "GridColumn4" + Me.GridColumn4.Visible = True + Me.GridColumn4.VisibleIndex = 1 + ' + 'GridColumn5 + ' + Me.GridColumn5.Caption = "Neuer Wert" + Me.GridColumn5.FieldName = "New value" + Me.GridColumn5.Name = "GridColumn5" + Me.GridColumn5.Visible = True + Me.GridColumn5.VisibleIndex = 2 + ' + 'GridColumn6 + ' + Me.GridColumn6.Caption = "Datum" + Me.GridColumn6.FieldName = "Changed when" + Me.GridColumn6.Name = "GridColumn6" + Me.GridColumn6.Visible = True + Me.GridColumn6.VisibleIndex = 3 + ' + 'GridColumn7 + ' + Me.GridColumn7.Caption = "Benutzer" + Me.GridColumn7.FieldName = "Changed who" + Me.GridColumn7.Name = "GridColumn7" + Me.GridColumn7.Visible = True + Me.GridColumn7.VisibleIndex = 4 + ' 'XtraTabPageVersions ' Me.XtraTabPageVersions.Name = "XtraTabPageVersions" @@ -535,6 +594,8 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControl1.ResumeLayout(False) CType(Me.GridObjectHistory, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewObjectHistory, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemDateEdit1.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemDateEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.progressLifecycle.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtObjectId.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtCreatedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -610,4 +671,10 @@ Partial Class ctrlObjectPropertyDialog Friend WithEvents XtraTabPageVersions As DevExpress.XtraTab.XtraTabPage Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn3 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn4 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn5 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn6 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn7 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents RepositoryItemDateEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemDateEdit End Class diff --git a/GUIs.Common/Resources/insertpagecount.svg b/GUIs.Common/Resources/insertpagecount.svg new file mode 100644 index 00000000..826e37b2 --- /dev/null +++ b/GUIs.Common/Resources/insertpagecount.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.Common/frmDocumentResultList.Designer.vb b/GUIs.Common/frmDocumentResultList.Designer.vb index 1e0eab61..8c952277 100644 --- a/GUIs.Common/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/frmDocumentResultList.Designer.vb @@ -63,18 +63,21 @@ Partial Class frmDocumentResultList Me.BarWorkspaceMenuItem1 = New DevExpress.XtraBars.BarWorkspaceMenuItem() Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components) Me.RibbonPageCategoryFile = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() - Me.RibbonPage4 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageActions1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupFilesystem = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageActions2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup8 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageCategoryAttribute = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() + Me.RibbonPageAttribute = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup_Navigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup9 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupExport = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup9 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup_Layout = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() @@ -167,6 +170,7 @@ Partial Class frmDocumentResultList Me.GridView1.Name = "GridView1" Me.GridView1.OptionsBehavior.Editable = False Me.GridView1.OptionsBehavior.ReadOnly = True + Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False Me.GridView1.OptionsView.ShowAutoFilterRow = True Me.GridView1.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[False] Me.GridView1.OptionsView.ShowIndicator = False @@ -190,9 +194,9 @@ Partial Class frmDocumentResultList resources.ApplyResources(Me.RibbonControl, "RibbonControl") Me.RibbonControl.MaxItemId = 46 Me.RibbonControl.Name = "RibbonControl" - Me.RibbonControl.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryFile}) + Me.RibbonControl.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryFile, Me.RibbonPageCategoryAttribute}) Me.RibbonControl.PageHeaderItemLinks.Add(Me.BarWorkspaceMenuItem1) - Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2}) + Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPage2}) Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl.ShowToolbarCustomizeItem = False @@ -232,7 +236,9 @@ Partial Class frmDocumentResultList ' resources.ApplyResources(Me.labelResultCount, "labelResultCount") Me.labelResultCount.Id = 8 + Me.labelResultCount.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.insertpagecount Me.labelResultCount.Name = "labelResultCount" + Me.labelResultCount.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' 'BarButtonBack ' @@ -456,21 +462,18 @@ Partial Class frmDocumentResultList Me.RibbonPageCategoryFile.Appearance.BackColor = System.Drawing.Color.DarkGreen Me.RibbonPageCategoryFile.Appearance.Options.UseBackColor = True Me.RibbonPageCategoryFile.Name = "RibbonPageCategoryFile" - Me.RibbonPageCategoryFile.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage4, Me.RibbonPage3}) + Me.RibbonPageCategoryFile.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageActions1, Me.RibbonPageActions2}) resources.ApplyResources(Me.RibbonPageCategoryFile, "RibbonPageCategoryFile") ' - 'RibbonPage4 + 'RibbonPageActions1 ' - Me.RibbonPage4.Appearance.BackColor = System.Drawing.Color.Green - Me.RibbonPage4.Appearance.Options.UseBackColor = True - Me.RibbonPage4.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroupFilesystem}) - Me.RibbonPage4.Name = "RibbonPage4" - resources.ApplyResources(Me.RibbonPage4, "RibbonPage4") + Me.RibbonPageActions1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroupFilesystem}) + Me.RibbonPageActions1.Name = "RibbonPageActions1" + resources.ApplyResources(Me.RibbonPageActions1, "RibbonPageActions1") ' 'RibbonPageGroup3 ' Me.RibbonPageGroup3.ItemLinks.Add(Me.MenuItemFileOpen) - Me.RibbonPageGroup3.ItemLinks.Add(Me.MenuItemSaveProperties) Me.RibbonPageGroup3.ItemLinks.Add(Me.MenuItemPropertiesECM) Me.RibbonPageGroup3.Name = "RibbonPageGroup3" resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") @@ -483,11 +486,11 @@ Partial Class frmDocumentResultList Me.RibbonPageGroupFilesystem.Name = "RibbonPageGroupFilesystem" resources.ApplyResources(Me.RibbonPageGroupFilesystem, "RibbonPageGroupFilesystem") ' - 'RibbonPage3 + 'RibbonPageActions2 ' - Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4, Me.RibbonPageGroup8}) - Me.RibbonPage3.Name = "RibbonPage3" - resources.ApplyResources(Me.RibbonPage3, "RibbonPage3") + Me.RibbonPageActions2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4, Me.RibbonPageGroup8}) + Me.RibbonPageActions2.Name = "RibbonPageActions2" + resources.ApplyResources(Me.RibbonPageActions2, "RibbonPageActions2") ' 'RibbonPageGroup4 ' @@ -503,11 +506,31 @@ Partial Class frmDocumentResultList Me.RibbonPageGroup8.Name = "RibbonPageGroup8" resources.ApplyResources(Me.RibbonPageGroup8, "RibbonPageGroup8") ' - 'RibbonPage1 + 'RibbonPageCategoryAttribute ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroup9, Me.RibbonPageGroupExport, Me.RibbonPageGroup5}) - Me.RibbonPage1.Name = "RibbonPage1" - resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") + Me.RibbonPageCategoryAttribute.Appearance.BackColor = System.Drawing.Color.DodgerBlue + Me.RibbonPageCategoryAttribute.Appearance.Options.UseBackColor = True + Me.RibbonPageCategoryAttribute.Name = "RibbonPageCategoryAttribute" + Me.RibbonPageCategoryAttribute.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageAttribute}) + resources.ApplyResources(Me.RibbonPageCategoryAttribute, "RibbonPageCategoryAttribute") + ' + 'RibbonPageAttribute + ' + Me.RibbonPageAttribute.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2}) + Me.RibbonPageAttribute.Name = "RibbonPageAttribute" + resources.ApplyResources(Me.RibbonPageAttribute, "RibbonPageAttribute") + ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.MenuItemSaveProperties) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") + ' + 'RibbonPageStart + ' + Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroupExport, Me.RibbonPageGroup5}) + Me.RibbonPageStart.Name = "RibbonPageStart" + resources.ApplyResources(Me.RibbonPageStart, "RibbonPageStart") ' 'RibbonPageGroup_Navigation ' @@ -516,16 +539,6 @@ Partial Class frmDocumentResultList Me.RibbonPageGroup_Navigation.Name = "RibbonPageGroup_Navigation" resources.ApplyResources(Me.RibbonPageGroup_Navigation, "RibbonPageGroup_Navigation") ' - 'RibbonPageGroup9 - ' - Me.RibbonPageGroup9.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowQuickfilter) - Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowGrouping) - Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowTitle) - Me.RibbonPageGroup9.ItemLinks.Add(Me.BarButtonItem11) - Me.RibbonPageGroup9.Name = "RibbonPageGroup9" - resources.ApplyResources(Me.RibbonPageGroup9, "RibbonPageGroup9") - ' 'RibbonPageGroupExport ' Me.RibbonPageGroupExport.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far @@ -542,10 +555,19 @@ Partial Class frmDocumentResultList ' 'RibbonPage2 ' - Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup_Layout}) + Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup9, Me.RibbonPageGroup1, Me.RibbonPageGroup_Layout}) Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' + 'RibbonPageGroup9 + ' + Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowQuickfilter) + Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowGrouping) + Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowTitle) + Me.RibbonPageGroup9.ItemLinks.Add(Me.BarButtonItem11) + Me.RibbonPageGroup9.Name = "RibbonPageGroup9" + resources.ApplyResources(Me.RibbonPageGroup9, "RibbonPageGroup9") + ' 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonResetLayout) @@ -783,7 +805,7 @@ Partial Class frmDocumentResultList End Sub Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl - Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageStart As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup_Layout As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents SwitchMainContainerHorizontal As DevExpress.XtraBars.BarToggleSwitchItem @@ -828,7 +850,7 @@ Partial Class frmDocumentResultList Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPage4 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageActions1 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageGroupFilesystem As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup @@ -843,7 +865,7 @@ Partial Class frmDocumentResultList Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem Friend WithEvents CtrlObjectPropertyDialog As ctrlObjectPropertyDialog Friend WithEvents RibbonPageCategoryFile As DevExpress.XtraBars.Ribbon.RibbonPageCategory - Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageActions2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem @@ -859,4 +881,7 @@ Partial Class frmDocumentResultList Friend WithEvents BarButtonItem11 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarWorkspaceMenuItem1 As DevExpress.XtraBars.BarWorkspaceMenuItem Friend WithEvents WorkspaceManager1 As DevExpress.Utils.WorkspaceManager + Friend WithEvents RibbonPageCategoryAttribute As DevExpress.XtraBars.Ribbon.RibbonPageCategory + Friend WithEvents RibbonPageAttribute As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/GUIs.Common/frmDocumentResultList.resx b/GUIs.Common/frmDocumentResultList.resx index 0471653c..ccb0a3a6 100644 --- a/GUIs.Common/frmDocumentResultList.resx +++ b/GUIs.Common/frmDocumentResultList.resx @@ -469,7 +469,7 @@ Titel anzeigen - Speichern + Änderungen Speichern Spaltenauswahl @@ -993,10 +993,10 @@ DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPage4 + + RibbonPageActions1 - + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1011,10 +1011,10 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPage3 + + RibbonPageActions2 - + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1029,10 +1029,28 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPage1 + + RibbonPageCategoryAttribute - + + DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageAttribute + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup2 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageStart + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1041,12 +1059,6 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup9 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RibbonPageGroupExport @@ -1065,6 +1077,12 @@ DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPageGroup9 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPageGroup1 @@ -1152,7 +1170,7 @@ Dateien und Ordner - + Aktionen 1 @@ -1161,27 +1179,36 @@ Bearbeiten - + Aktionen 2 Datei + + Attribute + + + Aktionen + + + Attribute + Navigation - - Tabellen Einstellungen - Export Aktualisieren - + Start + + Tabellen Einstellungen + RibbonPageGroup1 diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb index 9c557087..2cdf934f 100644 --- a/GUIs.Common/frmDocumentResultList.vb +++ b/GUIs.Common/frmDocumentResultList.vb @@ -215,7 +215,10 @@ Public Class frmDocumentResultList Dim oDocumentInfo As DocumentResultList.Document = Nothing ' Show Ribbon Category - RibbonPageCategoryFile.Visible = True + If RibbonPageCategoryFile.Visible = False Then + RibbonPageCategoryFile.Visible = True + RibbonControl.SelectedPage = RibbonPageActions1 + End If ' Load DocumentInfo oDocumentInfo = Documentloader.Load(oObjectId, oFullPath) @@ -254,6 +257,7 @@ Public Class frmDocumentResultList End If Else RibbonPageCategoryFile.Visible = False + RibbonControl.SelectedPage = RibbonPageStart End If Catch ex As Exception ErrorHandler.ShowErrorMessage(ex, "GridView_FocusedRowChanged") @@ -575,6 +579,15 @@ Public Class frmDocumentResultList End Try Next + For Each oColumn As BandedGridColumn In GridView.Columns + + If oColumn.ColumnType.Name = "DateTime" Then + oColumn.DisplayFormat.FormatType = FormatType.DateTime + oColumn.DisplayFormat.FormatString = "g" + End If + + Next + 'Dim oCreated, oChanged As String 'If UserLanguage = State.UserState.LANG_DE_DE Then ' oChanged = "Geändert" @@ -952,4 +965,13 @@ Public Class frmDocumentResultList Private Sub BarButtonItem11_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem11.ItemClick GridView1.ShowCustomization() End Sub + + Private Sub CtrlObjectPropertyDialog_Enter(sender As Object, e As EventArgs) Handles CtrlObjectPropertyDialog.Enter + RibbonPageCategoryAttribute.Visible = True + RibbonControl.SelectedPage = RibbonPageAttribute + End Sub + + Private Sub CtrlObjectPropertyDialog_Leave(sender As Object, e As EventArgs) Handles CtrlObjectPropertyDialog.Leave + RibbonPageCategoryAttribute.Visible = False + End Sub End Class \ No newline at end of file