mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 01:07:21 +13:00
Update control states, remove ok button
This commit is contained in:
Jaex
parent
05578e71fd
commit
e7eadbd7be
4 changed files with 90 additions and 126 deletions
|
|
@ -24,11 +24,9 @@ You should have received a copy of the GNU General Public License
|
|||
#endregion License Information (GPL v3)
|
||||
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace ShareX.ImageEffectsLib
|
||||
|
|
|
|||
30
ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs
generated
30
ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs
generated
|
|
@ -35,8 +35,6 @@ private void InitializeComponent()
|
|||
this.lvEffects = new ShareX.HelpersLib.MyListView();
|
||||
this.chEffect = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.btnRemove = new System.Windows.Forms.Button();
|
||||
this.btnOK = new System.Windows.Forms.Button();
|
||||
this.btnCancel = new System.Windows.Forms.Button();
|
||||
this.btnClear = new System.Windows.Forms.Button();
|
||||
this.btnDuplicate = new System.Windows.Forms.Button();
|
||||
this.btnRefresh = new System.Windows.Forms.Button();
|
||||
|
|
@ -53,6 +51,7 @@ private void InitializeComponent()
|
|||
this.cbPresets = new System.Windows.Forms.ComboBox();
|
||||
this.lblPresetName = new System.Windows.Forms.Label();
|
||||
this.txtPresetName = new System.Windows.Forms.TextBox();
|
||||
this.btnClose = new System.Windows.Forms.Button();
|
||||
this.cmsLoadImage.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
|
|
@ -104,20 +103,6 @@ private void InitializeComponent()
|
|||
this.btnRemove.UseVisualStyleBackColor = true;
|
||||
this.btnRemove.Click += new System.EventHandler(this.btnRemove_Click);
|
||||
//
|
||||
// btnOK
|
||||
//
|
||||
resources.ApplyResources(this.btnOK, "btnOK");
|
||||
this.btnOK.Name = "btnOK";
|
||||
this.btnOK.UseVisualStyleBackColor = true;
|
||||
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
|
||||
//
|
||||
// btnCancel
|
||||
//
|
||||
resources.ApplyResources(this.btnCancel, "btnCancel");
|
||||
this.btnCancel.Name = "btnCancel";
|
||||
this.btnCancel.UseVisualStyleBackColor = true;
|
||||
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
|
||||
//
|
||||
// btnClear
|
||||
//
|
||||
resources.ApplyResources(this.btnClear, "btnClear");
|
||||
|
|
@ -234,11 +219,19 @@ private void InitializeComponent()
|
|||
this.txtPresetName.Name = "txtPresetName";
|
||||
this.txtPresetName.TextChanged += new System.EventHandler(this.txtPresetName_TextChanged);
|
||||
//
|
||||
// btnClose
|
||||
//
|
||||
resources.ApplyResources(this.btnClose, "btnClose");
|
||||
this.btnClose.Name = "btnClose";
|
||||
this.btnClose.UseVisualStyleBackColor = true;
|
||||
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
|
||||
//
|
||||
// ImageEffectsForm
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.Controls.Add(this.btnClose);
|
||||
this.Controls.Add(this.txtPresetName);
|
||||
this.Controls.Add(this.lblPresetName);
|
||||
this.Controls.Add(this.cbPresets);
|
||||
|
|
@ -251,8 +244,6 @@ private void InitializeComponent()
|
|||
this.Controls.Add(this.btnDuplicate);
|
||||
this.Controls.Add(this.btnClear);
|
||||
this.Controls.Add(this.pbResult);
|
||||
this.Controls.Add(this.btnCancel);
|
||||
this.Controls.Add(this.btnOK);
|
||||
this.Controls.Add(this.btnRemove);
|
||||
this.Controls.Add(this.btnAdd);
|
||||
this.Controls.Add(this.pgSettings);
|
||||
|
|
@ -274,8 +265,6 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.ColumnHeader chEffect;
|
||||
private System.Windows.Forms.Button btnRemove;
|
||||
private ShareX.HelpersLib.MyPictureBox pbResult;
|
||||
private System.Windows.Forms.Button btnOK;
|
||||
private System.Windows.Forms.Button btnCancel;
|
||||
private System.Windows.Forms.Button btnClear;
|
||||
private System.Windows.Forms.Button btnDuplicate;
|
||||
private System.Windows.Forms.Button btnRefresh;
|
||||
|
|
@ -291,6 +280,7 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.ComboBox cbPresets;
|
||||
private System.Windows.Forms.Label lblPresetName;
|
||||
private System.Windows.Forms.TextBox txtPresetName;
|
||||
private System.Windows.Forms.Button btnClose;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@ public void EditorMode()
|
|||
pbResult.AllowDrop = true;
|
||||
mbLoadImage.Visible = true;
|
||||
btnSaveImage.Visible = true;
|
||||
btnOK.Visible = false;
|
||||
}
|
||||
|
||||
private void AddAllEffectsToContextMenu()
|
||||
|
|
@ -200,9 +199,18 @@ private void UpdatePreview()
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
UpdateControlStates();
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateControlStates()
|
||||
{
|
||||
btnRemovePreset.Enabled = cbPresets.Enabled = txtPresetName.Enabled = btnAdd.Enabled = cbPresets.SelectedIndex > -1;
|
||||
btnRemove.Enabled = btnDuplicate.Enabled = lvEffects.SelectedItems.Count > 0;
|
||||
btnClear.Enabled = btnRefresh.Enabled = lvEffects.Items.Count > 0;
|
||||
}
|
||||
|
||||
private List<ImageEffect> GetImageEffects()
|
||||
{
|
||||
return lvEffects.Items.Cast<ListViewItem>().Where(x => x != null && x.Tag is ImageEffect).Select(x => (ImageEffect)x.Tag).ToList();
|
||||
|
|
@ -447,6 +455,8 @@ private void lvEffects_SelectedIndexChanged(object sender, EventArgs e)
|
|||
pgSettings.SelectedObject = lvi.Tag;
|
||||
}
|
||||
}
|
||||
|
||||
UpdateControlStates();
|
||||
}
|
||||
|
||||
private void lvEffects_ItemChecked(object sender, ItemCheckedEventArgs e)
|
||||
|
|
@ -573,15 +583,8 @@ private void pbResult_DragDrop(object sender, DragEventArgs e)
|
|||
}
|
||||
}
|
||||
|
||||
private void btnOK_Click(object sender, EventArgs e)
|
||||
private void btnClose_Click(object sender, EventArgs e)
|
||||
{
|
||||
DialogResult = DialogResult.OK;
|
||||
Close();
|
||||
}
|
||||
|
||||
private void btnCancel_Click(object sender, EventArgs e)
|
||||
{
|
||||
DialogResult = DialogResult.Cancel;
|
||||
Close();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -142,13 +142,13 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>pgSettings.ZOrder" xml:space="preserve">
|
||||
<value>18</value>
|
||||
<value>17</value>
|
||||
</data>
|
||||
<data name="btnAdd.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 40</value>
|
||||
</data>
|
||||
<data name="btnAdd.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>80, 24</value>
|
||||
<value>88, 24</value>
|
||||
</data>
|
||||
<data name="btnAdd.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
|
|
@ -166,14 +166,11 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnAdd.ZOrder" xml:space="preserve">
|
||||
<value>17</value>
|
||||
<value>16</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, 72</value>
|
||||
</data>
|
||||
|
|
@ -193,13 +190,16 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lvEffects.ZOrder" xml:space="preserve">
|
||||
<value>19</value>
|
||||
<value>18</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, 40</value>
|
||||
<value>104, 40</value>
|
||||
</data>
|
||||
<data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>80, 24</value>
|
||||
<value>88, 24</value>
|
||||
</data>
|
||||
<data name="btnRemove.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
|
|
@ -217,67 +217,13 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnRemove.ZOrder" xml:space="preserve">
|
||||
<value>16</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, 504</value>
|
||||
</data>
|
||||
<data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>88, 24</value>
|
||||
</data>
|
||||
<data name="btnOK.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>14</value>
|
||||
</data>
|
||||
<data name="btnOK.Text" xml:space="preserve">
|
||||
<value>OK</value>
|
||||
</data>
|
||||
<data name=">>btnOK.Name" xml:space="preserve">
|
||||
<value>btnOK</value>
|
||||
</data>
|
||||
<data name=">>btnOK.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=">>btnOK.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnOK.ZOrder" xml:space="preserve">
|
||||
<value>15</value>
|
||||
</data>
|
||||
<data name="btnCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
</data>
|
||||
<data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>872, 504</value>
|
||||
</data>
|
||||
<data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>88, 24</value>
|
||||
</data>
|
||||
<data name="btnCancel.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>15</value>
|
||||
</data>
|
||||
<data name="btnCancel.Text" xml:space="preserve">
|
||||
<value>Cancel</value>
|
||||
</data>
|
||||
<data name=">>btnCancel.Name" xml:space="preserve">
|
||||
<value>btnCancel</value>
|
||||
</data>
|
||||
<data name=">>btnCancel.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=">>btnCancel.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnCancel.ZOrder" xml:space="preserve">
|
||||
<value>14</value>
|
||||
</data>
|
||||
<data name="btnClear.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>184, 40</value>
|
||||
<value>200, 40</value>
|
||||
</data>
|
||||
<data name="btnClear.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>80, 24</value>
|
||||
<value>88, 24</value>
|
||||
</data>
|
||||
<data name="btnClear.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
|
|
@ -295,13 +241,13 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnClear.ZOrder" xml:space="preserve">
|
||||
<value>12</value>
|
||||
<value>13</value>
|
||||
</data>
|
||||
<data name="btnDuplicate.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>272, 40</value>
|
||||
<value>296, 40</value>
|
||||
</data>
|
||||
<data name="btnDuplicate.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>80, 24</value>
|
||||
<value>88, 24</value>
|
||||
</data>
|
||||
<data name="btnDuplicate.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>3</value>
|
||||
|
|
@ -319,13 +265,13 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnDuplicate.ZOrder" xml:space="preserve">
|
||||
<value>11</value>
|
||||
<value>12</value>
|
||||
</data>
|
||||
<data name="btnRefresh.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>360, 40</value>
|
||||
<value>392, 40</value>
|
||||
</data>
|
||||
<data name="btnRefresh.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>80, 24</value>
|
||||
<value>88, 24</value>
|
||||
</data>
|
||||
<data name="btnRefresh.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>6</value>
|
||||
|
|
@ -343,7 +289,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnRefresh.ZOrder" xml:space="preserve">
|
||||
<value>10</value>
|
||||
<value>11</value>
|
||||
</data>
|
||||
<data name="btnSaveImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -376,7 +322,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnSaveImage.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="eiImageEffects.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -400,7 +346,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>eiImageEffects.ZOrder" xml:space="preserve">
|
||||
<value>8</value>
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="pbResult.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
|
|
@ -424,7 +370,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>pbResult.ZOrder" xml:space="preserve">
|
||||
<value>13</value>
|
||||
<value>14</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>
|
||||
|
|
@ -447,18 +393,6 @@
|
|||
<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="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>
|
||||
<data name="cmsLoadImage.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>131, 48</value>
|
||||
</data>
|
||||
|
|
@ -487,7 +421,19 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>mbLoadImage.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
<value>8</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>
|
||||
<data name="btnAddPreset.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 8</value>
|
||||
|
|
@ -511,7 +457,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnAddPreset.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="btnRemovePreset.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>152, 8</value>
|
||||
|
|
@ -535,7 +481,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnRemovePreset.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="cbPresets.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>296, 8</value>
|
||||
|
|
@ -556,7 +502,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>cbPresets.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="lblPresetName.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
|
@ -583,13 +529,13 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblPresetName.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="txtPresetName.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>648, 8</value>
|
||||
<value>672, 8</value>
|
||||
</data>
|
||||
<data name="txtPresetName.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>312, 20</value>
|
||||
<value>288, 20</value>
|
||||
</data>
|
||||
<data name="txtPresetName.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>21</value>
|
||||
|
|
@ -604,7 +550,34 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>txtPresetName.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="btnClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
</data>
|
||||
<data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>840, 504</value>
|
||||
</data>
|
||||
<data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>120, 24</value>
|
||||
</data>
|
||||
<data name="btnClose.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>22</value>
|
||||
</data>
|
||||
<data name="btnClose.Text" xml:space="preserve">
|
||||
<value>Close</value>
|
||||
</data>
|
||||
<data name=">>btnClose.Name" xml:space="preserve">
|
||||
<value>btnClose</value>
|
||||
</data>
|
||||
<data name=">>btnClose.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=">>btnClose.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnClose.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>
|
||||
|
|
|
|||
Loading…
Reference in a new issue