From 277ed9691fe50cd56e4ddb974b21976ccd463d77 Mon Sep 17 00:00:00 2001 From: t0815 <10379828+t0815@users.noreply.github.com> Date: Sun, 29 Oct 2023 21:57:58 +0100 Subject: [PATCH] Complete rework of file handling Bugfixes, lots of bugfixes...... --- MyCBZ/App.config | 2 +- MyCBZ/Forms/ImagePreviewForm.cs | 6 +- MyCBZ/Forms/MainForm.Designer.cs | 198 ++++++++++++++--------------- MyCBZ/Forms/MainForm.cs | 41 +++--- MyCBZ/Forms/MainForm.resx | 8 +- MyCBZ/Forms/PageSettingsForm.cs | 2 +- MyCBZ/Models/LocalFile.cs | 13 +- MyCBZ/Models/Page.cs | 111 +++++++++++----- MyCBZ/Models/ProjectModel.cs | 51 +++----- MyCBZ/Win_CBZSettings.Designer.cs | 2 +- MyCBZ/Win_CBZSettings.settings | 2 +- Readme.md | 2 +- Win_CBZ-Setup/Win_CBZ-Setup.vdproj | 6 +- 13 files changed, 245 insertions(+), 199 deletions(-) diff --git a/MyCBZ/App.config b/MyCBZ/App.config index 5f9923fd..1215e713 100644 --- a/MyCBZ/App.config +++ b/MyCBZ/App.config @@ -61,7 +61,7 @@ - 0.13.65b + 0.13.66b diff --git a/MyCBZ/Forms/ImagePreviewForm.cs b/MyCBZ/Forms/ImagePreviewForm.cs index e193a1dc..8e9eeb58 100644 --- a/MyCBZ/Forms/ImagePreviewForm.cs +++ b/MyCBZ/Forms/ImagePreviewForm.cs @@ -24,12 +24,12 @@ public ImagePreviewForm(Page page) { currentIndex = page.Index; currentId = page.Id; - if (page.LocalPath == null) + if (page.LocalFile == null) { - page.LocalPath = Program.ProjectModel.RequestTemporaryFile(page); + page.LocalFile = new LocalFile(Program.ProjectModel.RequestTemporaryFile(page)); } - PageImagePreview.ImageLocation = page.LocalPath; + PageImagePreview.ImageLocation = page.LocalFile.FullPath; } catch (Exception e) diff --git a/MyCBZ/Forms/MainForm.Designer.cs b/MyCBZ/Forms/MainForm.Designer.cs index 2c5f9a83..4469c320 100644 --- a/MyCBZ/Forms/MainForm.Designer.cs +++ b/MyCBZ/Forms/MainForm.Designer.cs @@ -116,8 +116,6 @@ private void InitializeComponent() this.GlobalAlertMessageIcon = new System.Windows.Forms.PictureBox(); this.MainSplitBox = new System.Windows.Forms.SplitContainer(); this.SplitBoxPageView = new System.Windows.Forms.SplitContainer(); - 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(); @@ -168,12 +166,6 @@ private void InitializeComponent() this.CompatInfoText = new System.Windows.Forms.Label(); 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.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.label1 = new System.Windows.Forms.Label(); @@ -194,6 +186,14 @@ private void InitializeComponent() this.Tooltip = new System.Windows.Forms.ToolTip(this.components); this.SelectColorDialog = new System.Windows.Forms.ColorDialog(); this.AddPagesDirDialog = new System.Windows.Forms.FolderBrowserDialog(); + 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.StatusBar.SuspendLayout(); @@ -944,7 +944,7 @@ private void InitializeComponent() this.GlobalAlertTableLayout.ColumnCount = 3; this.GlobalAlertTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 3.9819F)); this.GlobalAlertTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 96.0181F)); - this.GlobalAlertTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 303F)); + this.GlobalAlertTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 325F)); this.GlobalAlertTableLayout.Controls.Add(this.LabelGlobalActionStatusMessage, 1, 0); this.GlobalAlertTableLayout.Controls.Add(this.ExecuteCurrentGlobalAction, 2, 0); this.GlobalAlertTableLayout.Controls.Add(this.GlobalAlertMessageIcon, 0, 0); @@ -963,7 +963,7 @@ private void InitializeComponent() // this.LabelGlobalActionStatusMessage.AutoSize = true; this.LabelGlobalActionStatusMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LabelGlobalActionStatusMessage.Location = new System.Drawing.Point(33, 7); + this.LabelGlobalActionStatusMessage.Location = new System.Drawing.Point(32, 7); this.LabelGlobalActionStatusMessage.Margin = new System.Windows.Forms.Padding(4, 7, 4, 0); this.LabelGlobalActionStatusMessage.Name = "LabelGlobalActionStatusMessage"; this.LabelGlobalActionStatusMessage.Size = new System.Drawing.Size(70, 13); @@ -990,7 +990,7 @@ private void InitializeComponent() this.GlobalAlertMessageIcon.Location = new System.Drawing.Point(2, 2); this.GlobalAlertMessageIcon.Margin = new System.Windows.Forms.Padding(2); this.GlobalAlertMessageIcon.Name = "GlobalAlertMessageIcon"; - this.GlobalAlertMessageIcon.Size = new System.Drawing.Size(25, 29); + this.GlobalAlertMessageIcon.Size = new System.Drawing.Size(24, 29); this.GlobalAlertMessageIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.GlobalAlertMessageIcon.TabIndex = 2; this.GlobalAlertMessageIcon.TabStop = false; @@ -1034,34 +1034,6 @@ private void InitializeComponent() this.SplitBoxPageView.SplitterDistance = 123; this.SplitBoxPageView.TabIndex = 6; // - // PageView - // - this.PageView.Alignment = System.Windows.Forms.ListViewAlignment.Default; - this.PageView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader1}); - this.PageView.Dock = System.Windows.Forms.DockStyle.Fill; - 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(0, 0); - this.PageView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.PageView.Name = "PageView"; - this.PageView.OwnerDraw = true; - this.PageView.Size = new System.Drawing.Size(318, 123); - 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.DoubleClick += new System.EventHandler(this.PageView_DoubleClick); - // - // columnHeader1 - // - this.columnHeader1.Text = "Page"; - this.columnHeader1.Width = 455; - // // TabControlPageSettings // this.TabControlPageSettings.Controls.Add(this.TabPagePageSettings); @@ -1431,7 +1403,7 @@ private void InitializeComponent() this.TabPageGlobalSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.TabPageGlobalSettings.Name = "TabPageGlobalSettings"; this.TabPageGlobalSettings.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.TabPageGlobalSettings.Size = new System.Drawing.Size(311, 244); + this.TabPageGlobalSettings.Size = new System.Drawing.Size(310, 239); this.TabPageGlobalSettings.TabIndex = 1; this.TabPageGlobalSettings.Text = "File Settings"; this.TabPageGlobalSettings.UseVisualStyleBackColor = true; @@ -1469,7 +1441,7 @@ private void InitializeComponent() this.FileSettingsTablePanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 100F)); this.FileSettingsTablePanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 41F)); this.FileSettingsTablePanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 8F)); - this.FileSettingsTablePanel.Size = new System.Drawing.Size(247, 428); + this.FileSettingsTablePanel.Size = new System.Drawing.Size(246, 428); this.FileSettingsTablePanel.TabIndex = 1; // // PlaceholdersInfoLabel @@ -1515,7 +1487,7 @@ private void InitializeComponent() this.TextboxStoryPageRenamingPattern.Location = new System.Drawing.Point(3, 52); this.TextboxStoryPageRenamingPattern.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.TextboxStoryPageRenamingPattern.Name = "TextboxStoryPageRenamingPattern"; - this.TextboxStoryPageRenamingPattern.Size = new System.Drawing.Size(241, 21); + this.TextboxStoryPageRenamingPattern.Size = new System.Drawing.Size(240, 21); this.TextboxStoryPageRenamingPattern.TabIndex = 8; this.TextboxStoryPageRenamingPattern.Text = "{title}_p{page}.{ext}"; this.TextboxStoryPageRenamingPattern.TextChanged += new System.EventHandler(this.TextboxStoryPageRenamingPattern_TextChanged_1); @@ -1539,7 +1511,7 @@ private void InitializeComponent() this.TextboxSpecialPageRenamingPattern.Location = new System.Drawing.Point(3, 107); this.TextboxSpecialPageRenamingPattern.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.TextboxSpecialPageRenamingPattern.Name = "TextboxSpecialPageRenamingPattern"; - this.TextboxSpecialPageRenamingPattern.Size = new System.Drawing.Size(241, 21); + this.TextboxSpecialPageRenamingPattern.Size = new System.Drawing.Size(240, 21); this.TextboxSpecialPageRenamingPattern.TabIndex = 10; this.TextboxSpecialPageRenamingPattern.Text = "{type}_{index}.{ext}"; this.TextboxSpecialPageRenamingPattern.TextChanged += new System.EventHandler(this.TextboxSpecialPageRenamingPattern_TextChanged_1); @@ -1554,7 +1526,7 @@ private void InitializeComponent() this.PlaceholdersFlowPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.PlaceholdersFlowPanel.Name = "PlaceholdersFlowPanel"; this.PlaceholdersFlowPanel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.PlaceholdersFlowPanel.Size = new System.Drawing.Size(241, 96); + this.PlaceholdersFlowPanel.Size = new System.Drawing.Size(240, 96); this.PlaceholdersFlowPanel.TabIndex = 12; // // label2 @@ -1588,7 +1560,7 @@ private void InitializeComponent() this.RenamerExcludePages.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.RenamerExcludePages.Multiline = true; this.RenamerExcludePages.Name = "RenamerExcludePages"; - this.RenamerExcludePages.Size = new System.Drawing.Size(241, 96); + this.RenamerExcludePages.Size = new System.Drawing.Size(240, 96); this.RenamerExcludePages.TabIndex = 16; this.RenamerExcludePages.TextChanged += new System.EventHandler(this.RenamerExcludePages_TextChanged); // @@ -1612,7 +1584,7 @@ private void InitializeComponent() this.TabPageArchiveSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.TabPageArchiveSettings.Name = "TabPageArchiveSettings"; this.TabPageArchiveSettings.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.TabPageArchiveSettings.Size = new System.Drawing.Size(311, 244); + this.TabPageArchiveSettings.Size = new System.Drawing.Size(310, 239); this.TabPageArchiveSettings.TabIndex = 2; this.TabPageArchiveSettings.Text = "Build settings"; this.TabPageArchiveSettings.UseVisualStyleBackColor = true; @@ -1634,7 +1606,7 @@ private void InitializeComponent() this.ArchiveBuildSettingsTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 43.93939F)); this.ArchiveBuildSettingsTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 56.06061F)); this.ArchiveBuildSettingsTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 147F)); - this.ArchiveBuildSettingsTableLayout.Size = new System.Drawing.Size(299, 219); + this.ArchiveBuildSettingsTableLayout.Size = new System.Drawing.Size(298, 219); this.ArchiveBuildSettingsTableLayout.TabIndex = 0; // // label7 @@ -1661,7 +1633,7 @@ private void InitializeComponent() "None"}); this.ComboBoxCompressionLevel.Location = new System.Drawing.Point(5, 34); this.ComboBoxCompressionLevel.Name = "ComboBoxCompressionLevel"; - this.ComboBoxCompressionLevel.Size = new System.Drawing.Size(289, 21); + this.ComboBoxCompressionLevel.Size = new System.Drawing.Size(288, 21); this.ComboBoxCompressionLevel.TabIndex = 0; this.ComboBoxCompressionLevel.SelectedIndexChanged += new System.EventHandler(this.ComboBoxCompressionLevel_SelectedIndexChanged); // @@ -1674,7 +1646,7 @@ private void InitializeComponent() this.CompatModePanel.Controls.Add(this.CheckBoxCompatibilityMode); this.CompatModePanel.Location = new System.Drawing.Point(5, 72); this.CompatModePanel.Name = "CompatModePanel"; - this.CompatModePanel.Size = new System.Drawing.Size(289, 135); + this.CompatModePanel.Size = new System.Drawing.Size(288, 135); this.CompatModePanel.TabIndex = 2; // // CompatInfoText @@ -1683,7 +1655,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.CompatInfoText.Location = new System.Drawing.Point(5, 42); this.CompatInfoText.Name = "CompatInfoText"; - this.CompatInfoText.Size = new System.Drawing.Size(281, 93); + this.CompatInfoText.Size = new System.Drawing.Size(280, 93); this.CompatInfoText.TabIndex = 1; this.CompatInfoText.Text = resources.GetString("CompatInfoText.Text"); // @@ -1718,55 +1690,6 @@ private void InitializeComponent() this.SplitBoxItemsList.SplitterDistance = 168; this.SplitBoxItemsList.TabIndex = 7; // - // PagesList - // - 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.LabelEdit = true; - this.PagesList.Location = new System.Drawing.Point(0, 0); - this.PagesList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.PagesList.Name = "PagesList"; - this.PagesList.ShowItemToolTips = true; - this.PagesList.Size = new System.Drawing.Size(723, 166); - 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.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.PagesList_ItemSelectionChanged); - 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; @@ -2012,6 +1935,83 @@ private void InitializeComponent() this.AddPagesDirDialog.Description = "Select a Folder containing images to add"; this.AddPagesDirDialog.ShowNewFolderButton = false; // + // PageView + // + this.PageView.Alignment = System.Windows.Forms.ListViewAlignment.Default; + this.PageView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader1}); + this.PageView.Dock = System.Windows.Forms.DockStyle.Fill; + 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(0, 0); + this.PageView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.PageView.Name = "PageView"; + this.PageView.OwnerDraw = true; + this.PageView.Size = new System.Drawing.Size(318, 123); + 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.DoubleClick += new System.EventHandler(this.PageView_DoubleClick); + // + // columnHeader1 + // + this.columnHeader1.Text = "Page"; + this.columnHeader1.Width = 455; + // + // PagesList + // + 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.LabelEdit = true; + this.PagesList.Location = new System.Drawing.Point(0, 0); + this.PagesList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.PagesList.Name = "PagesList"; + this.PagesList.ShowItemToolTips = true; + this.PagesList.Size = new System.Drawing.Size(723, 166); + 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.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.PagesList_ItemSelectionChanged); + 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.cs b/MyCBZ/Forms/MainForm.cs index 3defdba5..3ed82878 100644 --- a/MyCBZ/Forms/MainForm.cs +++ b/MyCBZ/Forms/MainForm.cs @@ -319,22 +319,31 @@ private void PageChanged(object sender, PageChangedEvent e) if (e.OldValue != null) { int backupIndex = -1; - if (ComboBoxApplyPageAdjustmentsTo.Items.IndexOf(((Page)e.OldValue).Name) > -1) + string backupName = ""; + if (e.OldValue != null && ComboBoxApplyPageAdjustmentsTo.Items.IndexOf(((Page)e.OldValue).Name) > -1) { - if (ComboBoxApplyPageAdjustmentsTo.Items.IndexOf(e.Page.Name) > -1) + try { - backupIndex = ComboBoxApplyPageAdjustmentsTo.Items.IndexOf(e.Page.Name); - string backupName = ComboBoxApplyPageAdjustmentsTo.Items[backupIndex].ToString(); - - ComboBoxApplyPageAdjustmentsTo.Items[backupIndex] = Program.ProjectModel.MakeNewRandomId(); - } - - ComboBoxApplyPageAdjustmentsTo.Items[ComboBoxApplyPageAdjustmentsTo.Items.IndexOf(((Page)e.OldValue).Name)] = e.Page.Name; - - if (backupIndex > -1) + /* + if (ComboBoxApplyPageAdjustmentsTo.Items.IndexOf(e.Page.Name) > -1) + { + backupIndex = ComboBoxApplyPageAdjustmentsTo.Items.IndexOf(((Page)e.OldValue).Name); + backupName = ComboBoxApplyPageAdjustmentsTo.Items[backupIndex].ToString(); + + ComboBoxApplyPageAdjustmentsTo.Items[backupIndex] = Program.ProjectModel.MakeNewRandomId(); + } + */ + + ComboBoxApplyPageAdjustmentsTo.Items[ComboBoxApplyPageAdjustmentsTo.Items.IndexOf(((Page)e.OldValue).Name)] = e.Page.Name; + + //if (backupIndex > -1) + //{ + // ComboBoxApplyPageAdjustmentsTo.Items[backupIndex] = backupName; + // + //} + } catch (Exception ex) { - ComboBoxApplyPageAdjustmentsTo.Items[backupIndex] = ((Page)e.OldValue).Name; - + //ApplicationMessage.ShowException(ex); } } } @@ -1510,6 +1519,8 @@ private void DisableControllsForArchiveState(ProjectModel project, int state) LabelW.Text = "0"; LabelH.Text = "0"; CurrentGlobalActions.Clear(); + ComboBoxApplyPageAdjustmentsTo.Items.Clear(); + ComboBoxApplyPageAdjustmentsTo.Items.Add(""); //MessageLogListView.Items.Clear(); //MessageLogger.Instance.Log(LogMessageEvent.LOGMESSAGE_TYPE_INFO, "Archive [" + project.FileName + "] closed"); //MessageLogger.Instance.Log(LogMessageEvent.LOGMESSAGE_TYPE_INFO, "--- **** ---"); @@ -1991,10 +2002,10 @@ private void MovePageTo(Page page, int newIndex) //} } - PageChanged(this, new PageChangedEvent(page, originalPage, PageChangedEvent.IMAGE_STATUS_CHANGED)); + PageChanged(this, new PageChangedEvent(page, originalPage.Tag, PageChangedEvent.IMAGE_STATUS_CHANGED)); if (originalPage != null) { - PageChanged(this, new PageChangedEvent((Page)originalPage.Tag, page, PageChangedEvent.IMAGE_STATUS_CHANGED)); + PageChanged(this, new PageChangedEvent((Page)originalPage.Tag, null, PageChangedEvent.IMAGE_STATUS_CHANGED)); } ArchiveStateChanged(this, new CBZArchiveStatusEvent(Program.ProjectModel, CBZArchiveStatusEvent.ARCHIVE_FILE_UPDATED)); diff --git a/MyCBZ/Forms/MainForm.resx b/MyCBZ/Forms/MainForm.resx index 2f62acf0..a9eee5af 100644 --- a/MyCBZ/Forms/MainForm.resx +++ b/MyCBZ/Forms/MainForm.resx @@ -140,7 +140,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABu - CgAAAk1TRnQBSQFMAgEBAwEAAdABDAHQAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CgAAAk1TRnQBSQFMAgEBAwEAAYABDQGAAQ0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -198,7 +198,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe - PgAAAk1TRnQBSQFMAgEBEQEAAdABDAHQAQwBGAEAARgBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFg + PgAAAk1TRnQBSQFMAgEBEQEAAYABDQGAAQ0BGAEAARgBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFg AwABeAMAAQEBAAEYBgABh/8A/wD/AHgAAtQB1QMnNiUDJwPV3gADvQMlNr0DJQO+3gADvQMlEgAD/wHl AfMB9gG8AeoB8wG8AeoB8wHlAfMB9gP/EgADJQO+3gADvQMlDwAB9AH4AfkBUAHaAfQBAAHSAfoBAAHS AfoBAAHSAfoBAAHSAfoBUAHaAvQB+AH5DwADJQO+3gADvQMlDAAB+gL7AS4B1wH3AQAB0gH6AcwB7QL0 @@ -481,7 +481,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAK - AwAAAk1TRnQBSQFMAgEBAgEAAUABDAFAAQwBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA + AwAAAk1TRnQBSQFMAgEBAgEAAfABDAHwAQwBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABEAMAAQEBAAEYBgABDCEAA/cD2QPEA78D0gPtA/6lAAP+A7kDLA8lA38D/RIAA+cBUgFUAVUD+g8A A7gBtgK4bwAD+wOGBiUDSQOrA60DfwYlA0QD4wwAA+YDUAMlA30D+gYAA/0DtAMrAyUDumkAA/4DYwkl A5sGAAPfCSUDRAP9BgAD5wwlA0YD+gMAA7QMJQG2ArhmAAPUDCUDmwYAA98MJQN/A/4DAAPoAzUMJQN9 @@ -505,7 +505,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAQ - DAAAAk1TRnQBSQFMAgEBBAEAAdgBDAHYAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBAEAAYgBDQGIAQ0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/MyCBZ/Forms/PageSettingsForm.cs b/MyCBZ/Forms/PageSettingsForm.cs index 1c9aa319..9362f0df 100644 --- a/MyCBZ/Forms/PageSettingsForm.cs +++ b/MyCBZ/Forms/PageSettingsForm.cs @@ -33,7 +33,7 @@ public PageSettingsForm(Page page) PreviewThumbPictureBox.Image = PreviewThumb; - TextBoxFileLocation.Text = Page.Compressed ? Page.TempPath : Page.LocalPath; + TextBoxFileLocation.Text = Page.Compressed ? Page.TempPath : Page.LocalFile.FullPath; PageNameTextBox.Text = Page.Name; LabelSize.Text = Page.SizeFormat(); PageIndexTextbox.Text = (Page.Index + 1).ToString(); diff --git a/MyCBZ/Models/LocalFile.cs b/MyCBZ/Models/LocalFile.cs index 0e31bf68..f0e7bb0c 100644 --- a/MyCBZ/Models/LocalFile.cs +++ b/MyCBZ/Models/LocalFile.cs @@ -7,15 +7,15 @@ namespace Win_CBZ { - internal class LocalFile + public class LocalFile { - public String Name { get; set; } - public String FileName { get; set; } public String FilePath { get; set; } + public String FileExtension { get; set; } + public String FullPath { get; set; } public long FileSize { get; set; } @@ -26,6 +26,13 @@ internal class LocalFile public LocalFile(String fileName) { FullPath = fileName; + FileInfo localFileInfo = new FileInfo(fileName); + FileName = localFileInfo.Name; + FilePath = localFileInfo.Directory.FullName; + FileSize = localFileInfo.Length; + LastModified = localFileInfo.LastWriteTime; + FileExtension = localFileInfo.Extension; + } } diff --git a/MyCBZ/Models/Page.cs b/MyCBZ/Models/Page.cs index 4893cc18..f492f770 100644 --- a/MyCBZ/Models/Page.cs +++ b/MyCBZ/Models/Page.cs @@ -5,16 +5,10 @@ using System.IO; using System.IO.Compression; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using System.Windows.Forms.VisualStyles; -using static System.Windows.Forms.VisualStyles.VisualStyleElement; using Win_CBZ.Models; using System.Xml.Linq; using System.Runtime.CompilerServices; -using System.Diagnostics.Eventing.Reader; -using System.Windows.Media.Imaging; + namespace Win_CBZ { @@ -45,6 +39,8 @@ public class Page public String WorkingDir { get; set; } + public LocalFile LocalFile { get; set; } + public String LocalPath { get; set; } public String TempPath { get; set; } @@ -103,12 +99,14 @@ public class Page public Page(String fileName, FileAccess mode = FileAccess.Read) { + LocalFile = new LocalFile(fileName); ImageFileInfo = new FileInfo(fileName); ReadOnly = mode == FileAccess.Read || ImageFileInfo.IsReadOnly; if ((mode == FileAccess.Write || mode == FileAccess.ReadWrite) && ImageFileInfo.IsReadOnly) { RemoveReadOnlyAttribute(ref ImageFileInfo); } + FileStream ImageStream = ImageFileInfo.Open(FileMode.Open, mode, FileShare.ReadWrite); Filename = ImageFileInfo.Name; FileExtension = ImageFileInfo.Extension; @@ -119,33 +117,49 @@ public Page(String fileName, FileAccess mode = FileAccess.Read) Id = Guid.NewGuid().ToString(); ImageTask = new ImageTask(); } - - public Page(FileInfo ImageFileInfo, FileAccess mode = FileAccess.Read) + + public Page(LocalFile localFile, FileInfo tempFileName, FileAccess mode = FileAccess.Read) { - this.ImageFileInfo = ImageFileInfo; - ReadOnly = mode == FileAccess.Read || ImageFileInfo.IsReadOnly; - try - { - if ((mode == FileAccess.Write || mode == FileAccess.ReadWrite) && ImageFileInfo.IsReadOnly) + try { + Copy(localFile.FullPath, tempFileName.FullName); + + ImageFileInfo = new FileInfo(tempFileName.FullName); + ReadOnly = (mode == FileAccess.Read && mode != FileAccess.ReadWrite) || ImageFileInfo.IsReadOnly; + try { - RemoveReadOnlyAttribute(ref ImageFileInfo); + if ((mode == FileAccess.Write || mode == FileAccess.ReadWrite) && ImageFileInfo.IsReadOnly) + { + RemoveReadOnlyAttribute(ref ImageFileInfo); + } + ImageStream = ImageFileInfo.Open(FileMode.Open, mode, FileShare.ReadWrite); + ReadOnly = !ImageStream.CanWrite; + } + catch (UnauthorizedAccessException) + { + ImageStream = ImageFileInfo.Open(FileMode.Open, FileAccess.Read, FileShare.Read); + ReadOnly = true; + } + finally + { + LocalFile = localFile; + WorkingDir = tempFileName.Directory.FullName; + if (ReadOnly) + { + String newTempFileName = CreateLocalWorkingCopy(); + TempPath = new FileInfo(newTempFileName).FullName; + } } - ImageStream = ImageFileInfo.Open(FileMode.Open, mode, FileShare.ReadWrite); - ReadOnly = ImageStream.CanWrite; - } catch (UnauthorizedAccessException) - { - ImageStream = ImageFileInfo.Open(FileMode.Open, FileAccess.Read, FileShare.Read); - ReadOnly = true; - } finally - { - } + } catch { + + } + Filename = ImageFileInfo.FullName; - FileExtension = ImageFileInfo.Extension; + FileExtension = localFile.FileExtension; LocalPath = ImageFileInfo.Directory.FullName; - Name = ImageFileInfo.Name; + Name = localFile.FileName; Size = ImageFileInfo.Length; Id = Guid.NewGuid().ToString(); ImageTask = new ImageTask(); @@ -202,6 +216,8 @@ public Page(Page sourcePage, String RandomId, int ThumbWidth = 212, int ThumbHei Filename = sourcePage.Filename; LocalPath = sourcePage.LocalPath; ImageStream = sourcePage.ImageStream; + LocalFile = sourcePage.LocalFile; + FileExtension = sourcePage.FileExtension; Compressed = sourcePage.Compressed; TemporaryFileId = RandomId; EntryName = sourcePage.EntryName; @@ -249,6 +265,7 @@ public Page(Page sourcePage) TempPath = sourcePage.TempPath; Filename = sourcePage.Filename; LocalPath = sourcePage.LocalPath; + LocalFile = sourcePage.LocalFile; ImageStream = sourcePage.ImageStream; Compressed = sourcePage.Compressed; TemporaryFileId = sourcePage.TemporaryFileId; @@ -304,6 +321,7 @@ public void UpdatePage(Page page, bool skipIndex = false, bool skipName = false) Key = page.Key; Number = page.Number; Deleted = page.Deleted; + LocalFile = page.LocalFile; if (!skipName) { @@ -332,6 +350,25 @@ public void UpdateImageEntry(ZipArchiveEntry entry, String randomId) TemporaryFileId = randomId; } + public void UpdateLocalWorkingCopy(LocalFile localFile, FileInfo tempFileName = null) + { + Copy(localFile.FullPath, tempFileName.FullName); + + ImageFileInfo = new FileInfo(tempFileName.FullName); + + LocalFile = new LocalFile(localFile.FullPath); + Size = ImageFileInfo.Length; + LocalPath = localFile.FullPath; + Compressed = false; + LastModified = localFile.LastModified; + Name = localFile.FileName; + + //String newTempFileName = CreateLocalWorkingCopy(ExtractFileExtension(localFile.FullPath)); + //TempPath = new FileInfo(newTempFileName).FullName; + + + } + protected bool RemoveReadOnlyAttribute(ref FileInfo ImageFileInfo) { FileAttributes fileAttributes = ImageFileInfo.Attributes & ~FileAttributes.ReadOnly; @@ -403,7 +440,7 @@ protected void RequestTemporaryFile(String destination = null) { if (destination == null) { - destination = WorkingDir + TemporaryFileId + ".tmp"; + destination = Path.Combine(WorkingDir, TemporaryFileId + ".tmp"); } ImageEntry.ExtractToFile(destination); @@ -417,13 +454,13 @@ protected void RequestTemporaryFile(String destination = null) } } else { - if (ReadOnly) + if (ReadOnly || TempPath == null) { if (TempPath == null || destination != null) { if (destination == null) { - destination = WorkingDir + TemporaryFileId + ".tmp"; + destination = Path.Combine(WorkingDir, TemporaryFileId + ".tmp"); } TempPath = destination; @@ -433,7 +470,7 @@ protected void RequestTemporaryFile(String destination = null) if (!IsMemoryCopy) { - FileStream localFile = File.OpenRead(LocalPath); + FileStream localFile = File.OpenRead(LocalFile.FullPath); try { @@ -544,7 +581,7 @@ public void DeleteLocalFile() { if (!ReadOnly) { - File.Delete(LocalPath); + File.Delete(LocalFile.FileName); } } @@ -656,13 +693,13 @@ public String CreateLocalWorkingCopy(String destination = null) { if (destination == null) { - destination = WorkingDir + TemporaryFileId + ".tmp"; + destination = Path.Combine(WorkingDir, TemporaryFileId + ".tmp"); } - FileInfo copyFileInfo = new FileInfo(destination); + FileInfo copyFileInfo = new FileInfo(destination); // Target if (ImageStream != null) { - if (ImageStream.CanSeek && ImageStream.Position == copyFileInfo.Length) + if (ImageStream.CanSeek && ImageStream.Position > 0) { ImageStream.Seek(0, SeekOrigin.Begin); } @@ -717,7 +754,7 @@ public String CreateLocalWorkingCopy(String destination = null) } } else { - if (LocalPath != null) + if (LocalFile != null) { FileStream localCopyStream = copyFileInfo.Open(FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read); @@ -752,10 +789,14 @@ public String CreateLocalWorkingCopy(String destination = null) { TempPath = destination; + LocalFile = new LocalFile(TempPath); + return destination; } } + LocalFile = new LocalFile(TempPath); + return TempPath; } diff --git a/MyCBZ/Models/ProjectModel.cs b/MyCBZ/Models/ProjectModel.cs index 623d5ae8..8512fa1a 100644 --- a/MyCBZ/Models/ProjectModel.cs +++ b/MyCBZ/Models/ProjectModel.cs @@ -541,12 +541,12 @@ public bool Validate(ref string[] validationErrors, bool showErrorsDialog = fals pagesValid = false; } - if (page.LocalPath != null) + if (page.LocalFile != null) { - FileInfo fileInfo = new FileInfo(page.LocalPath); + FileInfo fileInfo = new FileInfo(page.LocalFile.FullPath); if (!fileInfo.Exists) { - problems.Add("Pages->Page: Local image file not found for page [" + page.Name + "] @(" + page.LocalPath + ")"); + problems.Add("Pages->Page: Local image file not found for page [" + page.Name + "] @(" + page.LocalFile.FullPath + ")"); pagesValid = false; } //fileInfo. @@ -555,7 +555,7 @@ public bool Validate(ref string[] validationErrors, bool showErrorsDialog = fals { if (!page.Compressed) { - problems.Add("Pages->Page: Local image file not found for page [" + page.Name + "] @(" + page.LocalPath + ")"); + problems.Add("Pages->Page: Local image file not found for page [" + page.Name + "] @(" + page.LocalFile.FullPath + ")"); pagesValid = false; } } @@ -908,23 +908,23 @@ public void AddImagesProc() int index = MaxFileIndex; int realNewIndex = MaxFileIndex; int progressIndex = 0; - String targetPath = ""; + FileInfo targetPath = null; + FileInfo localPath = null; Page page = null; foreach (LocalFile fileObject in Files) { try { - targetPath = PathHelper.ResolvePath(WorkingDir) + ProjectGUID + "\\" + fileObject.FileName; + localPath = new FileInfo(fileObject.FileName); + targetPath = MakeNewTempFileName(); - CopyFile(fileObject.FullPath, targetPath); - - FileInfo fi = new FileInfo(targetPath); + //CopyFile(fileObject.FullPath, targetPath.FullName); page = GetPageByName(fileObject.FileName); if (page == null) { - page = new Page(fi, FileAccess.ReadWrite); + page = new Page(fileObject, targetPath, FileAccess.ReadWrite); page.Number = realNewIndex + 1; page.Index = realNewIndex; page.OriginalIndex = realNewIndex; @@ -932,17 +932,10 @@ public void AddImagesProc() realNewIndex++; } else { + page.UpdateLocalWorkingCopy(fileObject, targetPath); page.Changed = true; } - page.Size = fileObject.FileSize; - page.LocalPath = fileObject.FullPath; - page.Compressed = false; - page.LastModified = fileObject.LastModified; - page.Name = fileObject.FileName; - page.TempPath = fi.FullName; - - if (!page.Changed) { Pages.Add(page); @@ -1028,16 +1021,7 @@ public void ParseFilesProc() try { - var fi = new FileInfo(fname); - - LocalFile localFile = new LocalFile(fi.FullName); - localFile.FilePath = fi.Directory.FullName; - localFile.FileName = fi.Name; - localFile.FileSize = fi.Length; - localFile.LastModified = fi.LastWriteTime; - - Files.Add(localFile); - + Files.Add(new LocalFile(fname)); index++; OnTaskProgress(new TaskProgressEvent(null, index, FileNamesToAdd.Count)); @@ -1357,9 +1341,12 @@ public void RenamePage(Page page, String name, bool ignoreDuplicates = false) { foreach (Page existingPage in Pages) { - if (existingPage.Name.ToLower().Equals(name.ToLower())) + if (existingPage.Name != name) { - throw new PageDuplicateNameException(page, "Failed to rename page ['" + page.Name + "'] with ID [" + page.Id + "]! A different page with the same name already exists at Index " + existingPage.Index + "."); + if (existingPage.Name.ToLower().Equals(name.ToLower())) + { + throw new PageDuplicateNameException(page, "Failed to rename page ['" + page.Name + "'] with ID [" + page.Id + "]! A different page with the same name already exists at Index " + existingPage.Index + "."); + } } } } @@ -1776,13 +1763,13 @@ protected void SaveArchiveProc() } catch (Exception ex) { - sourceFileName = page.LocalPath; + sourceFileName = page.LocalFile.FullPath; MessageLogger.Instance.Log(LogMessageEvent.LOGMESSAGE_TYPE_WARNING, "Failed to open temporary file! Compressing original file [" + page.LocalPath + "] instead of [" + page.TempPath + "]"); } } else { - sourceFileName = page.LocalPath; + sourceFileName = page.LocalFile.FullPath; } updatedEntry = BuildingArchive.CreateEntryFromFile(sourceFileName, page.Name, CompressionLevel); diff --git a/MyCBZ/Win_CBZSettings.Designer.cs b/MyCBZ/Win_CBZSettings.Designer.cs index d3c7f03e..734e7f83 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.13.65b")] + [global::System.Configuration.DefaultSettingValueAttribute("0.13.66b")] public string Version { get { return ((string)(this["Version"])); diff --git a/MyCBZ/Win_CBZSettings.settings b/MyCBZ/Win_CBZSettings.settings index 62c3840e..91348f06 100644 --- a/MyCBZ/Win_CBZSettings.settings +++ b/MyCBZ/Win_CBZSettings.settings @@ -6,7 +6,7 @@ %APPDATA%\CBZMage\Temp\ - 0.13.65b + 0.13.66b <?xml version="1.0" encoding="utf-16"?> diff --git a/Readme.md b/Readme.md index c3e6c484..a80ae4e2 100644 --- a/Readme.md +++ b/Readme.md @@ -30,7 +30,7 @@ Microsoft Visual Studio [Community] 2022 (64-Bit) ## Latest Release -v0.13.65b released! +v0.13.66b released! ## Third party components diff --git a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj index b369a16e..2924826b 100644 --- a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj +++ b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj @@ -434,15 +434,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Win_CBZ" - "ProductCode" = "8:{C3CC870A-3CA3-4B12-97EE-95DB01BA8A18}" - "PackageCode" = "8:{C6D15786-F48E-4913-BA93-D00D687A7576}" + "ProductCode" = "8:{BA1D1BB8-4E03-456C-83F7-8ECBB8D875E0}" + "PackageCode" = "8:{A81038B8-FFA1-42A6-9561-8CA294D781DF}" "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.13.65" + "ProductVersion" = "8:0.13.66" "Manufacturer" = "8:Trash_s0Ft" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:"