MS1611

2016-11-17 12:25:23 +01:00
parent ba4040e3e4
commit 8ffa31303b
20 changed files with 3837 additions and 3872 deletions
--- a/app/DD-Record-Organiser/frmSearchAllOVer.Designer.vb
+++ b/app/DD-Record-Organiser/frmSearchAllOVer.Designer.vb
@@ -36,36 +36,33 @@ Partial Class frmSearchAllOVer
        Me.Label2 = New System.Windows.Forms.Label()
        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
        Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
-        Me.SplitContainer2 = New DevExpress.XtraEditors.SplitContainerControl()
        Me.GridControlRecords = New DevExpress.XtraGrid.GridControl()
+        Me.cmsRecords = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ExportExcelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ShowRecordToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.GridViewRecords = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.ToolStripRecords = New System.Windows.Forms.ToolStrip()
        Me.tslblRecordsResult = New System.Windows.Forms.ToolStripLabel()
        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.pnlDetails = New System.Windows.Forms.Panel()
+        Me.tsbtnviewDetail = New System.Windows.Forms.ToolStripButton()
        Me.GridControlFiles = New DevExpress.XtraGrid.GridControl()
        Me.GridViewFiles = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.ToolStripDokumente = New System.Windows.Forms.ToolStrip()
        Me.tslblDocView = New System.Windows.Forms.ToolStripLabel()
        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
-        Me.cmsRecords = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.ExportExcelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ShowRecordToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMain.SuspendLayout()
        Me.Panel1.SuspendLayout()
        Me.GroupBox1.SuspendLayout()
        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerMain.SuspendLayout()
-        CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SplitContainer2.SuspendLayout()
        CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.cmsRecords.SuspendLayout()
        CType(Me.GridViewRecords, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ToolStripRecords.SuspendLayout()
        CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ToolStripDokumente.SuspendLayout()
-        Me.cmsRecords.SuspendLayout()
        Me.SuspendLayout()
        '
        'ToolStripMain
@@ -109,7 +106,7 @@ Partial Class frmSearchAllOVer
        'rbSearchRecord
        '
        Me.rbSearchRecord.AutoSize = True
-        Me.rbSearchRecord.Location = New System.Drawing.Point(293, 20)
+        Me.rbSearchRecord.Location = New System.Drawing.Point(423, 20)
        Me.rbSearchRecord.Name = "rbSearchRecord"
        Me.rbSearchRecord.Size = New System.Drawing.Size(183, 17)
        Me.rbSearchRecord.TabIndex = 1
@@ -119,7 +116,7 @@ Partial Class frmSearchAllOVer
        'rbSearchFulltext
        '
        Me.rbSearchFulltext.AutoSize = True
-        Me.rbSearchFulltext.Location = New System.Drawing.Point(493, 20)
+        Me.rbSearchFulltext.Location = New System.Drawing.Point(423, 43)
        Me.rbSearchFulltext.Name = "rbSearchFulltext"
        Me.rbSearchFulltext.Size = New System.Drawing.Size(188, 17)
        Me.rbSearchFulltext.TabIndex = 2
@@ -132,10 +129,10 @@ Partial Class frmSearchAllOVer
        Me.rbSearchCombined.Checked = True
        Me.rbSearchCombined.Location = New System.Drawing.Point(12, 20)
        Me.rbSearchCombined.Name = "rbSearchCombined"
-        Me.rbSearchCombined.Size = New System.Drawing.Size(275, 17)
+        Me.rbSearchCombined.Size = New System.Drawing.Size(405, 17)
        Me.rbSearchCombined.TabIndex = 0
        Me.rbSearchCombined.TabStop = True
-        Me.rbSearchCombined.Text = "Kombinierte Suche (ADDI-Datensätzen und Dateien)"
+        Me.rbSearchCombined.Text = "Kombinierte Suche (ADDI-Datensätzen und Dateien - wenn Volltext vorhanden)"
        Me.rbSearchCombined.UseVisualStyleBackColor = True
        '
        'Panel1
@@ -173,9 +170,9 @@ Partial Class frmSearchAllOVer
        Me.GroupBox1.Controls.Add(Me.rbSearchRecord)
        Me.GroupBox1.Controls.Add(Me.rbSearchFulltext)
        Me.GroupBox1.Controls.Add(Me.rbSearchCombined)
-        Me.GroupBox1.Location = New System.Drawing.Point(619, 31)
+        Me.GroupBox1.Location = New System.Drawing.Point(538, 31)
        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(684, 49)
+        Me.GroupBox1.Size = New System.Drawing.Size(765, 78)
        Me.GroupBox1.TabIndex = 7
        Me.GroupBox1.TabStop = False
        Me.GroupBox1.Text = "Bitte definieren Sie eine Suchvariante:"
@@ -186,7 +183,8 @@ Partial Class frmSearchAllOVer
        Me.SplitContainerMain.Dock = System.Windows.Forms.DockStyle.Fill
        Me.SplitContainerMain.Location = New System.Drawing.Point(0, 117)
        Me.SplitContainerMain.Name = "SplitContainerMain"
-        Me.SplitContainerMain.Panel1.Controls.Add(Me.SplitContainer2)
+        Me.SplitContainerMain.Panel1.Controls.Add(Me.GridControlRecords)
+        Me.SplitContainerMain.Panel1.Controls.Add(Me.ToolStripRecords)
        Me.SplitContainerMain.Panel1.Text = "Panel1"
        Me.SplitContainerMain.Panel2.Controls.Add(Me.GridControlFiles)
        Me.SplitContainerMain.Panel2.Controls.Add(Me.ToolStripDokumente)
@@ -196,22 +194,6 @@ Partial Class frmSearchAllOVer
        Me.SplitContainerMain.TabIndex = 8
        Me.SplitContainerMain.Text = "SplitContainerControl1"
        '
-        'SplitContainer2
-        '
-        Me.SplitContainer2.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainer2.Horizontal = False
-        Me.SplitContainer2.Location = New System.Drawing.Point(0, 0)
-        Me.SplitContainer2.Name = "SplitContainer2"
-        Me.SplitContainer2.Panel1.Controls.Add(Me.GridControlRecords)
-        Me.SplitContainer2.Panel1.Controls.Add(Me.ToolStripRecords)
-        Me.SplitContainer2.Panel1.Text = "Panel1"
-        Me.SplitContainer2.Panel2.Controls.Add(Me.pnlDetails)
-        Me.SplitContainer2.Panel2.Text = "Panel2"
-        Me.SplitContainer2.Size = New System.Drawing.Size(692, 430)
-        Me.SplitContainer2.SplitterPosition = 236
-        Me.SplitContainer2.TabIndex = 0
-        Me.SplitContainer2.Text = "SplitContainerControl1"
-        '
        'GridControlRecords
        '
        Me.GridControlRecords.ContextMenuStrip = Me.cmsRecords
@@ -219,10 +201,30 @@ Partial Class frmSearchAllOVer
        Me.GridControlRecords.Location = New System.Drawing.Point(0, 25)
        Me.GridControlRecords.MainView = Me.GridViewRecords
        Me.GridControlRecords.Name = "GridControlRecords"
-        Me.GridControlRecords.Size = New System.Drawing.Size(692, 211)
+        Me.GridControlRecords.Size = New System.Drawing.Size(692, 405)
        Me.GridControlRecords.TabIndex = 0
        Me.GridControlRecords.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewRecords})
        '
