This commit is contained in:
SchreiberM
2015-11-12 08:37:21 +01:00
parent 1f67eee867
commit 5af4fd3719
7 changed files with 68 additions and 78 deletions

View File

@@ -80,102 +80,83 @@
</Reference>
<Reference Include="DevExpress.BonusSkins.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.Data.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.Office.v15.1.Core, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.Printing.v14.2.Core, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Printing.v15.1.Core, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.RichEdit.v15.1.Core, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.Utils.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraLayout.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraNavBar.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraPrinting.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraRichEdit.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraScheduler.v15.1.Reporting.Extensions, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraScheduler.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraScheduler.v15.1.Core, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraScheduler.v15.1.Extensions, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraTreeList.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraVerticalGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="DevExpress.XtraWizard.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="Independentsoft.Msg">
@@ -221,6 +202,7 @@
<HintPath>..\..\3rdparty\lib\Oracle Managed Data Access\Oracle.ManagedDataAccess.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="SnapPanelControl, Version=1.0.5491.24234, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\SnapPanelControl\SnapPanelControl.dll</HintPath>
@@ -233,12 +215,14 @@
<Reference Include="System.DirectoryServices.AccountManagement" />
<Reference Include="System.DirectoryServices.Protocols" />
<Reference Include="System.Drawing" />
<Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="UIAutomationClient" />
</ItemGroup>
<ItemGroup>
<Import Include="Microsoft.VisualBasic" />
@@ -254,10 +238,10 @@
<Import Include="System.Threading.Tasks" />
</ItemGroup>
<ItemGroup>
<Compile Include="AboutBox1.Designer.vb">
<DependentUpon>AboutBox1.vb</DependentUpon>
<Compile Include="frmAbout.Designer.vb">
<DependentUpon>frmAbout.vb</DependentUpon>
</Compile>
<Compile Include="AboutBox1.vb">
<Compile Include="frmAbout.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="ApplicationEvents.vb" />
@@ -553,8 +537,8 @@
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="AboutBox1.resx">
<DependentUpon>AboutBox1.vb</DependentUpon>
<EmbeddedResource Include="frmAbout.resx">
<DependentUpon>frmAbout.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmConfiguration_Basic.resx">
<DependentUpon>frmConfiguration_Basic.vb</DependentUpon>

View File

@@ -20,16 +20,16 @@ Partial Class frmConstructor_Main
<System.Diagnostics.DebuggerStepThrough()> _
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

View File

@@ -160,9 +160,6 @@
<metadata name="DD_ECMAdmin.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>565, 17</value>
</metadata>
<metadata name="DD_ECMAdmin.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>565, 17</value>
</metadata>
<metadata name="VWTEMPQUICKVIEWTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>945, 17</value>
</metadata>

View File

@@ -1,5 +1,5 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
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

View File

@@ -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

View File

@@ -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