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

Compare commits

base: AppStd:75bfd81ad4b4212d74331a85c65da0f95b8575fd
Branches Tags
AppStd:master AppStd:Design AppStd:Limilabs AppStd:Redesign
...
compare: AppStd:6cc19c72a5ad418b22321059ca1bacc99b153785
Branches Tags
AppStd:master AppStd:Design AppStd:Limilabs AppStd:Redesign

4 Commits
75bfd81ad4 ... 6cc19c72a5

Author SHA1 Message Date
Jonathan Jenne
6cc19c72a5 Version 2.6.8.1 2023-12-20 09:23:17 +01:00
Jonathan Jenne
349351ba82 Automatically set focus to profile select or first control 2023-12-20 09:22:52 +01:00
Jonathan Jenne
65ad9de1e2 Version 2.6.8.0 2023-12-19 10:12:27 +01:00
Jonathan Jenne
64a6cba017 add keybinding for profile selector 2023-12-19 10:12:05 +01:00
9 changed files with 31 additions and 25 deletions
Expand all files Collapse all files

4
Global_Indexer/ClassPatterns.vb
View File

@@ -1,7 +1,7 @@
Imports System.Text.RegularExpressions
Imports DevExpress.XtraEditors
Imports DigitalData.Controls.LookupGrid
Imports DigitalData.Modules.Language
Imports DigitalData.Modules.Base
Imports DigitalData.GUIs.GlobalIndexer
Imports WINDREAMLib
@@ -240,7 +240,7 @@ Public Class ClassPatterns
LOGGER.Warn("Lookup Control with [{0}] is not supported!", oFoundType)
End Select
Else
oValue = Utils.NotNull(oLookupControl.Properties.SelectedValues.Item(0), "")
oValue = ObjectEx.NotNull(oLookupControl.Properties.SelectedValues.Item(0), "")
End If
Catch ex As Exception
LOGGER.Error(ex)

6
Global_Indexer/Global_Indexer.vbproj
View File

@@ -178,12 +178,6 @@
<Reference Include="DigitalData.Modules.Database">
<HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
</Reference>
<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.License">
<HintPath>..\..\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
</Reference>

4
Global_Indexer/My Project/AssemblyInfo.vb
View File

@@ -15,7 +15,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("File Flow")>
<Assembly: AssemblyCopyright("Copyright © 2023")>
<Assembly: AssemblyTrademark("2.6.7.3")>
<Assembly: AssemblyTrademark("2.6.8.1")>
<Assembly: ComVisible(False)>
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.6.7.3")>
<Assembly: AssemblyVersion("2.6.8.1")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguageAttribute("")>

2
Global_Indexer/frmIndex.designer.vb generated
View File

@@ -97,6 +97,7 @@ Partial Class frmIndex
'SplitContainer1.Panel2
'
Me.SplitContainer1.Panel2.Controls.Add(Me.DocumentViewer1)
Me.SplitContainer1.TabStop = False
'
'pnlIndex
'
@@ -274,6 +275,7 @@ Partial Class frmIndex
resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1")
Me.DocumentViewer1.FileLoaded = False
Me.DocumentViewer1.Name = "DocumentViewer1"
Me.DocumentViewer1.TabStop = False
'
'BarToggleSwitchItem1
'

10
Global_Indexer/frmIndex.resx
View File

@@ -139,7 +139,7 @@
<value>636, 433</value>
</data>
<data name="pnlIndex.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
<value>2</value>
</data>
<data name="pnlIndex.Visible" type="System.Boolean, mscorlib">
<value>False</value>
@@ -424,7 +424,7 @@
<value>441, 18</value>
</data>
<data name="checkMultiindex.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
<value>3</value>
</data>
<data name="&gt;&gt;checkMultiindex.Name" xml:space="preserve">
<value>checkMultiindex</value>
@@ -468,7 +468,7 @@
<value>183, 44</value>
</data>
<data name="btnOK.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
<value>4</value>
</data>
<data name="btnOK.Text" xml:space="preserve">
<value>Datei verarbeiten</value>
@@ -565,7 +565,7 @@
<value>636, 30</value>
</data>
<data name="ComboboxDoctype.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
<value>1</value>
</data>
<data name="&gt;&gt;ComboboxDoctype.Name" xml:space="preserve">
<value>ComboboxDoctype</value>
@@ -637,7 +637,7 @@
<value>636</value>
</data>
<data name="SplitContainer1.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
<value>0</value>
</data>
<data name="&gt;&gt;SplitContainer1.Name" xml:space="preserve">
<value>SplitContainer1</value>

