Version 2.0.0.34

Global_Indexer/ClassConfig.vb

@@ -14,6 +14,7 @@ Public Class ClassConfig
     Public Property ProfilePreselection As Boolean = False
     Public Property ShowIndexResult As Boolean = True
     Public Property DeleteOriginalFile As Boolean = False
+    Public Property TopMost As Boolean = True
 
     ' Misc Settings
     Public Property LogErrorsOnly As Boolean = True

Global_Indexer/ClassControls.vb

@@ -2,6 +2,7 @@
 Imports Oracle.ManagedDataAccess.Client
 Imports DigitalData.Controls.LookupGrid
 
+
 Public Class ClassControls
     Private Property Form As frmIndex
     Private Property Panel As Panel
@@ -49,7 +50,7 @@ Public Class ClassControls
             Return chk
         Catch ex As Exception
             LOGGER.Info("Unhandled Exception in AddCheckBox: " & ex.Message)
-            LOGGER.Error(ex.message)
+            LOGGER.Error(ex.Message)
             Return Nothing
         End Try
     End Function
@@ -112,7 +113,7 @@ Public Class ClassControls
             Return oControl
         Catch ex As Exception
             LOGGER.Info(" - Unvorhergesehener Unexpected error in AddVorschlag_ComboBox - Indexname: " & indexname & " - Fehler: " & vbNewLine & ex.Message)
-            LOGGER.Error(ex.message)
+            LOGGER.Error(ex.Message)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Unvorhergesehener Unexpected error in AddVorschlag_ComboBox:")
             Return Nothing
         End Try
@@ -290,13 +291,13 @@ Public Class ClassControls
             End If
         Catch ex As Exception
             LOGGER.Info(" - Unvorhergesehener Unexpected error in Renew_ComboboxResults - Fehler: " & vbNewLine & ex.Message)
-            LOGGER.Error(ex.message)
+            LOGGER.Error(ex.Message)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Unvorhergesehener Unexpected error in Renew_ComboboxResults:")
         End Try
     End Sub
 
-    Public Function AddTextBox(indexname As String, y As Integer, text As String, DataType As String) As TextBox
+    Public Function AddTextBox(indexname As String, y As Integer, text As String, DataType As String) As DevExpress.XtraEditors.TextEdit
-        Dim txt As New TextBox With {
+        Dim oEdit As New DevExpress.XtraEditors.TextEdit With {
             .Name = "txt" & indexname,
             .Size = New Size(260, 27),
             .Location = New Point(11, y),
@@ -306,38 +307,44 @@ Public Class ClassControls
             }
         }
 
-        If text <> "" Then
+        Select Case DataType
-            txt.Text = text
+            Case "INTEGER"
-            txt.Size = New Size(CInt(text.Length * 15), 27)
+                oEdit.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.Numeric
-            txt.SelectAll()
+        End Select
+
+        If text IsNot Nothing Then
+            oEdit.Text = text
+            oEdit.SelectAll()
         End If
-        AddHandler txt.GotFocus, AddressOf OnTextBoxFocus
+
-        AddHandler txt.LostFocus, AddressOf OnTextBoxLostFocus
+        AddHandler oEdit.GotFocus, AddressOf OnTextBoxFocus
-        AddHandler txt.KeyUp, AddressOf OnTextBoxKeyUp
+        AddHandler oEdit.LostFocus, AddressOf OnTextBoxLostFocus
-        AddHandler txt.TextChanged, AddressOf OnTextBoxTextChanged
+        AddHandler oEdit.KeyUp, AddressOf OnTextBoxKeyUp
-        Return txt
+        AddHandler oEdit.TextChanged, AddressOf OnTextBoxTextChanged
+
+        Return oEdit
     End Function
 
     Public Sub OnTextBoxFocus(sender As System.Object, e As System.EventArgs)
-        Dim oTextbox As TextBox = sender
+        Dim oTextbox As DevExpress.XtraEditors.TextEdit = sender
         oTextbox.BackColor = Color.Lime
         oTextbox.SelectAll()
     End Sub
 
     Public Sub OnTextBoxTextChanged(sender As System.Object, e As System.EventArgs)
-        Dim oTextbox As TextBox = sender
+        Dim oTextbox As DevExpress.XtraEditors.TextEdit = sender
         Using oGraphics As Graphics = oTextbox.CreateGraphics()
             oTextbox.Width = oGraphics.MeasureString(oTextbox.Text, oTextbox.Font).Width + 15
         End Using
     End Sub
 
     Public Sub OnTextBoxLostFocus(sender As System.Object, e As System.EventArgs)
-        Dim oTextbox As TextBox = sender
+        Dim oTextbox As DevExpress.XtraEditors.TextEdit = sender
         oTextbox.BackColor = Color.White
     End Sub
 
     Public Sub OnTextBoxKeyUp(sender As System.Object, e As System.Windows.Forms.KeyEventArgs)
-        Dim oTextbox As TextBox = sender
+        Dim oTextbox As DevExpress.XtraEditors.TextEdit = sender
 
         If oTextbox.Text = String.Empty Then
             Exit Sub
@@ -445,7 +452,7 @@ Public Class ClassControls
                 LOGGER.Warn("Error in SQL Command: {0}", SqlCommand)
             End If
 
-            If TypeOf oFoundControl Is TextBox Then
+            If TypeOf oFoundControl Is DevExpress.XtraEditors.TextEdit Then
                 If oDatatable.Rows.Count > 0 Then
                     Dim oFirstRow As DataRow = oDatatable.Rows.Item(0)
 
@@ -453,7 +460,7 @@ Public Class ClassControls
                         Dim oValue = oFirstRow.Item(0).ToString()
 
                         LOGGER.Debug("Setting Value for control [{0}]: [{1}]", oFoundControl.Name, oValue)
-                        DirectCast(oFoundControl, TextBox).Text = oValue
+                        DirectCast(oFoundControl, DevExpress.XtraEditors.TextEdit).Text = oValue
                     End If
                 End If
             ElseIf TypeOf oFoundControl Is LookupControl2 Then

Global_Indexer/My Project/AssemblyInfo.vb

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.0.0.31")>
+<Assembly: AssemblyVersion("2.0.0.34")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

Global_Indexer/frmAdministration.vb

@@ -451,16 +451,6 @@ Public Class frmAdministration
         End Try
     End Sub
 
-    Private Sub SUGGESTIONCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles SUGGESTIONCheckBox.CheckedChanged
-        If frmloaded = True Then
-            If SUGGESTIONCheckBox.CheckState = CheckState.Checked Then
-                btnSQLView.Enabled = True
-            Else
-                btnSQLView.Enabled = False
-            End If
-        End If
-    End Sub
-
     Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged
         Dim oSelectedPageName = XtraTabControl1.SelectedTabPage.Name
 
@@ -1432,6 +1422,14 @@ Public Class frmAdministration
         End If
     End Sub
 
+    Private Sub SUGGESTIONCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles SUGGESTIONCheckBox.CheckedChanged
+        If SUGGESTIONCheckBox.CheckState = CheckState.Checked Then
+            btnSQLView.Enabled = True
+        Else
+            btnSQLView.Enabled = False
+        End If
+    End Sub
+
     Private Sub TBDD_INDEX_MANBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBDD_INDEX_MANBindingSource.CurrentChanged
         If ListBoxControl3.SelectedIndex = -1 Then
             EnableControls(Panel1, False)

Global_Indexer/frmIndex.designer.vb

@@ -34,7 +34,7 @@ Partial Class frmIndex
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.BarToggleSwitchItem1 = New DevExpress.XtraBars.BarToggleSwitchItem()
         Me.BarToggleSwitchItem2 = New DevExpress.XtraBars.BarToggleSwitchItem()
-        Me.BarCheckItem1 = New DevExpress.XtraBars.BarCheckItem()
+        Me.checkItemTopMost = New DevExpress.XtraBars.BarCheckItem()
         Me.checkItemDeleteSource = New DevExpress.XtraBars.BarCheckItem()
         Me.checkItemPreselection = New DevExpress.XtraBars.BarCheckItem()
         Me.labelError = New DevExpress.XtraBars.BarStaticItem()
@@ -142,7 +142,7 @@ Partial Class frmIndex
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarToggleSwitchItem1, Me.BarToggleSwitchItem2, Me.BarCheckItem1, Me.checkItemDeleteSource, Me.checkItemPreselection, Me.labelError, Me.BarStaticItem1, Me.BarStaticItem2, Me.labelFilePath, Me.checkItemPreview, Me.labelNotice, Me.BarListItem1, Me.BarStaticItem4, Me.BarButtonItem1})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarToggleSwitchItem1, Me.BarToggleSwitchItem2, Me.checkItemTopMost, Me.checkItemDeleteSource, Me.checkItemPreselection, Me.labelError, Me.BarStaticItem1, Me.BarStaticItem2, Me.labelFilePath, Me.checkItemPreview, Me.labelNotice, Me.BarListItem1, Me.BarStaticItem4, Me.BarButtonItem1})
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
         Me.RibbonControl1.MaxItemId = 22
         Me.RibbonControl1.Name = "RibbonControl1"
@@ -162,14 +162,14 @@ Partial Class frmIndex
         Me.BarToggleSwitchItem2.Id = 2
         Me.BarToggleSwitchItem2.Name = "BarToggleSwitchItem2"
         '
-        'BarCheckItem1
+        'checkItemTopMost
         '
-        Me.BarCheckItem1.BindableChecked = True
+        Me.checkItemTopMost.BindableChecked = True
-        resources.ApplyResources(Me.BarCheckItem1, "BarCheckItem1")
+        resources.ApplyResources(Me.checkItemTopMost, "checkItemTopMost")
-        Me.BarCheckItem1.Checked = True
+        Me.checkItemTopMost.Checked = True
-        Me.BarCheckItem1.Id = 5
+        Me.checkItemTopMost.Id = 5
-        Me.BarCheckItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarCheckItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.checkItemTopMost.ImageOptions.SvgImage = CType(resources.GetObject("BarCheckItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarCheckItem1.Name = "BarCheckItem1"
+        Me.checkItemTopMost.Name = "checkItemTopMost"
         '
         'checkItemDeleteSource
         '
@@ -267,7 +267,7 @@ Partial Class frmIndex
         'RibbonPageGroup2
         '
         Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarCheckItem1)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.checkItemTopMost)
         Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
         resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
         '
@@ -404,7 +404,7 @@ Partial Class frmIndex
     Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
     Friend WithEvents BarToggleSwitchItem1 As DevExpress.XtraBars.BarToggleSwitchItem
     Friend WithEvents BarToggleSwitchItem2 As DevExpress.XtraBars.BarToggleSwitchItem
-    Friend WithEvents BarCheckItem1 As DevExpress.XtraBars.BarCheckItem
+    Friend WithEvents checkItemTopMost As DevExpress.XtraBars.BarCheckItem
     Friend WithEvents checkItemDeleteSource As DevExpress.XtraBars.BarCheckItem
     Friend WithEvents checkItemPreselection As DevExpress.XtraBars.BarCheckItem
     Friend WithEvents labelError As DevExpress.XtraBars.BarStaticItem

Global_Indexer/frmIndex.resx

@@ -246,7 +246,7 @@
   <data name="BarToggleSwitchItem2.Caption" xml:space="preserve">
     <value>Multi Indexing</value>
   </data>
-  <data name="BarCheckItem1.Caption" xml:space="preserve">
+  <data name="checkItemTopMost.Caption" xml:space="preserve">
     <value>Andere Fenster überdecken</value>
   </data>
   <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -766,10 +766,10 @@
   <data name="&gt;&gt;BarToggleSwitchItem2.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarToggleSwitchItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;BarCheckItem1.Name" xml:space="preserve">
+  <data name="&gt;&gt;checkItemTopMost.Name" xml:space="preserve">
-    <value>BarCheckItem1</value>
+    <value>checkItemTopMost</value>
   </data>
-  <data name="&gt;&gt;BarCheckItem1.Type" xml:space="preserve">
+  <data name="&gt;&gt;checkItemTopMost.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;checkItemDeleteSource.Name" xml:space="preserve">

Global_Indexer/frmIndex.vb

@@ -281,7 +281,7 @@ Public Class frmIndex
             For Each oControl As Control In Me.pnlIndex.Controls
                 ' MsgBox(ctrl.Name)
                 If oControl.Name.StartsWith("txt") Then
-                    Dim box As TextBox = oControl
+                    Dim box As DevExpress.XtraEditors.TextEdit = oControl
                     If box.Text = "" Then
                         Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & dokartid & " AND NAME = '" & Replace(box.Name, "txt", "") & "'", MyConnectionString, True)
                         If optional_index = False Then
@@ -491,29 +491,22 @@ Public Class frmIndex
                         Else
 
                             If optional_index = True Then
-                                Dim result As MsgBoxResult
+                                oNamenkonvention = oNamenkonvention.Replace("-" & oElement.Value & "-", "-")
+                                oNamenkonvention = oNamenkonvention.Replace("_" & oElement.Value & "_", "_")
+                                oNamenkonvention = oNamenkonvention.Replace("_" & oElement.Value & "-", "_")
+                                oNamenkonvention = oNamenkonvention.Replace("-" & oElement.Value & "_", "-")
 
-                                'If USER_LANGUAGE = "de-DE" Then
+                                oNamenkonvention = oNamenkonvention.Replace("-" & oElement.Value, "-")
-                                '    result = MessageBox.Show("Achtung der optionale Index ist leer, wird aber für die Benennung der Datei benutzt." & vbNewLine & "Wollen Sie stattdessen den Originaldateinamen verwenden?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                                oNamenkonvention = oNamenkonvention.Replace("_" & oElement.Value, "_")
-                                'Else
+                                oNamenkonvention = oNamenkonvention.Replace(oElement.Value & "-", "-")
-                                '    result = MessageBox.Show("Attention: optional index is empty, but is being used in renaming the file." & vbNewLine & "Do you want to use the original filename instead?", "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                                oNamenkonvention = oNamenkonvention.Replace(oElement.Value & "_", "_")
-                                'End If
+
+                                oNamenkonvention = oNamenkonvention.Replace(oElement.Value, oManValue)
 
-                                'If result = MsgBoxResult.Yes Then
-                                '    oNamenkonvention = oNamenkonvention.Replace(oElement.Value, System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE))
-                                '    NewFileString = oNamenkonvention
-                                '    sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString
-                                '    AnzahlIndexe += 1
-                                '    sql_history_Index_Values = sql_history_Index_Values & ", '" & System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE).Replace("'", "''") & "'"
-                                'Else
-                                oNamenkonvention = oNamenkonvention.Replace("_" & oElement.Value, oManValue)
-                                oNamenkonvention = oNamenkonvention.Replace("-" & oElement.Value, oManValue)
                                 NewFileString = oNamenkonvention
                                 sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString
                                 AnzahlIndexe += 1
                                 sql_history_Index_Values = sql_history_Index_Values & ", '" & oManValue.Replace("'", "''") & "'"
-                                ' End If
-
                             Else
                                 LOGGER.Debug("Der Indexvalue für Index '" & Indexname & "' ist String.Empty")
                                 err = True
@@ -1439,8 +1432,6 @@ Public Class frmIndex
                     End If
                 End If
 
-                BarCheckItem1.Checked = TopMost
-
                 labelFilePath.Caption = CURRENT_WORKFILE
 
                 ClassWindowLocation.LoadFormLocationSize(Me)
@@ -1491,7 +1482,6 @@ Public Class frmIndex
     End Sub
 
     Private Sub frmIndex_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown
-        'Me.TopMost = True
         Me.BringToFront()
         Me.Focus()
         Me.Cursor = Cursors.Default
@@ -1502,6 +1492,9 @@ Public Class frmIndex
         checkItemDeleteSource.Enabled = True
         checkItemDeleteSource.Checked = CONFIG.Config.DeleteOriginalFile
 
+        checkItemTopMost.Checked = CONFIG.Config.TopMost
+        TopMost = CONFIG.Config.TopMost
+
         FormLoaded = True
 
         Try
@@ -2454,6 +2447,8 @@ Public Class frmIndex
                     End If
                 End If
             Next sonderChar
+            oNewFullPath = WINDREAM.GetCleanedPath(oNewFullPath)
+
             LOGGER.Info("Fullpath (ohne SZ) '" & oNewFullpath & "'")
             If Directory.Exists(oNewFullpath) = False Then
                 Try
@@ -2466,7 +2461,6 @@ Public Class frmIndex
                     MsgBox("Attention: Root Folder '" & oNewFullpath & "' could not be created." & vbNewLine & ex.Message, MsgBoxStyle.Critical)
                     Return False
                 End Try
-
             End If
 
             CURRENT_NEWFILENAME = Path.Combine(oNewFullpath, Path.GetFileName(CURRENT_NEWFILENAME))
@@ -2546,8 +2540,12 @@ Public Class frmIndex
         End If
     End Sub
 
-    Private Sub BarCheckItem1_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarCheckItem1.CheckedChanged
+    Private Sub BarCheckItem1_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkItemTopMost.CheckedChanged
-        TopMost = BarCheckItem1.Checked
+        If FormLoaded = True Then
+            TopMost = checkItemTopMost.Checked
+            CONFIG.Config.TopMost = checkItemTopMost.Checked
+            CONFIG.Save()
+        End If
     End Sub
 
     Private Sub checkItemDeleteSource_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkItemDeleteSource.CheckedChanged
@@ -2673,4 +2671,8 @@ Public Class frmIndex
         CONFIG.Config.ProfilePreselection = checkItemPreselection.Checked
         CONFIG.Save()
     End Sub
+
+    Private Sub frmIndex_RightToLeftChanged(sender As Object, e As EventArgs) Handles Me.RightToLeftChanged
+
+    End Sub
 End Class

Global_Indexer/frmStart.vb

@@ -359,7 +359,9 @@ Public Class frmStart
             ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True)
             Unregister_Hotkeys()
             Load_Hotkeys()
+
             Me.Opacity = 30
+            Me.TopMost = True
 
         Catch ex As Exception
             MsgBox("Unexpected Error in Load-Form" & vbNewLine & ex.Message, MsgBoxStyle.Critical)