Fix saving and restoring form position, fix display format
This commit is contained in:
parent
a4b44bc5c3
commit
37b02ec625
@ -211,7 +211,7 @@ Public Module ModuleControlProperties
|
||||
<Editor(GetType(MultilineStringEditor), GetType(UITypeEditor))>
|
||||
Public Property RegexMessage As String
|
||||
|
||||
<DisplayName("Display Format String")>
|
||||
<DisplayName("Display Format")>
|
||||
<Category(ClassConstants.CAT_DISPLAY)>
|
||||
<TypeConverter(GetType(DisplayFormatConverter))>
|
||||
Public Property DisplayFormat As String
|
||||
@ -226,10 +226,10 @@ Public Module ModuleControlProperties
|
||||
Public Overrides Function GetStandardValues(context As ITypeDescriptorContext) As StandardValuesCollection
|
||||
Dim displayFormatList = New List(Of String) From {
|
||||
ClassControlCreator.CONTROL_TYPE_TEXT,
|
||||
ClassControlCreator.CONTROL_TYPE_BOOLEAN,
|
||||
ClassControlCreator.CONTROL_TYPE_INTEGER,
|
||||
ClassControlCreator.CONTROL_TYPE_DOUBLE,
|
||||
ClassControlCreator.CONTROL_TYPE_CURRENCY
|
||||
ClassControlCreator.CONTROL_TYPE_CURRENCY,
|
||||
ClassControlCreator.CONTROL_TYPE_DATE,
|
||||
ClassControlCreator.CONTROL_TYPE_DATETIME
|
||||
}
|
||||
Dim values As New StandardValuesCollection(displayFormatList)
|
||||
Return values
|
||||
|
||||
@ -17,6 +17,7 @@ Imports DevExpress.XtraGrid.Views.BandedGrid
|
||||
Imports DevExpress.XtraBars.Ribbon
|
||||
Imports DigitalData.Modules.ZooFlow
|
||||
Imports DevExpress.LookAndFeel
|
||||
Imports DigitalData.Modules.Base
|
||||
|
||||
Public Class frmMain
|
||||
Private Property FormHelper As FormHelper
|
||||
@ -402,8 +403,10 @@ Public Class frmMain
|
||||
Check_Timer_Notification()
|
||||
Timer_Inactivity_Reset_Disable("FormLoad")
|
||||
|
||||
Restore_Form_Position()
|
||||
|
||||
'Restore_Form_Position()
|
||||
ScreenEx.RestoreFormPosition(Me, My.Settings.frmMainPosition)
|
||||
ScreenEx.RestoreFormState(Me, My.Settings.frmMainWindowState)
|
||||
Size = My.Settings.frmMainSize
|
||||
|
||||
If IDB_ACTIVE = False And ERROR_STATE = "" Then
|
||||
Try
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user