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

Image effects form design change

Browse source
This commit is contained in:
Jaex 2020-07-08 14:14:24 +03:00
parent a1464f277b
commit 1d649e2617
12 changed files with 628 additions and 474 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ShareX.HelpersLib/Controls/MyListView.cs
View file

@ -153,9 +153,9 @@ public void SelectSingle(ListViewItem lvi)
public void UnselectAll() public void UnselectAll()
{ {
foreach (ListViewItem lvi in SelectedItems) if (MultiSelect)
{ {
lvi.Selected = false; SelectedItems.Clear();
} }
} }
@ -324,7 +324,7 @@ protected override void OnColumnClick(ColumnClickEventArgs e)
lvwColumnSorter.Order = SortOrder.Ascending; lvwColumnSorter.Order = SortOrder.Ascending;
} }
// if the column is tagged as a DateTime, then sort by date // If the column is tagged as a DateTime, then sort by date
lvwColumnSorter.SortByDate = Columns[e.Column].Tag is DateTime; lvwColumnSorter.SortByDate = Columns[e.Column].Tag is DateTime;
Cursor.Current = Cursors.WaitCursor; Cursor.Current = Cursors.WaitCursor;
@ -350,6 +350,7 @@ private void DrawInsertionLine(int left, int right, int y)
protected override void ScaleControl(SizeF factor, BoundsSpecified specified) protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
{ {
base.ScaleControl(factor, specified); base.ScaleControl(factor, specified);
foreach (ColumnHeader column in Columns) foreach (ColumnHeader column in Columns)
{ {
column.Width = (int)Math.Round(column.Width * factor.Width); column.Width = (int)Math.Round(column.Width * factor.Width);

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

@ -31,12 +31,8 @@ private void InitializeComponent()
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImageEffectsForm)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImageEffectsForm));
this.pgSettings = new System.Windows.Forms.PropertyGrid(); this.pgSettings = new System.Windows.Forms.PropertyGrid();
this.btnAdd = new System.Windows.Forms.Button();
this.lvEffects = new ShareX.HelpersLib.MyListView(); this.lvEffects = new ShareX.HelpersLib.MyListView();
this.chEffect = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.chEffect = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.btnRemove = new System.Windows.Forms.Button();
this.btnClear = new System.Windows.Forms.Button();
this.btnDuplicate = 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();
@ -45,19 +41,25 @@ private void InitializeComponent()
this.cmsLoadImage = new System.Windows.Forms.ContextMenuStrip(this.components); this.cmsLoadImage = new System.Windows.Forms.ContextMenuStrip(this.components);
this.tsmiLoadImageFromFile = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiLoadImageFromFile = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiLoadImageFromClipboard = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiLoadImageFromClipboard = new System.Windows.Forms.ToolStripMenuItem();
this.btnAddPreset = new System.Windows.Forms.Button();
this.btnRemovePreset = new System.Windows.Forms.Button();
this.cbPresets = new System.Windows.Forms.ComboBox();
this.lblPresetName = new System.Windows.Forms.Label(); this.lblPresetName = new System.Windows.Forms.Label();
this.txtPresetName = new System.Windows.Forms.TextBox(); this.txtPresetName = new System.Windows.Forms.TextBox();
this.btnClose = new System.Windows.Forms.Button(); this.btnClose = new System.Windows.Forms.Button();
this.btnOK = new System.Windows.Forms.Button(); this.btnOK = new System.Windows.Forms.Button();
this.btnUploadImage = new System.Windows.Forms.Button(); this.btnUploadImage = new System.Windows.Forms.Button();
this.btnRefresh = new System.Windows.Forms.Button();
this.btnDuplicatePreset = new System.Windows.Forms.Button();
this.lblPresets = new System.Windows.Forms.Label(); this.lblPresets = new System.Windows.Forms.Label();
this.btnPackager = new System.Windows.Forms.Button(); this.btnPackager = new System.Windows.Forms.Button();
this.scMain = new ShareX.HelpersLib.SplitContainerCustomSplitter(); this.scMain = new ShareX.HelpersLib.SplitContainerCustomSplitter();
this.btnPresetNew = new System.Windows.Forms.Button();
this.btnPresetRemove = new System.Windows.Forms.Button();
this.btnPresetDuplicate = new System.Windows.Forms.Button();
this.lvPresets = new ShareX.HelpersLib.MyListView();
this.chPreset = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.lblEffects = new System.Windows.Forms.Label();
this.btnEffectAdd = new System.Windows.Forms.Button();
this.btnEffectRemove = new System.Windows.Forms.Button();
this.btnEffectDuplicate = new System.Windows.Forms.Button();
this.btnEffectClear = new System.Windows.Forms.Button();
this.btnEffectRefresh = new System.Windows.Forms.Button();
this.cmsLoadImage.SuspendLayout(); this.cmsLoadImage.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
this.scMain.Panel1.SuspendLayout(); this.scMain.Panel1.SuspendLayout();
@ -73,13 +75,6 @@ private void InitializeComponent()
this.pgSettings.ToolbarVisible = false; this.pgSettings.ToolbarVisible = false;
this.pgSettings.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.pgSettings_PropertyValueChanged); this.pgSettings.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.pgSettings_PropertyValueChanged);
// //
// btnAdd
//
resources.ApplyResources(this.btnAdd, "btnAdd");
this.btnAdd.Name = "btnAdd";
this.btnAdd.UseVisualStyleBackColor = true;
this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click);
//
// lvEffects // lvEffects
// //
this.lvEffects.AllowDrop = true; this.lvEffects.AllowDrop = true;
@ -105,27 +100,6 @@ private void InitializeComponent()
// //
resources.ApplyResources(this.chEffect, "chEffect"); resources.ApplyResources(this.chEffect, "chEffect");
// //
// btnRemove
//
resources.ApplyResources(this.btnRemove, "btnRemove");
this.btnRemove.Name = "btnRemove";
this.btnRemove.UseVisualStyleBackColor = true;
this.btnRemove.Click += new System.EventHandler(this.btnRemove_Click);
//
// btnClear
//
resources.ApplyResources(this.btnClear, "btnClear");
this.btnClear.Name = "btnClear";
this.btnClear.UseVisualStyleBackColor = true;
this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
//
// btnDuplicate
//
resources.ApplyResources(this.btnDuplicate, "btnDuplicate");
this.btnDuplicate.Name = "btnDuplicate";
this.btnDuplicate.UseVisualStyleBackColor = true;
this.btnDuplicate.Click += new System.EventHandler(this.btnDuplicate_Click);
//
// btnSaveImage // btnSaveImage
// //
resources.ApplyResources(this.btnSaveImage, "btnSaveImage"); resources.ApplyResources(this.btnSaveImage, "btnSaveImage");
@ -191,28 +165,6 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiLoadImageFromClipboard, "tsmiLoadImageFromClipboard"); resources.ApplyResources(this.tsmiLoadImageFromClipboard, "tsmiLoadImageFromClipboard");
this.tsmiLoadImageFromClipboard.Click += new System.EventHandler(this.tsmiLoadImageFromClipboard_Click); this.tsmiLoadImageFromClipboard.Click += new System.EventHandler(this.tsmiLoadImageFromClipboard_Click);
// //
// btnAddPreset
//
resources.ApplyResources(this.btnAddPreset, "btnAddPreset");
this.btnAddPreset.Name = "btnAddPreset";
this.btnAddPreset.UseVisualStyleBackColor = true;
this.btnAddPreset.Click += new System.EventHandler(this.btnAddPreset_Click);
//
// btnRemovePreset
//
resources.ApplyResources(this.btnRemovePreset, "btnRemovePreset");
this.btnRemovePreset.Name = "btnRemovePreset";
this.btnRemovePreset.UseVisualStyleBackColor = true;
this.btnRemovePreset.Click += new System.EventHandler(this.btnRemovePreset_Click);
//
// cbPresets
//
this.cbPresets.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbPresets.FormattingEnabled = true;
resources.ApplyResources(this.cbPresets, "cbPresets");
this.cbPresets.Name = "cbPresets";
this.cbPresets.SelectedIndexChanged += new System.EventHandler(this.cbPresets_SelectedIndexChanged);
//
// lblPresetName // lblPresetName
// //
resources.ApplyResources(this.lblPresetName, "lblPresetName"); resources.ApplyResources(this.lblPresetName, "lblPresetName");
@ -246,20 +198,6 @@ private void InitializeComponent()
this.btnUploadImage.UseVisualStyleBackColor = true; this.btnUploadImage.UseVisualStyleBackColor = true;
this.btnUploadImage.Click += new System.EventHandler(this.btnUploadImage_Click); this.btnUploadImage.Click += new System.EventHandler(this.btnUploadImage_Click);
// //
// btnRefresh
//
resources.ApplyResources(this.btnRefresh, "btnRefresh");
this.btnRefresh.Name = "btnRefresh";
this.btnRefresh.UseVisualStyleBackColor = true;
this.btnRefresh.Click += new System.EventHandler(this.BtnRefresh_Click);
//
// btnDuplicatePreset
//
resources.ApplyResources(this.btnDuplicatePreset, "btnDuplicatePreset");
this.btnDuplicatePreset.Name = "btnDuplicatePreset";
this.btnDuplicatePreset.UseVisualStyleBackColor = true;
this.btnDuplicatePreset.Click += new System.EventHandler(this.btnDuplicatePreset_Click);
//
// lblPresets // lblPresets
// //
resources.ApplyResources(this.lblPresets, "lblPresets"); resources.ApplyResources(this.lblPresets, "lblPresets");
@ -287,32 +225,121 @@ private void InitializeComponent()
this.scMain.SplitterColor = System.Drawing.Color.White; this.scMain.SplitterColor = System.Drawing.Color.White;
this.scMain.SplitterLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189))))); this.scMain.SplitterLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189)))));
// //
// btnPresetNew
//
this.btnPresetNew.Image = global::ShareX.ImageEffectsLib.Properties.Resources.plus;
resources.ApplyResources(this.btnPresetNew, "btnPresetNew");
this.btnPresetNew.Name = "btnPresetNew";
this.btnPresetNew.UseVisualStyleBackColor = true;
this.btnPresetNew.Click += new System.EventHandler(this.btnPresetNew_Click);
//
// btnPresetRemove
//
this.btnPresetRemove.Image = global::ShareX.ImageEffectsLib.Properties.Resources.minus;
resources.ApplyResources(this.btnPresetRemove, "btnPresetRemove");
this.btnPresetRemove.Name = "btnPresetRemove";
this.btnPresetRemove.UseVisualStyleBackColor = true;
this.btnPresetRemove.Click += new System.EventHandler(this.btnPresetRemove_Click);
//
// btnPresetDuplicate
//
this.btnPresetDuplicate.Image = global::ShareX.ImageEffectsLib.Properties.Resources.document_copy;
resources.ApplyResources(this.btnPresetDuplicate, "btnPresetDuplicate");
this.btnPresetDuplicate.Name = "btnPresetDuplicate";
this.btnPresetDuplicate.UseVisualStyleBackColor = true;
this.btnPresetDuplicate.Click += new System.EventHandler(this.btnPresetDuplicate_Click);
//
// lvPresets
//
this.lvPresets.AutoFillColumn = true;
this.lvPresets.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chPreset});
this.lvPresets.FullRowSelect = true;
this.lvPresets.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lvPresets.HideSelection = false;
resources.ApplyResources(this.lvPresets, "lvPresets");
this.lvPresets.MultiSelect = false;
this.lvPresets.Name = "lvPresets";
this.lvPresets.UseCompatibleStateImageBehavior = false;
this.lvPresets.View = System.Windows.Forms.View.Details;
this.lvPresets.SelectedIndexChanged += new System.EventHandler(this.lvPresets_SelectedIndexChanged);
//
// chPreset
//
resources.ApplyResources(this.chPreset, "chPreset");
//
// lblEffects
//
resources.ApplyResources(this.lblEffects, "lblEffects");
this.lblEffects.Name = "lblEffects";
//
// btnEffectAdd
//
this.btnEffectAdd.Image = global::ShareX.ImageEffectsLib.Properties.Resources.plus;
resources.ApplyResources(this.btnEffectAdd, "btnEffectAdd");
this.btnEffectAdd.Name = "btnEffectAdd";
this.btnEffectAdd.UseVisualStyleBackColor = true;
this.btnEffectAdd.Click += new System.EventHandler(this.btnEffectAdd_Click);
//
// btnEffectRemove
//
this.btnEffectRemove.Image = global::ShareX.ImageEffectsLib.Properties.Resources.minus;
resources.ApplyResources(this.btnEffectRemove, "btnEffectRemove");
this.btnEffectRemove.Name = "btnEffectRemove";
this.btnEffectRemove.UseVisualStyleBackColor = true;
this.btnEffectRemove.Click += new System.EventHandler(this.btnEffectRemove_Click);
//
// btnEffectDuplicate
//
this.btnEffectDuplicate.Image = global::ShareX.ImageEffectsLib.Properties.Resources.document_copy;
resources.ApplyResources(this.btnEffectDuplicate, "btnEffectDuplicate");
this.btnEffectDuplicate.Name = "btnEffectDuplicate";
this.btnEffectDuplicate.UseVisualStyleBackColor = true;
this.btnEffectDuplicate.Click += new System.EventHandler(this.btnEffectDuplicate_Click);
//
// btnEffectClear
//
this.btnEffectClear.Image = global::ShareX.ImageEffectsLib.Properties.Resources.eraser;
resources.ApplyResources(this.btnEffectClear, "btnEffectClear");
this.btnEffectClear.Name = "btnEffectClear";
this.btnEffectClear.UseVisualStyleBackColor = true;
this.btnEffectClear.Click += new System.EventHandler(this.btnEffectClear_Click);
//
// btnEffectRefresh
//
this.btnEffectRefresh.Image = global::ShareX.ImageEffectsLib.Properties.Resources.arrow_circle_double_135;
resources.ApplyResources(this.btnEffectRefresh, "btnEffectRefresh");
this.btnEffectRefresh.Name = "btnEffectRefresh";
this.btnEffectRefresh.UseVisualStyleBackColor = true;
this.btnEffectRefresh.Click += new System.EventHandler(this.btnEffectRefresh_Click);
//
// ImageEffectsForm // ImageEffectsForm
// //
resources.ApplyResources(this, "$this"); resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window; this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnClose; this.CancelButton = this.btnClose;
this.Controls.Add(this.btnEffectRefresh);
this.Controls.Add(this.btnEffectClear);
this.Controls.Add(this.btnEffectDuplicate);
this.Controls.Add(this.btnEffectRemove);
this.Controls.Add(this.btnEffectAdd);
this.Controls.Add(this.lblEffects);
this.Controls.Add(this.lvPresets);
this.Controls.Add(this.btnPresetDuplicate);
this.Controls.Add(this.btnPresetRemove);
this.Controls.Add(this.btnPresetNew);
this.Controls.Add(this.scMain); this.Controls.Add(this.scMain);
this.Controls.Add(this.btnPackager); this.Controls.Add(this.btnPackager);
this.Controls.Add(this.lblPresets); this.Controls.Add(this.lblPresets);
this.Controls.Add(this.btnDuplicatePreset);
this.Controls.Add(this.btnRefresh);
this.Controls.Add(this.btnUploadImage); this.Controls.Add(this.btnUploadImage);
this.Controls.Add(this.btnOK); this.Controls.Add(this.btnOK);
this.Controls.Add(this.btnClose); this.Controls.Add(this.btnClose);
this.Controls.Add(this.txtPresetName); this.Controls.Add(this.txtPresetName);
this.Controls.Add(this.lblPresetName); this.Controls.Add(this.lblPresetName);
this.Controls.Add(this.cbPresets);
this.Controls.Add(this.btnRemovePreset);
this.Controls.Add(this.btnAddPreset);
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.btnDuplicate);
this.Controls.Add(this.btnClear);
this.Controls.Add(this.btnRemove);
this.Controls.Add(this.btnAdd);
this.Controls.Add(this.lvEffects); this.Controls.Add(this.lvEffects);
this.Name = "ImageEffectsForm"; this.Name = "ImageEffectsForm";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
@ -330,13 +357,9 @@ private void InitializeComponent()
#endregion #endregion
private System.Windows.Forms.PropertyGrid pgSettings; private System.Windows.Forms.PropertyGrid pgSettings;
private System.Windows.Forms.Button btnAdd;
private ShareX.HelpersLib.MyListView lvEffects; private ShareX.HelpersLib.MyListView lvEffects;
private System.Windows.Forms.ColumnHeader chEffect; private System.Windows.Forms.ColumnHeader chEffect;
private System.Windows.Forms.Button btnRemove;
private ShareX.HelpersLib.MyPictureBox pbResult; private ShareX.HelpersLib.MyPictureBox pbResult;
private System.Windows.Forms.Button btnClear;
private System.Windows.Forms.Button btnDuplicate;
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;
@ -344,19 +367,25 @@ private void InitializeComponent()
private System.Windows.Forms.ContextMenuStrip cmsLoadImage; private System.Windows.Forms.ContextMenuStrip cmsLoadImage;
private System.Windows.Forms.ToolStripMenuItem tsmiLoadImageFromFile; private System.Windows.Forms.ToolStripMenuItem tsmiLoadImageFromFile;
private System.Windows.Forms.ToolStripMenuItem tsmiLoadImageFromClipboard; private System.Windows.Forms.ToolStripMenuItem tsmiLoadImageFromClipboard;
private System.Windows.Forms.Button btnAddPreset;
private System.Windows.Forms.Button btnRemovePreset;
private System.Windows.Forms.ComboBox cbPresets;
private System.Windows.Forms.Label lblPresetName; private System.Windows.Forms.Label lblPresetName;
private System.Windows.Forms.TextBox txtPresetName; private System.Windows.Forms.TextBox txtPresetName;
private System.Windows.Forms.Button btnClose; private System.Windows.Forms.Button btnClose;
private System.Windows.Forms.Button btnOK; private System.Windows.Forms.Button btnOK;
private System.Windows.Forms.Button btnUploadImage; private System.Windows.Forms.Button btnUploadImage;
private System.Windows.Forms.Button btnRefresh;
private System.Windows.Forms.Button btnDuplicatePreset;
private System.Windows.Forms.Label lblPresets; private System.Windows.Forms.Label lblPresets;
private System.Windows.Forms.Button btnPackager; private System.Windows.Forms.Button btnPackager;
private HelpersLib.SplitContainerCustomSplitter scMain; private HelpersLib.SplitContainerCustomSplitter scMain;
private System.Windows.Forms.Button btnPresetNew;
private System.Windows.Forms.Button btnPresetRemove;
private System.Windows.Forms.Button btnPresetDuplicate;
private HelpersLib.MyListView lvPresets;
private System.Windows.Forms.Label lblEffects;
private System.Windows.Forms.Button btnEffectAdd;
private System.Windows.Forms.Button btnEffectRemove;
private System.Windows.Forms.Button btnEffectDuplicate;
private System.Windows.Forms.Button btnEffectClear;
private System.Windows.Forms.Button btnEffectRefresh;
private System.Windows.Forms.ColumnHeader chPreset;
} }
} }

