Mirrors/flowframes
1
0
Fork 0
mirror of https://github.com/n00mkrad/flowframes.git synced 2026-09-01 19:51:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clear log after switching input file (or starting batch proc) - optional

Browse Source
This commit is contained in:
N00MKRAD
2021-01-06 21:58:37 +01:00
parent 8ec2d196db
commit cb3f42ca9c
6 changed files with 91 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
Code/Forms/SettingsForm.Designer.cs generated
View File

@@ -96,6 +96,9 @@
this.label5 = new System.Windows.Forms.Label();
this.label32 = new System.Windows.Forms.Label();
this.vidExportTab = new Cyotek.Windows.Forms.TabListPage();
this.aviColors = new System.Windows.Forms.ComboBox();
this.aviCodec = new System.Windows.Forms.ComboBox();
this.label60 = new System.Windows.Forms.Label();
this.proResProfile = new System.Windows.Forms.ComboBox();
this.label59 = new System.Windows.Forms.Label();
this.panel11 = new System.Windows.Forms.Panel();
@@ -151,9 +154,9 @@
this.cmdDebugMode = new System.Windows.Forms.ComboBox();
this.titleLabel = new System.Windows.Forms.Label();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.label60 = new System.Windows.Forms.Label();
this.aviCodec = new System.Windows.Forms.ComboBox();
this.aviColors = new System.Windows.Forms.ComboBox();
this.label61 = new System.Windows.Forms.Label();
this.clearLogOnInput = new System.Windows.Forms.CheckBox();
this.label62 = new System.Windows.Forms.Label();
this.settingsTabList.SuspendLayout();
this.generalTab.SuspendLayout();
this.tabListPage2.SuspendLayout();
@@ -181,6 +184,9 @@
// generalTab
//
this.generalTab.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.generalTab.Controls.Add(this.label62);
this.generalTab.Controls.Add(this.clearLogOnInput);
this.generalTab.Controls.Add(this.label61);
this.generalTab.Controls.Add(this.processingMode);
this.generalTab.Controls.Add(this.label39);
this.generalTab.Controls.Add(this.tempDirBrowseBtn);
@@ -1006,6 +1012,49 @@
this.vidExportTab.Size = new System.Drawing.Size(762, 419);
this.vidExportTab.Text = "Video Export";
//
// aviColors
//
this.aviColors.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.aviColors.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.aviColors.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.aviColors.ForeColor = System.Drawing.Color.White;
this.aviColors.FormattingEnabled = true;
this.aviColors.Items.AddRange(new object[] {
"yuv420p",
"yuv422p",
"yuv444p",
"rgb24"});
this.aviColors.Location = new System.Drawing.Point(486, 357);
this.aviColors.Name = "aviColors";
this.aviColors.Size = new System.Drawing.Size(194, 21);
this.aviColors.TabIndex = 71;
//
// aviCodec
//
this.aviCodec.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.aviCodec.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.aviCodec.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.aviCodec.ForeColor = System.Drawing.Color.White;
this.aviCodec.FormattingEnabled = true;
this.aviCodec.Items.AddRange(new object[] {
"ffv1",
"huffyuv",
"rawvideo"});
this.aviCodec.Location = new System.Drawing.Point(280, 357);
this.aviCodec.Name = "aviCodec";
this.aviCodec.Size = new System.Drawing.Size(200, 21);
this.aviCodec.TabIndex = 70;
//
// label60
//
this.label60.AutoSize = true;
this.label60.Location = new System.Drawing.Point(10, 360);
this.label60.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label60.Name = "label60";
this.label60.Size = new System.Drawing.Size(130, 13);
this.label60.TabIndex = 69;
this.label60.Text = "AVI: Codec / Color Space";
//
// proResProfile
//
this.proResProfile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
@@ -1669,48 +1718,35 @@
this.titleLabel.TabIndex = 1;
this.titleLabel.Text = "Settings";
//
// label60
// label61
//
this.label60.AutoSize = true;
this.label60.Location = new System.Drawing.Point(10, 360);
this.label60.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label60.Name = "label60";
this.label60.Size = new System.Drawing.Size(130, 13);
this.label60.TabIndex = 69;
this.label60.Text = "AVI: Codec / Color Space";
this.label61.AutoSize = true;
this.label61.Location = new System.Drawing.Point(10, 161);
this.label61.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label61.Name = "label61";
this.label61.Size = new System.Drawing.Size(181, 13);
this.label61.TabIndex = 73;
this.label61.Text = "Clear Log Box When Switching Input";
//
// aviCodec
// clearLogOnInput
//
this.aviCodec.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.aviCodec.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.aviCodec.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.aviCodec.ForeColor = System.Drawing.Color.White;
this.aviCodec.FormattingEnabled = true;
this.aviCodec.Items.AddRange(new object[] {
"ffv1",
"huffyuv",
"rawvideo"});
this.aviCodec.Location = new System.Drawing.Point(280, 357);
this.aviCodec.Name = "aviCodec";
this.aviCodec.Size = new System.Drawing.Size(200, 21);
this.aviCodec.TabIndex = 70;
this.clearLogOnInput.AutoSize = true;
this.clearLogOnInput.Location = new System.Drawing.Point(280, 161);
this.clearLogOnInput.Name = "clearLogOnInput";
this.clearLogOnInput.Size = new System.Drawing.Size(15, 14);
this.clearLogOnInput.TabIndex = 74;
this.clearLogOnInput.UseVisualStyleBackColor = true;
//
// aviColors
// label62
//
this.aviColors.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.aviColors.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.aviColors.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.aviColors.ForeColor = System.Drawing.Color.White;
this.aviColors.FormattingEnabled = true;
this.aviColors.Items.AddRange(new object[] {
"yuv420p",
"yuv422p",
"yuv444p",
"rgb24"});
this.aviColors.Location = new System.Drawing.Point(486, 357);
this.aviColors.Name = "aviColors";
this.aviColors.Size = new System.Drawing.Size(194, 21);
this.aviColors.TabIndex = 71;
this.label62.AutoSize = true;
this.label62.ForeColor = System.Drawing.Color.Silver;
this.label62.Location = new System.Drawing.Point(308, 161);
this.label62.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label62.Name = "label62";
this.label62.Size = new System.Drawing.Size(249, 13);
this.label62.TabIndex = 75;
this.label62.Text = "Only affects the log box in the GUI, not the log files.";
//
// SettingsForm
//
@@ -1874,5 +1910,8 @@
private System.Windows.Forms.ComboBox aviColors;
private System.Windows.Forms.ComboBox aviCodec;
private System.Windows.Forms.Label label60;
private System.Windows.Forms.Label label62;
private System.Windows.Forms.CheckBox clearLogOnInput;
private System.Windows.Forms.Label label61;
}
}

