CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-30 20:20:34 +12:00
Code Issues Packages Projects Releases Wiki Activity

Removed custom uploaders config path & history path

Browse source
This commit is contained in:
Jaex 2013-12-11 19:26:16 +02:00
parent 30058d8372
commit 7c11cc37bb
4 changed files with 3 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ShareX/ApplicationConfig.cs
View file

@ -63,10 +63,6 @@ public class ApplicationConfig : SettingsBase<ApplicationConfig>
#region Paths
public bool UseCustomUploadersConfigPath = false;
public string CustomUploadersConfigPath = string.Empty;
public bool UseCustomHistoryPath = false;
public string CustomHistoryPath = string.Empty;
public bool UseCustomScreenshotsPath = false;
public string CustomScreenshotsPath = string.Empty;
public string SaveImageSubFolderPattern = "%y-%mo";

89
ShareX/Forms/SettingsForm.Designer.cs generated
View file

@ -41,18 +41,11 @@ private void InitializeComponent()
this.tpPaths = new System.Windows.Forms.TabPage();
this.btnBrowseCustomScreenshotsPath = new System.Windows.Forms.Button();
this.btnOpenPersonalFolder = new System.Windows.Forms.Button();
this.btnLoadUploadersConfig = new System.Windows.Forms.Button();
this.txtCustomHistoryPath = new System.Windows.Forms.TextBox();
this.txtCustomScreenshotsPath = new System.Windows.Forms.TextBox();
this.cbUseCustomUploadersConfigPath = new System.Windows.Forms.CheckBox();
this.cbUseCustomScreenshotsPath = new System.Windows.Forms.CheckBox();
this.lblSaveImageSubFolderPattern = new System.Windows.Forms.Label();
this.btnBrowseCustomHistoryPath = new System.Windows.Forms.Button();
this.lblSaveImageSubFolderPatternPreview = new System.Windows.Forms.Label();
this.txtCustomUploadersConfigPath = new System.Windows.Forms.TextBox();
this.txtSaveImageSubFolderPattern = new System.Windows.Forms.TextBox();
this.cbUseCustomHistoryPath = new System.Windows.Forms.CheckBox();
this.btnBrowseCustomUploadersConfigPath = new System.Windows.Forms.Button();
this.tpProxy = new System.Windows.Forms.TabPage();
this.lblProxyNote = new System.Windows.Forms.Label();
this.cbProxyMethod = new System.Windows.Forms.ComboBox();
@ -225,18 +218,11 @@ private void InitializeComponent()
//
this.tpPaths.Controls.Add(this.btnBrowseCustomScreenshotsPath);
this.tpPaths.Controls.Add(this.btnOpenPersonalFolder);
this.tpPaths.Controls.Add(this.btnLoadUploadersConfig);
this.tpPaths.Controls.Add(this.txtCustomHistoryPath);
this.tpPaths.Controls.Add(this.txtCustomScreenshotsPath);
this.tpPaths.Controls.Add(this.cbUseCustomUploadersConfigPath);
this.tpPaths.Controls.Add(this.cbUseCustomScreenshotsPath);
this.tpPaths.Controls.Add(this.lblSaveImageSubFolderPattern);
this.tpPaths.Controls.Add(this.btnBrowseCustomHistoryPath);
this.tpPaths.Controls.Add(this.lblSaveImageSubFolderPatternPreview);
this.tpPaths.Controls.Add(this.txtCustomUploadersConfigPath);
this.tpPaths.Controls.Add(this.txtSaveImageSubFolderPattern);
this.tpPaths.Controls.Add(this.cbUseCustomHistoryPath);
this.tpPaths.Controls.Add(this.btnBrowseCustomUploadersConfigPath);
this.tpPaths.Location = new System.Drawing.Point(4, 22);
this.tpPaths.Name = "tpPaths";
this.tpPaths.Padding = new System.Windows.Forms.Padding(3);
@ -265,24 +251,6 @@ private void InitializeComponent()
this.btnOpenPersonalFolder.UseVisualStyleBackColor = true;
this.btnOpenPersonalFolder.Click += new System.EventHandler(this.btnOpenPersonalFolder_Click);
//
// btnLoadUploadersConfig
//
this.btnLoadUploadersConfig.Location = new System.Drawing.Point(432, 79);
this.btnLoadUploadersConfig.Name = "btnLoadUploadersConfig";
this.btnLoadUploadersConfig.Size = new System.Drawing.Size(80, 23);
this.btnLoadUploadersConfig.TabIndex = 4;
this.btnLoadUploadersConfig.Text = "Load";
this.btnLoadUploadersConfig.UseVisualStyleBackColor = true;
this.btnLoadUploadersConfig.Click += new System.EventHandler(this.btnLoadUploadersConfig_Click);
//
// txtCustomHistoryPath
//
this.txtCustomHistoryPath.Location = new System.Drawing.Point(16, 136);
this.txtCustomHistoryPath.Name = "txtCustomHistoryPath";
this.txtCustomHistoryPath.Size = new System.Drawing.Size(408, 20);
this.txtCustomHistoryPath.TabIndex = 6;
this.txtCustomHistoryPath.TextChanged += new System.EventHandler(this.txtCustomHistoryPath_TextChanged);
//
// txtCustomScreenshotsPath
//
this.txtCustomScreenshotsPath.Location = new System.Drawing.Point(16, 192);
@ -291,17 +259,6 @@ private void InitializeComponent()
this.txtCustomScreenshotsPath.TabIndex = 9;
this.txtCustomScreenshotsPath.TextChanged += new System.EventHandler(this.txtCustomScreenshotsPath_TextChanged);
//
// cbUseCustomUploadersConfigPath
//
this.cbUseCustomUploadersConfigPath.AutoSize = true;
this.cbUseCustomUploadersConfigPath.Location = new System.Drawing.Point(16, 56);
this.cbUseCustomUploadersConfigPath.Name = "cbUseCustomUploadersConfigPath";
this.cbUseCustomUploadersConfigPath.Size = new System.Drawing.Size(201, 17);
this.cbUseCustomUploadersConfigPath.TabIndex = 1;
this.cbUseCustomUploadersConfigPath.Text = "Use custom uploader config file path:";
this.cbUseCustomUploadersConfigPath.UseVisualStyleBackColor = true;
this.cbUseCustomUploadersConfigPath.CheckedChanged += new System.EventHandler(this.cbUseCustomUploadersConfigPath_CheckedChanged);
//
// cbUseCustomScreenshotsPath
//
this.cbUseCustomScreenshotsPath.AutoSize = true;
@ -322,16 +279,6 @@ private void InitializeComponent()
this.lblSaveImageSubFolderPattern.TabIndex = 11;
this.lblSaveImageSubFolderPattern.Text = "Sub folder pattern:";
//
// btnBrowseCustomHistoryPath
//
this.btnBrowseCustomHistoryPath.Location = new System.Drawing.Point(432, 135);
this.btnBrowseCustomHistoryPath.Name = "btnBrowseCustomHistoryPath";
this.btnBrowseCustomHistoryPath.Size = new System.Drawing.Size(80, 23);
this.btnBrowseCustomHistoryPath.TabIndex = 7;
this.btnBrowseCustomHistoryPath.Text = "Browse...";
this.btnBrowseCustomHistoryPath.UseVisualStyleBackColor = true;
this.btnBrowseCustomHistoryPath.Click += new System.EventHandler(this.btnBrowseCustomHistoryPath_Click);
//
// lblSaveImageSubFolderPatternPreview
//
this.lblSaveImageSubFolderPatternPreview.AutoSize = true;
@ -341,14 +288,6 @@ private void InitializeComponent()
this.lblSaveImageSubFolderPatternPreview.TabIndex = 13;
this.lblSaveImageSubFolderPatternPreview.Text = "...";
//
// txtCustomUploadersConfigPath
//
this.txtCustomUploadersConfigPath.Location = new System.Drawing.Point(16, 80);
this.txtCustomUploadersConfigPath.Name = "txtCustomUploadersConfigPath";
this.txtCustomUploadersConfigPath.Size = new System.Drawing.Size(320, 20);
this.txtCustomUploadersConfigPath.TabIndex = 2;
this.txtCustomUploadersConfigPath.TextChanged += new System.EventHandler(this.txtCustomUploadersConfigPath_TextChanged);
//
// txtSaveImageSubFolderPattern
//
this.txtSaveImageSubFolderPattern.Location = new System.Drawing.Point(120, 220);
@ -357,27 +296,6 @@ private void InitializeComponent()
this.txtSaveImageSubFolderPattern.TabIndex = 12;
this.txtSaveImageSubFolderPattern.TextChanged += new System.EventHandler(this.txtSaveImageSubFolderPattern_TextChanged);
//
// cbUseCustomHistoryPath
//
this.cbUseCustomHistoryPath.AutoSize = true;
this.cbUseCustomHistoryPath.Location = new System.Drawing.Point(16, 112);
this.cbUseCustomHistoryPath.Name = "cbUseCustomHistoryPath";
this.cbUseCustomHistoryPath.Size = new System.Drawing.Size(158, 17);
this.cbUseCustomHistoryPath.TabIndex = 5;
this.cbUseCustomHistoryPath.Text = "Use custom history file path:";
this.cbUseCustomHistoryPath.UseVisualStyleBackColor = true;
this.cbUseCustomHistoryPath.CheckedChanged += new System.EventHandler(this.cbUseCustomHistoryPath_CheckedChanged);
//
// btnBrowseCustomUploadersConfigPath
//
this.btnBrowseCustomUploadersConfigPath.Location = new System.Drawing.Point(344, 79);
this.btnBrowseCustomUploadersConfigPath.Name = "btnBrowseCustomUploadersConfigPath";
this.btnBrowseCustomUploadersConfigPath.Size = new System.Drawing.Size(80, 23);
this.btnBrowseCustomUploadersConfigPath.TabIndex = 3;
this.btnBrowseCustomUploadersConfigPath.Text = "Browse...";
this.btnBrowseCustomUploadersConfigPath.UseVisualStyleBackColor = true;
this.btnBrowseCustomUploadersConfigPath.Click += new System.EventHandler(this.btnBrowseCustomUploadersConfigPath_Click);
//
// tpProxy
//
this.tpProxy.Controls.Add(this.lblProxyNote);
@ -780,14 +698,7 @@ private void InitializeComponent()
private System.Windows.Forms.TabPage tpGeneral;
private System.Windows.Forms.TabPage tpProxy;
private System.Windows.Forms.CheckBox cbSendToMenu;
private System.Windows.Forms.TextBox txtCustomHistoryPath;
private System.Windows.Forms.CheckBox cbUseCustomHistoryPath;
private System.Windows.Forms.Button btnBrowseCustomHistoryPath;
private System.Windows.Forms.Button btnOpenPersonalFolder;
private System.Windows.Forms.Button btnBrowseCustomUploadersConfigPath;
private System.Windows.Forms.TextBox txtCustomUploadersConfigPath;
private System.Windows.Forms.CheckBox cbUseCustomUploadersConfigPath;
private System.Windows.Forms.Button btnLoadUploadersConfig;
private System.Windows.Forms.CheckBox cbShowTray;
private System.Windows.Forms.CheckBox cbStartWithWindows;
private System.Windows.Forms.Label lblSaveImageSubFolderPatternPreview;

