AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix saving and restoring form position, fix display format

Browse Source
This commit is contained in:
Jonathan Jenne 2023-05-24 08:55:51 +02:00
parent a4b44bc5c3
commit 37b02ec625
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/TaskFlow/ModuleControlProperties.vb
View File

@ -211,7 +211,7 @@ Public Module ModuleControlProperties
<Editor(GetType(MultilineStringEditor), GetType(UITypeEditor))> <Editor(GetType(MultilineStringEditor), GetType(UITypeEditor))>
Public Property RegexMessage As String Public Property RegexMessage As String
<DisplayName("Display Format String")> <DisplayName("Display Format")>
<Category(ClassConstants.CAT_DISPLAY)> <Category(ClassConstants.CAT_DISPLAY)>
<TypeConverter(GetType(DisplayFormatConverter))> <TypeConverter(GetType(DisplayFormatConverter))>
Public Property DisplayFormat As String Public Property DisplayFormat As String
@ -226,10 +226,10 @@ Public Module ModuleControlProperties
Public Overrides Function GetStandardValues(context As ITypeDescriptorContext) As StandardValuesCollection Public Overrides Function GetStandardValues(context As ITypeDescriptorContext) As StandardValuesCollection
Dim displayFormatList = New List(Of String) From { Dim displayFormatList = New List(Of String) From {
ClassControlCreator.CONTROL_TYPE_TEXT, ClassControlCreator.CONTROL_TYPE_TEXT,
ClassControlCreator.CONTROL_TYPE_BOOLEAN,
ClassControlCreator.CONTROL_TYPE_INTEGER,
ClassControlCreator.CONTROL_TYPE_DOUBLE, 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) Dim values As New StandardValuesCollection(displayFormatList)
Return values Return values

7
app/TaskFlow/frmMain.vb
View File

@ -17,6 +17,7 @@ Imports DevExpress.XtraGrid.Views.BandedGrid
Imports DevExpress.XtraBars.Ribbon Imports DevExpress.XtraBars.Ribbon
Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.ZooFlow
Imports DevExpress.LookAndFeel Imports DevExpress.LookAndFeel
Imports DigitalData.Modules.Base
Public Class frmMain Public Class frmMain
Private Property FormHelper As FormHelper Private Property FormHelper As FormHelper
@ -402,8 +403,10 @@ Public Class frmMain
Check_Timer_Notification() Check_Timer_Notification()
Timer_Inactivity_Reset_Disable("FormLoad") 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 If IDB_ACTIVE = False And ERROR_STATE = "" Then
Try Try