mirror of https://github.com/n00mkrad/flowframes
Use LOCALAPPDATA\Flowframes\Temp as default temp folder, improve temp folder code & options
This commit is contained in:
parent
0cf201a013
commit
f1a91a4a53
|
@ -32,6 +32,8 @@
|
|||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsForm));
|
||||
this.settingsTabList = new Cyotek.Windows.Forms.TabList();
|
||||
this.generalTab = new Cyotek.Windows.Forms.TabListPage();
|
||||
this.btnResetHwEnc = new HTAlt.WinForms.HTButton();
|
||||
this.label10 = new System.Windows.Forms.Label();
|
||||
this.custOutDirBrowseBtn = new HTAlt.WinForms.HTButton();
|
||||
this.custOutDir = new System.Windows.Forms.TextBox();
|
||||
this.outFolderLoc = new System.Windows.Forms.ComboBox();
|
||||
|
@ -157,8 +159,6 @@
|
|||
this.titleLabel = new System.Windows.Forms.Label();
|
||||
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
|
||||
this.resetBtn = new HTAlt.WinForms.HTButton();
|
||||
this.label10 = new System.Windows.Forms.Label();
|
||||
this.btnResetHwEnc = new HTAlt.WinForms.HTButton();
|
||||
this.settingsTabList.SuspendLayout();
|
||||
this.generalTab.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.info1)).BeginInit();
|
||||
|
@ -230,6 +230,30 @@
|
|||
this.generalTab.Size = new System.Drawing.Size(762, 419);
|
||||
this.generalTab.Text = "Application";
|
||||
//
|
||||
// btnResetHwEnc
|
||||
//
|
||||
this.btnResetHwEnc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
|
||||
this.btnResetHwEnc.FlatAppearance.BorderSize = 0;
|
||||
this.btnResetHwEnc.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnResetHwEnc.ForeColor = System.Drawing.Color.White;
|
||||
this.btnResetHwEnc.Location = new System.Drawing.Point(280, 245);
|
||||
this.btnResetHwEnc.Name = "btnResetHwEnc";
|
||||
this.btnResetHwEnc.Size = new System.Drawing.Size(206, 23);
|
||||
this.btnResetHwEnc.TabIndex = 95;
|
||||
this.btnResetHwEnc.Text = "Re-Detected Hardware Encoders";
|
||||
this.btnResetHwEnc.UseVisualStyleBackColor = false;
|
||||
this.btnResetHwEnc.Click += new System.EventHandler(this.btnResetHwEnc_Click);
|
||||
//
|
||||
// label10
|
||||
//
|
||||
this.label10.AutoSize = true;
|
||||
this.label10.Location = new System.Drawing.Point(10, 250);
|
||||
this.label10.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
|
||||
this.label10.Name = "label10";
|
||||
this.label10.Size = new System.Drawing.Size(186, 13);
|
||||
this.label10.TabIndex = 94;
|
||||
this.label10.Text = "Manage Detected Hardware Features";
|
||||
//
|
||||
// custOutDirBrowseBtn
|
||||
//
|
||||
this.custOutDirBrowseBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
|
||||
|
@ -493,9 +517,9 @@
|
|||
this.tempFolderLoc.ForeColor = System.Drawing.Color.White;
|
||||
this.tempFolderLoc.FormattingEnabled = true;
|
||||
this.tempFolderLoc.Items.AddRange(new object[] {
|
||||
"Windows Temp Folder",
|
||||
"Same As Input Directory",
|
||||
"Parent Directory Of Output Folder",
|
||||
"Inside Output Folder",
|
||||
"Same As Output Directory",
|
||||
"Flowframes Program Folder",
|
||||
"Custom..."});
|
||||
this.tempFolderLoc.Location = new System.Drawing.Point(280, 67);
|
||||
|
@ -1779,30 +1803,6 @@
|
|||
this.resetBtn.UseVisualStyleBackColor = false;
|
||||
this.resetBtn.Click += new System.EventHandler(this.resetBtn_Click);
|
||||
//
|
||||
// label10
|
||||
//
|
||||
this.label10.AutoSize = true;
|
||||
this.label10.Location = new System.Drawing.Point(10, 250);
|
||||
this.label10.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
|
||||
this.label10.Name = "label10";
|
||||
this.label10.Size = new System.Drawing.Size(186, 13);
|
||||
this.label10.TabIndex = 94;
|
||||
this.label10.Text = "Manage Detected Hardware Features";
|
||||
//
|
||||
// btnResetHwEnc
|
||||
//
|
||||
this.btnResetHwEnc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
|
||||
this.btnResetHwEnc.FlatAppearance.BorderSize = 0;
|
||||
this.btnResetHwEnc.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.btnResetHwEnc.ForeColor = System.Drawing.Color.White;
|
||||
this.btnResetHwEnc.Location = new System.Drawing.Point(280, 245);
|
||||
this.btnResetHwEnc.Name = "btnResetHwEnc";
|
||||
this.btnResetHwEnc.Size = new System.Drawing.Size(206, 23);
|
||||
this.btnResetHwEnc.TabIndex = 95;
|
||||
this.btnResetHwEnc.Text = "Re-Detected Hardware Encoders";
|
||||
this.btnResetHwEnc.UseVisualStyleBackColor = false;
|
||||
this.btnResetHwEnc.Click += new System.EventHandler(this.btnResetHwEnc_Click);
|
||||
//
|
||||
// SettingsForm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
|
|
|
@ -69,26 +69,34 @@ namespace Flowframes.Main
|
|||
|
||||
public static string GetTempFolderLoc(string inPath, string outPath)
|
||||
{
|
||||
string basePath = inPath.GetParentDir();
|
||||
string basePath = Path.Combine(Environment.GetEnvironmentVariable("LOCALAPPDATA"), "Temp", "Flowframes");
|
||||
int tempFolderLoc = Config.GetInt(Config.Key.tempFolderLoc);
|
||||
|
||||
if (Config.GetInt(Config.Key.tempFolderLoc) == 1)
|
||||
basePath = outPath.GetParentDir();
|
||||
|
||||
if (Config.GetInt(Config.Key.tempFolderLoc) == 2)
|
||||
basePath = outPath;
|
||||
|
||||
if (Config.GetInt(Config.Key.tempFolderLoc) == 3)
|
||||
basePath = Paths.GetExeDir();
|
||||
|
||||
if (Config.GetInt(Config.Key.tempFolderLoc) == 4)
|
||||
switch (tempFolderLoc)
|
||||
{
|
||||
string custPath = Config.Get(Config.Key.tempDirCustom);
|
||||
case 1:
|
||||
basePath = inPath.GetParentDir();
|
||||
break;
|
||||
|
||||
if (IoUtils.IsDirValid(custPath))
|
||||
basePath = custPath;
|
||||
case 2:
|
||||
basePath = outPath;
|
||||
break;
|
||||
|
||||
case 3:
|
||||
basePath = Paths.GetSessionDataPath();
|
||||
break;
|
||||
|
||||
case 4:
|
||||
string custPath = Config.Get(Config.Key.tempDirCustom);
|
||||
if (IoUtils.IsDirValid(custPath))
|
||||
{
|
||||
basePath = custPath;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
return Path.Combine(basePath, Path.GetFileNameWithoutExtension(inPath).StripBadChars().Remove(" ").Trunc(30, false) + "-temp");
|
||||
string folderName = Path.GetFileNameWithoutExtension(inPath).StripBadChars().Remove(" ").Trunc(30, false) + ".tmp";
|
||||
return Path.Combine(basePath, folderName);
|
||||
}
|
||||
|
||||
public static bool InputIsValid(InterpSettings s)
|
||||
|
|
Loading…
Reference in New Issue