From 5af4fd37191da537e881d5eb94603d371567ac10 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Thu, 12 Nov 2015 08:37:21 +0100 Subject: [PATCH] MS_12.11 --- .../DD-Record-Organiser.vbproj | 34 ++----- app/DD-Record-Organiser/XtraForm2.Designer.vb | 88 +++++++++---------- app/DD-Record-Organiser/XtraForm2.resx | 3 - ...tBox1.Designer.vb => frmAbout.Designer.vb} | 6 +- .../{AboutBox1.resx => frmAbout.resx} | 0 .../{AboutBox1.vb => frmAbout.vb} | 11 ++- app/DD-Record-Organiser/frmMain.vb | 4 +- 7 files changed, 68 insertions(+), 78 deletions(-) rename app/DD-Record-Organiser/{AboutBox1.Designer.vb => frmAbout.Designer.vb} (98%) rename app/DD-Record-Organiser/{AboutBox1.resx => frmAbout.resx} (100%) rename app/DD-Record-Organiser/{AboutBox1.vb => frmAbout.vb} (71%) diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index 77ef227..60476c2 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -80,102 +80,83 @@ False - True False - True False - True + False - True False - True False - True False - True False - True False - True False - True False - True False - True False - True False - True False - True False - True False - True False - True False - True False - True @@ -221,6 +202,7 @@ ..\..\3rdparty\lib\Oracle Managed Data Access\Oracle.ManagedDataAccess.dll True + False ..\..\lib\SnapPanelControl\SnapPanelControl.dll @@ -233,12 +215,14 @@ + + @@ -254,10 +238,10 @@ - - AboutBox1.vb + + frmAbout.vb - + Form @@ -553,8 +537,8 @@ - - AboutBox1.vb + + frmAbout.vb frmConfiguration_Basic.vb diff --git a/app/DD-Record-Organiser/XtraForm2.Designer.vb b/app/DD-Record-Organiser/XtraForm2.Designer.vb index e7549ff..a05b2b9 100644 --- a/app/DD-Record-Organiser/XtraForm2.Designer.vb +++ b/app/DD-Record-Organiser/XtraForm2.Designer.vb @@ -20,16 +20,16 @@ Partial Class frmConstructor_Main _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() - Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() - Dim TileViewItemElement8 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement9 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement10 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main)) + Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim TileViewItemElement1 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() Dim TileViewItemElement2 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() Dim TileViewItemElement3 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement11 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main)) + Dim TileViewItemElement4 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement5 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement6 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement7 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() Me.grvwCarousel = New DevExpress.XtraGrid.Views.Layout.LayoutView() Me.GridControlSelection = New DevExpress.XtraGrid.GridControl() Me.ContextMenu_GridControlSelection = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -113,11 +113,11 @@ Partial Class frmConstructor_Main ' Me.GridControlSelection.ContextMenuStrip = Me.ContextMenu_GridControlSelection Me.GridControlSelection.Dock = System.Windows.Forms.DockStyle.Fill - GridLevelNode3.LevelTemplate = Me.grvwCarousel - GridLevelNode3.RelationName = "Level1" - GridLevelNode4.LevelTemplate = Me.grvwTiles - GridLevelNode4.RelationName = "Level2" - Me.GridControlSelection.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3, GridLevelNode4}) + GridLevelNode1.LevelTemplate = Me.grvwCarousel + GridLevelNode1.RelationName = "Level1" + GridLevelNode2.LevelTemplate = Me.grvwTiles + GridLevelNode2.RelationName = "Level2" + Me.GridControlSelection.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2}) Me.GridControlSelection.Location = New System.Drawing.Point(0, 0) Me.GridControlSelection.MainView = Me.grvwGrid Me.GridControlSelection.Name = "GridControlSelection" @@ -172,15 +172,15 @@ Partial Class frmConstructor_Main Me.grvwTiles.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.TileViewColumn1, Me.TileViewColumn2, Me.TileViewColumn3}) Me.grvwTiles.GridControl = Me.GridControlSelection Me.grvwTiles.Name = "grvwTiles" - TileViewItemElement8.Column = Me.TileViewColumn1 - TileViewItemElement8.Text = "element1" - TileViewItemElement9.Column = Me.TileViewColumn2 - TileViewItemElement9.Text = "element2" - TileViewItemElement10.Column = Me.TileViewColumn3 - TileViewItemElement10.Text = "element3" - Me.grvwTiles.TileTemplate.Add(TileViewItemElement8) - Me.grvwTiles.TileTemplate.Add(TileViewItemElement9) - Me.grvwTiles.TileTemplate.Add(TileViewItemElement10) + TileViewItemElement1.Column = Me.TileViewColumn1 + TileViewItemElement1.Text = "element1" + TileViewItemElement2.Column = Me.TileViewColumn2 + TileViewItemElement2.Text = "element2" + TileViewItemElement3.Column = Me.TileViewColumn3 + TileViewItemElement3.Text = "element3" + Me.grvwTiles.TileTemplate.Add(TileViewItemElement1) + Me.grvwTiles.TileTemplate.Add(TileViewItemElement2) + Me.grvwTiles.TileTemplate.Add(TileViewItemElement3) ' 'TileViewColumn1 ' @@ -403,29 +403,29 @@ Partial Class frmConstructor_Main Me.TileView2.OptionsTiles.ItemSize = New System.Drawing.Size(280, 160) Me.TileView2.OptionsTiles.RowCount = 2 Me.TileView2.SortInfo.AddRange(New DevExpress.XtraGrid.Columns.GridColumnSortInfo() {New DevExpress.XtraGrid.Columns.GridColumnSortInfo(Me.colAktenzustand, DevExpress.Data.ColumnSortOrder.Ascending)}) - TileViewItemElement1.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - TileViewItemElement1.Appearance.Normal.ForeColor = System.Drawing.Color.DodgerBlue - TileViewItemElement1.Appearance.Normal.Options.UseFont = True - TileViewItemElement1.Appearance.Normal.Options.UseForeColor = True - TileViewItemElement1.Column = Me.colAktenzeichen - TileViewItemElement1.Text = "colAktenzeichen" - TileViewItemElement1.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual - TileViewItemElement1.TextLocation = New System.Drawing.Point(120, 0) - TileViewItemElement2.Column = Me.TileViewColumn5 - TileViewItemElement2.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft - TileViewItemElement2.ImageBorder = DevExpress.XtraEditors.TileItemElementImageBorderMode.None - TileViewItemElement2.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TileViewItemElement2.Text = "TileViewColumn5" - TileViewItemElement3.Column = Me.colTagderEintragungimRegister - TileViewItemElement3.Text = "colTagderEintragungimRegister" - TileViewItemElement3.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual - TileViewItemElement3.TextLocation = New System.Drawing.Point(120, 20) - TileViewItemElement11.Column = Me.colAktenzustand - TileViewItemElement11.Text = "colAktenzustand" - Me.TileView2.TileTemplate.Add(TileViewItemElement1) - Me.TileView2.TileTemplate.Add(TileViewItemElement2) - Me.TileView2.TileTemplate.Add(TileViewItemElement3) - Me.TileView2.TileTemplate.Add(TileViewItemElement11) + TileViewItemElement4.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + TileViewItemElement4.Appearance.Normal.ForeColor = System.Drawing.Color.DodgerBlue + TileViewItemElement4.Appearance.Normal.Options.UseFont = True + TileViewItemElement4.Appearance.Normal.Options.UseForeColor = True + TileViewItemElement4.Column = Me.colAktenzeichen + TileViewItemElement4.Text = "colAktenzeichen" + TileViewItemElement4.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual + TileViewItemElement4.TextLocation = New System.Drawing.Point(120, 0) + TileViewItemElement5.Column = Me.TileViewColumn5 + TileViewItemElement5.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft + TileViewItemElement5.ImageBorder = DevExpress.XtraEditors.TileItemElementImageBorderMode.None + TileViewItemElement5.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement5.Text = "TileViewColumn5" + TileViewItemElement6.Column = Me.colTagderEintragungimRegister + TileViewItemElement6.Text = "colTagderEintragungimRegister" + TileViewItemElement6.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual + TileViewItemElement6.TextLocation = New System.Drawing.Point(120, 20) + TileViewItemElement7.Column = Me.colAktenzustand + TileViewItemElement7.Text = "colAktenzustand" + Me.TileView2.TileTemplate.Add(TileViewItemElement4) + Me.TileView2.TileTemplate.Add(TileViewItemElement5) + Me.TileView2.TileTemplate.Add(TileViewItemElement6) + Me.TileView2.TileTemplate.Add(TileViewItemElement7) Me.TileView2.ViewCaption = "dfsdfsdf" ' 'TileViewColumn4 diff --git a/app/DD-Record-Organiser/XtraForm2.resx b/app/DD-Record-Organiser/XtraForm2.resx index 2c5d2be..08a0b88 100644 --- a/app/DD-Record-Organiser/XtraForm2.resx +++ b/app/DD-Record-Organiser/XtraForm2.resx @@ -160,9 +160,6 @@ 565, 17 - - 565, 17 - 945, 17 diff --git a/app/DD-Record-Organiser/AboutBox1.Designer.vb b/app/DD-Record-Organiser/frmAbout.Designer.vb similarity index 98% rename from app/DD-Record-Organiser/AboutBox1.Designer.vb rename to app/DD-Record-Organiser/frmAbout.Designer.vb index d5b6eaf..2f2bcd3 100644 --- a/app/DD-Record-Organiser/AboutBox1.Designer.vb +++ b/app/DD-Record-Organiser/frmAbout.Designer.vb @@ -1,5 +1,5 @@  _ -Partial Class AboutBox1 +Partial Class frmAbout Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -116,7 +116,7 @@ Partial Class AboutBox1 Me.LinkLabel3.TabStop = True Me.LinkLabel3.Text = "Support-Portal Digital Data" ' - 'AboutBox1 + 'frmAbout ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -136,7 +136,7 @@ Partial Class AboutBox1 Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False - Me.Name = "AboutBox1" + Me.Name = "frmAbout" Me.Padding = New System.Windows.Forms.Padding(9) Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent diff --git a/app/DD-Record-Organiser/AboutBox1.resx b/app/DD-Record-Organiser/frmAbout.resx similarity index 100% rename from app/DD-Record-Organiser/AboutBox1.resx rename to app/DD-Record-Organiser/frmAbout.resx diff --git a/app/DD-Record-Organiser/AboutBox1.vb b/app/DD-Record-Organiser/frmAbout.vb similarity index 71% rename from app/DD-Record-Organiser/AboutBox1.vb rename to app/DD-Record-Organiser/frmAbout.vb index 5d426c5..bd10e20 100644 --- a/app/DD-Record-Organiser/AboutBox1.vb +++ b/app/DD-Record-Organiser/frmAbout.vb @@ -1,4 +1,4 @@ -Public NotInheritable Class AboutBox1 +Public NotInheritable Class frmAbout Private Sub AboutBox1_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load ' Legen Sie den Titel des Formulars fest. @@ -23,4 +23,13 @@ Me.Close() End Sub + Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked + System.Diagnostics.Process.Start("www.didalog.de") + LinkLabel1.LinkVisited = True + End Sub + + Private Sub LinkLabel3_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel3.LinkClicked + System.Diagnostics.Process.Start("www.didalog.de/support") + LinkLabel3.LinkVisited = True + End Sub End Class diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb index 94efbcb..42bb60e 100644 --- a/app/DD-Record-Organiser/frmMain.vb +++ b/app/DD-Record-Organiser/frmMain.vb @@ -335,7 +335,7 @@ Public Class frmMain End Sub Private Sub InfoToolStripMenuItem_Click(sender As Object, e As EventArgs) - AboutBox1.ShowDialog() + frmAbout.ShowDialog() End Sub Private Sub ImageManagerToolStripMenuItem_Click(sender As Object, e As EventArgs) @@ -367,7 +367,7 @@ Public Class frmMain End Sub Private Sub itemInfo_ItemClick(sender As Object, e As ItemClickEventArgs) Handles itemInfo.ItemClick - AboutBox1.ShowDialog() + frmAbout.ShowDialog() End Sub Private Sub itemExit_ItemClick(sender As Object, e As ItemClickEventArgs) Handles itemExit.ItemClick