prepare release and fix marvman's bugs
This commit is contained in:
@@ -78,6 +78,7 @@ Partial Class frmAdministration
|
||||
Me.BarButtonItem25 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.labelSelection = New DevExpress.XtraBars.BarStaticItem()
|
||||
Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem()
|
||||
Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||
Me.RibbonGroup_Profile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
Me.RibbonGroup_DocSearch = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||
@@ -120,7 +121,8 @@ Partial Class frmAdministration
|
||||
Me.MemoEdit5 = New DevExpress.XtraEditors.MemoEdit()
|
||||
Me.MemoEdit6 = New DevExpress.XtraEditors.MemoEdit()
|
||||
Me.txtDOC_GUID = New DevExpress.XtraEditors.TextEdit()
|
||||
Me.TextEdit19 = New DevExpress.XtraEditors.ComboBoxEdit()
|
||||
Me.TextEdit19 = New DevExpress.XtraEditors.LookUpEdit()
|
||||
Me.TBWHSEARCHPOSITIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup()
|
||||
Me.LayoutControlItem29 = New DevExpress.XtraLayout.LayoutControlItem()
|
||||
Me.LayoutControlItem30 = New DevExpress.XtraLayout.LayoutControlItem()
|
||||
@@ -149,7 +151,7 @@ Partial Class frmAdministration
|
||||
Me.MemoEdit3 = New DevExpress.XtraEditors.MemoEdit()
|
||||
Me.MemoEdit4 = New DevExpress.XtraEditors.MemoEdit()
|
||||
Me.txtDATAGUID = New DevExpress.XtraEditors.TextEdit()
|
||||
Me.TextEdit10 = New DevExpress.XtraEditors.ComboBoxEdit()
|
||||
Me.TextEdit10 = New DevExpress.XtraEditors.LookUpEdit()
|
||||
Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup()
|
||||
Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem()
|
||||
Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem()
|
||||
@@ -211,7 +213,6 @@ Partial Class frmAdministration
|
||||
Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem()
|
||||
Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit()
|
||||
Me.SimpleSeparator1 = New DevExpress.XtraLayout.SimpleSeparator()
|
||||
Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem()
|
||||
CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.GridControlProfiles, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@@ -265,6 +266,7 @@ Partial Class frmAdministration
|
||||
CType(Me.MemoEdit6.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.txtDOC_GUID.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.TextEdit19.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.TBWHSEARCHPOSITIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@@ -537,6 +539,7 @@ Partial Class frmAdministration
|
||||
Me.RibbonControl2.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
|
||||
Me.RibbonControl2.Size = New System.Drawing.Size(1365, 146)
|
||||
Me.RibbonControl2.StatusBar = Me.RibbonStatusBar1
|
||||
Me.RibbonControl2.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden
|
||||
'
|
||||
'ApplicationMenu1
|
||||
'
|
||||
@@ -764,6 +767,14 @@ Partial Class frmAdministration
|
||||
Me.labelSelection.Id = 12
|
||||
Me.labelSelection.Name = "labelSelection"
|
||||
'
|
||||
'BarButtonItem27
|
||||
'
|
||||
Me.BarButtonItem27.Caption = "Zuordnung bearbeiten"
|
||||
Me.BarButtonItem27.Id = 13
|
||||
Me.BarButtonItem27.ImageOptions.Image = CType(resources.GetObject("BarButtonItem27.ImageOptions.Image"), System.Drawing.Image)
|
||||
Me.BarButtonItem27.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem27.ImageOptions.LargeImage"), System.Drawing.Image)
|
||||
Me.BarButtonItem27.Name = "BarButtonItem27"
|
||||
'
|
||||
'RibbonPage2
|
||||
'
|
||||
Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonGroup_Profile, Me.RibbonGroup_DocSearch, Me.RibbonGroup_DataSearch, Me.RibbonGroup_Process, Me.RibbonGroup_Window, Me.RibbonGroup_Control, Me.RibbonGroup_User, Me.RibbonGroup_Group})
|
||||
@@ -1208,11 +1219,22 @@ Partial Class frmAdministration
|
||||
Me.TextEdit19.Name = "TextEdit19"
|
||||
Me.TextEdit19.Properties.AutoHeight = False
|
||||
Me.TextEdit19.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
|
||||
Me.TextEdit19.Properties.Items.AddRange(New Object() {"0", "1", "2", "3", "4"})
|
||||
Me.TextEdit19.Properties.Columns.AddRange(New DevExpress.XtraEditors.Controls.LookUpColumnInfo() {New DevExpress.XtraEditors.Controls.LookUpColumnInfo("POSITION_NAME", "Position", 93, DevExpress.Utils.FormatType.None, "", True, DevExpress.Utils.HorzAlignment.Near, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.[Default])})
|
||||
Me.TextEdit19.Properties.DataSource = Me.TBWHSEARCHPOSITIONBindingSource
|
||||
Me.TextEdit19.Properties.DisplayMember = "POSITION_NAME"
|
||||
Me.TextEdit19.Properties.NullText = ""
|
||||
Me.TextEdit19.Properties.PopupSizeable = False
|
||||
Me.TextEdit19.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard
|
||||
Me.TextEdit19.Properties.ValueMember = "POSITION_INDEX"
|
||||
Me.TextEdit19.Size = New System.Drawing.Size(200, 20)
|
||||
Me.TextEdit19.StyleController = Me.LayoutControlDocs
|
||||
Me.TextEdit19.TabIndex = 10
|
||||
'
|
||||
'TBWHSEARCHPOSITIONBindingSource
|
||||
'
|
||||
Me.TBWHSEARCHPOSITIONBindingSource.DataMember = "TBWH_SEARCH_POSITION"
|
||||
Me.TBWHSEARCHPOSITIONBindingSource.DataSource = Me.MyDataset
|
||||
'
|
||||
'LayoutControlGroup2
|
||||
'
|
||||
Me.LayoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
|
||||
@@ -1534,7 +1556,13 @@ Partial Class frmAdministration
|
||||
Me.TextEdit10.Name = "TextEdit10"
|
||||
Me.TextEdit10.Properties.AutoHeight = False
|
||||
Me.TextEdit10.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
|
||||
Me.TextEdit10.Properties.Items.AddRange(New Object() {"0", "1", "2", "3", "4"})
|
||||
Me.TextEdit10.Properties.Columns.AddRange(New DevExpress.XtraEditors.Controls.LookUpColumnInfo() {New DevExpress.XtraEditors.Controls.LookUpColumnInfo("POSITION_NAME", "Position", 93, DevExpress.Utils.FormatType.None, "", True, DevExpress.Utils.HorzAlignment.Near, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.[Default])})
|
||||
Me.TextEdit10.Properties.DataSource = Me.TBWHSEARCHPOSITIONBindingSource
|
||||
Me.TextEdit10.Properties.DisplayMember = "POSITION_NAME"
|
||||
Me.TextEdit10.Properties.NullText = ""
|
||||
Me.TextEdit10.Properties.PopupSizeable = False
|
||||
Me.TextEdit10.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard
|
||||
Me.TextEdit10.Properties.ValueMember = "POSITION_INDEX"
|
||||
Me.TextEdit10.Size = New System.Drawing.Size(200, 20)
|
||||
Me.TextEdit10.StyleController = Me.LayoutControlData
|
||||
Me.TextEdit10.TabIndex = 10
|
||||
@@ -2137,14 +2165,6 @@ Partial Class frmAdministration
|
||||
Me.SimpleSeparator1.Name = "SimpleSeparator1"
|
||||
Me.SimpleSeparator1.Size = New System.Drawing.Size(280, 2)
|
||||
'
|
||||
'BarButtonItem27
|
||||
'
|
||||
Me.BarButtonItem27.Caption = "Zuordnung bearbeiten"
|
||||
Me.BarButtonItem27.Id = 13
|
||||
Me.BarButtonItem27.ImageOptions.Image = CType(resources.GetObject("BarButtonItem27.ImageOptions.Image"), System.Drawing.Image)
|
||||
Me.BarButtonItem27.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem27.ImageOptions.LargeImage"), System.Drawing.Image)
|
||||
Me.BarButtonItem27.Name = "BarButtonItem27"
|
||||
'
|
||||
'frmAdministration
|
||||
'
|
||||
Me.Appearance.Options.UseFont = True
|
||||
@@ -2214,6 +2234,7 @@ Partial Class frmAdministration
|
||||
CType(Me.MemoEdit6.Properties, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.txtDOC_GUID.Properties, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.TextEdit19.Properties, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.TBWHSEARCHPOSITIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.LayoutControlItem29, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
@@ -2470,8 +2491,6 @@ Partial Class frmAdministration
|
||||
Friend WithEvents LayoutControlItem34 As DevExpress.XtraLayout.LayoutControlItem
|
||||
Friend WithEvents EmptySpaceItem2 As DevExpress.XtraLayout.EmptySpaceItem
|
||||
Friend WithEvents EmptySpaceItem3 As DevExpress.XtraLayout.EmptySpaceItem
|
||||
Friend WithEvents TextEdit19 As DevExpress.XtraEditors.ComboBoxEdit
|
||||
Friend WithEvents TextEdit10 As DevExpress.XtraEditors.ComboBoxEdit
|
||||
Friend WithEvents BarButtonItem23 As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents RibbonGroup_Control As DevExpress.XtraBars.Ribbon.RibbonPageGroup
|
||||
Friend WithEvents BarButtonItem24 As DevExpress.XtraBars.BarButtonItem
|
||||
@@ -2479,4 +2498,7 @@ Partial Class frmAdministration
|
||||
Friend WithEvents BarButtonItem26 As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents labelSelection As DevExpress.XtraBars.BarStaticItem
|
||||
Friend WithEvents BarButtonItem27 As DevExpress.XtraBars.BarButtonItem
|
||||
Friend WithEvents TextEdit19 As DevExpress.XtraEditors.LookUpEdit
|
||||
Friend WithEvents TBWHSEARCHPOSITIONBindingSource As BindingSource
|
||||
Friend WithEvents TextEdit10 As DevExpress.XtraEditors.LookUpEdit
|
||||
End Class
|
||||
|
||||
Reference in New Issue
Block a user