JJ 27.04.2016

2016-04-27 16:50:39 +02:00
parent f48daef141
commit a573219f6f
12 changed files with 137 additions and 2 deletions
--- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
+++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
@@ -1165,6 +1165,12 @@
    <None Include="Resources\brick.png" />
  </ItemGroup>
  <ItemGroup>
+    <None Include="Resources\_blank.png" />
+    <None Include="Resources\xls.png" />
+    <None Include="Resources\doc.png" />
+    <None Include="Resources\pdf.png" />
+    <None Include="Resources\ppt.png" />
+    <None Include="Resources\text.png" />
    <None Include="Resources\lock.png" />
    <None Include="Resources\email_go.png" />
    <None Include="Resources\mail.bmp" />
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -110,6 +110,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property _blank() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("_blank", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -740,6 +750,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property doc() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("doc", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -1360,6 +1380,26 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property pdf() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("pdf", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property ppt() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ppt", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -1510,6 +1550,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property text() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("text", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -1639,5 +1689,15 @@ Namespace My.Resources
                Return CType(obj,System.Drawing.Bitmap)
            End Get
        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property xls() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("xls", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
    End Module
 End Namespace
--- a/app/DD-Record-Organiser/My
+++ b/app/DD-Record-Organiser/My
@@ -592,4 +592,22 @@
  <data name="lock" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="doc" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\doc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="pdf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ppt" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="text" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="xls" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
--- a/app/DD-Record-Organiser/Resources/_blank.png
+++ b/app/DD-Record-Organiser/Resources/_blank.png
--- a/app/DD-Record-Organiser/Resources/doc.png
+++ b/app/DD-Record-Organiser/Resources/doc.png
--- a/app/DD-Record-Organiser/Resources/pdf.png
+++ b/app/DD-Record-Organiser/Resources/pdf.png
--- a/app/DD-Record-Organiser/Resources/ppt.png
+++ b/app/DD-Record-Organiser/Resources/ppt.png
--- a/app/DD-Record-Organiser/Resources/text.png
+++ b/app/DD-Record-Organiser/Resources/text.png
--- a/app/DD-Record-Organiser/Resources/xls.png
+++ b/app/DD-Record-Organiser/Resources/xls.png
--- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb
@@ -443,8 +443,19 @@ Partial Class frmConstructor_Main
        '
        'GridViewDoc_Search
        '
+        Me.GridViewDoc_Search.Appearance.HorzLine.BackColor = CType(resources.GetObject("GridViewDoc_Search.Appearance.HorzLine.BackColor"), System.Drawing.Color)
+        Me.GridViewDoc_Search.Appearance.HorzLine.ForeColor = CType(resources.GetObject("GridViewDoc_Search.Appearance.HorzLine.ForeColor"), System.Drawing.Color)
+        Me.GridViewDoc_Search.Appearance.HorzLine.Options.UseBackColor = True
+        Me.GridViewDoc_Search.Appearance.HorzLine.Options.UseForeColor = True
+        Me.GridViewDoc_Search.Appearance.OddRow.BackColor = CType(resources.GetObject("GridViewDoc_Search.Appearance.OddRow.BackColor"), System.Drawing.Color)
+        Me.GridViewDoc_Search.Appearance.OddRow.Options.UseBackColor = True
        Me.GridViewDoc_Search.GridControl = Me.GridControlDocSearch
        Me.GridViewDoc_Search.Name = "GridViewDoc_Search"
+        Me.GridViewDoc_Search.OptionsBehavior.Editable = False
+        Me.GridViewDoc_Search.OptionsBehavior.ReadOnly = True
+        Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridViewDoc_Search.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewDoc_Search.OptionsView.ShowIndicator = False
        '
        'AxObjectListControl
        '
--- a/app/DD-Record-Organiser/frmConstructor_Main.resx
+++ b/app/DD-Record-Organiser/frmConstructor_Main.resx
@@ -414,6 +414,15 @@
  <data name="GridControlDocSearch.Location" type="System.Drawing.Point, System.Drawing">
    <value>3, 160</value>
  </data>
+  <data name="GridViewDoc_Search.Appearance.HorzLine.BackColor" type="System.Drawing.Color, System.Drawing">
+    <value>White</value>
+  </data>
+  <data name="GridViewDoc_Search.Appearance.HorzLine.ForeColor" type="System.Drawing.Color, System.Drawing">
+    <value>Transparent</value>
+  </data>
+  <data name="GridViewDoc_Search.Appearance.OddRow.BackColor" type="System.Drawing.Color, System.Drawing">
+    <value>192, 255, 192</value>
+  </data>
  <data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
    <value>1066, 153</value>
  </data>
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@@ -3423,7 +3423,13 @@ Public Class frmConstructor_Main
                Dim DT As DataTable = ClassDatabase.Return_Datatable(sql_ResultList, "GET RESULTLIST KONFIG")
                Dim ColArray As New List(Of String)
                Try
-                  
+                    'Die Icon Colum erstellen und konfigurieren
+                    Dim colIcon As New System.Data.DataColumn()
+                    colIcon.DataType = GetType(Image)
+                    colIcon.ColumnName = "ICON"
+                    colIcon.Caption = ""
+                    DTGrid.Columns.Add(colIcon)
+
                    If Not DT Is Nothing And DT.Rows.Count = 1 Then
                        Dim ColCount As Integer = 1
                        For Each Column As DataColumn In DT.Columns
@@ -3475,7 +3481,29 @@ Public Class frmConstructor_Main
                        Try
                            Dim NewRow As DataRow
                            NewRow = DTGrid.NewRow()
-                            Dim i = 0
+
+                            'Icon zuweisen
+                            Select Case extension
+                                Case ".csv"
+                                Case ".txt"
+                                    NewRow.Item(0) = My.Resources.text
+                                Case ".pdf"
+                                    NewRow.Item(0) = My.Resources.pdf
+                                Case ".doc"
+                                Case ".docx"
+                                    NewRow.Item(0) = My.Resources.doc
+                                Case ".xls"
+                                Case ".xlsx"
+                                    NewRow.Item(0) = My.Resources.xls
+                                Case ".ppt"
+                                Case ".pptx"
+                                    NewRow.Item(0) = My.Resources.ppt
+                                Case Else
+                                    NewRow.Item(0) = My.Resources._blank
+                            End Select
+
+
+                            Dim i = 1 'Fängt bei 1 an, um die ICON Column zu überspringen
                            For Each Column As String In ColArray
                                Dim Indexname = DT.Rows(0).Item(Column)
                                Dim idxvalue
@@ -3504,6 +3532,9 @@ Public Class frmConstructor_Main
                End If
                If DTGrid.Rows.Count > 0 Then
                    GridControlDocSearch.DataSource = DTGrid
+                    GridViewDoc_Search.Columns.Item(0).MaxWidth = 24
+                    GridViewDoc_Search.Columns.Item(0).MinWidth = 24
+
                End If
            Else
                Dim msg = "Windream-Dokumente für Record: " & RECORD_ID & " - Keine Dateien gefunden"