+        'cmsRecords
+        '
+        Me.cmsRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportExcelToolStripMenuItem, Me.ShowRecordToolStripMenuItem})
+        Me.cmsRecords.Name = "cmsRecords"
+        Me.cmsRecords.Size = New System.Drawing.Size(144, 48)
+        '
+        'ExportExcelToolStripMenuItem
+        '
+        Me.ExportExcelToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.Excel_25ixel
+        Me.ExportExcelToolStripMenuItem.Name = "ExportExcelToolStripMenuItem"
+        Me.ExportExcelToolStripMenuItem.Size = New System.Drawing.Size(143, 22)
+        Me.ExportExcelToolStripMenuItem.Text = "Export Excel"
+        '
+        'ShowRecordToolStripMenuItem
+        '
+        Me.ShowRecordToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.application_view_detail
+        Me.ShowRecordToolStripMenuItem.Name = "ShowRecordToolStripMenuItem"
+        Me.ShowRecordToolStripMenuItem.Size = New System.Drawing.Size(143, 22)
+        Me.ShowRecordToolStripMenuItem.Text = "Show Record"
+        '
        'GridViewRecords
        '
        Me.GridViewRecords.Appearance.EvenRow.BackColor = System.Drawing.Color.Aqua
@@ -243,7 +245,7 @@ Partial Class frmSearchAllOVer
        '
        'ToolStripRecords
        '
-        Me.ToolStripRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblRecordsResult, Me.ToolStripSeparator1, Me.ToolStripButton1})
+        Me.ToolStripRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblRecordsResult, Me.ToolStripSeparator1, Me.ToolStripButton1, Me.tsbtnviewDetail})
        Me.ToolStripRecords.Location = New System.Drawing.Point(0, 0)
        Me.ToolStripRecords.Name = "ToolStripRecords"
        Me.ToolStripRecords.Size = New System.Drawing.Size(692, 25)