2
Code/Forms/SettingsForm.cs
View File

@@ -52,6 +52,7 @@ namespace Flowframes.Forms
ConfigParser.SaveComboxIndex(tempFolderLoc);
ConfigParser.SaveGuiElement(keepTempFolder);
ConfigParser.SaveGuiElement(delLogsOnStartup);
ConfigParser.SaveGuiElement(clearLogOnInput);
// Interpolation
ConfigParser.SaveGuiElement(enableAudio);
ConfigParser.SaveComboxIndex(dedupMode);
@@ -99,6 +100,7 @@ namespace Flowframes.Forms
ConfigParser.LoadComboxIndex(tempFolderLoc); ConfigParser.LoadGuiElement(tempDirCustom);
ConfigParser.LoadGuiElement(delLogsOnStartup);
ConfigParser.LoadGuiElement(keepTempFolder);
ConfigParser.LoadGuiElement(clearLogOnInput);
// Interpolation
ConfigParser.LoadGuiElement(enableAudio);
ConfigParser.LoadComboxIndex(dedupMode);

1
Code/IO/Config.cs
View File

@@ -111,6 +111,7 @@ namespace Flowframes.IO
{
if (key == "maxVidHeight") return WriteDefault(key, "2160");
if (key == "delLogsOnStartup") return WriteDefault(key, "True");
if (key == "clearLogOnInput") return WriteDefault(key, "True");
if (key == "tempDirCustom") return WriteDefault(key, "C:/");
// Interpolation
if (key == "dedupMode") return WriteDefault(key, "2");

4
Code/IO/Logger.cs
View File

@@ -33,7 +33,7 @@ namespace Flowframes
s = s.Replace("\n", Environment.NewLine);
if (!hidden && textbox != null)
textbox.AppendText(Environment.NewLine + s);
textbox.AppendText((textbox.Text.Length > 1 ? Environment.NewLine : "") + s);
LogToFile(s, false, filename);
}
@@ -87,7 +87,7 @@ namespace Flowframes
}
}
public static void Clear ()
public static void ClearLogBox ()
{
textbox.Text = "";
}

3
Code/Main/BatchProcessing.cs
View File

@@ -18,6 +18,9 @@ namespace Flowframes.Main
public static async void Start()
{
if (Config.GetBool("clearLogOnInput"))
Logger.ClearLogBox();
stopped = false;
Program.mainForm.SetTab("preview");
int initTaskCount = Program.batchQueue.Count;

4
Code/UI/MainUiFunctions.cs
View File

@@ -18,6 +18,10 @@ namespace Flowframes.UI
public static async Task InitInput (TextBox outputTbox, TextBox inputTbox, TextBox fpsInTbox)
{
Program.mainForm.SetTab("interpolate");
if (Config.GetBool("clearLogOnInput"))
Logger.ClearLogBox();
outputTbox.Text = inputTbox.Text.Trim().GetParentDir();
string path = inputTbox.Text.Trim();
Program.lastInputPath = path;