Merge branch 'master' of http://scmadmin@172.24.11.74:90/scm/git/RecordOrganizer
This commit is contained in:
@@ -124,6 +124,7 @@ Partial Class frmConstructor_Main
|
||||
Me.AnwendungscacheFreigebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.tsButtonShowTaskOverview = New System.Windows.Forms.ToolStripButton()
|
||||
Me.tsButtonShowWorkflowTasks = New System.Windows.Forms.ToolStripButton()
|
||||
Me.tsButtonCancel = New System.Windows.Forms.ToolStripButton()
|
||||
Me.tslblLocked = New System.Windows.Forms.ToolStripLabel()
|
||||
Me.tslblFileslocked = New System.Windows.Forms.ToolStripLabel()
|
||||
Me.Panel2 = New System.Windows.Forms.Panel()
|
||||
@@ -764,7 +765,7 @@ Partial Class frmConstructor_Main
|
||||
'ToolStripEdit
|
||||
'
|
||||
Me.ToolStripEdit.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
|
||||
Me.ToolStripEdit.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsButtonAdd, Me.tsButtonSave, Me.tsButtonDelete, Me.tsButtonEdit, Me.ToolStripDropDownButton1, Me.tsButtonShowTaskOverview, Me.tsButtonShowWorkflowTasks, Me.tslblLocked, Me.tslblFileslocked})
|
||||
Me.ToolStripEdit.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsButtonAdd, Me.tsButtonSave, Me.tsButtonDelete, Me.tsButtonEdit, Me.ToolStripDropDownButton1, Me.tsButtonShowTaskOverview, Me.tsButtonShowWorkflowTasks, Me.tsButtonCancel, Me.tslblLocked, Me.tslblFileslocked})
|
||||
resources.ApplyResources(Me.ToolStripEdit, "ToolStripEdit")
|
||||
Me.ToolStripEdit.Name = "ToolStripEdit"
|
||||
'
|
||||
@@ -868,6 +869,12 @@ Partial Class frmConstructor_Main
|
||||
Me.tsButtonShowWorkflowTasks.Image = Global.DD_Record_Organiser.My.Resources.Resources.bricks
|
||||
Me.tsButtonShowWorkflowTasks.Name = "tsButtonShowWorkflowTasks"
|
||||
'
|
||||
'tsButtonCancel
|
||||
'
|
||||
Me.tsButtonCancel.Image = Global.DD_Record_Organiser.My.Resources.Resources.cancel
|
||||
resources.ApplyResources(Me.tsButtonCancel, "tsButtonCancel")
|
||||
Me.tsButtonCancel.Name = "tsButtonCancel"
|
||||
'
|
||||
'tslblLocked
|
||||
'
|
||||
resources.ApplyResources(Me.tslblLocked, "tslblLocked")
|
||||
@@ -1238,4 +1245,5 @@ Partial Class frmConstructor_Main
|
||||
Friend WithEvents ToolStripSeparator9 As System.Windows.Forms.ToolStripSeparator
|
||||
Friend WithEvents PropertiesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
|
||||
Friend WithEvents tslblFileslocked As System.Windows.Forms.ToolStripLabel
|
||||
Friend WithEvents tsButtonCancel As System.Windows.Forms.ToolStripButton
|
||||
End Class
|
||||
|
||||
Reference in New Issue
Block a user