From 81179446cf34d6a4051f8f3d6be1a9368c7628c2 Mon Sep 17 00:00:00 2001 From: JKlingen Date: Sun, 1 Apr 2012 08:14:44 +0000 Subject: [PATCH] obfuscate tool: do not allow blur with radius 0, or pixelize with pixel size <= 1 git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1733 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- Greenshot/Forms/ImageEditorForm.Designer.cs | 352 ++++++++++---------- 1 file changed, 177 insertions(+), 175 deletions(-) diff --git a/Greenshot/Forms/ImageEditorForm.Designer.cs b/Greenshot/Forms/ImageEditorForm.Designer.cs index 65dc3d9fd..a89ec6245 100644 --- a/Greenshot/Forms/ImageEditorForm.Designer.cs +++ b/Greenshot/Forms/ImageEditorForm.Designer.cs @@ -49,6 +49,7 @@ namespace Greenshot { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImageEditorForm)); this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.dimensionsLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel1 = new GreenshotPlugin.Controls.NonJumpingPanel(); @@ -59,35 +60,35 @@ namespace Greenshot { this.btnEllipse = new System.Windows.Forms.ToolStripButton(); this.btnLine = new System.Windows.Forms.ToolStripButton(); this.btnArrow = new System.Windows.Forms.ToolStripButton(); + this.btnFreehand = new System.Windows.Forms.ToolStripButton(); this.btnText = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); this.btnHighlight = new System.Windows.Forms.ToolStripButton(); this.btnObfuscate = new System.Windows.Forms.ToolStripButton(); - this.btnFreehand = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator(); this.btnCrop = new System.Windows.Forms.ToolStripButton(); this.menuStrip1 = new Greenshot.Controls.MenuStripEx(); this.fileStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); - this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator(); this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.duplicateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); this.preferencesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.autoCropToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.insert_window_toolstripmenuitem = new System.Windows.Forms.ToolStripMenuItem(); this.objectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.addRectangleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.addEllipseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.drawFreehandToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.drawLineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.drawArrowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.drawFreehandToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.addTextBoxToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -119,6 +120,7 @@ namespace Greenshot { this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); this.btnSettings = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); this.btnHelp = new System.Windows.Forms.ToolStripButton(); this.propertiesToolStrip = new Greenshot.Controls.ToolStripEx(); this.obfuscateModeButton = new Greenshot.Controls.BindableToolStripDropDownButton(); @@ -159,15 +161,13 @@ namespace Greenshot { this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); this.btnConfirm = new Greenshot.Controls.BindableToolStripButton(); this.btnCancel = new Greenshot.Controls.BindableToolStripButton(); + this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); + this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.btnLineColor_ = new Greenshot.Controls.ToolStripColorButton(); this.btnFillColor_ = new Greenshot.Controls.ToolStripColorButton(); this.fileSavedStatusContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.copyPathMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openDirectoryMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.insert_window_toolstripmenuitem = new System.Windows.Forms.ToolStripMenuItem(); - this.dimensionsLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.autoCropToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripContainer1.BottomToolStripPanel.SuspendLayout(); this.toolStripContainer1.ContentPanel.SuspendLayout(); this.toolStripContainer1.LeftToolStripPanel.SuspendLayout(); @@ -193,7 +193,7 @@ namespace Greenshot { // this.toolStripContainer1.ContentPanel.AutoScroll = true; this.toolStripContainer1.ContentPanel.Controls.Add(this.tableLayoutPanel1); - this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(761, 387); + this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(761, 385); this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill; // // toolStripContainer1.LeftToolStripPanel @@ -214,13 +214,26 @@ namespace Greenshot { // statusStrip1 // this.statusStrip1.Dock = System.Windows.Forms.DockStyle.None; - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {this.dimensionsLabel, this.statusLabel}); + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.dimensionsLabel, + this.statusLabel}); this.statusStrip1.Location = new System.Drawing.Point(0, 0); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(785, 22); + this.statusStrip1.Size = new System.Drawing.Size(785, 24); this.statusStrip1.TabIndex = 3; this.statusStrip1.Text = "statusStrip1"; // + // dimensionsLabel + // + this.dimensionsLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) + | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) + | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); + this.dimensionsLabel.BorderStyle = System.Windows.Forms.Border3DStyle.Sunken; + this.dimensionsLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.dimensionsLabel.Name = "dimensionsLabel"; + this.dimensionsLabel.Size = new System.Drawing.Size(52, 19); + this.dimensionsLabel.Text = "123x321"; + // // statusLabel // this.statusLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) @@ -229,7 +242,7 @@ namespace Greenshot { this.statusLabel.BorderStyle = System.Windows.Forms.Border3DStyle.Sunken; this.statusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(0, 17); + this.statusLabel.Size = new System.Drawing.Size(4, 19); this.statusLabel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.StatusLabelClicked); // // tableLayoutPanel1 @@ -244,7 +257,7 @@ namespace Greenshot { this.tableLayoutPanel1.RowCount = 1; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 412F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(761, 387); + this.tableLayoutPanel1.Size = new System.Drawing.Size(761, 385); this.tableLayoutPanel1.TabIndex = 3; // // panel1 @@ -260,6 +273,7 @@ namespace Greenshot { // // toolStrip2 // + this.toolStrip2.ClickThrough = true; this.toolStrip2.Dock = System.Windows.Forms.DockStyle.None; this.toolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -278,10 +292,9 @@ namespace Greenshot { this.btnCrop}); this.toolStrip2.Location = new System.Drawing.Point(0, 0); this.toolStrip2.Name = "toolStrip2"; - this.toolStrip2.Size = new System.Drawing.Size(24, 387); + this.toolStrip2.Size = new System.Drawing.Size(24, 385); this.toolStrip2.Stretch = true; this.toolStrip2.TabIndex = 0; - this.toolStrip2.ClickThrough = true; // // btnCursor // @@ -341,6 +354,14 @@ namespace Greenshot { this.btnArrow.Size = new System.Drawing.Size(22, 20); this.btnArrow.Click += new System.EventHandler(this.BtnArrowClick); // + // btnFreehand + // + this.btnFreehand.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnFreehand.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btnFreehand.Name = "btnFreehand"; + this.btnFreehand.Size = new System.Drawing.Size(22, 4); + this.btnFreehand.Click += new System.EventHandler(this.BtnFreehandClick); + // // btnText // this.btnText.CheckOnClick = true; @@ -356,16 +377,6 @@ namespace Greenshot { this.toolStripSeparator14.Name = "toolStripSeparator14"; this.toolStripSeparator14.Size = new System.Drawing.Size(22, 6); // - // toolStripSeparator15 - // - this.toolStripSeparator15.Name = "toolStripSeparator15"; - this.toolStripSeparator15.Size = new System.Drawing.Size(22, 6); - // - // toolStripSeparator16 - // - this.toolStripSeparator16.Name = "toolStripSeparator16"; - this.toolStripSeparator16.Size = new System.Drawing.Size(22, 6); - // // btnHighlight // this.btnHighlight.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -384,19 +395,10 @@ namespace Greenshot { this.btnObfuscate.Size = new System.Drawing.Size(22, 20); this.btnObfuscate.Click += new System.EventHandler(this.BtnObfuscateClick); // - // btnFreehand - // - this.btnFreehand.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.btnFreehand.Image = ((System.Drawing.Image)(resources.GetObject("freehand.Image"))); - this.btnFreehand.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btnFreehand.Name = "btnFreehand"; - this.btnFreehand.Size = new System.Drawing.Size(30, 20); - this.btnFreehand.Click += new System.EventHandler(this.BtnFreehandClick); - // // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(30, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(22, 6); // // btnCrop // @@ -409,6 +411,7 @@ namespace Greenshot { // // menuStrip1 // + this.menuStrip1.ClickThrough = true; this.menuStrip1.Dock = System.Windows.Forms.DockStyle.None; this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileStripMenuItem, @@ -420,34 +423,13 @@ namespace Greenshot { this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Size = new System.Drawing.Size(785, 24); this.menuStrip1.TabIndex = 1; - this.menuStrip1.ClickThrough = true; // // fileStripMenuItem // this.fileStripMenuItem.Name = "fileStripMenuItem"; - this.fileStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileStripMenuItem.Text = "File"; this.fileStripMenuItem.DropDownOpening += new System.EventHandler(this.FileMenuDropDownOpening); - // toolStripSeparator9 - // - this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(304, 6); - // - // closeToolStripMenuItem - // - this.closeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("closeToolStripMenuItem.Image"))); - this.closeToolStripMenuItem.Name = "closeToolStripMenuItem"; - this.closeToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.closeToolStripMenuItem.Size = new System.Drawing.Size(307, 22); - this.closeToolStripMenuItem.Text = "Close"; - this.closeToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItemClick); - // - // autoCropToolStripMenuItem - // - this.autoCropToolStripMenuItem.Name = "autoCropToolStripMenuItem"; - this.autoCropToolStripMenuItem.Size = new System.Drawing.Size(166, 22); - this.autoCropToolStripMenuItem.Text = "Auto Crop"; - this.autoCropToolStripMenuItem.Click += new System.EventHandler(this.AutoCropToolStripMenuItemClick); // // editToolStripMenuItem // @@ -466,17 +448,40 @@ namespace Greenshot { this.autoCropToolStripMenuItem, this.insert_window_toolstripmenuitem}); this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); this.editToolStripMenuItem.Text = "Edit"; this.editToolStripMenuItem.Click += new System.EventHandler(this.EditToolStripMenuItemClick); // + // undoToolStripMenuItem + // + this.undoToolStripMenuItem.Enabled = false; + this.undoToolStripMenuItem.Name = "undoToolStripMenuItem"; + this.undoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); + this.undoToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.undoToolStripMenuItem.Text = "Undo"; + this.undoToolStripMenuItem.Click += new System.EventHandler(this.UndoToolStripMenuItemClick); + // + // redoToolStripMenuItem + // + this.redoToolStripMenuItem.Enabled = false; + this.redoToolStripMenuItem.Name = "redoToolStripMenuItem"; + this.redoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); + this.redoToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.redoToolStripMenuItem.Text = "Redo"; + this.redoToolStripMenuItem.Click += new System.EventHandler(this.RedoToolStripMenuItemClick); + // + // toolStripSeparator15 + // + this.toolStripSeparator15.Name = "toolStripSeparator15"; + this.toolStripSeparator15.Size = new System.Drawing.Size(163, 6); + // // cutToolStripMenuItem // this.cutToolStripMenuItem.Enabled = false; this.cutToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("cutToolStripMenuItem.Image"))); this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; this.cutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); - this.cutToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.cutToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.cutToolStripMenuItem.Text = "Cut"; this.cutToolStripMenuItem.Click += new System.EventHandler(this.CutToolStripMenuItemClick); // @@ -486,7 +491,7 @@ namespace Greenshot { this.copyToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("copyToolStripMenuItem.Image"))); this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.copyToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.copyToolStripMenuItem.Text = "Copy"; this.copyToolStripMenuItem.Click += new System.EventHandler(this.CopyToolStripMenuItemClick); // @@ -496,57 +501,56 @@ namespace Greenshot { this.pasteToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("pasteToolStripMenuItem.Image"))); this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); - this.pasteToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.pasteToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.pasteToolStripMenuItem.Text = "Paste"; this.pasteToolStripMenuItem.Click += new System.EventHandler(this.PasteToolStripMenuItemClick); // - // undoToolStripMenuItem - // - this.undoToolStripMenuItem.Enabled = false; - this.undoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("btnUndo.Image"))); - this.undoToolStripMenuItem.Name = "undoToolStripMenuItem"; - this.undoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); - this.undoToolStripMenuItem.Size = new System.Drawing.Size(160, 22); - this.undoToolStripMenuItem.Text = "Undo"; - this.undoToolStripMenuItem.Click += new System.EventHandler(this.UndoToolStripMenuItemClick); - // - // redoToolStripMenuItem - // - this.redoToolStripMenuItem.Enabled = false; - this.redoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("btnRedo.Image"))); - this.redoToolStripMenuItem.Name = "redoToolStripMenuItem"; - this.redoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); - this.redoToolStripMenuItem.Size = new System.Drawing.Size(160, 22); - this.redoToolStripMenuItem.Text = "Redo"; - this.redoToolStripMenuItem.Click += new System.EventHandler(this.RedoToolStripMenuItemClick); - // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(157, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(163, 6); // // duplicateToolStripMenuItem // this.duplicateToolStripMenuItem.Enabled = false; this.duplicateToolStripMenuItem.Name = "duplicateToolStripMenuItem"; this.duplicateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.duplicateToolStripMenuItem.Text = "Duplicate"; this.duplicateToolStripMenuItem.Click += new System.EventHandler(this.DuplicateToolStripMenuItemClick); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(157, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(163, 6); // // preferencesToolStripMenuItem // this.preferencesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("preferencesToolStripMenuItem.Image"))); this.preferencesToolStripMenuItem.Name = "preferencesToolStripMenuItem"; - this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.preferencesToolStripMenuItem.Text = "Preferences..."; this.preferencesToolStripMenuItem.Click += new System.EventHandler(this.PreferencesToolStripMenuItemClick); // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(163, 6); + // + // autoCropToolStripMenuItem + // + this.autoCropToolStripMenuItem.Name = "autoCropToolStripMenuItem"; + this.autoCropToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.autoCropToolStripMenuItem.Text = "Auto Crop"; + this.autoCropToolStripMenuItem.Click += new System.EventHandler(this.AutoCropToolStripMenuItemClick); + // + // insert_window_toolstripmenuitem + // + this.insert_window_toolstripmenuitem.Name = "insert_window_toolstripmenuitem"; + this.insert_window_toolstripmenuitem.Size = new System.Drawing.Size(166, 22); + this.insert_window_toolstripmenuitem.Text = "Insert window"; + this.insert_window_toolstripmenuitem.MouseEnter += new System.EventHandler(this.Insert_window_toolstripmenuitemMouseEnter); + // // objectToolStripMenuItem // this.objectToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -564,14 +568,14 @@ namespace Greenshot { this.saveElementsToolStripMenuItem, this.loadElementsToolStripMenuItem}); this.objectToolStripMenuItem.Name = "objectToolStripMenuItem"; - this.objectToolStripMenuItem.Size = new System.Drawing.Size(51, 20); + this.objectToolStripMenuItem.Size = new System.Drawing.Size(54, 20); this.objectToolStripMenuItem.Text = "Object"; // // addRectangleToolStripMenuItem // this.addRectangleToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("addRectangleToolStripMenuItem.Image"))); this.addRectangleToolStripMenuItem.Name = "addRectangleToolStripMenuItem"; - this.addRectangleToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.addRectangleToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.addRectangleToolStripMenuItem.Text = "Draw rectangle"; this.addRectangleToolStripMenuItem.Click += new System.EventHandler(this.AddRectangleToolStripMenuItemClick); // @@ -579,23 +583,15 @@ namespace Greenshot { // this.addEllipseToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("addEllipseToolStripMenuItem.Image"))); this.addEllipseToolStripMenuItem.Name = "addEllipseToolStripMenuItem"; - this.addEllipseToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.addEllipseToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.addEllipseToolStripMenuItem.Text = "Draw ellipse"; this.addEllipseToolStripMenuItem.Click += new System.EventHandler(this.AddEllipseToolStripMenuItemClick); // - // drawFreehandToolStripMenuItem - // - this.drawFreehandToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("freehand.Image"))); - this.drawFreehandToolStripMenuItem.Name = "drawFreehandToolStripMenuItem"; - this.drawFreehandToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.drawFreehandToolStripMenuItem.Text = "Draw freehand"; - this.drawFreehandToolStripMenuItem.Click += new System.EventHandler(this.DrawFreehandToolStripMenuItemClick); - // // drawLineToolStripMenuItem // this.drawLineToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("drawLineToolStripMenuItem.Image"))); this.drawLineToolStripMenuItem.Name = "drawLineToolStripMenuItem"; - this.drawLineToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.drawLineToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.drawLineToolStripMenuItem.Text = "Draw line"; this.drawLineToolStripMenuItem.Click += new System.EventHandler(this.DrawLineToolStripMenuItemClick); // @@ -603,28 +599,35 @@ namespace Greenshot { // this.drawArrowToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("drawArrowToolStripMenuItem.Image"))); this.drawArrowToolStripMenuItem.Name = "drawArrowToolStripMenuItem"; - this.drawArrowToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.drawArrowToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.drawArrowToolStripMenuItem.Text = "Draw arrow"; this.drawArrowToolStripMenuItem.Click += new System.EventHandler(this.DrawArrowToolStripMenuItemClick); // + // drawFreehandToolStripMenuItem + // + this.drawFreehandToolStripMenuItem.Name = "drawFreehandToolStripMenuItem"; + this.drawFreehandToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.drawFreehandToolStripMenuItem.Text = "Draw freehand"; + this.drawFreehandToolStripMenuItem.Click += new System.EventHandler(this.DrawFreehandToolStripMenuItemClick); + // // addTextBoxToolStripMenuItem // this.addTextBoxToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("addTextBoxToolStripMenuItem.Image"))); this.addTextBoxToolStripMenuItem.Name = "addTextBoxToolStripMenuItem"; - this.addTextBoxToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.addTextBoxToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.addTextBoxToolStripMenuItem.Text = "Add text box"; this.addTextBoxToolStripMenuItem.Click += new System.EventHandler(this.AddTextBoxToolStripMenuItemClick); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(174, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(186, 6); // // selectAllToolStripMenuItem // this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); - this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.selectAllToolStripMenuItem.Text = "Select all"; this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.SelectAllToolStripMenuItemClick); // @@ -634,14 +637,14 @@ namespace Greenshot { this.removeObjectToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("removeObjectToolStripMenuItem.Image"))); this.removeObjectToolStripMenuItem.Name = "removeObjectToolStripMenuItem"; this.removeObjectToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; - this.removeObjectToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.removeObjectToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.removeObjectToolStripMenuItem.Text = "Remove Object"; this.removeObjectToolStripMenuItem.Click += new System.EventHandler(this.RemoveObjectToolStripMenuItemClick); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(174, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(186, 6); // // arrangeToolStripMenuItem // @@ -652,7 +655,7 @@ namespace Greenshot { this.downToBottomToolStripMenuItem}); this.arrangeToolStripMenuItem.Enabled = false; this.arrangeToolStripMenuItem.Name = "arrangeToolStripMenuItem"; - this.arrangeToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.arrangeToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.arrangeToolStripMenuItem.Text = "Arrange"; // // upToTopToolStripMenuItem @@ -660,7 +663,7 @@ namespace Greenshot { this.upToTopToolStripMenuItem.Enabled = false; this.upToTopToolStripMenuItem.Name = "upToTopToolStripMenuItem"; this.upToTopToolStripMenuItem.ShortcutKeyDisplayString = "Home"; - this.upToTopToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.upToTopToolStripMenuItem.Size = new System.Drawing.Size(191, 22); this.upToTopToolStripMenuItem.Text = "Up to top"; this.upToTopToolStripMenuItem.Click += new System.EventHandler(this.UpToTopToolStripMenuItemClick); // @@ -669,7 +672,7 @@ namespace Greenshot { this.upOneLevelToolStripMenuItem.Enabled = false; this.upOneLevelToolStripMenuItem.Name = "upOneLevelToolStripMenuItem"; this.upOneLevelToolStripMenuItem.ShortcutKeyDisplayString = "PgUp"; - this.upOneLevelToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.upOneLevelToolStripMenuItem.Size = new System.Drawing.Size(191, 22); this.upOneLevelToolStripMenuItem.Text = "Up one level"; this.upOneLevelToolStripMenuItem.Click += new System.EventHandler(this.UpOneLevelToolStripMenuItemClick); // @@ -678,7 +681,7 @@ namespace Greenshot { this.downOneLevelToolStripMenuItem.Enabled = false; this.downOneLevelToolStripMenuItem.Name = "downOneLevelToolStripMenuItem"; this.downOneLevelToolStripMenuItem.ShortcutKeyDisplayString = "PgDn"; - this.downOneLevelToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.downOneLevelToolStripMenuItem.Size = new System.Drawing.Size(191, 22); this.downOneLevelToolStripMenuItem.Text = "Down one level"; this.downOneLevelToolStripMenuItem.Click += new System.EventHandler(this.DownOneLevelToolStripMenuItemClick); // @@ -687,28 +690,28 @@ namespace Greenshot { this.downToBottomToolStripMenuItem.Enabled = false; this.downToBottomToolStripMenuItem.Name = "downToBottomToolStripMenuItem"; this.downToBottomToolStripMenuItem.ShortcutKeyDisplayString = "End"; - this.downToBottomToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.downToBottomToolStripMenuItem.Size = new System.Drawing.Size(191, 22); this.downToBottomToolStripMenuItem.Text = "Down to bottom"; this.downToBottomToolStripMenuItem.Click += new System.EventHandler(this.DownToBottomToolStripMenuItemClick); // // saveElementsToolStripMenuItem // this.saveElementsToolStripMenuItem.Name = "saveElementsToolStripMenuItem"; - this.saveElementsToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.saveElementsToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.saveElementsToolStripMenuItem.Text = "Save objects to file"; this.saveElementsToolStripMenuItem.Click += new System.EventHandler(this.SaveElementsToolStripMenuItemClick); // // loadElementsToolStripMenuItem // this.loadElementsToolStripMenuItem.Name = "loadElementsToolStripMenuItem"; - this.loadElementsToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.loadElementsToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.loadElementsToolStripMenuItem.Text = "Load objects from file"; this.loadElementsToolStripMenuItem.Click += new System.EventHandler(this.LoadElementsToolStripMenuItemClick); // // pluginToolStripMenuItem // this.pluginToolStripMenuItem.Name = "pluginToolStripMenuItem"; - this.pluginToolStripMenuItem.Size = new System.Drawing.Size(52, 20); + this.pluginToolStripMenuItem.Size = new System.Drawing.Size(58, 20); this.pluginToolStripMenuItem.Text = "Plugins"; this.pluginToolStripMenuItem.Visible = false; // @@ -718,7 +721,7 @@ namespace Greenshot { this.helpToolStripMenuItem1, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); this.helpToolStripMenuItem.Text = "Help"; // // helpToolStripMenuItem1 @@ -726,19 +729,20 @@ namespace Greenshot { this.helpToolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("helpToolStripMenuItem1.Image"))); this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1"; this.helpToolStripMenuItem1.ShortcutKeys = System.Windows.Forms.Keys.F1; - this.helpToolStripMenuItem1.Size = new System.Drawing.Size(114, 22); + this.helpToolStripMenuItem1.Size = new System.Drawing.Size(118, 22); this.helpToolStripMenuItem1.Text = "Help"; this.helpToolStripMenuItem1.Click += new System.EventHandler(this.HelpToolStripMenuItem1Click); // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(118, 22); this.aboutToolStripMenuItem.Text = "About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.AboutToolStripMenuItemClick); // // toolStrip1 // + this.toolStrip1.ClickThrough = true; this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -763,7 +767,6 @@ namespace Greenshot { this.toolStrip1.Size = new System.Drawing.Size(785, 25); this.toolStrip1.Stretch = true; this.toolStrip1.TabIndex = 0; - this.toolStrip1.ClickThrough = true; // // btnSave // @@ -848,6 +851,7 @@ namespace Greenshot { this.btnPaste.Size = new System.Drawing.Size(23, 22); this.btnPaste.Text = "Paste element from clipboard"; this.btnPaste.Click += new System.EventHandler(this.BtnPasteClick); + // // btnUndo // this.btnUndo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -888,6 +892,11 @@ namespace Greenshot { this.toolStripSeparator11.Name = "toolStripSeparator11"; this.toolStripSeparator11.Size = new System.Drawing.Size(6, 25); // + // toolStripSeparator16 + // + this.toolStripSeparator16.Name = "toolStripSeparator16"; + this.toolStripSeparator16.Size = new System.Drawing.Size(6, 25); + // // btnHelp // this.btnHelp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -900,6 +909,7 @@ namespace Greenshot { // // propertiesToolStrip // + this.propertiesToolStrip.ClickThrough = true; this.propertiesToolStrip.Dock = System.Windows.Forms.DockStyle.None; this.propertiesToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.propertiesToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -937,7 +947,6 @@ namespace Greenshot { this.propertiesToolStrip.Size = new System.Drawing.Size(785, 27); this.propertiesToolStrip.Stretch = true; this.propertiesToolStrip.TabIndex = 2; - this.propertiesToolStrip.ClickThrough = true; // // obfuscateModeButton // @@ -957,7 +966,7 @@ namespace Greenshot { // this.pixelizeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("pixelizeToolStripMenuItem.Image"))); this.pixelizeToolStripMenuItem.Name = "pixelizeToolStripMenuItem"; - this.pixelizeToolStripMenuItem.Size = new System.Drawing.Size(112, 22); + this.pixelizeToolStripMenuItem.Size = new System.Drawing.Size(114, 22); this.pixelizeToolStripMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.PIXELIZE; this.pixelizeToolStripMenuItem.Text = "Pixelate"; // @@ -965,7 +974,7 @@ namespace Greenshot { // this.blurToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("blurToolStripMenuItem.Image"))); this.blurToolStripMenuItem.Name = "blurToolStripMenuItem"; - this.blurToolStripMenuItem.Size = new System.Drawing.Size(112, 22); + this.blurToolStripMenuItem.Size = new System.Drawing.Size(114, 22); this.blurToolStripMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.BLUR; this.blurToolStripMenuItem.Text = "Blur"; // @@ -989,7 +998,7 @@ namespace Greenshot { // this.textHighlightMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("textHighlightMenuItem.Image"))); this.textHighlightMenuItem.Name = "textHighlightMenuItem"; - this.textHighlightMenuItem.Size = new System.Drawing.Size(140, 22); + this.textHighlightMenuItem.Size = new System.Drawing.Size(149, 22); this.textHighlightMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.TEXT_HIGHTLIGHT; this.textHighlightMenuItem.Text = "Text highlight"; // @@ -997,7 +1006,7 @@ namespace Greenshot { // this.areaHighlightMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("areaHighlightMenuItem.Image"))); this.areaHighlightMenuItem.Name = "areaHighlightMenuItem"; - this.areaHighlightMenuItem.Size = new System.Drawing.Size(140, 22); + this.areaHighlightMenuItem.Size = new System.Drawing.Size(149, 22); this.areaHighlightMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.AREA_HIGHLIGHT; this.areaHighlightMenuItem.Text = "Area highlight"; // @@ -1005,7 +1014,7 @@ namespace Greenshot { // this.grayscaleHighlightMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("grayscaleHighlightMenuItem.Image"))); this.grayscaleHighlightMenuItem.Name = "grayscaleHighlightMenuItem"; - this.grayscaleHighlightMenuItem.Size = new System.Drawing.Size(140, 22); + this.grayscaleHighlightMenuItem.Size = new System.Drawing.Size(149, 22); this.grayscaleHighlightMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.GRAYSCALE; this.grayscaleHighlightMenuItem.Text = "Grayscale"; // @@ -1013,7 +1022,7 @@ namespace Greenshot { // this.magnifyMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("magnifyMenuItem.Image"))); this.magnifyMenuItem.Name = "magnifyMenuItem"; - this.magnifyMenuItem.Size = new System.Drawing.Size(140, 22); + this.magnifyMenuItem.Size = new System.Drawing.Size(149, 22); this.magnifyMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.MAGNIFICATION; this.magnifyMenuItem.Text = "Magnify"; // @@ -1043,7 +1052,7 @@ namespace Greenshot { // lineThicknessLabel // this.lineThicknessLabel.Name = "lineThicknessLabel"; - this.lineThicknessLabel.Size = new System.Drawing.Size(73, 24); + this.lineThicknessLabel.Size = new System.Drawing.Size(81, 24); this.lineThicknessLabel.Text = "Line thickness"; // // lineThicknessUpDown @@ -1072,8 +1081,8 @@ namespace Greenshot { 0, 0, 0}); - this.lineThicknessUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); this.lineThicknessUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); + this.lineThicknessUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // // fontFamilyComboBox // @@ -1083,13 +1092,13 @@ namespace Greenshot { this.fontFamilyComboBox.Name = "fontFamilyComboBox"; this.fontFamilyComboBox.Size = new System.Drawing.Size(200, 21); this.fontFamilyComboBox.Text = "Aharoni"; - this.fontFamilyComboBox.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); this.fontFamilyComboBox.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); + this.fontFamilyComboBox.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // // fontSizeLabel // this.fontSizeLabel.Name = "fontSizeLabel"; - this.fontSizeLabel.Size = new System.Drawing.Size(50, 24); + this.fontSizeLabel.Size = new System.Drawing.Size(53, 24); this.fontSizeLabel.Text = "Font size"; // // fontSizeUpDown @@ -1118,8 +1127,8 @@ namespace Greenshot { 0, 0, 0}); - this.fontSizeUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); this.fontSizeUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); + this.fontSizeUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // // fontBoldButton // @@ -1146,7 +1155,7 @@ namespace Greenshot { // blurRadiusLabel // this.blurRadiusLabel.Name = "blurRadiusLabel"; - this.blurRadiusLabel.Size = new System.Drawing.Size(57, 24); + this.blurRadiusLabel.Size = new System.Drawing.Size(63, 24); this.blurRadiusLabel.Text = "Blur radius"; // // blurRadiusUpDown @@ -1163,25 +1172,25 @@ namespace Greenshot { 0, 0}); this.blurRadiusUpDown.Minimum = new decimal(new int[] { - 0, + 1, 0, 0, 0}); this.blurRadiusUpDown.Name = "blurRadiusUpDown"; this.blurRadiusUpDown.Size = new System.Drawing.Size(41, 24); - this.blurRadiusUpDown.Text = "0"; + this.blurRadiusUpDown.Text = "1"; this.blurRadiusUpDown.Value = new decimal(new int[] { - 0, + 1, 0, 0, 0}); - this.blurRadiusUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); this.blurRadiusUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); + this.blurRadiusUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // // brightnessLabel // this.brightnessLabel.Name = "brightnessLabel"; - this.brightnessLabel.Size = new System.Drawing.Size(57, 24); + this.brightnessLabel.Size = new System.Drawing.Size(62, 24); this.brightnessLabel.Text = "Brightness"; // // brightnessUpDown @@ -1203,20 +1212,20 @@ namespace Greenshot { 0, 0}); this.brightnessUpDown.Name = "brightnessUpDown"; - this.brightnessUpDown.Size = new System.Drawing.Size(41, 24); + this.brightnessUpDown.Size = new System.Drawing.Size(41, 23); this.brightnessUpDown.Text = "100"; this.brightnessUpDown.Value = new decimal(new int[] { 100, 0, 0, 0}); - this.brightnessUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); this.brightnessUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); + this.brightnessUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // // previewQualityLabel // this.previewQualityLabel.Name = "previewQualityLabel"; - this.previewQualityLabel.Size = new System.Drawing.Size(80, 13); + this.previewQualityLabel.Size = new System.Drawing.Size(87, 15); this.previewQualityLabel.Text = "Preview quality"; // // previewQualityUpDown @@ -1238,20 +1247,20 @@ namespace Greenshot { 0, 0}); this.previewQualityUpDown.Name = "previewQualityUpDown"; - this.previewQualityUpDown.Size = new System.Drawing.Size(41, 21); + this.previewQualityUpDown.Size = new System.Drawing.Size(41, 23); this.previewQualityUpDown.Text = "50"; this.previewQualityUpDown.Value = new decimal(new int[] { 50, 0, 0, 0}); - this.previewQualityUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); this.previewQualityUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); + this.previewQualityUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // // magnificationFactorLabel // this.magnificationFactorLabel.Name = "magnificationFactorLabel"; - this.magnificationFactorLabel.Size = new System.Drawing.Size(45, 13); + this.magnificationFactorLabel.Size = new System.Drawing.Size(51, 15); this.magnificationFactorLabel.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.MAGNIFICATION; this.magnificationFactorLabel.Text = "Magnify"; // @@ -1274,20 +1283,20 @@ namespace Greenshot { 0, 0}); this.magnificationFactorUpDown.Name = "magnificationFactorUpDown"; - this.magnificationFactorUpDown.Size = new System.Drawing.Size(29, 21); + this.magnificationFactorUpDown.Size = new System.Drawing.Size(29, 23); this.magnificationFactorUpDown.Text = "2"; this.magnificationFactorUpDown.Value = new decimal(new int[] { 2, 0, 0, 0}); - this.magnificationFactorUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); this.magnificationFactorUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); + this.magnificationFactorUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // // pixelSizeLabel // this.pixelSizeLabel.Name = "pixelSizeLabel"; - this.pixelSizeLabel.Size = new System.Drawing.Size(51, 13); + this.pixelSizeLabel.Size = new System.Drawing.Size(54, 15); this.pixelSizeLabel.Text = "Pixel Size"; // // pixelSizeUpDown @@ -1304,25 +1313,25 @@ namespace Greenshot { 0, 0}); this.pixelSizeUpDown.Minimum = new decimal(new int[] { - 1, + 2, 0, 0, 0}); this.pixelSizeUpDown.Name = "pixelSizeUpDown"; - this.pixelSizeUpDown.Size = new System.Drawing.Size(41, 21); + this.pixelSizeUpDown.Size = new System.Drawing.Size(41, 23); this.pixelSizeUpDown.Text = "5"; this.pixelSizeUpDown.Value = new decimal(new int[] { 5, 0, 0, 0}); - this.pixelSizeUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); this.pixelSizeUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); + this.pixelSizeUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // // arrowHeadsLabel // this.arrowHeadsLabel.Name = "arrowHeadsLabel"; - this.arrowHeadsLabel.Size = new System.Drawing.Size(63, 13); + this.arrowHeadsLabel.Size = new System.Drawing.Size(68, 15); this.arrowHeadsLabel.Text = "Arrow head"; // // arrowHeadsDropDownButton @@ -1342,7 +1351,7 @@ namespace Greenshot { // arrowHeadStartMenuItem // this.arrowHeadStartMenuItem.Name = "arrowHeadStartMenuItem"; - this.arrowHeadStartMenuItem.Size = new System.Drawing.Size(125, 22); + this.arrowHeadStartMenuItem.Size = new System.Drawing.Size(129, 22); this.arrowHeadStartMenuItem.Tag = Greenshot.Drawing.ArrowContainer.ArrowHeadCombination.START_POINT; this.arrowHeadStartMenuItem.Text = "Start point"; this.arrowHeadStartMenuItem.Click += new System.EventHandler(this.ArrowHeadsToolStripMenuItemClick); @@ -1350,7 +1359,7 @@ namespace Greenshot { // arrowHeadEndMenuItem // this.arrowHeadEndMenuItem.Name = "arrowHeadEndMenuItem"; - this.arrowHeadEndMenuItem.Size = new System.Drawing.Size(125, 22); + this.arrowHeadEndMenuItem.Size = new System.Drawing.Size(129, 22); this.arrowHeadEndMenuItem.Tag = Greenshot.Drawing.ArrowContainer.ArrowHeadCombination.END_POINT; this.arrowHeadEndMenuItem.Text = "End point"; this.arrowHeadEndMenuItem.Click += new System.EventHandler(this.ArrowHeadsToolStripMenuItemClick); @@ -1358,7 +1367,7 @@ namespace Greenshot { // arrowHeadBothMenuItem // this.arrowHeadBothMenuItem.Name = "arrowHeadBothMenuItem"; - this.arrowHeadBothMenuItem.Size = new System.Drawing.Size(125, 22); + this.arrowHeadBothMenuItem.Size = new System.Drawing.Size(129, 22); this.arrowHeadBothMenuItem.Tag = Greenshot.Drawing.ArrowContainer.ArrowHeadCombination.BOTH; this.arrowHeadBothMenuItem.Text = "Both"; this.arrowHeadBothMenuItem.Click += new System.EventHandler(this.ArrowHeadsToolStripMenuItemClick); @@ -1366,7 +1375,7 @@ namespace Greenshot { // arrowHeadNoneMenuItem // this.arrowHeadNoneMenuItem.Name = "arrowHeadNoneMenuItem"; - this.arrowHeadNoneMenuItem.Size = new System.Drawing.Size(125, 22); + this.arrowHeadNoneMenuItem.Size = new System.Drawing.Size(129, 22); this.arrowHeadNoneMenuItem.Tag = Greenshot.Drawing.ArrowContainer.ArrowHeadCombination.NONE; this.arrowHeadNoneMenuItem.Text = "None"; this.arrowHeadNoneMenuItem.Click += new System.EventHandler(this.ArrowHeadsToolStripMenuItemClick); @@ -1410,6 +1419,20 @@ namespace Greenshot { this.btnCancel.Text = "Cancel"; this.btnCancel.Click += new System.EventHandler(this.BtnCancelClick); // + // toolStripSeparator9 + // + this.toolStripSeparator9.Name = "toolStripSeparator9"; + this.toolStripSeparator9.Size = new System.Drawing.Size(304, 6); + // + // closeToolStripMenuItem + // + this.closeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("closeToolStripMenuItem.Image"))); + this.closeToolStripMenuItem.Name = "closeToolStripMenuItem"; + this.closeToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); + this.closeToolStripMenuItem.Size = new System.Drawing.Size(307, 22); + this.closeToolStripMenuItem.Text = "Close"; + this.closeToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItemClick); + // // btnLineColor_ // this.btnLineColor_.BackColor = System.Drawing.SystemColors.Control; @@ -1448,27 +1471,6 @@ namespace Greenshot { this.openDirectoryMenuItem.Text = "Open directory in Windows Explorer"; this.openDirectoryMenuItem.Click += new System.EventHandler(this.OpenDirectoryMenuItemClick); // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(154, 6); - // - // insert_window_toolstripmenuitem - // - this.insert_window_toolstripmenuitem.Name = "insert_window_toolstripmenuitem"; - this.insert_window_toolstripmenuitem.Size = new System.Drawing.Size(157, 22); - this.insert_window_toolstripmenuitem.Text = "Insert window"; - this.insert_window_toolstripmenuitem.MouseEnter += new System.EventHandler(this.Insert_window_toolstripmenuitemMouseEnter); - // - // dimensionsLabel - // - this.dimensionsLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); - this.dimensionsLabel.BorderStyle = System.Windows.Forms.Border3DStyle.Sunken; - this.dimensionsLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.dimensionsLabel.Name = "dimensionsLabel"; - this.dimensionsLabel.Size = new System.Drawing.Size(48, 17); - this.dimensionsLabel.Text = "123x321"; - // // ImageEditorForm // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);