2022.6.7.0

Fixed some design issues
2026-03-14 15:52:18 +00:00 · 2022-06-07 20:00:36 +03:00
parent 4a5e050201
commit f3d956f33f
16 changed files with 11 additions and 27 deletions
--- a/SCrawler.Plugin.XVIDEOS/My
+++ b/SCrawler.Plugin.XVIDEOS/My
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("2022.6.6.0")>
-<Assembly: AssemblyFileVersion("2022.6.6.0")>
+<Assembly: AssemblyVersion("2022.6.7.0")>
+<Assembly: AssemblyFileVersion("2022.6.7.0")>
 <Assembly: NeutralResourcesLanguage("en")>
--- a/SCrawler.Plugin.XVIDEOS/SettingsForm.vb
+++ b/SCrawler.Plugin.XVIDEOS/SettingsForm.vb
@@ -21,7 +21,6 @@ Public Class SettingsForm : Implements IOkCancelToolbar
            With MyDefs
                .MyViewInitialize(Me, Settings.Design, True)
                .AddOkCancelToolbar()
-                .DelegateClosingChecker()
                If Settings.Domains.Count > 0 Then Settings.Domains.ForEach(Sub(d) LIST_DOMAINS.Items.Add(d))
                .EndLoaderOperations()
            End With
--- a/SCrawler/API/Instagram/OptionsForm.vb
+++ b/SCrawler/API/Instagram/OptionsForm.vb
@@ -21,8 +21,6 @@ Namespace API.Instagram
            With MyDefs
                .MyViewInitialize(Me, Settings.Design, True)
                .AddOkCancelToolbar()
-                .DelegateClosingChecker()
-                .AppendDetectors()
                With MyExchangeOptions
                    CH_GET_STORIES.Checked = .GetStories
                    CH_GET_TAGGED.Checked = .GetTagged
--- a/SCrawler/API/Reddit/RedditViewSettingsForm.vb
+++ b/SCrawler/API/Reddit/RedditViewSettingsForm.vb
@@ -31,8 +31,6 @@ Namespace API.Reddit
                With MyDefs
                    .MyViewInitialize(Me, Settings.Design, True)
                    .AddOkCancelToolbar()
-                    .AppendDetectors()
-                    .DelegateClosingChecker()
                    Select Case MyOptions.ViewMode
                        Case CView.Hot : OPT_VIEW_MODE_HOT.Checked = True
                        Case CView.Top : OPT_VIEW_MODE_TOP.Checked = True
--- a/SCrawler/Channels/ChannelViewForm.vb
+++ b/SCrawler/Channels/ChannelViewForm.vb
@@ -224,7 +224,8 @@ Friend Class ChannelViewForm : Implements IChannelLimits
            .SmallImageList = New ImageList With {.ColorDepth = ColorDepth.Depth32Bit, .ImageSize = s}
        End With
        CMB_CHANNELS.Enabled(False) = Not CMB_CHANNELS.Checked
-        MyDefs.EndLoaderOperations()
+        MyDefs.DelegateClosingChecker = False
+        MyDefs.EndLoaderOperations(False)
        SetLimitsByChannel(, False)
    End Sub
    Private Sub ChannelViewForm_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing
--- a/SCrawler/Channels/ChannelsStatsForm.vb
+++ b/SCrawler/Channels/ChannelsStatsForm.vb
@@ -22,14 +22,12 @@ Friend Class ChannelsStatsForm : Implements IOkCancelDeleteToolbar
            With MyDefs
                .MyViewInitialize(Me, Settings.Design)
                .AddOkCancelToolbar()
-                .DelegateClosingChecker()
                .MyOkCancel.EnableDelete = False
                If Settings.Channels.Count > 0 Then
                    RefillList()
                Else
                    MsgBoxE("Channels not found", vbExclamation)
                End If
-                .AppendDetectors()
                .EndLoaderOperations()
            End With
        Catch ex As Exception
--- a/SCrawler/Download/AutoDownloaderEditorForm.vb
+++ b/SCrawler/Download/AutoDownloaderEditorForm.vb
@@ -69,8 +69,6 @@ Namespace DownloadObjects
                        .AddControl(Of Integer)(TXT_TIMER, TXT_TIMER.CaptionText,, New AutomationTimerChecker)
                        .EndLoaderOperations()
                    End With
-                    .DelegateClosingChecker()
-                    .AppendDetectors()
                    .EndLoaderOperations()
                End If
            End With
--- a/SCrawler/Download/Groups/GroupEditorForm.vb
+++ b/SCrawler/Download/Groups/GroupEditorForm.vb
@@ -46,7 +46,6 @@ Namespace DownloadObjects.Groups
            With MyDefs
                .MyViewInitialize(Me, Settings.Design, True)
                .AddOkCancelToolbar()
-                .DelegateClosingChecker()
                If Not MyGroup Is Nothing Then
                    With MyGroup
                        TXT_NAME.Text = .Name
@@ -59,7 +58,6 @@ Namespace DownloadObjects.Groups
                .MyFieldsChecker = New FieldsChecker
                DirectCast(.MyFieldsChecker, FieldsChecker).AddControl(Of String)(TXT_NAME, TXT_NAME.CaptionText,, New NameChecker(If(MyGroup?.Name, String.Empty)))
                .MyFieldsChecker.EndLoaderOperations()
-                .AppendDetectors()
                .EndLoaderOperations()
            End With
        End Sub
--- a/SCrawler/Editors/CollectionEditorForm.vb
+++ b/SCrawler/Editors/CollectionEditorForm.vb
@@ -28,10 +28,11 @@ Namespace Editors
                With MyDefs
                    .MyViewInitialize(Me, Settings.Design)
                    .AddOkCancelToolbar()
