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

Use Base classes, deprecate language

Browse Source
This commit is contained in:
Jonathan Jenne 2023-10-13 08:31:35 +02:00
parent 9700b781d6
commit 8adceb2811
6 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/DD_Clipboard_Searcher/ClassInit.vb
View File

@ -9,6 +9,7 @@ Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
Imports System.Globalization Imports System.Globalization
Imports System.Threading Imports System.Threading
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
Imports DigitalData.Modules.Base
Public Class ClassInit Public Class ClassInit
Public _lizenzManager As LicenseManagerLegacy Public _lizenzManager As LicenseManagerLegacy
@ -197,19 +198,19 @@ Public Class ClassInit
Logger.Info("Login time: " & Now.ToShortDateString, False) Logger.Info("Login time: " & Now.ToShortDateString, False)
USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID") USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID")
USER_SURNAME = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"), "") USER_SURNAME = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"), "")
USER_PRENAME = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME"), "") USER_PRENAME = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME"), "")
USER_SHORTNAME = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"), "") USER_SHORTNAME = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"), "")
USER_EMAIL = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"), "") USER_EMAIL = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"), "")
USER_LANGUAGE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE"), "de-DE") USER_LANGUAGE = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE"), "de-DE")
USER_DATE_FORMAT = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT"), "dd.MM.yyyy") USER_DATE_FORMAT = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT"), "dd.MM.yyyy")
USER_IN_MODULE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS"), False) USER_IN_MODULE = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS"), False)
USER_IS_ADMIN = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN"), False) USER_IS_ADMIN = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN"), False)
ADDITIONAL_TITLE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE"), "") ADDITIONAL_TITLE = ObjectEx.NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE"), "")
Logger.Debug("User Id: [{0}]", USER_ID) Logger.Debug("User Id: [{0}]", USER_ID)
Logger.Debug("User Email: [{0}]", USER_EMAIL) Logger.Debug("User Email: [{0}]", USER_EMAIL)

3
app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
View File

@ -121,9 +121,6 @@
<Reference Include="DigitalData.Modules.Filesystem"> <Reference Include="DigitalData.Modules.Filesystem">
<HintPath>..\..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath> <HintPath>..\..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Language">
<HintPath>..\..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.License"> <Reference Include="DigitalData.Modules.License">
<HintPath>..\..\..\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath> <HintPath>..\..\..\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
</Reference> </Reference>

6
app/DD_Clipboard_Searcher/My Project/licenses.licx
View File

@ -1 +1,7 @@
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

3
app/DD_Clipboard_Searcher/frmAdministration.vb
View File

@ -1,4 +1,5 @@
Imports System.Text.RegularExpressions Imports System.Text.RegularExpressions
Imports DigitalData.Modules.Base
Imports DigitalData.Modules.Database Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Language Imports DigitalData.Modules.Language
Public Class frmAdministration Public Class frmAdministration
@ -377,7 +378,7 @@ Public Class frmAdministration
End Sub End Sub
Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
If Utils.NotNull(txtProfileName.EditValue, String.Empty) <> String.Empty Then If ObjectEx.NotNull(txtProfileName.EditValue, String.Empty) <> String.Empty Then
Save_Profile() Save_Profile()
Else Else
MsgBox("Profil kann nicht ohne Profil-Name gespeichert werden!", MsgBoxStyle.Exclamation, Text) MsgBox("Profil kann nicht ohne Profil-Name gespeichert werden!", MsgBoxStyle.Exclamation, Text)

2
app/DD_Clipboard_Searcher/frmMain.vb
View File

@ -61,7 +61,7 @@ Public Class frmMain
End If End If
lblUser.Caption = USER_USERNAME lblUser.Caption = USER_USERNAME
Language.LogApplicationLanguage(Logger) LanguageEx.LogApplicationLanguage(Logger)
If Database.DBInitialized = True Then If Database.DBInitialized = True Then
If ERROR_INIT <> "" Then If ERROR_INIT <> "" Then

2
app/DD_Clipboard_Searcher/frmSplash.vb
View File

@ -84,7 +84,7 @@ Public NotInheritable Class frmSplash
Application.Exit() Application.Exit()
End If End If
Language.SetApplicationLanguage(Logger, USER_LANGUAGE, USER_DATE_FORMAT) LanguageEx.SetApplicationLanguage(Logger, USER_LANGUAGE, USER_DATE_FORMAT)
' Wenn kein Fehler, Splashscreen schließen ' Wenn kein Fehler, Splashscreen schließen
Close() Close()