41
ShareX/Forms/SettingsForm.cs
View file

@ -66,10 +66,6 @@ private void LoadSettings()
cbRememberMainFormSize.Checked = Program.Settings.RememberMainFormSize;
// Paths
cbUseCustomUploadersConfigPath.Checked = Program.Settings.UseCustomUploadersConfigPath;
txtCustomUploadersConfigPath.Text = Program.Settings.CustomUploadersConfigPath;
cbUseCustomHistoryPath.Checked = Program.Settings.UseCustomHistoryPath;
txtCustomHistoryPath.Text = Program.Settings.CustomHistoryPath;
cbUseCustomScreenshotsPath.Checked = Program.Settings.UseCustomScreenshotsPath;
txtCustomScreenshotsPath.Text = Program.Settings.CustomScreenshotsPath;
txtSaveImageSubFolderPattern.Text = Program.Settings.SaveImageSubFolderPattern;
@ -212,43 +208,6 @@ private void btnOpenPersonalFolder_Click(object sender, EventArgs e)
}
}
private void cbUseCustomUploadersConfigPath_CheckedChanged(object sender, EventArgs e)
{
Program.Settings.UseCustomUploadersConfigPath = cbUseCustomUploadersConfigPath.Checked;
}
private void txtCustomUploadersConfigPath_TextChanged(object sender, EventArgs e)
{
Program.Settings.CustomUploadersConfigPath = txtCustomUploadersConfigPath.Text;
}
private void btnBrowseCustomUploadersConfigPath_Click(object sender, EventArgs e)
{
Helpers.BrowseFile("ShareX - Choose uploaders config file path", txtCustomUploadersConfigPath, Program.PersonalPath);
Program.Settings.CustomUploadersConfigPath = txtCustomUploadersConfigPath.Text;
Program.LoadUploadersConfig();
}
private void btnLoadUploadersConfig_Click(object sender, EventArgs e)
{
Program.LoadUploadersConfig();
}
private void cbUseCustomHistoryPath_CheckedChanged(object sender, EventArgs e)
{
Program.Settings.UseCustomHistoryPath = cbUseCustomHistoryPath.Checked;
}
private void txtCustomHistoryPath_TextChanged(object sender, EventArgs e)
{
Program.Settings.CustomHistoryPath = txtCustomHistoryPath.Text;
}
private void btnBrowseCustomHistoryPath_Click(object sender, EventArgs e)
{
Helpers.BrowseFile("ShareX - Choose history file path", txtCustomHistoryPath, Program.PersonalPath);
}
private void cbUseCustomScreenshotsPath_CheckedChanged(object sender, EventArgs e)
{
Program.Settings.UseCustomScreenshotsPath = cbUseCustomScreenshotsPath.Checked;

11
ShareX/Program.cs
View file

@ -114,11 +114,6 @@ public static string UploadersConfigFilePath
{
if (!IsSandbox)
{
if (Settings != null && Settings.UseCustomUploadersConfigPath && !string.IsNullOrEmpty(Settings.CustomUploadersConfigPath))
{
return Settings.CustomUploadersConfigPath;
}
return Path.Combine(PersonalPath, UploadersConfigFilename);
}
@ -143,12 +138,12 @@ public static string HistoryFilePath
{
get
{
if (Settings != null && Settings.UseCustomHistoryPath && !string.IsNullOrEmpty(Settings.CustomHistoryPath))
if (!IsSandbox)
{
return Settings.CustomHistoryPath;
return Path.Combine(PersonalPath, HistoryFilename);
}
return Path.Combine(PersonalPath, HistoryFilename);
return null;
}
}