diff --git a/MyCBZ/App.config b/MyCBZ/App.config index 0255077..98c7809 100644 --- a/MyCBZ/App.config +++ b/MyCBZ/App.config @@ -132,7 +132,7 @@ - 0.18.131b + 0.18.132b diff --git a/MyCBZ/Forms/MainForm.Designer.cs b/MyCBZ/Forms/MainForm.Designer.cs index f780710..88f19d2 100644 --- a/MyCBZ/Forms/MainForm.Designer.cs +++ b/MyCBZ/Forms/MainForm.Designer.cs @@ -119,8 +119,6 @@ private void InitializeComponent() this.MainSplitBox = new System.Windows.Forms.SplitContainer(); this.SplitBoxPageView = new System.Windows.Forms.SplitContainer(); this.PageThumbsListBox = new System.Windows.Forms.ListBox(); - this.PageView = new Win_CBZ.ExtendetListView(); - this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.TabControlPageSettings = new System.Windows.Forms.TabControl(); this.TabPagePageSettings = new System.Windows.Forms.TabPage(); this.TablePanePageAdjustments = new System.Windows.Forms.TableLayoutPanel(); @@ -175,12 +173,6 @@ private void InitializeComponent() this.InfoIconTooltip = new System.Windows.Forms.PictureBox(); this.CheckBoxCompatibilityMode = new System.Windows.Forms.CheckBox(); this.SplitBoxItemsList = new System.Windows.Forms.SplitContainer(); - this.PagesList = new Win_CBZ.ExtendetListView(); - this.NamePageCol = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.IndexPageCol = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.TypePageCol = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.ModifiedPageCol = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.SizeFormatedPageCol = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.MetadataPanel = new System.Windows.Forms.TableLayoutPanel(); this.MetadataEditorHeaderFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); this.LabelMetadataPanel = new System.Windows.Forms.Label(); @@ -209,6 +201,14 @@ private void InitializeComponent() this.AddPagesDirDialog = new System.Windows.Forms.FolderBrowserDialog(); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.AutoCompleteItems = new AutocompleteMenuNS.AutocompleteMenu(); + this.PageView = new Win_CBZ.ExtendetListView(); + this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.PagesList = new Win_CBZ.ExtendetListView(); + this.NamePageCol = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.IndexPageCol = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.TypePageCol = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.ModifiedPageCol = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.SizeFormatedPageCol = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.ToolBar.SuspendLayout(); this.MenuBar.SuspendLayout(); this.MainStatusToolStrip.SuspendLayout(); @@ -680,7 +680,7 @@ private void InitializeComponent() // this.CopyToolStripMenuItem.Name = "CopyToolStripMenuItem"; this.CopyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.CopyToolStripMenuItem.Size = new System.Drawing.Size(224, 26); + this.CopyToolStripMenuItem.Size = new System.Drawing.Size(208, 26); this.CopyToolStripMenuItem.Text = "Copy"; this.CopyToolStripMenuItem.Click += new System.EventHandler(this.CopyToolStripMenuItem_Click); // @@ -690,34 +690,34 @@ private void InitializeComponent() this.PasteToolStripMenuItem.Image = global::Win_CBZ.Properties.Resources.clipboard_paste; this.PasteToolStripMenuItem.Name = "PasteToolStripMenuItem"; this.PasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); - this.PasteToolStripMenuItem.Size = new System.Drawing.Size(224, 26); + this.PasteToolStripMenuItem.Size = new System.Drawing.Size(208, 26); this.PasteToolStripMenuItem.Text = "Paste"; this.PasteToolStripMenuItem.Click += new System.EventHandler(this.PasteToolStripMenuItem_Click); // // toolStripMenuItem7 // this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(221, 6); + this.toolStripMenuItem7.Size = new System.Drawing.Size(205, 6); // // SelectAllToolStripMenuItem // this.SelectAllToolStripMenuItem.Image = global::Win_CBZ.Properties.Resources.elements_selection; this.SelectAllToolStripMenuItem.Name = "SelectAllToolStripMenuItem"; this.SelectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); - this.SelectAllToolStripMenuItem.Size = new System.Drawing.Size(224, 26); + this.SelectAllToolStripMenuItem.Size = new System.Drawing.Size(208, 26); this.SelectAllToolStripMenuItem.Text = "Select all"; this.SelectAllToolStripMenuItem.Click += new System.EventHandler(this.SelectAllToolStripMenuItem_Click); // // toolStripMenuItem10 // this.toolStripMenuItem10.Name = "toolStripMenuItem10"; - this.toolStripMenuItem10.Size = new System.Drawing.Size(221, 6); + this.toolStripMenuItem10.Size = new System.Drawing.Size(205, 6); // // SettingsToolStripMenuItem // this.SettingsToolStripMenuItem.Image = global::Win_CBZ.Properties.Resources.window_gear; this.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"; - this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(224, 26); + this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(208, 26); this.SettingsToolStripMenuItem.Text = "Settings"; this.SettingsToolStripMenuItem.Click += new System.EventHandler(this.SettingsToolStripMenuItem_Click); // @@ -1100,34 +1100,6 @@ private void InitializeComponent() this.PageThumbsListBox.SelectedValueChanged += new System.EventHandler(this.PageThumbsListBox_SelectedValueChanged); this.PageThumbsListBox.DoubleClick += new System.EventHandler(this.PageThumbsListBox_DoubleClick); // - // PageView - // - this.PageView.Alignment = System.Windows.Forms.ListViewAlignment.Default; - this.PageView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader1}); - this.PageView.FullRowSelect = true; - this.PageView.GridLines = true; - this.PageView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.PageView.HideSelection = false; - this.PageView.LabelWrap = false; - this.PageView.LargeImageList = this.PageImages; - this.PageView.Location = new System.Drawing.Point(252, 132); - this.PageView.Margin = new System.Windows.Forms.Padding(2); - this.PageView.Name = "PageView"; - this.PageView.OwnerDraw = true; - this.PageView.Size = new System.Drawing.Size(122, 16); - this.PageView.TabIndex = 6; - this.PageView.UseCompatibleStateImageBehavior = false; - this.PageView.DrawItem += new System.Windows.Forms.DrawListViewItemEventHandler(this.PageView_DrawItem); - this.PageView.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.PageView_ItemSelectionChanged); - this.PageView.SelectedIndexChanged += new System.EventHandler(this.PageView_SelectedIndexChanged); - this.PageView.DoubleClick += new System.EventHandler(this.PageView_DoubleClick); - // - // columnHeader1 - // - this.columnHeader1.Text = "Page"; - this.columnHeader1.Width = 455; - // // TabControlPageSettings // this.TabControlPageSettings.Controls.Add(this.TabPagePageSettings); @@ -1553,7 +1525,7 @@ private void InitializeComponent() this.TabPageGlobalSettings.Margin = new System.Windows.Forms.Padding(2); this.TabPageGlobalSettings.Name = "TabPageGlobalSettings"; this.TabPageGlobalSettings.Padding = new System.Windows.Forms.Padding(2); - this.TabPageGlobalSettings.Size = new System.Drawing.Size(375, 306); + this.TabPageGlobalSettings.Size = new System.Drawing.Size(375, 305); this.TabPageGlobalSettings.TabIndex = 1; this.TabPageGlobalSettings.Text = "File Settings"; this.TabPageGlobalSettings.UseVisualStyleBackColor = true; @@ -1592,7 +1564,7 @@ private void InitializeComponent() this.FileSettingsTablePanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 132F)); this.FileSettingsTablePanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42F)); this.FileSettingsTablePanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 10F)); - this.FileSettingsTablePanel.Size = new System.Drawing.Size(371, 302); + this.FileSettingsTablePanel.Size = new System.Drawing.Size(371, 301); this.FileSettingsTablePanel.TabIndex = 1; // // PlaceholdersInfoLabel @@ -1744,7 +1716,7 @@ private void InitializeComponent() this.TabPageArchiveSettings.Margin = new System.Windows.Forms.Padding(2); this.TabPageArchiveSettings.Name = "TabPageArchiveSettings"; this.TabPageArchiveSettings.Padding = new System.Windows.Forms.Padding(2); - this.TabPageArchiveSettings.Size = new System.Drawing.Size(375, 306); + this.TabPageArchiveSettings.Size = new System.Drawing.Size(375, 305); this.TabPageArchiveSettings.TabIndex = 2; this.TabPageArchiveSettings.Text = "Build settings"; this.TabPageArchiveSettings.UseVisualStyleBackColor = true; @@ -1774,7 +1746,7 @@ private void InitializeComponent() this.ArchiveBuildSettingsTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 45F)); this.ArchiveBuildSettingsTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 125F)); this.ArchiveBuildSettingsTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.ArchiveBuildSettingsTableLayout.Size = new System.Drawing.Size(371, 302); + this.ArchiveBuildSettingsTableLayout.Size = new System.Drawing.Size(371, 301); this.ArchiveBuildSettingsTableLayout.TabIndex = 0; // // CompatInfoText @@ -1894,60 +1866,6 @@ private void InitializeComponent() this.SplitBoxItemsList.SplitterWidth = 5; this.SplitBoxItemsList.TabIndex = 7; // - // PagesList - // - this.PagesList.AllowDrop = true; - this.PagesList.AllowItemDrag = true; - this.PagesList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.NamePageCol, - this.IndexPageCol, - this.TypePageCol, - this.ModifiedPageCol, - this.SizeFormatedPageCol}); - this.PagesList.Dock = System.Windows.Forms.DockStyle.Fill; - this.PagesList.FullRowSelect = true; - this.PagesList.HideSelection = false; - this.PagesList.InsertionLineColor = System.Drawing.Color.DodgerBlue; - this.PagesList.LabelEdit = true; - this.PagesList.Location = new System.Drawing.Point(0, 0); - this.PagesList.Margin = new System.Windows.Forms.Padding(2); - this.PagesList.Name = "PagesList"; - this.PagesList.ShowItemToolTips = true; - this.PagesList.Size = new System.Drawing.Size(920, 174); - this.PagesList.TabIndex = 5; - this.PagesList.UseCompatibleStateImageBehavior = false; - this.PagesList.View = System.Windows.Forms.View.Details; - this.PagesList.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.PagesList_AfterLabelEdit); - this.PagesList.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.PagesList_ItemDrag); - this.PagesList.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.PagesList_ItemSelectionChanged); - this.PagesList.DragDrop += new System.Windows.Forms.DragEventHandler(this.PagesList_DragDrop); - this.PagesList.DragOver += new System.Windows.Forms.DragEventHandler(this.PagesList_DragOver); - this.PagesList.DoubleClick += new System.EventHandler(this.PagesList_DoubleClick); - // - // NamePageCol - // - this.NamePageCol.Text = "Filename"; - this.NamePageCol.Width = 189; - // - // IndexPageCol - // - this.IndexPageCol.Text = "Index"; - this.IndexPageCol.Width = 195; - // - // TypePageCol - // - this.TypePageCol.Text = "Type"; - // - // ModifiedPageCol - // - this.ModifiedPageCol.Text = "Modified"; - this.ModifiedPageCol.Width = 147; - // - // SizeFormatedPageCol - // - this.SizeFormatedPageCol.Text = "Size"; - this.SizeFormatedPageCol.Width = 160; - // // MetadataPanel // this.MetadataPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; @@ -2275,6 +2193,88 @@ private void InitializeComponent() this.AutoCompleteItems.TargetControlWrapper = null; this.AutoCompleteItems.Selected += new System.EventHandler(this.AutoCompleteItems_Selected); // + // PageView + // + this.PageView.Alignment = System.Windows.Forms.ListViewAlignment.Default; + this.PageView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader1}); + this.PageView.FullRowSelect = true; + this.PageView.GridLines = true; + this.PageView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.PageView.HideSelection = false; + this.PageView.LabelWrap = false; + this.PageView.LargeImageList = this.PageImages; + this.PageView.Location = new System.Drawing.Point(252, 132); + this.PageView.Margin = new System.Windows.Forms.Padding(2); + this.PageView.Name = "PageView"; + this.PageView.OwnerDraw = true; + this.PageView.Size = new System.Drawing.Size(122, 16); + this.PageView.TabIndex = 6; + this.PageView.UseCompatibleStateImageBehavior = false; + this.PageView.DrawItem += new System.Windows.Forms.DrawListViewItemEventHandler(this.PageView_DrawItem); + this.PageView.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.PageView_ItemSelectionChanged); + this.PageView.SelectedIndexChanged += new System.EventHandler(this.PageView_SelectedIndexChanged); + this.PageView.DoubleClick += new System.EventHandler(this.PageView_DoubleClick); + // + // columnHeader1 + // + this.columnHeader1.Text = "Page"; + this.columnHeader1.Width = 455; + // + // PagesList + // + this.PagesList.AllowDrop = true; + this.PagesList.AllowItemDrag = true; + this.PagesList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.NamePageCol, + this.IndexPageCol, + this.TypePageCol, + this.ModifiedPageCol, + this.SizeFormatedPageCol}); + this.PagesList.Dock = System.Windows.Forms.DockStyle.Fill; + this.PagesList.FullRowSelect = true; + this.PagesList.HideSelection = false; + this.PagesList.InsertionLineColor = System.Drawing.Color.DodgerBlue; + this.PagesList.LabelEdit = true; + this.PagesList.Location = new System.Drawing.Point(0, 0); + this.PagesList.Margin = new System.Windows.Forms.Padding(2); + this.PagesList.Name = "PagesList"; + this.PagesList.ShowItemToolTips = true; + this.PagesList.Size = new System.Drawing.Size(920, 174); + this.PagesList.TabIndex = 5; + this.PagesList.UseCompatibleStateImageBehavior = false; + this.PagesList.View = System.Windows.Forms.View.Details; + this.PagesList.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.PagesList_AfterLabelEdit); + this.PagesList.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.PagesList_ItemDrag); + this.PagesList.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.PagesList_ItemSelectionChanged); + this.PagesList.DragDrop += new System.Windows.Forms.DragEventHandler(this.PagesList_DragDrop); + this.PagesList.DragOver += new System.Windows.Forms.DragEventHandler(this.PagesList_DragOver); + this.PagesList.DoubleClick += new System.EventHandler(this.PagesList_DoubleClick); + // + // NamePageCol + // + this.NamePageCol.Text = "Filename"; + this.NamePageCol.Width = 189; + // + // IndexPageCol + // + this.IndexPageCol.Text = "Index"; + this.IndexPageCol.Width = 195; + // + // TypePageCol + // + this.TypePageCol.Text = "Type"; + // + // ModifiedPageCol + // + this.ModifiedPageCol.Text = "Modified"; + this.ModifiedPageCol.Width = 147; + // + // SizeFormatedPageCol + // + this.SizeFormatedPageCol.Text = "Size"; + this.SizeFormatedPageCol.Width = 160; + // // MainForm // this.AllowDrop = true; diff --git a/MyCBZ/Forms/MainForm.resx b/MyCBZ/Forms/MainForm.resx index 9e6cc10..46a352b 100644 --- a/MyCBZ/Forms/MainForm.resx +++ b/MyCBZ/Forms/MainForm.resx @@ -140,7 +140,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABu - CgAAAk1TRnQBSQFMAgEBAwEAAUABHQFAAR0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CgAAAk1TRnQBSQFMAgEBAwEAAXABHQFwAR0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -198,7 +198,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe - PgAAAk1TRnQBSQFMAgEBEQEAAUABHQFAAR0BGAEAARgBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFg + PgAAAk1TRnQBSQFMAgEBEQEAAXABHQFwAR0BGAEAARgBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFg AwABeAMAAQEBAAEYBgABh/8A/wD/AHgAAtQB1QMnNiUDJwPV3gADvQMlNr0DJQO+3gADvQMlEgAD/wHl AfMB9gG8AeoB8wG8AeoB8wHlAfMB9gP/EgADJQO+3gADvQMlDwAB9AH4AfkBUAHaAfQBAAHSAfoBAAHS AfoBAAHSAfoBAAHSAfoBUAHaAvQB+AH5DwADJQO+3gADvQMlDAAB+gL7AS4B1wH3AQAB0gH6AcwB7QL0 @@ -509,7 +509,7 @@ The page with type 'FrontCover' should be at index 1. AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAK - AwAAAk1TRnQBSQFMAgEBAgEAAbABHAGwARwBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA + AwAAAk1TRnQBSQFMAgEBAgEAAeABHAHgARwBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABEAMAAQEBAAEYBgABDCEAA/cD2QPEA78D0gPtA/6lAAP+A7kDLA8lA38D/RIAA+cBUgFUAVUD+g8A A7gBtgK4bwAD+wOGBiUDSQOrA60DfwYlA0QD4wwAA+YDUAMlA30D+gYAA/0DtAMrAyUDumkAA/4DYwkl A5sGAAPfCSUDRAP9BgAD5wwlA0YD+gMAA7QMJQG2ArhmAAPUDCUDmwYAA98MJQN/A/4DAAPoAzUMJQN9 @@ -536,7 +536,7 @@ The page with type 'FrontCover' should be at index 1. AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAQ - DAAAAk1TRnQBSQFMAgEBBAEAAUgBHQFIAR0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBAEAAXgBHQF4AR0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/MyCBZ/Models/ProjectModel.cs b/MyCBZ/Models/ProjectModel.cs index 1ef984a..3d7f490 100644 --- a/MyCBZ/Models/ProjectModel.cs +++ b/MyCBZ/Models/ProjectModel.cs @@ -1009,8 +1009,14 @@ protected void SaveArchiveProc(object threadParams) { if (page.TemporaryFile.Exists()) { - page.TemporaryFile.LocalFileInfo.Delete(); - page.TemporaryFile = null; + try + { + page.DeleteTemporaryFile(); + + } catch (Exception exd) + { + MessageLogger.Instance.Log(LogMessageEvent.LOGMESSAGE_TYPE_ERROR, "Error finalizing CBZ [" + exd.Message + "]"); + } } OnTaskProgress(new TaskProgressEvent(page, deletedIndex, Pages.Count)); deletedIndex++; @@ -1041,6 +1047,18 @@ protected void SaveArchiveProc(object threadParams) Page page = GetPageByName(entry.Name); page?.UpdateImageEntry(entry, RandomId.getInstance().make()); } + + if (Win_CBZ.Win_CBZSettings.Default.AutoDeleteTempFiles) + { + foreach (Page page in Pages) + { + if (!page.TemporaryFile.Exists()) + { + page.ThumbnailInvalidated = true; + } + } + } + IsChanged = false; IsNew = false; FileName = tParams.FileName; diff --git a/MyCBZ/Win_CBZSettings.Designer.cs b/MyCBZ/Win_CBZSettings.Designer.cs index e4f98ec..51010df 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.18.131b")] + [global::System.Configuration.DefaultSettingValueAttribute("0.18.132b")] public string Version { get { return ((string)(this["Version"])); diff --git a/MyCBZ/Win_CBZSettings.settings b/MyCBZ/Win_CBZSettings.settings index 5d127e3..74ca6cd 100644 --- a/MyCBZ/Win_CBZSettings.settings +++ b/MyCBZ/Win_CBZSettings.settings @@ -6,7 +6,7 @@ %APPDATA%\WIN_CBZ\Temp\ - 0.18.131b + 0.18.132b <?xml version="1.0" encoding="utf-16"?> diff --git a/Readme.md b/Readme.md index ca574b0..357a020 100644 --- a/Readme.md +++ b/Readme.md @@ -48,7 +48,7 @@ Microsoft Visual Studio [Community] 2022 (64-Bit) ## Latest Release -v0.18.131b released! +v0.18.132b released! ## Third party components diff --git a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj index 9128dc7..b387625 100644 --- a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj +++ b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj @@ -6864,15 +6864,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Win_CBZ" - "ProductCode" = "8:{873AF7A2-3CBA-400A-BEC2-2B1073F2580A}" - "PackageCode" = "8:{27008A49-A695-4065-B3B1-06D739089201}" + "ProductCode" = "8:{6EE6EA9A-6551-4801-A4C6-DF99206EAA37}" + "PackageCode" = "8:{6AD480D5-3ED2-48EF-8874-A6D72C4670A2}" "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.18.131" + "ProductVersion" = "8:0.18.132" "Manufacturer" = "8:Trash_s0Ft" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:"