mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-02 18:26:27 +13:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
Jimin Park
commit
30aef84392
3 changed files with 141 additions and 65 deletions
50
ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs
generated
50
ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs
generated
|
|
@ -40,11 +40,15 @@ private void InitializeComponent()
|
|||
this.btnClear = new System.Windows.Forms.Button();
|
||||
this.btnDuplicate = new System.Windows.Forms.Button();
|
||||
this.btnRefresh = new System.Windows.Forms.Button();
|
||||
this.btnLoadImage = new System.Windows.Forms.Button();
|
||||
this.btnSaveImage = new System.Windows.Forms.Button();
|
||||
this.eiImageEffects = new ShareX.HelpersLib.ExportImportControl();
|
||||
this.pbResult = new ShareX.HelpersLib.MyPictureBox();
|
||||
this.cmsEffects = new System.Windows.Forms.ContextMenuStrip(this.components);
|
||||
this.mbLoadImage = new ShareX.HelpersLib.MenuButton();
|
||||
this.cmsLoadImage = new System.Windows.Forms.ContextMenuStrip(this.components);
|
||||
this.tsmiLoadImageFromFile = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiLoadImageFromClipboard = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.cmsLoadImage.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// pgSettings
|
||||
|
|
@ -129,13 +133,6 @@ private void InitializeComponent()
|
|||
this.btnRefresh.UseVisualStyleBackColor = true;
|
||||
this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
|
||||
//
|
||||
// btnLoadImage
|
||||
//
|
||||
resources.ApplyResources(this.btnLoadImage, "btnLoadImage");
|
||||
this.btnLoadImage.Name = "btnLoadImage";
|
||||
this.btnLoadImage.UseVisualStyleBackColor = true;
|
||||
this.btnLoadImage.Click += new System.EventHandler(this.btnLoadImage_Click);
|
||||
//
|
||||
// btnSaveImage
|
||||
//
|
||||
resources.ApplyResources(this.btnSaveImage, "btnSaveImage");
|
||||
|
|
@ -169,13 +166,42 @@ private void InitializeComponent()
|
|||
this.cmsEffects.ShowImageMargin = false;
|
||||
resources.ApplyResources(this.cmsEffects, "cmsEffects");
|
||||
//
|
||||
// mbLoadImage
|
||||
//
|
||||
resources.ApplyResources(this.mbLoadImage, "mbLoadImage");
|
||||
this.mbLoadImage.Menu = this.cmsLoadImage;
|
||||
this.mbLoadImage.MenuX0 = true;
|
||||
this.mbLoadImage.Name = "mbLoadImage";
|
||||
this.mbLoadImage.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// cmsLoadImage
|
||||
//
|
||||
this.cmsLoadImage.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.tsmiLoadImageFromFile,
|
||||
this.tsmiLoadImageFromClipboard});
|
||||
this.cmsLoadImage.Name = "cmsLoadImage";
|
||||
this.cmsLoadImage.ShowImageMargin = false;
|
||||
resources.ApplyResources(this.cmsLoadImage, "cmsLoadImage");
|
||||
//
|
||||
// tsmiLoadImageFromFile
|
||||
//
|
||||
this.tsmiLoadImageFromFile.Name = "tsmiLoadImageFromFile";
|
||||
resources.ApplyResources(this.tsmiLoadImageFromFile, "tsmiLoadImageFromFile");
|
||||
this.tsmiLoadImageFromFile.Click += new System.EventHandler(this.tsmiLoadImageFromFile_Click);
|
||||
//
|
||||
// tsmiLoadImageFromClipboard
|
||||
//
|
||||
this.tsmiLoadImageFromClipboard.Name = "tsmiLoadImageFromClipboard";
|
||||
resources.ApplyResources(this.tsmiLoadImageFromClipboard, "tsmiLoadImageFromClipboard");
|
||||
this.tsmiLoadImageFromClipboard.Click += new System.EventHandler(this.tsmiLoadImageFromClipboard_Click);
|
||||
//
|
||||
// ImageEffectsForm
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.mbLoadImage);
|
||||
this.Controls.Add(this.eiImageEffects);
|
||||
this.Controls.Add(this.btnSaveImage);
|
||||
this.Controls.Add(this.btnLoadImage);
|
||||
this.Controls.Add(this.btnRefresh);
|
||||
this.Controls.Add(this.btnDuplicate);
|
||||
this.Controls.Add(this.btnClear);
|
||||
|
|
@ -188,6 +214,7 @@ private void InitializeComponent()
|
|||
this.Controls.Add(this.lvEffects);
|
||||
this.Name = "ImageEffectsForm";
|
||||
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
|
||||
this.cmsLoadImage.ResumeLayout(false);
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
|
|
@ -206,10 +233,13 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.Button btnClear;
|
||||
private System.Windows.Forms.Button btnDuplicate;
|
||||
private System.Windows.Forms.Button btnRefresh;
|
||||
private System.Windows.Forms.Button btnLoadImage;
|
||||
private System.Windows.Forms.Button btnSaveImage;
|
||||
private ShareX.HelpersLib.ExportImportControl eiImageEffects;
|
||||
private System.Windows.Forms.ContextMenuStrip cmsEffects;
|
||||
private HelpersLib.MenuButton mbLoadImage;
|
||||
private System.Windows.Forms.ContextMenuStrip cmsLoadImage;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiLoadImageFromFile;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiLoadImageFromClipboard;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public ImageEffectsForm(Image img, List<ImageEffect> effects = null)
|
|||
public void EditorMode()
|
||||
{
|
||||
pbResult.AllowDrop = true;
|
||||
btnLoadImage.Visible = true;
|
||||
mbLoadImage.Visible = true;
|
||||
btnSaveImage.Visible = true;
|
||||
}
|
||||
|
||||
|
|
@ -323,7 +323,7 @@ private void eiImageEffects_ImportRequested(object obj)
|
|||
}
|
||||
}
|
||||
|
||||
private void btnLoadImage_Click(object sender, EventArgs e)
|
||||
private void tsmiLoadImageFromFile_Click(object sender, EventArgs e)
|
||||
{
|
||||
string filePath = ImageHelpers.OpenImageFileDialog();
|
||||
|
||||
|
|
@ -335,11 +335,26 @@ private void btnLoadImage_Click(object sender, EventArgs e)
|
|||
}
|
||||
}
|
||||
|
||||
private void tsmiLoadImageFromClipboard_Click(object sender, EventArgs e)
|
||||
{
|
||||
Image img = Clipboard.GetImage();
|
||||
|
||||
if (img != null)
|
||||
{
|
||||
if (DefaultImage != null) DefaultImage.Dispose();
|
||||
DefaultImage = img;
|
||||
UpdatePreview();
|
||||
}
|
||||
}
|
||||
|
||||
private void btnSaveImage_Click(object sender, EventArgs e)
|
||||
{
|
||||
using (Image img = ApplyEffects())
|
||||
if (DefaultImage != null)
|
||||
{
|
||||
ImageHelpers.SaveImageFileDialog(img);
|
||||
using (Image img = ApplyEffects())
|
||||
{
|
||||
ImageHelpers.SaveImageFileDialog(img);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
|
@ -141,7 +142,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>pgSettings.ZOrder" xml:space="preserve">
|
||||
<value>12</value>
|
||||
<value>13</value>
|
||||
</data>
|
||||
<data name="btnAdd.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 8</value>
|
||||
|
|
@ -165,14 +166,11 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnAdd.ZOrder" xml:space="preserve">
|
||||
<value>11</value>
|
||||
<value>12</value>
|
||||
</data>
|
||||
<data name="lvEffects.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left</value>
|
||||
</data>
|
||||
<data name="chEffect.Width" type="System.Int32, mscorlib">
|
||||
<value>164</value>
|
||||
</data>
|
||||
<data name="lvEffects.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 40</value>
|
||||
</data>
|
||||
|
|
@ -192,7 +190,10 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lvEffects.ZOrder" xml:space="preserve">
|
||||
<value>13</value>
|
||||
<value>14</value>
|
||||
</data>
|
||||
<data name="chEffect.Width" type="System.Int32, mscorlib">
|
||||
<value>164</value>
|
||||
</data>
|
||||
<data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>96, 8</value>
|
||||
|
|
@ -216,13 +217,13 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnRemove.ZOrder" xml:space="preserve">
|
||||
<value>10</value>
|
||||
<value>11</value>
|
||||
</data>
|
||||
<data name="btnOK.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
</data>
|
||||
<data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>776, 479</value>
|
||||
<value>776, 480</value>
|
||||
</data>
|
||||
<data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>88, 24</value>
|
||||
|
|
@ -243,7 +244,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnOK.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="btnCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
|
|
@ -270,7 +271,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnCancel.ZOrder" xml:space="preserve">
|
||||
<value>8</value>
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="btnClear.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>184, 8</value>
|
||||
|
|
@ -294,7 +295,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnClear.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="btnDuplicate.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>272, 8</value>
|
||||
|
|
@ -318,7 +319,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnDuplicate.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="btnRefresh.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>360, 8</value>
|
||||
|
|
@ -342,40 +343,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnRefresh.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="btnLoadImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
</data>
|
||||
<data name="btnLoadImage.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="btnLoadImage.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>200, 479</value>
|
||||
</data>
|
||||
<data name="btnLoadImage.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>120, 24</value>
|
||||
</data>
|
||||
<data name="btnLoadImage.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>12</value>
|
||||
</data>
|
||||
<data name="btnLoadImage.Text" xml:space="preserve">
|
||||
<value>Load image...</value>
|
||||
</data>
|
||||
<data name="btnLoadImage.Visible" type="System.Boolean, mscorlib">
|
||||
<value>False</value>
|
||||
</data>
|
||||
<data name=">>btnLoadImage.Name" xml:space="preserve">
|
||||
<value>btnLoadImage</value>
|
||||
</data>
|
||||
<data name=">>btnLoadImage.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>btnLoadImage.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnLoadImage.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="btnSaveImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -384,7 +352,7 @@
|
|||
<value>True</value>
|
||||
</data>
|
||||
<data name="btnSaveImage.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>328, 479</value>
|
||||
<value>328, 480</value>
|
||||
</data>
|
||||
<data name="btnSaveImage.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>120, 24</value>
|
||||
|
|
@ -408,13 +376,13 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnSaveImage.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="eiImageEffects.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
</data>
|
||||
<data name="eiImageEffects.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 479</value>
|
||||
<value>8, 480</value>
|
||||
</data>
|
||||
<data name="eiImageEffects.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>192, 24</value>
|
||||
|
|
@ -432,7 +400,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>eiImageEffects.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="pbResult.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
|
|
@ -456,7 +424,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>pbResult.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
<value>8</value>
|
||||
</data>
|
||||
<metadata name="cmsEffects.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
|
|
@ -470,6 +438,57 @@
|
|||
<data name=">>cmsEffects.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="mbLoadImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
</data>
|
||||
<data name="mbLoadImage.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>200, 480</value>
|
||||
</data>
|
||||
<metadata name="cmsLoadImage.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>126, 17</value>
|
||||
</metadata>
|
||||
<data name="cmsLoadImage.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>131, 48</value>
|
||||
</data>
|
||||
<data name=">>cmsLoadImage.Name" xml:space="preserve">
|
||||
<value>cmsLoadImage</value>
|
||||
</data>
|
||||
<data name=">>cmsLoadImage.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="mbLoadImage.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>120, 24</value>
|
||||
</data>
|
||||
<data name="mbLoadImage.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>16</value>
|
||||
</data>
|
||||
<data name="mbLoadImage.Text" xml:space="preserve">
|
||||
<value>Load image</value>
|
||||
</data>
|
||||
<data name=">>mbLoadImage.Name" xml:space="preserve">
|
||||
<value>mbLoadImage</value>
|
||||
</data>
|
||||
<data name=">>mbLoadImage.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>mbLoadImage.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>mbLoadImage.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="tsmiLoadImageFromFile.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>130, 22</value>
|
||||
</data>
|
||||
<data name="tsmiLoadImageFromFile.Text" xml:space="preserve">
|
||||
<value>From file...</value>
|
||||
</data>
|
||||
<data name="tsmiLoadImageFromClipboard.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>130, 22</value>
|
||||
</data>
|
||||
<data name="tsmiLoadImageFromClipboard.Text" xml:space="preserve">
|
||||
<value>From clipboard</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
|
@ -491,6 +510,18 @@
|
|||
<data name=">>chEffect.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>tsmiLoadImageFromFile.Name" xml:space="preserve">
|
||||
<value>tsmiLoadImageFromFile</value>
|
||||
</data>
|
||||
<data name=">>tsmiLoadImageFromFile.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>tsmiLoadImageFromClipboard.Name" xml:space="preserve">
|
||||
<value>tsmiLoadImageFromClipboard</value>
|
||||
</data>
|
||||
<data name=">>tsmiLoadImageFromClipboard.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>ImageEffectsForm</value>
|
||||
</data>
|
||||
|
|
|
|||
Loading…
Reference in a new issue