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

fix: depending controls in administration (multiselect, sql editor), save topmost to config

Browse Source
This commit is contained in:
Jonathan Jenne 2020-05-18 11:12:22 +02:00
parent 98663d3c4a
commit a00cc1a39e
5 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Global_Indexer/ClassConfig.vb
View File

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

18
Global_Indexer/frmAdministration.vb
View File

@ -451,16 +451,6 @@ Public Class frmAdministration
End Try End Try
End Sub 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 Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged
Dim oSelectedPageName = XtraTabControl1.SelectedTabPage.Name Dim oSelectedPageName = XtraTabControl1.SelectedTabPage.Name
@ -1432,6 +1422,14 @@ Public Class frmAdministration
End If End If
End Sub 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 Private Sub TBDD_INDEX_MANBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBDD_INDEX_MANBindingSource.CurrentChanged
If ListBoxControl3.SelectedIndex = -1 Then If ListBoxControl3.SelectedIndex = -1 Then
EnableControls(Panel1, False) EnableControls(Panel1, False)

22
Global_Indexer/frmIndex.designer.vb generated
View File

@ -34,7 +34,7 @@ Partial Class frmIndex
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
Me.BarToggleSwitchItem1 = New DevExpress.XtraBars.BarToggleSwitchItem() Me.BarToggleSwitchItem1 = New DevExpress.XtraBars.BarToggleSwitchItem()
Me.BarToggleSwitchItem2 = 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.checkItemDeleteSource = New DevExpress.XtraBars.BarCheckItem()
Me.checkItemPreselection = New DevExpress.XtraBars.BarCheckItem() Me.checkItemPreselection = New DevExpress.XtraBars.BarCheckItem()
Me.labelError = New DevExpress.XtraBars.BarStaticItem() Me.labelError = New DevExpress.XtraBars.BarStaticItem()
@ -142,7 +142,7 @@ Partial Class frmIndex
'RibbonControl1 'RibbonControl1
' '
Me.RibbonControl1.ExpandCollapseItem.Id = 0 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") resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.MaxItemId = 22 Me.RibbonControl1.MaxItemId = 22
Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Name = "RibbonControl1"
@ -162,14 +162,14 @@ Partial Class frmIndex
Me.BarToggleSwitchItem2.Id = 2 Me.BarToggleSwitchItem2.Id = 2
Me.BarToggleSwitchItem2.Name = "BarToggleSwitchItem2" 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 'checkItemDeleteSource
' '
@ -267,7 +267,7 @@ Partial Class frmIndex
'RibbonPageGroup2 'RibbonPageGroup2
' '
Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
Me.RibbonPageGroup2.ItemLinks.Add(Me.BarCheckItem1) Me.RibbonPageGroup2.ItemLinks.Add(Me.checkItemTopMost)
Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
' '
@ -404,7 +404,7 @@ Partial Class frmIndex
Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
Friend WithEvents BarToggleSwitchItem1 As DevExpress.XtraBars.BarToggleSwitchItem Friend WithEvents BarToggleSwitchItem1 As DevExpress.XtraBars.BarToggleSwitchItem
Friend WithEvents BarToggleSwitchItem2 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 checkItemDeleteSource As DevExpress.XtraBars.BarCheckItem
Friend WithEvents checkItemPreselection As DevExpress.XtraBars.BarCheckItem Friend WithEvents checkItemPreselection As DevExpress.XtraBars.BarCheckItem
Friend WithEvents labelError As DevExpress.XtraBars.BarStaticItem Friend WithEvents labelError As DevExpress.XtraBars.BarStaticItem

8
Global_Indexer/frmIndex.resx
View File

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

18
Global_Indexer/frmIndex.vb
View File

@ -1432,8 +1432,6 @@ Public Class frmIndex
End If End If
End If End If
BarCheckItem1.Checked = TopMost
labelFilePath.Caption = CURRENT_WORKFILE labelFilePath.Caption = CURRENT_WORKFILE
ClassWindowLocation.LoadFormLocationSize(Me) ClassWindowLocation.LoadFormLocationSize(Me)
@ -1484,7 +1482,6 @@ Public Class frmIndex
End Sub End Sub
Private Sub frmIndex_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown Private Sub frmIndex_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown
'Me.TopMost = True
Me.BringToFront() Me.BringToFront()
Me.Focus() Me.Focus()
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
@ -1495,6 +1492,9 @@ Public Class frmIndex
checkItemDeleteSource.Enabled = True checkItemDeleteSource.Enabled = True
checkItemDeleteSource.Checked = CONFIG.Config.DeleteOriginalFile checkItemDeleteSource.Checked = CONFIG.Config.DeleteOriginalFile
checkItemTopMost.Checked = CONFIG.Config.TopMost
TopMost = CONFIG.Config.TopMost
FormLoaded = True FormLoaded = True
Try Try
@ -2540,8 +2540,12 @@ Public Class frmIndex
End If End If
End Sub 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 End Sub
Private Sub checkItemDeleteSource_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkItemDeleteSource.CheckedChanged Private Sub checkItemDeleteSource_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkItemDeleteSource.CheckedChanged
@ -2667,4 +2671,8 @@ Public Class frmIndex
CONFIG.Config.ProfilePreselection = checkItemPreselection.Checked CONFIG.Config.ProfilePreselection = checkItemPreselection.Checked
CONFIG.Save() CONFIG.Save()
End Sub End Sub
Private Sub frmIndex_RightToLeftChanged(sender As Object, e As EventArgs) Handles Me.RightToLeftChanged
End Sub
End Class End Class