From 9c8dfd588f450b1e7f5c56bb9bb51debdb8cfcb3 Mon Sep 17 00:00:00 2001 From: t0815 <10379828+t0815@users.noreply.github.com> Date: Thu, 22 Aug 2024 00:06:08 +0200 Subject: [PATCH] fix trigger page changed when changing page and imagetask updates controls --- MyCBZ/App.config | 2 +- MyCBZ/Forms/MainForm.cs | 5 +++-- MyCBZ/Win_CBZ.csproj | 2 +- MyCBZ/Win_CBZSettings.Designer.cs | 2 +- MyCBZ/Win_CBZSettings.settings | 2 +- Readme.md | 2 +- Win_CBZ-Setup/Win_CBZ-Setup.vdproj | 6 +++--- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/MyCBZ/App.config b/MyCBZ/App.config index 4770162..4da3cd3 100644 --- a/MyCBZ/App.config +++ b/MyCBZ/App.config @@ -135,7 +135,7 @@ - 0.19.144b + 0.19.145b diff --git a/MyCBZ/Forms/MainForm.cs b/MyCBZ/Forms/MainForm.cs index 61b91b6..ee04ec2 100644 --- a/MyCBZ/Forms/MainForm.cs +++ b/MyCBZ/Forms/MainForm.cs @@ -5505,6 +5505,7 @@ private void TextBoxResizeW_TextChanged(object sender, EventArgs e) if (selectedImageTasks != null) { + Page selectedPage = PagesList.SelectedItem?.Tag as Page; Page page = Program.ProjectModel.GetPageById(selectedImageTasks.PageId); oldValue = page?.ImageTask.ImageAdjustments.ResizeTo.X; @@ -5524,7 +5525,7 @@ private void TextBoxResizeW_TextChanged(object sender, EventArgs e) selectedImageTasks.ImageAdjustments.ResizeTo = new Point(w, selectedImageTasks.ImageAdjustments.ResizeTo.Y); - if (page != null && oldValue != selectedImageTasks.ImageAdjustments.ConvertType) + if (page != null && oldValue != selectedImageTasks.ImageAdjustments.ResizeTo.X) { AppEventHandler.OnPageChanged(this, new PageChangedEvent(page, null, PageChangedEvent.IMAGE_STATUS_CHANGED, true)); AppEventHandler.OnArchiveStatusChanged(this, new CBZArchiveStatusEvent(Program.ProjectModel, CBZArchiveStatusEvent.ARCHIVE_FILE_UPDATED)); @@ -5557,7 +5558,7 @@ private void TextBoxResizeH_TextChanged(object sender, EventArgs e) selectedImageTasks.ImageAdjustments.ResizeTo = new Point(selectedImageTasks.ImageAdjustments.ResizeTo.X, h); - if (page != null && oldValue != selectedImageTasks.ImageAdjustments.ConvertType) + if (page != null && oldValue != selectedImageTasks.ImageAdjustments.ResizeTo.Y) { AppEventHandler.OnPageChanged(this, new PageChangedEvent(page, null, PageChangedEvent.IMAGE_STATUS_CHANGED, true)); AppEventHandler.OnArchiveStatusChanged(this, new CBZArchiveStatusEvent(Program.ProjectModel, CBZArchiveStatusEvent.ARCHIVE_FILE_UPDATED)); diff --git a/MyCBZ/Win_CBZ.csproj b/MyCBZ/Win_CBZ.csproj index 1289581..828d86e 100644 --- a/MyCBZ/Win_CBZ.csproj +++ b/MyCBZ/Win_CBZ.csproj @@ -21,7 +21,7 @@ false true 0 - 0.19.144.%2a + 0.19.145.%2a false true false diff --git a/MyCBZ/Win_CBZSettings.Designer.cs b/MyCBZ/Win_CBZSettings.Designer.cs index a12fd87..bd712e3 100644 --- a/MyCBZ/Win_CBZSettings.Designer.cs +++ b/MyCBZ/Win_CBZSettings.Designer.cs @@ -37,7 +37,7 @@ public string TempFolderPath { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0.19.144b")] + [global::System.Configuration.DefaultSettingValueAttribute("0.19.145b")] public string Version { get { return ((string)(this["Version"])); diff --git a/MyCBZ/Win_CBZSettings.settings b/MyCBZ/Win_CBZSettings.settings index 33adaad..dd99ad5 100644 --- a/MyCBZ/Win_CBZSettings.settings +++ b/MyCBZ/Win_CBZSettings.settings @@ -6,7 +6,7 @@ %APPDATA%\WIN_CBZ\Temp\ - 0.19.144b + 0.19.145b <?xml version="1.0" encoding="utf-16"?> diff --git a/Readme.md b/Readme.md index cd6e1ee..b912c42 100644 --- a/Readme.md +++ b/Readme.md @@ -48,7 +48,7 @@ Microsoft Visual Studio [Community] 2022 (64-Bit) ## Latest Release -v0.19.144b released! +v0.19.145b released! ## Third party components diff --git a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj index a3954a1..28b53ce 100644 --- a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj +++ b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj @@ -248,15 +248,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Win_CBZ" - "ProductCode" = "8:{3E63B11B-A4EE-480C-86E9-236DF3D62037}" - "PackageCode" = "8:{73359F68-9711-45C8-8D42-5197E9AB743E}" + "ProductCode" = "8:{9D11D719-8537-4341-8BE4-9ABCA4E58D29}" + "PackageCode" = "8:{BD1EC95C-4E8C-453D-93A0-507CD62E1086}" "UpgradeCode" = "8:{66FAEF81-1CAE-4971-9E0F-796310EFEA5E}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:0.19.144" + "ProductVersion" = "8:0.19.145" "Manufacturer" = "8:Trash_s0Ft" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:"