From ea49653d4824b88aba7affb57c9e6ec7a2b447f5 Mon Sep 17 00:00:00 2001 From: t0815 <10379828+t0815@users.noreply.github.com> Date: Sat, 21 Sep 2024 05:19:02 +0200 Subject: [PATCH] fix exception updating result, redraw updated page-thumb [#12] --- MyCBZ/App.config | 2 +- MyCBZ/Forms/MainForm.Designer.cs | 66 ++++++++++++---------- MyCBZ/Forms/MainForm.cs | 18 ++++-- MyCBZ/Forms/MainForm.resx | 91 +++++++++++++++--------------- MyCBZ/Models/ProjectModel.cs | 69 ++++++++++++---------- MyCBZ/Properties/AssemblyInfo.cs | 4 +- MyCBZ/Win_CBZSettings.Designer.cs | 2 +- MyCBZ/Win_CBZSettings.settings | 2 +- Readme.md | 2 +- Win_CBZ-Setup/Win_CBZ-Setup.vdproj | 8 +-- 10 files changed, 144 insertions(+), 120 deletions(-) diff --git a/MyCBZ/App.config b/MyCBZ/App.config index 2d20804..270e33e 100644 --- a/MyCBZ/App.config +++ b/MyCBZ/App.config @@ -168,7 +168,7 @@ - 0.21.167b + 0.21.168b diff --git a/MyCBZ/Forms/MainForm.Designer.cs b/MyCBZ/Forms/MainForm.Designer.cs index 382081a..af81835 100644 --- a/MyCBZ/Forms/MainForm.Designer.cs +++ b/MyCBZ/Forms/MainForm.Designer.cs @@ -31,10 +31,10 @@ private void InitializeComponent() { components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); ToolBar = new System.Windows.Forms.ToolStrip(); ToolButtonNew = new System.Windows.Forms.ToolStripButton(); toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); @@ -1548,6 +1548,7 @@ private void InitializeComponent() // CheckBoxSplitOnlyIfDoubleSize // CheckBoxSplitOnlyIfDoubleSize.AutoSize = true; + CheckBoxSplitOnlyIfDoubleSize.Enabled = false; CheckBoxSplitOnlyIfDoubleSize.Location = new System.Drawing.Point(62, 125); CheckBoxSplitOnlyIfDoubleSize.Name = "CheckBoxSplitOnlyIfDoubleSize"; CheckBoxSplitOnlyIfDoubleSize.Size = new System.Drawing.Size(195, 24); @@ -1596,6 +1597,7 @@ private void InitializeComponent() // LabelDetectSplitColor // LabelDetectSplitColor.AutoSize = true; + LabelDetectSplitColor.Enabled = false; LabelDetectSplitColor.Location = new System.Drawing.Point(123, 176); LabelDetectSplitColor.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); LabelDetectSplitColor.Name = "LabelDetectSplitColor"; @@ -1793,6 +1795,7 @@ private void InitializeComponent() // label8 // label8.AutoSize = true; + label8.Enabled = false; label8.Location = new System.Drawing.Point(3, 104); label8.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0); label8.Name = "label8"; @@ -1836,6 +1839,7 @@ private void InitializeComponent() // ComboBoxTaskOrderSplit // ComboBoxTaskOrderSplit.Dock = System.Windows.Forms.DockStyle.Fill; + ComboBoxTaskOrderSplit.Enabled = false; ComboBoxTaskOrderSplit.FormattingEnabled = true; ComboBoxTaskOrderSplit.Items.AddRange(new object[] { "auto", "1", "2", "3", "4" }); ComboBoxTaskOrderSplit.Location = new System.Drawing.Point(147, 102); @@ -2442,40 +2446,40 @@ private void InitializeComponent() // MetaDataGrid // MetaDataGrid.AllowUserToAddRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(224, 224, 224); - MetaDataGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Courier New", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - MetaDataGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(224, 224, 224); + MetaDataGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle6.Font = new System.Drawing.Font("Courier New", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + MetaDataGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; MetaDataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; MetaDataGrid.ContextMenuStrip = DataGridContextMenu; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.Padding = new System.Windows.Forms.Padding(0, 1, 1, 1); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.Gold; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - MetaDataGrid.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle7.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle7.Padding = new System.Windows.Forms.Padding(0, 1, 1, 1); + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.Gold; + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + MetaDataGrid.DefaultCellStyle = dataGridViewCellStyle7; MetaDataGrid.Dock = System.Windows.Forms.DockStyle.Fill; MetaDataGrid.Location = new System.Drawing.Point(2, 50); MetaDataGrid.Margin = new System.Windows.Forms.Padding(2); MetaDataGrid.MultiSelect = false; MetaDataGrid.Name = "MetaDataGrid"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - MetaDataGrid.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + MetaDataGrid.RowHeadersDefaultCellStyle = dataGridViewCellStyle8; MetaDataGrid.RowHeadersWidth = 51; MetaDataGrid.RowTemplate.Height = 26; MetaDataGrid.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; diff --git a/MyCBZ/Forms/MainForm.cs b/MyCBZ/Forms/MainForm.cs index a1b5ab4..47942d2 100644 --- a/MyCBZ/Forms/MainForm.cs +++ b/MyCBZ/Forms/MainForm.cs @@ -1136,8 +1136,18 @@ private void OnRedrawThumbnail(object sender, RedrawThumbEvent e) { Invoke(new Action(() => { - ThumbnailPagesSlice.Add(e.Page); - RequestImageInfoSlice(); + e.Page.ThumbnailInvalidated = true; + int pageIndex = PageThumbsListBox.Items.IndexOf(e.Page); + if (pageIndex > -1) + { + if (PageImages.Images.ContainsKey(e.Page.Id)) + { + PageImages.Images.RemoveByKey(e.Page.Id); + } + PageThumbsListBox.Items[pageIndex] = e.Page; + } + PageThumbsListBox.Invalidate(); + PageThumbsListBox.Refresh(); })); } } @@ -1261,7 +1271,7 @@ public void LoadThumbnailSlice(object threadParams) { try { - if (!page.Closed) + if (!page.Closed && !page.Deleted) { if (!PageImages.Images.ContainsKey(page.Id)) { @@ -5940,7 +5950,7 @@ private void HandleImageAdjustmentsChanged(object sender, ImageAdjustmentsChange if (e.PageId != null && e.PageId != "") { Page page = Program.ProjectModel.GetPageById(e.PageId); - if (page != null && page.Id == ((Page)PagesList.SelectedItem.Tag).Id) + if (page != null && PagesList.SelectedItem != null && page.Id == ((Page)PagesList.SelectedItem.Tag).Id) { updateCtls = RadioApplyAdjustmentsPage.Checked; } diff --git a/MyCBZ/Forms/MainForm.resx b/MyCBZ/Forms/MainForm.resx index 66b4bac..bf2f7a8 100644 --- a/MyCBZ/Forms/MainForm.resx +++ b/MyCBZ/Forms/MainForm.resx @@ -140,7 +140,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAbgoAAAJNU0Z0AUkBTAIBAQMB - AAFwAScBcAEnARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMAAUADAAEQAwABAQEAAQgG + AAGQAScBkAEnARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMAAUADAAEQAwABAQEAAQgG AAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEAAfABygGmAQABMwUAATMB AAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEAAYABfAH/AQACUAH/AQAB kwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFmAwABmQMAAcwCAAEzAwAC @@ -198,7 +198,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAXj4AAAJNU0Z0AUkBTAIBAREB - AAFwAScBcAEnARgBAAEYAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABYAMAAXgDAAEBAQABGAYAAYf/ + AAGQAScBkAEnARgBAAEYAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABYAMAAXgDAAEBAQABGAYAAYf/ AP8A/wB4AALUAdUDJzYlAycD1d4AA70DJTa9AyUDvt4AA70DJRIAA/8B5QHzAfYBvAHqAfMBvAHqAfMB 5QHzAfYD/xIAAyUDvt4AA70DJQ8AAfQB+AH5AVAB2gH0AQAB0gH6AQAB0gH6AQAB0gH6AQAB0gH6AVAB 2gL0AfgB+Q8AAyUDvt4AA70DJQwAAfoC+wEuAdcB9wEAAdIB+gHMAe0C9AH4AfkB9AH4AfkBzAHtAfQB @@ -469,9 +469,6 @@ 801, 62 - - 439, 103 - 750, 21 @@ -500,7 +497,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAIicAAAJNU0Z0AUkBTAIBAQ8B - AAHIAQcByAEHARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAAUADAAEBAQABIAYAAUD/ + AAHoAQcB6AEHARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAAUADAAEBAQABIAYAAUD/ ABsAA0wBkAMlAf8DYgHhCAADJAE0AyUB/wMlAf8DKgE/YAABVQJXAbEBXAJlAecBKwJ+AfwBKwJ+AfwB XAJlAecBVQJXAbFkAAMyAU8DJQH/AyUB/wMaASQEAAQCA1kB7wMlAf8DRgGAJAADBgEIA0EBcgNbAc0D XAH4A1wB+ANbAc0DQQFyAwYBCBwAAUACQQFxAQAB0gH6Af8BAAHSAfoB/wEAAdIB+gH/AQAB0gH6Af8B @@ -518,14 +515,14 @@ JQH/AyUB/wMlAf8DJQH/AyUB/wNcAfgMAANBAfkDJQH/Az0BZwMzAVABWgJjAekBWgJjAekDMwFQAzUB VgMXAR8DNgFXA1oBxANaAcQDOQFeAxgBIFQAA1kBxgMlAf8DVAGrCAADPgFqAyUB/wNNAfoDCgENFAAD XAH4AwcBCRAAAyUB/wMlAf8DJQH/AyUB/wMlAf8DXAH4DAADYAHgAyUB/wNhAeYDPQFnAyMBMwMjATMD - NgFYA2AB4AM9AWkDVwH+AyUB/wMlAf8DVwH+Az0BaUwAAxYBHgMqAT8DUwGqAyUB/wNhAesDKgE/AyoB + NgFYA2AB4AM9AWkDWwH+AyUB/wMlAf8DWwH+Az0BaUwAAxYBHgMqAT8DUwGqAyUB/wNhAesDKgE/AyoB PwM7AWQDJQH/AyUB/wNAAXEDKgE/AxQBGwwAA1sBzQMpAT0QAAMlAf8DJQH/AyUB/wMlAf8DJQH/A1sB zQwAAzwBZgNbAcoDRAF6Ay4BSAMwAUsDRAF6A1sBygM8AWYDYQHmAyUB/wMlAf8DJQH/AyUB/wNhAeZM AAMzAVEDJQH/AyUB/wMlAf8DJQH/AyUB/wMlAf8DJQH/AyUB/wMlAf8DJQH/AyUB/wNOAZcMAANBAXID VQGuEAADJQH/AyUB/wMlAf8DJQH/AyUB/wNBAXIQAAMXAR8DNgFXA1oBxANaAcQDOQFeAxgBIAQAA1oB 9QMlAf8DJQH/AyUB/wMlAf8DWgH1TAADDgESAysB/AMlAf8DJQH/AyUB/wMlAf8DJQH/AyUB/wMlAf8D JQH/AyUB/wMlAf8DXAHZDAADBgEIA1sB0wNBAXMMAAMlAf8DJQH/AyUB/wMlAf8DWwHTAwYBCBAAAz0B - aQNXAf4DJQH/AyUB/wNXAf4DPQFpBAADUQGeAyUB/wMlAf8DJQH/AyUB/wNRAZ5QAAMPARMDEAEVA1oB + aQNbAf4DJQH/AyUB/wNbAf4DPQFpBAADUQGeAyUB/wMlAf8DJQH/AyUB/wNRAZ5QAAMPARMDEAEVA1oB xAMlAf8DWAG6AxABFQMQARUDQAFvAyUB/wNAAf0DGwEmAxABFRAAAxYBHQNbAdMDVQGuAykBPQMHAQkD JQH/AyUB/wMlAf8DWwHTAxYBHRQAA2EB5gMlAf8DJQH/AyUB/wMlAf8DYQHmBAADCAEKA04BmANlAfED ZQHxA04BmAMIAQpYAANGAYADJQH/A1kB7wQCBAADGgEkAyUB/wMlAf8DMgFPGAADBgEIA0EBcgNbAc0D @@ -668,14 +665,6 @@ gwGAAQEB8AEPAagBRQGHAQMBgAEBAfABDwGoAUUBggEHAYABAQHwAQ8BqAFFAYABDwH8AT8B8AEPAb8B /QGAAR8B/AE/AfABDwGAAQEBgAE/AfwBPwHwAQ8C/wGAAX8B/AE/AfgBHwr/Cw== - - - Most CBZ-Readers ignore the ComicInfo Page-Index and rely on filename ordering instead. If enabled, any renaming options are ignored and the files are automatically renamed according to their index. The Page with Type 'FrontCover' should be at index 1. - - - Most CBZ-Readers ignore the ComicInfo.xml Page-Index and rely on filename ordering instead. -If enabled, any renaming options are ignored and the files are automatically renamed according to their index. -The page with type 'FrontCover' should be at index 1. 17, 144 @@ -688,7 +677,7 @@ The page with type 'FrontCover' should be at index 1. AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAlgYAAAJNU0Z0AUkBTAIBAQIB - AAEgAQcBIAEHARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAARADAAEBAQABIAYAARD/ + AAFAAQcBQAEHARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAARADAAEBAQABIAYAARD/ ACcAAxgBIQNQAZwDWgHyA1ABnAMYASHkAAMYASADTwGZA1oB8gNRAaIDJQH/A1EBogNaAfIDTwGZAxgB IBQAA1kBwANZAcADWQHAA1kBwANZAcADWQHAA1kBwANZAcADWQHAA1kBwANZAcADWQHAA1kBwAMlAf8D KgFAhAADFQEcA04BlgNaAfIDUQGeAxoBIwMIAQoDJQH/AwgBCgMaASMDUQGeA1oB8gNOAZYDFQEcDAAD @@ -718,32 +707,6 @@ The page with type 'FrontCover' should be at index 1. gAEDAYMBgAQAAYABAwGDBQABgAEDAYAFAAGAAQMBgAUAAeABDwGABQAB+AE/Av8EAAT/BAAL - - 1120, 21 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs - LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu - SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAACgMAAAJNU0Z0AUkBTAIBAQIB - AAHgASYB4AEmARABAAEQAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAARADAAEBAQABGAYAAQwh - AAP3A9kDxAO/A9ID7QP+pQAD/gO5AywPJQN/A/0SAAPnAVIBVAFVA/oPAAO4AbYCuG8AA/sDhgYlA0kD - qwOtA38GJQNEA+MMAAPmA1ADJQN9A/oGAAP9A7QDKwMlA7ppAAP+A2MJJQObBgAD3wklA0QD/QYAA+cM - JQNGA/oDAAO0DCUBtgK4ZgAD1AwlA5sGAAPfDCUDfwP+AwAD6AM1DCUDfQO0AysJJQMrA7hmAAOGDCUD - mwYAA98PJQPtBgAD8wM1GyUDtGkAA0kDJQPRBt8D7gYAA/kJ3wN/AyUD0gkAA+ADNRIlAysDtAP9aQAD - KQMlA/sbAAOtAyUDvwwAA/MDNQ8lA7RvAAMyAyUD+xsAA6sDJQPECQAD/QO0AysPJQN9A/psAANbAyUD - hAabA88GAAPuCZsDSQMlA9kJAAO0GCUDRgP6aQADogwlA5sGAAPfDCUDLAP3AwAD/QO0AysJJQMrAzUM - JQN9A/pmAAPoDCUDmwYAA98MJQO5BgABygLLDyUDtAPzAzUMJQFSAVQBVWYAA/8DwAMtBiUDhAb7A9EJ - JQOGA/4GAAP2A3YGJQMrA7QD/QMAA+ADNQYlA1AD52wAA8AYJQNjA/sPAAN2AyUDtAwAA/MDNQMlA+Zv - AAP/A+gDogNbAzIDKQNJA4YD1AP+EgAD9gHKAssD/Q8AA+gD5/8AKgABQgFNAT4HAAE+AwABKAMAAUAD - AAEQAwABAQEAAQEFAAGAFwAD/wEAAfgBDwL/BAAB4AEHAeMB5wQAAcABAwHBAYMEAAKBAYABgQQAAYEC - gAEBBAABgQGAAcABAwQAAYEBgAHgAQMEAAGPAfgB8AEPBAABjwH4AeABBwQAAYEBgAHgAQMEAAGBAoAB - AQQAAoEBgAEBBAABgAEBAYABgQQAAeABAwHjAcMEAAHgAQcB4wHnBAAE/wQACw== - - - - 462, 62 - 990, 62 @@ -752,7 +715,7 @@ The page with type 'FrontCover' should be at index 1. AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAuAsAAAJNU0Z0AUkBTAIBAQQB - AAEIAQUBCAEFARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAASADAAEBAQABIAYAASD/ + AAEoAQUBKAEFARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAASADAAEBAQABIAYAASD/ AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/ADYAAxgBIAM4AVsDRAF4A0YBfgM8AWYDJQE3AwQB BdwAAwQBBQNJAYUDTQH6A1wB5wNRAaQDTgGWA10BzAMlAf8DWAG9AwcBCVwAAxMBGgNJAYgBXQJhAdQB RQFoAWoB+QFFAWgBagH5AV0CYQHUA0kBiAMTARowAAM4AV0DMAFKAwQBBRwAAw4BEgNVAbQDVQGsAy0B @@ -804,12 +767,52 @@ The page with type 'FrontCover' should be at index 1. IQH8AT8BwAEDAYYBIQHhAYMB/gE/AeABBwHAAQMB4AEHAf4BPwHwAQ8B8AEPCP8L + + 439, 103 + + + Most CBZ-Readers ignore the ComicInfo Page-Index and rely on filename ordering instead. If enabled, any renaming options are ignored and the files are automatically renamed according to their index. The Page with Type 'FrontCover' should be at index 1. + + + Most CBZ-Readers ignore the ComicInfo.xml Page-Index and rely on filename ordering instead. +If enabled, any renaming options are ignored and the files are automatically renamed according to their index. +The page with type 'FrontCover' should be at index 1. + + + 1120, 21 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs + LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu + SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAACAMAAAJNU0Z0AUkBTAIBAQIC + AAEnAQABJwEQAQABEAEABP8BGQEACP8BQgFNATYHAAE2AwABKAMAAUADAAEQAwABAQEAARgGAAEMIQAD + 9wPZA8QDvwPSA+0D/qUAA/4DuQMsDyUDfwP9EgAD5wFSAVQBVQP6DwADuAG2ArhvAAP7A4YGJQNJA6sD + rQN/BiUDRAPjDAAD5gNQAyUDfQP6BgAD/QO0AysDJQO6aQAD/gNjCSUDmwYAA98JJQNEA/0GAAPnDCUD + RgP6AwADtAwlAbYCuGYAA9QMJQObBgAD3wwlA38D/gMAA+gDNQwlA30DtAMrCSUDKwO4ZgADhgwlA5sG + AAPfDyUD7QYAA/MDNRslA7RpAANJAyUD0QbfA+4GAAP5Cd8DfwMlA9IJAAPgAzUSJQMrA7QD/WkAAykD + JQP7GwADrQMlA78MAAPzAzUPJQO0bwADMgMlA/sbAAOrAyUDxAkAA/0DtAMrDyUDfQP6bAADWwMlA4QG + mwPPBgAD7gmbA0kDJQPZCQADtBglA0YD+mkAA6IMJQObBgAD3wwlAywD9wMAA/0DtAMrCSUDKwM1DCUD + fQP6ZgAD6AwlA5sGAAPfDCUDuQYAAcoCyw8lA7QD8wM1DCUBUgFUAVVmAAP/A8ADLQYlA4QG+wPRCSUD + hgP+BgAD9gN2BiUDKwO0A/0DAAPgAzUGJQNQA+dsAAPAGCUDYwP7DwADdgMlA7QMAAPzAzUDJQPmbwAD + /wPoA6IDWwMyAykDSQOGA9QD/hIAA/YBygLLA/0PAAPoA+f/ACoAAUIBTQE+BwABPgMAASgDAAFAAwAB + EAMAAQEBAAEBBQABgBcAA/8BAAH4AQ8C/wQAAeABBwHjAecEAAHAAQMBwQGDBAACgQGAAYEEAAGBAoAB + AQQAAYEBgAHAAQMEAAGBAYAB4AEDBAABjwH4AfABDwQAAY8B+AHgAQcEAAGBAYAB4AEDBAABgQKAAQEE + AAKBAYABAQQAAYABAQGAAYEEAAHgAQMB4wHDBAAB4AEHAeMB5wQABP8EAAs= + + + + 462, 62 + 202, 103 17, 103 + + 439, 103 + 546, 103 diff --git a/MyCBZ/Models/ProjectModel.cs b/MyCBZ/Models/ProjectModel.cs index 66a5a2e..b0505b1 100644 --- a/MyCBZ/Models/ProjectModel.cs +++ b/MyCBZ/Models/ProjectModel.cs @@ -396,41 +396,48 @@ private void HandlePipeline(object sender, PipelineEvent e) foreach (Page resultPage in r.Result.Pages) { - page = GetPageById(resultPage.Id); - //page?.UpdatePage(resultPage); - //page?.UpdateStreams(resultPage); - page?.UpdatePageAttributes(resultPage); - page?.UpdateTemporaryFile(resultPage.TemporaryFile); - //page?.LoadImageInfo(true); + try + { + page = GetPageById(resultPage.Id); + //page?.UpdatePage(resultPage); + //page?.UpdateStreams(resultPage); + page?.UpdatePageAttributes(resultPage); + page?.UpdateTemporaryFile(resultPage.TemporaryFile); + //page?.LoadImageInfo(true); - if (page != null) - { - //page.Name = resultPage.Name; - //page.Format = resultPage.Format; - page.Size = resultPage.Size; - page.ImageTask.ImageAdjustments.SplitPage = false; - page.ImageTask.ImageAdjustments.ResizeMode = -1; - page.ImageTask.ImageAdjustments.ConvertType = 0; - page.ThumbnailInvalidated = true; - - resultPage.Close(); - - AppEventHandler.OnImageAdjustmentsChanged(null, new ImageAdjustmentsChangedEvent(page.ImageTask.ImageAdjustments, page.Id)); - AppEventHandler.OnPageChanged(this, new PageChangedEvent(resultPage, null, PageChangedEvent.IMAGE_STATUS_CHANGED)); - AppEventHandler.OnRedrawThumb(null, new RedrawThumbEvent(page)); - } - else - { + if (page != null) + { + //page.Name = resultPage.Name; + //page.Format = resultPage.Format; + page.Size = resultPage.Size; + page.ImageTask.ImageAdjustments.SplitPage = false; + page.ImageTask.ImageAdjustments.ResizeMode = -1; + page.ImageTask.ImageAdjustments.ConvertType = 0; + page.ThumbnailInvalidated = true; + + resultPage.Close(); + + AppEventHandler.OnImageAdjustmentsChanged(null, new ImageAdjustmentsChangedEvent(page.ImageTask.ImageAdjustments, page.Id)); + AppEventHandler.OnPageChanged(this, new PageChangedEvent(resultPage, null, PageChangedEvent.IMAGE_STATUS_CHANGED)); + AppEventHandler.OnRedrawThumb(null, new RedrawThumbEvent(page)); + } + else + { + + Page newPage = AddPage(resultPage, resultPage.Index); + newPage.ImageTask.ImageAdjustments.SplitPage = false; + newPage.ImageTask.ImageAdjustments.ResizeMode = -1; + newPage.ImageTask.ImageAdjustments.ConvertType = 0; - Page newPage = AddPage(resultPage, resultPage.Index); - newPage.ImageTask.ImageAdjustments.SplitPage = false; - newPage.ImageTask.ImageAdjustments.ResizeMode = -1; - newPage.ImageTask.ImageAdjustments.ConvertType = 0; + AppEventHandler.OnImageAdjustmentsChanged(null, new ImageAdjustmentsChangedEvent(resultPage.ImageTask.ImageAdjustments, resultPage.Id)); + AppEventHandler.OnPageChanged(this, new PageChangedEvent(newPage, null, PageChangedEvent.IMAGE_STATUS_NEW)); + AppEventHandler.OnRedrawThumb(null, new RedrawThumbEvent(newPage)); + } + } catch (Exception e) + { + MessageLogger.Instance.Log(LogMessageEvent.LOGMESSAGE_TYPE_ERROR, "Error updating result images! [" + e.Message + "]"); - AppEventHandler.OnImageAdjustmentsChanged(null, new ImageAdjustmentsChangedEvent(page.ImageTask.ImageAdjustments, page.Id)); - AppEventHandler.OnPageChanged(this, new PageChangedEvent(newPage, null, PageChangedEvent.IMAGE_STATUS_NEW)); - AppEventHandler.OnRedrawThumb(null, new RedrawThumbEvent(newPage)); } AppEventHandler.OnGeneralTaskProgress(null, new GeneralTaskProgressEvent(GeneralTaskProgressEvent.TASK_PROCESS_IMAGE, GeneralTaskProgressEvent.TASK_STATUS_RUNNING, "Updating processed pages...", index, r.Result.Pages.Count, false)); diff --git a/MyCBZ/Properties/AssemblyInfo.cs b/MyCBZ/Properties/AssemblyInfo.cs index 4b7749d..c846e5a 100644 --- a/MyCBZ/Properties/AssemblyInfo.cs +++ b/MyCBZ/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // indem Sie "*" wie unten gezeigt eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.21.167")] -[assembly: AssemblyFileVersion("0.21.167")] +[assembly: AssemblyVersion("0.21.168")] +[assembly: AssemblyFileVersion("0.21.168")] [assembly: NeutralResourcesLanguage("en")] diff --git a/MyCBZ/Win_CBZSettings.Designer.cs b/MyCBZ/Win_CBZSettings.Designer.cs index a72e175..ceab3ea 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.21.167b")] + [global::System.Configuration.DefaultSettingValueAttribute("0.21.168b")] public string InstalledVersion { get { return ((string)(this["InstalledVersion"])); diff --git a/MyCBZ/Win_CBZSettings.settings b/MyCBZ/Win_CBZSettings.settings index da43ad1..265c150 100644 --- a/MyCBZ/Win_CBZSettings.settings +++ b/MyCBZ/Win_CBZSettings.settings @@ -6,7 +6,7 @@ %APPDATA%\WIN_CBZ\Temp\ - 0.21.167b + 0.21.168b <?xml version="1.0" encoding="utf-16"?> diff --git a/Readme.md b/Readme.md index 25b2182..29c1827 100644 --- a/Readme.md +++ b/Readme.md @@ -53,7 +53,7 @@ Microsoft Visual Studio [Community] 2022 (64-Bit) ## Latest Release -v0.21.167b released! +v0.21.168b released! >[!IMPORTANT] diff --git a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj index 5007f3a..083d1c0 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:{8D7990FE-5963-4822-9AD6-C1837C89B823}" - "PackageCode" = "8:{B76ED5D6-E875-41A1-9AC6-87D5C2E1ECC1}" + "ProductCode" = "8:{20794C93-F009-47B7-8C5F-FE5708B0F254}" + "PackageCode" = "8:{968008B3-D76A-4146-8C76-33466C4C4329}" "UpgradeCode" = "8:{66FAEF81-1CAE-4971-9E0F-796310EFEA5E}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:0.21.167" + "ProductVersion" = "8:0.21.168" "Manufacturer" = "8:Trash_s0Ft" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -808,7 +808,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1DAB07B3E40248E0B54293E16EE30178" { - "SourcePath" = "8:..\\MyCBZ\\obj\\x64\\Release\\net8.0-windows7.0\\apphost.exe" + "SourcePath" = "8:..\\MyCBZ\\obj\\x64\\Debug\\net8.0-windows7.0\\apphost.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_381C2AC7AD384E1488C6014F95032920"