-                    .DelegateClosingChecker()
                    Collections.ListAddList((From c In Settings.Users Where c.IsCollection Select c.CollectionName), LAP.NotContainsOnly, EDP.ThrowException)
                    If Collections.ListExists Then Collections.Sort() : CMB_COLLECTIONS.Items.AddRange(From c In Collections Select New ListItem(c))
                    If Not Collection.IsEmptyString And Collections.Contains(Collection) Then CMB_COLLECTIONS.SelectedIndex = Collections.IndexOf(Collection)
+                    .DelegateClosingChecker = False
+                    .EndLoaderOperations(False)
                End With
            Catch ex As Exception
                MyDefs.InvokeLoaderError(ex)
--- a/SCrawler/Editors/GlobalSettingsForm.vb
+++ b/SCrawler/Editors/GlobalSettingsForm.vb
@@ -30,7 +30,6 @@ Namespace Editors
                With MyDefs
                    .MyViewInitialize(Me, Settings.Design, True)
                    .AddOkCancelToolbar()
-                    .DelegateClosingChecker()
                    With Settings
                        'Basis
                        TXT_GLOBAL_PATH.Text = .GlobalPath.Value
@@ -96,7 +95,6 @@ Namespace Editors
                                                New DownloadObjects.AutoDownloaderEditorForm.AutomationTimerChecker)
                        .EndLoaderOperations()
                    End With
-                    .AppendDetectors()
                    .EndLoaderOperations()
                    ChangeFileNameChangersEnabling()
                End With
--- a/SCrawler/Editors/LabelsForm.vb
+++ b/SCrawler/Editors/LabelsForm.vb
@@ -43,7 +43,6 @@ Friend Class LabelsForm : Implements IOkCancelDeleteToolbar
            With MyDefs
                .MyViewInitialize(Me, Settings.Design)
                .AddOkCancelToolbar(, WithDeleteButton)
-                .DelegateClosingChecker()
                If Source.Count > 0 Then
                    Dim items As New List(Of Integer)
                    CMB_LABELS.BeginUpdate()
@@ -55,7 +54,6 @@ Friend Class LabelsForm : Implements IOkCancelDeleteToolbar
                    CMB_LABELS.EndUpdate()
                    CMB_LABELS.ListCheckedIndexes = items
                End If
-                .AppendDetectors()
                .EndLoaderOperations()
            End With
        Catch ex As Exception
--- a/SCrawler/Editors/SiteEditorForm.vb
+++ b/SCrawler/Editors/SiteEditorForm.vb
@@ -52,7 +52,6 @@ Namespace Editors
                With MyDefs
                    .MyViewInitialize(Me, Settings.Design, True)
                    .AddOkCancelToolbar()
-                    .DelegateClosingChecker()

                    .MyFieldsChecker = New FieldsChecker
                    With Host
@@ -144,7 +143,6 @@ Namespace Editors
                    End With

                    .MyFieldsChecker.EndLoaderOperations()
-                    .AppendDetectors()
                    .EndLoaderOperations()
                End With
            Catch ex As Exception
--- a/SCrawler/Editors/SiteSelectionForm.vb
+++ b/SCrawler/Editors/SiteSelectionForm.vb
@@ -22,7 +22,6 @@ Namespace Editors
        Private Sub SiteSelectionForm_Load(sender As Object, e As EventArgs) Handles Me.Load
            With MyDefs
                .MyViewInitialize(Me, Settings.Design, True)
-                .DelegateClosingChecker()
                .AddOkCancelToolbar()
                CMB_SITES.BeginUpdate()
                Dim sl As List(Of String) = ListAddList(Nothing, Settings.Plugins.Select(Function(p) p.Name))
@@ -32,7 +31,8 @@ Namespace Editors
                sl.Clear()
                CMB_SITES.EndUpdate()
                If l.Count > 0 Then CMB_SITES.ListCheckedIndexes = l : l.Clear()
-                .EndLoaderOperations()
+                .DelegateClosingChecker = False
+                .EndLoaderOperations(False)
                .MyOkCancel.EnableOK = True
            End With
        End Sub
--- a/SCrawler/Editors/UserCreatorForm.vb
+++ b/SCrawler/Editors/UserCreatorForm.vb
@@ -165,7 +165,6 @@ Namespace Editors
                    .MyFieldsChecker = New FieldsChecker
                    DirectCast(.MyFieldsChecker, FieldsChecker).AddControl(Of String)(TXT_USER, TXT_USER.CaptionText)
                    .MyFieldsChecker.EndLoaderOperations()
-                    .AppendDetectors()
                    .EndLoaderOperations()
                End With
            Catch ex As Exception
--- a/SCrawler/FDatePickerForm.vb
+++ b/SCrawler/FDatePickerForm.vb
@@ -26,13 +26,13 @@ Friend Class FDatePickerForm : Implements IOkCancelDeleteToolbar
            With MyDefs
                .MyViewInitialize(Me, Settings.Design, True)
                .AddOkCancelToolbar()
-                .DelegateClosingChecker()
                If _InitialValue.HasValue Then
                    DT.Checked = True
                    DT.Value = _InitialValue.Value.Date
                Else
                    DT.Checked = False
                End If
+                .DelegateClosingChecker = False
                .EndLoaderOperations()
                MyDefs.MyOkCancel.EnableOK = True
            End With
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("2022.6.6.0")>
-<Assembly: AssemblyFileVersion("2022.6.6.0")>
+<Assembly: AssemblyVersion("2022.6.7.0")>
+<Assembly: AssemblyFileVersion("2022.6.7.0")>
 <Assembly: NeutralResourcesLanguage("en")>