diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index 68b5975..d7222e6 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -164,19 +164,19 @@ False - True - ..\..\..\..\Interop.WINDREAMLib.dll + False + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll - ..\..\..\..\Interop.WMOBRWSLib.dll + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll True - ..\..\..\..\Interop.WMOSRCHLib.dll + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll True - ..\..\..\..\Interop.WMOTOOLLib.dll + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll True diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 1c2c45c..01d9c02 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -124,6 +124,10 @@ Partial Class frmMain Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() Me.bwBasicData = New System.ComponentModel.BackgroundWorker() Me.DocumentViewerBarManager1 = New DevExpress.XtraPrinting.Preview.DocumentViewerBarManager(Me.components) + Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() Me.PrintPreviewStaticItem1 = New DevExpress.XtraPrinting.Preview.PrintPreviewStaticItem() Me.ProgressBarEditItem1 = New DevExpress.XtraPrinting.Preview.ProgressBarEditItem() Me.RepositoryItemProgressBar2 = New DevExpress.XtraEditors.Repository.RepositoryItemProgressBar() @@ -131,10 +135,6 @@ Partial Class frmMain Me.PrintPreviewStaticItem2 = New DevExpress.XtraPrinting.Preview.PrintPreviewStaticItem() Me.ZoomTrackBarEditItem1 = New DevExpress.XtraPrinting.Preview.ZoomTrackBarEditItem() Me.RepositoryItemZoomTrackBar1 = New DevExpress.XtraEditors.Repository.RepositoryItemZoomTrackBar() - Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() - Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() - Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() - Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() Me.bbiDocumentMap = New DevExpress.XtraPrinting.Preview.PrintPreviewBarItem() Me.bbiParameters = New DevExpress.XtraPrinting.Preview.PrintPreviewBarItem() Me.bbiThumbnails = New DevExpress.XtraPrinting.Preview.PrintPreviewBarItem() @@ -190,6 +190,7 @@ Partial Class frmMain Me.PrintPreviewBarCheckItem17 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() Me.PrintPreviewBarCheckItem18 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() Me.PrintPreviewBarCheckItem19 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainerDashboard, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerDashboard.Panel1.SuspendLayout() Me.SplitContainerDashboard.Panel2.SuspendLayout() @@ -709,9 +710,9 @@ Partial Class frmMain 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.BarButtonItem2}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 17 + Me.RibbonControl1.MaxItemId = 18 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.QuickToolbarItemLinks.Add(Me.bbtnitemInfo) @@ -869,6 +870,7 @@ Partial Class frmMain Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtniMetadataFile) Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtniMonitor) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") ' @@ -939,6 +941,30 @@ Partial Class frmMain Me.DocumentViewerBarManager1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar2, Me.RepositoryItemZoomTrackBar1, Me.PrintPreviewRepositoryItemComboBox1}) Me.DocumentViewerBarManager1.TransparentEditorsMode = DevExpress.Utils.DefaultBoolean.[True] ' + 'barDockControlTop + ' + Me.barDockControlTop.CausesValidation = False + resources.ApplyResources(Me.barDockControlTop, "barDockControlTop") + Me.barDockControlTop.Manager = Me.DocumentViewerBarManager1 + ' + 'barDockControlBottom + ' + Me.barDockControlBottom.CausesValidation = False + resources.ApplyResources(Me.barDockControlBottom, "barDockControlBottom") + Me.barDockControlBottom.Manager = Me.DocumentViewerBarManager1 + ' + 'barDockControlLeft + ' + Me.barDockControlLeft.CausesValidation = False + resources.ApplyResources(Me.barDockControlLeft, "barDockControlLeft") + Me.barDockControlLeft.Manager = Me.DocumentViewerBarManager1 + ' + 'barDockControlRight + ' + Me.barDockControlRight.CausesValidation = False + resources.ApplyResources(Me.barDockControlRight, "barDockControlRight") + Me.barDockControlRight.Manager = Me.DocumentViewerBarManager1 + ' 'PrintPreviewStaticItem1 ' Me.PrintPreviewStaticItem1.Border = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder @@ -1000,30 +1026,6 @@ Partial Class frmMain Me.RepositoryItemZoomTrackBar1.Maximum = 180 Me.RepositoryItemZoomTrackBar1.Name = "RepositoryItemZoomTrackBar1" ' - 'barDockControlTop - ' - Me.barDockControlTop.CausesValidation = False - resources.ApplyResources(Me.barDockControlTop, "barDockControlTop") - Me.barDockControlTop.Manager = Me.DocumentViewerBarManager1 - ' - 'barDockControlBottom - ' - Me.barDockControlBottom.CausesValidation = False - resources.ApplyResources(Me.barDockControlBottom, "barDockControlBottom") - Me.barDockControlBottom.Manager = Me.DocumentViewerBarManager1 - ' - 'barDockControlLeft - ' - Me.barDockControlLeft.CausesValidation = False - resources.ApplyResources(Me.barDockControlLeft, "barDockControlLeft") - Me.barDockControlLeft.Manager = Me.DocumentViewerBarManager1 - ' - 'barDockControlRight - ' - Me.barDockControlRight.CausesValidation = False - resources.ApplyResources(Me.barDockControlRight, "barDockControlRight") - Me.barDockControlRight.Manager = Me.DocumentViewerBarManager1 - ' 'bbiDocumentMap ' Me.bbiDocumentMap.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.Check @@ -1501,6 +1503,12 @@ Partial Class frmMain Me.PrintPreviewBarCheckItem19.Id = 58 Me.PrintPreviewBarCheckItem19.Name = "PrintPreviewBarCheckItem19" ' + 'BarButtonItem2 + ' + resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") + Me.BarButtonItem2.Id = 17 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' 'frmMain ' Me.Appearance.Options.UseFont = True @@ -1740,4 +1748,5 @@ Partial Class frmMain Friend WithEvents PrintPreviewBarCheckItem17 As DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem Friend WithEvents PrintPreviewBarCheckItem18 As DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem Friend WithEvents PrintPreviewBarCheckItem19 As DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 3095ac6..ce6e54c 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -659,7 +659,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAARwBBgEcAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAASQBBgEkAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1783,6 +1783,9 @@ Sync in Progress + + BarButtonItem2 + 0, 0 @@ -2981,6 +2984,12 @@ DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem, DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmMain