Compare commits

..

No commits in common. "032b28eb98f1380b2e61d7e3b286fdce9b10e6b6" and "6270be7cdfede2baf6bc57a6ba9b7468265a0a2b" have entirely different histories.

6 changed files with 10 additions and 34 deletions

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.9.9.0")>
<Assembly: AssemblyFileVersion("2.9.9.0")>
<Assembly: AssemblyVersion("2.9.8.0")>
<Assembly: AssemblyFileVersion("2.9.8.0")>

View File

@ -733,18 +733,6 @@ Namespace My
Me("vDefaultDeleteLogsTime") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public Property vNIStatusFinished() As Boolean
Get
Return CType(Me("vNIStatusFinished"),Boolean)
End Get
Set
Me("vNIStatusFinished") = value
End Set
End Property
End Class
End Namespace

View File

@ -181,8 +181,5 @@
<Setting Name="vDefaultDeleteLogsTime" Type="System.DateTime" Scope="User">
<Value Profile="(Default)">01/01/0001 03:00:00</Value>
</Setting>
<Setting Name="vNIStatusFinished" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>

View File

@ -1 +0,0 @@
DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@ -159,9 +159,6 @@
<setting name="vDefaultDeleteLogsTime" serializeAs="String">
<value>01/01/0001 03:00:00</value>
</setting>
<setting name="vNIStatusFinished" serializeAs="String">
<value>False</value>
</setting>
</ToolCollection.My.MySettings>
</userSettings>
<applicationSettings>

View File

@ -362,13 +362,13 @@ Public Class frmNIVerknuepfungen
Me.txtSelectAnweisung.Text = ""
'Finaler Index ja nein?
If Me._selectedProfil.finalerIndex <> "" Then
Me.chbxStatusfertig.Checked = My.Settings.vNIStatusFinished
Me.chbxStatusfertig.CheckState = CheckState.Checked
Me.cmbIndex_Statusfertig.Items.Clear()
Me.cmbIndex_Statusfertig.ForeColor = Color.Black
Me.cmbIndex_Statusfertig.Items.Add(Me._selectedProfil.finalerIndex) ' den index eintragen
Me.cmbIndex_Statusfertig.SelectedIndex = 0 ' und direkt auswählen
Else
Me.chbxStatusfertig.Checked = My.Settings.vNIStatusFinished
Me.chbxStatusfertig.CheckState = CheckState.Unchecked
End If
'#### VOLLTEXTINDEXER #####
ElseIf Me._selectedProfil.Ni_Art = "fulltext" Then
@ -1692,11 +1692,9 @@ Public Class frmNIVerknuepfungen
If Not Me._selectedProfil._links.IsSaved Then
SaveLinks()
SaveProfile()
End If
Else
Me._selectedProfil._links.setLinksSaved()
Me._selectedProfil.setSaved()
End If
End If
@ -2383,8 +2381,6 @@ Public Class frmNIVerknuepfungen
Private Sub CheckBox1_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles chbxStatusfertig.CheckedChanged
If Me.chbxStatusfertig.Checked Then
Me.cmbIndex_Statusfertig.Enabled = True
My.Settings.vNIStatusFinished = chbxStatusfertig.Checked
My.Settings.Save()
Try
Me.cmbIndex_Statusfertig.Items.Clear()
Dim indexe = _windream.GetIndicesByObjecttype(Me._selectedProfil.Dokumenttyp.aName, True, "NI")
@ -2397,13 +2393,12 @@ Public Class frmNIVerknuepfungen
cmbIndex_Statusfertig.SelectedIndex = cmbIndex_Statusfertig.FindStringExact(Me._selectedProfil.finalerIndex)
End If
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der windream-Indexe in die Auswahlliste 'cmbIndex_Statusfertig'")
End Try
Else
Me.cmbIndex_Statusfertig.Enabled = False
My.Settings.vNIStatusFinished = chbxStatusfertig.Checked
My.Settings.Save()
If Me._selectedProfil IsNot Nothing Then
Me._selectedProfil.finalerIndex = ""
Me._selectedProfil.setChanged()
@ -2716,10 +2711,10 @@ Public Class frmNIVerknuepfungen
Me._selectedProfil.checkIndexsql = txtCheckIndexSQL.Text
If Not Me._selectedProfil.checkIndexsql = Me._selectedProfil.OriginalcheckIndexsql Then
btnSaveAll.Enabled = True
Me._selectedProfil.setChanged()
End If
If Not Me._selectedProfil.checkIndexsql = Me._selectedProfil.OriginalcheckIndexsql Then
btnSaveAll.Enabled = True
Me._selectedProfil.setChanged()
End If
End If
@ -3595,7 +3590,7 @@ Public Class frmNIVerknuepfungen
End If
Case 2
If Me._selectedProfil IsNot Nothing Then
chbxStatusfertig.Checked = My.Settings.vNIStatusFinished
chbxStatusfertig.Checked = True
End If
End Select