diff --git a/Tumbl Tool/Properties/AssemblyInfo.cs b/Tumbl Tool/Properties/AssemblyInfo.cs
index dd8b2ae..41bd10f 100644
--- a/Tumbl Tool/Properties/AssemblyInfo.cs
+++ b/Tumbl Tool/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
\ No newline at end of file
diff --git a/Tumblr Tool UI/Form1.Designer.cs b/Tumblr Tool UI/Form1.Designer.cs
index 70a1b5a..16cb4ba 100644
--- a/Tumblr Tool UI/Form1.Designer.cs
+++ b/Tumblr Tool UI/Form1.Designer.cs
@@ -120,6 +120,7 @@ private void InitializeComponent()
this.blogTagListWorker = new System.ComponentModel.BackgroundWorker();
this.blogTagLIstWorkerUI = new System.ComponentModel.BackgroundWorker();
this.tagListSaveWorker = new System.ComponentModel.BackgroundWorker();
+ this.check_Options_GenerateUncompressedLog = new System.Windows.Forms.CheckBox();
this.menu_TopMenu.SuspendLayout();
this.status_Strip.SuspendLayout();
this.tabControl_Main.SuspendLayout();
@@ -321,7 +322,7 @@ private void InitializeComponent()
this.tabControl_Main.ItemSize = new System.Drawing.Size(0, 26);
this.tabControl_Main.Location = new System.Drawing.Point(0, 57);
this.tabControl_Main.Name = "tabControl_Main";
- this.tabControl_Main.SelectedIndex = 0;
+ this.tabControl_Main.SelectedIndex = 3;
this.tabControl_Main.Size = new System.Drawing.Size(625, 256);
this.tabControl_Main.TabBorderColor = System.Drawing.Color.Transparent;
this.tabControl_Main.TabGradient.ColorEnd = System.Drawing.Color.Transparent;
@@ -1055,10 +1056,11 @@ private void InitializeComponent()
//
// section_Options_LogOptions
//
+ this.section_Options_LogOptions.Controls.Add(this.check_Options_GenerateUncompressedLog);
this.section_Options_LogOptions.Controls.Add(this.check_Options_GenerateLog);
this.section_Options_LogOptions.Location = new System.Drawing.Point(311, 23);
this.section_Options_LogOptions.Name = "section_Options_LogOptions";
- this.section_Options_LogOptions.Size = new System.Drawing.Size(133, 72);
+ this.section_Options_LogOptions.Size = new System.Drawing.Size(215, 107);
this.section_Options_LogOptions.TabIndex = 6;
this.section_Options_LogOptions.TabStop = false;
this.section_Options_LogOptions.Text = "Log Options";
@@ -1076,6 +1078,7 @@ private void InitializeComponent()
this.check_Options_GenerateLog.Text = "Generate Log File";
this.check_Options_GenerateLog.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.check_Options_GenerateLog.UseVisualStyleBackColor = true;
+ this.check_Options_GenerateLog.CheckedChanged += new System.EventHandler(this.GenerateLogCheckedChange);
//
// section_Options_MethodOptions
//
@@ -1337,6 +1340,20 @@ private void InitializeComponent()
this.tagListSaveWorker.DoWork += new System.ComponentModel.DoWorkEventHandler(this.TagListSaveWorker_Work);
this.tagListSaveWorker.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.TagListSaveWorker_Completed);
//
+ // check_Options_GenerateUncompressedLog
+ //
+ this.check_Options_GenerateUncompressedLog.Checked = true;
+ this.check_Options_GenerateUncompressedLog.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.check_Options_GenerateUncompressedLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.check_Options_GenerateUncompressedLog.Location = new System.Drawing.Point(8, 67);
+ this.check_Options_GenerateUncompressedLog.Name = "check_Options_GenerateUncompressedLog";
+ this.check_Options_GenerateUncompressedLog.RightToLeft = System.Windows.Forms.RightToLeft.No;
+ this.check_Options_GenerateUncompressedLog.Size = new System.Drawing.Size(202, 34);
+ this.check_Options_GenerateUncompressedLog.TabIndex = 1;
+ this.check_Options_GenerateUncompressedLog.Text = "Generate Uncompressed Log File";
+ this.check_Options_GenerateUncompressedLog.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.check_Options_GenerateUncompressedLog.UseVisualStyleBackColor = true;
+ //
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 16F);
@@ -1484,6 +1501,7 @@ private void InitializeComponent()
private System.ComponentModel.BackgroundWorker tagListSaveWorker;
private System.Windows.Forms.CheckBox check_Tags_PhotoOnly;
private System.Windows.Forms.ToolStripMenuItem menuItem_LoadFromFile;
+ private System.Windows.Forms.CheckBox check_Options_GenerateUncompressedLog;
}
}
diff --git a/Tumblr Tool UI/Form1.cs b/Tumblr Tool UI/Form1.cs
index 50662d1..067660d 100644
--- a/Tumblr Tool UI/Form1.cs
+++ b/Tumblr Tool UI/Form1.cs
@@ -6,7 +6,7 @@
*
* Created: 2013
*
- * Last Updated: May, 2017
+ * Last Updated: August, 2017
*
* 01010011 01101000 01101001 01101110 01101111 01000001 01101101 01100001 01101011 01110101 01110011 01100001 */
@@ -33,7 +33,7 @@ public partial class MainForm : Form
{
private const string AppCopyright = "© 2013 - 2017 Shino Amakusa\r\n" + AppLinkUrl;
private const string AppLinkUrl = "git.io/v9S3h";
- private const string AppVersion = "1.5.4";
+ private const string AppVersion = "1.5.5";
private const string FileSizeFormat = "{0} {1}";
private const string ImageSizeLarge = "Large";
private const string ImageSizeMedium = "Medium";
@@ -1328,6 +1328,13 @@ private void FileOpenWorker_Work(object sender, DoWorkEventArgs e)
}
}
+ private void GenerateLogCheckedChange(object sender, EventArgs e)
+ {
+ CheckBox box = sender as CheckBox;
+ check_Options_GenerateUncompressedLog.Enabled = box.Checked;
+ check_Options_GenerateUncompressedLog.Checked = box.Checked;
+ }
+
///
///
///
@@ -1852,6 +1859,7 @@ private void RestoreOptions()
check_Options_GenerateLog.Checked = Options.GenerateLog;
check_Options_OldToNewDownloadOrder.Checked = Options.OldToNewDownloadOrder;
+ check_Options_GenerateUncompressedLog.Checked = Options.GenerateUncompressedLog;
}
///
@@ -1860,7 +1868,10 @@ private void RestoreOptions()
private void SaveLogFile()
{
FileHelper.SaveTumblrFile(SaveLocation + @"\" + TumblrLogFile.Filename, TumblrLogFile, SaveFileFormat.JsonCompressed);
- FileHelper.SaveTumblrFile(SaveLocation + @"\" + TumblrLogFile.Filename + ".txt", TumblrLogFile);
+ if (Options.GenerateUncompressedLog)
+ {
+ FileHelper.SaveTumblrFile(SaveLocation + @"\" + TumblrLogFile.Filename + ".txt", TumblrLogFile);
+ }
}
///
@@ -1929,6 +1940,7 @@ private void SetOptions()
//this.Options.ApiMode = this.apiMode.ToString();
Options.GenerateLog = check_Options_GenerateLog.Checked;
Options.OldToNewDownloadOrder = check_Options_OldToNewDownloadOrder.Checked;
+ Options.GenerateUncompressedLog = check_Options_GenerateUncompressedLog.Checked;
}
///
diff --git a/Tumblr Tool UI/Form1.resx b/Tumblr Tool UI/Form1.resx
index 1cc9112..e8e4386 100644
--- a/Tumblr Tool UI/Form1.resx
+++ b/Tumblr Tool UI/Form1.resx
@@ -144,6 +144,9 @@
1090, 17
+
+ True
+
339, 56
@@ -152,7 +155,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA
- FAAAAk1TRnQBSQFMAgEBCAEAAfABAwHwAQMBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ FAAAAk1TRnQBSQFMAgEBCAEAAfgBAwH4AQMBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABMAMAAQEBAAEgBgABMP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AcgADEgEZA1EB9wMA
Af8DAAH/AwAB/wMAAf8DAAH/A1ABniAAAxABFQNYAeYBGgIcAf4DAAH/AwAB/wMAAf8DUgH0A0cBgxgA
A14B5QMAAf8DAAH/A0AB/QMNAREMAANSAaYDAAH/AwAB/wMAAf8DMwFSUAADVgG7AwAB/wMAAf8DAAH/
@@ -242,9 +245,6 @@
AsMB+AE/AfEBxwH4AQ8B4AEHAv8B/AE/Av8B+AEfAv8L
-
- True
-
17, 56
diff --git a/Tumblr Tool UI/Properties/AssemblyInfo.cs b/Tumblr Tool UI/Properties/AssemblyInfo.cs
index 2749166..21a6ad3 100644
--- a/Tumblr Tool UI/Properties/AssemblyInfo.cs
+++ b/Tumblr Tool UI/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
\ No newline at end of file
diff --git a/Tumblr Tool UI/ToolOptions.cs b/Tumblr Tool UI/ToolOptions.cs
index aa1773c..9087260 100644
--- a/Tumblr Tool UI/ToolOptions.cs
+++ b/Tumblr Tool UI/ToolOptions.cs
@@ -17,6 +17,7 @@ public class ToolOptions
public ToolOptions()
{
GenerateLog = true;
+ GenerateUncompressedLog = true;
ParseGif = true;
ParseJpeg = true;
DownloadFiles = true;
@@ -35,6 +36,11 @@ public ToolOptions()
///
public bool GenerateLog { get; set; }
+ ///
+ /// Option to generate posts log text file
+ ///
+ public bool GenerateUncompressedLog { get; set; }
+
///
/// Reverse download order - t/f
///
diff --git a/Tumblr Tools Setup/setup.aip b/Tumblr Tools Setup/setup.aip
index e8ef043..a67c358 100644
--- a/Tumblr Tools Setup/setup.aip
+++ b/Tumblr Tools Setup/setup.aip
@@ -1,5 +1,5 @@
-
+
|
@@ -27,10 +27,10 @@
|
|
|
- |
+ |
|
|
- |
+ |
|
|
|
@@ -55,7 +55,7 @@
|
- |
+ |
|
|
|
@@ -94,7 +94,7 @@
|
- |
+ |
|
@@ -193,10 +193,10 @@
|
|
|
+ |
|
|
|
- |
|
@@ -368,10 +368,10 @@
- |
-
+ |
+
- |
+ |