From 0cae7cdc6a0cef81a0c69f5fc40994b491100c48 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Thu, 28 Apr 2016 11:47:47 +0200 Subject: [PATCH] MS_27.04.2016_1 --- .../frmConstructor_Main.Designer.vb | 38 +++++++-------- .../frmConstructor_Main.resx | 46 +++++++++---------- .../frmConstructor_Main.vb | 12 +++-- 3 files changed, 51 insertions(+), 45 deletions(-) diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index 5460764..8fcb19c 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -61,11 +61,11 @@ Partial Class frmConstructor_Main Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip() Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator() - Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator() - Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() - Me.EigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PropertiesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView() Me.AxObjectListControl = New AxOBJECTLISTCONTROLLib.AxObjectListControl() Me.ToolStripDokumente = New System.Windows.Forms.ToolStrip() @@ -452,7 +452,7 @@ Partial Class frmConstructor_Main ' 'ContextMenuStripResultFiles ' - Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.ToolStripSeparator7, Me.KopierenToolStripMenuItem, Me.ToolStripSeparator8, Me.LöschenToolStripMenuItem, Me.ToolStripSeparator9, Me.EigenschaftenToolStripMenuItem}) + Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.ToolStripSeparator7, Me.CopyToolStripMenuItem, Me.ToolStripSeparator8, Me.DeleteToolStripMenuItem, Me.ToolStripSeparator9, Me.PropertiesToolStripMenuItem}) Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles" resources.ApplyResources(Me.ContextMenuStripResultFiles, "ContextMenuStripResultFiles") ' @@ -466,33 +466,33 @@ Partial Class frmConstructor_Main Me.ToolStripSeparator7.Name = "ToolStripSeparator7" resources.ApplyResources(Me.ToolStripSeparator7, "ToolStripSeparator7") ' - 'KopierenToolStripMenuItem + 'CopyToolStripMenuItem ' - Me.KopierenToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.Copy_6524 - Me.KopierenToolStripMenuItem.Name = "KopierenToolStripMenuItem" - resources.ApplyResources(Me.KopierenToolStripMenuItem, "KopierenToolStripMenuItem") + Me.CopyToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.Copy_6524 + Me.CopyToolStripMenuItem.Name = "CopyToolStripMenuItem" + resources.ApplyResources(Me.CopyToolStripMenuItem, "CopyToolStripMenuItem") ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" resources.ApplyResources(Me.ToolStripSeparator8, "ToolStripSeparator8") ' - 'LöschenToolStripMenuItem + 'DeleteToolStripMenuItem ' - Me.LöschenToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete - Me.LöschenToolStripMenuItem.Name = "LöschenToolStripMenuItem" - resources.ApplyResources(Me.LöschenToolStripMenuItem, "LöschenToolStripMenuItem") + Me.DeleteToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete + Me.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem" + resources.ApplyResources(Me.DeleteToolStripMenuItem, "DeleteToolStripMenuItem") ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" resources.ApplyResources(Me.ToolStripSeparator9, "ToolStripSeparator9") ' - 'EigenschaftenToolStripMenuItem + 'PropertiesToolStripMenuItem ' - Me.EigenschaftenToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.PropertyGridEditorPart_6041 - Me.EigenschaftenToolStripMenuItem.Name = "EigenschaftenToolStripMenuItem" - resources.ApplyResources(Me.EigenschaftenToolStripMenuItem, "EigenschaftenToolStripMenuItem") + Me.PropertiesToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.PropertyGridEditorPart_6041 + Me.PropertiesToolStripMenuItem.Name = "PropertiesToolStripMenuItem" + resources.ApplyResources(Me.PropertiesToolStripMenuItem, "PropertiesToolStripMenuItem") ' 'GridViewDoc_Search ' @@ -1227,9 +1227,9 @@ Partial Class frmConstructor_Main Friend WithEvents ContextMenuStripResultFiles As System.Windows.Forms.ContextMenuStrip Friend WithEvents DateiÖffnenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ToolStripSeparator7 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents KopierenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents CopyToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ToolStripSeparator8 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents LöschenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents DeleteToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ToolStripSeparator9 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents EigenschaftenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents PropertiesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem End Class diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 1547b3a..b019713 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -415,40 +415,40 @@ 187, 65 - 148, 22 + 152, 22 Datei Öffnen - 145, 6 + 149, 6 - - 148, 22 + + 152, 22 - + Kopieren - 145, 6 + 149, 6 - - 148, 22 + + 152, 22 - + Löschen - 145, 6 + 149, 6 - - 148, 22 + + 152, 22 - + Eigenschaften - 149, 110 + 153, 132 ContextMenuStripResultFiles @@ -2375,10 +2375,10 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - KopierenToolStripMenuItem + + CopyToolStripMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2387,10 +2387,10 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - LöschenToolStripMenuItem + + DeleteToolStripMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2399,10 +2399,10 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - EigenschaftenToolStripMenuItem + + PropertiesToolStripMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index c9ad600..04cf250 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -718,7 +718,10 @@ Public Class frmConstructor_Main RIGHT_ONLY_READ = False tsmi_RecordDelete.Enabled = True + DeleteToolStripMenuItem.Enabled = True + CopyToolStripMenuItem.Enabled = True RecordKopierenToolStripMenuItem.Enabled = True + PropertiesToolStripMenuItem.Enabled = True tslblLocked.Visible = False TabFollowUp.PageEnabled = True Dim tempsql @@ -758,6 +761,9 @@ Public Class frmConstructor_Main tsButtonSave.Enabled = False tsButtonDelete.Enabled = False tsmi_RecordDelete.Enabled = False + PropertiesToolStripMenuItem.Enabled = False + CopyToolStripMenuItem.Enabled = False + DeleteToolStripMenuItem.Enabled = False tslblLocked.Visible = True RecordKopierenToolStripMenuItem.Enabled = False TabFollowUp.PageEnabled = False @@ -4715,7 +4721,7 @@ Public Class frmConstructor_Main Delete_Record() End Sub - Private Sub KopierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KopierenToolStripMenuItem.Click + Private Sub KopierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CopyToolStripMenuItem.Click If RESULT_DOC_PATH <> Nothing Then Try Dim selectedfile(0) As String @@ -4744,7 +4750,7 @@ Public Class frmConstructor_Main End Sub - Private Sub LöschenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LöschenToolStripMenuItem.Click + Private Sub LöschenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DeleteToolStripMenuItem.Click If RESULT_DOC_PATH <> Nothing Then Dim msg = "Sind Sie sicher, dass Sie diese Dateien löschen wollen?" If USER_LANGUAGE <> "de-DE" Then @@ -4769,7 +4775,7 @@ Public Class frmConstructor_Main End Sub - Private Sub EigenschaftenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EigenschaftenToolStripMenuItem.Click + Private Sub EigenschaftenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PropertiesToolStripMenuItem.Click If RESULT_DOC_PATH <> Nothing Then Cursor = Cursors.WaitCursor Dim sei As New SHELLEXECUTEINFO