diff --git a/MyCBZ/App.config b/MyCBZ/App.config
index a8175aa8..ffc86aae 100644
--- a/MyCBZ/App.config
+++ b/MyCBZ/App.config
@@ -37,6 +37,9 @@
False
+
+ False
+
@@ -61,7 +64,7 @@
- 0.14.69b
+ 0.14.70b
diff --git a/MyCBZ/Data/DataValidation.cs b/MyCBZ/Data/DataValidation.cs
index db359168..b7112921 100644
--- a/MyCBZ/Data/DataValidation.cs
+++ b/MyCBZ/Data/DataValidation.cs
@@ -117,6 +117,7 @@ public static bool ValidateTags(ref ArrayList unknownTagsList, bool showError =
MetaDataEntry tagEntry = Program.ProjectModel.MetaData.EntryByKey("Tags");
System.Collections.Specialized.StringCollection validTags = Win_CBZSettings.Default.ValidKnownTags;
+ System.Collections.Specialized.StringCollection validTagsLcase = new System.Collections.Specialized.StringCollection();
//ArrayList unknownTags = new ArrayList();
if (unknownTagsList == null)
@@ -124,14 +125,38 @@ public static bool ValidateTags(ref ArrayList unknownTagsList, bool showError =
unknownTagsList = new ArrayList();
}
+ if (Win_CBZSettings.Default.TagValidationIgnoreCase) {
+ String[] bufferStrings = new string[validTags.Count];
+ validTags.CopyTo(bufferStrings, 0);
+ validTagsLcase.AddRange(bufferStrings.Select(s => s.ToLower()).ToArray());
+ }
+
if (tagEntry != null && tagEntry.Value != null && tagEntry.Value.Length > 0 && validTags.Count > 0)
{
- String[] tags = tagEntry.Value.Split(',').Select(s => s.Trim()).ToArray();
+ String[] tags = new String[1];
+ if (Win_CBZSettings.Default.TagValidationIgnoreCase)
+ {
+ tags = tagEntry.Value.Split(',').Select(s => s.Trim().ToLower()).ToArray();
+ } else
+ {
+ tags = tagEntry.Value.Split(',').Select(s => s.Trim()).ToArray();
+ }
+
foreach (String tag in tags)
{
- if (!validTags.Contains(tag))
+ if (Win_CBZSettings.Default.TagValidationIgnoreCase)
+ {
+ if (!validTagsLcase.Contains(tag.ToLower()))
+ {
+ unknownTagsList.Add(tag);
+ }
+ }
+ else
{
- unknownTagsList.Add(tag);
+ if (!validTags.Contains(tag))
+ {
+ unknownTagsList.Add(tag);
+ }
}
}
}
diff --git a/MyCBZ/Forms/MainForm.Designer.cs b/MyCBZ/Forms/MainForm.Designer.cs
index 0554773f..c5c5879a 100644
--- a/MyCBZ/Forms/MainForm.Designer.cs
+++ b/MyCBZ/Forms/MainForm.Designer.cs
@@ -654,7 +654,7 @@ private void InitializeComponent()
// copyToolStripMenuItem
//
this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
- this.copyToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
+ this.copyToolStripMenuItem.Size = new System.Drawing.Size(184, 26);
this.copyToolStripMenuItem.Text = "Copy";
//
// PasteToolStripMenuItem
@@ -662,33 +662,33 @@ private void InitializeComponent()
this.PasteToolStripMenuItem.Enabled = false;
this.PasteToolStripMenuItem.Image = global::Win_CBZ.Properties.Resources.clipboard_paste;
this.PasteToolStripMenuItem.Name = "PasteToolStripMenuItem";
- this.PasteToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
+ this.PasteToolStripMenuItem.Size = new System.Drawing.Size(184, 26);
this.PasteToolStripMenuItem.Text = "Paste";
//
// toolStripMenuItem7
//
this.toolStripMenuItem7.Name = "toolStripMenuItem7";
- this.toolStripMenuItem7.Size = new System.Drawing.Size(161, 6);
+ this.toolStripMenuItem7.Size = new System.Drawing.Size(181, 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(164, 22);
+ this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(184, 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(161, 6);
+ this.toolStripMenuItem10.Size = new System.Drawing.Size(181, 6);
//
// settingsToolStripMenuItem
//
this.settingsToolStripMenuItem.Image = global::Win_CBZ.Properties.Resources.window_gear;
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
- this.settingsToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
+ this.settingsToolStripMenuItem.Size = new System.Drawing.Size(184, 26);
this.settingsToolStripMenuItem.Text = "Settings";
this.settingsToolStripMenuItem.Click += new System.EventHandler(this.SettingsToolStripMenuItem_Click);
//
@@ -947,7 +947,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, 366F));
+ this.GlobalAlertTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 367F));
this.GlobalAlertTableLayout.Controls.Add(this.LabelGlobalActionStatusMessage, 1, 0);
this.GlobalAlertTableLayout.Controls.Add(this.ExecuteCurrentGlobalAction, 2, 0);
this.GlobalAlertTableLayout.Controls.Add(this.GlobalAlertMessageIcon, 0, 0);
@@ -1497,7 +1497,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(264, 428);
+ this.FileSettingsTablePanel.Size = new System.Drawing.Size(247, 428);
this.FileSettingsTablePanel.TabIndex = 1;
//
// PlaceholdersInfoLabel
@@ -1543,7 +1543,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(258, 21);
+ this.TextboxStoryPageRenamingPattern.Size = new System.Drawing.Size(241, 21);
this.TextboxStoryPageRenamingPattern.TabIndex = 8;
this.TextboxStoryPageRenamingPattern.Text = "{title}_p{page}.{ext}";
this.TextboxStoryPageRenamingPattern.TextChanged += new System.EventHandler(this.TextboxStoryPageRenamingPattern_TextChanged_1);
@@ -1567,7 +1567,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(258, 21);
+ this.TextboxSpecialPageRenamingPattern.Size = new System.Drawing.Size(241, 21);
this.TextboxSpecialPageRenamingPattern.TabIndex = 10;
this.TextboxSpecialPageRenamingPattern.Text = "{type}_{index}.{ext}";
this.TextboxSpecialPageRenamingPattern.TextChanged += new System.EventHandler(this.TextboxSpecialPageRenamingPattern_TextChanged_1);
@@ -1582,7 +1582,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(258, 96);
+ this.PlaceholdersFlowPanel.Size = new System.Drawing.Size(241, 96);
this.PlaceholdersFlowPanel.TabIndex = 12;
//
// label2
@@ -1599,7 +1599,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(162, 6);
+ this.CheckBoxPreview.Location = new System.Drawing.Point(151, 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);
@@ -1616,7 +1616,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(258, 96);
+ this.RenamerExcludePages.Size = new System.Drawing.Size(241, 96);
this.RenamerExcludePages.TabIndex = 16;
this.RenamerExcludePages.TextChanged += new System.EventHandler(this.RenamerExcludePages_TextChanged);
//
@@ -1626,7 +1626,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(153, 37);
+ this.btnGetExcludesFromSelectedPages.Size = new System.Drawing.Size(142, 37);
this.btnGetExcludesFromSelectedPages.TabIndex = 17;
this.btnGetExcludesFromSelectedPages.Text = "Get From selected Pages";
this.btnGetExcludesFromSelectedPages.UseVisualStyleBackColor = true;
diff --git a/MyCBZ/Forms/MainForm.cs b/MyCBZ/Forms/MainForm.cs
index 47fa46f4..15bf9834 100644
--- a/MyCBZ/Forms/MainForm.cs
+++ b/MyCBZ/Forms/MainForm.cs
@@ -2691,6 +2691,7 @@ private void SettingsToolStripMenuItem_Click(object sender, EventArgs e)
}
Win_CBZSettings.Default.ValidateTags = settingsDialog.ValidateTagsSetting;
+ Win_CBZSettings.Default.TagValidationIgnoreCase = settingsDialog.TagValidationIgnoreCase;
}
}
diff --git a/MyCBZ/Forms/MainForm.resx b/MyCBZ/Forms/MainForm.resx
index de2d4045..2ae47c37 100644
--- a/MyCBZ/Forms/MainForm.resx
+++ b/MyCBZ/Forms/MainForm.resx
@@ -140,7 +140,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABu
- CgAAAk1TRnQBSQFMAgEBAwEAAcgBDgHIAQ4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CgAAAk1TRnQBSQFMAgEBAwEAAdABDgHQAQ4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -198,7 +198,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe
- PgAAAk1TRnQBSQFMAgEBEQEAAcgBDgHIAQ4BGAEAARgBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFg
+ PgAAAk1TRnQBSQFMAgEBEQEAAdABDgHQAQ4BGAEAARgBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFg
AwABeAMAAQEBAAEYBgABh/8A/wD/AHgAAtQB1QMnNiUDJwPV3gADvQMlNr0DJQO+3gADvQMlEgAD/wHl
AfMB9gG8AeoB8wG8AeoB8wHlAfMB9gP/EgADJQO+3gADvQMlDwAB9AH4AfkBUAHaAfQBAAHSAfoBAAHS
AfoBAAHSAfoBAAHSAfoBUAHaAvQB+AH5DwADJQO+3gADvQMlDAAB+gL7AS4B1wH3AQAB0gH6AcwB7QL0
@@ -490,7 +490,7 @@ The Page with Type 'FrontCover' should be at index 1.
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAK
- AwAAAk1TRnQBSQFMAgEBAgEAATgBDgE4AQ4BEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ AwAAAk1TRnQBSQFMAgEBAgEAAUABDgFAAQ4BEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEYBgABDCEAA/cD2QPEA78D0gPtA/6lAAP+A7kDLA8lA38D/RIAA+cBUgFUAVUD+g8A
A7gBtgK4bwAD+wOGBiUDSQOrA60DfwYlA0QD4wwAA+YDUAMlA30D+gYAA/0DtAMrAyUDumkAA/4DYwkl
A5sGAAPfCSUDRAP9BgAD5wwlA0YD+gMAA7QMJQG2ArhmAAPUDCUDmwYAA98MJQN/A/4DAAPoAzUMJQN9
@@ -514,7 +514,7 @@ The Page with Type 'FrontCover' should be at index 1.
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAQ
- DAAAAk1TRnQBSQFMAgEBBAEAAdABDgHQAQ4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ DAAAAk1TRnQBSQFMAgEBBAEAAdgBDgHYAQ4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
diff --git a/MyCBZ/Forms/SettingsDialog.Designer.cs b/MyCBZ/Forms/SettingsDialog.Designer.cs
index 3dd40a1c..7960dfc8 100644
--- a/MyCBZ/Forms/SettingsDialog.Designer.cs
+++ b/MyCBZ/Forms/SettingsDialog.Designer.cs
@@ -50,6 +50,7 @@ private void InitializeComponent()
this.label3 = new System.Windows.Forms.Label();
this.InfoIconTooltip = new System.Windows.Forms.PictureBox();
this.TagValidationTooltip = new System.Windows.Forms.ToolTip(this.components);
+ this.CheckBoxTagValidationIgnoreCase = new System.Windows.Forms.CheckBox();
this.SettingsTablePanel.SuspendLayout();
this.HeaderPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -246,19 +247,21 @@ private void InitializeComponent()
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 2;
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 58.72641F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 41.27359F));
- this.tableLayoutPanel1.Controls.Add(this.ValidTags, 0, 1);
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 57.54717F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 42.45283F));
this.tableLayoutPanel1.Controls.Add(this.CheckBoxValidateTags, 0, 0);
- this.tableLayoutPanel1.Controls.Add(this.label3, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.InfoIconTooltip, 1, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label3, 0, 3);
+ this.tableLayoutPanel1.Controls.Add(this.ValidTags, 0, 2);
+ this.tableLayoutPanel1.Controls.Add(this.CheckBoxTagValidationIgnoreCase, 0, 1);
this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 5);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
- this.tableLayoutPanel1.RowCount = 3;
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.82759F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 80.17242F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 47F));
+ this.tableLayoutPanel1.RowCount = 4;
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 45.28302F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 54.71698F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 153F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(424, 236);
this.tableLayoutPanel1.TabIndex = 0;
//
@@ -266,12 +269,12 @@ private void InitializeComponent()
//
this.tableLayoutPanel1.SetColumnSpan(this.ValidTags, 2);
this.ValidTags.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.ValidTags.Location = new System.Drawing.Point(2, 39);
+ this.ValidTags.Location = new System.Drawing.Point(2, 55);
this.ValidTags.Margin = new System.Windows.Forms.Padding(2);
this.ValidTags.Multiline = true;
this.ValidTags.Name = "ValidTags";
this.ValidTags.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.ValidTags.Size = new System.Drawing.Size(403, 138);
+ this.ValidTags.Size = new System.Drawing.Size(403, 126);
this.ValidTags.TabIndex = 3;
//
// CheckBoxValidateTags
@@ -281,15 +284,16 @@ private void InitializeComponent()
this.CheckBoxValidateTags.Margin = new System.Windows.Forms.Padding(2);
this.CheckBoxValidateTags.Name = "CheckBoxValidateTags";
this.CheckBoxValidateTags.Padding = new System.Windows.Forms.Padding(4, 4, 0, 0);
- this.CheckBoxValidateTags.Size = new System.Drawing.Size(230, 21);
+ this.CheckBoxValidateTags.Size = new System.Drawing.Size(230, 20);
this.CheckBoxValidateTags.TabIndex = 0;
this.CheckBoxValidateTags.Text = "Validate Tags against a list of known Tags";
this.CheckBoxValidateTags.UseVisualStyleBackColor = true;
+ this.CheckBoxValidateTags.CheckStateChanged += new System.EventHandler(this.CheckBoxValidateTags_CheckStateChanged);
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(2, 188);
+ this.label3.Location = new System.Drawing.Point(2, 206);
this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(90, 13);
@@ -300,10 +304,11 @@ private void InitializeComponent()
//
this.InfoIconTooltip.Image = global::Win_CBZ.Properties.Resources.information;
this.InfoIconTooltip.InitialImage = global::Win_CBZ.Properties.Resources.information;
- this.InfoIconTooltip.Location = new System.Drawing.Point(249, 0);
+ this.InfoIconTooltip.Location = new System.Drawing.Point(244, 0);
this.InfoIconTooltip.Margin = new System.Windows.Forms.Padding(0);
this.InfoIconTooltip.Name = "InfoIconTooltip";
this.InfoIconTooltip.Padding = new System.Windows.Forms.Padding(5);
+ this.tableLayoutPanel1.SetRowSpan(this.InfoIconTooltip, 2);
this.InfoIconTooltip.Size = new System.Drawing.Size(33, 37);
this.InfoIconTooltip.TabIndex = 5;
this.InfoIconTooltip.TabStop = false;
@@ -320,6 +325,18 @@ private void InitializeComponent()
this.TagValidationTooltip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
this.TagValidationTooltip.ToolTipTitle = "Custom Tag Validation";
//
+ // CheckBoxTagValidationIgnoreCase
+ //
+ this.CheckBoxTagValidationIgnoreCase.AutoSize = true;
+ this.CheckBoxTagValidationIgnoreCase.Enabled = false;
+ this.CheckBoxTagValidationIgnoreCase.Location = new System.Drawing.Point(3, 27);
+ this.CheckBoxTagValidationIgnoreCase.Name = "CheckBoxTagValidationIgnoreCase";
+ this.CheckBoxTagValidationIgnoreCase.Padding = new System.Windows.Forms.Padding(18, 4, 0, 0);
+ this.CheckBoxTagValidationIgnoreCase.Size = new System.Drawing.Size(114, 21);
+ this.CheckBoxTagValidationIgnoreCase.TabIndex = 6;
+ this.CheckBoxTagValidationIgnoreCase.Text = "Case Sensitive";
+ this.CheckBoxTagValidationIgnoreCase.UseVisualStyleBackColor = true;
+ //
// SettingsDialog
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -370,5 +387,6 @@ private void InitializeComponent()
private System.Windows.Forms.Label label3;
private System.Windows.Forms.PictureBox InfoIconTooltip;
private System.Windows.Forms.ToolTip TagValidationTooltip;
+ private System.Windows.Forms.CheckBox CheckBoxTagValidationIgnoreCase;
}
}
\ No newline at end of file
diff --git a/MyCBZ/Forms/SettingsDialog.cs b/MyCBZ/Forms/SettingsDialog.cs
index 39d3f1d4..9bc7393f 100644
--- a/MyCBZ/Forms/SettingsDialog.cs
+++ b/MyCBZ/Forms/SettingsDialog.cs
@@ -21,6 +21,8 @@ public partial class SettingsDialog : Form
public bool ValidateTagsSetting;
+ public bool TagValidationIgnoreCase;
+
public SettingsDialog()
{
InitializeComponent();
@@ -36,6 +38,7 @@ public SettingsDialog()
}
CheckBoxValidateTags.Checked = Win_CBZSettings.Default.ValidateTags;
+ CheckBoxTagValidationIgnoreCase.Checked = !Win_CBZSettings.Default.TagValidationIgnoreCase;
}
private void ButtonCancel_Click(object sender, EventArgs e)
@@ -79,6 +82,7 @@ private void SettingsDialog_FormClosing(object sender, FormClosingEventArgs e)
NewDefaults = CustomDefaultKeys.Lines.ToArray();
NewValidTagList = ValidTags.Lines.ToArray();
ValidateTagsSetting = CheckBoxValidateTags.Checked;
+ TagValidationIgnoreCase = !CheckBoxTagValidationIgnoreCase.Checked;
}
catch (MetaDataValidationException mv)
{
@@ -98,5 +102,10 @@ private void SettingsTablePanel_Paint(object sender, PaintEventArgs e)
{
}
+
+ private void CheckBoxValidateTags_CheckStateChanged(object sender, EventArgs e)
+ {
+ CheckBoxTagValidationIgnoreCase.Enabled = CheckBoxValidateTags.CheckState == CheckState.Checked;
+ }
}
}
diff --git a/MyCBZ/Win_CBZSettings.Designer.cs b/MyCBZ/Win_CBZSettings.Designer.cs
index 343bd8ad..aed34204 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.14.69b")]
+ [global::System.Configuration.DefaultSettingValueAttribute("0.14.70b")]
public string Version {
get {
return ((string)(this["Version"]));
@@ -183,5 +183,17 @@ public bool CompatMode {
this["CompatMode"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool TagValidationIgnoreCase {
+ get {
+ return ((bool)(this["TagValidationIgnoreCase"]));
+ }
+ set {
+ this["TagValidationIgnoreCase"] = value;
+ }
+ }
}
}
diff --git a/MyCBZ/Win_CBZSettings.settings b/MyCBZ/Win_CBZSettings.settings
index 7d701836..8d92a9f1 100644
--- a/MyCBZ/Win_CBZSettings.settings
+++ b/MyCBZ/Win_CBZSettings.settings
@@ -6,7 +6,7 @@
%APPDATA%\CBZMage\Temp\
- 0.14.69b
+ 0.14.70b
<?xml version="1.0" encoding="utf-16"?>
@@ -60,5 +60,8 @@
False
+
+ False
+
\ No newline at end of file
diff --git a/Readme.md b/Readme.md
index 2d2d7df1..fd4360d9 100644
--- a/Readme.md
+++ b/Readme.md
@@ -30,7 +30,7 @@ Microsoft Visual Studio [Community] 2022 (64-Bit)
## Latest Release
-v0.14.69b released!
+v0.14.70b released!
## Third party components
diff --git a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj
index 2a72ab3d..c6464955 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:{F559BD72-8687-4BEA-B211-AFDE4260B941}"
- "PackageCode" = "8:{2C53EEEE-8DDF-4ACF-AF6B-6E6A73773DBD}"
+ "ProductCode" = "8:{E5C5DFCD-821B-42BE-A467-F10EB6A6B89B}"
+ "PackageCode" = "8:{3137D366-6AE1-4C64-8793-3860CE383F47}"
"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.14.69"
+ "ProductVersion" = "8:0.14.70"
"Manufacturer" = "8:Trash_s0Ft"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"