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

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager

Browse Source
This commit is contained in:
SchreiberM
2022-10-28 12:59:21 +02:00
parent eb06ef5de4 b9f8703e78
commit 0665672626
5 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@@ -154,8 +154,5 @@ $RECYCLE.BIN/
# Mac desktop service store files # Mac desktop service store files
.DS_Store .DS_Store
/app/.vs/DD_PM_WINDREAM/v15/Server/sqlite3
/app/.vs/DD_PM_WINDREAM/v16/Server/sqlite3/storage.ide-wal .vs
/app/.vs/DD_PM_WINDREAM/v16/Server/sqlite3/storage.ide-shm
/app/.vs/DD_PM_WINDREAM/v16/Server/sqlite3/storage.ide
/app/.vs/DD_PM_WINDREAM/v16/Server/sqlite3/db.lock

BIN
app/.vs/DD_PM_WINDREAM/FileContentIndex/752fbd1f-7849-4b3c-ac9c-f6c29213792d.vsidx
View File

Binary file not shown.

BIN
app/.vs/DD_PM_WINDREAM/FileContentIndex/e8d4f533-a94c-49bf-a99d-cea208695548.vsidx
View File

Binary file not shown.

BIN
app/.vs/DD_PM_WINDREAM/FileContentIndex/f7cfac79-9ee7-41e4-9fb5-048c3154c94a.vsidx
View File

Binary file not shown.

7
app/DD_PM_WINDREAM/frmMain.vb
View File

@@ -1320,8 +1320,7 @@ Public Class frmMain
End Try End Try
Try Try
If USER_LANGUAGE <> "" Then If USER_LANGUAGE <> "" Then
Dim cultureInfo As System.Globalization.CultureInfo Dim cultureInfo As New System.Globalization.CultureInfo(USER_LANGUAGE)
cultureInfo = New System.Globalization.CultureInfo(USER_LANGUAGE)
cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
Thread.CurrentThread.CurrentCulture = cultureInfo Thread.CurrentThread.CurrentCulture = cultureInfo
Thread.CurrentThread.CurrentUICulture = cultureInfo Thread.CurrentThread.CurrentUICulture = cultureInfo
@@ -1329,7 +1328,7 @@ Public Class frmMain
CultureInfo.DefaultThreadCurrentUICulture = cultureInfo CultureInfo.DefaultThreadCurrentUICulture = cultureInfo
End If End If
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex)
End Try End Try
Try Try
InitializeComponent() InitializeComponent()
@@ -1339,8 +1338,6 @@ Public Class frmMain
LOGGER.Error(ex) LOGGER.Error(ex)
LOGGER.Info($"Error in InitializeComponent: {ex.Message}") LOGGER.Info($"Error in InitializeComponent: {ex.Message}")
End Try End Try
End Sub End Sub
Private Sub TimerReminder_Tick(sender As Object, e As EventArgs) Handles TimerReminder.Tick Private Sub TimerReminder_Tick(sender As Object, e As EventArgs) Handles TimerReminder.Tick