65
ShareX.ImageEffectsLib/ImageEffectsForm.cs
View file

@ -192,10 +192,11 @@ private void LoadSettings()
{ {
foreach (ImageEffectPreset preset in Presets) foreach (ImageEffectPreset preset in Presets)
{ {
cbPresets.Items.Add(preset); ListViewItem lvi = new ListViewItem(preset.ToString());
lvPresets.Items.Add(lvi);
} }
cbPresets.SelectedIndex = SelectedPresetIndex.Clamp(0, Presets.Count - 1); lvPresets.SelectedIndex = SelectedPresetIndex.Clamp(0, Presets.Count - 1);
} }
UpdateControlStates(); UpdateControlStates();
@ -203,13 +204,20 @@ private void LoadSettings()
private ImageEffectPreset GetSelectedPreset() private ImageEffectPreset GetSelectedPreset()
{ {
int index = cbPresets.SelectedIndex; return GetSelectedPreset(out _);
}
private ImageEffectPreset GetSelectedPreset(out ListViewItem lvi)
{
int index = lvPresets.SelectedIndex;
if (Presets.IsValidIndex(index)) if (Presets.IsValidIndex(index))
{ {
lvi = lvPresets.Items[index];
return Presets[index]; return Presets[index];
} }
lvi = null;
return null; return null;
} }
@ -223,9 +231,10 @@ private void AddPreset(ImageEffectPreset preset)
if (preset != null) if (preset != null)
{ {
Presets.Add(preset); Presets.Add(preset);
cbPresets.Items.Add(preset); ListViewItem lvi = new ListViewItem(preset.ToString());
lvPresets.Items.Add(lvi);
ignorePresetsSelectedIndexChanged = true; ignorePresetsSelectedIndexChanged = true;
cbPresets.SelectedIndex = cbPresets.Items.Count - 1; lvPresets.SelectLast();
ignorePresetsSelectedIndexChanged = false; ignorePresetsSelectedIndexChanged = false;
LoadPreset(preset); LoadPreset(preset);
txtPresetName.Focus(); txtPresetName.Focus();
@ -282,9 +291,9 @@ private void UpdatePreview()
private void UpdateControlStates() private void UpdateControlStates()
{ {
btnRemovePreset.Enabled = btnDuplicatePreset.Enabled = cbPresets.Enabled = txtPresetName.Enabled = btnAdd.Enabled = cbPresets.SelectedIndex > -1; btnPresetRemove.Enabled = btnPresetDuplicate.Enabled = lvPresets.Enabled = txtPresetName.Enabled = btnEffectAdd.Enabled = lvPresets.SelectedItems.Count > 0;
btnRemove.Enabled = btnDuplicate.Enabled = lvEffects.SelectedItems.Count > 0; btnEffectRemove.Enabled = btnEffectDuplicate.Enabled = lvEffects.SelectedItems.Count > 0;
btnClear.Enabled = lvEffects.Items.Count > 0; btnEffectClear.Enabled = lvEffects.Items.Count > 0;
} }
private void GeneratePreviewImage(int padding) private void GeneratePreviewImage(int padding)
@ -447,33 +456,33 @@ private void ImageEffectsForm_Shown(object sender, EventArgs e)
this.ForceActivate(); this.ForceActivate();
} }
private void btnAddPreset_Click(object sender, EventArgs e) private void btnPresetNew_Click(object sender, EventArgs e)
{ {
AddPreset(); AddPreset();
} }
private void btnRemovePreset_Click(object sender, EventArgs e) private void btnPresetRemove_Click(object sender, EventArgs e)
{ {
int selected = cbPresets.SelectedIndex; int selected = lvPresets.SelectedIndex;
if (selected > -1) if (selected > -1)
{ {
cbPresets.Items.RemoveAt(selected); lvPresets.Items.RemoveAt(selected);
Presets.RemoveAt(selected); Presets.RemoveAt(selected);
if (cbPresets.Items.Count > 0) if (lvPresets.Items.Count > 0)
{ {
cbPresets.SelectedIndex = selected == cbPresets.Items.Count ? cbPresets.Items.Count - 1 : selected; lvPresets.SelectedIndex = selected == lvPresets.Items.Count ? lvPresets.Items.Count - 1 : selected;
} }
else else
{ {
ClearFields(); ClearFields();
btnAddPreset.Focus(); btnPresetNew.Focus();
} }
} }
} }
private void btnDuplicatePreset_Click(object sender, EventArgs e) private void btnPresetDuplicate_Click(object sender, EventArgs e)
{ {
ImageEffectPreset preset = GetSelectedPreset(); ImageEffectPreset preset = GetSelectedPreset();
@ -484,9 +493,9 @@ private void btnDuplicatePreset_Click(object sender, EventArgs e)
} }
} }
private void cbPresets_SelectedIndexChanged(object sender, EventArgs e) private void lvPresets_SelectedIndexChanged(object sender, EventArgs e)
{ {
SelectedPresetIndex = cbPresets.SelectedIndex; SelectedPresetIndex = lvPresets.SelectedIndex;
if (!ignorePresetsSelectedIndexChanged) if (!ignorePresetsSelectedIndexChanged)
{ {
@ -500,27 +509,27 @@ private void cbPresets_SelectedIndexChanged(object sender, EventArgs e)
private void txtPresetName_TextChanged(object sender, EventArgs e) private void txtPresetName_TextChanged(object sender, EventArgs e)
{ {
ImageEffectPreset preset = GetSelectedPreset(); ListViewItem lvi;
ImageEffectPreset preset = GetSelectedPreset(out lvi);
if (preset != null) if (preset != null)
{ {
preset.Name = txtPresetName.Text; preset.Name = txtPresetName.Text;
ignorePresetsSelectedIndexChanged = true; lvi.Text = preset.ToString();
cbPresets.RefreshItems();
ignorePresetsSelectedIndexChanged = false;
} }
} }
private void btnAdd_Click(object sender, EventArgs e) private void btnEffectAdd_Click(object sender, EventArgs e)
{ {
cmsEffects.Show(btnAdd, 0, btnAdd.Height + 1); cmsEffects.Show(btnEffectAdd, 0, btnEffectAdd.Height + 1);
} }
private void btnRemove_Click(object sender, EventArgs e) private void btnEffectRemove_Click(object sender, EventArgs e)
{ {
RemoveSelectedEffects(); RemoveSelectedEffects();
} }
private void btnDuplicate_Click(object sender, EventArgs e) private void btnEffectDuplicate_Click(object sender, EventArgs e)
{ {
ImageEffectPreset preset = GetSelectedPreset(); ImageEffectPreset preset = GetSelectedPreset();
@ -541,7 +550,7 @@ private void btnDuplicate_Click(object sender, EventArgs e)
} }
} }
private void btnClear_Click(object sender, EventArgs e) private void btnEffectClear_Click(object sender, EventArgs e)
{ {
ImageEffectPreset preset = GetSelectedPreset(); ImageEffectPreset preset = GetSelectedPreset();
@ -554,7 +563,7 @@ private void btnClear_Click(object sender, EventArgs e)
} }
} }
private void BtnRefresh_Click(object sender, EventArgs e) private void btnEffectRefresh_Click(object sender, EventArgs e)
{ {
UpdatePreview(); UpdatePreview();
} }

