diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index 32e0db4..1610e71 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -1165,6 +1165,12 @@ + + + + + + diff --git a/app/DD-Record-Organiser/My Project/Resources.Designer.vb b/app/DD-Record-Organiser/My Project/Resources.Designer.vb index a72c57f..39907a2 100644 --- a/app/DD-Record-Organiser/My Project/Resources.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Resources.Designer.vb @@ -110,6 +110,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + 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 + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -740,6 +750,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + 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 + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1360,6 +1380,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + 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 + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + 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 + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1510,6 +1550,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + 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 + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1639,5 +1689,15 @@ Namespace My.Resources Return CType(obj,System.Drawing.Bitmap) End Get End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + 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 diff --git a/app/DD-Record-Organiser/My Project/Resources.resx b/app/DD-Record-Organiser/My Project/Resources.resx index 32a97a5..a1e305f 100644 --- a/app/DD-Record-Organiser/My Project/Resources.resx +++ b/app/DD-Record-Organiser/My Project/Resources.resx @@ -592,4 +592,22 @@ ..\Resources\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\doc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/app/DD-Record-Organiser/Resources/_blank.png b/app/DD-Record-Organiser/Resources/_blank.png new file mode 100644 index 0000000..ceebb42 Binary files /dev/null and b/app/DD-Record-Organiser/Resources/_blank.png differ diff --git a/app/DD-Record-Organiser/Resources/doc.png b/app/DD-Record-Organiser/Resources/doc.png new file mode 100644 index 0000000..cdfcf6c Binary files /dev/null and b/app/DD-Record-Organiser/Resources/doc.png differ diff --git a/app/DD-Record-Organiser/Resources/pdf.png b/app/DD-Record-Organiser/Resources/pdf.png new file mode 100644 index 0000000..0f8a3e1 Binary files /dev/null and b/app/DD-Record-Organiser/Resources/pdf.png differ diff --git a/app/DD-Record-Organiser/Resources/ppt.png b/app/DD-Record-Organiser/Resources/ppt.png new file mode 100644 index 0000000..ef39540 Binary files /dev/null and b/app/DD-Record-Organiser/Resources/ppt.png differ diff --git a/app/DD-Record-Organiser/Resources/text.png b/app/DD-Record-Organiser/Resources/text.png new file mode 100644 index 0000000..26909be Binary files /dev/null and b/app/DD-Record-Organiser/Resources/text.png differ diff --git a/app/DD-Record-Organiser/Resources/xls.png b/app/DD-Record-Organiser/Resources/xls.png new file mode 100644 index 0000000..67c7708 Binary files /dev/null and b/app/DD-Record-Organiser/Resources/xls.png differ diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index be33925..c1be2b8 100644 --- 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 ' diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 302ce9d..39a21c4 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -414,6 +414,15 @@ 3, 160 + + White + + + Transparent + + + 192, 255, 192 + 1066, 153 diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index ec85ada..733d12a 100644 --- 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"