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

Added upload image button to image effects form

Browse source
This commit is contained in:
Jaex 2018-05-09 01:34:19 +03:00
parent dae4809133
commit 696e9ff715
4 changed files with 85 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs generated
View file

@ -52,6 +52,7 @@ private void InitializeComponent()
this.txtPresetName = new System.Windows.Forms.TextBox();
this.btnClose = new System.Windows.Forms.Button();
this.btnOK = new System.Windows.Forms.Button();
this.btnUploadImage = new System.Windows.Forms.Button();
this.cmsLoadImage.SuspendLayout();
this.SuspendLayout();
//
@ -228,12 +229,20 @@ private void InitializeComponent()
this.btnOK.UseVisualStyleBackColor = true;
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
//
// btnUploadImage
//
resources.ApplyResources(this.btnUploadImage, "btnUploadImage");
this.btnUploadImage.Name = "btnUploadImage";
this.btnUploadImage.UseVisualStyleBackColor = true;
this.btnUploadImage.Click += new System.EventHandler(this.btnUploadImage_Click);
//
// ImageEffectsForm
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnClose;
this.Controls.Add(this.btnUploadImage);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.btnClose);
this.Controls.Add(this.txtPresetName);
@ -284,6 +293,7 @@ private void InitializeComponent()
private System.Windows.Forms.TextBox txtPresetName;
private System.Windows.Forms.Button btnClose;
private System.Windows.Forms.Button btnOK;
private System.Windows.Forms.Button btnUploadImage;
}
}

27
ShareX.ImageEffectsLib/ImageEffectsForm.cs
View file

@ -35,6 +35,8 @@ namespace ShareX.ImageEffectsLib
{
public partial class ImageEffectsForm : Form
{
public event Action<Image> ImageProcessRequested;
public Image DefaultImage { get; private set; }
public List<ImageEffectPreset> Presets { get; private set; }
@ -58,11 +60,13 @@ public ImageEffectsForm(Image img, List<ImageEffectPreset> presets, int selected
AddAllEffectsToContextMenu();
}
public void ToolMode()
public void ToolMode(Action<Image> imageProcessRequested)
{
ImageProcessRequested += imageProcessRequested;
pbResult.AllowDrop = true;
mbLoadImage.Visible = true;
btnSaveImage.Visible = true;
btnUploadImage.Visible = true;
}
public void EditorMode()
@ -71,6 +75,14 @@ public void EditorMode()
btnClose.Text = Resources.ImageEffectsForm_EditorMode_Cancel;
}
protected void OnImageProcessRequested(Image img)
{
if (ImageProcessRequested != null)
{
ImageProcessRequested(img);
}
}
private void AddAllEffectsToContextMenu()
{
AddEffectToContextMenu(Resources.ImageEffectsForm_AddAllEffectsToTreeView_Drawings,
@ -545,6 +557,19 @@ private void btnSaveImage_Click(object sender, EventArgs e)
}
}
private void btnUploadImage_Click(object sender, EventArgs e)
{
if (DefaultImage != null)
{
Image img = ApplyEffects();
if (img != null)
{
OnImageProcessRequested(img);
}
}
}
private void pbResult_DragEnter(object sender, DragEventArgs e)
{
if (e.Data.GetDataPresent(DataFormats.FileDrop, false) || e.Data.GetDataPresent(DataFormats.Bitmap, false))

69
ShareX.ImageEffectsLib/ImageEffectsForm.resx
View file

@ -142,7 +142,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pgSettings.ZOrder" xml:space="preserve">
<value>17</value>
<value>18</value>
</data>
<data name="btnAdd.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 40</value>
@ -166,7 +166,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnAdd.ZOrder" xml:space="preserve">
<value>16</value>
<value>17</value>
</data>
<data name="lvEffects.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left</value>
@ -184,13 +184,13 @@
<value>lvEffects</value>
</data>
<data name="&gt;&gt;lvEffects.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.1.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvEffects.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lvEffects.ZOrder" xml:space="preserve">
<value>18</value>
<value>19</value>
</data>
<data name="chEffect.Width" type="System.Int32, mscorlib">
<value>164</value>
@ -217,7 +217,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnRemove.ZOrder" xml:space="preserve">
<value>15</value>
<value>16</value>
</data>
<data name="btnClear.Location" type="System.Drawing.Point, System.Drawing">
<value>344, 40</value>
@ -241,7 +241,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnClear.ZOrder" xml:space="preserve">
<value>13</value>
<value>14</value>
</data>
<data name="btnDuplicate.Location" type="System.Drawing.Point, System.Drawing">
<value>232, 40</value>
@ -265,7 +265,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnDuplicate.ZOrder" xml:space="preserve">
<value>12</value>
<value>13</value>
</data>
<data name="btnSaveImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
@ -298,7 +298,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnSaveImage.ZOrder" xml:space="preserve">
<value>11</value>
<value>12</value>
</data>
<data name="eiImageEffects.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
@ -316,13 +316,13 @@
<value>eiImageEffects</value>
</data>
<data name="&gt;&gt;eiImageEffects.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=12.1.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;eiImageEffects.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;eiImageEffects.ZOrder" xml:space="preserve">
<value>10</value>
<value>11</value>
</data>
<data name="pbResult.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
@ -340,13 +340,13 @@
<value>pbResult</value>
</data>
<data name="&gt;&gt;pbResult.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=12.1.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;pbResult.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;pbResult.ZOrder" xml:space="preserve">
<value>14</value>
<value>15</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>
@ -394,13 +394,13 @@
<value>mbLoadImage</value>
</data>
<data name="&gt;&gt;mbLoadImage.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=12.1.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;mbLoadImage.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;mbLoadImage.ZOrder" xml:space="preserve">
<value>9</value>
<value>10</value>
</data>
<data name="tsmiLoadImageFromFile.Size" type="System.Drawing.Size, System.Drawing">
<value>130, 22</value>
@ -436,7 +436,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnAddPreset.ZOrder" xml:space="preserve">
<value>8</value>
<value>9</value>
</data>
<data name="btnRemovePreset.Location" type="System.Drawing.Point, System.Drawing">
<value>152, 8</value>
@ -460,7 +460,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnRemovePreset.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="cbPresets.Location" type="System.Drawing.Point, System.Drawing">
<value>296, 9</value>
@ -481,7 +481,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;cbPresets.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="lblPresetName.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -508,7 +508,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lblPresetName.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="txtPresetName.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@ -532,7 +532,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;txtPresetName.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="btnClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
@ -559,7 +559,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="btnOK.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
@ -589,7 +589,34 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="btnUploadImage.Location" type="System.Drawing.Point, System.Drawing">
<value>456, 504</value>
</data>
<data name="btnUploadImage.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 24</value>
</data>
<data name="btnUploadImage.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
</data>
<data name="btnUploadImage.Text" xml:space="preserve">
<value>Upload image</value>
</data>
<data name="btnUploadImage.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;btnUploadImage.Name" xml:space="preserve">
<value>btnUploadImage</value>
</data>
<data name="&gt;&gt;btnUploadImage.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="&gt;&gt;btnUploadImage.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnUploadImage.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>

2
ShareX/TaskHelpers.cs
View file

@ -980,7 +980,7 @@ public static void OpenImageEffects(TaskSettings taskSettings = null)
using (ImageEffectsForm imageEffectsForm = new ImageEffectsForm(img, taskSettings.ImageSettings.ImageEffectPresets,
taskSettings.ImageSettings.SelectedImageEffectPreset))
{
imageEffectsForm.ToolMode();
imageEffectsForm.ToolMode(x => UploadManager.RunImageTask(x, taskSettings));
imageEffectsForm.ShowDialog();
//taskSettings.ImageSettings.SelectedImageEffectPreset = imageEffectsForm.SelectedPresetIndex;
}