QuickImage – Diff between revs 12 and 20
?pathlinks?
Rev 12 | Rev 20 | |||
---|---|---|---|---|
Line 12... | Line 12... | |||
12 | using System.Runtime.CompilerServices; |
12 | using System.Runtime.CompilerServices; |
|
13 | using System.Security.Cryptography; |
13 | using System.Security.Cryptography; |
|
14 | using System.Text.RegularExpressions; |
14 | using System.Text.RegularExpressions; |
|
15 | using System.Threading; |
15 | using System.Threading; |
|
16 | using System.Threading.Tasks; |
16 | using System.Threading.Tasks; |
|
17 | using System.Threading.Tasks.Dataflow; |
17 | using System.Threading.Tasks.Dataflow; |
|
18 | using System.Windows.Forms; |
18 | using System.Windows.Forms; |
|
19 | using Configuration; |
19 | using Configuration; |
|
20 | using ImageMagick; |
20 | using ImageMagick; |
|
21 | using ImageMagick.Factories; |
21 | using ImageMagick.Factories; |
|
22 | using Microsoft.WindowsAPICodePack.Dialogs; |
22 | using Microsoft.WindowsAPICodePack.Dialogs; |
|
Line 34... | Line 34... | |||
34 | using QuickImage.Utilities.Serialization.XML; |
34 | using QuickImage.Utilities.Serialization.XML; |
|
35 | using Serilog; |
35 | using Serilog; |
|
36 | using Shipwreck.Phash; |
36 | using Shipwreck.Phash; |
|
37 | using Shipwreck.Phash.Bitmaps; |
37 | using Shipwreck.Phash.Bitmaps; |
|
38 | using Tesseract; |
38 | using Tesseract; |
|
39 | using ImageFormat = System.Drawing.Imaging.ImageFormat; |
39 | using ImageFormat = System.Drawing.Imaging.ImageFormat; |
|
40 | |
40 | |
|
41 | namespace QuickImage |
41 | namespace QuickImage |
|
42 | { |
42 | { |
|
43 | public partial class Form1 : Form |
43 | public partial class Form1 : Form |
|
44 | { |
44 | { |
|
45 | private readonly CancellationToken _cancellationToken; |
45 | private readonly CancellationToken _cancellationToken; |
|
Line 2732... | Line 2732... | |||
2732 | |
2732 | |
|
2733 | _tagAutoCompleteStringCollection = new AutoCompleteStringCollection(); |
2733 | _tagAutoCompleteStringCollection = new AutoCompleteStringCollection(); |
|
2734 | textBox1.AutoCompleteCustomSource = _tagAutoCompleteStringCollection; |
2734 | textBox1.AutoCompleteCustomSource = _tagAutoCompleteStringCollection; |
|
Line -... | Line 2735... | |||
- | 2735 | tagTextBox.AutoCompleteCustomSource = _tagAutoCompleteStringCollection; |
||
- | 2736 | |
||
2735 | tagTextBox.AutoCompleteCustomSource = _tagAutoCompleteStringCollection; |
2737 | moveToolStripMenuItem.DropDown.ItemClicked += moveTargetToolStripMenuItem_Click; |
|
Line 2736... | Line 2738... | |||
2736 | |
2738 | |
|
2737 | Configuration = await LoadConfiguration(); |
2739 | Configuration = await LoadConfiguration(); |
|
2738 | |
2740 | |
|
Line 3966... | Line 3968... | |||
3966 | if (menuItem.DropDownItems.ContainsKey(group)) |
3968 | if (menuItem.DropDownItems.ContainsKey(group)) |
|
3967 | { |
3969 | { |
|
3968 | continue; |
3970 | continue; |
|
3969 | } |
3971 | } |
|
Line 3970... | Line 3972... | |||
3970 | |
3972 | |
|
3971 | var toolStripMenuSubItem = new ToolStripButton(group) { Name = group }; |
- | ||
3972 | toolStripMenuSubItem.Click += moveTargetToolStripMenuItem_Click; |
3973 | var toolStripMenuSubItem = new ToolStripMenuItem(group) { Name = group }; |
|
3973 | menuItem.DropDownItems.Add(toolStripMenuSubItem); |
3974 | menuItem.DropDownItems.Add(toolStripMenuSubItem); |
|
3974 | } |
3975 | } |
|
Line 3975... | Line 3976... | |||
3975 | } |
3976 | } |
|
3976 | |
3977 | |
|
- | 3978 | private void moveToolStripMenuItem_DropDownClosed(object sender, EventArgs e) |
||
3977 | private void moveToolStripMenuItem_DropDownClosed(object sender, EventArgs e) |
3979 | { |
|
Line 3978... | Line 3980... | |||
3978 | { |
3980 | |
|
3979 | var menuItem = (ToolStripMenuItem)sender; |
3981 | var menuItem = (ToolStripMenuItem)sender; |
|
3980 | |
3982 | |
|
3981 | var items = new ConcurrentBag<ToolStripButton>(); |
- | ||
3982 | foreach(var toolStripMenuSubItem in menuItem.DropDownItems.OfType<ToolStripButton>()) |
- | ||
3983 | { |
3983 | var items = new ConcurrentBag<ToolStripMenuItem>(); |
|
3984 | toolStripMenuSubItem.Click -= moveTargetToolStripMenuItem_Click; |
3984 | foreach(var toolStripMenuSubItem in menuItem.DropDownItems.OfType<ToolStripMenuItem>()) |
|
Line 3985... | Line 3985... | |||
3985 | |
3985 | { |
|
3986 | items.Add(toolStripMenuSubItem); |
3986 | items.Add(toolStripMenuSubItem); |
|
3987 | } |
3987 | } |
|
3988 | |
3988 | |
|
3989 | foreach(var toolStripMenuSubItem in items) |
3989 | while(items.TryTake(out var toolStripMenuSubItem)) |
|
Line 3990... | Line 3990... | |||
3990 | { |
3990 | { |
|
3991 | menuItem.DropDownItems.Remove(toolStripMenuSubItem); |
3991 | menuItem.DropDownItems.Remove(toolStripMenuSubItem); |
|
3992 | } |
3992 | } |
|
Line 3993... | Line 3993... | |||
3993 | } |
3993 | } |
|
Line 3994... | Line 3994... | |||
3994 | |
3994 | |
|
3995 | private async void moveTargetToolStripMenuItem_Click(object sender, EventArgs e) |
3995 | private async void moveTargetToolStripMenuItem_Click(object sender, ToolStripItemClickedEventArgs e) |