Update deps, deprecate Language
This commit is contained in:
@@ -80,9 +80,6 @@
|
||||
<Reference Include="DigitalData.Modules.Filesystem">
|
||||
<HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DigitalData.Modules.Language">
|
||||
<HintPath>..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DigitalData.Modules.Logging">
|
||||
<HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
|
||||
</Reference>
|
||||
|
||||
@@ -11,7 +11,7 @@ Public Class ControlHelper
|
||||
End Sub
|
||||
|
||||
Public Function HasValue(pControl As Control) As Boolean
|
||||
Return Utils.NotNull(GetValue(pControl), Nothing) IsNot Nothing
|
||||
Return ObjectEx.NotNull(GetValue(pControl), Nothing) IsNot Nothing
|
||||
End Function
|
||||
|
||||
Public Function GetValue(pControl As Control) As Object
|
||||
|
||||
@@ -13,6 +13,7 @@ Imports DigitalData.GUIs.Common
|
||||
Imports System.ComponentModel
|
||||
Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
|
||||
Imports DigitalData.Modules.ZooFlow.Constants
|
||||
Imports DigitalData.Modules.Base
|
||||
|
||||
Public Class frmDataResultList
|
||||
Implements IResultForm
|
||||
@@ -61,11 +62,11 @@ Public Class frmDataResultList
|
||||
SplitContainerControl2.SplitterPosition = _Config.Config.SplitContainer2Distance
|
||||
SwitchDetailContainerHorizontal.Checked = _Config.Config.SplitContainer2Horizontal
|
||||
|
||||
If Utils.IsVisibleOnAnyScreen(_Config.Config.WindowLocation) Then
|
||||
If Utils.LocationIsVisible(_Config.Config.WindowLocation) Then
|
||||
If ScreenEx.IsVisibleOnAnyScreen(_Config.Config.WindowLocation) Then
|
||||
If ScreenEx.LocationIsVisible(_Config.Config.WindowLocation) Then
|
||||
Location = _Config.Config.WindowLocation
|
||||
End If
|
||||
If Utils.SizeIsVisible(_Config.Config.WindowSize) Then
|
||||
If ScreenEx.SizeIsVisible(_Config.Config.WindowSize) Then
|
||||
Size = _Config.Config.WindowSize
|
||||
End If
|
||||
End If
|
||||
@@ -236,7 +237,7 @@ Public Class frmDataResultList
|
||||
If oActiveGrid IsNot Nothing Then
|
||||
Dim oGridBand = _ActiveGridBand
|
||||
|
||||
XtraSaveFileDialog.FileName = Utils.ConvertTextToSlug(oGridBand.Caption) & ".xlsx"
|
||||
XtraSaveFileDialog.FileName = StringEx.ConvertTextToSlug(oGridBand.Caption) & ".xlsx"
|
||||
XtraSaveFileDialog.DefaultExt = ".xlsx"
|
||||
|
||||
If XtraSaveFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then
|
||||
|
||||
@@ -6,7 +6,6 @@ Imports DevExpress.XtraGrid.Views.Grid
|
||||
Imports DigitalData.Modules.Base
|
||||
Imports DigitalData.Modules.Config
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.Language
|
||||
Imports DigitalData.Modules.ZooFlow
|
||||
|
||||
Namespace DocumentResultList
|
||||
@@ -124,11 +123,11 @@ Namespace DocumentResultList
|
||||
End Function
|
||||
|
||||
Public Sub LoadWindowLocationAndSize(ByRef pForm As Form)
|
||||
If Utils.IsVisibleOnAnyScreen(Config.Config.WindowLocation) Then
|
||||
If Utils.LocationIsVisible(Config.Config.WindowLocation) Then
|
||||
If ScreenEx.IsVisibleOnAnyScreen(Config.Config.WindowLocation) Then
|
||||
If ScreenEx.LocationIsVisible(Config.Config.WindowLocation) Then
|
||||
pForm.Location = Config.Config.WindowLocation
|
||||
End If
|
||||
If Utils.SizeIsVisible(Config.Config.WindowSize) Then
|
||||
If ScreenEx.SizeIsVisible(Config.Config.WindowSize) Then
|
||||
pForm.Size = Config.Config.WindowSize
|
||||
End If
|
||||
End If
|
||||
|
||||
@@ -112,7 +112,7 @@ Namespace DocumentResultList
|
||||
Try
|
||||
Dim oTempPath = Path.Combine(Path.GetTempPath(), Constants.TEMP_PATH_SUBFOLDER)
|
||||
Dim oDirectory = Directory.CreateDirectory(oTempPath)
|
||||
Dim oFileName = $"{pDocument.Id}-{Now.UnixTimestamp}.{pDocument.Extension}"
|
||||
Dim oFileName = $"{pDocument.Id}-{Now.GetUnixTimestamp}.{pDocument.Extension}"
|
||||
Dim oFilePath = Path.Combine(oTempPath, oFileName)
|
||||
|
||||
Using oMemoryStream As New MemoryStream(pDocument.Contents)
|
||||
|
||||
@@ -63,7 +63,7 @@ Namespace DocumentResultList
|
||||
|
||||
Private Function GetWorkspacePath(pWorkspaceName As String) As String
|
||||
Dim oDirectory = GetWorkspaceDirectoryPath()
|
||||
Dim oFilename As String = Utils.ConvertTextToSlug(pWorkspaceName) & "_" & _UserLanguage & ".xml"
|
||||
Dim oFilename As String = StringEx.ConvertTextToSlug(pWorkspaceName) & "_" & _UserLanguage & ".xml"
|
||||
Return IO.Path.Combine(oDirectory, oFilename)
|
||||
End Function
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ Imports DevExpress.XtraEditors
|
||||
Imports DevExpress.XtraLayout
|
||||
Imports DigitalData.Modules.EDMI.API
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.Language
|
||||
Imports DigitalData.Modules.Base
|
||||
Imports DigitalData.Modules.ZooFlow
|
||||
|
||||
Public Class ctrlObjectPropertyDialog
|
||||
@@ -167,8 +167,8 @@ Public Class ctrlObjectPropertyDialog
|
||||
txtObjectId.Text = oRow.Item("IDB_OBJ_ID")
|
||||
txtCreatedWhen.Text = oRow.Item("ADDED_WHEN")
|
||||
txtCreatedWho.Text = oRow.Item("ADDED_WHO")
|
||||
txtChangedWhen.Text = Utils.NotNull(oRow.Item("CHANGED_WHEN_SUBSTRUCTURE"), String.Empty)
|
||||
txtChangedWho.Text = Utils.NotNull(oRow.Item("CHANGED_WHO_SUBSTRUCTURE"), String.Empty)
|
||||
txtChangedWhen.Text = oRow.ItemEx("CHANGED_WHEN_SUBSTRUCTURE", String.Empty)
|
||||
txtChangedWho.Text = oRow.ItemEx("CHANGED_WHO_SUBSTRUCTURE", String.Empty)
|
||||
|
||||
lbLifecycleStart.Text = DirectCast(oRow.Item("ADDED_WHEN"), Date).ToShortDateString
|
||||
lbLifecycleEnd.Text = Date.MaxValue.ToShortDateString
|
||||
|
||||
@@ -5,7 +5,7 @@ Imports DevExpress.XtraSplashScreen
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.ZooFlow
|
||||
Imports DigitalData.Modules.Language
|
||||
Imports DigitalData.Modules.Base
|
||||
Imports DigitalData.Modules.EDMI.API
|
||||
|
||||
Public Class frmObjectPropertyDialog
|
||||
@@ -195,8 +195,8 @@ Public Class frmObjectPropertyDialog
|
||||
txtObjectId.Text = oRow.Item("IDB_OBJ_ID")
|
||||
txtCreatedWhen.Text = oRow.Item("ADDED_WHEN")
|
||||
txtCreatedWho.Text = oRow.Item("ADDED_WHO")
|
||||
txtChangedWhen.Text = Utils.NotNull(oRow.Item("CHANGED_WHEN"), String.Empty)
|
||||
txtChangedWho.Text = Utils.NotNull(oRow.Item("CHANGED_WHO"), String.Empty)
|
||||
txtChangedWhen.Text = oRow.ItemEx("CHANGED_WHEN", String.Empty)
|
||||
txtChangedWho.Text = oRow.ItemEx("CHANGED_WHO", String.Empty)
|
||||
|
||||
lbLifecycleStart.Text = DirectCast(oRow.Item("ADDED_WHEN"), Date).ToShortDateString
|
||||
lbLifecycleEnd.Text = Date.MaxValue.ToShortDateString
|
||||
|
||||
Reference in New Issue
Block a user