From 9b983ec6b53f02021f727562b7067885d38bf1ef Mon Sep 17 00:00:00 2001 From: t0815 <10379828+t0815@users.noreply.github.com> Date: Sun, 22 Oct 2023 11:03:40 +0200 Subject: [PATCH] Small Frontend fixes ++Version --- MyCBZ/App.config | 2 +- MyCBZ/Forms/MainForm.Designer.cs | 192 ++++++++++++++--------------- MyCBZ/Forms/MainForm.cs | 88 +++---------- MyCBZ/Forms/MainForm.resx | 8 +- MyCBZ/Win_CBZSettings.Designer.cs | 2 +- MyCBZ/Win_CBZSettings.settings | 2 +- Readme.md | 2 +- Win_CBZ-Setup/Win_CBZ-Setup.vdproj | 6 +- 8 files changed, 122 insertions(+), 180 deletions(-) diff --git a/MyCBZ/App.config b/MyCBZ/App.config index c9c74d00..85f6d837 100644 --- a/MyCBZ/App.config +++ b/MyCBZ/App.config @@ -52,7 +52,7 @@ - 0.12.52b + 0.12.53b diff --git a/MyCBZ/Forms/MainForm.Designer.cs b/MyCBZ/Forms/MainForm.Designer.cs index fa90b312..5ad8a198 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(); @@ -165,12 +163,6 @@ private void InitializeComponent() this.label7 = new System.Windows.Forms.Label(); this.ComboBoxCompressionLevel = new System.Windows.Forms.ComboBox(); 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(); @@ -190,6 +182,14 @@ private void InitializeComponent() this.SaveArchiveDialog = new System.Windows.Forms.SaveFileDialog(); this.Tooltip = new System.Windows.Forms.ToolTip(this.components); this.SelectColorDialog = new System.Windows.Forms.ColorDialog(); + 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(); @@ -428,7 +428,7 @@ private void InitializeComponent() this.ToolButtonImagePreview.Name = "ToolButtonImagePreview"; this.ToolButtonImagePreview.Size = new System.Drawing.Size(28, 28); this.ToolButtonImagePreview.Text = "View Page"; - this.ToolButtonImagePreview.Click += new System.EventHandler(this.toolStripButton2_Click); + this.ToolButtonImagePreview.Click += new System.EventHandler(this.ToolButtonImagePreview_Click); // // toolStripSeparator5 // @@ -938,7 +938,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, 257F)); + this.GlobalAlertTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 261F)); this.GlobalAlertTableLayout.Controls.Add(this.LabelGlobalActionStatusMessage, 1, 0); this.GlobalAlertTableLayout.Controls.Add(this.ExecuteCurrentGlobalAction, 2, 0); this.GlobalAlertTableLayout.Controls.Add(this.GlobalAlertMessageIcon, 0, 0); @@ -1028,34 +1028,6 @@ private void InitializeComponent() this.SplitBoxPageView.SplitterDistance = 128; 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(309, 128); - 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); @@ -1462,7 +1434,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(248, 428); + this.FileSettingsTablePanel.Size = new System.Drawing.Size(214, 428); this.FileSettingsTablePanel.TabIndex = 1; // // PlaceholdersInfoLabel @@ -1508,7 +1480,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(242, 21); + this.TextboxStoryPageRenamingPattern.Size = new System.Drawing.Size(208, 21); this.TextboxStoryPageRenamingPattern.TabIndex = 8; this.TextboxStoryPageRenamingPattern.Text = "{title}_p{page}.{ext}"; this.TextboxStoryPageRenamingPattern.TextChanged += new System.EventHandler(this.TextboxStoryPageRenamingPattern_TextChanged_1); @@ -1517,9 +1489,9 @@ private void InitializeComponent() // this.label13.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(3, 84); + this.label13.Location = new System.Drawing.Point(3, 78); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(126, 13); + this.label13.Size = new System.Drawing.Size(95, 25); this.label13.TabIndex = 9; this.label13.Text = "Special Pages (i.e Cover)"; // @@ -1532,7 +1504,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(242, 21); + this.TextboxSpecialPageRenamingPattern.Size = new System.Drawing.Size(208, 21); this.TextboxSpecialPageRenamingPattern.TabIndex = 10; this.TextboxSpecialPageRenamingPattern.Text = "{type}_{index}.{ext}"; this.TextboxSpecialPageRenamingPattern.TextChanged += new System.EventHandler(this.TextboxSpecialPageRenamingPattern_TextChanged_1); @@ -1547,7 +1519,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); - this.PlaceholdersFlowPanel.Size = new System.Drawing.Size(242, 96); + this.PlaceholdersFlowPanel.Size = new System.Drawing.Size(208, 96); this.PlaceholdersFlowPanel.TabIndex = 12; // // label2 @@ -1564,7 +1536,7 @@ private void InitializeComponent() this.CheckBoxPreview.Anchor = System.Windows.Forms.AnchorStyles.Left; this.CheckBoxPreview.AutoSize = true; this.CheckBoxPreview.Enabled = false; - this.CheckBoxPreview.Location = new System.Drawing.Point(151, 6); + this.CheckBoxPreview.Location = new System.Drawing.Point(131, 6); this.CheckBoxPreview.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.CheckBoxPreview.Name = "CheckBoxPreview"; this.CheckBoxPreview.Size = new System.Drawing.Size(64, 17); @@ -1581,7 +1553,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(242, 96); + this.RenamerExcludePages.Size = new System.Drawing.Size(208, 96); this.RenamerExcludePages.TabIndex = 16; this.RenamerExcludePages.TextChanged += new System.EventHandler(this.RenamerExcludePages_TextChanged); // @@ -1590,7 +1562,7 @@ private void InitializeComponent() this.btnGetExcludesFromSelectedPages.Location = new System.Drawing.Point(3, 385); this.btnGetExcludesFromSelectedPages.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnGetExcludesFromSelectedPages.Name = "btnGetExcludesFromSelectedPages"; - this.btnGetExcludesFromSelectedPages.Size = new System.Drawing.Size(142, 36); + this.btnGetExcludesFromSelectedPages.Size = new System.Drawing.Size(122, 36); this.btnGetExcludesFromSelectedPages.TabIndex = 17; this.btnGetExcludesFromSelectedPages.Text = "Get From selected Pages"; this.btnGetExcludesFromSelectedPages.UseVisualStyleBackColor = true; @@ -1676,55 +1648,6 @@ private void InitializeComponent() this.SplitBoxItemsList.SplitterDistance = 173; 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(732, 171); - 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; @@ -1964,6 +1887,83 @@ private void InitializeComponent() // this.SelectColorDialog.AnyColor = true; // + // 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(309, 128); + 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(732, 171); + 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 cc4616ec..1f9ec6b8 100644 --- a/MyCBZ/Forms/MainForm.cs +++ b/MyCBZ/Forms/MainForm.cs @@ -1543,7 +1543,7 @@ private void PageView_ItemSelectionChanged(object sender, ListViewItemSelectionC ToolButtonMovePageUp.Enabled = buttonState; ToolButtonSetPageType.Enabled = selectedPages.Count == 1; - ToolButtonImagePreview.Enabled = buttonState; + ToolButtonImagePreview.Enabled = selectedPages.Count == 1; foreach (ListViewItem itempage in PagesList.Items) { @@ -2167,8 +2167,9 @@ private void PagesList_ItemSelectionChanged(object sender, ListViewItemSelection ToolButtonMovePageDown.Enabled = buttonState && selectedPages.Count != PagesList.Items.Count; ToolButtonMovePageUp.Enabled = buttonState && selectedPages.Count != PagesList.Items.Count; ToolButtonEditImageProps.Enabled = propsButtonAvailable; + ToolButtonImagePreview.Enabled = selectedPages.Count == 1; - ToolButtonSetPageType.Enabled = buttonState; + ToolButtonSetPageType.Enabled = selectedPages.Count == 1; if (buttonState) { @@ -2632,75 +2633,7 @@ private void PagesList_DoubleClick(object sender, EventArgs e) private void PageView_DoubleClick(object sender, EventArgs e) { - //ToolButtonEditImageProps_Click(this, e); - - if (PageView.SelectedItem != null) - { - Page page = (Page)PageView.SelectedItem.Tag; - Page editPage = new Page(page); - - ImagePreviewForm pagePreviewForm = new ImagePreviewForm(editPage); - DialogResult dlgResult = pagePreviewForm.ShowDialog(); - - /* - if (dlgResult == DialogResult.OK) - { - Page pageResult = pageSettingsForm.GetResult(); - Page pageToUpdate = Program.ProjectModel.GetPageById(pageResult.Id); - if (pageToUpdate != null) - { - pageToUpdate.UpdatePage(pageResult); - if (!pageResult.Deleted) - { - if (editPage.Name != pageResult.Name) - { - HandleGlobalActionRequired(null, new GlobalActionRequiredEvent(Program.ProjectModel, 0, "Page name changed. Rebuild pageindex now?", "Rebuild", GlobalActionRequiredEvent.TASK_TYPE_INDEX_REBUILD, RebuildPageIndexMetaDataTask.UpdatePageIndexMetadata(Program.ProjectModel.Pages, Program.ProjectModel.MetaData, HandleGlobalTaskProgress, PageChanged))); - - PageChanged(null, new PageChangedEvent(pageResult, PageChangedEvent.IMAGE_STATUS_RENAMED)); - ArchiveStateChanged(null, new CBZArchiveStatusEvent(Program.ProjectModel, CBZArchiveStatusEvent.ARCHIVE_FILE_UPDATED)); - } - - try - { - MovePageTo(pageToUpdate, pageResult.Index); - } - catch (Exception ex) - { - RestoreIndex(pageToUpdate, editPage); - RestoreIndex(page, editPage); - - ApplicationMessage.ShowException(ex); - } - } - - if (pageResult.Deleted != editPage.Deleted) - { - HandleGlobalActionRequired(null, new GlobalActionRequiredEvent(Program.ProjectModel, 0, "Page order changed. Rebuild pageindex now?", "Rebuild", GlobalActionRequiredEvent.TASK_TYPE_INDEX_REBUILD, RebuildPageIndexMetaDataTask.UpdatePageIndexMetadata(Program.ProjectModel.Pages, Program.ProjectModel.MetaData, HandleGlobalTaskProgress, PageChanged))); - } - - if (pageToUpdate.Deleted) - { - try - { - pageToUpdate.DeleteTemporaryFile(); - } - catch (Exception ex) - { - MessageLogger.Instance.Log(LogMessageEvent.LOGMESSAGE_TYPE_ERROR, ex.Message); - } - - HandleGlobalActionRequired(null, new GlobalActionRequiredEvent(Program.ProjectModel, 0, "Page order changed. Rebuild pageindex now?", "Rebuild", GlobalActionRequiredEvent.TASK_TYPE_INDEX_REBUILD, RebuildPageIndexMetaDataTask.UpdatePageIndexMetadata(Program.ProjectModel.Pages, Program.ProjectModel.MetaData, HandleGlobalTaskProgress, PageChanged))); - } - - PageChanged(this, new PageChangedEvent(pageToUpdate, PageChangedEvent.IMAGE_STATUS_CHANGED)); - } - } - - pageSettingsForm.FreeResult(); - pageSettingsForm.Dispose(); - */ - } - + ToolButtonImagePreview_Click(this, e); } private void ComboBoxCompressionLevel_SelectedIndexChanged(object sender, EventArgs e) @@ -2722,9 +2655,18 @@ private void ComboBoxCompressionLevel_SelectedIndexChanged(object sender, EventA } } - private void toolStripButton2_Click(object sender, EventArgs e) + private void ToolButtonImagePreview_Click(object sender, EventArgs e) { - PageView_DoubleClick(sender, e); + if (PagesList.SelectedItem != null) + { + Page page = (Page)PagesList.SelectedItem.Tag; + Page editPage = new Page(page); + + ImagePreviewForm pagePreviewForm = new ImagePreviewForm(editPage); + DialogResult dlgResult = pagePreviewForm.ShowDialog(); + + + } } diff --git a/MyCBZ/Forms/MainForm.resx b/MyCBZ/Forms/MainForm.resx index 2258e3ed..7f5a312e 100644 --- a/MyCBZ/Forms/MainForm.resx +++ b/MyCBZ/Forms/MainForm.resx @@ -140,7 +140,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABu - CgAAAk1TRnQBSQFMAgEBAwEAAWABCwFgAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CgAAAk1TRnQBSQFMAgEBAwEAAYABCwGAAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -198,7 +198,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe - PgAAAk1TRnQBSQFMAgEBEQEAAWABCwFgAQsBGAEAARgBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFg + PgAAAk1TRnQBSQFMAgEBEQEAAYABCwGAAQsBGAEAARgBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFg AwABeAMAAQEBAAEYBgABh/8A/wD/AHgAAtQB1QMnNiUDJwPV3gADvQMlNr0DJQO+3gADvQMlEgAD/wHl AfMB9gG8AeoB8wG8AeoB8wHlAfMB9gP/EgADJQO+3gADvQMlDwAB9AH4AfkBUAHaAfQBAAHSAfoBAAHS AfoBAAHSAfoBAAHSAfoBUAHaAvQB+AH5DwADJQO+3gADvQMlDAAB+gL7AS4B1wH3AQAB0gH6AcwB7QL0 @@ -478,7 +478,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAK - AwAAAk1TRnQBSQFMAgEBAgEAAdABCgHQAQoBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA + AwAAAk1TRnQBSQFMAgEBAgEAAfABCgHwAQoBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABEAMAAQEBAAEYBgABDCEAA/cD2QPEA78D0gPtA/6lAAP+A7kDLA8lA38D/RIAA+cBUgFUAVUD+g8A A7gBtgK4bwAD+wOGBiUDSQOrA60DfwYlA0QD4wwAA+YDUAMlA30D+gYAA/0DtAMrAyUDumkAA/4DYwkl A5sGAAPfCSUDRAP9BgAD5wwlA0YD+gMAA7QMJQG2ArhmAAPUDCUDmwYAA98MJQN/A/4DAAPoAzUMJQN9 @@ -502,7 +502,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAQ - DAAAAk1TRnQBSQFMAgEBBAEAAWgBCwFoAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBAEAAYgBCwGIAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/MyCBZ/Win_CBZSettings.Designer.cs b/MyCBZ/Win_CBZSettings.Designer.cs index a9cb3366..9347b8a3 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.12.52b")] + [global::System.Configuration.DefaultSettingValueAttribute("0.12.53b")] public string Version { get { return ((string)(this["Version"])); diff --git a/MyCBZ/Win_CBZSettings.settings b/MyCBZ/Win_CBZSettings.settings index ff65afd0..024a7879 100644 --- a/MyCBZ/Win_CBZSettings.settings +++ b/MyCBZ/Win_CBZSettings.settings @@ -6,7 +6,7 @@ %APPDATA%\CBZMage\Temp\ - 0.12.52b + 0.12.53b <?xml version="1.0" encoding="utf-16"?> diff --git a/Readme.md b/Readme.md index ef42096b..bc2457d8 100644 --- a/Readme.md +++ b/Readme.md @@ -29,7 +29,7 @@ Microsoft Visual Studio [Community] 2022 (64-Bit) ## Latest Release -v0.12.52b released! +v0.12.53b released! ## Third party components diff --git a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj index 9d02c976..fe160a32 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:{97EE9702-CEE5-457D-8FC6-0D48D246F35A}" - "PackageCode" = "8:{42F5736E-8DE3-43D4-9B17-D0C834D9E742}" + "ProductCode" = "8:{E6A6B1B5-6D6C-4C79-9077-F1F7CA108DE2}" + "PackageCode" = "8:{AD5C7F5F-C1B3-4850-B226-7DA8B93798C5}" "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.12.52" + "ProductVersion" = "8:0.12.53" "Manufacturer" = "8:Trash_s0Ft" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:"