diff --git a/DocumentViewer/App.config b/Controls.DocumentViewer/App.config similarity index 100% rename from DocumentViewer/App.config rename to Controls.DocumentViewer/App.config diff --git a/DocumentViewer/DocumentViewer.Designer.vb b/Controls.DocumentViewer/DocumentViewer.Designer.vb similarity index 82% rename from DocumentViewer/DocumentViewer.Designer.vb rename to Controls.DocumentViewer/DocumentViewer.Designer.vb index 7c0aa2df..c5bad93d 100644 --- a/DocumentViewer/DocumentViewer.Designer.vb +++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb @@ -23,7 +23,7 @@ Partial Class DocumentViewer _ Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(DocumentViewer)) - Me.GdViewer1 = New GdPicture14.GdViewer() + Me.GdViewer = New GdPicture14.GdViewer() Me.mainToolStrip = New System.Windows.Forms.ToolStrip() Me.btnOpen = New System.Windows.Forms.ToolStripButton() Me.btnPrint = New System.Windows.Forms.ToolStripButton() @@ -57,82 +57,82 @@ Partial Class DocumentViewer Me.btnSettings = New System.Windows.Forms.ToolStripButton() Me.statusbar = New System.Windows.Forms.StatusStrip() Me.ToolStripStatusLabel1 = New System.Windows.Forms.ToolStripStatusLabel() - Me.ToolStripStatusLabel2 = New System.Windows.Forms.ToolStripStatusLabel() + Me.statusLabel = New System.Windows.Forms.ToolStripStatusLabel() Me.OpenFileDialog = New System.Windows.Forms.OpenFileDialog() Me.mainToolStrip.SuspendLayout() Me.statusbar.SuspendLayout() Me.SuspendLayout() ' - 'GdViewer1 + 'GdViewer ' - Me.GdViewer1.AllowDropFile = False - Me.GdViewer1.AnimateGIF = True - Me.GdViewer1.AnnotationDropShadow = False - Me.GdViewer1.AnnotationResizeRotateHandlesColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.GdViewer1.AnnotationResizeRotateHandlesScale = 1.0! - Me.GdViewer1.AnnotationSelectionLineColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) - Me.GdViewer1.AutoScrollMargin = New System.Drawing.Size(0, 0) - Me.GdViewer1.AutoScrollMinSize = New System.Drawing.Size(0, 0) - Me.GdViewer1.BackColor = System.Drawing.SystemColors.AppWorkspace - Me.GdViewer1.BackgroundImage = Nothing - Me.GdViewer1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.GdViewer1.ContinuousViewMode = True - Me.GdViewer1.DisplayQuality = GdPicture14.DisplayQuality.DisplayQualityAutomatic - Me.GdViewer1.DisplayQualityAuto = True - Me.GdViewer1.Dock = System.Windows.Forms.DockStyle.Fill - Me.GdViewer1.DocumentAlignment = GdPicture14.ViewerDocumentAlignment.DocumentAlignmentMiddleCenter - Me.GdViewer1.DocumentPosition = GdPicture14.ViewerDocumentPosition.DocumentPositionMiddleCenter - Me.GdViewer1.DrawPageBorders = True - Me.GdViewer1.EnableDeferredPainting = True - Me.GdViewer1.EnabledProgressBar = True - Me.GdViewer1.EnableICM = False - Me.GdViewer1.EnableMenu = True - Me.GdViewer1.EnableMouseWheel = True - Me.GdViewer1.EnableTextSelection = True - Me.GdViewer1.ForceScrollBars = False - Me.GdViewer1.ForceTemporaryMode = False - Me.GdViewer1.ForeColor = System.Drawing.Color.Black - Me.GdViewer1.Gamma = 1.0! - Me.GdViewer1.HQAnnotationRendering = True - Me.GdViewer1.IgnoreDocumentResolution = False - Me.GdViewer1.KeepDocumentPosition = False - Me.GdViewer1.Location = New System.Drawing.Point(0, 0) - Me.GdViewer1.LockViewer = False - Me.GdViewer1.MagnifierHeight = 90 - Me.GdViewer1.MagnifierWidth = 160 - Me.GdViewer1.MagnifierZoomX = 2.0! - Me.GdViewer1.MagnifierZoomY = 2.0! - Me.GdViewer1.MouseButtonForMouseMode = GdPicture14.MouseButton.MouseButtonLeft - Me.GdViewer1.MouseMode = GdPicture14.ViewerMouseMode.MouseModePan - Me.GdViewer1.MouseWheelMode = GdPicture14.ViewerMouseWheelMode.MouseWheelModeZoom - Me.GdViewer1.Name = "GdViewer1" - Me.GdViewer1.PageBordersColor = System.Drawing.Color.Black - Me.GdViewer1.PageBordersPenSize = 1 - Me.GdViewer1.PageDisplayMode = GdPicture14.PageDisplayMode.MultiplePagesView - Me.GdViewer1.PdfDisplayFormField = True - Me.GdViewer1.PdfEnableFileLinks = True - Me.GdViewer1.PdfEnableLinks = True - Me.GdViewer1.PdfIncreaseTextContrast = False - Me.GdViewer1.PdfRasterizerEngine = GdPicture14.PdfRasterizerEngine.PdfRasterizerEngineHybrid - Me.GdViewer1.PdfShowDialogForPassword = True - Me.GdViewer1.PdfShowOpenFileDialogForDecryption = True - Me.GdViewer1.PdfVerifyDigitalCertificates = False - Me.GdViewer1.RectBorderColor = System.Drawing.Color.Black - Me.GdViewer1.RectBorderSize = 1 - Me.GdViewer1.RectIsEditable = True - Me.GdViewer1.RegionsAreEditable = True - Me.GdViewer1.RenderGdPictureAnnots = True - Me.GdViewer1.ScrollBars = True - Me.GdViewer1.ScrollLargeChange = CType(50, Short) - Me.GdViewer1.ScrollSmallChange = CType(1, Short) - Me.GdViewer1.SilentMode = True - Me.GdViewer1.Size = New System.Drawing.Size(1015, 590) - Me.GdViewer1.TabIndex = 0 - Me.GdViewer1.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone - Me.GdViewer1.Zoom = 1.0R - Me.GdViewer1.ZoomCenterAtMousePosition = False - Me.GdViewer1.ZoomMode = GdPicture14.ViewerZoomMode.ZoomMode100 - Me.GdViewer1.ZoomStep = 25 + Me.GdViewer.AllowDropFile = False + Me.GdViewer.AnimateGIF = True + Me.GdViewer.AnnotationDropShadow = False + Me.GdViewer.AnnotationResizeRotateHandlesColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.GdViewer.AnnotationResizeRotateHandlesScale = 1.0! + Me.GdViewer.AnnotationSelectionLineColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) + Me.GdViewer.AutoScrollMargin = New System.Drawing.Size(0, 0) + Me.GdViewer.AutoScrollMinSize = New System.Drawing.Size(0, 0) + Me.GdViewer.BackColor = System.Drawing.SystemColors.AppWorkspace + Me.GdViewer.BackgroundImage = Nothing + Me.GdViewer.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.GdViewer.ContinuousViewMode = True + Me.GdViewer.DisplayQuality = GdPicture14.DisplayQuality.DisplayQualityAutomatic + Me.GdViewer.DisplayQualityAuto = True + Me.GdViewer.Dock = System.Windows.Forms.DockStyle.Fill + Me.GdViewer.DocumentAlignment = GdPicture14.ViewerDocumentAlignment.DocumentAlignmentMiddleCenter + Me.GdViewer.DocumentPosition = GdPicture14.ViewerDocumentPosition.DocumentPositionMiddleCenter + Me.GdViewer.DrawPageBorders = True + Me.GdViewer.EnableDeferredPainting = True + Me.GdViewer.EnabledProgressBar = True + Me.GdViewer.EnableICM = False + Me.GdViewer.EnableMenu = True + Me.GdViewer.EnableMouseWheel = True + Me.GdViewer.EnableTextSelection = True + Me.GdViewer.ForceScrollBars = False + Me.GdViewer.ForceTemporaryMode = False + Me.GdViewer.ForeColor = System.Drawing.Color.Black + Me.GdViewer.Gamma = 1.0! + Me.GdViewer.HQAnnotationRendering = True + Me.GdViewer.IgnoreDocumentResolution = False + Me.GdViewer.KeepDocumentPosition = False + Me.GdViewer.Location = New System.Drawing.Point(0, 31) + Me.GdViewer.LockViewer = False + Me.GdViewer.MagnifierHeight = 90 + Me.GdViewer.MagnifierWidth = 160 + Me.GdViewer.MagnifierZoomX = 2.0! + Me.GdViewer.MagnifierZoomY = 2.0! + Me.GdViewer.MouseButtonForMouseMode = GdPicture14.MouseButton.MouseButtonLeft + Me.GdViewer.MouseMode = GdPicture14.ViewerMouseMode.MouseModePan + Me.GdViewer.MouseWheelMode = GdPicture14.ViewerMouseWheelMode.MouseWheelModeZoom + Me.GdViewer.Name = "GdViewer" + Me.GdViewer.PageBordersColor = System.Drawing.Color.Black + Me.GdViewer.PageBordersPenSize = 1 + Me.GdViewer.PageDisplayMode = GdPicture14.PageDisplayMode.MultiplePagesView + Me.GdViewer.PdfDisplayFormField = True + Me.GdViewer.PdfEnableFileLinks = True + Me.GdViewer.PdfEnableLinks = True + Me.GdViewer.PdfIncreaseTextContrast = False + Me.GdViewer.PdfRasterizerEngine = GdPicture14.PdfRasterizerEngine.PdfRasterizerEngineHybrid + Me.GdViewer.PdfShowDialogForPassword = True + Me.GdViewer.PdfShowOpenFileDialogForDecryption = True + Me.GdViewer.PdfVerifyDigitalCertificates = False + Me.GdViewer.RectBorderColor = System.Drawing.Color.Black + Me.GdViewer.RectBorderSize = 1 + Me.GdViewer.RectIsEditable = True + Me.GdViewer.RegionsAreEditable = True + Me.GdViewer.RenderGdPictureAnnots = True + Me.GdViewer.ScrollBars = True + Me.GdViewer.ScrollLargeChange = CType(50, Short) + Me.GdViewer.ScrollSmallChange = CType(1, Short) + Me.GdViewer.SilentMode = True + Me.GdViewer.Size = New System.Drawing.Size(1015, 537) + Me.GdViewer.TabIndex = 0 + Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone + Me.GdViewer.Zoom = 1.0R + Me.GdViewer.ZoomCenterAtMousePosition = False + Me.GdViewer.ZoomMode = GdPicture14.ViewerZoomMode.ZoomMode100 + Me.GdViewer.ZoomStep = 25 ' 'mainToolStrip ' @@ -403,10 +403,11 @@ Partial Class DocumentViewer ' 'statusbar ' - Me.statusbar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabel1, Me.ToolStripStatusLabel2}) + Me.statusbar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabel1, Me.statusLabel}) Me.statusbar.Location = New System.Drawing.Point(0, 568) Me.statusbar.Name = "statusbar" Me.statusbar.Size = New System.Drawing.Size(1015, 22) + Me.statusbar.SizingGrip = False Me.statusbar.TabIndex = 7 Me.statusbar.Text = "StatusStrip1" ' @@ -415,10 +416,10 @@ Partial Class DocumentViewer Me.ToolStripStatusLabel1.Name = "ToolStripStatusLabel1" Me.ToolStripStatusLabel1.Size = New System.Drawing.Size(0, 17) ' - 'ToolStripStatusLabel2 + 'statusLabel ' - Me.ToolStripStatusLabel2.Name = "ToolStripStatusLabel2" - Me.ToolStripStatusLabel2.Size = New System.Drawing.Size(0, 17) + Me.statusLabel.Name = "statusLabel" + Me.statusLabel.Size = New System.Drawing.Size(0, 17) ' 'OpenFileDialog ' @@ -428,9 +429,9 @@ Partial Class DocumentViewer ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.GdViewer) Me.Controls.Add(Me.statusbar) Me.Controls.Add(Me.mainToolStrip) - Me.Controls.Add(Me.GdViewer1) Me.Name = "DocumentViewer" Me.Size = New System.Drawing.Size(1015, 590) Me.mainToolStrip.ResumeLayout(False) @@ -442,7 +443,7 @@ Partial Class DocumentViewer End Sub - Friend WithEvents GdViewer1 As GdPicture14.GdViewer + Friend WithEvents GdViewer As GdPicture14.GdViewer Friend WithEvents mainToolStrip As ToolStrip Friend WithEvents btnOpen As ToolStripButton Friend WithEvents btnPrint As ToolStripButton @@ -476,6 +477,6 @@ Partial Class DocumentViewer Friend WithEvents btnSettings As ToolStripButton Friend WithEvents statusbar As StatusStrip Friend WithEvents ToolStripStatusLabel1 As ToolStripStatusLabel - Friend WithEvents ToolStripStatusLabel2 As ToolStripStatusLabel + Friend WithEvents statusLabel As ToolStripStatusLabel Friend WithEvents OpenFileDialog As OpenFileDialog End Class diff --git a/DocumentViewer/DocumentViewer.resx b/Controls.DocumentViewer/DocumentViewer.resx similarity index 74% rename from DocumentViewer/DocumentViewer.resx rename to Controls.DocumentViewer/DocumentViewer.resx index 5bfcfcf1..ee577e98 100644 --- a/DocumentViewer/DocumentViewer.resx +++ b/Controls.DocumentViewer/DocumentViewer.resx @@ -124,31 +124,31 @@ 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 @@ -172,87 +172,87 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVEhLnZPPKwRhHMa3/Dq5+AecuTi4oJkRJ38AN0Up - F0nEzsjBgbgoyR1HlsK8m/w4cKFIy8FZ4ciNKOL1PuO7NXmfNbM+9elt3u/7PLM7u5MpRU9PrsLx871u - oEIvq+4bBlY/vEDpudyVxhpdm33McQ7nJZpMy+h+nZNVZyj67dbprbUHcR45qfgb86n2WEn3/JGe3ShE - K5sjJxWl8SaVy8Lw+e1dA6xsHmnyUsXx/HCZBo1x2DzS5KWK40yoCxo0xmFziLxUcZwx9cSCMA6bQ+Sl - iuMNqE8WhHHYPNLkpcqmffq4koaMnVN5fX37pF/MD4wV1+wclDqb5sHLKhaIm109p/tF241SZ1O8wUHh - 4V/mL+6im0idDfsGeBR9iyfaXzvXM+sFPb95Fa24xj57VFJnk+YRpVHqbBqnc9UsUK5SZ9M1vFfDAuUq - dTY/f9OVLxZK78qX1HH+epPTmPgmO4E6ZMG0Ii9VHNcPh1gwrchLFadtYqe2NVCPLJwkcshLVWlcf7ef - FSSJnFQk4/pqiZWUEuclmh43CMebRrbfWGFRzHFOIuXTMZWvd4JwwZTdGF9j3mAfczlKyGS+AfERuLY2 - +SnbAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVEhLnZPPKwRhHMa3/Dq5+AcclYuDC5oZcfIHcFO4 + uEgidkYODsRFSa6KI0th3k1+HLhQpOXgrHDkRhTxep/x3Zq8z5pZn/r0Nu/3fZ7Znd3JlKKnJ1fh+Ple + N1Chl1X3DQOrH16g9FzuSmONrs0+5jiH8xJNpmV0v87JqjMU/Xbr9NbagziPnFT8jflUe6yke/5Iz24U + opXNkZOK0niTymVh+Pz2rgFWNo80eanieH64TIPGOGweafJSxXEm1AUNGuOwOUReqjjOmHpiQRiHzSHy + UsXxBtQnC8I4bB5p8lJl0z59XElDxs6pvL6+fdIv5gfGimt2DkqdTfPgZRULxM2untP9ou1GqbMp3uCg + 8PAv8xd30U2kzoZ9AzyKvsUT7a+d65n1gp7fvIpWXGOfPSqps0nziNIodTaN07lqFihXqbPpGt6rYYFy + lTqbn7/pyhcLpXflS+o4f73JaUx8k51AHbJgWpGXKo7rh0MsmFbkpYrTNrFT2xqoRxZOEjnkpao0rr/b + zwqSRE4qknF9tcRKSonzEk2PG4TjTSPbb6ywKOY4J5Hy6ZjK1ztBuGDKboyvMW+wj7kcJWQy34QJuKYJ + Zco/AAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGjSURBVEhLxVRLS8NAEF7UnkVRPHr32oNCsgmIRy8iQVHE - W8++mt0iEgTR+hM8eRfFZreI4ME/IAqK+h8En1efmXaiyzapSWn0gyGTeXzfzpAsyQKjJX8A3fYCiCkT - 29Q9eMYQIRaXn6oNzu++Yiox7CXRR7koG1w8hTyYIoSyrQ8wCMIzjYBZOuo3mdgMel90HixpTQCIKZMb + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGjSURBVEhLxVRLS8NAEF7UnkVRPHr32oNCsgmIJ28iQVHE + W8++mt0iEgQt+hM8eRfFZreI4ME/IAqK+h8En1efmXaiyzapSWn0gyGTeXzfzpAsyQKjJX8A3fYCiCkT + 29Q9eMYQIRaXn6oNzu++Yiox7CXRR7nYMrh4CnkwRQhlmx9gEIRnGgGzdNRvMlEOel90HixpTQCIKZMb w0w8qr2qj6XpVmTyag8QWwv7D3qfbtiSbIKRxeNe6vrrBqvvWK2P87G1uUDtxFyuUebf63WJBSCgWihg cbFqLVfu9HxSq5EDGk4xLt5hxw1x7V2NR/lIHyHQxFfff6tH+j8QgEAWhvT/MMEQl2/BnXKpx9Ma0kf/ B2PspNtgcsIoinOLl79Pr9aFzzgf6aMFMEUcZ68zuH4ngx/tQq9LLAAB1aKuCts77bJ51UmzOmxtPkED PK8juPenjBUQ+lld2Kv62JFSAAETma6cNt3Kldqr+liabEVxyBfOcpYrZgzu3+g8WNLaBDpqH0NRzlJX - XIerw1R7kS/s5Gwu5szi4S2GsgGsru4R8gVpsy89PfCVKAAAAABJRU5ErkJggg== + XIerw1R7kS/s5Gwu5szi4S2GsgGsru4R8gWEZC4psffHngAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHLSURBVEhLY6AZqK9ngrKoC4zTzrDalG0OsS3bdAIqRB1g - X7+fw7Z8U4pdxeYbQPwfhKFSlAH7/PUCduWbyy1KNz2zLW//BzIYRIMwVAl5wKlqszTQxZ02RZveIBtK - sQU2FVvV7Mo2T7esWPsFFhS4MFQLMeA/o1XpBhOb8k0rtSo2/0F3KS42VDMeAExq9hVbXGzLN+yx9dn0 - F9kAiiwIDV3FbFuxKdymdPMpO9/Nf0GayMFQ4xDAtXgnNzD9ptuVbryJzUXIfGRxXGyosQwMFoU7hIAp - ohSIn+LTgMzHpQaZDTbctnxjg23BmnfEaEDmE6MebIFdxZY064rN9+0qOsCS1MRgC0DAI3cbu33Fplib + X7+fw7Z8U4pdxeYbQPwfhKFSlAH7/PUCduWbyy1KNz2zLW/9BzIYRIMwVAl5wKlqszTQxZ02RZveIBtK + sQU2FVvV7Mo2T7esWPsFFhS4MFQLMeA/o1XpBhOb8k0rtSo2/0F3KS42VDMeAExq9hVbXGzLN+yx9dr0 + F9kAiiwIDV3FbFuxKdymdPMpO+/Nf0GayMFQ4xDAtXgnNzD9ptuVbryJzUXIfGRxXGyosQwMFoU7hIAp + ohSIn+LTgMzHpQaZDTbctnxjg23BmnfEaEDmE6MebIFdxZY064rN9+0q2sCS1MRgC0DAI3cbu33Fplib sg2X8bkImY9LDTIbajwCAMsTFpvKTQHAjHQEpJBSDDUWO7Ar3eBoXb5xh3z8/N8wFyG7EEbjY0ONwg/s yjcY2pRtXGGbteknsgFUswAGgEWFum355qn6+eu/gwwhBkO1kgZsq7ZLgkpRu4qNb7G5GpkN1UIesKnY ImhbtrESVA/QxAIYABUvoLxkV7LhLshwZAxVQh0ASuK2pZujgbXbWar6AAMAi3ig672sSzcdhIrQCvxn - ZGBgYAAAk+6LMhigUAQAAAAASUVORK5CYII= + ZGBgYAAAx7aKXPsltNoAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHCSURBVEhLYwCD+nomCINGwLZs0wmbss0hxmlnWKFC1AV2 - FZv/Q/EN2/JNKfb1+zmgUtQBtuXt/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG - KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMZ9Nf23L - N+yxr9jiQlQSB2kkC/tu/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp - FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXHHP+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+ + FZv/Q/EN2/JNKfb1+zmgUtQBtuWt/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG + KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMa9Nf23L + N+yxr9jiQlQSB2kkC3tv/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp + FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXHbP+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+ YlOsR+42drDhIACSpBiXbT5iU7kpAFiOsUCNRQB8LkJmI4uBsHz8/N/W5Rt32JVucIQahR3ANBBtQdam nzZlG1fYlW8whBqBH4A0EoP189d/ty3fPBVYVKhDtRIH0F2Kyd74FlSq2lZtl4RqIQ1gN3Tzf1C9YFu2 - sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEAib+L - MlwLRhAAAAAASUVORK5CYII= + sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEApL+K + XHJ8GzIAAAAASUVORK5CYII= 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 @@ -325,19 +325,19 @@ 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 diff --git a/DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb similarity index 68% rename from DocumentViewer/DocumentViewer.vb rename to Controls.DocumentViewer/DocumentViewer.vb index 8a0684c0..19b5de50 100644 --- a/DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -1,6 +1,7 @@ Imports System.ComponentModel Imports System.Globalization Imports System.Text.RegularExpressions +Imports DigitalData.Modules.Logging Imports GdPicture14 Public Class DocumentViewer @@ -19,11 +20,9 @@ Public Class DocumentViewer Private _currentSearchOccurence As Integer = 0 Private _toggleGamma As Boolean = True Private _licenseKey As String = String.Empty - - Public Sub Init(LicenseKey As String) - Dim oLicenceManager As New GdPicture14.LicenseManager() - oLicenceManager.RegisterKEY(LicenseKey) 'Please, replace XXXX by a valid demo or commercial license key. - End Sub + Private _licenseManager As New GdPicture14.LicenseManager() + Private _logConfig As LogConfig + Private _logger As Logger Private Sub DocumentViewer_Load(sender As Object, e As EventArgs) Handles Me.Load Dim zoomModes As New Dictionary(Of ZoomMode, String) From { @@ -44,40 +43,55 @@ Public Class DocumentViewer UpdateMainUi() End Sub - Public Sub Load_File_from_Path(filepath As String) - CloseDocument() - _docPath = filepath - ToolStripStatusLabel2.Text = _docPath - GdViewer1.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer - GdViewer1.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter + Public Sub Init(LogConfig As LogConfig, LicenseKey As String) + _logConfig = LogConfig + _logger = LogConfig.GetLogger() + + _licenseKey = LicenseKey + _licenseManager.RegisterKEY(_licenseKey) + End Sub + + Public Sub LoadFile(filepath As String) + If _licenseKey = String.Empty Then + _logger.Warn("License key was not provided. File {0} not loaded.", filepath) + Exit Sub + End If + + CloseDocument() + + _docPath = filepath + statusLabel.Text = _docPath + + GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer + GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter + GdViewer.DisplayFromFile(filepath) + GdViewer.Focus() - GdViewer1.DisplayFromFile(filepath) - GdViewer1.Focus() UpdateMainUi() End Sub Private Sub CloseDocument() - GdViewer1.CloseDocument() + GdViewer.CloseDocument() UpdateMainUi() End Sub Private Sub btnOpen_Click(sender As Object, e As EventArgs) Handles btnOpen.Click CloseDocument() - GdViewer1.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer - GdViewer1.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter + GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer + GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter If OpenFileDialog.ShowDialog() = DialogResult.OK Then - GdViewer1.DisplayFromFile(OpenFileDialog.FileName) + GdViewer.DisplayFromFile(OpenFileDialog.FileName) End If - GdViewer1.Focus() + GdViewer.Focus() UpdateMainUi() End Sub Private Function GetDocumentTypeLabel() As String Dim result As String = "" - Select Case GdViewer1.GetDocumentType() + Select Case GdViewer.GetDocumentType() Case DocumentType.DocumentTypeBitmap result = "Bilddatei" Case DocumentType.DocumentTypeMetaFile @@ -95,7 +109,7 @@ Public Class DocumentViewer End Function Private Sub UpdateMainUi() - If GdViewer1.PageCount = 0 Then + If GdViewer.PageCount = 0 Then btnOpen.Enabled = True btnPrint.Enabled = False btnFirstPage.Enabled = False @@ -139,63 +153,63 @@ Public Class DocumentViewer End Sub Private Sub btnFirstPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnFirstPage.Click - GdViewer1.DisplayFirstPage() + GdViewer.DisplayFirstPage() End Sub Private Sub btnPreviousPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnPreviousPage.Click - GdViewer1.DisplayPreviousPage() + GdViewer.DisplayPreviousPage() End Sub Private Sub btnNextPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnNextPage.Click - GdViewer1.DisplayNextPage() + GdViewer.DisplayNextPage() End Sub Private Sub btnLastPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnLastPage.Click - GdViewer1.DisplayLastPage() + GdViewer.DisplayLastPage() End Sub Private Sub tbCurrentPage_Leave(ByVal sender As System.Object, ByVal e As EventArgs) Handles tbCurrentPage.Leave Dim page As Integer = 0 If Integer.TryParse(tbCurrentPage.Text, page) Then - If page > 0 And page <= GdViewer1.PageCount Then - GdViewer1.DisplayPage(page) + If page > 0 And page <= GdViewer.PageCount Then + GdViewer.DisplayPage(page) UpdateaNavigationToolbar() End If End If End Sub - Private Sub GdViewer1_PageChanged() Handles GdViewer1.PageChanged + Private Sub GdViewer1_PageChanged() Handles GdViewer.PageChanged UpdateaNavigationToolbar() End Sub Private Sub ChangeZoomValue() If cbZoom.SelectedIndex <> -1 Then - Select Case CType(cbZoom.SelectedIndex, ZoomMode) + Select Case cbZoom.SelectedIndex Case ZoomMode.Zoom50 - GdViewer1.Zoom = 50.0F / 100 + GdViewer.Zoom = 50.0F / 100 Case ZoomMode.Zoom100 - GdViewer1.Zoom = 100.0F / 100 + GdViewer.Zoom = 100.0F / 100 Case ZoomMode.Zoom150 - GdViewer1.Zoom = 150.0F / 100 + GdViewer.Zoom = 150.0F / 100 Case ZoomMode.Zoom200 - GdViewer1.Zoom = 250.0F / 100 + GdViewer.Zoom = 250.0F / 100 Case ZoomMode.ZoomSelectedArea - If GdViewer1.IsRect() Then - GdViewer1.ZoomRect() + If GdViewer.IsRect() Then + GdViewer.ZoomRect() Else - GdViewer1.MouseMode = ViewerMouseMode.MouseModeAreaSelection - GdViewer1.Focus() + GdViewer.MouseMode = ViewerMouseMode.MouseModeAreaSelection + GdViewer.Focus() End If Case ZoomMode.ZoomFitToViewer - GdViewer1.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer + GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer Case ZoomMode.ZoomFitWidth - GdViewer1.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer + GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer Case ZoomMode.ZoomFitHeight - GdViewer1.ZoomMode = ViewerZoomMode.ZoomModeHeightViewer + GdViewer.ZoomMode = ViewerZoomMode.ZoomModeHeightViewer End Select Else If (IsNumeric(Regex.Replace(cbZoom.Text, "[^0-9,.]", ""))) Then - GdViewer1.Zoom = Val(Regex.Replace(cbZoom.Text, "[^0-9,.]", "")) / 100 + GdViewer.Zoom = Val(Regex.Replace(cbZoom.Text, "[^0-9,.]", "")) / 100 End If End If UpdateaNavigationToolbar() @@ -205,19 +219,19 @@ Public Class DocumentViewer ChangeZoomValue() End Sub - Private Sub GdViewer1_AfterZoomChange() Handles GdViewer1.AfterZoomChange + Private Sub GdViewer1_AfterZoomChange() Handles GdViewer.AfterZoomChange UpdateaNavigationToolbar() - If GdViewer1.MouseMode = ViewerMouseMode.MouseModeAreaZooming Then - GdViewer1.MouseMode = ViewerMouseMode.MouseModePan + If GdViewer.MouseMode = ViewerMouseMode.MouseModeAreaZooming Then + GdViewer.MouseMode = ViewerMouseMode.MouseModePan End If End Sub Private Sub btnZoomOut_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnZoomOut.Click - GdViewer1.ZoomOUT() + GdViewer.ZoomOUT() End Sub Private Sub btnZoomIn_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnZoomIn.Click - GdViewer1.ZoomIN() + GdViewer.ZoomIN() End Sub Private Sub cbZoom_TextUpdate(ByVal sender As System.Object, ByVal e As EventArgs) Handles cbZoom.Validating @@ -225,45 +239,45 @@ Public Class DocumentViewer End Sub Private Sub btnPrint_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnPrint.Click - If GdViewer1.PageCount = 0 Then + If GdViewer.PageCount = 0 Then Return End If - Using f As New frmViewerPrint(GdViewer1) + Using f As New frmViewerPrint(GdViewer) f.ShowDialog(Me) If f.DialogResult <> DialogResult.OK Then Return End If Dim printSettings As frmViewerPrint.PrintSettings = f.printConfiguration - If Not GdViewer1.PrintSetActivePrinter(printSettings.Printer) Then + If Not GdViewer.PrintSetActivePrinter(printSettings.Printer) Then Return End If - GdViewer1.PrintSetDocumentName("GdPicture Print Job " + DateTime.Now.ToString("yyyy-MM-dd HH\mm")) - GdViewer1.PrintSetAlignment(printSettings.PrintAlignment) + GdViewer.PrintSetDocumentName("GdPicture Print Job " + DateTime.Now.ToString("yyyy-MM-dd HH\mm")) + GdViewer.PrintSetAlignment(printSettings.PrintAlignment) Select Case printSettings.Orientation Case frmViewerPrint.PrintOrientation.AutoDetection - GdViewer1.PrintSetAutoRotation(True) + GdViewer.PrintSetAutoRotation(True) Exit Select Case frmViewerPrint.PrintOrientation.Portrait - GdViewer1.PrintSetAutoRotation(False) - GdViewer1.PrintSetOrientation(PrinterOrientation.PrinterOrientationPortrait) + GdViewer.PrintSetAutoRotation(False) + GdViewer.PrintSetOrientation(PrinterOrientation.PrinterOrientationPortrait) Exit Select Case frmViewerPrint.PrintOrientation.Paysage - GdViewer1.PrintSetAutoRotation(False) - GdViewer1.PrintSetOrientation(PrinterOrientation.PrinterOrientationLandscape) + GdViewer.PrintSetAutoRotation(False) + GdViewer.PrintSetOrientation(PrinterOrientation.PrinterOrientationLandscape) Exit Select End Select - GdViewer1.PrintSetCopies(printSettings.Copies) + GdViewer.PrintSetCopies(printSettings.Copies) If printSettings.Copies > 1 Then - GdViewer1.PrintSetCollate(printSettings.Collate) + GdViewer.PrintSetCollate(printSettings.Collate) End If Select Case printSettings.PagesToPrint Case frmViewerPrint.PagesToPrint.All - GdViewer1.PrintSetFromToPage(1, GdViewer1.PageCount) - GdViewer1.Print(printSettings.PrintSize) + GdViewer.PrintSetFromToPage(1, GdViewer.PageCount) + GdViewer.Print(printSettings.PrintSize) Exit Select Case frmViewerPrint.PagesToPrint.Current - GdViewer1.PrintSetFromToPage(GdViewer1.CurrentPage, GdViewer1.CurrentPage) - GdViewer1.Print(printSettings.PrintSize) + GdViewer.PrintSetFromToPage(GdViewer.CurrentPage, GdViewer.CurrentPage) + GdViewer.Print(printSettings.PrintSize) Exit Select Case frmViewerPrint.PagesToPrint.Range If printSettings.PageRange IsNot Nothing And printSettings.PageRange <> String.Empty Then @@ -273,11 +287,11 @@ Public Class DocumentViewer Dim pageEnd As Integer = 0 If Integer.TryParse(printSettings.PageRange.Split("-"c)(1), pageEnd) Then If pageEnd < pageStart Then - GdViewer1.PrintSetFromToPage(pageEnd, pageStart) - GdViewer1.Print(printSettings.PrintSize) + GdViewer.PrintSetFromToPage(pageEnd, pageStart) + GdViewer.Print(printSettings.PrintSize) Else - GdViewer1.PrintSetFromToPage(pageStart, pageEnd) - GdViewer1.Print(printSettings.PrintSize) + GdViewer.PrintSetFromToPage(pageStart, pageEnd) + GdViewer.Print(printSettings.PrintSize) End If Else MessageBox.Show("Page range is invalid.", "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) @@ -288,8 +302,8 @@ Public Class DocumentViewer Else Dim page As Integer = 0 If Integer.TryParse(printSettings.PageRange, page) Then - GdViewer1.PrintSetFromToPage(page, page) - GdViewer1.Print(printSettings.PrintSize) + GdViewer.PrintSetFromToPage(page, page) + GdViewer.Print(printSettings.PrintSize) Else MessageBox.Show("Page range is invalid.", "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) End If @@ -303,23 +317,23 @@ Public Class DocumentViewer End Sub Private Sub btnRotateLeft_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnRotateLeft.Click - GdViewer1.Rotate(RotateFlipType.Rotate270FlipNone) + GdViewer.Rotate(RotateFlipType.Rotate270FlipNone) End Sub Private Sub btnRotateRight_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnRotateRight.Click - GdViewer1.Rotate(RotateFlipType.Rotate90FlipNone) + GdViewer.Rotate(RotateFlipType.Rotate90FlipNone) End Sub Private Sub btnFlipX_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnFlipX.Click - GdViewer1.Rotate(RotateFlipType.RotateNoneFlipX) + GdViewer.Rotate(RotateFlipType.RotateNoneFlipX) End Sub Private Sub btnFlipY_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnFlipY.Click - GdViewer1.Rotate(RotateFlipType.RotateNoneFlipY) + GdViewer.Rotate(RotateFlipType.RotateNoneFlipY) End Sub - Private Sub GdViewer1_TransferEnded(ByVal status As GdPictureStatus, ByVal download As System.Boolean) Handles GdViewer1.TransferEnded - GdViewer1.Focus() + Private Sub GdViewer1_TransferEnded(ByVal status As GdPictureStatus, ByVal download As System.Boolean) Handles GdViewer.TransferEnded + GdViewer.Focus() UpdateMainUi() End Sub @@ -328,24 +342,24 @@ Public Class DocumentViewer End Sub Private Sub AddSearchRegion(ByVal occurence As Integer, ByVal leftCoordinate As Single, ByVal topCoordinate As Single, ByVal regionWidth As Single, ByVal regionheight As Single, ByVal ensureVisibility As Boolean) - Dim searchRegion As Integer = GdViewer1.AddRegionInches("SearchResult" & occurence, leftCoordinate, topCoordinate, regionWidth, regionheight, ForegroundMixMode.ForegroundMixModeMASKPEN, Color.Yellow) - GdViewer1.SetRegionEditable(searchRegion, False) + Dim searchRegion As Integer = GdViewer.AddRegionInches("SearchResult" & occurence, leftCoordinate, topCoordinate, regionWidth, regionheight, ForegroundMixMode.ForegroundMixModeMASKPEN, Color.Yellow) + GdViewer.SetRegionEditable(searchRegion, False) If ensureVisibility Then - GdViewer1.EnsureRegionVisibility(searchRegion) + GdViewer.EnsureRegionVisibility(searchRegion) End If End Sub Private Sub btnSettings_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnSettings.Click - Using frmSettings As New frmViewerSettings(GdViewer1) + Using frmSettings As New frmViewerSettings(GdViewer) frmSettings.ShowDialog(Me) End Using UpdateaNavigationToolbar() End Sub Private Sub UpdateaNavigationToolbar() - Dim currentPage As Integer = GdViewer1.CurrentPage() + Dim currentPage As Integer = GdViewer.CurrentPage() tbCurrentPage.Text = currentPage.ToString() - lblPageCount.Text = "/ " & GdViewer1.PageCount.ToString() + lblPageCount.Text = "/ " & GdViewer.PageCount.ToString() If currentPage = 1 Then btnFirstPage.Enabled = False btnPreviousPage.Enabled = False @@ -353,89 +367,89 @@ Public Class DocumentViewer btnFirstPage.Enabled = True btnPreviousPage.Enabled = True End If - If currentPage = GdViewer1.PageCount Then + If currentPage = GdViewer.PageCount Then btnNextPage.Enabled = False btnLastPage.Enabled = False Else btnNextPage.Enabled = True btnLastPage.Enabled = True End If - cbZoom.Text = String.Format(CultureInfo.InvariantCulture, "{0:#0.##%}", GdViewer1.Zoom) + cbZoom.Text = String.Format(CultureInfo.InvariantCulture, "{0:#0.##%}", GdViewer.Zoom) Dim widthInches, heightInches As Double - If GdViewer1.GetDocumentType = DocumentType.DocumentTypePDF Then - widthInches = GdViewer1.PdfGetPageWidth / 72 - heightInches = GdViewer1.PdfGetPageHeight / 72 + If GdViewer.GetDocumentType = DocumentType.DocumentTypePDF Then + widthInches = GdViewer.PdfGetPageWidth / 72 + heightInches = GdViewer.PdfGetPageHeight / 72 Else - widthInches = GdViewer1.PageWidth / GdViewer1.HorizontalResolution - heightInches = GdViewer1.PageHeight / GdViewer1.VerticalResolution + widthInches = GdViewer.PageWidth / GdViewer.HorizontalResolution + 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(GdViewer1.PageWidth)) + " × " + Trim(Str(GdViewer1.PageHeight)) + " - " + - "Horizontale Auflösung: " + Trim(Str(Math.Round(GdViewer1.HorizontalResolution, 2))) + " DPI - " + - "Vertikale Auflösung: " + Trim(Str(Math.Round(GdViewer1.VerticalResolution, 2))) + " DPI" + "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" End Sub Private Sub btnFitWidth_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnFitWidth.Click - GdViewer1.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer + GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer End Sub Private Sub btnFitPage_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnFitPage.Click - GdViewer1.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer + GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer End Sub Private Sub DefaultToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles DefaultToolStripMenuItem.Click - GdViewer1.MouseMode = ViewerMouseMode.MouseModeDefault + GdViewer.MouseMode = ViewerMouseMode.MouseModeDefault DefaultToolStripMenuItem.Checked = True AreaSelectionToolStripMenuItem.Checked = False PanToolStripMenuItem.Checked = False AreaZoomingToolStripMenuItem.Checked = False MagnifierToolStripMenuItem.Checked = False - GdViewer1.Focus() + GdViewer.Focus() End Sub Private Sub AreaSelectionToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles AreaSelectionToolStripMenuItem.Click - GdViewer1.MouseMode = ViewerMouseMode.MouseModeAreaSelection + GdViewer.MouseMode = ViewerMouseMode.MouseModeAreaSelection DefaultToolStripMenuItem.Checked = False AreaSelectionToolStripMenuItem.Checked = True PanToolStripMenuItem.Checked = False AreaZoomingToolStripMenuItem.Checked = False MagnifierToolStripMenuItem.Checked = False - GdViewer1.Focus() + GdViewer.Focus() End Sub Private Sub PanToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles PanToolStripMenuItem.Click - GdViewer1.MouseMode = ViewerMouseMode.MouseModePan + GdViewer.MouseMode = ViewerMouseMode.MouseModePan DefaultToolStripMenuItem.Checked = False AreaSelectionToolStripMenuItem.Checked = False PanToolStripMenuItem.Checked = True AreaZoomingToolStripMenuItem.Checked = False MagnifierToolStripMenuItem.Checked = False - GdViewer1.Focus() + GdViewer.Focus() End Sub Private Sub AreaZoomingToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles AreaZoomingToolStripMenuItem.Click - GdViewer1.MouseMode = ViewerMouseMode.MouseModeAreaZooming + GdViewer.MouseMode = ViewerMouseMode.MouseModeAreaZooming DefaultToolStripMenuItem.Checked = False AreaSelectionToolStripMenuItem.Checked = False PanToolStripMenuItem.Checked = False AreaZoomingToolStripMenuItem.Checked = True MagnifierToolStripMenuItem.Checked = False - GdViewer1.Focus() + GdViewer.Focus() End Sub Private Sub MagnifierToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles MagnifierToolStripMenuItem.Click - GdViewer1.MouseMode = ViewerMouseMode.MouseModeMagnifier + GdViewer.MouseMode = ViewerMouseMode.MouseModeMagnifier DefaultToolStripMenuItem.Checked = False AreaSelectionToolStripMenuItem.Checked = False PanToolStripMenuItem.Checked = False AreaZoomingToolStripMenuItem.Checked = False MagnifierToolStripMenuItem.Checked = True - GdViewer1.Focus() + GdViewer.Focus() End Sub End Class diff --git a/DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj similarity index 91% rename from DocumentViewer/DocumentViewer.vbproj rename to Controls.DocumentViewer/DocumentViewer.vbproj index d42336d7..ff6f0a70 100644 --- a/DocumentViewer/DocumentViewer.vbproj +++ b/Controls.DocumentViewer/DocumentViewer.vbproj @@ -52,9 +52,13 @@ D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET\GdPicture.NET.14.dll + + ..\packages\NLog.4.6.7\lib\net45\NLog.dll + + @@ -62,6 +66,8 @@ + + @@ -146,6 +152,13 @@ Settings.Designer.vb + + + + + {903B2D7D-3B80-4BE9-8713-7447B704E1B0} + Logging + \ No newline at end of file diff --git a/ClipboardWatcher/My Project/Application.Designer.vb b/Controls.DocumentViewer/My Project/Application.Designer.vb similarity index 100% rename from ClipboardWatcher/My Project/Application.Designer.vb rename to Controls.DocumentViewer/My Project/Application.Designer.vb diff --git a/DocumentViewer/My Project/Application.myapp b/Controls.DocumentViewer/My Project/Application.myapp similarity index 100% rename from DocumentViewer/My Project/Application.myapp rename to Controls.DocumentViewer/My Project/Application.myapp diff --git a/DocumentViewer/My Project/AssemblyInfo.vb b/Controls.DocumentViewer/My Project/AssemblyInfo.vb similarity index 100% rename from DocumentViewer/My Project/AssemblyInfo.vb rename to Controls.DocumentViewer/My Project/AssemblyInfo.vb diff --git a/DocumentViewer/My Project/Resources.Designer.vb b/Controls.DocumentViewer/My Project/Resources.Designer.vb similarity index 100% rename from DocumentViewer/My Project/Resources.Designer.vb rename to Controls.DocumentViewer/My Project/Resources.Designer.vb diff --git a/ClipboardWatcher/My Project/Resources.resx b/Controls.DocumentViewer/My Project/Resources.resx similarity index 100% rename from ClipboardWatcher/My Project/Resources.resx rename to Controls.DocumentViewer/My Project/Resources.resx diff --git a/DocumentViewer/My Project/Settings.Designer.vb b/Controls.DocumentViewer/My Project/Settings.Designer.vb similarity index 100% rename from DocumentViewer/My Project/Settings.Designer.vb rename to Controls.DocumentViewer/My Project/Settings.Designer.vb diff --git a/ClipboardWatcher/My Project/Settings.settings b/Controls.DocumentViewer/My Project/Settings.settings similarity index 100% rename from ClipboardWatcher/My Project/Settings.settings rename to Controls.DocumentViewer/My Project/Settings.settings diff --git a/DocumentViewer/frmViewerPrint.Designer.vb b/Controls.DocumentViewer/frmViewerPrint.Designer.vb similarity index 100% rename from DocumentViewer/frmViewerPrint.Designer.vb rename to Controls.DocumentViewer/frmViewerPrint.Designer.vb diff --git a/DocumentViewer/frmViewerPrint.resx b/Controls.DocumentViewer/frmViewerPrint.resx similarity index 100% rename from DocumentViewer/frmViewerPrint.resx rename to Controls.DocumentViewer/frmViewerPrint.resx diff --git a/DocumentViewer/frmViewerPrint.vb b/Controls.DocumentViewer/frmViewerPrint.vb similarity index 100% rename from DocumentViewer/frmViewerPrint.vb rename to Controls.DocumentViewer/frmViewerPrint.vb diff --git a/DocumentViewer/frmViewerSettings.Designer.vb b/Controls.DocumentViewer/frmViewerSettings.Designer.vb similarity index 100% rename from DocumentViewer/frmViewerSettings.Designer.vb rename to Controls.DocumentViewer/frmViewerSettings.Designer.vb diff --git a/DocumentViewer/frmViewerSettings.resx b/Controls.DocumentViewer/frmViewerSettings.resx similarity index 100% rename from DocumentViewer/frmViewerSettings.resx rename to Controls.DocumentViewer/frmViewerSettings.resx diff --git a/DocumentViewer/frmViewerSettings.vb b/Controls.DocumentViewer/frmViewerSettings.vb similarity index 100% rename from DocumentViewer/frmViewerSettings.vb rename to Controls.DocumentViewer/frmViewerSettings.vb diff --git a/ClipboardWatcher/packages.config b/Controls.DocumentViewer/packages.config similarity index 100% rename from ClipboardWatcher/packages.config rename to Controls.DocumentViewer/packages.config diff --git a/DDLicenseService/DDEDMLicenseService.vbproj b/DDLicenseService/DDEDMLicenseService.vbproj index c16041b0..0b27b112 100644 --- a/DDLicenseService/DDEDMLicenseService.vbproj +++ b/DDLicenseService/DDEDMLicenseService.vbproj @@ -128,10 +128,6 @@ - - {991d0231-4623-496d-8bd0-9ca906029cbc} - Filesystem - {eaf0ea75-5fa7-485d-89c7-b2d843b03a96} Database diff --git a/DDMonorepo.sln b/DDMonorepo.sln index 502d982b..00a66b49 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -21,8 +21,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TestGUI", "GUIs.Test.TestGU EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Database", "Modules.Database\Database.vbproj", "{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Messaging", "Message\Messaging.vbproj", "{AF664D85-0A4B-4BAB-A2F8-83110C06553A}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDTestService", "DDTestService\DDTestService.vbproj", "{63B0EAA3-8BF5-46DA-9040-15E781F4C3B1}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Config", "Modules.Config\Config.vbproj", "{44982F9B-6116-44E2-85D0-F39650B1EF99}" @@ -31,8 +29,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controls", "Controls", "{F9 EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "LookupControl", "Controls.LookupGrid\LookupControl.vbproj", "{3DCD6D1A-C830-4241-B7E4-27430E7EA483}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Filesystem", "Filesystem\Filesystem.vbproj", "{991D0231-4623-496D-8BD0-9CA906029CBC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Licenses", "Licenses", "{59A45678-44A7-4A59-9FC4-C2643E431B52}" ProjectSection(SolutionItems) = preProject FIREBIRD-LICENSE.txt = FIREBIRD-LICENSE.txt @@ -50,8 +46,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Interfaces", "Modules.Inter EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ZUGFeRDTest", "GUIs.Test.ZUGFeRDTest\ZUGFeRDTest.vbproj", "{16156434-E471-43F1-8030-76A0DA17CD5A}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Jobs", "Jobs\Jobs.vbproj", "{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD_CommunicationService", "DD_CommunicationService\DD_CommunicationService.vbproj", "{1FB2854F-C050-427D-9FAC-1D8F232E8025}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUI_EDMI", "GUIs.Test.GUI_EDMI\GUI_EDMI.vbproj", "{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}" @@ -60,8 +54,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ClientSuite", "GUIs.ClientS EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "IDBService", "SERVICES\DDEDM_NetworkService\IDBService.vbproj", "{A8C3F298-76AB-4359-AB3C-986E313B4336}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIAPI", "EDMI_FILE_OPs\EDMIAPI.vbproj", "{5B1171DC-FFFE-4813-A20D-786AAE47B320}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMLicenseService", "DDLicenseService\DDEDMLicenseService.vbproj", "{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "License", "Modules.License\License.vbproj", "{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}" @@ -80,21 +72,29 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Language", "Modules.Languag EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RegexEditor", "Controls.RegexEditor\RegexEditor.vbproj", "{BCC6942F-CD4B-4B67-8200-1C0D002E7CC2}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ZooFlow", "ZooFlow\ZooFlow.vbproj", "{D0FB36EB-783D-40E1-B71E-A0B84B2FE567}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Windows", "Windows\Windows.vbproj", "{5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ZooFlow", "Modules\ZooFlow\ZooFlow.vbproj", "{81CAC44F-3711-4C8F-AE98-E02A7448782A}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Automation", "Automation\Automation.vbproj", "{483A3DA7-6F7A-4E57-B77F-ED33F4E280C5}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ClipboardWatcher", "ClipboardWatcher\ClipboardWatcher.vbproj", "{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Common", "GUIs.Common\Common.vbproj", "{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Patterns", "Patterns\Patterns.vbproj", "{7C3B0C7E-59FE-4E1A-A655-27AE119F9444}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ZooFlow", "GUIs.ZooFlow\ZooFlow.vbproj", "{D0FB36EB-783D-40E1-B71E-A0B84B2FE567}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Common", "Common\Common.vbproj", "{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ZooFlow", "Modules.ZooFlow\ZooFlow.vbproj", "{81CAC44F-3711-4C8F-AE98-E02A7448782A}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DocumentViewer", "DocumentViewer\DocumentViewer.vbproj", "{0958CDDF-4A16-41F6-8837-8335F71D599C}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Patterns", "Modules.Patterns\Patterns.vbproj", "{7C3B0C7E-59FE-4E1A-A655-27AE119F9444}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DocumentViewer", "Controls.DocumentViewer\DocumentViewer.vbproj", "{0958CDDF-4A16-41F6-8837-8335F71D599C}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Messaging", "Modules.Messaging\Messaging.vbproj", "{AF664D85-0A4B-4BAB-A2F8-83110C06553A}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ClipboardWatcher", "GUIs.ClipboardWatcher\ClipboardWatcher.vbproj", "{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Filesystem", "Modules.Filesystem\Filesystem.vbproj", "{991D0231-4623-496D-8BD0-9CA906029CBC}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIAPI", "Modules.EDMIAPI\EDMIAPI.vbproj", "{5B1171DC-FFFE-4813-A20D-786AAE47B320}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Jobs", "Modules.Jobs\Jobs.vbproj", "{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -122,10 +122,6 @@ Global {EAF0EA75-5FA7-485D-89C7-B2D843B03A96}.Debug|Any CPU.Build.0 = Debug|Any CPU {EAF0EA75-5FA7-485D-89C7-B2D843B03A96}.Release|Any CPU.ActiveCfg = Release|Any CPU {EAF0EA75-5FA7-485D-89C7-B2D843B03A96}.Release|Any CPU.Build.0 = Release|Any CPU - {AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Release|Any CPU.Build.0 = Release|Any CPU {63B0EAA3-8BF5-46DA-9040-15E781F4C3B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {63B0EAA3-8BF5-46DA-9040-15E781F4C3B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {63B0EAA3-8BF5-46DA-9040-15E781F4C3B1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -138,10 +134,6 @@ Global {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Debug|Any CPU.Build.0 = Debug|Any CPU {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Release|Any CPU.ActiveCfg = Release|Any CPU {3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Release|Any CPU.Build.0 = Release|Any CPU - {991D0231-4623-496D-8BD0-9CA906029CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {991D0231-4623-496D-8BD0-9CA906029CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {991D0231-4623-496D-8BD0-9CA906029CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {991D0231-4623-496D-8BD0-9CA906029CBC}.Release|Any CPU.Build.0 = Release|Any CPU {3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Debug|Any CPU.Build.0 = Debug|Any CPU {3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -158,10 +150,6 @@ Global {16156434-E471-43F1-8030-76A0DA17CD5A}.Debug|Any CPU.Build.0 = Debug|Any CPU {16156434-E471-43F1-8030-76A0DA17CD5A}.Release|Any CPU.ActiveCfg = Release|Any CPU {16156434-E471-43F1-8030-76A0DA17CD5A}.Release|Any CPU.Build.0 = Release|Any CPU - {39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Release|Any CPU.Build.0 = Release|Any CPU {1FB2854F-C050-427D-9FAC-1D8F232E8025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1FB2854F-C050-427D-9FAC-1D8F232E8025}.Debug|Any CPU.Build.0 = Debug|Any CPU {1FB2854F-C050-427D-9FAC-1D8F232E8025}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -178,10 +166,6 @@ Global {A8C3F298-76AB-4359-AB3C-986E313B4336}.Debug|Any CPU.Build.0 = Debug|Any CPU {A8C3F298-76AB-4359-AB3C-986E313B4336}.Release|Any CPU.ActiveCfg = Release|Any CPU {A8C3F298-76AB-4359-AB3C-986E313B4336}.Release|Any CPU.Build.0 = Release|Any CPU - {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.Build.0 = Release|Any CPU {CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.Build.0 = Debug|Any CPU {CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -214,38 +198,54 @@ Global {BCC6942F-CD4B-4B67-8200-1C0D002E7CC2}.Debug|Any CPU.Build.0 = Debug|Any CPU {BCC6942F-CD4B-4B67-8200-1C0D002E7CC2}.Release|Any CPU.ActiveCfg = Release|Any CPU {BCC6942F-CD4B-4B67-8200-1C0D002E7CC2}.Release|Any CPU.Build.0 = Release|Any CPU - {D0FB36EB-783D-40E1-B71E-A0B84B2FE567}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0FB36EB-783D-40E1-B71E-A0B84B2FE567}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0FB36EB-783D-40E1-B71E-A0B84B2FE567}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0FB36EB-783D-40E1-B71E-A0B84B2FE567}.Release|Any CPU.Build.0 = Release|Any CPU {5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86}.Debug|Any CPU.Build.0 = Debug|Any CPU {5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86}.Release|Any CPU.ActiveCfg = Release|Any CPU {5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86}.Release|Any CPU.Build.0 = Release|Any CPU - {81CAC44F-3711-4C8F-AE98-E02A7448782A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81CAC44F-3711-4C8F-AE98-E02A7448782A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81CAC44F-3711-4C8F-AE98-E02A7448782A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81CAC44F-3711-4C8F-AE98-E02A7448782A}.Release|Any CPU.Build.0 = Release|Any CPU {483A3DA7-6F7A-4E57-B77F-ED33F4E280C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {483A3DA7-6F7A-4E57-B77F-ED33F4E280C5}.Debug|Any CPU.Build.0 = Debug|Any CPU {483A3DA7-6F7A-4E57-B77F-ED33F4E280C5}.Release|Any CPU.ActiveCfg = Release|Any CPU {483A3DA7-6F7A-4E57-B77F-ED33F4E280C5}.Release|Any CPU.Build.0 = Release|Any CPU - {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}.Release|Any CPU.Build.0 = Release|Any CPU - {7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Release|Any CPU.Build.0 = Release|Any CPU {D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}.Debug|Any CPU.Build.0 = Debug|Any CPU {D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}.Release|Any CPU.ActiveCfg = Release|Any CPU {D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}.Release|Any CPU.Build.0 = Release|Any CPU + {D0FB36EB-783D-40E1-B71E-A0B84B2FE567}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D0FB36EB-783D-40E1-B71E-A0B84B2FE567}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D0FB36EB-783D-40E1-B71E-A0B84B2FE567}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D0FB36EB-783D-40E1-B71E-A0B84B2FE567}.Release|Any CPU.Build.0 = Release|Any CPU + {81CAC44F-3711-4C8F-AE98-E02A7448782A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {81CAC44F-3711-4C8F-AE98-E02A7448782A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {81CAC44F-3711-4C8F-AE98-E02A7448782A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {81CAC44F-3711-4C8F-AE98-E02A7448782A}.Release|Any CPU.Build.0 = Release|Any CPU + {7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7C3B0C7E-59FE-4E1A-A655-27AE119F9444}.Release|Any CPU.Build.0 = Release|Any CPU {0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|Any CPU.Build.0 = Debug|Any CPU {0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|Any CPU.ActiveCfg = Release|Any CPU {0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|Any CPU.Build.0 = Release|Any CPU + {AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AF664D85-0A4B-4BAB-A2F8-83110C06553A}.Release|Any CPU.Build.0 = Release|Any CPU + {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}.Release|Any CPU.Build.0 = Release|Any CPU + {991D0231-4623-496D-8BD0-9CA906029CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {991D0231-4623-496D-8BD0-9CA906029CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {991D0231-4623-496D-8BD0-9CA906029CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {991D0231-4623-496D-8BD0-9CA906029CBC}.Release|Any CPU.Build.0 = Release|Any CPU + {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.Build.0 = Release|Any CPU + {39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -256,21 +256,17 @@ Global {4C86DF8F-A280-40D4-85B0-10B1BF66C15C} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {93130E7D-A950-4CBD-A0D9-7A6FAF94DDC0} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} {EAF0EA75-5FA7-485D-89C7-B2D843B03A96} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} - {AF664D85-0A4B-4BAB-A2F8-83110C06553A} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {63B0EAA3-8BF5-46DA-9040-15E781F4C3B1} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} {44982F9B-6116-44E2-85D0-F39650B1EF99} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {3DCD6D1A-C830-4241-B7E4-27430E7EA483} = {F98C0329-C004-417F-B2AB-7466E88D8220} - {991D0231-4623-496D-8BD0-9CA906029CBC} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {3207D8E7-36E3-4714-9B03-7B5B3D6D351A} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} {AB6F09BF-E794-4F6A-94BB-C97C0BA84D64} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {16156434-E471-43F1-8030-76A0DA17CD5A} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} - {39EC839A-3C30-4922-A41E-6B09D1DDE5C3} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {1FB2854F-C050-427D-9FAC-1D8F232E8025} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} {88EDAD5B-1B98-43E4-B068-1251E7AF01A0} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} {406C95F4-9FEA-45B6-8385-1768CDBBF1A7} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} {A8C3F298-76AB-4359-AB3C-986E313B4336} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} - {5B1171DC-FFFE-4813-A20D-786AAE47B320} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} {5EBACBFA-F11A-4BBF-8D02-91461F2293ED} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {7386AB04-DF8D-4DFB-809D-1FAC8212CB7E} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} @@ -279,14 +275,18 @@ Global {3D437957-B90B-4D8F-9219-6D19B0C90994} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} {D3C8CFED-D6F6-43A8-9BDF-454145D0352F} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {BCC6942F-CD4B-4B67-8200-1C0D002E7CC2} = {F98C0329-C004-417F-B2AB-7466E88D8220} - {D0FB36EB-783D-40E1-B71E-A0B84B2FE567} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} {5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} - {81CAC44F-3711-4C8F-AE98-E02A7448782A} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {483A3DA7-6F7A-4E57-B77F-ED33F4E280C5} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} - {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} - {7C3B0C7E-59FE-4E1A-A655-27AE119F9444} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {D20A6BF2-C7C6-4A7A-B34D-FA27D775A049} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} + {D0FB36EB-783D-40E1-B71E-A0B84B2FE567} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} + {81CAC44F-3711-4C8F-AE98-E02A7448782A} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} + {7C3B0C7E-59FE-4E1A-A655-27AE119F9444} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {0958CDDF-4A16-41F6-8837-8335F71D599C} = {F98C0329-C004-417F-B2AB-7466E88D8220} + {AF664D85-0A4B-4BAB-A2F8-83110C06553A} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} + {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} + {991D0231-4623-496D-8BD0-9CA906029CBC} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} + {5B1171DC-FFFE-4813-A20D-786AAE47B320} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} + {39EC839A-3C30-4922-A41E-6B09D1DDE5C3} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286} diff --git a/DDZUGFeRDService/DDZUGFeRDService.vbproj b/DDZUGFeRDService/DDZUGFeRDService.vbproj index 7aea1100..282492bb 100644 --- a/DDZUGFeRDService/DDZUGFeRDService.vbproj +++ b/DDZUGFeRDService/DDZUGFeRDService.vbproj @@ -133,10 +133,6 @@ - - {39EC839A-3C30-4922-A41E-6B09D1DDE5C3} - Jobs - {eaf0ea75-5fa7-485d-89c7-b2d843b03a96} Database diff --git a/GUIs.ClientSuite/ClientSuite.vbproj b/GUIs.ClientSuite/ClientSuite.vbproj index 3d834188..460c519d 100644 --- a/GUIs.ClientSuite/ClientSuite.vbproj +++ b/GUIs.ClientSuite/ClientSuite.vbproj @@ -492,14 +492,6 @@ {3dcd6d1a-c830-4241-b7e4-27430e7ea483} LookupControl - - {5b1171dc-fffe-4813-a20d-786aae47b320} - EDMIAPI - - - {991d0231-4623-496d-8bd0-9ca906029cbc} - Filesystem - {44982f9b-6116-44e2-85d0-f39650b1ef99} Config diff --git a/ClipboardWatcher/ClipboardWatcher.vbproj b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj similarity index 95% rename from ClipboardWatcher/ClipboardWatcher.vbproj rename to GUIs.ClipboardWatcher/ClipboardWatcher.vbproj index 9f5f488b..7bc352ab 100644 --- a/ClipboardWatcher/ClipboardWatcher.vbproj +++ b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj @@ -146,7 +146,7 @@ - + {D20A6BF2-C7C6-4A7A-B34D-FA27D775A049} Common @@ -162,14 +162,14 @@ {903b2d7d-3b80-4be9-8713-7447b704e1b0} Logging - - {81CAC44F-3711-4C8F-AE98-E02A7448782A} - ZooFlow - - - {7C3B0C7E-59FE-4E1A-A655-27AE119F9444} + + {7c3b0c7e-59fe-4e1a-a655-27ae119f9444} Patterns + + {81cac44f-3711-4c8f-ae98-e02a7448782a} + ZooFlow + {5efaef9b-90b9-4f05-9f70-f79ad77fff86} Windows diff --git a/Common/My Project/Application.Designer.vb b/GUIs.ClipboardWatcher/My Project/Application.Designer.vb similarity index 100% rename from Common/My Project/Application.Designer.vb rename to GUIs.ClipboardWatcher/My Project/Application.Designer.vb diff --git a/ClipboardWatcher/My Project/Application.myapp b/GUIs.ClipboardWatcher/My Project/Application.myapp similarity index 100% rename from ClipboardWatcher/My Project/Application.myapp rename to GUIs.ClipboardWatcher/My Project/Application.myapp diff --git a/ClipboardWatcher/My Project/AssemblyInfo.vb b/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb similarity index 100% rename from ClipboardWatcher/My Project/AssemblyInfo.vb rename to GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb diff --git a/ClipboardWatcher/My Project/Resources.Designer.vb b/GUIs.ClipboardWatcher/My Project/Resources.Designer.vb similarity index 100% rename from ClipboardWatcher/My Project/Resources.Designer.vb rename to GUIs.ClipboardWatcher/My Project/Resources.Designer.vb diff --git a/DocumentViewer/My Project/Resources.resx b/GUIs.ClipboardWatcher/My Project/Resources.resx similarity index 100% rename from DocumentViewer/My Project/Resources.resx rename to GUIs.ClipboardWatcher/My Project/Resources.resx diff --git a/ClipboardWatcher/My Project/Settings.Designer.vb b/GUIs.ClipboardWatcher/My Project/Settings.Designer.vb similarity index 100% rename from ClipboardWatcher/My Project/Settings.Designer.vb rename to GUIs.ClipboardWatcher/My Project/Settings.Designer.vb diff --git a/Common/My Project/Settings.settings b/GUIs.ClipboardWatcher/My Project/Settings.settings similarity index 100% rename from Common/My Project/Settings.settings rename to GUIs.ClipboardWatcher/My Project/Settings.settings diff --git a/ClipboardWatcher/My Project/licenses.licx b/GUIs.ClipboardWatcher/My Project/licenses.licx similarity index 100% rename from ClipboardWatcher/My Project/licenses.licx rename to GUIs.ClipboardWatcher/My Project/licenses.licx diff --git a/ClipboardWatcher/ProfileFilter.vb b/GUIs.ClipboardWatcher/ProfileFilter.vb similarity index 99% rename from ClipboardWatcher/ProfileFilter.vb rename to GUIs.ClipboardWatcher/ProfileFilter.vb index 62eb4181..c77fe448 100644 --- a/ClipboardWatcher/ProfileFilter.vb +++ b/GUIs.ClipboardWatcher/ProfileFilter.vb @@ -6,7 +6,7 @@ Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Windows Imports DigitalData.Modules.ZooFlow.Params Imports DigitalData.Modules.ZooFlow.State -Imports Patterns +Imports DigitalData.Modules.Patterns Public Class ProfileFilter Private _ProfileMatch As ProfileMatch diff --git a/ClipboardWatcher/ProfileMatch.vb b/GUIs.ClipboardWatcher/ProfileMatch.vb similarity index 100% rename from ClipboardWatcher/ProfileMatch.vb rename to GUIs.ClipboardWatcher/ProfileMatch.vb diff --git a/ClipboardWatcher/ProfileSearches.vb b/GUIs.ClipboardWatcher/ProfileSearches.vb similarity index 100% rename from ClipboardWatcher/ProfileSearches.vb rename to GUIs.ClipboardWatcher/ProfileSearches.vb diff --git a/ClipboardWatcher/frmMatch.Designer.vb b/GUIs.ClipboardWatcher/frmMatch.Designer.vb similarity index 100% rename from ClipboardWatcher/frmMatch.Designer.vb rename to GUIs.ClipboardWatcher/frmMatch.Designer.vb diff --git a/ClipboardWatcher/frmMatch.resx b/GUIs.ClipboardWatcher/frmMatch.resx similarity index 100% rename from ClipboardWatcher/frmMatch.resx rename to GUIs.ClipboardWatcher/frmMatch.resx diff --git a/ClipboardWatcher/frmMatch.vb b/GUIs.ClipboardWatcher/frmMatch.vb similarity index 100% rename from ClipboardWatcher/frmMatch.vb rename to GUIs.ClipboardWatcher/frmMatch.vb diff --git a/ClipboardWatcher/frmTreeView.Designer.vb b/GUIs.ClipboardWatcher/frmTreeView.Designer.vb similarity index 100% rename from ClipboardWatcher/frmTreeView.Designer.vb rename to GUIs.ClipboardWatcher/frmTreeView.Designer.vb diff --git a/ClipboardWatcher/frmTreeView.resx b/GUIs.ClipboardWatcher/frmTreeView.resx similarity index 100% rename from ClipboardWatcher/frmTreeView.resx rename to GUIs.ClipboardWatcher/frmTreeView.resx diff --git a/ClipboardWatcher/frmTreeView.vb b/GUIs.ClipboardWatcher/frmTreeView.vb similarity index 100% rename from ClipboardWatcher/frmTreeView.vb rename to GUIs.ClipboardWatcher/frmTreeView.vb diff --git a/Common/packages.config b/GUIs.ClipboardWatcher/packages.config similarity index 100% rename from Common/packages.config rename to GUIs.ClipboardWatcher/packages.config diff --git a/Common/Base/ClassMessageBox.vb b/GUIs.Common/Base/ClassMessageBox.vb similarity index 100% rename from Common/Base/ClassMessageBox.vb rename to GUIs.Common/Base/ClassMessageBox.vb diff --git a/Common/Common.vbproj b/GUIs.Common/Common.vbproj similarity index 95% rename from Common/Common.vbproj rename to GUIs.Common/Common.vbproj index e763b6cb..a9798af3 100644 --- a/Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -140,7 +140,7 @@ - + {0958cddf-4a16-41f6-8837-8335f71d599c} DocumentViewer @@ -160,14 +160,10 @@ {903B2D7D-3B80-4BE9-8713-7447B704E1B0} Logging - - {81CAC44F-3711-4C8F-AE98-E02A7448782A} + + {81cac44f-3711-4c8f-ae98-e02a7448782a} ZooFlow - - {7C3B0C7E-59FE-4E1A-A655-27AE119F9444} - Patterns - diff --git a/Common/DocumentResultList/DocumentResultConfig.vb b/GUIs.Common/DocumentResultList/DocumentResultConfig.vb similarity index 100% rename from Common/DocumentResultList/DocumentResultConfig.vb rename to GUIs.Common/DocumentResultList/DocumentResultConfig.vb diff --git a/Common/DocumentResultList/DocumentResultParams.vb b/GUIs.Common/DocumentResultList/DocumentResultParams.vb similarity index 89% rename from Common/DocumentResultList/DocumentResultParams.vb rename to GUIs.Common/DocumentResultList/DocumentResultParams.vb index 7f52ce28..dc7b0869 100644 --- a/Common/DocumentResultList/DocumentResultParams.vb +++ b/GUIs.Common/DocumentResultList/DocumentResultParams.vb @@ -3,7 +3,6 @@ ''' WindowGuid is used to save layout data ''' Public WindowGuid As String - Public ViewerLicense As String Public Results As New List(Of DocumentResult) End Class diff --git a/Common/DocumentResultList/frmDocumentResultList.Designer.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb similarity index 79% rename from Common/DocumentResultList/frmDocumentResultList.Designer.vb rename to GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb index 83c2956f..6c91a97b 100644 --- a/Common/DocumentResultList/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb @@ -25,12 +25,20 @@ Partial Class frmDocumentResultList Me.SwitchMainContainerHorizontal = New DevExpress.XtraBars.BarToggleSwitchItem() Me.SwitchDetailContainerHorizontal = New DevExpress.XtraBars.BarToggleSwitchItem() Me.BarButtonItemExportGrid1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.OrdnerÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PfadInZwischenablageKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GridView1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView() Me.GridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl() @@ -47,6 +55,7 @@ Partial Class frmDocumentResultList CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.SuspendLayout() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ContextMenuGrid.SuspendLayout() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl2.SuspendLayout() @@ -61,9 +70,9 @@ Partial Class frmDocumentResultList 'RibbonControl ' Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) Me.RibbonControl.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl.MaxItemId = 4 + Me.RibbonControl.MaxItemId = 7 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -92,9 +101,33 @@ Partial Class frmDocumentResultList Me.BarButtonItemExportGrid1.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItemExportGrid1.ImageOptions.LargeImage"), System.Drawing.Image) Me.BarButtonItemExportGrid1.Name = "BarButtonItemExportGrid1" ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Datei öffnen" + Me.BarButtonItem1.Id = 4 + Me.BarButtonItem1.ImageOptions.Image = CType(resources.GetObject("BarButtonItem1.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Ordner öffnen" + Me.BarButtonItem2.Id = 5 + Me.BarButtonItem2.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem2.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Pfad in Zwischenablage" + Me.BarButtonItem3.Id = 6 + Me.BarButtonItem3.ImageOptions.Image = CType(resources.GetObject("BarButtonItem3.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem3.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Ergebnisse" ' @@ -105,6 +138,14 @@ Partial Class frmDocumentResultList Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Layout" ' + 'RibbonPageGroup3 + ' + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroup3.Name = "RibbonPageGroup3" + Me.RibbonPageGroup3.Text = "Dateiaktionen" + ' 'RibbonPageGroup2 ' Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItemExportGrid1) @@ -135,6 +176,7 @@ Partial Class frmDocumentResultList ' 'GridControl1 ' + Me.GridControl1.ContextMenuStrip = Me.ContextMenuGrid Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.GridControl1.Location = New System.Drawing.Point(0, 0) Me.GridControl1.MainView = Me.GridView1 @@ -144,6 +186,30 @@ Partial Class frmDocumentResultList Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' + 'ContextMenuGrid + ' + Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.OrdnerÖffnenToolStripMenuItem, Me.PfadInZwischenablageKopierenToolStripMenuItem}) + Me.ContextMenuGrid.Name = "ContextMenuGrid" + Me.ContextMenuGrid.Size = New System.Drawing.Size(200, 70) + ' + 'DateiÖffnenToolStripMenuItem + ' + Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem" + Me.DateiÖffnenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) + Me.DateiÖffnenToolStripMenuItem.Text = "Datei öffnen" + ' + 'OrdnerÖffnenToolStripMenuItem + ' + Me.OrdnerÖffnenToolStripMenuItem.Name = "OrdnerÖffnenToolStripMenuItem" + Me.OrdnerÖffnenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) + Me.OrdnerÖffnenToolStripMenuItem.Text = "Ordner öffnen" + ' + 'PfadInZwischenablageKopierenToolStripMenuItem + ' + Me.PfadInZwischenablageKopierenToolStripMenuItem.Name = "PfadInZwischenablageKopierenToolStripMenuItem" + Me.PfadInZwischenablageKopierenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) + Me.PfadInZwischenablageKopierenToolStripMenuItem.Text = "Pfad in Zwischenablage" + ' 'GridView1 ' Me.GridView1.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand1}) @@ -183,6 +249,7 @@ Partial Class frmDocumentResultList ' 'GridControl2 ' + Me.GridControl2.ContextMenuStrip = Me.ContextMenuGrid Me.GridControl2.Dock = System.Windows.Forms.DockStyle.Fill Me.GridControl2.Location = New System.Drawing.Point(0, 0) Me.GridControl2.MainView = Me.GridView2 @@ -214,6 +281,7 @@ Partial Class frmDocumentResultList ' 'GridControl3 ' + Me.GridControl3.ContextMenuStrip = Me.ContextMenuGrid Me.GridControl3.Dock = System.Windows.Forms.DockStyle.Fill Me.GridControl3.Location = New System.Drawing.Point(0, 0) Me.GridControl3.MainView = Me.GridView3 @@ -286,6 +354,7 @@ Partial Class frmDocumentResultList CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl1.ResumeLayout(False) CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ContextMenuGrid.ResumeLayout(False) CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl2.ResumeLayout(False) @@ -322,4 +391,12 @@ Partial Class frmDocumentResultList Friend WithEvents XtraSaveFileDialog As DevExpress.XtraEditors.XtraSaveFileDialog Friend WithEvents SplitContainerControl3 As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents DocumentViewer1 As DocumentViewer.DocumentViewer + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents ContextMenuGrid As Windows.Forms.ContextMenuStrip + Friend WithEvents DateiÖffnenToolStripMenuItem As Windows.Forms.ToolStripMenuItem + Friend WithEvents OrdnerÖffnenToolStripMenuItem As Windows.Forms.ToolStripMenuItem + Friend WithEvents PfadInZwischenablageKopierenToolStripMenuItem As Windows.Forms.ToolStripMenuItem End Class diff --git a/Common/DocumentResultList/frmDocumentResultList.resx b/GUIs.Common/DocumentResultList/frmDocumentResultList.resx similarity index 74% rename from Common/DocumentResultList/frmDocumentResultList.resx rename to GUIs.Common/DocumentResultList/frmDocumentResultList.resx index 8f70ff33..4dc17f69 100644 --- a/Common/DocumentResultList/frmDocumentResultList.resx +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.resx @@ -139,6 +139,70 @@ TFqBJ/gMgS6kFlgD86IA67vA+3CjC4yA0LudSp2BAAAAAElFTkSuQmCC + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAddEVYdFRpdGxlAEFydGljbGU7TG9hZDtPcGVuO0lz + c3VlwgbP1QAAAIJJREFUOE+lkQEOgCAIRb0gl+kIzUN1gM7TDRiBG8wlitrf3jKCp7NERL+wRc6ZFvAF + oyBieTYCfgEpqADOq4vEE5SCCqKEAm9nRRIKooQCb2dFUvVPn0AvuYG/uQJgrOm5D2CoA3wF0jwaaKgF + y8OMnWBrmCl3sD0s2P/cxS3OQ+kF2uLi3IrZfvEAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAddEVYdFRpdGxlAEFydGljbGU7TG9hZDtPcGVuO0lz + c3VlwgbP1QAAARFJREFUWEfdkkEOwkAIRb3gXMaNe9MLufMArj2KVxj5BpKh+dh2xtJEkpcCKZ9P01Ot + 9VBoMxPazIQ2M6FNME1T/RFU36BNgOHR+C8D5XpfRRubDcjLxYbwHA3TkjTEFTpADbBrGW2YlqQhrtAB + aqAnTEvSEFfoADXArmW0YVqShrhCB6iBnjAtSUNcoQPUALuW0YZpSRriCh2gBnrCtCQNcYUOUAPsWkYb + piVpiCt0gBpYiCI4LbC0HLii0wCWg/p6nLdS1hqgFyq9yz84scBAkRcBFRhk8Qvsulz4+g/svhxEBsrz + dtl9OWAGUi435gZSlwNnQBqpy8HcABseJVwOnIEjoM1MaDMT2syENvOopzdUfCMZg5IrCQAAAABJRU5E + rkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAArdEVYdFRpdGxlAE9wZW47Rm9sZGVyO0JhcnM7Umli + Ym9uO1N0YW5kYXJkO0xvYWTxw8RjAAAAb0lEQVQ4T6XQ0Q2AIAwEUBbsMs7Q0ZzHFeqVRIJ6VQof7+fC + XUiLmS2hYQYNM4qqChjhOS31fICVL8JKvb+BSBueHUB3cQCGB+oxmWjgVjj2TcAC8hzwx1+Fl34gXYb2 + g6ky1BtMl1295AoajrNyArCYwjN4ThJYAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAArdEVYdFRpdGxlAE9wZW47Rm9sZGVyO0JhcnM7Umli + Ym9uO1N0YW5kYXJkO0xvYWTxw8RjAAAA0UlEQVRYR8XU0RHCMAwD0C6YZZihozEPK5j4h4t0ShvSVP14 + H9bVleE4toh4lAydZOgkQycZOsnQSYZOMnSCYd/3UsWgfBb2Z8BABSNgfwYMouAM7M+AQRSsUNoOBoNY + XqLtYDCo5RXaDgaDWl6h7WAwqOUV2g4Gg1oeNP2fAAO9dFT5vF8pJpTRA7qfMF9CL/0LvIxKf+X1wUsl + B06/gVvLq8PfwO3lqXeApTypA2zliQ+wlic4oAbW8sQHqOWruuUJDniCDJ1k6CRDJxn6xPYFX3CGNwSC + woYAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAENvcHk7QmFycztSaWJib247U3Rh + bmRhcmQ7Q2xvbmVtDt9bAAAAb0lEQVQ4T+2OwQ2AIBAE6ckW700HlOaXIny4cgbIokE5w9NNJhC4HXAA + GkQEHfa8LjzflBUd6kXvvPcrS8yClI0ltfREjFGLt3PtDr0aQqiSEpNAc5WYBExJ3r8LOL9gkoBJ+fSD + s1OYJxiFywDcAUEvVDi/LQTFAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAENvcHk7QmFycztSaWJib247U3Rh + bmRhcmQ7Q2xvbmVtDt9bAAAA50lEQVRYR+2TwQqDMAyGfT6fq1dRevfJxFNhD7EdsvysgukSp1vtBusH + P5K0id9BGyL6atRmyajNNM45OpjAaTmYfcp6tyis8BA/9oP7XdfdxnFsuUx3iVoUVt4RmOdZlSgmADSJ + ogIgldgUwOCReO9pmiYeleBsTZS4QoLPxDtFkQ6+Avf7vqcQQuw80PYsEnwmvomPBbA4lUB/Ixe+kk8A + aBIWcSavANgrcZoA2CNxqgBYJLS/A2QXsDIMQ7wlwRmTR2ALa1cVqAJVoAr8l4AVpowAI/ZrEUUV+AmB + nFnvtqI2y4WaO7s+m1CnlB8XAAAAAElFTkSuQmCC + + + + 170, 17 + 17, 17 diff --git a/Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb similarity index 67% rename from Common/DocumentResultList/frmDocumentResultList.vb rename to GUIs.Common/DocumentResultList/frmDocumentResultList.vb index 1adf4a81..df280524 100644 --- a/Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -10,6 +10,7 @@ Imports DigitalData.Modules.Config Imports DigitalData.Modules.Logging Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.Language +Imports DevExpress.XtraGrid.Views.Base Public Class frmDocumentResultList Private _LogConfig As LogConfig @@ -19,6 +20,16 @@ Public Class frmDocumentResultList Private _Params As DocumentResultParams Private _ResultLists As List(Of DocumentResult) + Private _ActiveGrid As GridControl = Nothing + Private _ActiveRowHandle As Integer = NO_ROW_HANDLE + + Private Const NO_ROW_HANDLE = -1 + + Private Const COLUMN_ICON = "ICON" + Private Const COLUMN_FILEPATH = "FULL_FILENAME" + Private Const COLUMN_FILENAME = "Filename" + Private Const COLUMN_DOCID = "DocID" + Private _IsLoading As Boolean = True Public Sub New(LogConfig As LogConfig, Environment As Environment, Params As DocumentResultParams) @@ -44,7 +55,12 @@ Public Class frmDocumentResultList SplitContainerControl2.SplitterPosition = _Config.Config.SplitContainer2Distance SwitchDetailContainerHorizontal.Checked = _Config.Config.SplitContainer2Horizontal - DocumentViewer1.Init(_Params.ViewerLicense) + ' Initialize Viewer with GDPicture.NET License + DocumentViewer1.Init(_LogConfig, _Environment.Settings.GdPictureKey) + + AddHandler GridView1.FocusedRowChanged, AddressOf GridView_FocusedRowChanged + AddHandler GridView2.FocusedRowChanged, AddressOf GridView_FocusedRowChanged + AddHandler GridView3.FocusedRowChanged, AddressOf GridView_FocusedRowChanged Dim oTotalResults = 0 @@ -94,7 +110,31 @@ Public Class frmDocumentResultList End Try End Sub + Private Sub UpdateGridHeader(Index As Integer, Count As Integer) + Select Case Index + Case 0 + Dim oResult As DocumentResult = _ResultLists.Item(0) + GridBand1.Caption = $"{oResult.Title} ({Count})" + Case 1 + Dim oResult As DocumentResult = _ResultLists.Item(1) + GridBand2.Caption = $"{oResult.Title} ({Count})" + + Case 2 + Dim oResult As DocumentResult = _ResultLists.Item(2) + GridBand3.Caption = $"{oResult.Title} ({Count})" + End Select + End Sub + + Private Sub GridView_FocusedRowChanged(sender As GridView, e As FocusedRowChangedEventArgs) + _ActiveRowHandle = e.FocusedRowHandle + + If e.FocusedRowHandle >= 0 Then + Dim oRow = sender.GetDataRow(e.FocusedRowHandle) + Dim oFullPath = oRow.Item(COLUMN_FILEPATH) + DocumentViewer1.LoadFile(oFullPath) + End If + End Sub Private Sub CreateDocumentGrid(GridView As GridView, Datatable As DataTable) Dim oMyDocDatatable As New DataTable @@ -102,12 +142,12 @@ Public Class frmDocumentResultList 'Die Icon Colum erstellen und konfigurieren oMyDocDatatable.Columns.Add(New DataColumn() With { .DataType = GetType(Image), - .ColumnName = "ICON", + .ColumnName = COLUMN_ICON, .Caption = "" }) oMyDocDatatable.Columns.Add(New DataColumn() With { .DataType = GetType(String), - .ColumnName = "FULL_FILENAME", + .ColumnName = COLUMN_FILEPATH, .Caption = "Fullpath" }) oMyDocDatatable.Columns.Add(New DataColumn() With { @@ -124,7 +164,7 @@ Public Class frmDocumentResultList Dim oRestColArray As New List(Of String) For Each oCol As DataColumn In Datatable.Columns Dim onewColumn As New DataColumn() - If oCol.ColumnName <> "DocID" And oCol.ColumnName <> "FULL_FILENAME" And oCol.ColumnName <> "Filename" Then + If oCol.ColumnName <> "DocID" And oCol.ColumnName <> COLUMN_FILEPATH And oCol.ColumnName <> "Filename" Then onewColumn.DataType = GetType(String) onewColumn.ColumnName = oCol.ColumnName onewColumn.Caption = oCol.Caption @@ -134,7 +174,7 @@ Public Class frmDocumentResultList Next For Each oRow As DataRow In Datatable.Rows - Dim oFullpath = oRow.Item("FULL_FILENAME") + Dim oFullpath = oRow.Item(COLUMN_FILEPATH) Dim oDocID = oRow.Item("DocID") 'Dim Folderpath = Path.GetDirectoryName(fullpath) Dim oFilename = IO.Path.GetFileName(oFullpath) @@ -203,7 +243,7 @@ Public Class frmDocumentResultList Catch ex As Exception End Try Try - GridView.Columns.Item("FULL_FILENAME").Visible = False + GridView.Columns.Item(COLUMN_FILEPATH).Visible = False Catch ex As Exception End Try @@ -233,8 +273,8 @@ Public Class frmDocumentResultList oColumn.OptionsColumn.AllowEdit = False Next - GridView.Columns.Item("ICON").MaxWidth = 24 - GridView.Columns.Item("ICON").MinWidth = 24 + GridView.Columns.Item(COLUMN_ICON).MaxWidth = 24 + GridView.Columns.Item(COLUMN_ICON).MinWidth = 24 GridView.OptionsView.BestFitMaxRowCount = -1 GridView.BestFitColumns(True) Catch ex As Exception @@ -285,4 +325,116 @@ Public Class frmDocumentResultList _Config.Save() End If End Sub + + Private Function GetActiveRow() As DataRow + Dim oActiveGrid = GetActiveGridControl() + Dim oActiveRowhandle = GetActiveRowHandle() + + If oActiveGrid IsNot Nothing And oActiveRowhandle <> NO_ROW_HANDLE Then + Dim oView = DirectCast(oActiveGrid.DefaultView, GridView) + Dim oRow = oView.GetDataRow(oActiveRowhandle) + Return oRow + Else + Return Nothing + End If + End Function + + Private Function GetActiveGridControl() As GridControl + If _ActiveGrid Is Nothing Then + Return Nothing + End If + + Return _ActiveGrid + End Function + + Private Function GetActiveRowHandle() As Integer + If _ActiveRowHandle = NO_ROW_HANDLE Then + Return NO_ROW_HANDLE + End If + + Return _ActiveRowHandle + End Function + + Private Sub GridControl_Enter(sender As GridControl, e As EventArgs) Handles GridControl1.Enter, GridControl2.Enter, GridControl3.Enter + _ActiveGrid = sender + End Sub + + Private Sub OpenFolderPath() + Try + Dim oRow = GetActiveRow() + + If oRow IsNot Nothing Then + Dim oFilename = oRow.Item(COLUMN_FILEPATH) + Dim oDirectory = IO.Path.GetDirectoryName(oFilename) + Process.Start(oDirectory) + End If + Catch ex As Exception + _Logger.Error(ex) + End Try + End Sub + + Private Sub OpenFile() + Try + Dim oRow = GetActiveRow() + + If oRow IsNot Nothing Then + Dim oFilename = oRow.Item(COLUMN_FILEPATH) + Process.Start(oFilename) + End If + Catch ex As Exception + _Logger.Error(ex) + End Try + End Sub + + Private Sub CopyFileName() + Try + Dim oRow = GetActiveRow() + + If oRow IsNot Nothing Then + Dim oFilename = oRow.Item(COLUMN_FILEPATH) + Clipboard.SetText(oFilename) + End If + Catch ex As Exception + _Logger.Error(ex) + End Try + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + OpenFile() + End Sub + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + OpenFolderPath() + End Sub + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + CopyFileName() + End Sub + + Private Sub DateiÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiÖffnenToolStripMenuItem.Click + OpenFile() + End Sub + + Private Sub OrdnerÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OrdnerÖffnenToolStripMenuItem.Click + OpenFolderPath() + End Sub + + Private Sub PfadInZwischenablageKopierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PfadInZwischenablageKopierenToolStripMenuItem.Click + CopyFileName() + End Sub + + Private Sub GridView1_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridView1.ColumnFilterChanged + Dim oRowCount = sender.RowCount + UpdateGridHeader(0, oRowCount) + End Sub + + Private Sub GridView2_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridView2.ColumnFilterChanged + Dim oRowCount = sender.RowCount + UpdateGridHeader(1, oRowCount) + End Sub + + Private Sub GridView3_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridView3.ColumnFilterChanged + Dim oRowCount = sender.RowCount + UpdateGridHeader(2, oRowCount) + End Sub End Class \ No newline at end of file diff --git a/Common/IResultForm.vb b/GUIs.Common/IResultForm.vb similarity index 100% rename from Common/IResultForm.vb rename to GUIs.Common/IResultForm.vb diff --git a/DocumentViewer/My Project/Application.Designer.vb b/GUIs.Common/My Project/Application.Designer.vb similarity index 100% rename from DocumentViewer/My Project/Application.Designer.vb rename to GUIs.Common/My Project/Application.Designer.vb diff --git a/Common/My Project/Application.myapp b/GUIs.Common/My Project/Application.myapp similarity index 100% rename from Common/My Project/Application.myapp rename to GUIs.Common/My Project/Application.myapp diff --git a/Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb similarity index 100% rename from Common/My Project/AssemblyInfo.vb rename to GUIs.Common/My Project/AssemblyInfo.vb diff --git a/Common/My Project/Resources.Designer.vb b/GUIs.Common/My Project/Resources.Designer.vb similarity index 100% rename from Common/My Project/Resources.Designer.vb rename to GUIs.Common/My Project/Resources.Designer.vb diff --git a/Common/My Project/Resources.resx b/GUIs.Common/My Project/Resources.resx similarity index 100% rename from Common/My Project/Resources.resx rename to GUIs.Common/My Project/Resources.resx diff --git a/Common/My Project/Settings.Designer.vb b/GUIs.Common/My Project/Settings.Designer.vb similarity index 100% rename from Common/My Project/Settings.Designer.vb rename to GUIs.Common/My Project/Settings.Designer.vb diff --git a/DocumentViewer/My Project/Settings.settings b/GUIs.Common/My Project/Settings.settings similarity index 100% rename from DocumentViewer/My Project/Settings.settings rename to GUIs.Common/My Project/Settings.settings diff --git a/Common/My Project/licenses.licx b/GUIs.Common/My Project/licenses.licx similarity index 100% rename from Common/My Project/licenses.licx rename to GUIs.Common/My Project/licenses.licx diff --git a/Common/Resources/_blank.png b/GUIs.Common/Resources/_blank.png similarity index 100% rename from Common/Resources/_blank.png rename to GUIs.Common/Resources/_blank.png diff --git a/Common/Resources/_page.png b/GUIs.Common/Resources/_page.png similarity index 100% rename from Common/Resources/_page.png rename to GUIs.Common/Resources/_page.png diff --git a/Common/Resources/doc.png b/GUIs.Common/Resources/doc.png similarity index 100% rename from Common/Resources/doc.png rename to GUIs.Common/Resources/doc.png diff --git a/Common/Resources/dwg.png b/GUIs.Common/Resources/dwg.png similarity index 100% rename from Common/Resources/dwg.png rename to GUIs.Common/Resources/dwg.png diff --git a/Common/Resources/dxf.png b/GUIs.Common/Resources/dxf.png similarity index 100% rename from Common/Resources/dxf.png rename to GUIs.Common/Resources/dxf.png diff --git a/Common/Resources/jpg.png b/GUIs.Common/Resources/jpg.png similarity index 100% rename from Common/Resources/jpg.png rename to GUIs.Common/Resources/jpg.png diff --git a/Common/Resources/pdf.png b/GUIs.Common/Resources/pdf.png similarity index 100% rename from Common/Resources/pdf.png rename to GUIs.Common/Resources/pdf.png diff --git a/Common/Resources/png.png b/GUIs.Common/Resources/png.png similarity index 100% rename from Common/Resources/png.png rename to GUIs.Common/Resources/png.png diff --git a/Common/Resources/ppt.png b/GUIs.Common/Resources/ppt.png similarity index 100% rename from Common/Resources/ppt.png rename to GUIs.Common/Resources/ppt.png diff --git a/Common/Resources/tiff.png b/GUIs.Common/Resources/tiff.png similarity index 100% rename from Common/Resources/tiff.png rename to GUIs.Common/Resources/tiff.png diff --git a/Common/Resources/txt.png b/GUIs.Common/Resources/txt.png similarity index 100% rename from Common/Resources/txt.png rename to GUIs.Common/Resources/txt.png diff --git a/Common/Resources/xls.png b/GUIs.Common/Resources/xls.png similarity index 100% rename from Common/Resources/xls.png rename to GUIs.Common/Resources/xls.png diff --git a/Common/ResultListParams.vb b/GUIs.Common/ResultListParams.vb similarity index 100% rename from Common/ResultListParams.vb rename to GUIs.Common/ResultListParams.vb diff --git a/EDMI_FILE_OPs/packages.config b/GUIs.Common/packages.config similarity index 100% rename from EDMI_FILE_OPs/packages.config rename to GUIs.Common/packages.config diff --git a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj index e05efbe6..793769eb 100644 --- a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj +++ b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj @@ -132,10 +132,6 @@ - - {39EC839A-3C30-4922-A41E-6B09D1DDE5C3} - Jobs - {EAF0EA75-5FA7-485D-89C7-B2D843B03A96} Database @@ -144,6 +140,10 @@ {ab6f09bf-e794-4f6a-94bb-c97c0ba84d64} Interfaces + + {39ec839a-3c30-4922-a41e-6b09d1dde5c3} + Jobs + {903B2D7D-3B80-4BE9-8713-7447B704E1B0} Logging diff --git a/ZooFlow/ApplicationEvents.vb b/GUIs.ZooFlow/ApplicationEvents.vb similarity index 100% rename from ZooFlow/ApplicationEvents.vb rename to GUIs.ZooFlow/ApplicationEvents.vb diff --git a/ZooFlow/Base/BaseClass.vb b/GUIs.ZooFlow/Base/BaseClass.vb similarity index 100% rename from ZooFlow/Base/BaseClass.vb rename to GUIs.ZooFlow/Base/BaseClass.vb diff --git a/ZooFlow/ClassClipboardWatcher.vb b/GUIs.ZooFlow/ClassClipboardWatcher.vb similarity index 100% rename from ZooFlow/ClassClipboardWatcher.vb rename to GUIs.ZooFlow/ClassClipboardWatcher.vb diff --git a/ZooFlow/ClassConstants.vb b/GUIs.ZooFlow/ClassConstants.vb similarity index 100% rename from ZooFlow/ClassConstants.vb rename to GUIs.ZooFlow/ClassConstants.vb diff --git a/ZooFlow/ClassEnvironment.vb b/GUIs.ZooFlow/ClassEnvironment.vb similarity index 100% rename from ZooFlow/ClassEnvironment.vb rename to GUIs.ZooFlow/ClassEnvironment.vb diff --git a/ZooFlow/ClassFlowForm.vb b/GUIs.ZooFlow/ClassFlowForm.vb similarity index 100% rename from ZooFlow/ClassFlowForm.vb rename to GUIs.ZooFlow/ClassFlowForm.vb diff --git a/ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb similarity index 95% rename from ZooFlow/ClassInit.vb rename to GUIs.ZooFlow/ClassInit.vb index bda14c5a..e5206c04 100644 --- a/ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -71,6 +71,8 @@ Public Class ClassInit Else ' Copy back state from MyApplication Helper to My.Application Dim oMyApplication As My.MyApplication = DirectCast(e.Result, My.MyApplication) + + My.Application.Settings = oMyApplication.Settings My.Application.User = oMyApplication.User My.Application.Modules = oMyApplication.Modules My.Application.ModulesActive = oMyApplication.ModulesActive @@ -93,14 +95,18 @@ Public Class ClassInit End If End Sub - Private Sub Initialize3rdParty(obj As Object) + Private Sub Initialize3rdParty(MyApplication As My.MyApplication) Try - Dim oSql = "SELECT GDPICTURE_LICENSE FROM TBCW_CONFIGURATION" + Dim oSql = "SELECT * FROM TBCW_CONFIGURATION" Dim oDatatable As DataTable = My.Database.GetDatatable(oSql) If oDatatable.Rows.Count = 0 Then Throw New InitException("Konfiguration konnte nicht geladen werden!") End If + + Dim oRow As DataRow = oDatatable.Rows.Item(0) + + MyApplication.Settings.GdPictureKey = NotNull(oRow.Item("GDPICTURE_LICENSE"), String.Empty) Catch ex As Exception _Logger.Error(ex) Throw New InitException("Fehler beim Laden der Konfiguration!") diff --git a/ZooFlow/ClassInitLoader.vb b/GUIs.ZooFlow/ClassInitLoader.vb similarity index 100% rename from ZooFlow/ClassInitLoader.vb rename to GUIs.ZooFlow/ClassInitLoader.vb diff --git a/ZooFlow/ClassProfileFilter.vb b/GUIs.ZooFlow/ClassProfileFilter.vb similarity index 100% rename from ZooFlow/ClassProfileFilter.vb rename to GUIs.ZooFlow/ClassProfileFilter.vb diff --git a/ZooFlow/ClipboardWatcher/State.vb b/GUIs.ZooFlow/ClipboardWatcher/State.vb similarity index 100% rename from ZooFlow/ClipboardWatcher/State.vb rename to GUIs.ZooFlow/ClipboardWatcher/State.vb diff --git a/ZooFlow/Config/ClassConfig.vb b/GUIs.ZooFlow/Config/ClassConfig.vb similarity index 100% rename from ZooFlow/Config/ClassConfig.vb rename to GUIs.ZooFlow/Config/ClassConfig.vb diff --git a/ZooFlow/Config/ClassUIConfig.vb b/GUIs.ZooFlow/Config/ClassUIConfig.vb similarity index 100% rename from ZooFlow/Config/ClassUIConfig.vb rename to GUIs.ZooFlow/Config/ClassUIConfig.vb diff --git a/ZooFlow/Events/OnFlowFormInteractionEvent.vb b/GUIs.ZooFlow/Events/OnFlowFormInteractionEvent.vb similarity index 100% rename from ZooFlow/Events/OnFlowFormInteractionEvent.vb rename to GUIs.ZooFlow/Events/OnFlowFormInteractionEvent.vb diff --git a/ZooFlow/Events/OnFlowFormStateChangedEvent.vb b/GUIs.ZooFlow/Events/OnFlowFormStateChangedEvent.vb similarity index 100% rename from ZooFlow/Events/OnFlowFormStateChangedEvent.vb rename to GUIs.ZooFlow/Events/OnFlowFormStateChangedEvent.vb diff --git a/ZooFlow/My Project/Application.Designer.vb b/GUIs.ZooFlow/My Project/Application.Designer.vb similarity index 100% rename from ZooFlow/My Project/Application.Designer.vb rename to GUIs.ZooFlow/My Project/Application.Designer.vb diff --git a/ZooFlow/My Project/Application.myapp b/GUIs.ZooFlow/My Project/Application.myapp similarity index 100% rename from ZooFlow/My Project/Application.myapp rename to GUIs.ZooFlow/My Project/Application.myapp diff --git a/ZooFlow/My Project/AssemblyInfo.vb b/GUIs.ZooFlow/My Project/AssemblyInfo.vb similarity index 100% rename from ZooFlow/My Project/AssemblyInfo.vb rename to GUIs.ZooFlow/My Project/AssemblyInfo.vb diff --git a/ZooFlow/My Project/DataSources/ZooFlow.State.ClassUserState.datasource b/GUIs.ZooFlow/My Project/DataSources/ZooFlow.State.ClassUserState.datasource similarity index 100% rename from ZooFlow/My Project/DataSources/ZooFlow.State.ClassUserState.datasource rename to GUIs.ZooFlow/My Project/DataSources/ZooFlow.State.ClassUserState.datasource diff --git a/ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb similarity index 100% rename from ZooFlow/My Project/Resources.Designer.vb rename to GUIs.ZooFlow/My Project/Resources.Designer.vb diff --git a/ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx similarity index 100% rename from ZooFlow/My Project/Resources.resx rename to GUIs.ZooFlow/My Project/Resources.resx diff --git a/ZooFlow/My Project/Settings.Designer.vb b/GUIs.ZooFlow/My Project/Settings.Designer.vb similarity index 100% rename from ZooFlow/My Project/Settings.Designer.vb rename to GUIs.ZooFlow/My Project/Settings.Designer.vb diff --git a/ZooFlow/My Project/Settings.settings b/GUIs.ZooFlow/My Project/Settings.settings similarity index 100% rename from ZooFlow/My Project/Settings.settings rename to GUIs.ZooFlow/My Project/Settings.settings diff --git a/ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx similarity index 100% rename from ZooFlow/My Project/licenses.licx rename to GUIs.ZooFlow/My Project/licenses.licx diff --git a/ZooFlow/MyApplication.vb b/GUIs.ZooFlow/MyApplication.vb similarity index 96% rename from ZooFlow/MyApplication.vb rename to GUIs.ZooFlow/MyApplication.vb index 0fc82892..cd634b6a 100644 --- a/ZooFlow/MyApplication.vb +++ b/GUIs.ZooFlow/MyApplication.vb @@ -36,6 +36,7 @@ Namespace My ''' Example: My.Application.User ''' Partial Friend Class MyApplication + Public Property Settings As New State.SettingsState Public Property User As New State.UserState Public Property Service As New State.ServiceState Public Property Modules As New Dictionary(Of String, State.ModuleState) diff --git a/ZooFlow/Queries/ClassClipboardWatcherQueries.vb b/GUIs.ZooFlow/Queries/ClassClipboardWatcherQueries.vb similarity index 100% rename from ZooFlow/Queries/ClassClipboardWatcherQueries.vb rename to GUIs.ZooFlow/Queries/ClassClipboardWatcherQueries.vb diff --git a/ZooFlow/Queries/ClassCommonQueries.vb b/GUIs.ZooFlow/Queries/ClassCommonQueries.vb similarity index 100% rename from ZooFlow/Queries/ClassCommonQueries.vb rename to GUIs.ZooFlow/Queries/ClassCommonQueries.vb diff --git a/ZooFlow/Queries/ClassQueries.vb b/GUIs.ZooFlow/Queries/ClassQueries.vb similarity index 100% rename from ZooFlow/Queries/ClassQueries.vb rename to GUIs.ZooFlow/Queries/ClassQueries.vb diff --git a/ZooFlow/Resources/CW_GEFUNDEN_klein.png b/GUIs.ZooFlow/Resources/CW_GEFUNDEN_klein.png similarity index 100% rename from ZooFlow/Resources/CW_GEFUNDEN_klein.png rename to GUIs.ZooFlow/Resources/CW_GEFUNDEN_klein.png diff --git a/ZooFlow/Resources/CW_hatwas_klein.png b/GUIs.ZooFlow/Resources/CW_hatwas_klein.png similarity index 100% rename from ZooFlow/Resources/CW_hatwas_klein.png rename to GUIs.ZooFlow/Resources/CW_hatwas_klein.png diff --git a/ZooFlow/Resources/CW_klein.png b/GUIs.ZooFlow/Resources/CW_klein.png similarity index 100% rename from ZooFlow/Resources/CW_klein.png rename to GUIs.ZooFlow/Resources/CW_klein.png diff --git a/ZooFlow/Resources/CW_wartet_klein.png b/GUIs.ZooFlow/Resources/CW_wartet_klein.png similarity index 100% rename from ZooFlow/Resources/CW_wartet_klein.png rename to GUIs.ZooFlow/Resources/CW_wartet_klein.png diff --git a/ZooFlow/Resources/GLOBIX_GEFUNDEN_klein.png b/GUIs.ZooFlow/Resources/GLOBIX_GEFUNDEN_klein.png similarity index 100% rename from ZooFlow/Resources/GLOBIX_GEFUNDEN_klein.png rename to GUIs.ZooFlow/Resources/GLOBIX_GEFUNDEN_klein.png diff --git a/ZooFlow/Resources/GLOBIX_klein.png b/GUIs.ZooFlow/Resources/GLOBIX_klein.png similarity index 100% rename from ZooFlow/Resources/GLOBIX_klein.png rename to GUIs.ZooFlow/Resources/GLOBIX_klein.png diff --git a/ZooFlow/Resources/ZOOFLOW_Home_klein.png b/GUIs.ZooFlow/Resources/ZOOFLOW_Home_klein.png similarity index 100% rename from ZooFlow/Resources/ZOOFLOW_Home_klein.png rename to GUIs.ZooFlow/Resources/ZOOFLOW_Home_klein.png diff --git a/ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj similarity index 94% rename from ZooFlow/ZooFlow.vbproj rename to GUIs.ZooFlow/ZooFlow.vbproj index ecd10c0a..0dcd26c4 100644 --- a/ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -185,18 +185,10 @@ - - {B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E} + + {b7d465a2-ae31-4cdf-a8b2-34b42d3ea84e} ClipboardWatcher - - {991d0231-4623-496d-8bd0-9ca906029cbc} - Filesystem - - - {af664d85-0a4b-4bab-a2f8-83110c06553a} - Messaging - {44982F9B-6116-44E2-85D0-F39650B1EF99} Config @@ -205,6 +197,10 @@ {EAF0EA75-5FA7-485D-89C7-B2D843B03A96} Database + + {991d0231-4623-496d-8bd0-9ca906029cbc} + Filesystem + {d3c8cfed-d6f6-43a8-9bdf-454145d0352f} Language @@ -213,7 +209,15 @@ {903B2D7D-3B80-4BE9-8713-7447B704E1B0} Logging - + + {af664d85-0a4b-4bab-a2f8-83110c06553a} + Messaging + + + {7c3b0c7e-59fe-4e1a-a655-27ae119f9444} + Patterns + + {81cac44f-3711-4c8f-ae98-e02a7448782a} ZooFlow diff --git a/ZooFlow/frmAdmin.Designer.vb b/GUIs.ZooFlow/frmAdmin.Designer.vb similarity index 100% rename from ZooFlow/frmAdmin.Designer.vb rename to GUIs.ZooFlow/frmAdmin.Designer.vb diff --git a/ZooFlow/frmAdmin.resx b/GUIs.ZooFlow/frmAdmin.resx similarity index 100% rename from ZooFlow/frmAdmin.resx rename to GUIs.ZooFlow/frmAdmin.resx diff --git a/ZooFlow/frmAdmin.vb b/GUIs.ZooFlow/frmAdmin.vb similarity index 98% rename from ZooFlow/frmAdmin.vb rename to GUIs.ZooFlow/frmAdmin.vb index 020b33aa..c29dd44e 100644 --- a/ZooFlow/frmAdmin.vb +++ b/GUIs.ZooFlow/frmAdmin.vb @@ -3,8 +3,8 @@ Imports DevExpress.LookAndFeel Imports DevExpress.XtraSplashScreen Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Windows -Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.Messaging +Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.ZooFlow.Params Imports DigitalData.GUIs.ZooFlow.OnFlowFormStateChangedEvent.FlowFormState Imports DigitalData.Modules.ClipboardWatcher @@ -71,7 +71,8 @@ Partial Public Class frmAdmin Dim oEnvironment As New Environment() With { .User = My.Application.User, .Modules = My.Application.Modules, - .Database = My.Database + .Database = My.Database, + .Settings = My.Application.Settings } Dim oParams As New ClipboardWatcherParams() With { .MatchingProfiles = MatchingProfiles, diff --git a/ZooFlow/frmConfigDatabase.Designer.vb b/GUIs.ZooFlow/frmConfigDatabase.Designer.vb similarity index 100% rename from ZooFlow/frmConfigDatabase.Designer.vb rename to GUIs.ZooFlow/frmConfigDatabase.Designer.vb diff --git a/ZooFlow/frmConfigDatabase.resx b/GUIs.ZooFlow/frmConfigDatabase.resx similarity index 100% rename from ZooFlow/frmConfigDatabase.resx rename to GUIs.ZooFlow/frmConfigDatabase.resx diff --git a/ZooFlow/frmConfigDatabase.vb b/GUIs.ZooFlow/frmConfigDatabase.vb similarity index 100% rename from ZooFlow/frmConfigDatabase.vb rename to GUIs.ZooFlow/frmConfigDatabase.vb diff --git a/ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb similarity index 100% rename from ZooFlow/frmFlowForm.Designer.vb rename to GUIs.ZooFlow/frmFlowForm.Designer.vb diff --git a/ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx similarity index 100% rename from ZooFlow/frmFlowForm.resx rename to GUIs.ZooFlow/frmFlowForm.resx diff --git a/ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb similarity index 100% rename from ZooFlow/frmFlowForm.vb rename to GUIs.ZooFlow/frmFlowForm.vb diff --git a/ZooFlow/frmSettings.Designer.vb b/GUIs.ZooFlow/frmSettings.Designer.vb similarity index 100% rename from ZooFlow/frmSettings.Designer.vb rename to GUIs.ZooFlow/frmSettings.Designer.vb diff --git a/ZooFlow/frmSettings.resx b/GUIs.ZooFlow/frmSettings.resx similarity index 100% rename from ZooFlow/frmSettings.resx rename to GUIs.ZooFlow/frmSettings.resx diff --git a/ZooFlow/frmSettings.vb b/GUIs.ZooFlow/frmSettings.vb similarity index 100% rename from ZooFlow/frmSettings.vb rename to GUIs.ZooFlow/frmSettings.vb diff --git a/ZooFlow/frmSplash.Designer.vb b/GUIs.ZooFlow/frmSplash.Designer.vb similarity index 100% rename from ZooFlow/frmSplash.Designer.vb rename to GUIs.ZooFlow/frmSplash.Designer.vb diff --git a/ZooFlow/frmSplash.resx b/GUIs.ZooFlow/frmSplash.resx similarity index 100% rename from ZooFlow/frmSplash.resx rename to GUIs.ZooFlow/frmSplash.resx diff --git a/ZooFlow/frmSplash.vb b/GUIs.ZooFlow/frmSplash.vb similarity index 100% rename from ZooFlow/frmSplash.vb rename to GUIs.ZooFlow/frmSplash.vb diff --git a/Modules/ZooFlow/packages.config b/GUIs.ZooFlow/packages.config similarity index 100% rename from Modules/ZooFlow/packages.config rename to GUIs.ZooFlow/packages.config diff --git a/Modules.Config/Config.vbproj b/Modules.Config/Config.vbproj index 68e2431c..0f139413 100644 --- a/Modules.Config/Config.vbproj +++ b/Modules.Config/Config.vbproj @@ -113,7 +113,7 @@ - + {991d0231-4623-496d-8bd0-9ca906029cbc} Filesystem diff --git a/EDMI_FILE_OPs/Channel.vb b/Modules.EDMIAPI/Channel.vb similarity index 100% rename from EDMI_FILE_OPs/Channel.vb rename to Modules.EDMIAPI/Channel.vb diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult.datasource b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult.datasource similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult.datasource rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult.datasource diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.Filesystem.xsd b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.Filesystem.xsd similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Modules.Filesystem.xsd rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Modules.Filesystem.xsd diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.xsd b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.xsd similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.xsd rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService.xsd diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService1.xsd b/Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService1.xsd similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/DigitalData.Services.IDBService1.xsd rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/DigitalData.Services.IDBService1.xsd diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/Reference.svcmap b/Modules.EDMIAPI/Connected Services/IDBServiceReference/Reference.svcmap similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/Reference.svcmap rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/Reference.svcmap diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/Reference.vb b/Modules.EDMIAPI/Connected Services/IDBServiceReference/Reference.vb similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/Reference.vb rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/Reference.vb diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/System.Data.xsd b/Modules.EDMIAPI/Connected Services/IDBServiceReference/System.Data.xsd similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/System.Data.xsd rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/System.Data.xsd diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/System.xsd b/Modules.EDMIAPI/Connected Services/IDBServiceReference/System.xsd similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/System.xsd rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/System.xsd diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/configuration.svcinfo b/Modules.EDMIAPI/Connected Services/IDBServiceReference/configuration.svcinfo similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/configuration.svcinfo rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/configuration.svcinfo diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/configuration91.svcinfo b/Modules.EDMIAPI/Connected Services/IDBServiceReference/configuration91.svcinfo similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/configuration91.svcinfo rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/configuration91.svcinfo diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/service.wsdl b/Modules.EDMIAPI/Connected Services/IDBServiceReference/service.wsdl similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/service.wsdl rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/service.wsdl diff --git a/EDMI_FILE_OPs/Connected Services/IDBServiceReference/service.xsd b/Modules.EDMIAPI/Connected Services/IDBServiceReference/service.xsd similarity index 100% rename from EDMI_FILE_OPs/Connected Services/IDBServiceReference/service.xsd rename to Modules.EDMIAPI/Connected Services/IDBServiceReference/service.xsd diff --git a/EDMI_FILE_OPs/Constants.vb b/Modules.EDMIAPI/Constants.vb similarity index 100% rename from EDMI_FILE_OPs/Constants.vb rename to Modules.EDMIAPI/Constants.vb diff --git a/EDMI_FILE_OPs/Document.vb b/Modules.EDMIAPI/Document.vb similarity index 100% rename from EDMI_FILE_OPs/Document.vb rename to Modules.EDMIAPI/Document.vb diff --git a/EDMI_FILE_OPs/EDMIAPI.vbproj b/Modules.EDMIAPI/EDMIAPI.vbproj similarity index 100% rename from EDMI_FILE_OPs/EDMIAPI.vbproj rename to Modules.EDMIAPI/EDMIAPI.vbproj diff --git a/EDMI_FILE_OPs/My Project/Application.Designer.vb b/Modules.EDMIAPI/My Project/Application.Designer.vb similarity index 100% rename from EDMI_FILE_OPs/My Project/Application.Designer.vb rename to Modules.EDMIAPI/My Project/Application.Designer.vb diff --git a/EDMI_FILE_OPs/My Project/Application.myapp b/Modules.EDMIAPI/My Project/Application.myapp similarity index 100% rename from EDMI_FILE_OPs/My Project/Application.myapp rename to Modules.EDMIAPI/My Project/Application.myapp diff --git a/EDMI_FILE_OPs/My Project/AssemblyInfo.vb b/Modules.EDMIAPI/My Project/AssemblyInfo.vb similarity index 100% rename from EDMI_FILE_OPs/My Project/AssemblyInfo.vb rename to Modules.EDMIAPI/My Project/AssemblyInfo.vb diff --git a/EDMI_FILE_OPs/My Project/Resources.Designer.vb b/Modules.EDMIAPI/My Project/Resources.Designer.vb similarity index 100% rename from EDMI_FILE_OPs/My Project/Resources.Designer.vb rename to Modules.EDMIAPI/My Project/Resources.Designer.vb diff --git a/EDMI_FILE_OPs/My Project/Resources.resx b/Modules.EDMIAPI/My Project/Resources.resx similarity index 100% rename from EDMI_FILE_OPs/My Project/Resources.resx rename to Modules.EDMIAPI/My Project/Resources.resx diff --git a/EDMI_FILE_OPs/My Project/Settings.Designer.vb b/Modules.EDMIAPI/My Project/Settings.Designer.vb similarity index 100% rename from EDMI_FILE_OPs/My Project/Settings.Designer.vb rename to Modules.EDMIAPI/My Project/Settings.Designer.vb diff --git a/EDMI_FILE_OPs/My Project/Settings.settings b/Modules.EDMIAPI/My Project/Settings.settings similarity index 100% rename from EDMI_FILE_OPs/My Project/Settings.settings rename to Modules.EDMIAPI/My Project/Settings.settings diff --git a/EDMI_FILE_OPs/app.config b/Modules.EDMIAPI/app.config similarity index 100% rename from EDMI_FILE_OPs/app.config rename to Modules.EDMIAPI/app.config diff --git a/Patterns/packages.config b/Modules.EDMIAPI/packages.config similarity index 100% rename from Patterns/packages.config rename to Modules.EDMIAPI/packages.config diff --git a/Filesystem/Compression.vb b/Modules.Filesystem/Compression.vb similarity index 100% rename from Filesystem/Compression.vb rename to Modules.Filesystem/Compression.vb diff --git a/Filesystem/DocumentObject.vb b/Modules.Filesystem/DocumentObject.vb similarity index 100% rename from Filesystem/DocumentObject.vb rename to Modules.Filesystem/DocumentObject.vb diff --git a/Filesystem/Encryption.vb b/Modules.Filesystem/Encryption.vb similarity index 100% rename from Filesystem/Encryption.vb rename to Modules.Filesystem/Encryption.vb diff --git a/Filesystem/EncryptionLegacy.vb b/Modules.Filesystem/EncryptionLegacy.vb similarity index 100% rename from Filesystem/EncryptionLegacy.vb rename to Modules.Filesystem/EncryptionLegacy.vb diff --git a/Filesystem/File.vb b/Modules.Filesystem/File.vb similarity index 100% rename from Filesystem/File.vb rename to Modules.Filesystem/File.vb diff --git a/Filesystem/FileContainer.vb b/Modules.Filesystem/FileContainer.vb similarity index 100% rename from Filesystem/FileContainer.vb rename to Modules.Filesystem/FileContainer.vb diff --git a/Filesystem/FileContainerInner.vb b/Modules.Filesystem/FileContainerInner.vb similarity index 100% rename from Filesystem/FileContainerInner.vb rename to Modules.Filesystem/FileContainerInner.vb diff --git a/Filesystem/FileWatcher.vb b/Modules.Filesystem/FileWatcher.vb similarity index 100% rename from Filesystem/FileWatcher.vb rename to Modules.Filesystem/FileWatcher.vb diff --git a/Filesystem/FileWatcherFilters.vb b/Modules.Filesystem/FileWatcherFilters.vb similarity index 100% rename from Filesystem/FileWatcherFilters.vb rename to Modules.Filesystem/FileWatcherFilters.vb diff --git a/Filesystem/FileWatcherProperties.vb b/Modules.Filesystem/FileWatcherProperties.vb similarity index 100% rename from Filesystem/FileWatcherProperties.vb rename to Modules.Filesystem/FileWatcherProperties.vb diff --git a/Filesystem/Filesystem.vbproj b/Modules.Filesystem/Filesystem.vbproj similarity index 100% rename from Filesystem/Filesystem.vbproj rename to Modules.Filesystem/Filesystem.vbproj diff --git a/Filesystem/My Project/Application.Designer.vb b/Modules.Filesystem/My Project/Application.Designer.vb similarity index 100% rename from Filesystem/My Project/Application.Designer.vb rename to Modules.Filesystem/My Project/Application.Designer.vb diff --git a/Filesystem/My Project/Application.myapp b/Modules.Filesystem/My Project/Application.myapp similarity index 100% rename from Filesystem/My Project/Application.myapp rename to Modules.Filesystem/My Project/Application.myapp diff --git a/Filesystem/My Project/AssemblyInfo.vb b/Modules.Filesystem/My Project/AssemblyInfo.vb similarity index 100% rename from Filesystem/My Project/AssemblyInfo.vb rename to Modules.Filesystem/My Project/AssemblyInfo.vb diff --git a/Filesystem/My Project/Resources.Designer.vb b/Modules.Filesystem/My Project/Resources.Designer.vb similarity index 100% rename from Filesystem/My Project/Resources.Designer.vb rename to Modules.Filesystem/My Project/Resources.Designer.vb diff --git a/Filesystem/My Project/Resources.resx b/Modules.Filesystem/My Project/Resources.resx similarity index 100% rename from Filesystem/My Project/Resources.resx rename to Modules.Filesystem/My Project/Resources.resx diff --git a/Filesystem/My Project/Settings.Designer.vb b/Modules.Filesystem/My Project/Settings.Designer.vb similarity index 100% rename from Filesystem/My Project/Settings.Designer.vb rename to Modules.Filesystem/My Project/Settings.Designer.vb diff --git a/Filesystem/My Project/Settings.settings b/Modules.Filesystem/My Project/Settings.settings similarity index 100% rename from Filesystem/My Project/Settings.settings rename to Modules.Filesystem/My Project/Settings.settings diff --git a/Filesystem/packages.config b/Modules.Filesystem/packages.config similarity index 100% rename from Filesystem/packages.config rename to Modules.Filesystem/packages.config diff --git a/Jobs/App.config b/Modules.Jobs/App.config similarity index 100% rename from Jobs/App.config rename to Modules.Jobs/App.config diff --git a/Jobs/EDMI/ADSync/ADSyncArgs.vb b/Modules.Jobs/EDMI/ADSync/ADSyncArgs.vb similarity index 100% rename from Jobs/EDMI/ADSync/ADSyncArgs.vb rename to Modules.Jobs/EDMI/ADSync/ADSyncArgs.vb diff --git a/Jobs/EDMI/ADSync/ADSyncJob.vb b/Modules.Jobs/EDMI/ADSync/ADSyncJob.vb similarity index 100% rename from Jobs/EDMI/ADSync/ADSyncJob.vb rename to Modules.Jobs/EDMI/ADSync/ADSyncJob.vb diff --git a/Jobs/EDMI/ZUGFeRD/EmailData.vb b/Modules.Jobs/EDMI/ZUGFeRD/EmailData.vb similarity index 100% rename from Jobs/EDMI/ZUGFeRD/EmailData.vb rename to Modules.Jobs/EDMI/ZUGFeRD/EmailData.vb diff --git a/Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb similarity index 99% rename from Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb rename to Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb index abdf4a63..663920be 100644 --- a/Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb +++ b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb @@ -101,6 +101,7 @@ Public Class ImportZUGFeRDFiles Dim oFinalFileName = _filesystem.GetVersionedFilename(oDestination) Try + _logger.Info("Moving email from {0} to {1}", oSource, oFinalFileName) IO.File.Move(oSource, oFinalFileName) oEmailData.Attachment = oFinalFileName Catch ex As Exception @@ -147,9 +148,6 @@ Public Class ImportZUGFeRDFiles Else _logger.Debug("Email has already been sent!!") End If - - - Catch ex As Exception _logger.Error(ex) End Try diff --git a/Jobs/EDMI/ZUGFeRD/PropertyValues.vb b/Modules.Jobs/EDMI/ZUGFeRD/PropertyValues.vb similarity index 100% rename from Jobs/EDMI/ZUGFeRD/PropertyValues.vb rename to Modules.Jobs/EDMI/ZUGFeRD/PropertyValues.vb diff --git a/Jobs/EDMI/ZUGFeRD/WorkerArgs.vb b/Modules.Jobs/EDMI/ZUGFeRD/WorkerArgs.vb similarity index 100% rename from Jobs/EDMI/ZUGFeRD/WorkerArgs.vb rename to Modules.Jobs/EDMI/ZUGFeRD/WorkerArgs.vb diff --git a/Jobs/EDMI/ZUGFeRD/XmlItemProperty.vb b/Modules.Jobs/EDMI/ZUGFeRD/XmlItemProperty.vb similarity index 100% rename from Jobs/EDMI/ZUGFeRD/XmlItemProperty.vb rename to Modules.Jobs/EDMI/ZUGFeRD/XmlItemProperty.vb diff --git a/Jobs/Exceptions.vb b/Modules.Jobs/Exceptions.vb similarity index 100% rename from Jobs/Exceptions.vb rename to Modules.Jobs/Exceptions.vb diff --git a/Jobs/JobArgs.vb b/Modules.Jobs/JobArgs.vb similarity index 100% rename from Jobs/JobArgs.vb rename to Modules.Jobs/JobArgs.vb diff --git a/Jobs/JobBase.vb b/Modules.Jobs/JobBase.vb similarity index 100% rename from Jobs/JobBase.vb rename to Modules.Jobs/JobBase.vb diff --git a/Jobs/JobConfig.vb b/Modules.Jobs/JobConfig.vb similarity index 100% rename from Jobs/JobConfig.vb rename to Modules.Jobs/JobConfig.vb diff --git a/Jobs/JobConfigParser.vb b/Modules.Jobs/JobConfigParser.vb similarity index 100% rename from Jobs/JobConfigParser.vb rename to Modules.Jobs/JobConfigParser.vb diff --git a/Jobs/JobInterface.vb b/Modules.Jobs/JobInterface.vb similarity index 100% rename from Jobs/JobInterface.vb rename to Modules.Jobs/JobInterface.vb diff --git a/Jobs/Jobs.vbproj b/Modules.Jobs/Jobs.vbproj similarity index 98% rename from Jobs/Jobs.vbproj rename to Modules.Jobs/Jobs.vbproj index da12e083..d90b780b 100644 --- a/Jobs/Jobs.vbproj +++ b/Modules.Jobs/Jobs.vbproj @@ -64,7 +64,7 @@ - + {991d0231-4623-496d-8bd0-9ca906029cbc} Filesystem diff --git a/Jobs/My Project/AssemblyInfo.vb b/Modules.Jobs/My Project/AssemblyInfo.vb similarity index 100% rename from Jobs/My Project/AssemblyInfo.vb rename to Modules.Jobs/My Project/AssemblyInfo.vb diff --git a/Jobs/My Project/Settings.Designer.vb b/Modules.Jobs/My Project/Settings.Designer.vb similarity index 100% rename from Jobs/My Project/Settings.Designer.vb rename to Modules.Jobs/My Project/Settings.Designer.vb diff --git a/Jobs/My Project/Settings.settings b/Modules.Jobs/My Project/Settings.settings similarity index 100% rename from Jobs/My Project/Settings.settings rename to Modules.Jobs/My Project/Settings.settings diff --git a/Jobs/packages.config b/Modules.Jobs/packages.config similarity index 100% rename from Jobs/packages.config rename to Modules.Jobs/packages.config diff --git a/Modules.License/License.vbproj b/Modules.License/License.vbproj index 09db248a..d8b0085d 100644 --- a/Modules.License/License.vbproj +++ b/Modules.License/License.vbproj @@ -117,10 +117,6 @@ - - {991d0231-4623-496d-8bd0-9ca906029cbc} - Filesystem - {903b2d7d-3b80-4be9-8713-7447b704e1b0} Logging diff --git a/Message/Email.vb b/Modules.Messaging/Email.vb similarity index 100% rename from Message/Email.vb rename to Modules.Messaging/Email.vb diff --git a/Message/EventBus.vb b/Modules.Messaging/EventBus.vb similarity index 100% rename from Message/EventBus.vb rename to Modules.Messaging/EventBus.vb diff --git a/Message/Messaging.vbproj b/Modules.Messaging/Messaging.vbproj similarity index 100% rename from Message/Messaging.vbproj rename to Modules.Messaging/Messaging.vbproj diff --git a/Message/My Project/Application.Designer.vb b/Modules.Messaging/My Project/Application.Designer.vb similarity index 100% rename from Message/My Project/Application.Designer.vb rename to Modules.Messaging/My Project/Application.Designer.vb diff --git a/Message/My Project/Application.myapp b/Modules.Messaging/My Project/Application.myapp similarity index 100% rename from Message/My Project/Application.myapp rename to Modules.Messaging/My Project/Application.myapp diff --git a/Message/My Project/AssemblyInfo.vb b/Modules.Messaging/My Project/AssemblyInfo.vb similarity index 100% rename from Message/My Project/AssemblyInfo.vb rename to Modules.Messaging/My Project/AssemblyInfo.vb diff --git a/Message/My Project/Resources.Designer.vb b/Modules.Messaging/My Project/Resources.Designer.vb similarity index 100% rename from Message/My Project/Resources.Designer.vb rename to Modules.Messaging/My Project/Resources.Designer.vb diff --git a/Message/My Project/Resources.resx b/Modules.Messaging/My Project/Resources.resx similarity index 100% rename from Message/My Project/Resources.resx rename to Modules.Messaging/My Project/Resources.resx diff --git a/Message/My Project/Settings.Designer.vb b/Modules.Messaging/My Project/Settings.Designer.vb similarity index 100% rename from Message/My Project/Settings.Designer.vb rename to Modules.Messaging/My Project/Settings.Designer.vb diff --git a/Message/My Project/Settings.settings b/Modules.Messaging/My Project/Settings.settings similarity index 100% rename from Message/My Project/Settings.settings rename to Modules.Messaging/My Project/Settings.settings diff --git a/Message/SMS.vb b/Modules.Messaging/SMS.vb similarity index 100% rename from Message/SMS.vb rename to Modules.Messaging/SMS.vb diff --git a/Message/packages.config b/Modules.Messaging/packages.config similarity index 100% rename from Message/packages.config rename to Modules.Messaging/packages.config diff --git a/Modules/ZooFlow/My Project/Application.Designer.vb b/Modules.Patterns/My Project/Application.Designer.vb similarity index 100% rename from Modules/ZooFlow/My Project/Application.Designer.vb rename to Modules.Patterns/My Project/Application.Designer.vb diff --git a/Modules/ZooFlow/My Project/Application.myapp b/Modules.Patterns/My Project/Application.myapp similarity index 100% rename from Modules/ZooFlow/My Project/Application.myapp rename to Modules.Patterns/My Project/Application.myapp diff --git a/Patterns/My Project/AssemblyInfo.vb b/Modules.Patterns/My Project/AssemblyInfo.vb similarity index 100% rename from Patterns/My Project/AssemblyInfo.vb rename to Modules.Patterns/My Project/AssemblyInfo.vb diff --git a/Modules.Patterns/My Project/Resources.Designer.vb b/Modules.Patterns/My Project/Resources.Designer.vb new file mode 100644 index 00000000..a2cb98e3 --- /dev/null +++ b/Modules.Patterns/My Project/Resources.Designer.vb @@ -0,0 +1,63 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + +Imports System + +Namespace My.Resources + + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + ''' + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + ''' + _ + Friend Module Resources + + Private resourceMan As Global.System.Resources.ResourceManager + + Private resourceCulture As Global.System.Globalization.CultureInfo + + ''' + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + ''' + _ + Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.Patterns.Resources", GetType(Resources).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + ''' + _ + Friend Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set + resourceCulture = value + End Set + End Property + End Module +End Namespace diff --git a/Modules/ZooFlow/My Project/Resources.resx b/Modules.Patterns/My Project/Resources.resx similarity index 100% rename from Modules/ZooFlow/My Project/Resources.resx rename to Modules.Patterns/My Project/Resources.resx diff --git a/Modules.Patterns/My Project/Settings.Designer.vb b/Modules.Patterns/My Project/Settings.Designer.vb new file mode 100644 index 00000000..feccec48 --- /dev/null +++ b/Modules.Patterns/My Project/Settings.Designer.vb @@ -0,0 +1,73 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + + +Namespace My + + _ + Partial Friend NotInheritable Class MySettings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + +#Region "Automatische My.Settings-Speicherfunktion" +#If _MyType = "WindowsForms" Then + Private Shared addedHandler As Boolean + + Private Shared addedHandlerLockObject As New Object + + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub +#End If +#End Region + + Public Shared ReadOnly Property [Default]() As MySettings + Get + +#If _MyType = "WindowsForms" Then + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If +#End If + Return defaultInstance + End Get + End Property + End Class +End Namespace + +Namespace My + + _ + Friend Module MySettingsProperty + + _ + Friend ReadOnly Property Settings() As Global.DigitalData.Modules.Patterns.My.MySettings + Get + Return Global.DigitalData.Modules.Patterns.My.MySettings.Default + End Get + End Property + End Module +End Namespace diff --git a/Modules/ZooFlow/My Project/Settings.settings b/Modules.Patterns/My Project/Settings.settings similarity index 100% rename from Modules/ZooFlow/My Project/Settings.settings rename to Modules.Patterns/My Project/Settings.settings diff --git a/Patterns/Patterns.vb b/Modules.Patterns/Patterns.vb similarity index 100% rename from Patterns/Patterns.vb rename to Modules.Patterns/Patterns.vb diff --git a/Patterns/Patterns.vbproj b/Modules.Patterns/Patterns.vbproj similarity index 92% rename from Patterns/Patterns.vbproj rename to Modules.Patterns/Patterns.vbproj index 70c717b3..a994de37 100644 --- a/Patterns/Patterns.vbproj +++ b/Modules.Patterns/Patterns.vbproj @@ -6,8 +6,8 @@ AnyCPU {7C3B0C7E-59FE-4E1A-A655-27AE119F9444} Library - Patterns - Patterns + DigitalData.Modules.Patterns + DigitalData.Modules.Patterns 512 Windows v4.6.1 @@ -18,7 +18,7 @@ true true bin\Debug\ - Patterns.xml + DigitalData.Modules.Patterns.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -27,7 +27,7 @@ true true bin\Release\ - Patterns.xml + DigitalData.Modules.Patterns.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -115,8 +115,8 @@ {903B2D7D-3B80-4BE9-8713-7447B704E1B0} Logging - - {81CAC44F-3711-4C8F-AE98-E02A7448782A} + + {81cac44f-3711-4c8f-ae98-e02a7448782a} ZooFlow diff --git a/ZooFlow/packages.config b/Modules.Patterns/packages.config similarity index 100% rename from ZooFlow/packages.config rename to Modules.Patterns/packages.config diff --git a/Modules/ZooFlow/Environment.vb b/Modules.ZooFlow/Environment.vb similarity index 82% rename from Modules/ZooFlow/Environment.vb rename to Modules.ZooFlow/Environment.vb index b45e5dfb..52db9c50 100644 --- a/Modules/ZooFlow/Environment.vb +++ b/Modules.ZooFlow/Environment.vb @@ -2,6 +2,7 @@ Public Class Environment Public User As State.UserState + Public Settings As State.SettingsState Public Database As MSSQLServer Public Modules As Dictionary(Of String, State.ModuleState) End Class diff --git a/Modules.ZooFlow/My Project/Application.Designer.vb b/Modules.ZooFlow/My Project/Application.Designer.vb new file mode 100644 index 00000000..8ab460ba --- /dev/null +++ b/Modules.ZooFlow/My Project/Application.Designer.vb @@ -0,0 +1,13 @@ +'------------------------------------------------------------------------------ +' +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 +' +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. +' +'------------------------------------------------------------------------------ + +Option Strict On +Option Explicit On + diff --git a/Patterns/My Project/Application.myapp b/Modules.ZooFlow/My Project/Application.myapp similarity index 100% rename from Patterns/My Project/Application.myapp rename to Modules.ZooFlow/My Project/Application.myapp diff --git a/Modules/ZooFlow/My Project/AssemblyInfo.vb b/Modules.ZooFlow/My Project/AssemblyInfo.vb similarity index 100% rename from Modules/ZooFlow/My Project/AssemblyInfo.vb rename to Modules.ZooFlow/My Project/AssemblyInfo.vb diff --git a/Modules/ZooFlow/My Project/Resources.Designer.vb b/Modules.ZooFlow/My Project/Resources.Designer.vb similarity index 100% rename from Modules/ZooFlow/My Project/Resources.Designer.vb rename to Modules.ZooFlow/My Project/Resources.Designer.vb diff --git a/Patterns/My Project/Resources.resx b/Modules.ZooFlow/My Project/Resources.resx similarity index 100% rename from Patterns/My Project/Resources.resx rename to Modules.ZooFlow/My Project/Resources.resx diff --git a/Modules/ZooFlow/My Project/Settings.Designer.vb b/Modules.ZooFlow/My Project/Settings.Designer.vb similarity index 100% rename from Modules/ZooFlow/My Project/Settings.Designer.vb rename to Modules.ZooFlow/My Project/Settings.Designer.vb diff --git a/Patterns/My Project/Settings.settings b/Modules.ZooFlow/My Project/Settings.settings similarity index 100% rename from Patterns/My Project/Settings.settings rename to Modules.ZooFlow/My Project/Settings.settings diff --git a/Modules/ZooFlow/Params/ClipboardWatcherParams.vb b/Modules.ZooFlow/Params/ClipboardWatcherParams.vb similarity index 100% rename from Modules/ZooFlow/Params/ClipboardWatcherParams.vb rename to Modules.ZooFlow/Params/ClipboardWatcherParams.vb diff --git a/Modules/ZooFlow/Params/ProfileData.vb b/Modules.ZooFlow/Params/ProfileData.vb similarity index 100% rename from Modules/ZooFlow/Params/ProfileData.vb rename to Modules.ZooFlow/Params/ProfileData.vb diff --git a/Modules/ZooFlow/State/ModuleState.vb b/Modules.ZooFlow/State/ModuleState.vb similarity index 100% rename from Modules/ZooFlow/State/ModuleState.vb rename to Modules.ZooFlow/State/ModuleState.vb diff --git a/Modules/ZooFlow/State/ServiceState.vb b/Modules.ZooFlow/State/ServiceState.vb similarity index 100% rename from Modules/ZooFlow/State/ServiceState.vb rename to Modules.ZooFlow/State/ServiceState.vb diff --git a/Modules.ZooFlow/State/SettingsState.vb b/Modules.ZooFlow/State/SettingsState.vb new file mode 100644 index 00000000..6a9e50e6 --- /dev/null +++ b/Modules.ZooFlow/State/SettingsState.vb @@ -0,0 +1,5 @@ +Namespace State + Public Class SettingsState + Public GdPictureKey As String = String.Empty + End Class +End Namespace \ No newline at end of file diff --git a/Modules/ZooFlow/State/UserState.vb b/Modules.ZooFlow/State/UserState.vb similarity index 100% rename from Modules/ZooFlow/State/UserState.vb rename to Modules.ZooFlow/State/UserState.vb diff --git a/Modules/ZooFlow/ZooFlow.vbproj b/Modules.ZooFlow/ZooFlow.vbproj similarity index 94% rename from Modules/ZooFlow/ZooFlow.vbproj rename to Modules.ZooFlow/ZooFlow.vbproj index 67d2f623..758f8c4e 100644 --- a/Modules/ZooFlow/ZooFlow.vbproj +++ b/Modules.ZooFlow/ZooFlow.vbproj @@ -94,6 +94,7 @@ + @@ -117,19 +118,19 @@ - + {EAF0EA75-5FA7-485D-89C7-B2D843B03A96} Database - + {d3c8cfed-d6f6-43a8-9bdf-454145d0352f} Language - + {903B2D7D-3B80-4BE9-8713-7447B704E1B0} Logging - + {5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86} Windows diff --git a/Modules.ZooFlow/packages.config b/Modules.ZooFlow/packages.config new file mode 100644 index 00000000..99e34262 --- /dev/null +++ b/Modules.ZooFlow/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Patterns/My Project/Application.Designer.vb b/Patterns/My Project/Application.Designer.vb deleted file mode 100644 index 88dd01c7..00000000 --- a/Patterns/My Project/Application.Designer.vb +++ /dev/null @@ -1,13 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - diff --git a/Patterns/My Project/Resources.Designer.vb b/Patterns/My Project/Resources.Designer.vb deleted file mode 100644 index 53cbd2bc..00000000 --- a/Patterns/My Project/Resources.Designer.vb +++ /dev/null @@ -1,62 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My.Resources - - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. - ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. - ''' - _ - Friend Module Resources - - Private resourceMan As Global.System.Resources.ResourceManager - - Private resourceCulture As Global.System.Globalization.CultureInfo - - ''' - ''' Returns the cached ResourceManager instance used by this class. - ''' - _ - Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager - Get - If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Patterns.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. - ''' - _ - Friend Property Culture() As Global.System.Globalization.CultureInfo - Get - Return resourceCulture - End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) - resourceCulture = value - End Set - End Property - End Module -End Namespace diff --git a/Patterns/My Project/Settings.Designer.vb b/Patterns/My Project/Settings.Designer.vb deleted file mode 100644 index 8ecd2f90..00000000 --- a/Patterns/My Project/Settings.Designer.vb +++ /dev/null @@ -1,73 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - _ - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - -#Region "My.Settings Auto-Save Functionality" -#If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean - - Private Shared addedHandlerLockObject As New Object - - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub -#End If -#End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - -#If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If -#End If - Return defaultInstance - End Get - End Property - End Class -End Namespace - -Namespace My - - _ - Friend Module MySettingsProperty - - _ - Friend ReadOnly Property Settings() As Global.Patterns.My.MySettings - Get - Return Global.Patterns.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/SERVICES/DDEDM_NetworkService/IDBService.vbproj b/SERVICES/DDEDM_NetworkService/IDBService.vbproj index 90e096ee..3d342642 100644 --- a/SERVICES/DDEDM_NetworkService/IDBService.vbproj +++ b/SERVICES/DDEDM_NetworkService/IDBService.vbproj @@ -144,10 +144,6 @@ - - {991d0231-4623-496d-8bd0-9ca906029cbc} - Filesystem - {EAF0EA75-5FA7-485D-89C7-B2D843B03A96} Database diff --git a/Service.JobRunner/JobRunner.vbproj b/Service.JobRunner/JobRunner.vbproj index 7df7004d..c4872423 100644 --- a/Service.JobRunner/JobRunner.vbproj +++ b/Service.JobRunner/JobRunner.vbproj @@ -144,10 +144,6 @@ - - {39EC839A-3C30-4922-A41E-6B09D1DDE5C3} - Jobs - {EAF0EA75-5FA7-485D-89C7-B2D843B03A96} Database