QuickImage – Diff between revs 8 and 9

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 8 Rev 9
Line 39... Line 39...
39 this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); 39 this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
40 this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); 40 this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
41 this.removeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 41 this.removeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
42 this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); 42 this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
43 this.groupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 43 this.groupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-   44 this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
-   45 this.collapseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
44 this.collapseAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 46 this.collapseAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
45 this.expandAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 47 this.expandAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
46 this.imageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 48 this.imageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
47 this.editToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); 49 this.editToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
48 this.convertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 50 this.convertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
Line 99... Line 101...
99 this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 101 this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
100 this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); 102 this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
101 this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 103 this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
102 this.quitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 104 this.quitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
103 this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 105 this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-   106 this.copyCtrlCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-   107 this.copyAsMediaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-   108 this.pasteCtrlCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-   109 this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
104 this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 110 this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
105 this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 111 this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
106 this.sortByToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); 112 this.sortByToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
107 this.nameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 113 this.nameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
108 this.perceptionToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); 114 this.perceptionToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
Line 156... Line 162...
156 this.imageToolStripMenuItem, 162 this.imageToolStripMenuItem,
157 this.fileToolStripMenuItem1, 163 this.fileToolStripMenuItem1,
158 this.directoryToolStripMenuItem, 164 this.directoryToolStripMenuItem,
159 this.taggingToolStripMenuItem}); 165 this.taggingToolStripMenuItem});
160 this.contextMenuStrip1.Name = "contextMenuStrip1"; 166 this.contextMenuStrip1.Name = "contextMenuStrip1";
161 this.contextMenuStrip1.Size = new System.Drawing.Size(196, 200); 167 this.contextMenuStrip1.Size = new System.Drawing.Size(196, 178);
162 this.contextMenuStrip1.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.contextMenuStrip1_Closing); 168 this.contextMenuStrip1.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.contextMenuStrip1_Closing);
163 this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening); 169 this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
164 this.contextMenuStrip1.Opened += new System.EventHandler(this.contextMenuStrip1_Opened); 170 this.contextMenuStrip1.Opened += new System.EventHandler(this.contextMenuStrip1_Opened);
165 // 171 //
166 // tagTextBox 172 // tagTextBox
Line 196... Line 202...
196 this.toolStripSeparator3.Size = new System.Drawing.Size(192, 6); 202 this.toolStripSeparator3.Size = new System.Drawing.Size(192, 6);
197 // 203 //
198 // groupToolStripMenuItem 204 // groupToolStripMenuItem
199 // 205 //
200 this.groupToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 206 this.groupToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-   207 this.toolStripSeparator9,
-   208 this.collapseToolStripMenuItem,
201 this.collapseAllToolStripMenuItem, 209 this.collapseAllToolStripMenuItem,
202 this.expandAllToolStripMenuItem}); 210 this.expandAllToolStripMenuItem});
203 this.groupToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("groupToolStripMenuItem.Image"))); 211 this.groupToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("groupToolStripMenuItem.Image")));
204 this.groupToolStripMenuItem.Name = "groupToolStripMenuItem"; 212 this.groupToolStripMenuItem.Name = "groupToolStripMenuItem";
205 this.groupToolStripMenuItem.Size = new System.Drawing.Size(195, 22); 213 this.groupToolStripMenuItem.Size = new System.Drawing.Size(195, 22);
206 this.groupToolStripMenuItem.Text = "Group"; 214 this.groupToolStripMenuItem.Text = "Group";
207 // 215 //
-   216 // toolStripSeparator9
-   217 //
-   218 this.toolStripSeparator9.Name = "toolStripSeparator9";
-   219 this.toolStripSeparator9.Size = new System.Drawing.Size(131, 6);
-   220 //
-   221 // collapseToolStripMenuItem
-   222 //
-   223 this.collapseToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("collapseToolStripMenuItem.Image")));
-   224 this.collapseToolStripMenuItem.Name = "collapseToolStripMenuItem";
-   225 this.collapseToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
-   226 this.collapseToolStripMenuItem.Text = "Collapse";
-   227 this.collapseToolStripMenuItem.Click += new System.EventHandler(this.collapseToolStripMenuItem_Click);
-   228 //
208 // collapseAllToolStripMenuItem 229 // collapseAllToolStripMenuItem
209 // 230 //
210 this.collapseAllToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("collapseAllToolStripMenuItem.Image"))); 231 this.collapseAllToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("collapseAllToolStripMenuItem.Image")));
211 this.collapseAllToolStripMenuItem.Name = "collapseAllToolStripMenuItem"; 232 this.collapseAllToolStripMenuItem.Name = "collapseAllToolStripMenuItem";
212 this.collapseAllToolStripMenuItem.Size = new System.Drawing.Size(134, 22); 233 this.collapseAllToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
Line 293... Line 314...
293 // 314 //
294 // deleteToolStripMenuItem 315 // deleteToolStripMenuItem
295 // 316 //
296 this.deleteToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("deleteToolStripMenuItem.Image"))); 317 this.deleteToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("deleteToolStripMenuItem.Image")));
297 this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; 318 this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
298 this.deleteToolStripMenuItem.Size = new System.Drawing.Size(180, 22); 319 this.deleteToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
299 this.deleteToolStripMenuItem.Text = "Delete"; 320 this.deleteToolStripMenuItem.Text = "Delete";
300 this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); 321 this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click);
301 // 322 //
302 // openDirectoryToolStripMenuItem 323 // openDirectoryToolStripMenuItem
303 // 324 //
304 this.openDirectoryToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openDirectoryToolStripMenuItem.Image"))); 325 this.openDirectoryToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openDirectoryToolStripMenuItem.Image")));
305 this.openDirectoryToolStripMenuItem.Name = "openDirectoryToolStripMenuItem"; 326 this.openDirectoryToolStripMenuItem.Name = "openDirectoryToolStripMenuItem";
306 this.openDirectoryToolStripMenuItem.Size = new System.Drawing.Size(180, 22); 327 this.openDirectoryToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
307 this.openDirectoryToolStripMenuItem.Text = "Open in Explorer"; 328 this.openDirectoryToolStripMenuItem.Text = "Open in Explorer";
308 this.openDirectoryToolStripMenuItem.Click += new System.EventHandler(this.openDirectoryToolStripMenuItem_Click); 329 this.openDirectoryToolStripMenuItem.Click += new System.EventHandler(this.openDirectoryToolStripMenuItem_Click);
309 // 330 //
310 // moveToolStripMenuItem 331 // moveToolStripMenuItem
311 // 332 //
312 this.moveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("moveToolStripMenuItem.Image"))); 333 this.moveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("moveToolStripMenuItem.Image")));
313 this.moveToolStripMenuItem.Name = "moveToolStripMenuItem"; 334 this.moveToolStripMenuItem.Name = "moveToolStripMenuItem";
314 this.moveToolStripMenuItem.Size = new System.Drawing.Size(180, 22); 335 this.moveToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
315 this.moveToolStripMenuItem.Text = "Move"; 336 this.moveToolStripMenuItem.Text = "Move";
316 this.moveToolStripMenuItem.DropDownClosed += new System.EventHandler(this.moveToolStripMenuItem_DropDownClosed); 337 this.moveToolStripMenuItem.DropDownClosed += new System.EventHandler(this.moveToolStripMenuItem_DropDownClosed);
317 this.moveToolStripMenuItem.DropDownOpening += new System.EventHandler(this.moveToolStripMenuItem_DropDownOpening); 338 this.moveToolStripMenuItem.DropDownOpening += new System.EventHandler(this.moveToolStripMenuItem_DropDownOpening);
318 // 339 //
319 // renameToolStripMenuItem 340 // renameToolStripMenuItem
320 // 341 //
321 this.renameToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("renameToolStripMenuItem.Image"))); 342 this.renameToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("renameToolStripMenuItem.Image")));
322 this.renameToolStripMenuItem.Name = "renameToolStripMenuItem"; 343 this.renameToolStripMenuItem.Name = "renameToolStripMenuItem";
323 this.renameToolStripMenuItem.Size = new System.Drawing.Size(180, 22); 344 this.renameToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
324 this.renameToolStripMenuItem.Text = "Rename"; 345 this.renameToolStripMenuItem.Text = "Rename";
325 this.renameToolStripMenuItem.Click += new System.EventHandler(this.renameToolStripMenuItem_Click); 346 this.renameToolStripMenuItem.Click += new System.EventHandler(this.renameToolStripMenuItem_Click);
326 // 347 //
327 // directoryToolStripMenuItem 348 // directoryToolStripMenuItem
328 // 349 //
Line 823... Line 844...
823 this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click); 844 this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click);
824 // 845 //
825 // editToolStripMenuItem 846 // editToolStripMenuItem
826 // 847 //
827 this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 848 this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-   849 this.copyCtrlCToolStripMenuItem,
-   850 this.copyAsMediaToolStripMenuItem,
-   851 this.pasteCtrlCToolStripMenuItem,
-   852 this.toolStripSeparator10,
828 this.selectAllToolStripMenuItem}); 853 this.selectAllToolStripMenuItem});
829 this.editToolStripMenuItem.Name = "editToolStripMenuItem"; 854 this.editToolStripMenuItem.Name = "editToolStripMenuItem";
830 this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); 855 this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
831 this.editToolStripMenuItem.Text = "Edit"; 856 this.editToolStripMenuItem.Text = "Edit";
832 // 857 //
-   858 // copyCtrlCToolStripMenuItem
-   859 //
-   860 this.copyCtrlCToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("copyCtrlCToolStripMenuItem.Image")));
-   861 this.copyCtrlCToolStripMenuItem.Name = "copyCtrlCToolStripMenuItem";
-   862 this.copyCtrlCToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
-   863 this.copyCtrlCToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
-   864 this.copyCtrlCToolStripMenuItem.Text = "Copy";
-   865 this.copyCtrlCToolStripMenuItem.Click += new System.EventHandler(this.copyCtrlToolStripMenuItem_Click);
-   866 //
-   867 // copyAsMediaToolStripMenuItem
-   868 //
-   869 this.copyAsMediaToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("copyAsMediaToolStripMenuItem.Image")));
-   870 this.copyAsMediaToolStripMenuItem.Name = "copyAsMediaToolStripMenuItem";
-   871 this.copyAsMediaToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
-   872 | System.Windows.Forms.Keys.C)));
-   873 this.copyAsMediaToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
-   874 this.copyAsMediaToolStripMenuItem.Text = "Copy As Media";
-   875 this.copyAsMediaToolStripMenuItem.Click += new System.EventHandler(this.copyAsMediaToolStripMenuItem_Click);
-   876 //
-   877 // pasteCtrlCToolStripMenuItem
-   878 //
-   879 this.pasteCtrlCToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("pasteCtrlCToolStripMenuItem.Image")));
-   880 this.pasteCtrlCToolStripMenuItem.Name = "pasteCtrlCToolStripMenuItem";
-   881 this.pasteCtrlCToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
-   882 this.pasteCtrlCToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
-   883 this.pasteCtrlCToolStripMenuItem.Text = "Paste";
-   884 this.pasteCtrlCToolStripMenuItem.Click += new System.EventHandler(this.pasteCtrlCToolStripMenuItem_Click);
-   885 //
-   886 // toolStripSeparator10
-   887 //
-   888 this.toolStripSeparator10.Name = "toolStripSeparator10";
-   889 this.toolStripSeparator10.Size = new System.Drawing.Size(219, 6);
-   890 //
833 // selectAllToolStripMenuItem 891 // selectAllToolStripMenuItem
834 // 892 //
835 this.selectAllToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("selectAllToolStripMenuItem.Image"))); 893 this.selectAllToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("selectAllToolStripMenuItem.Image")));
836 this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; 894 this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
-   895 this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
837 this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(170, 22); 896 this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
838 this.selectAllToolStripMenuItem.Text = "Select All (Ctrl + A)"; 897 this.selectAllToolStripMenuItem.Text = "Select All";
839 this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); 898 this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
840 // 899 //
841 // viewToolStripMenuItem 900 // viewToolStripMenuItem
842 // 901 //
843 this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 902 this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
Line 1171... Line 1230...
1171 private ToolStripMenuItem oCRTextToTagsToolStripMenuItem; 1230 private ToolStripMenuItem oCRTextToTagsToolStripMenuItem;
1172 private TableLayoutPanel tableLayoutPanel5; 1231 private TableLayoutPanel tableLayoutPanel5;
1173 private TableLayoutPanel tableLayoutPanel6; 1232 private TableLayoutPanel tableLayoutPanel6;
1174 private Button button1; 1233 private Button button1;
1175 private ToolStripMenuItem nameToolStripMenuItem; 1234 private ToolStripMenuItem nameToolStripMenuItem;
-   1235 private ToolStripSeparator toolStripSeparator9;
-   1236 private ToolStripMenuItem collapseToolStripMenuItem;
-   1237 private ToolStripMenuItem copyCtrlCToolStripMenuItem;
-   1238 private ToolStripMenuItem pasteCtrlCToolStripMenuItem;
-   1239 private ToolStripSeparator toolStripSeparator10;
-   1240 private ToolStripMenuItem copyAsMediaToolStripMenuItem;
1176 } 1241 }
1177 } 1242 }