From 540eeae31afec3d7d26b24289397d5a1df30d03a Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 28 Jan 2020 10:43:16 +0100 Subject: [PATCH] MS: DocumentViewer --- Controls.DocumentViewer/DocumentViewer.vb | 24 +- Controls.LookupGrid/My Project/licenses.licx | 1 + Controls.LookupGrid/frmLookupGrid.Designer.vb | 2 +- Controls.LookupGrid/frmLookupGrid.vb | 2 +- GUIs.ClientSuite/ClientSuite.vbproj | 30 +- GUIs.ClientSuite/ClientSuite.vbproj.bak | 546 ++++++++++++++++++ GUIs.ClientSuite/My Project/licenses.licx | 20 +- GUIs.ClientSuite/My Project/licenses.licx.bak | 17 + .../DataResultList/frmDataResultList.vb | 2 +- .../frmDocumentResultList.vb | 2 +- 10 files changed, 602 insertions(+), 44 deletions(-) create mode 100644 GUIs.ClientSuite/ClientSuite.vbproj.bak create mode 100644 GUIs.ClientSuite/My Project/licenses.licx.bak diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index 35668297..0309e5b8 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -174,7 +174,7 @@ Public Class DocumentViewer Dim result As String = "" Select Case GdViewer.GetDocumentType() Case DocumentType.DocumentTypeBitmap - result = "Bilddatei" + result = "Imagefile" Case DocumentType.DocumentTypeMetaFile result = "Metafile" Case DocumentType.DocumentTypePDF @@ -182,13 +182,21 @@ Public Class DocumentViewer Case DocumentType.DocumentTypeSVG result = "SVG" Case DocumentType.DocumentTypeTXT - result = "Textdatei" + result = "textfile" Case DocumentType.DocumentTypeUnknown - result = "Unbekannt" + result = "Unknown" End Select Return result End Function + Public Sub RightOnlyView(oValueRight As Boolean) + If oValueRight = True Then + btnPrint.Visible = False + Else + btnPrint.Visible = True + End If + + End Sub Private Sub UpdateMainUi() Exit Sub @@ -470,11 +478,11 @@ Public Class DocumentViewer heightInches = GdViewer.PageHeight / GdViewer.VerticalResolution End If - Me.ToolStripStatusLabel1.Text = "Typ: " + GetDocumentTypeLabel() + " - " + - "Seitengröße (zoll): " + Trim(Str(Math.Round(widthInches, 2))) + " × " + Trim(Str(Math.Round(heightInches, 2))) + " - " + - "Seitengröße (pixel): " + Trim(Str(GdViewer.PageWidth)) + " × " + Trim(Str(GdViewer.PageHeight)) + " - " + - "Horizontale Auflösung: " + Trim(Str(Math.Round(GdViewer.HorizontalResolution, 2))) + " DPI - " + - "Vertikale Auflösung: " + Trim(Str(Math.Round(GdViewer.VerticalResolution, 2))) + " DPI" + Me.ToolStripStatusLabel1.Text = "Type: " + GetDocumentTypeLabel() + " - " + + "Pagesize (zoll): " + Trim(Str(Math.Round(widthInches, 2))) + " × " + Trim(Str(Math.Round(heightInches, 2))) + " - " + + "Pagesize (pixel): " + Trim(Str(GdViewer.PageWidth)) + " × " + Trim(Str(GdViewer.PageHeight)) + " - " + + "Horizontal resolution: " + Trim(Str(Math.Round(GdViewer.HorizontalResolution, 2))) + " DPI - " + + "Vertical resolution: " + Trim(Str(Math.Round(GdViewer.VerticalResolution, 2))) + " DPI" End Sub diff --git a/Controls.LookupGrid/My Project/licenses.licx b/Controls.LookupGrid/My Project/licenses.licx index e69de29b..fb064627 100644 --- a/Controls.LookupGrid/My Project/licenses.licx +++ b/Controls.LookupGrid/My Project/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Controls.LookupGrid/frmLookupGrid.Designer.vb b/Controls.LookupGrid/frmLookupGrid.Designer.vb index 7d887f7f..8f8a802a 100644 --- a/Controls.LookupGrid/frmLookupGrid.Designer.vb +++ b/Controls.LookupGrid/frmLookupGrid.Designer.vb @@ -64,7 +64,7 @@ Partial Class frmLookupGrid Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(117, 23) Me.btnOK.TabIndex = 0 - Me.btnOK.Text = "OK (F1)" + Me.btnOK.Text = "OK (F2)" Me.btnOK.UseVisualStyleBackColor = True ' 'btnClear diff --git a/Controls.LookupGrid/frmLookupGrid.vb b/Controls.LookupGrid/frmLookupGrid.vb index 1591cdc5..92bf54cd 100644 --- a/Controls.LookupGrid/frmLookupGrid.vb +++ b/Controls.LookupGrid/frmLookupGrid.vb @@ -159,7 +159,7 @@ Public Class frmLookupGrid Private Sub gridLookup_KeyUp(sender As Object, e As KeyEventArgs) Handles gridLookup.KeyUp If e.KeyCode = Keys.Escape Then Close() - ElseIf e.KeyCode = Keys.S And e.Control Then + ElseIf e.KeyCode = Keys.F2 Then SaveSelectedValues() DialogResult = DialogResult.OK diff --git a/GUIs.ClientSuite/ClientSuite.vbproj b/GUIs.ClientSuite/ClientSuite.vbproj index e716d318..09e4e28e 100644 --- a/GUIs.ClientSuite/ClientSuite.vbproj +++ b/GUIs.ClientSuite/ClientSuite.vbproj @@ -66,21 +66,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + ..\packages\FirebirdSql.Data.FirebirdClient.6.4.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll diff --git a/GUIs.ClientSuite/ClientSuite.vbproj.bak b/GUIs.ClientSuite/ClientSuite.vbproj.bak new file mode 100644 index 00000000..e716d318 --- /dev/null +++ b/GUIs.ClientSuite/ClientSuite.vbproj.bak @@ -0,0 +1,546 @@ + + + + + Debug + AnyCPU + {406C95F4-9FEA-45B6-8385-1768CDBBF1A7} + WinExe + DigitalData.GUIs.ClientSuite.My.MyApplication + DigitalData.GUIs.ClientSuite + ClientSuite + 512 + WindowsForms + v4.6.1 + true + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + + + AnyCPU + true + full + true + true + bin\Debug\ + ClientSuite.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + AnyCPU + pdbonly + false + true + true + bin\Release\ + ClientSuite.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + My Project\app.manifest + + + + + + + + + + + + + + + + + + + + ..\packages\FirebirdSql.Data.FirebirdClient.6.4.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll + + + ..\packages\FirebirdSql.EntityFrameworkCore.Firebird.6.4.0\lib\netstandard2.0\FirebirdSql.EntityFrameworkCore.Firebird.dll + + + + ..\packages\NLog.4.6.8\lib\net45\NLog.dll + + + ..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll + + + + + + + + + + + + + + ..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll + True + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + frmDatasourceEditor.vb + + + Form + + + + + + + frmFormDesigner.vb + + + Form + + + frmWorkflowOverview.vb + + + Form + + + frmWorkflowRawData.vb + + + Form + + + frmWorkflowStep.vb + + + Form + + + frmSearch.vb + + + Form + + + BasePanel.vb + + + UserControl + + + DocumentPanel.vb + + + UserControl + + + + + + + + GridOverview.vb + + + UserControl + + + NavControlOverview.vb + + + UserControl + + + + + DockManagerTest.vb + + + Form + + + frmDocTest.vb + + + Form + + + + + + + frmStaticListEditor.vb + + + Form + + + Form + + + Form + + + frmFileTest.vb + + + Form + + + frmHome.vb + + + Form + + + frmMain.vb + + + Form + + + frmConfigService.vb + + + Form + + + frmSplash.vb + + + Form + + + frmConfigUser.vb + + + Form + + + frmObjectEditor.vb + + + Form + + + frmUserManager.vb + + + Form + + + + True + Application.myapp + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + + True + True + ControlProperties.resx + + + True + True + ControlProperties.en.resx + + + UserControlAssignment.vb + + + UserControl + + + ProcessManagerWidget.vb + + + UserControl + + + frmWorkflowTest.vb + + + Form + + + + + BaseForm.vb + + + frmDatasourceEditor.vb + + + frmFormDesigner.vb + + + frmWorkflowOverview.vb + + + frmWorkflowRawData.vb + + + frmWorkflowStep.vb + + + frmSearch.vb + + + DocumentPanel.vb + + + GridOverview.vb + + + NavControlOverview.vb + + + DockManagerTest.vb + + + frmDocTest.vb + + + frmStaticListEditor.vb + + + frmStaticListEditor.vb + + + frmFileTest.vb + + + frmHome.vb + + + frmMain.vb + + + frmConfigService.vb + + + frmSplash.vb + + + frmConfigUser.vb + + + frmObjectEditor.vb + + + frmUserManager.vb + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + PublicResXFileCodeGenerator + ControlProperties.en.Designer.vb + My.Resources + + + PublicResXFileCodeGenerator + ControlProperties.Designer.vb + My.Resources + + + UserControlAssignment.vb + + + ProcessManagerWidget.vb + + + frmWorkflowTest.vb + + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + PublicSettingsSingleFileGenerator + My + Settings.Designer.vb + + + Designer + + + + + Designer + + + + + + + + + + + + False + Microsoft .NET Framework 4.6.1 %28x86 und x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + + + + + + + {3dcd6d1a-c830-4241-b7e4-27430e7ea483} + LookupControl + + + {44982f9b-6116-44e2-85d0-f39650b1ef99} + Config + + + {5b1171dc-fffe-4813-a20d-786aae47b320} + EDMIAPI + + + {d3c8cfed-d6f6-43a8-9bdf-454145d0352f} + Language + + + {5ebacbfa-f11a-4bbf-8d02-91461f2293ed} + License + + + {903b2d7d-3b80-4be9-8713-7447b704e1b0} + Logging + + + {A8C3F298-76AB-4359-AB3C-986E313B4336} + IDBService + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ClientSuite/My Project/licenses.licx b/GUIs.ClientSuite/My Project/licenses.licx index 8b6db701..fb9c5d02 100644 --- a/GUIs.ClientSuite/My Project/licenses.licx +++ b/GUIs.ClientSuite/My Project/licenses.licx @@ -1,17 +1,3 @@ -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.Utils.MVVM.MVVMContext, DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraVerticalGrid.VGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.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.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.ClientSuite/My Project/licenses.licx.bak b/GUIs.ClientSuite/My Project/licenses.licx.bak new file mode 100644 index 00000000..8b6db701 --- /dev/null +++ b/GUIs.ClientSuite/My Project/licenses.licx.bak @@ -0,0 +1,17 @@ +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.Utils.MVVM.MVVMContext, DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraVerticalGrid.VGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Common/DataResultList/frmDataResultList.vb b/GUIs.Common/DataResultList/frmDataResultList.vb index 30024376..1969f5c7 100644 --- a/GUIs.Common/DataResultList/frmDataResultList.vb +++ b/GUIs.Common/DataResultList/frmDataResultList.vb @@ -38,7 +38,7 @@ Public Class frmDataResultList _LogConfig = LogConfig _Logger = LogConfig.GetLogger() - _Config = New ConfigManager(Of DataResultConfig)(LogConfig, oConfigPath) + _Config = New ConfigManager(Of DataResultConfig)(LogConfig, oConfigPath, Application.StartupPath) _Environment = Environment _Params = Params _ResultLists = Params.Results diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index af2a5995..d2a3eb13 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -46,7 +46,7 @@ Public Class frmDocumentResultList _LogConfig = LogConfig _Logger = LogConfig.GetLogger() - _Config = New ConfigManager(Of DocumentResultConfig)(LogConfig, oConfigPath) + _Config = New ConfigManager(Of DocumentResultConfig)(LogConfig, oConfigPath, Application.StartupPath) _Environment = Environment _Params = Params _ResultLists = Params.Results