@@ -269,13 +271,13 @@ Partial Class frmSearchAllOVer
        Me.ToolStripButton1.Size = New System.Drawing.Size(60, 22)
        Me.ToolStripButton1.Text = "Export"
        '
-        'pnlDetails
+        'tsbtnviewDetail
        '
-        Me.pnlDetails.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pnlDetails.Location = New System.Drawing.Point(0, 0)
-        Me.pnlDetails.Name = "pnlDetails"
-        Me.pnlDetails.Size = New System.Drawing.Size(692, 182)
-        Me.pnlDetails.TabIndex = 0
+        Me.tsbtnviewDetail.Image = Global.DD_Record_Organiser.My.Resources.Resources.application_view_detail
+        Me.tsbtnviewDetail.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbtnviewDetail.Name = "tsbtnviewDetail"
+        Me.tsbtnviewDetail.Size = New System.Drawing.Size(95, 22)
+        Me.tsbtnviewDetail.Text = "Detailansicht"
        '
        'GridControlFiles
        '
@@ -332,25 +334,6 @@ Partial Class frmSearchAllOVer
        Me.ToolStripButton2.Size = New System.Drawing.Size(63, 22)
        Me.ToolStripButton2.Text = "Export"
        '
-        'cmsRecords
-        '
-        Me.cmsRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportExcelToolStripMenuItem, Me.ShowRecordToolStripMenuItem})
-        Me.cmsRecords.Name = "cmsRecords"
-        Me.cmsRecords.Size = New System.Drawing.Size(144, 48)
-        '
-        'ExportExcelToolStripMenuItem
-        '
-        Me.ExportExcelToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.Excel_25ixel
-        Me.ExportExcelToolStripMenuItem.Name = "ExportExcelToolStripMenuItem"
-        Me.ExportExcelToolStripMenuItem.Size = New System.Drawing.Size(143, 22)
-        Me.ExportExcelToolStripMenuItem.Text = "Export Excel"
-        '
-        'ShowRecordToolStripMenuItem
-        '
-        Me.ShowRecordToolStripMenuItem.Name = "ShowRecordToolStripMenuItem"
-        Me.ShowRecordToolStripMenuItem.Size = New System.Drawing.Size(143, 22)
-        Me.ShowRecordToolStripMenuItem.Text = "Show Record"
-        '
        'frmSearchAllOVer
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -360,6 +343,7 @@ Partial Class frmSearchAllOVer
        Me.Controls.Add(Me.Panel1)
        Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.KeyPreview = True
        Me.Name = "frmSearchAllOVer"
        Me.Text = "Search all over"
        Me.ToolStripMain.ResumeLayout(False)
@@ -370,9 +354,8 @@ Partial Class frmSearchAllOVer
        Me.GroupBox1.PerformLayout()
        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainerMain.ResumeLayout(False)
-        CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.SplitContainer2.ResumeLayout(False)
        CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.cmsRecords.ResumeLayout(False)
        CType(Me.GridViewRecords, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ToolStripRecords.ResumeLayout(False)
        Me.ToolStripRecords.PerformLayout()
@@ -380,7 +363,6 @@ Partial Class frmSearchAllOVer
        CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ToolStripDokumente.ResumeLayout(False)
        Me.ToolStripDokumente.PerformLayout()
-        Me.cmsRecords.ResumeLayout(False)
        Me.ResumeLayout(False)

    End Sub
@@ -390,11 +372,8 @@ Partial Class frmSearchAllOVer
    Friend WithEvents rbSearchRecord As System.Windows.Forms.RadioButton
    Friend WithEvents rbSearchFulltext As System.Windows.Forms.RadioButton
    Friend WithEvents rbSearchCombined As System.Windows.Forms.RadioButton
-    Friend WithEvents Panel1 As System.Windows.Forms.Panel
    Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
    Friend WithEvents SplitContainerMain As DevExpress.XtraEditors.SplitContainerControl
-    Friend WithEvents SplitContainer2 As DevExpress.XtraEditors.SplitContainerControl
-    Friend WithEvents pnlDetails As System.Windows.Forms.Panel
    Friend WithEvents tsbtnRefresh As System.Windows.Forms.ToolStripButton
    Friend WithEvents txtSearch As System.Windows.Forms.TextBox
    Friend WithEvents Label2 As System.Windows.Forms.Label
@@ -412,4 +391,6 @@ Partial Class frmSearchAllOVer
    Friend WithEvents cmsRecords As System.Windows.Forms.ContextMenuStrip
    Friend WithEvents ExportExcelToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents ShowRecordToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents Panel1 As System.Windows.Forms.Panel
+    Friend WithEvents tsbtnviewDetail As System.Windows.Forms.ToolStripButton
 End Class