Skip to content

Commit

Permalink
[+] Open temp folder menu item
Browse files Browse the repository at this point in the history
  • Loading branch information
huiyadanli committed Oct 20, 2018
1 parent ff82c3b commit 154ca36
Show file tree
Hide file tree
Showing 10 changed files with 216 additions and 156 deletions.
File renamed without changes.
11 changes: 10 additions & 1 deletion PasteEx/Forms/FormMain.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions PasteEx/Forms/FormMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,15 @@ public void SwitchLanguage(System.ComponentModel.ComponentResourceManager cmp, S
// Inheritance Object -> MarshalByRefObject -> Component -> NotifyIcon
if (notifyIcon.ContextMenuStrip != null)
{
foreach (ToolStripItem item in notifyIcon.ContextMenuStrip.Items)
{
cmp.ApplyResources(item, item.Name, cultureInfo);
}
I18n.ApplyResourceToToolStripItem(notifyIcon.ContextMenuStrip.Items, cmp, cultureInfo);
}
}

#endregion
private void openTempFolderToolStripMenuItem_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start("explorer.exe", PathGenerator.defaultMonitorTempFolder);
}

#endregion
}
}
219 changes: 117 additions & 102 deletions PasteEx/Forms/FormMain.resx

Large diffs are not rendered by default.

44 changes: 28 additions & 16 deletions PasteEx/Forms/FormMain.zh-CN.resx
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,6 @@
<data name="btnChooseLocation.Text" xml:space="preserve">
<value>选择路径</value>
</data>
<data name="contextMenuStripSetting.Size" type="System.Drawing.Size, System.Drawing">
<value>125, 48</value>
</data>
<data name="monitorModeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>124, 22</value>
</data>
Expand All @@ -151,49 +148,64 @@
<data name="settingToolStripMenuItem.Text" xml:space="preserve">
<value>设置</value>
</data>
<data name="contextMenuStripSetting.Size" type="System.Drawing.Size, System.Drawing">
<value>125, 48</value>
</data>
<data name="startMonitorToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
<value>160, 22</value>
</data>
<data name="startMonitorToolStripMenuItem.Text" xml:space="preserve">
<value>启动监听</value>
</data>
<data name="stopMonitorToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
<value>160, 22</value>
</data>
<data name="stopMonitorToolStripMenuItem.Text" xml:space="preserve">
<value>停止监听</value>
</data>
<data name="autoToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
<value>160, 22</value>
</data>
<data name="autoToolStripMenuItem.Text" xml:space="preserve">
<value>自动图片转文件</value>
</data>
<data name="advancedToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 6</value>
</data>
<data name="openDebugWindowToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
</data>
<data name="openDebugWindowToolStripMenuItem.Text" xml:space="preserve">
<value>打开 Debug 窗口</value>
</data>
<data name="openTempFolderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
</data>
<data name="openTempFolderToolStripMenuItem.Text" xml:space="preserve">
<value>打开临时文件目录</value>
</data>
<data name="advancedToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 22</value>
</data>
<data name="advancedToolStripMenuItem.Text" xml:space="preserve">
<value>高级</value>
</data>
<data name="settingToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
<value>160, 22</value>
</data>
<data name="settingToolStripMenuItem1.Text" xml:space="preserve">
<value>设置</value>
</data>
<data name="toolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 6</value>
</data>
<data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
<value>160, 22</value>
</data>
<data name="exitToolStripMenuItem.Text" xml:space="preserve">
<value>退出</value>
</data>
<data name="contextMenuStripMonitorMode.Size" type="System.Drawing.Size, System.Drawing">
<value>161, 136</value>
</data>
<data name="openDebugWindowToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
</data>
<data name="openDebugWindowToolStripMenuItem.Text" xml:space="preserve">
<value>打开 Debug 窗口</value>
<value>161, 148</value>
</data>
</root>
26 changes: 16 additions & 10 deletions PasteEx/Forms/FormMain.zh-Hant.resx
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,6 @@
<data name="btnChooseLocation.Text" xml:space="preserve">
<value>選擇路徑</value>
</data>
<data name="contextMenuStripSetting.Size" type="System.Drawing.Size, System.Drawing">
<value>125, 48</value>
</data>
<data name="monitorModeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>124, 22</value>
</data>
Expand All @@ -151,6 +148,9 @@
<data name="settingToolStripMenuItem.Text" xml:space="preserve">
<value>設置</value>
</data>
<data name="contextMenuStripSetting.Size" type="System.Drawing.Size, System.Drawing">
<value>125, 48</value>
</data>
<data name="startMonitorToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
</data>
Expand All @@ -172,6 +172,18 @@
<data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>177, 6</value>
</data>
<data name="openDebugWindowToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
</data>
<data name="openDebugWindowToolStripMenuItem.Text" xml:space="preserve">
<value>打開 Debug 窗口</value>
</data>
<data name="openTempFolderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
</data>
<data name="openTempFolderToolStripMenuItem.Text" xml:space="preserve">
<value>打開臨時文件目錄</value>
</data>
<data name="advancedToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
</data>
Expand All @@ -194,12 +206,6 @@
<value>退出</value>
</data>
<data name="contextMenuStripMonitorMode.Size" type="System.Drawing.Size, System.Drawing">
<value>161, 148</value>
</data>
<data name="openDebugWindowToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
</data>
<data name="openDebugWindowToolStripMenuItem.Text" xml:space="preserve">
<value>打開 Debug 窗口</value>
<value>181, 170</value>
</data>
</root>
5 changes: 2 additions & 3 deletions PasteEx/Forms/FormSetting.cs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ private void FormSetting_Load(object sender, EventArgs e)