511
ShareX.ImageEffectsLib/ImageEffectsForm.resx
View file

@ -126,7 +126,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="pgSettings.Size" type="System.Drawing.Size, System.Drawing"> <data name="pgSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>330, 424</value> <value>330, 496</value>
</data> </data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="pgSettings.TabIndex" type="System.Int32, mscorlib"> <data name="pgSettings.TabIndex" type="System.Int32, mscorlib">
@ -144,38 +144,17 @@
<data name="&gt;&gt;pgSettings.ZOrder" xml:space="preserve"> <data name="&gt;&gt;pgSettings.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="btnAdd.Location" type="System.Drawing.Point, System.Drawing">
<value>408, 40</value>
</data>
<data name="btnAdd.Size" type="System.Drawing.Size, System.Drawing">
<value>104, 24</value>
</data>
<data name="btnAdd.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="btnAdd.Text" xml:space="preserve">
<value>Add</value>
</data>
<data name="&gt;&gt;btnAdd.Name" xml:space="preserve">
<value>btnAdd</value>
</data>
<data name="&gt;&gt;btnAdd.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;btnAdd.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnAdd.ZOrder" xml:space="preserve">
<value>21</value>
</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>
</data> </data>
<data name="chEffect.Width" type="System.Int32, mscorlib">
<value>164</value>
</data>
<data name="lvEffects.Location" type="System.Drawing.Point, System.Drawing"> <data name="lvEffects.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 72</value> <value>8, 322</value>
</data> </data>
<data name="lvEffects.Size" type="System.Drawing.Size, System.Drawing"> <data name="lvEffects.Size" type="System.Drawing.Size, System.Drawing">
<value>168, 424</value> <value>168, 222</value>
</data> </data>
<data name="lvEffects.TabIndex" type="System.Int32, mscorlib"> <data name="lvEffects.TabIndex" type="System.Int32, mscorlib">
<value>14</value> <value>14</value>
@ -190,82 +169,7 @@
<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>22</value> <value>23</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>520, 40</value>
</data>
<data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
<value>104, 24</value>
</data>
<data name="btnRemove.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="btnRemove.Text" xml:space="preserve">
<value>Remove</value>
</data>
<data name="&gt;&gt;btnRemove.Name" xml:space="preserve">
<value>btnRemove</value>
</data>
<data name="&gt;&gt;btnRemove.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;btnRemove.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnRemove.ZOrder" xml:space="preserve">
<value>20</value>
</data>
<data name="btnClear.Location" type="System.Drawing.Point, System.Drawing">
<value>744, 40</value>
</data>
<data name="btnClear.Size" type="System.Drawing.Size, System.Drawing">
<value>104, 24</value>
</data>
<data name="btnClear.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
</data>
<data name="btnClear.Text" xml:space="preserve">
<value>Clear</value>
</data>
<data name="&gt;&gt;btnClear.Name" xml:space="preserve">
<value>btnClear</value>
</data>
<data name="&gt;&gt;btnClear.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;btnClear.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnClear.ZOrder" xml:space="preserve">
<value>19</value>
</data>
<data name="btnDuplicate.Location" type="System.Drawing.Point, System.Drawing">
<value>632, 40</value>
</data>
<data name="btnDuplicate.Size" type="System.Drawing.Size, System.Drawing">
<value>104, 24</value>
</data>
<data name="btnDuplicate.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="btnDuplicate.Text" xml:space="preserve">
<value>Duplicate</value>
</data>
<data name="&gt;&gt;btnDuplicate.Name" xml:space="preserve">
<value>btnDuplicate</value>
</data>
<data name="&gt;&gt;btnDuplicate.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;btnDuplicate.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnDuplicate.ZOrder" xml:space="preserve">
<value>18</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">
<value>Bottom, Left</value> <value>Bottom, Left</value>
@ -274,7 +178,7 @@
<value>True</value> <value>True</value>
</data> </data>
<data name="btnSaveImage.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnSaveImage.Location" type="System.Drawing.Point, System.Drawing">
<value>456, 504</value> <value>456, 552</value>
</data> </data>
<data name="btnSaveImage.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnSaveImage.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 24</value> <value>120, 24</value>
@ -298,13 +202,13 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;btnSaveImage.ZOrder" xml:space="preserve"> <data name="&gt;&gt;btnSaveImage.ZOrder" xml:space="preserve">
<value>17</value> <value>22</value>
</data> </data>
<data name="eiImageEffects.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="eiImageEffects.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value> <value>Bottom, Left</value>
</data> </data>
<data name="eiImageEffects.Location" type="System.Drawing.Point, System.Drawing"> <data name="eiImageEffects.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 504</value> <value>8, 552</value>
</data> </data>
<data name="eiImageEffects.Size" type="System.Drawing.Size, System.Drawing"> <data name="eiImageEffects.Size" type="System.Drawing.Size, System.Drawing">
<value>192, 24</value> <value>192, 24</value>
@ -322,7 +226,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;eiImageEffects.ZOrder" xml:space="preserve"> <data name="&gt;&gt;eiImageEffects.ZOrder" xml:space="preserve">
<value>16</value> <value>21</value>
</data> </data>
<data name="pbResult.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="pbResult.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
@ -331,7 +235,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="pbResult.Size" type="System.Drawing.Size, System.Drawing"> <data name="pbResult.Size" type="System.Drawing.Size, System.Drawing">
<value>440, 424</value> <value>496, 496</value>
</data> </data>
<data name="pbResult.TabIndex" type="System.Int32, mscorlib"> <data name="pbResult.TabIndex" type="System.Int32, mscorlib">
<value>16</value> <value>16</value>
@ -364,7 +268,7 @@
<value>Bottom, Left</value> <value>Bottom, Left</value>
</data> </data>
<data name="mbLoadImage.Location" type="System.Drawing.Point, System.Drawing"> <data name="mbLoadImage.Location" type="System.Drawing.Point, System.Drawing">
<value>328, 504</value> <value>328, 552</value>
</data> </data>
<metadata name="cmsLoadImage.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="cmsLoadImage.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>126, 17</value> <value>126, 17</value>
@ -400,7 +304,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;mbLoadImage.ZOrder" xml:space="preserve"> <data name="&gt;&gt;mbLoadImage.ZOrder" xml:space="preserve">
<value>15</value> <value>20</value>
</data> </data>
<data name="tsmiLoadImageFromFile.Size" type="System.Drawing.Size, System.Drawing"> <data name="tsmiLoadImageFromFile.Size" type="System.Drawing.Size, System.Drawing">
<value>130, 22</value> <value>130, 22</value>
@ -414,89 +318,20 @@
<data name="tsmiLoadImageFromClipboard.Text" xml:space="preserve"> <data name="tsmiLoadImageFromClipboard.Text" xml:space="preserve">
<value>From clipboard</value> <value>From clipboard</value>
</data> </data>
<data name="btnAddPreset.Location" type="System.Drawing.Point, System.Drawing">
<value>408, 8</value>
</data>
<data name="btnAddPreset.Size" type="System.Drawing.Size, System.Drawing">
<value>136, 24</value>
</data>
<data name="btnAddPreset.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="btnAddPreset.Text" xml:space="preserve">
<value>New preset</value>
</data>
<data name="&gt;&gt;btnAddPreset.Name" xml:space="preserve">
<value>btnAddPreset</value>
</data>
<data name="&gt;&gt;btnAddPreset.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;btnAddPreset.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnAddPreset.ZOrder" xml:space="preserve">
<value>14</value>
</data>
<data name="btnRemovePreset.Location" type="System.Drawing.Point, System.Drawing">
<value>552, 8</value>
</data>
<data name="btnRemovePreset.Size" type="System.Drawing.Size, System.Drawing">
<value>136, 24</value>
</data>
<data name="btnRemovePreset.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="btnRemovePreset.Text" xml:space="preserve">
<value>Remove preset</value>
</data>
<data name="&gt;&gt;btnRemovePreset.Name" xml:space="preserve">
<value>btnRemovePreset</value>
</data>
<data name="&gt;&gt;btnRemovePreset.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;btnRemovePreset.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnRemovePreset.ZOrder" xml:space="preserve">
<value>13</value>
</data>
<data name="cbPresets.Location" type="System.Drawing.Point, System.Drawing">
<value>104, 10</value>
</data>
<data name="cbPresets.Size" type="System.Drawing.Size, System.Drawing">
<value>296, 21</value>
</data>
<data name="cbPresets.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="&gt;&gt;cbPresets.Name" xml:space="preserve">
<value>cbPresets</value>
</data>
<data name="&gt;&gt;cbPresets.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbPresets.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;cbPresets.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="lblPresetName.AutoSize" type="System.Boolean, mscorlib"> <data name="lblPresetName.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
<data name="lblPresetName.Location" type="System.Drawing.Point, System.Drawing"> <data name="lblPresetName.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 46</value> <value>181, 8</value>
</data> </data>
<data name="lblPresetName.Size" type="System.Drawing.Size, System.Drawing"> <data name="lblPresetName.Size" type="System.Drawing.Size, System.Drawing">
<value>38, 13</value> <value>69, 13</value>
</data> </data>
<data name="lblPresetName.TabIndex" type="System.Int32, mscorlib"> <data name="lblPresetName.TabIndex" type="System.Int32, mscorlib">
<value>7</value> <value>7</value>
</data> </data>
<data name="lblPresetName.Text" xml:space="preserve"> <data name="lblPresetName.Text" xml:space="preserve">
<value>Name:</value> <value>Preset name:</value>
</data> </data>
<data name="&gt;&gt;lblPresetName.Name" xml:space="preserve"> <data name="&gt;&gt;lblPresetName.Name" xml:space="preserve">
<value>lblPresetName</value> <value>lblPresetName</value>
@ -508,13 +343,13 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;lblPresetName.ZOrder" xml:space="preserve"> <data name="&gt;&gt;lblPresetName.ZOrder" xml:space="preserve">
<value>11</value> <value>19</value>
</data> </data>
<data name="txtPresetName.Location" type="System.Drawing.Point, System.Drawing"> <data name="txtPresetName.Location" type="System.Drawing.Point, System.Drawing">
<value>104, 42</value> <value>184, 24</value>
</data> </data>
<data name="txtPresetName.Size" type="System.Drawing.Size, System.Drawing"> <data name="txtPresetName.Size" type="System.Drawing.Size, System.Drawing">
<value>296, 20</value> <value>168, 20</value>
</data> </data>
<data name="txtPresetName.TabIndex" type="System.Int32, mscorlib"> <data name="txtPresetName.TabIndex" type="System.Int32, mscorlib">
<value>8</value> <value>8</value>
@ -529,13 +364,13 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;txtPresetName.ZOrder" xml:space="preserve"> <data name="&gt;&gt;txtPresetName.ZOrder" xml:space="preserve">
<value>10</value> <value>18</value>
</data> </data>
<data name="btnClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="btnClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value> <value>Bottom, Right</value>
</data> </data>
<data name="btnClose.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
<value>840, 504</value> <value>896, 552</value>
</data> </data>
<data name="btnClose.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 24</value> <value>120, 24</value>
@ -556,13 +391,13 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve"> <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
<value>9</value> <value>17</value>
</data> </data>
<data name="btnOK.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="btnOK.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value> <value>Bottom, Right</value>
</data> </data>
<data name="btnOK.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
<value>712, 504</value> <value>768, 552</value>
</data> </data>
<data name="btnOK.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 24</value> <value>120, 24</value>
@ -586,13 +421,13 @@
<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>8</value> <value>16</value>
</data> </data>
<data name="btnUploadImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="btnUploadImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value> <value>Bottom, Left</value>
</data> </data>
<data name="btnUploadImage.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnUploadImage.Location" type="System.Drawing.Point, System.Drawing">
<value>584, 504</value> <value>584, 552</value>
</data> </data>
<data name="btnUploadImage.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnUploadImage.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 24</value> <value>120, 24</value>
@ -616,61 +451,13 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;btnUploadImage.ZOrder" xml:space="preserve"> <data name="&gt;&gt;btnUploadImage.ZOrder" xml:space="preserve">
<value>7</value> <value>15</value>
</data>
<data name="btnRefresh.Location" type="System.Drawing.Point, System.Drawing">
<value>856, 40</value>
</data>
<data name="btnRefresh.Size" type="System.Drawing.Size, System.Drawing">
<value>104, 24</value>
</data>
<data name="btnRefresh.TabIndex" type="System.Int32, mscorlib">
<value>13</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>6</value>
</data>
<data name="btnDuplicatePreset.Location" type="System.Drawing.Point, System.Drawing">
<value>696, 8</value>
</data>
<data name="btnDuplicatePreset.Size" type="System.Drawing.Size, System.Drawing">
<value>136, 24</value>
</data>
<data name="btnDuplicatePreset.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="btnDuplicatePreset.Text" xml:space="preserve">
<value>Duplicate preset</value>
</data>
<data name="&gt;&gt;btnDuplicatePreset.Name" xml:space="preserve">
<value>btnDuplicatePreset</value>
</data>
<data name="&gt;&gt;btnDuplicatePreset.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;btnDuplicatePreset.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnDuplicatePreset.ZOrder" xml:space="preserve">
<value>5</value>
</data> </data>
<data name="lblPresets.AutoSize" type="System.Boolean, mscorlib"> <data name="lblPresets.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
<data name="lblPresets.Location" type="System.Drawing.Point, System.Drawing"> <data name="lblPresets.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 14</value> <value>5, 8</value>
</data> </data>
<data name="lblPresets.Size" type="System.Drawing.Size, System.Drawing"> <data name="lblPresets.Size" type="System.Drawing.Size, System.Drawing">
<value>45, 13</value> <value>45, 13</value>
@ -691,13 +478,13 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;lblPresets.ZOrder" xml:space="preserve"> <data name="&gt;&gt;lblPresets.ZOrder" xml:space="preserve">
<value>4</value> <value>14</value>
</data> </data>
<data name="btnPackager.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="btnPackager.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value> <value>Bottom, Left</value>
</data> </data>
<data name="btnPackager.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnPackager.Location" type="System.Drawing.Point, System.Drawing">
<value>200, 504</value> <value>200, 552</value>
</data> </data>
<data name="btnPackager.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnPackager.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 24</value> <value>120, 24</value>
@ -718,13 +505,13 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;btnPackager.ZOrder" xml:space="preserve"> <data name="&gt;&gt;btnPackager.ZOrder" xml:space="preserve">
<value>3</value> <value>13</value>
</data> </data>
<data name="scMain.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="scMain.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value> <value>Top, Bottom, Left, Right</value>
</data> </data>
<data name="scMain.Location" type="System.Drawing.Point, System.Drawing"> <data name="scMain.Location" type="System.Drawing.Point, System.Drawing">
<value>184, 72</value> <value>184, 48</value>
</data> </data>
<data name="&gt;&gt;scMain.Panel1.Name" xml:space="preserve"> <data name="&gt;&gt;scMain.Panel1.Name" xml:space="preserve">
<value>scMain.Panel1</value> <value>scMain.Panel1</value>
@ -751,7 +538,7 @@
<value>1</value> <value>1</value>
</data> </data>
<data name="scMain.Size" type="System.Drawing.Size, System.Drawing"> <data name="scMain.Size" type="System.Drawing.Size, System.Drawing">
<value>776, 424</value> <value>832, 496</value>
</data> </data>
<data name="scMain.SplitterDistance" type="System.Int32, mscorlib"> <data name="scMain.SplitterDistance" type="System.Int32, mscorlib">
<value>330</value> <value>330</value>
@ -772,7 +559,226 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;scMain.ZOrder" xml:space="preserve"> <data name="&gt;&gt;scMain.ZOrder" xml:space="preserve">
<value>0</value> <value>12</value>
</data>
<data name="btnPresetNew.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 24</value>
</data>
<data name="btnPresetNew.Size" type="System.Drawing.Size, System.Drawing">
<value>24, 24</value>
</data>
<data name="btnPresetNew.TabIndex" type="System.Int32, mscorlib">
<value>23</value>
</data>
<data name="&gt;&gt;btnPresetNew.Name" xml:space="preserve">
<value>btnPresetNew</value>
</data>
<data name="&gt;&gt;btnPresetNew.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;btnPresetNew.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnPresetNew.ZOrder" xml:space="preserve">
<value>11</value>
</data>
<data name="btnPresetRemove.Location" type="System.Drawing.Point, System.Drawing">
<value>34, 24</value>
</data>
<data name="btnPresetRemove.Size" type="System.Drawing.Size, System.Drawing">
<value>24, 24</value>
</data>
<data name="btnPresetRemove.TabIndex" type="System.Int32, mscorlib">
<value>24</value>
</data>
<data name="&gt;&gt;btnPresetRemove.Name" xml:space="preserve">
<value>btnPresetRemove</value>
</data>
<data name="&gt;&gt;btnPresetRemove.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;btnPresetRemove.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnPresetRemove.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="btnPresetDuplicate.Location" type="System.Drawing.Point, System.Drawing">
<value>60, 24</value>
</data>
<data name="btnPresetDuplicate.Size" type="System.Drawing.Size, System.Drawing">
<value>24, 24</value>
</data>
<data name="btnPresetDuplicate.TabIndex" type="System.Int32, mscorlib">
<value>25</value>
</data>
<data name="&gt;&gt;btnPresetDuplicate.Name" xml:space="preserve">
<value>btnPresetDuplicate</value>
</data>
<data name="&gt;&gt;btnPresetDuplicate.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;btnPresetDuplicate.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnPresetDuplicate.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="lvPresets.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 50</value>
</data>
<data name="lvPresets.Size" type="System.Drawing.Size, System.Drawing">
<value>168, 222</value>
</data>
<data name="lvPresets.TabIndex" type="System.Int32, mscorlib">
<value>26</value>
</data>
<data name="&gt;&gt;lvPresets.Name" xml:space="preserve">
<value>lvPresets</value>
</data>
<data name="&gt;&gt;lvPresets.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.1.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvPresets.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lvPresets.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="chPreset.Width" type="System.Int32, mscorlib">
<value>164</value>
</data>
<data name="lblEffects.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblEffects.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 280</value>
</data>
<data name="lblEffects.Size" type="System.Drawing.Size, System.Drawing">
<value>43, 13</value>
</data>
<data name="lblEffects.TabIndex" type="System.Int32, mscorlib">
<value>27</value>
</data>
<data name="lblEffects.Text" xml:space="preserve">
<value>Effects:</value>
</data>
<data name="&gt;&gt;lblEffects.Name" xml:space="preserve">
<value>lblEffects</value>
</data>
<data name="&gt;&gt;lblEffects.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblEffects.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lblEffects.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="btnEffectAdd.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 296</value>
</data>
<data name="btnEffectAdd.Size" type="System.Drawing.Size, System.Drawing">
<value>24, 24</value>
</data>
<data name="btnEffectAdd.TabIndex" type="System.Int32, mscorlib">
<value>28</value>
</data>
<data name="&gt;&gt;btnEffectAdd.Name" xml:space="preserve">
<value>btnEffectAdd</value>
</data>
<data name="&gt;&gt;btnEffectAdd.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;btnEffectAdd.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnEffectAdd.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="btnEffectRemove.Location" type="System.Drawing.Point, System.Drawing">
<value>34, 296</value>
</data>
<data name="btnEffectRemove.Size" type="System.Drawing.Size, System.Drawing">
<value>24, 24</value>
</data>
<data name="btnEffectRemove.TabIndex" type="System.Int32, mscorlib">
<value>29</value>
</data>
<data name="&gt;&gt;btnEffectRemove.Name" xml:space="preserve">
<value>btnEffectRemove</value>
</data>
<data name="&gt;&gt;btnEffectRemove.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;btnEffectRemove.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnEffectRemove.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="btnEffectDuplicate.Location" type="System.Drawing.Point, System.Drawing">
<value>60, 296</value>
</data>
<data name="btnEffectDuplicate.Size" type="System.Drawing.Size, System.Drawing">
<value>24, 24</value>
</data>
<data name="btnEffectDuplicate.TabIndex" type="System.Int32, mscorlib">
<value>30</value>
</data>
<data name="&gt;&gt;btnEffectDuplicate.Name" xml:space="preserve">
<value>btnEffectDuplicate</value>
</data>
<data name="&gt;&gt;btnEffectDuplicate.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;btnEffectDuplicate.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnEffectDuplicate.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="btnEffectClear.Location" type="System.Drawing.Point, System.Drawing">
<value>86, 296</value>
</data>
<data name="btnEffectClear.Size" type="System.Drawing.Size, System.Drawing">
<value>24, 24</value>
</data>
<data name="btnEffectClear.TabIndex" type="System.Int32, mscorlib">
<value>31</value>
</data>
<data name="&gt;&gt;btnEffectClear.Name" xml:space="preserve">
<value>btnEffectClear</value>
</data>
<data name="&gt;&gt;btnEffectClear.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;btnEffectClear.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnEffectClear.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="btnEffectRefresh.Location" type="System.Drawing.Point, System.Drawing">
<value>112, 296</value>
</data>
<data name="btnEffectRefresh.Size" type="System.Drawing.Size, System.Drawing">
<value>24, 24</value>
</data>
<data name="btnEffectRefresh.TabIndex" type="System.Int32, mscorlib">
<value>32</value>
</data>
<data name="&gt;&gt;btnEffectRefresh.Name" xml:space="preserve">
<value>btnEffectRefresh</value>
</data>
<data name="&gt;&gt;btnEffectRefresh.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;btnEffectRefresh.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnEffectRefresh.ZOrder" xml:space="preserve">
<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>
@ -784,7 +790,10 @@
<value>6, 13</value> <value>6, 13</value>
</data> </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>969, 535</value> <value>1025, 585</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data> </data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms"> <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value> <value>CenterScreen</value>
@ -810,6 +819,12 @@
<data name="&gt;&gt;tsmiLoadImageFromClipboard.Type" xml:space="preserve"> <data name="&gt;&gt;tsmiLoadImageFromClipboard.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;chPreset.Name" xml:space="preserve">
<value>chPreset</value>
</data>
<data name="&gt;&gt;chPreset.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="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>ImageEffectsForm</value> <value>ImageEffectsForm</value>
</data> </data>

