From f3d956f33fe1d262b839a5c64820189475d228dd Mon Sep 17 00:00:00 2001 From: Andy <88590076+AAndyProgram@users.noreply.github.com> Date: Tue, 7 Jun 2022 20:00:36 +0300 Subject: [PATCH] 2022.6.7.0 Fixed some design issues --- SCrawler.Plugin.XVIDEOS/My Project/AssemblyInfo.vb | 4 ++-- SCrawler.Plugin.XVIDEOS/SettingsForm.vb | 1 - SCrawler/API/Instagram/OptionsForm.vb | 2 -- SCrawler/API/Reddit/RedditViewSettingsForm.vb | 2 -- SCrawler/Channels/ChannelViewForm.vb | 3 ++- SCrawler/Channels/ChannelsStatsForm.vb | 2 -- SCrawler/Download/AutoDownloaderEditorForm.vb | 2 -- SCrawler/Download/Groups/GroupEditorForm.vb | 2 -- SCrawler/Editors/CollectionEditorForm.vb | 3 ++- SCrawler/Editors/GlobalSettingsForm.vb | 2 -- SCrawler/Editors/LabelsForm.vb | 2 -- SCrawler/Editors/SiteEditorForm.vb | 2 -- SCrawler/Editors/SiteSelectionForm.vb | 4 ++-- SCrawler/Editors/UserCreatorForm.vb | 1 - SCrawler/FDatePickerForm.vb | 2 +- SCrawler/My Project/AssemblyInfo.vb | 4 ++-- 16 files changed, 11 insertions(+), 27 deletions(-) diff --git a/SCrawler.Plugin.XVIDEOS/My Project/AssemblyInfo.vb b/SCrawler.Plugin.XVIDEOS/My Project/AssemblyInfo.vb index 4ee5d05..75cb7a4 100644 --- a/SCrawler.Plugin.XVIDEOS/My Project/AssemblyInfo.vb +++ b/SCrawler.Plugin.XVIDEOS/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/SCrawler.Plugin.XVIDEOS/SettingsForm.vb b/SCrawler.Plugin.XVIDEOS/SettingsForm.vb index 4ec5106..3f47857 100644 --- 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 diff --git a/SCrawler/API/Instagram/OptionsForm.vb b/SCrawler/API/Instagram/OptionsForm.vb index 71a563f..3b96b4e 100644 --- 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 diff --git a/SCrawler/API/Reddit/RedditViewSettingsForm.vb b/SCrawler/API/Reddit/RedditViewSettingsForm.vb index c892e0c..ee1c689 100644 --- 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 diff --git a/SCrawler/Channels/ChannelViewForm.vb b/SCrawler/Channels/ChannelViewForm.vb index 0fa596b..e3b568f 100644 --- 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 diff --git a/SCrawler/Channels/ChannelsStatsForm.vb b/SCrawler/Channels/ChannelsStatsForm.vb index b51ceb4..a5db274 100644 --- 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 diff --git a/SCrawler/Download/AutoDownloaderEditorForm.vb b/SCrawler/Download/AutoDownloaderEditorForm.vb index 3b7549a..4ee05fa 100644 --- 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 diff --git a/SCrawler/Download/Groups/GroupEditorForm.vb b/SCrawler/Download/Groups/GroupEditorForm.vb index 8bc61ca..17591d6 100644 --- 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 diff --git a/SCrawler/Editors/CollectionEditorForm.vb b/SCrawler/Editors/CollectionEditorForm.vb index 4aacd06..f7b81a7 100644 --- 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) diff --git a/SCrawler/Editors/GlobalSettingsForm.vb b/SCrawler/Editors/GlobalSettingsForm.vb index e910646..17f20fb 100644 --- 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 diff --git a/SCrawler/Editors/LabelsForm.vb b/SCrawler/Editors/LabelsForm.vb index c0bd450..e8b914b 100644 --- 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 diff --git a/SCrawler/Editors/SiteEditorForm.vb b/SCrawler/Editors/SiteEditorForm.vb index a8982b7..bddc7d1 100644 --- 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 diff --git a/SCrawler/Editors/SiteSelectionForm.vb b/SCrawler/Editors/SiteSelectionForm.vb index 0b6fd4b..0db5d19 100644 --- 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 diff --git a/SCrawler/Editors/UserCreatorForm.vb b/SCrawler/Editors/UserCreatorForm.vb index a334c41..48b3896 100644 --- 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 diff --git a/SCrawler/FDatePickerForm.vb b/SCrawler/FDatePickerForm.vb index 7261e94..b044b44 100644 --- 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 diff --git a/SCrawler/My Project/AssemblyInfo.vb b/SCrawler/My Project/AssemblyInfo.vb index c70fe12..3afa04b 100644 --- a/SCrawler/My Project/AssemblyInfo.vb +++ b/SCrawler/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + +