CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 17:56:51 +13:00
Code Issues Projects Releases Packages Wiki Activity

Removed image effects refresh button, only show load image button on tool mode

Browse source
This commit is contained in:
Jaex 2018-01-21 13:23:45 +03:00
parent 543203eb29
commit e750e59704
3 changed files with 30 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,6 @@ private void InitializeComponent()
this.btnRemove = new System.Windows.Forms.Button(); this.btnRemove = new System.Windows.Forms.Button();
this.btnClear = new System.Windows.Forms.Button(); this.btnClear = new System.Windows.Forms.Button();
this.btnDuplicate = new System.Windows.Forms.Button(); this.btnDuplicate = new System.Windows.Forms.Button();
this.btnRefresh = new System.Windows.Forms.Button();
this.btnSaveImage = new System.Windows.Forms.Button(); this.btnSaveImage = new System.Windows.Forms.Button();
this.eiImageEffects = new ShareX.HelpersLib.ExportImportControl(); this.eiImageEffects = new ShareX.HelpersLib.ExportImportControl();
this.pbResult = new ShareX.HelpersLib.MyPictureBox(); this.pbResult = new ShareX.HelpersLib.MyPictureBox();
@ -118,13 +117,6 @@ private void InitializeComponent()
this.btnDuplicate.UseVisualStyleBackColor = true; this.btnDuplicate.UseVisualStyleBackColor = true;
this.btnDuplicate.Click += new System.EventHandler(this.btnDuplicate_Click); this.btnDuplicate.Click += new System.EventHandler(this.btnDuplicate_Click);
// //
// btnRefresh
//
resources.ApplyResources(this.btnRefresh, "btnRefresh");
this.btnRefresh.Name = "btnRefresh";
this.btnRefresh.UseVisualStyleBackColor = true;
this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
//
// btnSaveImage // btnSaveImage
// //
resources.ApplyResources(this.btnSaveImage, "btnSaveImage"); resources.ApplyResources(this.btnSaveImage, "btnSaveImage");
@ -252,7 +244,6 @@ private void InitializeComponent()
this.Controls.Add(this.mbLoadImage); this.Controls.Add(this.mbLoadImage);
this.Controls.Add(this.eiImageEffects); this.Controls.Add(this.eiImageEffects);
this.Controls.Add(this.btnSaveImage); this.Controls.Add(this.btnSaveImage);
this.Controls.Add(this.btnRefresh);
this.Controls.Add(this.btnDuplicate); this.Controls.Add(this.btnDuplicate);
this.Controls.Add(this.btnClear); this.Controls.Add(this.btnClear);
this.Controls.Add(this.pbResult); this.Controls.Add(this.pbResult);
@ -279,7 +270,6 @@ private void InitializeComponent()
private ShareX.HelpersLib.MyPictureBox pbResult; private ShareX.HelpersLib.MyPictureBox pbResult;
private System.Windows.Forms.Button btnClear; private System.Windows.Forms.Button btnClear;
private System.Windows.Forms.Button btnDuplicate; private System.Windows.Forms.Button btnDuplicate;
private System.Windows.Forms.Button btnRefresh;
private System.Windows.Forms.Button btnSaveImage; private System.Windows.Forms.Button btnSaveImage;
private ShareX.HelpersLib.ExportImportControl eiImageEffects; private ShareX.HelpersLib.ExportImportControl eiImageEffects;
private System.Windows.Forms.ContextMenuStrip cmsEffects; private System.Windows.Forms.ContextMenuStrip cmsEffects;

32
ShareX.ImageEffectsLib/ImageEffectsForm.cs
View file