50
ShareX.ImageEffectsLib/Properties/Resources.Designer.cs generated
View file

@ -60,6 +60,36 @@ internal class Resources {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap arrow_circle_double_135 {
get {
object obj = ResourceManager.GetObject("arrow-circle-double-135", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap document_copy {
get {
object obj = ResourceManager.GetObject("document-copy", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap eraser {
get {
object obj = ResourceManager.GetObject("eraser", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Adjustments. /// Looks up a localized string similar to Adjustments.
/// </summary> /// </summary>
@ -114,5 +144,25 @@ internal class Resources {
"me___2__ms", resourceCulture); "me___2__ms", resourceCulture);
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap minus {
get {
object obj = ResourceManager.GetObject("minus", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap plus {
get {
object obj = ResourceManager.GetObject("plus", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
} }
} }

71
ShareX.ImageEffectsLib/Properties/Resources.resx
View file

@ -3,7 +3,7 @@
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 1.3 Version 2.0
The primary goals of this format is to allow a simple XML format The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the that is mostly human readable. The generation and parsing of the
@ -14,16 +14,17 @@
... ado.net/XML headers & schema ... ... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">1.3</resheader> <resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1">this is my long string</data> <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
[base64 mime encoded serialized .NET Framework object] <value>[base64 mime encoded serialized .NET Framework object]</value>
</data> </data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
[base64 mime encoded string representing a byte array form of the .NET Framework object] <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data> </data>
There are any number of "resheader" rows that contain simple There are any number of "resheader" rows that contain simple
@ -45,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64 mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
@ -58,20 +59,38 @@
: using a System.ComponentModel.TypeConverter : using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
--> -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType> <xsd:complexType>
<xsd:choice maxOccurs="unbounded"> <xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data"> <xsd:element name="data">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="resheader"> <xsd:element name="resheader">
@ -90,30 +109,46 @@
<value>text/microsoft-resx</value> <value>text/microsoft-resx</value>
</resheader> </resheader>
<resheader name="version"> <resheader name="version">
<value>1.3</value> <value>2.0</value>
</resheader> </resheader>
<resheader name="reader"> <resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="ImageEffectsForm_AddAllEffectsToTreeView_Drawings" xml:space="preserve"> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<value>Drawings</value> <data name="eraser" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="ImageEffectsForm_AddAllEffectsToTreeView_Manipulations" xml:space="preserve"> <data name="plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Manipulations</value> <value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ImageEffectsForm_AddAllEffectsToTreeView_Adjustments" xml:space="preserve">
<value>Adjustments</value>
</data> </data>
<data name="ImageEffectsForm_AddAllEffectsToTreeView_Filters" xml:space="preserve"> <data name="ImageEffectsForm_AddAllEffectsToTreeView_Filters" xml:space="preserve">
<value>Filters</value> <value>Filters</value>
</data> </data>
<data name="minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ImageEffectsForm_AddAllEffectsToTreeView_Drawings" xml:space="preserve">
<value>Drawings</value>
</data>
<data name="ImageEffectsForm_UpdatePreview_Image_effects___Width___0___Height___1___Render_time___2__ms" xml:space="preserve"> <data name="ImageEffectsForm_UpdatePreview_Image_effects___Width___0___Height___1___Render_time___2__ms" xml:space="preserve">
<value>Image effects - Width: {0}, Height: {1}, Render time: {2} ms</value> <value>Image effects - Width: {0}, Height: {1}, Render time: {2} ms</value>
</data> </data>
<data name="ImageEffectsForm_AddAllEffectsToTreeView_Manipulations" xml:space="preserve">
<value>Manipulations</value>
</data>
<data name="document-copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\document-copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ImageEffectsForm_EditorMode_Cancel" xml:space="preserve"> <data name="ImageEffectsForm_EditorMode_Cancel" xml:space="preserve">
<value>Cancel</value> <value>Cancel</value>
</data> </data>
<data name="ImageEffectsForm_AddAllEffectsToTreeView_Adjustments" xml:space="preserve">
<value>Adjustments</value>
</data>
<data name="arrow-circle-double-135" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-circle-double-135.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>

BIN
ShareX.ImageEffectsLib/Resources/arrow-circle-double-135.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 792 B

BIN
ShareX.ImageEffectsLib/Resources/document-copy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 564 B

BIN
ShareX.ImageEffectsLib/Resources/eraser.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 656 B

BIN
ShareX.ImageEffectsLib/Resources/minus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 224 B

BIN
ShareX.ImageEffectsLib/Resources/plus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 482 B

15
ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
View file

@ -269,6 +269,21 @@
<Version>12.0.3</Version> <Version>12.0.3</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Resources\plus.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\minus.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\document-copy.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\eraser.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\arrow-circle-double-135.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.