public void InitSomething(object sender, EventArgs e)
{
Get();

// Application Filter
radApplicationFilter_CheckedChanged(sender, e);
Expand All @@ -138,8 +137,8 @@ public void InitSomething(object sender, EventArgs e)
chkAutoSave_CheckedChanged(sender, e);

// Validate Hotkey
ChangeLableValidState(lblQuickPasteExHotkeyValid, TxtPasteHotkeyValidate(txtQuickPasteExHotkey.Text));
chkQuickPasteExHotkeyWinKey_CheckedChanged(sender, e);
ChangeLableValidState(lblQuickPasteExHotkeyValid, TxtPasteHotkeyValidate(txtQuickPasteExHotkey.Text));

// About Tab Page
linkLabel1.Text = string.Format(Resources.Strings.TxtAbout, System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString());
Expand Down Expand Up @@ -364,7 +363,7 @@ private void txtQuickPasteExHotkey_TextChanged(object sender, EventArgs e)
private void chkQuickPasteExHotkeyWinKey_CheckedChanged(object sender, EventArgs e)
{
txtQuickPasteExHotkey.HasWinKey = chkQuickPasteExHotkeyWinKey.Checked;
txtQuickPasteExHotkey.RefreshText();
txtQuickPasteExHotkey.RefreshText(txtQuickPasteExHotkey.Text);
}

private void ChangeLableValidState(Label lbl, bool state)
Expand Down
31 changes: 18 additions & 13 deletions PasteEx/Forms/Hotkey/HotkeyTextBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class HotkeyTextBox : TextBox
public override bool Multiline { get { return false; } }

// These variables store the current hotkey and modifier(s)
private Hotkey Hotkey { get; }
private Hotkey hotkey;

public bool HasWinKey { get; set; }

Expand All @@ -25,7 +25,7 @@ public class HotkeyTextBox : TextBox
/// </summary>
public HotkeyTextBox()
{
Hotkey = new Hotkey();
hotkey = new Hotkey();

ContextMenu = new ContextMenu(); // Disable right-clicking
GotFocus += delegate { User32.HideCaret(Handle); };
Expand All @@ -34,10 +34,15 @@ public HotkeyTextBox()
/// <summary>
/// When the hotkey is modified externally, the hotkey string needs to be refreshed.
/// </summary>
public void RefreshText()
public void RefreshText(string hotkeyStr = null)
{
Hotkey.Windows = HasWinKey;
Text = Hotkey.ToString();
if (!string.IsNullOrEmpty(hotkeyStr))
{
hotkey = new Hotkey(hotkeyStr);
}

hotkey.Windows = HasWinKey;
Text = hotkey.ToString();
}

/// <summary>
Expand All @@ -48,28 +53,28 @@ protected override void OnKeyDown(KeyEventArgs e)
// Clear the current hotkey
if (e.KeyCode == Keys.Back || e.KeyCode == Keys.Delete)
{
Hotkey.Reset();
hotkey.Reset();
return;
}
else
{
Hotkey.Key = e.KeyCode;
hotkey.Key = e.KeyCode;

Hotkey.Alt = e.Alt;
Hotkey.Control = e.Control;
Hotkey.Shift = e.Shift;
Hotkey.Windows = HasWinKey;
hotkey.Alt = e.Alt;
hotkey.Control = e.Control;
hotkey.Shift = e.Shift;
hotkey.Windows = HasWinKey;
}

Text = Hotkey.ToString();
Text = hotkey.ToString();
}

/// <summary>
/// If the current hotkey isn't valid, reset it.
/// </summary>
protected override void OnKeyUp(KeyEventArgs e)
{
if (Hotkey.Key == Keys.None)
if (hotkey.Key == Keys.None)
{
Text = "";
}
Expand Down
2 changes: 1 addition & 1 deletion PasteEx/PasteEx.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Core\ApplicationCopyFilter.cs" />
<Compile Include="Core\AppCopyFilter.cs" />
<Compile Include="Core\ClipboardData.cs" />
<Compile Include="Core\ClipboardMonitor.cs" />
<Compile Include="Core\ModeController.cs" />
Expand Down
23 changes: 18 additions & 5 deletions PasteEx/Util/I18n.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,18 +128,31 @@ private static void ApplyResourceToControl(Control control, ComponentResourceMan
{
cmp.ApplyResources(control, control.Name, cultureInfo);

if(control.ContextMenuStrip != null)
if (control.ContextMenuStrip != null)
{
foreach(ToolStripItem item in control.ContextMenuStrip.Items)
{
cmp.ApplyResources(item, item.Name, cultureInfo);
}
ApplyResourceToToolStripItem(control.ContextMenuStrip.Items, cmp, cultureInfo);
}

foreach (Control child in control.Controls)
{
ApplyResourceToControl(child, cmp, cultureInfo);
}
}

public static void ApplyResourceToToolStripItem(ToolStripItemCollection collection, ComponentResourceManager cmp, CultureInfo cultureInfo)
{
foreach (ToolStripItem item in collection)
{
cmp.ApplyResources(item, item.Name, cultureInfo);
if (item is ToolStripMenuItem)
{
ToolStripItemCollection dropDownItems = (item as ToolStripMenuItem).DropDownItems;
if (dropDownItems != null && dropDownItems.Count > 0)
{
ApplyResourceToToolStripItem(dropDownItems, cmp, cultureInfo);
}
}
}
}
}
}

0 comments on commit 154ca36

Please sign in to comment.