@ -29,7 +29,6 @@ You should have received a copy of the GNU General Public License
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
namespace ShareX.ImageEffectsLib namespace ShareX.ImageEffectsLib
@ -221,7 +220,7 @@ private void UpdateControlStates()
{ {
btnRemovePreset.Enabled = cbPresets.Enabled = txtPresetName.Enabled = btnAdd.Enabled = cbPresets.SelectedIndex > -1; btnRemovePreset.Enabled = cbPresets.Enabled = txtPresetName.Enabled = btnAdd.Enabled = cbPresets.SelectedIndex > -1;
btnRemove.Enabled = btnDuplicate.Enabled = lvEffects.SelectedItems.Count > 0; btnRemove.Enabled = btnDuplicate.Enabled = lvEffects.SelectedItems.Count > 0;
btnClear.Enabled = btnRefresh.Enabled = lvEffects.Items.Count > 0; btnClear.Enabled = lvEffects.Items.Count > 0;
} }
private Image ApplyEffects() private Image ApplyEffects()
@ -401,18 +400,6 @@ private void btnRemove_Click(object sender, EventArgs e)
RemoveSelectedEffects(); RemoveSelectedEffects();
} }
private void btnClear_Click(object sender, EventArgs e)
{
ImageEffectPreset preset = GetSelectedPreset();
if (preset != null)
{
lvEffects.Items.Clear();
preset.Effects.Clear();
UpdatePreview();
}
}
private void btnDuplicate_Click(object sender, EventArgs e) private void btnDuplicate_Click(object sender, EventArgs e)
{ {
ImageEffectPreset preset = GetSelectedPreset(); ImageEffectPreset preset = GetSelectedPreset();
@ -434,6 +421,18 @@ private void btnDuplicate_Click(object sender, EventArgs e)
} }
} }
private void btnClear_Click(object sender, EventArgs e)
{
ImageEffectPreset preset = GetSelectedPreset();
if (preset != null)
{
lvEffects.Items.Clear();
preset.Effects.Clear();
UpdatePreview();
}
}
private void lvEffects_ItemMoved(object sender, int oldIndex, int newIndex) private void lvEffects_ItemMoved(object sender, int oldIndex, int newIndex)
{ {
ImageEffectPreset preset = GetSelectedPreset(); ImageEffectPreset preset = GetSelectedPreset();
@ -445,11 +444,6 @@ private void lvEffects_ItemMoved(object sender, int oldIndex, int newIndex)
} }
} }
private void btnRefresh_Click(object sender, EventArgs e)
{
UpdatePreview();
}
private void lvEffects_SelectedIndexChanged(object sender, EventArgs e) private void lvEffects_SelectedIndexChanged(object sender, EventArgs e)
{ {
pgSettings.SelectedObject = null; pgSettings.SelectedObject = null;

55
ShareX.ImageEffectsLib/ImageEffectsForm.resx
View file

@ -142,13 +142,13 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;pgSettings.ZOrder" xml:space="preserve"> <data name="&gt;&gt;pgSettings.ZOrder" xml:space="preserve">
<value>18</value> <value>17</value>
</data> </data>
<data name="btnAdd.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnAdd.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 40</value> <value>8, 40</value>
</data> </data>
<data name="btnAdd.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnAdd.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 24</value> <value>104, 24</value>
</data> </data>
<data name="btnAdd.TabIndex" type="System.Int32, mscorlib"> <data name="btnAdd.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -166,7 +166,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;btnAdd.ZOrder" xml:space="preserve"> <data name="&gt;&gt;btnAdd.ZOrder" xml:space="preserve">
<value>17</value> <value>16</value>
</data> </data>
<data name="lvEffects.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="lvEffects.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left</value> <value>Top, Bottom, Left</value>
@ -190,16 +190,16 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;lvEffects.ZOrder" xml:space="preserve"> <data name="&gt;&gt;lvEffects.ZOrder" xml:space="preserve">
<value>19</value> <value>18</value>
</data> </data>
<data name="chEffect.Width" type="System.Int32, mscorlib"> <data name="chEffect.Width" type="System.Int32, mscorlib">
<value>164</value> <value>164</value>
</data> </data>
<data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
<value>104, 40</value> <value>120, 40</value>
</data> </data>
<data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 24</value> <value>104, 24</value>
</data> </data>
<data name="btnRemove.TabIndex" type="System.Int32, mscorlib"> <data name="btnRemove.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -217,13 +217,13 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;btnRemove.ZOrder" xml:space="preserve"> <data name="&gt;&gt;btnRemove.ZOrder" xml:space="preserve">
<value>16</value> <value>15</value>
</data> </data>
<data name="btnClear.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnClear.Location" type="System.Drawing.Point, System.Drawing">
<value>200, 40</value> <value>344, 40</value>
</data> </data>
<data name="btnClear.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnClear.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 24</value> <value>104, 24</value>
</data> </data>
<data name="btnClear.TabIndex" type="System.Int32, mscorlib"> <data name="btnClear.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -241,13 +241,13 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;btnClear.ZOrder" xml:space="preserve"> <data name="&gt;&gt;btnClear.ZOrder" xml:space="preserve">
<value>14</value> <value>13</value>
</data> </data>
<data name="btnDuplicate.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnDuplicate.Location" type="System.Drawing.Point, System.Drawing">
<value>296, 40</value> <value>232, 40</value>
</data> </data>
<data name="btnDuplicate.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnDuplicate.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 24</value> <value>104, 24</value>
</data> </data>
<data name="btnDuplicate.TabIndex" type="System.Int32, mscorlib"> <data name="btnDuplicate.TabIndex" type="System.Int32, mscorlib">
<value>3</value> <value>3</value>
@ -265,30 +265,6 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;btnDuplicate.ZOrder" xml:space="preserve"> <data name="&gt;&gt;btnDuplicate.ZOrder" xml:space="preserve">
<value>13</value>
</data>
<data name="btnRefresh.Location" type="System.Drawing.Point, System.Drawing">
<value>392, 40</value>
</data>
<data name="btnRefresh.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 24</value>
</data>
<data name="btnRefresh.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="btnRefresh.Text" xml:space="preserve">
<value>Refresh</value>
</data>
<data name="&gt;&gt;btnRefresh.Name" xml:space="preserve">
<value>btnRefresh</value>
</data>
<data name="&gt;&gt;btnRefresh.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;btnRefresh.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnRefresh.ZOrder" xml:space="preserve">
<value>12</value> <value>12</value>
</data> </data>
<data name="btnSaveImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="btnSaveImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@ -370,7 +346,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;pbResult.ZOrder" xml:space="preserve"> <data name="&gt;&gt;pbResult.ZOrder" xml:space="preserve">
<value>15</value> <value>14</value>
</data> </data>
<metadata name="cmsEffects.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="cmsEffects.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
@ -411,6 +387,9 @@
<data name="mbLoadImage.Text" xml:space="preserve"> <data name="mbLoadImage.Text" xml:space="preserve">
<value>Load image</value> <value>Load image</value>
</data> </data>
<data name="mbLoadImage.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;mbLoadImage.Name" xml:space="preserve"> <data name="&gt;&gt;mbLoadImage.Name" xml:space="preserve">
<value>mbLoadImage</value> <value>mbLoadImage</value>
</data> </data>
@ -604,7 +583,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve"> <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
<value>0</value> <value>2</value>
</data> </data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>