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

Allow re ordering hotkeys

Browse source
This commit is contained in:
Jaex 2016-07-19 13:10:43 +03:00
parent 4ccc050e97
commit d9adf4ccd6
3 changed files with 136 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ShareX/Forms/HotkeySettingsForm.Designer.cs generated
View file

@ -35,6 +35,8 @@ private void InitializeComponent()
this.btnEdit = new System.Windows.Forms.Button();
this.btnRemove = new System.Windows.Forms.Button();
this.btnAdd = new System.Windows.Forms.Button();
this.btnMoveUp = new System.Windows.Forms.Button();
this.btnMoveDown = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// btnDuplicate
@ -78,11 +80,27 @@ private void InitializeComponent()
this.btnAdd.UseVisualStyleBackColor = true;
this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click);
//
// btnMoveUp
//
resources.ApplyResources(this.btnMoveUp, "btnMoveUp");
this.btnMoveUp.Name = "btnMoveUp";
this.btnMoveUp.UseVisualStyleBackColor = true;
this.btnMoveUp.Click += new System.EventHandler(this.btnMoveUp_Click);
//
// btnMoveDown
//
resources.ApplyResources(this.btnMoveDown, "btnMoveDown");
this.btnMoveDown.Name = "btnMoveDown";
this.btnMoveDown.UseVisualStyleBackColor = true;
this.btnMoveDown.Click += new System.EventHandler(this.btnMoveDown_Click);
//
// HotkeySettingsForm
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
this.Controls.Add(this.btnMoveDown);
this.Controls.Add(this.btnMoveUp);
this.Controls.Add(this.btnDuplicate);
this.Controls.Add(this.btnReset);
this.Controls.Add(this.flpHotkeys);
@ -103,6 +121,7 @@ private void InitializeComponent()
private System.Windows.Forms.Button btnEdit;
private System.Windows.Forms.Button btnRemove;
private System.Windows.Forms.Button btnAdd;
private System.Windows.Forms.Button btnMoveUp;
private System.Windows.Forms.Button btnMoveDown;
}
}

49
ShareX/Forms/HotkeySettingsForm.cs
View file

@ -24,12 +24,12 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using ShareX.HelpersLib;
using ShareX.Properties;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using ShareX.Properties;
namespace ShareX
{
@ -79,6 +79,7 @@ private void AddControls()
private void UpdateButtons()
{
btnEdit.Enabled = btnRemove.Enabled = btnDuplicate.Enabled = Selected != null;
btnMoveUp.Enabled = btnMoveDown.Enabled = Selected != null && flpHotkeys.Controls.Count > 1;
}
private HotkeySelectionControl FindSelectionControl(HotkeySettings hotkeySetting)
@ -210,12 +211,58 @@ private void btnDuplicate_Click(object sender, EventArgs e)
}
}
private void btnMoveUp_Click(object sender, EventArgs e)
{
if (Selected != null && flpHotkeys.Controls.Count > 1)
{
int index = flpHotkeys.Controls.GetChildIndex(Selected);
int newIndex;
if (index == 0)
{
newIndex = flpHotkeys.Controls.Count - 1;
}
else
{
newIndex = index - 1;
}
flpHotkeys.Controls.SetChildIndex(Selected, newIndex);
manager.Hotkeys.Move(index, newIndex);
}
}
private void btnMoveDown_Click(object sender, EventArgs e)
{
if (Selected != null && flpHotkeys.Controls.Count > 1)
{
int index = flpHotkeys.Controls.GetChildIndex(Selected);
int newIndex;
if (index == flpHotkeys.Controls.Count - 1)
{
newIndex = 0;
}
else
{
newIndex = index + 1;
}
flpHotkeys.Controls.SetChildIndex(Selected, newIndex);
manager.Hotkeys.Move(index, newIndex);
}
}
private void btnReset_Click(object sender, EventArgs e)
{
if (MessageBox.Show(Resources.HotkeySettingsForm_Reset_all_hotkeys_to_defaults_Confirmation, "ShareX", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
manager.ResetHotkeys();
AddControls();
Selected = null;
UpdateButtons();
}
}
}

82
ShareX/Forms/HotkeySettingsForm.resx
View file

@ -148,19 +148,16 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnDuplicate.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnReset.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
<value>2</value>
</data>
<data name="btnReset.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnReset.Location" type="System.Drawing.Point, System.Drawing">
<value>352, 8</value>
<value>392, 8</value>
</data>
<data name="btnReset.Size" type="System.Drawing.Size, System.Drawing">
<value>177, 23</value>
<value>208, 23</value>
</data>
<data name="btnReset.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -178,7 +175,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnReset.ZOrder" xml:space="preserve">
<value>1</value>
<value>3</value>
</data>
<data name="flpHotkeys.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
@ -193,7 +190,7 @@
<value>8, 35</value>
</data>
<data name="flpHotkeys.Size" type="System.Drawing.Size, System.Drawing">
<value>520, 373</value>
<value>591, 419</value>
</data>
<data name="flpHotkeys.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -211,7 +208,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;flpHotkeys.ZOrder" xml:space="preserve">
<value>2</value>
<value>4</value>
</data>
<data name="btnEdit.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
@ -241,7 +238,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnEdit.ZOrder" xml:space="preserve">
<value>3</value>
<value>5</value>
</data>
<data name="btnRemove.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
@ -271,7 +268,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnRemove.ZOrder" xml:space="preserve">
<value>4</value>
<value>6</value>
</data>
<data name="btnAdd.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -298,7 +295,64 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnAdd.ZOrder" xml:space="preserve">
<value>5</value>
<value>7</value>
</data>
<data name="btnMoveUp.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="btnMoveUp.Location" type="System.Drawing.Point, System.Drawing">
<value>328, 8</value>
</data>
<data name="btnMoveUp.Size" type="System.Drawing.Size, System.Drawing">
<value>32, 23</value>
</data>
<data name="btnMoveUp.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="btnMoveUp.Text" xml:space="preserve">
<value>↑</value>
</data>
<data name="&gt;&gt;btnMoveUp.Name" xml:space="preserve">
<value>btnMoveUp</value>
</data>
<data name="&gt;&gt;btnMoveUp.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;btnMoveUp.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnMoveUp.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="btnMoveDown.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="btnMoveDown.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnMoveDown.Location" type="System.Drawing.Point, System.Drawing">
<value>360, 8</value>
</data>
<data name="btnMoveDown.Size" type="System.Drawing.Size, System.Drawing">
<value>32, 23</value>
</data>
<data name="btnMoveDown.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="btnMoveDown.Text" xml:space="preserve">
<value>↓</value>
</data>
<data name="&gt;&gt;btnMoveDown.Name" xml:space="preserve">
<value>btnMoveDown</value>
</data>
<data name="&gt;&gt;btnMoveDown.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;btnMoveDown.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnMoveDown.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>
@ -307,10 +361,10 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>536, 415</value>
<value>607, 461</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>552, 200</value>
<value>623, 200</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>