Minor GUI updates to main form and X-ray terms creator.
Series count match primary works/work - for one book in series.
Don't show "Extracting metadata..." on initial load.
MODIFY
Resources/cancel.png
Resources/cancel.png
Binary files a/Resources/cancel.png and b/Resources/cancel.png differ

MODIFY
XRayBuilderGUI.csproj
XRayBuilderGUI.csproj
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Icon.ico" />
- <None Include="packages.config" />
<None Include="Resources\cancel.png" />
+ <None Include="packages.config" />
<None Include="Resources\file-on.png" />
<None Include="Resources\file-off.png" />
<None Include="doc\Help.pdf">

MODIFY
src/DataSources/Goodreads.cs
src/DataSources/Goodreads.cs
@@ -263,7 +263,7 @@ public override async Task<BookInfo> GetNextInSeries(BookInfo curBook, AuthorPro
if (seriesHtmlDoc != null)
{
SeriesNode = seriesHtmlDoc.DocumentNode.SelectSingleNode("//div[@class='greyText']");
- match = Regex.Match(SeriesNode.InnerText, @"([0-9]*) primary works");
+ match = Regex.Match(SeriesNode.InnerText, @"([0-9]*) primary works?");
if (match.Success)
{
@@ -271,7 +271,7 @@ public override async Task<BookInfo> GetNextInSeries(BookInfo curBook, AuthorPro
}
else
{
- match = Regex.Match(SeriesNode.InnerText, @"([0-9]*) works,");
+ match = Regex.Match(SeriesNode.InnerText, @"([0-9]*) works?,");
curBook.totalInSeries = match.Groups[1].Value;
}
bool notWholeNumber = curBook.seriesPosition.Contains(".");

MODIFY
src/frmCreateXR.designer.cs
src/frmCreateXR.designer.cs
@@ -304,7 +304,8 @@ private void InitializeComponent()
this.dgvTerms.AllowUserToDeleteRows = false;
this.dgvTerms.AllowUserToResizeRows = false;
this.dgvTerms.BackgroundColor = System.Drawing.SystemColors.Window;
- this.dgvTerms.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.dgvTerms.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.dgvTerms.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
this.dgvTerms.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvTerms.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Column1,

MODIFY
src/frmCreateXR.resx
src/frmCreateXR.resx
<data name="btnOpenXml.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABHNCSVQICAgIfAhkiAAAAAFzUkdCAK7O
- HOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA3WAAAN1gGQb3mcAAAAGXRFWHRTb2Z0d2FyZQB3d3cu
+ HOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA3VAAAN1QE91ljxAAAAGXRFWHRTb2Z0d2FyZQB3d3cu
aW5rc2NhcGUub3Jnm+48GgAAAjpJREFUSEu11MtrE0EcwPHp1b/Ao3gXFC/+AWL/AQ9FbWNjbfCFohI1
ldCgxrxIwYNilVZLbS3UYilUgm+pxqzZzaPp5tmkSZo6O/vIxk16jfNLoYQQbOnGw3d2mdn5DMxhUb1e
/y+1nexEbSc7UWPweF0Wh+vBXGtOj33G5X14onXTbmoMTpd9qlqtspubtWhziiL9mnr96g09oJd+19W8
<data name="btnClear.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABHNCSVQICAgIfAhkiAAAAAFzUkdCAK7O
- HOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA3WAAAN1gGQb3mcAAAAGXRFWHRTb2Z0d2FyZQB3d3cu
+ HOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA3VAAAN1QE91ljxAAAAGXRFWHRTb2Z0d2FyZQB3d3cu
aW5rc2NhcGUub3Jnm+48GgAABQJJREFUSEu1lGtQlGUUxxEdxhxNs7IR0L2wrBDNFAIqoKigwN65meJl
gbgsd1dBkVxtubi77y4goIuJqzJcRCTNe0AiiIoiipNN9aUapw9ZH2rK5aYp/867usQyTjN96J35vddz
fs95nvPM6wTgf+GVL+1wRPpQnsTwsWdUebtAbvqVLzU8ESrKHnjIjNVckX79Ijkza2I8P9KwXCAztrP3

MODIFY
src/frmMain.Designer.cs
src/frmMain.Designer.cs
@@ -50,6 +50,10 @@ private void InitializeComponent()
this.prgBar = new System.Windows.Forms.ProgressBar();
this.txtOutput = new System.Windows.Forms.RichTextBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.pbFile4 = new System.Windows.Forms.PictureBox();
+ this.pbFile3 = new System.Windows.Forms.PictureBox();
+ this.pbFile2 = new System.Windows.Forms.PictureBox();
+ this.pbFile1 = new System.Windows.Forms.PictureBox();
this.lblFiles = new System.Windows.Forms.Label();
this.txtAsin = new System.Windows.Forms.LinkLabel();
this.txtAuthor = new System.Windows.Forms.Label();
@@ -57,6 +61,7 @@ private void InitializeComponent()
this.lblAsin = new System.Windows.Forms.Label();
this.lblAuthor = new System.Windows.Forms.Label();
this.lblTitle = new System.Windows.Forms.Label();
+ this.pbCover = new System.Windows.Forms.PictureBox();
this.label1 = new System.Windows.Forms.Label();
this.btnCancel = new System.Windows.Forms.Button();
this.btnCreate = new System.Windows.Forms.Button();
@@ -64,11 +69,6 @@ private void InitializeComponent()
this.btnAbout = new System.Windows.Forms.Button();
this.btnHelp = new System.Windows.Forms.Button();
this.btnExtractTerms = new System.Windows.Forms.Button();
- this.pbFile4 = new System.Windows.Forms.PictureBox();
- this.pbFile3 = new System.Windows.Forms.PictureBox();
- this.pbFile2 = new System.Windows.Forms.PictureBox();
- this.pbFile1 = new System.Windows.Forms.PictureBox();
- this.pbCover = new System.Windows.Forms.PictureBox();
this.btnBrowseOutput = new System.Windows.Forms.Button();
this.btnOneClick = new System.Windows.Forms.Button();
this.btnUnpack = new System.Windows.Forms.Button();
@@ -268,9 +268,9 @@ private void InitializeComponent()
//
this.prgBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.prgBar.Location = new System.Drawing.Point(12, 540);
+ this.prgBar.Location = new System.Drawing.Point(12, 543);
this.prgBar.Name = "prgBar";
- this.prgBar.Size = new System.Drawing.Size(780, 12);
+ this.prgBar.Size = new System.Drawing.Size(772, 14);
this.prgBar.Step = 1;
this.prgBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
this.prgBar.TabIndex = 18;
@@ -287,7 +287,7 @@ private void InitializeComponent()
this.txtOutput.Name = "txtOutput";
this.txtOutput.ReadOnly = true;
this.txtOutput.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
- this.txtOutput.Size = new System.Drawing.Size(596, 335);
+ this.txtOutput.Size = new System.Drawing.Size(596, 338);
this.txtOutput.TabIndex = 61;
this.txtOutput.Text = "";
this.txtOutput.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.txtOutput_LinkClicked);
@@ -314,6 +314,42 @@ private void InitializeComponent()
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Book Details";
//
+ // pbFile4
+ //
+ this.pbFile4.Image = global::XRayBuilderGUI.Properties.Resources.file_off;
+ this.pbFile4.Location = new System.Drawing.Point(107, 323);
+ this.pbFile4.Name = "pbFile4";
+ this.pbFile4.Size = new System.Drawing.Size(9, 9);
+ this.pbFile4.TabIndex = 73;
+ this.pbFile4.TabStop = false;
+ //
+ // pbFile3
+ //
+ this.pbFile3.Image = global::XRayBuilderGUI.Properties.Resources.file_off;
+ this.pbFile3.Location = new System.Drawing.Point(90, 323);
+ this.pbFile3.Name = "pbFile3";
+ this.pbFile3.Size = new System.Drawing.Size(9, 9);
+ this.pbFile3.TabIndex = 72;
+ this.pbFile3.TabStop = false;
+ //
+ // pbFile2
+ //
+ this.pbFile2.Image = global::XRayBuilderGUI.Properties.Resources.file_off;
+ this.pbFile2.Location = new System.Drawing.Point(73, 323);
+ this.pbFile2.Name = "pbFile2";
+ this.pbFile2.Size = new System.Drawing.Size(9, 9);
+ this.pbFile2.TabIndex = 71;
+ this.pbFile2.TabStop = false;
+ //
+ // pbFile1
+ //
+ this.pbFile1.Image = global::XRayBuilderGUI.Properties.Resources.file_off;
+ this.pbFile1.Location = new System.Drawing.Point(56, 323);
+ this.pbFile1.Name = "pbFile1";
+ this.pbFile1.Size = new System.Drawing.Size(9, 9);
+ this.pbFile1.TabIndex = 70;
+ this.pbFile1.TabStop = false;
+ //
// lblFiles
//
this.lblFiles.AutoSize = true;
@@ -401,6 +437,15 @@ private void InitializeComponent()
this.lblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblTitle.Visible = false;
//
+ // pbCover
+ //
+ this.pbCover.Location = new System.Drawing.Point(14, 20);
+ this.pbCover.Name = "pbCover";
+ this.pbCover.Size = new System.Drawing.Size(166, 249);
+ this.pbCover.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pbCover.TabIndex = 0;
+ this.pbCover.TabStop = false;
+ //
// label1
//
this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
@@ -411,11 +456,12 @@ private void InitializeComponent()
//
// btnCancel
//
+ this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCancel.Enabled = false;
this.btnCancel.Image = global::XRayBuilderGUI.Properties.Resources.cancel;
- this.btnCancel.Location = new System.Drawing.Point(797, 537);
+ this.btnCancel.Location = new System.Drawing.Point(795, 539);
this.btnCancel.Name = "btnCancel";
- this.btnCancel.Size = new System.Drawing.Size(18, 18);
+ this.btnCancel.Size = new System.Drawing.Size(22, 22);
this.btnCancel.TabIndex = 69;
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@@ -470,51 +516,6 @@ private void InitializeComponent()
this.btnExtractTerms.UseVisualStyleBackColor = true;
this.btnExtractTerms.Click += new System.EventHandler(this.btnExtractTerms_Click);
//
- // pbFile4
- //
- this.pbFile4.Image = global::XRayBuilderGUI.Properties.Resources.file_off;
- this.pbFile4.Location = new System.Drawing.Point(107, 323);
- this.pbFile4.Name = "pbFile4";
- this.pbFile4.Size = new System.Drawing.Size(9, 9);
- this.pbFile4.TabIndex = 73;
- this.pbFile4.TabStop = false;
- //
- // pbFile3
- //
- this.pbFile3.Image = global::XRayBuilderGUI.Properties.Resources.file_off;
- this.pbFile3.Location = new System.Drawing.Point(90, 323);
- this.pbFile3.Name = "pbFile3";
- this.pbFile3.Size = new System.Drawing.Size(9, 9);
- this.pbFile3.TabIndex = 72;
- this.pbFile3.TabStop = false;
- //
- // pbFile2
- //
- this.pbFile2.Image = global::XRayBuilderGUI.Properties.Resources.file_off;
- this.pbFile2.Location = new System.Drawing.Point(73, 323);
- this.pbFile2.Name = "pbFile2";
- this.pbFile2.Size = new System.Drawing.Size(9, 9);
- this.pbFile2.TabIndex = 71;
- this.pbFile2.TabStop = false;
- //
- // pbFile1
- //
- this.pbFile1.Image = global::XRayBuilderGUI.Properties.Resources.file_off;
- this.pbFile1.Location = new System.Drawing.Point(56, 323);
- this.pbFile1.Name = "pbFile1";
- this.pbFile1.Size = new System.Drawing.Size(9, 9);
- this.pbFile1.TabIndex = 70;
- this.pbFile1.TabStop = false;
- //
- // pbCover
- //
- this.pbCover.Location = new System.Drawing.Point(14, 20);
- this.pbCover.Name = "pbCover";
- this.pbCover.Size = new System.Drawing.Size(166, 249);
- this.pbCover.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.pbCover.TabIndex = 0;
- this.pbCover.TabStop = false;
- //
// btnBrowseOutput
//
this.btnBrowseOutput.Image = ((System.Drawing.Image)(resources.GetObject("btnBrowseOutput.Image")));
@@ -621,7 +622,7 @@ private void InitializeComponent()
this.AllowDrop = true;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(828, 564);
+ this.ClientSize = new System.Drawing.Size(828, 572);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnCreate);
this.Controls.Add(this.btnPreview);

MODIFY
src/frmMain.cs
src/frmMain.cs
@@ -850,7 +850,7 @@ private void txtMobi_TextChanged(object sender, EventArgs e)
}
else
{
- Logger.Log("Extracting metadata...");
+ //Logger.Log("Extracting metadata...");
try
{
Unpack.Metadata md = Functions.GetMetaDataInternal(txtMobi.Text, settings.outDir, false);

MODIFY
src/frmMain.resx
src/frmMain.resx
<data name="btnCreate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAN
- 0wAADdMBvdUcagAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAARMSURBVFhHxZdJ
+ 0gAADdIBb5L+jgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAARMSURBVFhHxZdJ
SGRnFIUlCYHedEggm16kN4FsJAmKqBFnERURZ0wTd+LKleBGXDgP5YCzoojaizYNSUMi6Ric56lj7LKc
4xznIc5DlXJzz03XX5quhG67qlPwWdSrW+ec9+7/7v+0IaL/FbMH3ybyp6am5l5dXd0jfr+orq4mawKP
F173VIDa2toGnU53ZTDo6erq8iUuLy2FgfT6C9JqtVe1tTUNKkBVVZUeX+zt7dDOzpawvb15g62tDcXm
<data name="btnExtractTerms.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAN
- 0wAADdMBvdUcagAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAZ4SURBVFhHvZUL
+ 0gAADdIBb5L+jgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAZ4SURBVFhHvZUL
UJRVFMeXxQLHRz5ybJpskHxMMZka+UgTmcZprMZ8zQgpqbgI+MABlFJypMAJQR6VzWhpCkaJD1BBSRgV
FVEwYXcRQUR5iCy7LIuorDz2+/6de+FbdmFJnBzPzG+/veeee8//u/ee+8kA9ErBMtm7RJDKu1+m2vul
LHoeVa6w/63Qyy6U/ONsjbGEYvwIkZDb6mf0cLDgwq/kwZSoqXTz+Ob6ZN9WY8F+tBQfhVF5EI/z98CQ
<data name="btnDownloadTerms.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAN
- 0wAADdMBvdUcagAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAZySURBVFhHxZZr
+ 0gAADdIBb5L+jgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAZySURBVFhHxZZr
TNNnFMb3wV0+zGFmtsUsM5q57POSJSZLlph5XczmlnmZ023GIbq5qNvcuKkt1xYKXjpFRGuhtVCmIlgo
BYotpdCWtpSWAoo3zJxR8TIlgoru2TlviwHpHGUm+ye/9LzX87y3c/oMgP+ViJVyuXxqtiLzujw7A08F
RWZfVlba25F8jaqQSqUTFDlyn9FU+cDn86G1tRUejwdutxtOpxPNzc2w2+2w2WywWq0wm80wmUwwGAwo

- Minor GUI updates to main form and X-ray terms creator.
- Series count match primary works/work - for one book in series.
- Don't show "Extracting metadata..." on initial load.