14
Global_Indexer/frmIndex.vb
View File

@@ -1738,6 +1738,7 @@ Public Class frmIndex
_Logger.Info("Setting Last Saved DocType: {0}", CURRENT_LASTDOKART)
ComboboxDoctype.EditValue = oFoundDocType
ComboboxDoctype.SelectNextControl(ComboboxDoctype, forward:=True, tabStopOnly:=True, nested:=True, wrap:=False)
End If
End If
@@ -1762,12 +1763,18 @@ Public Class frmIndex
If oFoundDocType IsNot Nothing Then
_Logger.Debug("DocType found: [{0}]", oFoundDocType)
ComboboxDoctype.EditValue = oFoundDocType
ComboboxDoctype.SelectNextControl(ComboboxDoctype, forward:=True, tabStopOnly:=True, nested:=True, wrap:=False)
Exit For
End If
End If
Next
End If
If ComboboxDoctype.EditValue Is Nothing Then
ComboboxDoctype.Select()
End If
Catch ex As Exception
ShowErrorMessage(ex, "Form Shown")
End Try
@@ -2927,4 +2934,11 @@ Public Class frmIndex
MsgBox(ex.Message)
End Try
End Sub
Private Sub ComboboxDoctype_KeyUp(sender As Object, e As KeyEventArgs) Handles ComboboxDoctype.KeyUp
If e.KeyCode = Keys.F2 Then
Dim oCombo As SearchLookUpEdit = sender
oCombo.ShowPopup()
End If
End Sub
End Class

2
Global_Indexer/frmStart.resx
View File

@@ -606,7 +606,7 @@
<value>True</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>203</value>
<value>90</value>
</metadata>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>294, 161</value>

13
Global_Indexer/frmStart.vb
View File

@@ -1,12 +1,9 @@
Imports System.IO
Imports Microsoft.Office.Interop
Imports System.Text
Imports System.Globalization
Imports System.Threading
Imports System.Runtime.InteropServices
Imports DigitalData.Modules.Language
Imports DigitalData.Modules.Windows
Imports DigitalData.Modules.License
Imports DigitalData.Modules.Base
Imports DigitalData.GUIs.Common
Public Class frmStart
@@ -250,10 +247,10 @@ Public Class frmStart
End If
End If
For Each Filerow As DataRow In DTACTUAL_FILES.Rows
Dim oFileString As String = Filerow.Item("FILENAME2WORK")
Dim oFileGuid = Filerow.Item("GUID")
Dim oFileHash = Utils.NotNull(Filerow.Item("FILE_HASH"), "")
For Each oRow As DataRow In DTACTUAL_FILES.Rows
Dim oFileString As String = oRow.Item("FILENAME2WORK")
Dim oFileGuid = oRow.Item("GUID")
Dim oFileHash = oRow.ItemEx("FILE_HASH", "")
LOGGER.Info("Processing user file {0}", oFileString)
CURRENT_FILENAME = oFileString

1
SetupVS19/Product.wxs
View File

@@ -112,7 +112,6 @@
<File Id="Base" Name="DigitalData.Modules.Base.dll" Source="DigitalData.Modules.Base.dll" KeyPath="no" />
<File Id="Config" Name="DigitalData.Modules.Config.dll" Source="DigitalData.Modules.Config.dll" KeyPath="no" />
<File Id="Database" Name="DigitalData.Modules.Database.dll" Source="DigitalData.Modules.Database.dll" KeyPath="no" />
<File Id="Language" Name="DigitalData.Modules.Language.dll" Source="DigitalData.Modules.Language.dll" KeyPath="no" />
<File Id="License" Name="DigitalData.Modules.License.dll" Source="DigitalData.Modules.License.dll" KeyPath="no" />
<File Id="Logging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll" KeyPath="yes" />
<File Id="Messaging" Name="DigitalData.Modules.Messaging.dll" Source="DigitalData.Modules.Messaging.dll" KeyPath="no" />