mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 17:56:51 +13:00
Don't let selecting assets folder outside of ShareX image effects folder
This commit is contained in:
parent
0a5d803255
commit
056cb7cbac
2 changed files with 14 additions and 4 deletions
|
@ -56,7 +56,7 @@ private void InitializeComponent()
|
|||
this.btnPackage.Location = new System.Drawing.Point(16, 64);
|
||||
this.btnPackage.Name = "btnPackage";
|
||||
this.btnPackage.Size = new System.Drawing.Size(128, 23);
|
||||
this.btnPackage.TabIndex = 2;
|
||||
this.btnPackage.TabIndex = 3;
|
||||
this.btnPackage.Text = "Package...";
|
||||
this.btnPackage.UseVisualStyleBackColor = true;
|
||||
this.btnPackage.Click += new System.EventHandler(this.btnPackage_Click);
|
||||
|
@ -66,7 +66,7 @@ private void InitializeComponent()
|
|||
this.btnAssetsFolderBrowse.Location = new System.Drawing.Point(360, 31);
|
||||
this.btnAssetsFolderBrowse.Name = "btnAssetsFolderBrowse";
|
||||
this.btnAssetsFolderBrowse.Size = new System.Drawing.Size(32, 23);
|
||||
this.btnAssetsFolderBrowse.TabIndex = 3;
|
||||
this.btnAssetsFolderBrowse.TabIndex = 2;
|
||||
this.btnAssetsFolderBrowse.Text = "...";
|
||||
this.btnAssetsFolderBrowse.UseVisualStyleBackColor = true;
|
||||
this.btnAssetsFolderBrowse.Click += new System.EventHandler(this.btnAssetsFolderBrowse_Click);
|
||||
|
|
|
@ -50,15 +50,25 @@ private void txtAssetsFolder_TextChanged(object sender, EventArgs e)
|
|||
|
||||
private void btnAssetsFolderBrowse_Click(object sender, EventArgs e)
|
||||
{
|
||||
Helpers.BrowseFolder(txtAssetsFolder, "", true);
|
||||
Helpers.BrowseFolder(txtAssetsFolder, HelpersOptions.ShareXSpecialFolders["ShareXImageEffects"]);
|
||||
}
|
||||
|
||||
private void btnPackage_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!string.IsNullOrEmpty(Packager.AssetsFolderPath) &&
|
||||
!Packager.AssetsFolderPath.StartsWith(HelpersOptions.ShareXSpecialFolders["ShareXImageEffects"] + "\\", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
// TODO: Translate
|
||||
MessageBox.Show("Assets folder must be inside ShareX image effects folder.", "ShareX - " + "Invalid assets folder path",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||
}
|
||||
else
|
||||
{
|
||||
Packager.Package();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
ex.ShowError();
|
||||
|
|
Loading…
Reference in a new issue