diff --git a/Greenshot/Configuration/LanguageKeys.cs b/Greenshot/Configuration/LanguageKeys.cs index 2ebd634ae..60acd2f4b 100644 --- a/Greenshot/Configuration/LanguageKeys.cs +++ b/Greenshot/Configuration/LanguageKeys.cs @@ -65,6 +65,14 @@ namespace Greenshot.Configuration { contextmenu_settings, contextmenu_captureie, contextmenu_openrecentcapture, + editor_align_bottom, + editor_align_center, + editor_align_horizontal, + editor_align_middle, + editor_align_left, + editor_align_right, + editor_align_top, + editor_align_vertical, editor_arrange, editor_arrowheads, editor_arrowheads_both, diff --git a/Greenshot/Drawing/Fields/Binding/AlignmentConverter.cs b/Greenshot/Drawing/Fields/Binding/AlignmentConverter.cs new file mode 100644 index 000000000..88e182aa7 --- /dev/null +++ b/Greenshot/Drawing/Fields/Binding/AlignmentConverter.cs @@ -0,0 +1,89 @@ +/* + * Greenshot - a free and open source screenshot tool + * Copyright (C) 2007-2012 Thomas Braun, Jens Klingen, Robin Krom + * + * For more information see: http://getgreenshot.org/ + * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +using Greenshot.Plugin; +using System; +using System.Drawing; +using System.Windows.Forms; + +namespace Greenshot.Drawing.Fields.Binding { + /// + /// Converting horizontal alignment to its StringAlignment representation and vice versa. + /// Beware: there's currently no RTL support. + /// + public class HorizontalAlignmentConverter : AbstractBindingConverter { + + private static HorizontalAlignmentConverter uniqueInstance; + + protected override HorizontalAlignment convert(StringAlignment stringAlignment) { + switch(stringAlignment) { + case StringAlignment.Near: return HorizontalAlignment.Left; + case StringAlignment.Center: return HorizontalAlignment.Center; + case StringAlignment.Far: return HorizontalAlignment.Right; + default: throw new NotImplementedException("Cannot handle: "+ stringAlignment); + } + } + + protected override StringAlignment convert(HorizontalAlignment horizontalAligment) { + switch(horizontalAligment) { + case HorizontalAlignment.Left: return StringAlignment.Near; + case HorizontalAlignment.Center: return StringAlignment.Center; + case HorizontalAlignment.Right: return StringAlignment.Far; + default: throw new NotImplementedException("Cannot handle: "+ horizontalAligment); + } + } + + public static HorizontalAlignmentConverter GetInstance() { + if(uniqueInstance == null) uniqueInstance = new HorizontalAlignmentConverter(); + return uniqueInstance; + } + } + + /// + /// Converting vertical alignment to its StringAlignment representation and vice versa. + /// + public class VerticalAlignmentConverter : AbstractBindingConverter { + + private static VerticalAlignmentConverter uniqueInstance; + + protected override VerticalAlignment convert(StringAlignment stringAlignment) { + switch(stringAlignment) { + case StringAlignment.Near: return VerticalAlignment.TOP; + case StringAlignment.Center: return VerticalAlignment.CENTER; + case StringAlignment.Far: return VerticalAlignment.BOTTOM; + default: throw new NotImplementedException("Cannot handle: "+ stringAlignment); + } + } + + protected override StringAlignment convert(VerticalAlignment verticalAligment) { + switch(verticalAligment) { + case VerticalAlignment.TOP: return StringAlignment.Near; + case VerticalAlignment.CENTER: return StringAlignment.Center; + case VerticalAlignment.BOTTOM: return StringAlignment.Far; + default: throw new NotImplementedException("Cannot handle: "+ verticalAligment); + } + } + + public static VerticalAlignmentConverter GetInstance() { + if(uniqueInstance == null) uniqueInstance = new VerticalAlignmentConverter(); + return uniqueInstance; + } + } +} diff --git a/Greenshot/Drawing/Fields/FieldType.cs b/Greenshot/Drawing/Fields/FieldType.cs index e4f5f8785..5e6f0a3e6 100644 --- a/Greenshot/Drawing/Fields/FieldType.cs +++ b/Greenshot/Drawing/Fields/FieldType.cs @@ -36,6 +36,8 @@ namespace Greenshot.Drawing.Fields { public static readonly FieldType FONT_FAMILY = new FieldType("FONT_FAMILY"); public static readonly FieldType FONT_ITALIC = new FieldType("FONT_ITALIC"); public static readonly FieldType FONT_SIZE = new FieldType("FONT_SIZE"); + public static readonly FieldType TEXT_HORIZONTAL_ALIGNMENT = new FieldType("TEXT_HORIZONTAL_ALIGNMENT"); + public static readonly FieldType TEXT_VERTICAL_ALIGNMENT = new FieldType("TEXT_VERTICAL_ALIGNMENT"); public static readonly FieldType HIGHLIGHT_COLOR = new FieldType("HIGHLIGHT_COLOR"); public static readonly FieldType LINE_COLOR = new FieldType("LINE_COLOR"); public static readonly FieldType LINE_THICKNESS = new FieldType("LINE_THICKNESS"); @@ -56,6 +58,8 @@ namespace Greenshot.Drawing.Fields { FONT_FAMILY, FONT_ITALIC, FONT_SIZE, + TEXT_HORIZONTAL_ALIGNMENT, + TEXT_VERTICAL_ALIGNMENT, HIGHLIGHT_COLOR, LINE_COLOR, LINE_THICKNESS, diff --git a/Greenshot/Drawing/TextContainer.cs b/Greenshot/Drawing/TextContainer.cs index 869df1e7c..95b8e5ad5 100644 --- a/Greenshot/Drawing/TextContainer.cs +++ b/Greenshot/Drawing/TextContainer.cs @@ -23,9 +23,9 @@ using System.ComponentModel; using System.Drawing; using System.Runtime.Serialization; using System.Windows.Forms; - using Greenshot.Drawing.Fields; using Greenshot.Helpers; +using Greenshot.Plugin; using Greenshot.Plugin.Drawing; using Greenshot.Memento; using System.Drawing.Drawing2D; @@ -42,6 +42,7 @@ namespace Greenshot.Drawing { // This is set to true AFTER the first change is made, as there is already a "add element" on the undo stack private bool makeUndoable = false; private Font font; + StringFormat stringFormat = new StringFormat(); private string text; // there is a binding on the following property! @@ -76,12 +77,16 @@ namespace Greenshot.Drawing { AddField(GetType(), FieldType.FILL_COLOR, Color.Transparent); AddField(GetType(), FieldType.FONT_FAMILY, FontFamily.GenericSansSerif.Name); AddField(GetType(), FieldType.FONT_SIZE, 11f); + AddField(GetType(), FieldType.TEXT_HORIZONTAL_ALIGNMENT, HorizontalAlignment.Center); + AddField(GetType(), FieldType.TEXT_VERTICAL_ALIGNMENT, VerticalAlignment.CENTER); + + stringFormat.Trimming = StringTrimming.EllipsisWord; } [OnDeserializedAttribute()] private void OnDeserialized(StreamingContext context) { Init(); - UpdateFont(); + UpdateFormat(); } /** @@ -125,7 +130,7 @@ namespace Greenshot.Drawing { } public void FitToText() { - UpdateFont(); + UpdateFormat(); Size textSize = TextRenderer.MeasureText(text, font); int lineThickness = GetFieldValueAsInt(FieldType.LINE_THICKNESS); Width = textSize.Width + lineThickness; @@ -152,7 +157,7 @@ namespace Greenshot.Drawing { UpdateTextBoxFormat(); textBox.Invalidate(); } else { - UpdateFont(); + UpdateFormat(); //Invalidate(); } font.Dispose(); @@ -192,7 +197,7 @@ namespace Greenshot.Drawing { parent.Controls.Remove(textBox); } - private void UpdateFont() { + private void UpdateFormat() { string fontFamily = GetFieldValueAsString(FieldType.FONT_FAMILY); bool fontBold = GetFieldValueAsBool(FieldType.FONT_BOLD); bool fontItalic = GetFieldValueAsBool(FieldType.FONT_ITALIC); @@ -231,6 +236,9 @@ namespace Greenshot.Drawing { } fontInvalidated = false; } + + stringFormat.Alignment = (StringAlignment)GetFieldValue(FieldType.TEXT_HORIZONTAL_ALIGNMENT); + stringFormat.LineAlignment = (StringAlignment)GetFieldValue(FieldType.TEXT_VERTICAL_ALIGNMENT); } private void UpdateTextBoxPosition() { @@ -246,7 +254,7 @@ namespace Greenshot.Drawing { } private void UpdateTextBoxFormat() { - UpdateFont(); + UpdateFormat(); Color lineColor = GetFieldValueAsColor(FieldType.LINE_COLOR); textBox.ForeColor = lineColor; textBox.Font = font; @@ -268,7 +276,7 @@ namespace Greenshot.Drawing { public override void Draw(Graphics graphics, RenderMode rm) { base.Draw(graphics, rm); - UpdateFont(); + UpdateFormat(); graphics.SmoothingMode = SmoothingMode.HighQuality; graphics.InterpolationMode = InterpolationMode.HighQualityBicubic; graphics.CompositingQuality = CompositingQuality.HighQuality; @@ -302,7 +310,7 @@ namespace Greenshot.Drawing { shadowRect.Inflate(-textOffset, -textOffset); } using (Brush fontBrush = new SolidBrush(Color.FromArgb(alpha, 100, 100, 100))) { - graphics.DrawString(text, font, fontBrush, shadowRect); + graphics.DrawString(text, font, fontBrush, shadowRect, stringFormat); currentStep++; alpha = alpha - basealpha / steps; } @@ -316,7 +324,7 @@ namespace Greenshot.Drawing { } graphics.SmoothingMode = SmoothingMode.HighQuality; using (Brush fontBrush = new SolidBrush(lineColor)) { - graphics.DrawString(text, font, fontBrush, fontRect); + graphics.DrawString(text, font, fontBrush, fontRect, stringFormat); } } diff --git a/Greenshot/Forms/ImageEditorForm.Designer.cs b/Greenshot/Forms/ImageEditorForm.Designer.cs index be9960783..d5ca465eb 100644 --- a/Greenshot/Forms/ImageEditorForm.Designer.cs +++ b/Greenshot/Forms/ImageEditorForm.Designer.cs @@ -149,6 +149,10 @@ namespace Greenshot { this.fontSizeUpDown = new Greenshot.Controls.ToolStripNumericUpDown(); this.fontBoldButton = new Greenshot.Controls.BindableToolStripButton(); this.fontItalicButton = new Greenshot.Controls.BindableToolStripButton(); + this.textVerticalAlignmentButton = new Greenshot.Controls.BindableToolStripDropDownButton(); + this.alignTopToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); + this.alignMiddleToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); + this.alignBottomToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); this.blurRadiusLabel = new GreenshotPlugin.Controls.GreenshotToolStripLabel(); this.blurRadiusUpDown = new Greenshot.Controls.ToolStripNumericUpDown(); this.brightnessLabel = new GreenshotPlugin.Controls.GreenshotToolStripLabel(); @@ -175,6 +179,10 @@ namespace Greenshot { this.fileSavedStatusContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.copyPathMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); this.openDirectoryMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); + this.textHorizontalAlignmentButton = new Greenshot.Controls.BindableToolStripDropDownButton(); + this.alignLeftToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); + this.alignCenterToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); + this.alignRightToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); this.toolStripContainer1.BottomToolStripPanel.SuspendLayout(); this.toolStripContainer1.ContentPanel.SuspendLayout(); this.toolStripContainer1.LeftToolStripPanel.SuspendLayout(); @@ -222,8 +230,8 @@ namespace Greenshot { // this.statusStrip1.Dock = System.Windows.Forms.DockStyle.None; this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.dimensionsLabel, - this.statusLabel}); + 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, 24); @@ -232,9 +240,9 @@ namespace Greenshot { // // 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.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"; @@ -243,9 +251,9 @@ namespace Greenshot { // // statusLabel // - this.statusLabel.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.statusLabel.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.statusLabel.BorderStyle = System.Windows.Forms.Border3DStyle.Sunken; this.statusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.statusLabel.Name = "statusLabel"; @@ -284,22 +292,22 @@ namespace Greenshot { 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[] { - this.btnCursor, - this.toolStripSeparator1, - this.btnRect, - this.btnEllipse, - this.btnLine, - this.btnArrow, - this.btnFreehand, - this.btnText, - this.toolStripSeparator14, - this.btnHighlight, - this.btnObfuscate, - this.toolStripSplitButton1, - this.toolStripSeparator13, - this.btnCrop, - this.rotateCwToolstripButton, - this.rotateCcwToolstripButton}); + this.btnCursor, + this.toolStripSeparator1, + this.btnRect, + this.btnEllipse, + this.btnLine, + this.btnArrow, + this.btnFreehand, + this.btnText, + this.toolStripSeparator14, + this.btnHighlight, + this.btnObfuscate, + this.toolStripSplitButton1, + this.toolStripSeparator13, + this.btnCrop, + this.rotateCwToolstripButton, + this.rotateCcwToolstripButton}); this.toolStrip2.Location = new System.Drawing.Point(0, 0); this.toolStrip2.Name = "toolStrip2"; this.toolStrip2.Size = new System.Drawing.Size(24, 385); @@ -418,52 +426,52 @@ namespace Greenshot { // this.toolStripSplitButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripSplitButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.addBorderToolStripMenuItem, - this.addDropshadowToolStripMenuItem, - this.tornEdgesToolStripMenuItem, - this.grayscaleToolStripMenuItem, - this.invertToolStripMenuItem}); + this.addBorderToolStripMenuItem, + this.addDropshadowToolStripMenuItem, + this.tornEdgesToolStripMenuItem, + this.grayscaleToolStripMenuItem, + this.invertToolStripMenuItem}); this.toolStripSplitButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripSplitButton1.Image"))); this.toolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripSplitButton1.LanguageKey = "editor_effects"; this.toolStripSplitButton1.Name = "toolStripSplitButton1"; this.toolStripSplitButton1.ShowDropDownArrow = false; this.toolStripSplitButton1.Size = new System.Drawing.Size(22, 20); this.toolStripSplitButton1.Text = "toolStripSplitButton1"; - this.toolStripSplitButton1.LanguageKey = "editor_effects"; // // addBorderToolStripMenuItem // - this.addBorderToolStripMenuItem.Name = "addBorderToolStripMenuItem"; - this.addBorderToolStripMenuItem.Size = new System.Drawing.Size(183, 22); this.addBorderToolStripMenuItem.LanguageKey = "editor_border"; + this.addBorderToolStripMenuItem.Name = "addBorderToolStripMenuItem"; + this.addBorderToolStripMenuItem.Size = new System.Drawing.Size(67, 22); this.addBorderToolStripMenuItem.Click += new System.EventHandler(this.AddBorderToolStripMenuItemClick); // // addDropshadowToolStripMenuItem // - this.addDropshadowToolStripMenuItem.Name = "addDropshadowToolStripMenuItem"; - this.addDropshadowToolStripMenuItem.Size = new System.Drawing.Size(183, 22); this.addDropshadowToolStripMenuItem.LanguageKey = "editor_image_shadow"; + this.addDropshadowToolStripMenuItem.Name = "addDropshadowToolStripMenuItem"; + this.addDropshadowToolStripMenuItem.Size = new System.Drawing.Size(67, 22); this.addDropshadowToolStripMenuItem.Click += new System.EventHandler(this.AddDropshadowToolStripMenuItemClick); // // tornEdgesToolStripMenuItem // - this.tornEdgesToolStripMenuItem.Name = "tornEdgesToolStripMenuItem"; - this.tornEdgesToolStripMenuItem.Size = new System.Drawing.Size(183, 22); this.tornEdgesToolStripMenuItem.LanguageKey = "editor_torn_edge"; + this.tornEdgesToolStripMenuItem.Name = "tornEdgesToolStripMenuItem"; + this.tornEdgesToolStripMenuItem.Size = new System.Drawing.Size(67, 22); this.tornEdgesToolStripMenuItem.Click += new System.EventHandler(this.TornEdgesToolStripMenuItemClick); // // grayscaleToolStripMenuItem // - this.grayscaleToolStripMenuItem.Name = "grayscaleToolStripMenuItem"; - this.grayscaleToolStripMenuItem.Size = new System.Drawing.Size(183, 22); this.grayscaleToolStripMenuItem.LanguageKey = "editor_grayscale"; + this.grayscaleToolStripMenuItem.Name = "grayscaleToolStripMenuItem"; + this.grayscaleToolStripMenuItem.Size = new System.Drawing.Size(67, 22); this.grayscaleToolStripMenuItem.Click += new System.EventHandler(this.GrayscaleToolStripMenuItemClick); // // invertToolStripMenuItem // - this.invertToolStripMenuItem.Name = "invertToolStripMenuItem"; - this.invertToolStripMenuItem.Size = new System.Drawing.Size(183, 22); this.invertToolStripMenuItem.LanguageKey = "editor_invert"; + this.invertToolStripMenuItem.Name = "invertToolStripMenuItem"; + this.invertToolStripMenuItem.Size = new System.Drawing.Size(67, 22); this.invertToolStripMenuItem.Click += new System.EventHandler(this.InvertToolStripMenuItemClick); // // toolStripSeparator13 @@ -486,9 +494,9 @@ namespace Greenshot { this.rotateCwToolstripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.rotateCwToolstripButton.Image = ((System.Drawing.Image)(resources.GetObject("rotateCwToolstripButton.Image"))); this.rotateCwToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.rotateCwToolstripButton.LanguageKey = "editor_rotatecw"; this.rotateCwToolstripButton.Name = "rotateCwToolstripButton"; this.rotateCwToolstripButton.Size = new System.Drawing.Size(22, 20); - this.rotateCwToolstripButton.LanguageKey = "editor_rotatecw"; this.rotateCwToolstripButton.Click += new System.EventHandler(this.RotateCwToolstripButtonClick); // // rotateCcwToolstripButton @@ -496,9 +504,9 @@ namespace Greenshot { this.rotateCcwToolstripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.rotateCcwToolstripButton.Image = ((System.Drawing.Image)(resources.GetObject("rotateCcwToolstripButton.Image"))); this.rotateCcwToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.rotateCcwToolstripButton.LanguageKey = "editor_rotateccw"; this.rotateCcwToolstripButton.Name = "rotateCcwToolstripButton"; this.rotateCcwToolstripButton.Size = new System.Drawing.Size(22, 20); - this.rotateCcwToolstripButton.LanguageKey = "editor_rotateccw"; this.rotateCcwToolstripButton.Click += new System.EventHandler(this.RotateCcwToolstripButtonClick); // // menuStrip1 @@ -506,11 +514,11 @@ namespace Greenshot { this.menuStrip1.ClickThrough = true; this.menuStrip1.Dock = System.Windows.Forms.DockStyle.None; this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.fileStripMenuItem, - this.editToolStripMenuItem, - this.objectToolStripMenuItem, - this.pluginToolStripMenuItem, - this.helpToolStripMenuItem}); + this.fileStripMenuItem, + this.editToolStripMenuItem, + this.objectToolStripMenuItem, + this.pluginToolStripMenuItem, + this.helpToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Size = new System.Drawing.Size(785, 24); @@ -527,20 +535,20 @@ namespace Greenshot { // editToolStripMenuItem // this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.undoToolStripMenuItem, - this.redoToolStripMenuItem, - this.toolStripSeparator15, - this.cutToolStripMenuItem, - this.copyToolStripMenuItem, - this.pasteToolStripMenuItem, - this.toolStripSeparator4, - this.duplicateToolStripMenuItem, - this.toolStripSeparator12, - this.preferencesToolStripMenuItem, - this.toolStripSeparator5, - this.autoCropToolStripMenuItem, - this.toolStripSeparator17, - this.insert_window_toolstripmenuitem}); + this.undoToolStripMenuItem, + this.redoToolStripMenuItem, + this.toolStripSeparator15, + this.cutToolStripMenuItem, + this.copyToolStripMenuItem, + this.pasteToolStripMenuItem, + this.toolStripSeparator4, + this.duplicateToolStripMenuItem, + this.toolStripSeparator12, + this.preferencesToolStripMenuItem, + this.toolStripSeparator5, + this.autoCropToolStripMenuItem, + this.toolStripSeparator17, + this.insert_window_toolstripmenuitem}); this.editToolStripMenuItem.LanguageKey = "editor_edit"; this.editToolStripMenuItem.Name = "editToolStripMenuItem"; this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); @@ -553,7 +561,7 @@ namespace Greenshot { this.undoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("undoToolStripMenuItem.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(168, 22); + this.undoToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.undoToolStripMenuItem.Text = "Undo"; this.undoToolStripMenuItem.Click += new System.EventHandler(this.UndoToolStripMenuItemClick); // @@ -563,112 +571,112 @@ namespace Greenshot { this.redoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("redoToolStripMenuItem.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(168, 22); + this.redoToolStripMenuItem.Size = new System.Drawing.Size(144, 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(165, 6); + this.toolStripSeparator15.Size = new System.Drawing.Size(141, 6); // // cutToolStripMenuItem // this.cutToolStripMenuItem.Enabled = false; this.cutToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("cutToolStripMenuItem.Image"))); + this.cutToolStripMenuItem.LanguageKey = "editor_cuttoclipboard"; 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(168, 22); - this.cutToolStripMenuItem.LanguageKey = "editor_cuttoclipboard"; + this.cutToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.cutToolStripMenuItem.Click += new System.EventHandler(this.CutToolStripMenuItemClick); // // copyToolStripMenuItem // this.copyToolStripMenuItem.Enabled = false; this.copyToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("copyToolStripMenuItem.Image"))); + this.copyToolStripMenuItem.LanguageKey = "editor_copytoclipboard"; 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(168, 22); - this.copyToolStripMenuItem.LanguageKey = "editor_copytoclipboard"; + this.copyToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.copyToolStripMenuItem.Click += new System.EventHandler(this.CopyToolStripMenuItemClick); // // pasteToolStripMenuItem // this.pasteToolStripMenuItem.Enabled = false; this.pasteToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("pasteToolStripMenuItem.Image"))); + this.pasteToolStripMenuItem.LanguageKey = "editor_pastefromclipboard"; 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(168, 22); - this.pasteToolStripMenuItem.LanguageKey = "editor_pastefromclipboard"; + this.pasteToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.pasteToolStripMenuItem.Click += new System.EventHandler(this.PasteToolStripMenuItemClick); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(165, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(141, 6); // // duplicateToolStripMenuItem // this.duplicateToolStripMenuItem.Enabled = false; + this.duplicateToolStripMenuItem.LanguageKey = "editor_duplicate"; 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(168, 22); - this.duplicateToolStripMenuItem.LanguageKey = "editor_duplicate"; + this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.duplicateToolStripMenuItem.Click += new System.EventHandler(this.DuplicateToolStripMenuItemClick); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(165, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(141, 6); // // preferencesToolStripMenuItem // this.preferencesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("preferencesToolStripMenuItem.Image"))); - this.preferencesToolStripMenuItem.Name = "preferencesToolStripMenuItem"; - this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(168, 22); this.preferencesToolStripMenuItem.LanguageKey = "contextmenu_settings"; + this.preferencesToolStripMenuItem.Name = "preferencesToolStripMenuItem"; + this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.preferencesToolStripMenuItem.Click += new System.EventHandler(this.PreferencesToolStripMenuItemClick); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(165, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(141, 6); // // autoCropToolStripMenuItem // - this.autoCropToolStripMenuItem.Name = "autoCropToolStripMenuItem"; - this.autoCropToolStripMenuItem.Size = new System.Drawing.Size(168, 22); this.autoCropToolStripMenuItem.LanguageKey = "editor_autocrop"; + this.autoCropToolStripMenuItem.Name = "autoCropToolStripMenuItem"; + this.autoCropToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.autoCropToolStripMenuItem.Click += new System.EventHandler(this.AutoCropToolStripMenuItemClick); // // toolStripSeparator17 // this.toolStripSeparator17.Name = "toolStripSeparator17"; - this.toolStripSeparator17.Size = new System.Drawing.Size(165, 6); + this.toolStripSeparator17.Size = new System.Drawing.Size(141, 6); // // insert_window_toolstripmenuitem // - this.insert_window_toolstripmenuitem.Name = "insert_window_toolstripmenuitem"; - this.insert_window_toolstripmenuitem.Size = new System.Drawing.Size(168, 22); this.insert_window_toolstripmenuitem.LanguageKey = "editor_insertwindow"; + this.insert_window_toolstripmenuitem.Name = "insert_window_toolstripmenuitem"; + this.insert_window_toolstripmenuitem.Size = new System.Drawing.Size(144, 22); this.insert_window_toolstripmenuitem.MouseEnter += new System.EventHandler(this.Insert_window_toolstripmenuitemMouseEnter); // // objectToolStripMenuItem // this.objectToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.addRectangleToolStripMenuItem, - this.addEllipseToolStripMenuItem, - this.drawLineToolStripMenuItem, - this.drawArrowToolStripMenuItem, - this.drawFreehandToolStripMenuItem, - this.addTextBoxToolStripMenuItem, - this.toolStripSeparator8, - this.selectAllToolStripMenuItem, - this.removeObjectToolStripMenuItem, - this.toolStripSeparator7, - this.arrangeToolStripMenuItem, - this.saveElementsToolStripMenuItem, - this.loadElementsToolStripMenuItem}); + this.addRectangleToolStripMenuItem, + this.addEllipseToolStripMenuItem, + this.drawLineToolStripMenuItem, + this.drawArrowToolStripMenuItem, + this.drawFreehandToolStripMenuItem, + this.addTextBoxToolStripMenuItem, + this.toolStripSeparator8, + this.selectAllToolStripMenuItem, + this.removeObjectToolStripMenuItem, + this.toolStripSeparator7, + this.arrangeToolStripMenuItem, + this.saveElementsToolStripMenuItem, + this.loadElementsToolStripMenuItem}); this.objectToolStripMenuItem.LanguageKey = "editor_object"; this.objectToolStripMenuItem.Name = "objectToolStripMenuItem"; this.objectToolStripMenuItem.Size = new System.Drawing.Size(54, 20); @@ -677,139 +685,139 @@ namespace Greenshot { // addRectangleToolStripMenuItem // this.addRectangleToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("addRectangleToolStripMenuItem.Image"))); - this.addRectangleToolStripMenuItem.Name = "addRectangleToolStripMenuItem"; - this.addRectangleToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.addRectangleToolStripMenuItem.LanguageKey = "editor_drawrectangle"; + this.addRectangleToolStripMenuItem.Name = "addRectangleToolStripMenuItem"; + this.addRectangleToolStripMenuItem.Size = new System.Drawing.Size(109, 22); this.addRectangleToolStripMenuItem.Click += new System.EventHandler(this.AddRectangleToolStripMenuItemClick); // // addEllipseToolStripMenuItem // this.addEllipseToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("addEllipseToolStripMenuItem.Image"))); - this.addEllipseToolStripMenuItem.Name = "addEllipseToolStripMenuItem"; - this.addEllipseToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.addEllipseToolStripMenuItem.LanguageKey = "editor_drawellipse"; + this.addEllipseToolStripMenuItem.Name = "addEllipseToolStripMenuItem"; + this.addEllipseToolStripMenuItem.Size = new System.Drawing.Size(109, 22); this.addEllipseToolStripMenuItem.Click += new System.EventHandler(this.AddEllipseToolStripMenuItemClick); // // drawLineToolStripMenuItem // this.drawLineToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("drawLineToolStripMenuItem.Image"))); - this.drawLineToolStripMenuItem.Name = "drawLineToolStripMenuItem"; - this.drawLineToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.drawLineToolStripMenuItem.LanguageKey = "editor_drawline"; + this.drawLineToolStripMenuItem.Name = "drawLineToolStripMenuItem"; + this.drawLineToolStripMenuItem.Size = new System.Drawing.Size(109, 22); this.drawLineToolStripMenuItem.Click += new System.EventHandler(this.DrawLineToolStripMenuItemClick); // // drawArrowToolStripMenuItem // this.drawArrowToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("drawArrowToolStripMenuItem.Image"))); - this.drawArrowToolStripMenuItem.Name = "drawArrowToolStripMenuItem"; - this.drawArrowToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.drawArrowToolStripMenuItem.LanguageKey = "editor_drawarrow"; + this.drawArrowToolStripMenuItem.Name = "drawArrowToolStripMenuItem"; + this.drawArrowToolStripMenuItem.Size = new System.Drawing.Size(109, 22); this.drawArrowToolStripMenuItem.Click += new System.EventHandler(this.DrawArrowToolStripMenuItemClick); // // drawFreehandToolStripMenuItem // this.drawFreehandToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("drawFreehandToolStripMenuItem.Image"))); - this.drawFreehandToolStripMenuItem.Name = "drawFreehandToolStripMenuItem"; - this.drawFreehandToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.drawFreehandToolStripMenuItem.LanguageKey = "editor_drawfreehand"; + this.drawFreehandToolStripMenuItem.Name = "drawFreehandToolStripMenuItem"; + this.drawFreehandToolStripMenuItem.Size = new System.Drawing.Size(109, 22); 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(189, 22); this.addTextBoxToolStripMenuItem.LanguageKey = "editor_drawtextbox"; + this.addTextBoxToolStripMenuItem.Name = "addTextBoxToolStripMenuItem"; + this.addTextBoxToolStripMenuItem.Size = new System.Drawing.Size(109, 22); this.addTextBoxToolStripMenuItem.Click += new System.EventHandler(this.AddTextBoxToolStripMenuItemClick); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(186, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(106, 6); // // selectAllToolStripMenuItem // + this.selectAllToolStripMenuItem.LanguageKey = "editor_selectall"; 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(189, 22); - this.selectAllToolStripMenuItem.LanguageKey = "editor_selectall"; + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(109, 22); this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.SelectAllToolStripMenuItemClick); // // removeObjectToolStripMenuItem // this.removeObjectToolStripMenuItem.Enabled = false; this.removeObjectToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("removeObjectToolStripMenuItem.Image"))); + this.removeObjectToolStripMenuItem.LanguageKey = "editor_deleteelement"; this.removeObjectToolStripMenuItem.Name = "removeObjectToolStripMenuItem"; this.removeObjectToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; - this.removeObjectToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.removeObjectToolStripMenuItem.LanguageKey = "editor_deleteelement"; + this.removeObjectToolStripMenuItem.Size = new System.Drawing.Size(109, 22); this.removeObjectToolStripMenuItem.Click += new System.EventHandler(this.RemoveObjectToolStripMenuItemClick); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(186, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(106, 6); // // arrangeToolStripMenuItem // this.arrangeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.upToTopToolStripMenuItem, - this.upOneLevelToolStripMenuItem, - this.downOneLevelToolStripMenuItem, - this.downToBottomToolStripMenuItem}); + this.upToTopToolStripMenuItem, + this.upOneLevelToolStripMenuItem, + this.downOneLevelToolStripMenuItem, + this.downToBottomToolStripMenuItem}); this.arrangeToolStripMenuItem.Enabled = false; - this.arrangeToolStripMenuItem.Name = "arrangeToolStripMenuItem"; - this.arrangeToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.arrangeToolStripMenuItem.LanguageKey = "editor_arrange"; + this.arrangeToolStripMenuItem.Name = "arrangeToolStripMenuItem"; + this.arrangeToolStripMenuItem.Size = new System.Drawing.Size(109, 22); // // upToTopToolStripMenuItem // this.upToTopToolStripMenuItem.Enabled = false; + this.upToTopToolStripMenuItem.LanguageKey = "editor_uptotop"; this.upToTopToolStripMenuItem.Name = "upToTopToolStripMenuItem"; this.upToTopToolStripMenuItem.ShortcutKeyDisplayString = "Home"; - this.upToTopToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.upToTopToolStripMenuItem.LanguageKey = "editor_uptotop"; + this.upToTopToolStripMenuItem.Size = new System.Drawing.Size(107, 22); this.upToTopToolStripMenuItem.Click += new System.EventHandler(this.UpToTopToolStripMenuItemClick); // // upOneLevelToolStripMenuItem // this.upOneLevelToolStripMenuItem.Enabled = false; + this.upOneLevelToolStripMenuItem.LanguageKey = "editor_uponelevel"; this.upOneLevelToolStripMenuItem.Name = "upOneLevelToolStripMenuItem"; this.upOneLevelToolStripMenuItem.ShortcutKeyDisplayString = "PgUp"; - this.upOneLevelToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.upOneLevelToolStripMenuItem.LanguageKey = "editor_uponelevel"; + this.upOneLevelToolStripMenuItem.Size = new System.Drawing.Size(107, 22); this.upOneLevelToolStripMenuItem.Click += new System.EventHandler(this.UpOneLevelToolStripMenuItemClick); // // downOneLevelToolStripMenuItem // this.downOneLevelToolStripMenuItem.Enabled = false; + this.downOneLevelToolStripMenuItem.LanguageKey = "editor_downonelevel"; this.downOneLevelToolStripMenuItem.Name = "downOneLevelToolStripMenuItem"; this.downOneLevelToolStripMenuItem.ShortcutKeyDisplayString = "PgDn"; - this.downOneLevelToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.downOneLevelToolStripMenuItem.LanguageKey = "editor_downonelevel"; + this.downOneLevelToolStripMenuItem.Size = new System.Drawing.Size(107, 22); this.downOneLevelToolStripMenuItem.Click += new System.EventHandler(this.DownOneLevelToolStripMenuItemClick); // // downToBottomToolStripMenuItem // this.downToBottomToolStripMenuItem.Enabled = false; + this.downToBottomToolStripMenuItem.LanguageKey = "editor_downtobottom"; this.downToBottomToolStripMenuItem.Name = "downToBottomToolStripMenuItem"; this.downToBottomToolStripMenuItem.ShortcutKeyDisplayString = "End"; - this.downToBottomToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.downToBottomToolStripMenuItem.LanguageKey = "editor_downtobottom"; + this.downToBottomToolStripMenuItem.Size = new System.Drawing.Size(107, 22); this.downToBottomToolStripMenuItem.Click += new System.EventHandler(this.DownToBottomToolStripMenuItemClick); // // saveElementsToolStripMenuItem // - this.saveElementsToolStripMenuItem.Name = "saveElementsToolStripMenuItem"; - this.saveElementsToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.saveElementsToolStripMenuItem.LanguageKey = "editor_save_objects"; + this.saveElementsToolStripMenuItem.Name = "saveElementsToolStripMenuItem"; + this.saveElementsToolStripMenuItem.Size = new System.Drawing.Size(109, 22); this.saveElementsToolStripMenuItem.Click += new System.EventHandler(this.SaveElementsToolStripMenuItemClick); // // loadElementsToolStripMenuItem // - this.loadElementsToolStripMenuItem.Name = "loadElementsToolStripMenuItem"; - this.loadElementsToolStripMenuItem.Size = new System.Drawing.Size(189, 22); this.loadElementsToolStripMenuItem.LanguageKey = "editor_load_objects"; + this.loadElementsToolStripMenuItem.Name = "loadElementsToolStripMenuItem"; + this.loadElementsToolStripMenuItem.Size = new System.Drawing.Size(109, 22); this.loadElementsToolStripMenuItem.Click += new System.EventHandler(this.LoadElementsToolStripMenuItemClick); // // pluginToolStripMenuItem @@ -823,8 +831,8 @@ namespace Greenshot { // helpToolStripMenuItem // this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.helpToolStripMenuItem1, - this.aboutToolStripMenuItem}); + this.helpToolStripMenuItem1, + this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.LanguageKey = "contextmenu_help"; this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); @@ -833,17 +841,17 @@ namespace Greenshot { // helpToolStripMenuItem1 // this.helpToolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("helpToolStripMenuItem1.Image"))); + this.helpToolStripMenuItem1.LanguageKey = "contextmenu_help"; this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1"; this.helpToolStripMenuItem1.ShortcutKeys = System.Windows.Forms.Keys.F1; - this.helpToolStripMenuItem1.Size = new System.Drawing.Size(118, 22); - this.helpToolStripMenuItem1.LanguageKey = "contextmenu_help"; + this.helpToolStripMenuItem1.Size = new System.Drawing.Size(86, 22); this.helpToolStripMenuItem1.Click += new System.EventHandler(this.HelpToolStripMenuItem1Click); // // aboutToolStripMenuItem // - this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(118, 22); this.aboutToolStripMenuItem.LanguageKey = "contextmenu_about"; + this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(86, 22); this.aboutToolStripMenuItem.Click += new System.EventHandler(this.AboutToolStripMenuItemClick); // // toolStrip1 @@ -852,22 +860,22 @@ namespace Greenshot { 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[] { - this.btnSave, - this.btnClipboard, - this.btnPrint, - this.toolStripSeparator2, - this.btnDelete, - this.toolStripSeparator3, - this.btnCut, - this.btnCopy, - this.btnPaste, - this.btnUndo, - this.btnRedo, - this.toolStripSeparator6, - this.btnSettings, - this.toolStripSeparator11, - this.toolStripSeparator16, - this.btnHelp}); + this.btnSave, + this.btnClipboard, + this.btnPrint, + this.toolStripSeparator2, + this.btnDelete, + this.toolStripSeparator3, + this.btnCut, + this.btnCopy, + this.btnPaste, + this.btnUndo, + this.btnRedo, + this.toolStripSeparator6, + this.btnSettings, + this.toolStripSeparator11, + this.toolStripSeparator16, + this.btnHelp}); this.toolStrip1.Location = new System.Drawing.Point(0, 24); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(785, 25); @@ -1021,34 +1029,36 @@ namespace Greenshot { 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[] { - this.obfuscateModeButton, - this.highlightModeButton, - this.btnFillColor, - this.btnLineColor, - this.lineThicknessLabel, - this.lineThicknessUpDown, - this.fontFamilyComboBox, - this.fontSizeLabel, - this.fontSizeUpDown, - this.fontBoldButton, - this.fontItalicButton, - this.blurRadiusLabel, - this.blurRadiusUpDown, - this.brightnessLabel, - this.brightnessUpDown, - this.previewQualityLabel, - this.previewQualityUpDown, - this.magnificationFactorLabel, - this.magnificationFactorUpDown, - this.pixelSizeLabel, - this.pixelSizeUpDown, - this.arrowHeadsLabel, - this.arrowHeadsDropDownButton, - this.shadowButton, - this.toolStripSeparator, - this.toolStripSeparator10, - this.btnConfirm, - this.btnCancel}); + this.obfuscateModeButton, + this.highlightModeButton, + this.btnFillColor, + this.btnLineColor, + this.lineThicknessLabel, + this.lineThicknessUpDown, + this.fontFamilyComboBox, + this.fontSizeLabel, + this.fontSizeUpDown, + this.fontBoldButton, + this.fontItalicButton, + this.textHorizontalAlignmentButton, + this.textVerticalAlignmentButton, + this.blurRadiusLabel, + this.blurRadiusUpDown, + this.brightnessLabel, + this.brightnessUpDown, + this.previewQualityLabel, + this.previewQualityUpDown, + this.magnificationFactorLabel, + this.magnificationFactorUpDown, + this.pixelSizeLabel, + this.pixelSizeUpDown, + this.arrowHeadsLabel, + this.arrowHeadsDropDownButton, + this.shadowButton, + this.toolStripSeparator, + this.toolStripSeparator10, + this.btnConfirm, + this.btnCancel}); this.propertiesToolStrip.Location = new System.Drawing.Point(0, 49); this.propertiesToolStrip.MinimumSize = new System.Drawing.Size(0, 27); this.propertiesToolStrip.Name = "propertiesToolStrip"; @@ -1060,8 +1070,8 @@ namespace Greenshot { // this.obfuscateModeButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.obfuscateModeButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.pixelizeToolStripMenuItem, - this.blurToolStripMenuItem}); + this.pixelizeToolStripMenuItem, + this.blurToolStripMenuItem}); this.obfuscateModeButton.Image = ((System.Drawing.Image)(resources.GetObject("obfuscateModeButton.Image"))); this.obfuscateModeButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.obfuscateModeButton.LanguageKey = "editor_obfuscate_mode"; @@ -1073,27 +1083,27 @@ namespace Greenshot { // pixelizeToolStripMenuItem // this.pixelizeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("pixelizeToolStripMenuItem.Image"))); - this.pixelizeToolStripMenuItem.Name = "pixelizeToolStripMenuItem"; - this.pixelizeToolStripMenuItem.Size = new System.Drawing.Size(114, 22); - this.pixelizeToolStripMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.PIXELIZE; this.pixelizeToolStripMenuItem.LanguageKey = "editor_obfuscate_pixelize"; + this.pixelizeToolStripMenuItem.Name = "pixelizeToolStripMenuItem"; + this.pixelizeToolStripMenuItem.Size = new System.Drawing.Size(67, 22); + this.pixelizeToolStripMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.PIXELIZE; // // blurToolStripMenuItem // this.blurToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("blurToolStripMenuItem.Image"))); - this.blurToolStripMenuItem.Name = "blurToolStripMenuItem"; - this.blurToolStripMenuItem.Size = new System.Drawing.Size(114, 22); - this.blurToolStripMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.BLUR; this.blurToolStripMenuItem.LanguageKey = "editor_obfuscate_blur"; + this.blurToolStripMenuItem.Name = "blurToolStripMenuItem"; + this.blurToolStripMenuItem.Size = new System.Drawing.Size(67, 22); + this.blurToolStripMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.BLUR; // // highlightModeButton // this.highlightModeButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.highlightModeButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.textHighlightMenuItem, - this.areaHighlightMenuItem, - this.grayscaleHighlightMenuItem, - this.magnifyMenuItem}); + this.textHighlightMenuItem, + this.areaHighlightMenuItem, + this.grayscaleHighlightMenuItem, + this.magnifyMenuItem}); this.highlightModeButton.Image = ((System.Drawing.Image)(resources.GetObject("highlightModeButton.Image"))); this.highlightModeButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.highlightModeButton.LanguageKey = "editor_highlight_mode"; @@ -1105,34 +1115,34 @@ namespace Greenshot { // textHighlightMenuItem // this.textHighlightMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("textHighlightMenuItem.Image"))); - this.textHighlightMenuItem.Name = "textHighlightMenuItem"; - this.textHighlightMenuItem.Size = new System.Drawing.Size(149, 22); - this.textHighlightMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.TEXT_HIGHTLIGHT; this.textHighlightMenuItem.LanguageKey = "editor_highlight_text"; + this.textHighlightMenuItem.Name = "textHighlightMenuItem"; + this.textHighlightMenuItem.Size = new System.Drawing.Size(67, 22); + this.textHighlightMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.TEXT_HIGHTLIGHT; // // areaHighlightMenuItem // this.areaHighlightMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("areaHighlightMenuItem.Image"))); - this.areaHighlightMenuItem.Name = "areaHighlightMenuItem"; - this.areaHighlightMenuItem.Size = new System.Drawing.Size(149, 22); - this.areaHighlightMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.AREA_HIGHLIGHT; this.areaHighlightMenuItem.LanguageKey = "editor_highlight_area"; + this.areaHighlightMenuItem.Name = "areaHighlightMenuItem"; + this.areaHighlightMenuItem.Size = new System.Drawing.Size(67, 22); + this.areaHighlightMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.AREA_HIGHLIGHT; // // grayscaleHighlightMenuItem // this.grayscaleHighlightMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("grayscaleHighlightMenuItem.Image"))); - this.grayscaleHighlightMenuItem.Name = "grayscaleHighlightMenuItem"; - this.grayscaleHighlightMenuItem.Size = new System.Drawing.Size(149, 22); - this.grayscaleHighlightMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.GRAYSCALE; this.grayscaleHighlightMenuItem.LanguageKey = "editor_highlight_grayscale"; + this.grayscaleHighlightMenuItem.Name = "grayscaleHighlightMenuItem"; + this.grayscaleHighlightMenuItem.Size = new System.Drawing.Size(67, 22); + this.grayscaleHighlightMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.GRAYSCALE; // // magnifyMenuItem // this.magnifyMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("magnifyMenuItem.Image"))); - this.magnifyMenuItem.Name = "magnifyMenuItem"; - this.magnifyMenuItem.Size = new System.Drawing.Size(149, 22); - this.magnifyMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.MAGNIFICATION; this.magnifyMenuItem.LanguageKey = "editor_highlight_magnify"; + this.magnifyMenuItem.Name = "magnifyMenuItem"; + this.magnifyMenuItem.Size = new System.Drawing.Size(67, 22); + this.magnifyMenuItem.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.MAGNIFICATION; // // btnFillColor // @@ -1141,9 +1151,9 @@ namespace Greenshot { this.btnFillColor.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.btnFillColor.Image = ((System.Drawing.Image)(resources.GetObject("btnFillColor.Image"))); this.btnFillColor.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.btnFillColor.LanguageKey = "editor_backcolor"; this.btnFillColor.Margin = new System.Windows.Forms.Padding(0); this.btnFillColor.Name = "btnFillColor"; - this.btnFillColor.LanguageKey = "editor_backcolor"; this.btnFillColor.SelectedColor = System.Drawing.Color.Transparent; this.btnFillColor.Size = new System.Drawing.Size(23, 24); // @@ -1154,8 +1164,8 @@ namespace Greenshot { this.btnLineColor.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.btnLineColor.Image = ((System.Drawing.Image)(resources.GetObject("btnLineColor.Image"))); this.btnLineColor.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.btnLineColor.Name = "btnLineColor"; this.btnLineColor.LanguageKey = "editor_forecolor"; + this.btnLineColor.Name = "btnLineColor"; this.btnLineColor.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(203)))), ((int)(((byte)(222)))), ((int)(((byte)(250))))); this.btnLineColor.Size = new System.Drawing.Size(23, 24); // @@ -1163,34 +1173,34 @@ namespace Greenshot { // this.lineThicknessLabel.LanguageKey = "editor_thickness"; this.lineThicknessLabel.Name = "lineThicknessLabel"; - this.lineThicknessLabel.Size = new System.Drawing.Size(81, 24); + this.lineThicknessLabel.Size = new System.Drawing.Size(0, 24); // // lineThicknessUpDown // this.lineThicknessUpDown.DecimalPlaces = 0; this.lineThicknessUpDown.Increment = new decimal(new int[] { - 1, - 0, - 0, - 0}); + 1, + 0, + 0, + 0}); this.lineThicknessUpDown.Maximum = new decimal(new int[] { - 100, - 0, - 0, - 0}); + 100, + 0, + 0, + 0}); this.lineThicknessUpDown.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); + 0, + 0, + 0, + 0}); this.lineThicknessUpDown.Name = "lineThicknessUpDown"; this.lineThicknessUpDown.Size = new System.Drawing.Size(41, 24); this.lineThicknessUpDown.Text = "0"; this.lineThicknessUpDown.Value = new decimal(new int[] { - 0, - 0, - 0, - 0}); + 0, + 0, + 0, + 0}); this.lineThicknessUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); this.lineThicknessUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // @@ -1201,7 +1211,7 @@ namespace Greenshot { this.fontFamilyComboBox.MaxDropDownItems = 20; this.fontFamilyComboBox.Name = "fontFamilyComboBox"; this.fontFamilyComboBox.Size = new System.Drawing.Size(200, 23); - this.fontFamilyComboBox.Text = "Agency FB"; + this.fontFamilyComboBox.Text = "Aharoni"; this.fontFamilyComboBox.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); this.fontFamilyComboBox.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // @@ -1209,34 +1219,34 @@ namespace Greenshot { // this.fontSizeLabel.LanguageKey = "editor_fontsize"; this.fontSizeLabel.Name = "fontSizeLabel"; - this.fontSizeLabel.Size = new System.Drawing.Size(27, 24); + this.fontSizeLabel.Size = new System.Drawing.Size(0, 24); // // fontSizeUpDown // this.fontSizeUpDown.DecimalPlaces = 0; this.fontSizeUpDown.Increment = new decimal(new int[] { - 1, - 0, - 0, - 0}); + 1, + 0, + 0, + 0}); this.fontSizeUpDown.Maximum = new decimal(new int[] { - 500, - 0, - 0, - 0}); + 500, + 0, + 0, + 0}); this.fontSizeUpDown.Minimum = new decimal(new int[] { - 7, - 0, - 0, - 0}); + 7, + 0, + 0, + 0}); this.fontSizeUpDown.Name = "fontSizeUpDown"; this.fontSizeUpDown.Size = new System.Drawing.Size(41, 24); this.fontSizeUpDown.Text = "12"; this.fontSizeUpDown.Value = new decimal(new int[] { - 12, - 0, - 0, - 0}); + 12, + 0, + 0, + 0}); this.fontSizeUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); this.fontSizeUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // @@ -1264,6 +1274,48 @@ namespace Greenshot { this.fontItalicButton.Text = "Italic"; this.fontItalicButton.Click += new System.EventHandler(this.FontItalicButtonClick); // + // textVerticalAlignmentButton + // + this.textVerticalAlignmentButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.alignTopToolStripMenuItem, + this.alignMiddleToolStripMenuItem, + this.alignBottomToolStripMenuItem}); + this.textVerticalAlignmentButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.textVerticalAlignmentButton.Image = ((System.Drawing.Image)(resources.GetObject("btnAlignMiddle.Image"))); + this.textVerticalAlignmentButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.textVerticalAlignmentButton.LanguageKey = "editor_align_vertical"; + this.textVerticalAlignmentButton.Name = "textVerticalAlignmentButton"; + this.textVerticalAlignmentButton.SelectedTag = System.Windows.Forms.HorizontalAlignment.Center; + this.textVerticalAlignmentButton.Size = new System.Drawing.Size(13, 24); + this.textVerticalAlignmentButton.Tag = Greenshot.Plugin.VerticalAlignment.CENTER; + // + // alignTopToolStripMenuItem + // + this.alignTopToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.ImageAndText; + this.alignTopToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("btnAlignTop.Image"))); + this.alignTopToolStripMenuItem.LanguageKey = "editor_align_top"; + this.alignTopToolStripMenuItem.Name = "alignTopToolStripMenuItem"; + this.alignTopToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.alignTopToolStripMenuItem.Tag = Greenshot.Plugin.VerticalAlignment.TOP; + // + // alignMiddleToolStripMenuItem + // + this.alignMiddleToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.ImageAndText; + this.alignMiddleToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("btnAlignMiddle.Image"))); + this.alignMiddleToolStripMenuItem.LanguageKey = "editor_align_middle"; + this.alignMiddleToolStripMenuItem.Name = "alignMiddleToolStripMenuItem"; + this.alignMiddleToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.alignMiddleToolStripMenuItem.Tag = Greenshot.Plugin.VerticalAlignment.CENTER; + // + // alignBottomToolStripMenuItem + // + this.alignBottomToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.ImageAndText; + this.alignBottomToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("btnAlignBottom.Image"))); + this.alignBottomToolStripMenuItem.LanguageKey = "editor_align_bottom"; + this.alignBottomToolStripMenuItem.Name = "alignBottomToolStripMenuItem"; + this.alignBottomToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.alignBottomToolStripMenuItem.Tag = Greenshot.Plugin.VerticalAlignment.BOTTOM; + // // blurRadiusLabel // this.blurRadiusLabel.LanguageKey = "editor_blur_radius"; @@ -1275,28 +1327,28 @@ namespace Greenshot { // this.blurRadiusUpDown.DecimalPlaces = 0; this.blurRadiusUpDown.Increment = new decimal(new int[] { - 1, - 0, - 0, - 0}); + 1, + 0, + 0, + 0}); this.blurRadiusUpDown.Maximum = new decimal(new int[] { - 100, - 0, - 0, - 0}); + 100, + 0, + 0, + 0}); this.blurRadiusUpDown.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); + 0, + 0, + 0, + 0}); this.blurRadiusUpDown.Name = "blurRadiusUpDown"; this.blurRadiusUpDown.Size = new System.Drawing.Size(41, 24); this.blurRadiusUpDown.Text = "1"; this.blurRadiusUpDown.Value = new decimal(new int[] { - 1, - 0, - 0, - 0}); + 1, + 0, + 0, + 0}); this.blurRadiusUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); this.blurRadiusUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // @@ -1311,28 +1363,28 @@ namespace Greenshot { // this.brightnessUpDown.DecimalPlaces = 0; this.brightnessUpDown.Increment = new decimal(new int[] { - 5, - 0, - 0, - 0}); + 5, + 0, + 0, + 0}); this.brightnessUpDown.Maximum = new decimal(new int[] { - 200, - 0, - 0, - 0}); + 200, + 0, + 0, + 0}); this.brightnessUpDown.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); + 0, + 0, + 0, + 0}); this.brightnessUpDown.Name = "brightnessUpDown"; this.brightnessUpDown.Size = new System.Drawing.Size(41, 24); this.brightnessUpDown.Text = "100"; this.brightnessUpDown.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); + 100, + 0, + 0, + 0}); this.brightnessUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); this.brightnessUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // @@ -1340,35 +1392,35 @@ namespace Greenshot { // this.previewQualityLabel.LanguageKey = "editor_preview_quality"; this.previewQualityLabel.Name = "previewQualityLabel"; - this.previewQualityLabel.Size = new System.Drawing.Size(87, 15); + this.previewQualityLabel.Size = new System.Drawing.Size(87, 24); this.previewQualityLabel.Text = "Preview quality"; // // previewQualityUpDown // this.previewQualityUpDown.DecimalPlaces = 0; this.previewQualityUpDown.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); + 10, + 0, + 0, + 0}); this.previewQualityUpDown.Maximum = new decimal(new int[] { - 100, - 0, - 0, - 0}); + 100, + 0, + 0, + 0}); this.previewQualityUpDown.Minimum = new decimal(new int[] { - 10, - 0, - 0, - 0}); + 10, + 0, + 0, + 0}); this.previewQualityUpDown.Name = "previewQualityUpDown"; this.previewQualityUpDown.Size = new System.Drawing.Size(41, 23); this.previewQualityUpDown.Text = "50"; this.previewQualityUpDown.Value = new decimal(new int[] { - 50, - 0, - 0, - 0}); + 50, + 0, + 0, + 0}); this.previewQualityUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); this.previewQualityUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // @@ -1376,35 +1428,35 @@ namespace Greenshot { // this.magnificationFactorLabel.LanguageKey = "editor_magnification_factor"; this.magnificationFactorLabel.Name = "magnificationFactorLabel"; - this.magnificationFactorLabel.Size = new System.Drawing.Size(115, 15); + this.magnificationFactorLabel.Size = new System.Drawing.Size(0, 0); this.magnificationFactorLabel.Tag = Greenshot.Drawing.FilterContainer.PreparedFilter.MAGNIFICATION; // // magnificationFactorUpDown // this.magnificationFactorUpDown.DecimalPlaces = 0; this.magnificationFactorUpDown.Increment = new decimal(new int[] { - 2, - 0, - 0, - 0}); + 2, + 0, + 0, + 0}); this.magnificationFactorUpDown.Maximum = new decimal(new int[] { - 8, - 0, - 0, - 0}); + 8, + 0, + 0, + 0}); this.magnificationFactorUpDown.Minimum = new decimal(new int[] { - 2, - 0, - 0, - 0}); + 2, + 0, + 0, + 0}); this.magnificationFactorUpDown.Name = "magnificationFactorUpDown"; this.magnificationFactorUpDown.Size = new System.Drawing.Size(29, 23); this.magnificationFactorUpDown.Text = "2"; this.magnificationFactorUpDown.Value = new decimal(new int[] { - 2, - 0, - 0, - 0}); + 2, + 0, + 0, + 0}); this.magnificationFactorUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); this.magnificationFactorUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // @@ -1412,34 +1464,34 @@ namespace Greenshot { // this.pixelSizeLabel.LanguageKey = "editor_pixel_size"; this.pixelSizeLabel.Name = "pixelSizeLabel"; - this.pixelSizeLabel.Size = new System.Drawing.Size(53, 15); + this.pixelSizeLabel.Size = new System.Drawing.Size(0, 0); // // pixelSizeUpDown // this.pixelSizeUpDown.DecimalPlaces = 0; this.pixelSizeUpDown.Increment = new decimal(new int[] { - 1, - 0, - 0, - 0}); + 1, + 0, + 0, + 0}); this.pixelSizeUpDown.Maximum = new decimal(new int[] { - 100, - 0, - 0, - 0}); + 100, + 0, + 0, + 0}); this.pixelSizeUpDown.Minimum = new decimal(new int[] { - 2, - 0, - 0, - 0}); + 2, + 0, + 0, + 0}); this.pixelSizeUpDown.Name = "pixelSizeUpDown"; this.pixelSizeUpDown.Size = new System.Drawing.Size(41, 23); this.pixelSizeUpDown.Text = "5"; this.pixelSizeUpDown.Value = new decimal(new int[] { - 5, - 0, - 0, - 0}); + 5, + 0, + 0, + 0}); this.pixelSizeUpDown.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus); this.pixelSizeUpDown.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus); // @@ -1447,52 +1499,52 @@ namespace Greenshot { // this.arrowHeadsLabel.LanguageKey = "editor_pixel_size"; this.arrowHeadsLabel.Name = "arrowHeadsLabel"; - this.arrowHeadsLabel.Size = new System.Drawing.Size(53, 15); + this.arrowHeadsLabel.Size = new System.Drawing.Size(0, 0); // // arrowHeadsDropDownButton // this.arrowHeadsDropDownButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.arrowHeadsDropDownButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.arrowHeadStartMenuItem, - this.arrowHeadEndMenuItem, - this.arrowHeadBothMenuItem, - this.arrowHeadNoneMenuItem}); + this.arrowHeadStartMenuItem, + this.arrowHeadEndMenuItem, + this.arrowHeadBothMenuItem, + this.arrowHeadNoneMenuItem}); this.arrowHeadsDropDownButton.Image = ((System.Drawing.Image)(resources.GetObject("arrowHeadsDropDownButton.Image"))); this.arrowHeadsDropDownButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.arrowHeadsDropDownButton.LanguageKey = "editor_arrowheads"; this.arrowHeadsDropDownButton.Name = "arrowHeadsDropDownButton"; this.arrowHeadsDropDownButton.Size = new System.Drawing.Size(29, 20); - this.arrowHeadsDropDownButton.LanguageKey = "editor_arrowheads"; // // arrowHeadStartMenuItem // - this.arrowHeadStartMenuItem.Name = "arrowHeadStartMenuItem"; - this.arrowHeadStartMenuItem.Size = new System.Drawing.Size(129, 22); - this.arrowHeadStartMenuItem.Tag = Greenshot.Drawing.ArrowContainer.ArrowHeadCombination.START_POINT; this.arrowHeadStartMenuItem.LanguageKey = "editor_arrowheads_start"; + this.arrowHeadStartMenuItem.Name = "arrowHeadStartMenuItem"; + this.arrowHeadStartMenuItem.Size = new System.Drawing.Size(67, 22); + this.arrowHeadStartMenuItem.Tag = Greenshot.Drawing.ArrowContainer.ArrowHeadCombination.START_POINT; this.arrowHeadStartMenuItem.Click += new System.EventHandler(this.ArrowHeadsToolStripMenuItemClick); // // arrowHeadEndMenuItem // - this.arrowHeadEndMenuItem.Name = "arrowHeadEndMenuItem"; - this.arrowHeadEndMenuItem.Size = new System.Drawing.Size(129, 22); - this.arrowHeadEndMenuItem.Tag = Greenshot.Drawing.ArrowContainer.ArrowHeadCombination.END_POINT; this.arrowHeadEndMenuItem.LanguageKey = "editor_arrowheads_end"; + this.arrowHeadEndMenuItem.Name = "arrowHeadEndMenuItem"; + this.arrowHeadEndMenuItem.Size = new System.Drawing.Size(67, 22); + this.arrowHeadEndMenuItem.Tag = Greenshot.Drawing.ArrowContainer.ArrowHeadCombination.END_POINT; this.arrowHeadEndMenuItem.Click += new System.EventHandler(this.ArrowHeadsToolStripMenuItemClick); // // arrowHeadBothMenuItem // - this.arrowHeadBothMenuItem.Name = "arrowHeadBothMenuItem"; - this.arrowHeadBothMenuItem.Size = new System.Drawing.Size(129, 22); - this.arrowHeadBothMenuItem.Tag = Greenshot.Drawing.ArrowContainer.ArrowHeadCombination.BOTH; this.arrowHeadBothMenuItem.LanguageKey = "editor_arrowheads_both"; + this.arrowHeadBothMenuItem.Name = "arrowHeadBothMenuItem"; + this.arrowHeadBothMenuItem.Size = new System.Drawing.Size(67, 22); + this.arrowHeadBothMenuItem.Tag = Greenshot.Drawing.ArrowContainer.ArrowHeadCombination.BOTH; this.arrowHeadBothMenuItem.Click += new System.EventHandler(this.ArrowHeadsToolStripMenuItemClick); // // arrowHeadNoneMenuItem // - this.arrowHeadNoneMenuItem.Name = "arrowHeadNoneMenuItem"; - this.arrowHeadNoneMenuItem.Size = new System.Drawing.Size(129, 22); - this.arrowHeadNoneMenuItem.Tag = Greenshot.Drawing.ArrowContainer.ArrowHeadCombination.NONE; this.arrowHeadNoneMenuItem.LanguageKey = "editor_arrowheads_none"; + this.arrowHeadNoneMenuItem.Name = "arrowHeadNoneMenuItem"; + this.arrowHeadNoneMenuItem.Size = new System.Drawing.Size(67, 22); + this.arrowHeadNoneMenuItem.Tag = Greenshot.Drawing.ArrowContainer.ArrowHeadCombination.NONE; this.arrowHeadNoneMenuItem.Click += new System.EventHandler(this.ArrowHeadsToolStripMenuItemClick); // // shadowButton @@ -1545,34 +1597,76 @@ namespace Greenshot { // closeToolStripMenuItem // this.closeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("closeToolStripMenuItem.Image"))); + this.closeToolStripMenuItem.LanguageKey = "editor_close"; 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.LanguageKey = "editor_close"; this.closeToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItemClick); // // fileSavedStatusContextMenu // this.fileSavedStatusContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.copyPathMenuItem, - this.openDirectoryMenuItem}); + this.copyPathMenuItem, + this.openDirectoryMenuItem}); this.fileSavedStatusContextMenu.Name = "contextMenuStrip1"; this.fileSavedStatusContextMenu.Size = new System.Drawing.Size(247, 48); // // copyPathMenuItem // + this.copyPathMenuItem.LanguageKey = "editor_copypathtoclipboard"; this.copyPathMenuItem.Name = "copyPathMenuItem"; this.copyPathMenuItem.Size = new System.Drawing.Size(246, 22); - this.copyPathMenuItem.LanguageKey = "editor_copypathtoclipboard"; this.copyPathMenuItem.Click += new System.EventHandler(this.CopyPathMenuItemClick); // // openDirectoryMenuItem // + this.openDirectoryMenuItem.LanguageKey = "editor_opendirinexplorer"; this.openDirectoryMenuItem.Name = "openDirectoryMenuItem"; this.openDirectoryMenuItem.Size = new System.Drawing.Size(246, 22); - this.openDirectoryMenuItem.LanguageKey = "editor_opendirinexplorer"; this.openDirectoryMenuItem.Click += new System.EventHandler(this.OpenDirectoryMenuItemClick); // + // textHorizontalAlignmentButton + // + this.textHorizontalAlignmentButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.alignLeftToolStripMenuItem, + this.alignCenterToolStripMenuItem, + this.alignRightToolStripMenuItem}); + this.textHorizontalAlignmentButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.textHorizontalAlignmentButton.Image = ((System.Drawing.Image)(resources.GetObject("btnAlignCenter.Image"))); + this.textHorizontalAlignmentButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.textHorizontalAlignmentButton.LanguageKey = "editor_align_horizontal"; + this.textHorizontalAlignmentButton.Name = "textHorizontalAlignmentButton"; + this.textHorizontalAlignmentButton.SelectedTag = System.Windows.Forms.HorizontalAlignment.Center; + this.textHorizontalAlignmentButton.Size = new System.Drawing.Size(13, 24); + this.textHorizontalAlignmentButton.Tag = System.Windows.Forms.HorizontalAlignment.Center; + // + // alignLeftToolStripMenuItem + // + this.alignLeftToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.ImageAndText; + this.alignLeftToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("btnAlignLeft.Image"))); + this.alignLeftToolStripMenuItem.LanguageKey = "editor_align_left"; + this.alignLeftToolStripMenuItem.Name = "alignLeftToolStripMenuItem"; + this.alignLeftToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.alignLeftToolStripMenuItem.Tag = System.Windows.Forms.HorizontalAlignment.Left; + // + // alignCenterToolStripMenuItem + // + this.alignCenterToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.ImageAndText; + this.alignCenterToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("btnAlignCenter.Image"))); + this.alignCenterToolStripMenuItem.LanguageKey = "editor_align_center"; + this.alignCenterToolStripMenuItem.Name = "alignCenterToolStripMenuItem"; + this.alignCenterToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.alignCenterToolStripMenuItem.Tag = System.Windows.Forms.HorizontalAlignment.Center; + // + // alignRightToolStripMenuItem + // + this.alignRightToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.ImageAndText; + this.alignRightToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("btnAlignRight.Image"))); + this.alignRightToolStripMenuItem.LanguageKey = "editor_align_right"; + this.alignRightToolStripMenuItem.Name = "alignRightToolStripMenuItem"; + this.alignRightToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.alignRightToolStripMenuItem.Tag = System.Windows.Forms.HorizontalAlignment.Right; + // // ImageEditorForm // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -1609,6 +1703,14 @@ namespace Greenshot { this.fileSavedStatusContextMenu.ResumeLayout(false); this.ResumeLayout(false); } + private GreenshotPlugin.Controls.GreenshotToolStripMenuItem alignRightToolStripMenuItem; + private GreenshotPlugin.Controls.GreenshotToolStripMenuItem alignCenterToolStripMenuItem; + private GreenshotPlugin.Controls.GreenshotToolStripMenuItem alignLeftToolStripMenuItem; + private Greenshot.Controls.BindableToolStripDropDownButton textHorizontalAlignmentButton; + private GreenshotPlugin.Controls.GreenshotToolStripMenuItem alignMiddleToolStripMenuItem; + private GreenshotPlugin.Controls.GreenshotToolStripMenuItem alignBottomToolStripMenuItem; + private GreenshotPlugin.Controls.GreenshotToolStripMenuItem alignTopToolStripMenuItem; + private Greenshot.Controls.BindableToolStripDropDownButton textVerticalAlignmentButton; private GreenshotPlugin.Controls.GreenshotToolStripMenuItem invertToolStripMenuItem; private GreenshotPlugin.Controls.GreenshotToolStripMenuItem grayscaleToolStripMenuItem; private GreenshotPlugin.Controls.GreenshotToolStripButton rotateCcwToolstripButton; diff --git a/Greenshot/Forms/ImageEditorForm.cs b/Greenshot/Forms/ImageEditorForm.cs index 6f5351aa8..5966aec3a 100644 --- a/Greenshot/Forms/ImageEditorForm.cs +++ b/Greenshot/Forms/ImageEditorForm.cs @@ -943,6 +943,8 @@ namespace Greenshot { new BidirectionalBinding(fontSizeUpDown, "Value", surface.FieldAggregator.GetField(FieldType.FONT_SIZE), "Value", DecimalFloatConverter.GetInstance(), NotNullValidator.GetInstance()); new BidirectionalBinding(fontBoldButton, "Checked", surface.FieldAggregator.GetField(FieldType.FONT_BOLD), "Value", NotNullValidator.GetInstance()); new BidirectionalBinding(fontItalicButton, "Checked", surface.FieldAggregator.GetField(FieldType.FONT_ITALIC), "Value", NotNullValidator.GetInstance()); + new BidirectionalBinding(textHorizontalAlignmentButton, "SelectedTag", surface.FieldAggregator.GetField(FieldType.TEXT_HORIZONTAL_ALIGNMENT), "Value", HorizontalAlignmentConverter.GetInstance(), NotNullValidator.GetInstance()); + new BidirectionalBinding(textVerticalAlignmentButton, "SelectedTag", surface.FieldAggregator.GetField(FieldType.TEXT_VERTICAL_ALIGNMENT), "Value", VerticalAlignmentConverter.GetInstance(), NotNullValidator.GetInstance()); new BidirectionalBinding(shadowButton, "Checked", surface.FieldAggregator.GetField(FieldType.SHADOW), "Value", NotNullValidator.GetInstance()); new BidirectionalBinding(previewQualityUpDown, "Value", surface.FieldAggregator.GetField(FieldType.PREVIEW_QUALITY), "Value", DecimalDoublePercentageConverter.GetInstance(), NotNullValidator.GetInstance()); new BidirectionalBinding(obfuscateModeButton, "SelectedTag", surface.FieldAggregator.GetField(FieldType.PREPARED_FILTER_OBFUSCATE), "Value"); @@ -969,6 +971,8 @@ namespace Greenshot { fontSizeLabel.Visible = fontSizeUpDown.Visible = props.HasFieldValue(FieldType.FONT_SIZE); fontBoldButton.Visible = props.HasFieldValue(FieldType.FONT_BOLD); fontItalicButton.Visible = props.HasFieldValue(FieldType.FONT_ITALIC); + textHorizontalAlignmentButton.Visible = props.HasFieldValue(FieldType.TEXT_HORIZONTAL_ALIGNMENT); + textVerticalAlignmentButton.Visible = props.HasFieldValue(FieldType.TEXT_VERTICAL_ALIGNMENT); shadowButton.Visible = props.HasFieldValue(FieldType.SHADOW); btnConfirm.Visible = btnCancel.Visible = props.HasFieldValue(FieldType.FLAGS) && ((FieldType.Flag)props.GetFieldValue(FieldType.FLAGS)&FieldType.Flag.CONFIRMABLE) == FieldType.Flag.CONFIRMABLE; diff --git a/Greenshot/Forms/ImageEditorForm.resx b/Greenshot/Forms/ImageEditorForm.resx index 164398c67..b12d1ea91 100644 --- a/Greenshot/Forms/ImageEditorForm.resx +++ b/Greenshot/Forms/ImageEditorForm.resx @@ -117,17 +117,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 551, 17 - - - 17, 54 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFMSURBVDhPY2BAAmFhYb4hISFayGIksQMCAjKKioqqyTYE + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAFMSURBVDhPY2BAAmFhYb4hISFayGIksQMCAjKKioqqyTYE aEDmfyDIz8+v8fX11SbJdpBiT0/PbJABIJCVlVVLsiFubm65MANAdEZGRr2rq6sO0S5xcnLKRzYAxE5J SWl0dnbWJcoQGxubQnQDQPz4+PhmoJweQUMsLS2LsRkAEouKimoxNzfHb4iJiUkpLgNA4uHh4W0GBgb6 OF2ip6dXgWzAp0+fvjo4ONSDxGEYaEAUTgPU1dWrQAY8f/78fWdn50oQe+7cuTtVVVVx24psmoKCQh1I @@ -139,7 +133,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGhSURBVDhPY2CgFBiX7TEzLtuVA6KJNQtFj2HJ7tz///+f + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAGhSURBVDhPY2CgFBiX7TEzLtuVA6KJNQtFj2HJ7tz///+f AdFGpTuiicHIehiMynZZGJTuyp+58+7Cl+++nyIGg9SC9ID0gl1tULIj7sW77yfvv/q6mxgMUgvSA/ey ftH2hKfvvx+/8/zTDmIwSC1ID9wAncKtiY9efzl688mnbcj48uMPG07cfrN4/+WXM3acfzZx85mnfSB8 +u675SA9cAO08zYm33/x5dCVR+83g/C5ux/W7b3ycs7G008mrDv5tA+Cn8DxkRtvloL0wA3Qyt+cevvF @@ -152,7 +146,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIMSURBVDhPY2DAAYzL9pgZl+3KAdG41GAV1y/frmBUtsvb + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAIMSURBVDhPY2DAAYzL9pgZl+3KAdG41GAV1y/frmBUtsvb sGR37v///8+AaMOyXYkgMZAcTsPs6/ezGJbucvZtP5S55PDDSbP33F5iULwzb9rOOwsfv/m2ESQGkgOp AanFMMiwZIdH4fzzpY/fft31+M2XA/dffd2NjEFiIDmQGpBaFAN0inZoBHcfzXv86uuuO88/7QTiHTjw TpAakFqQHrghuoVbo7aeezITpOnW009b8WGQGpBakB6wAVp5m2y087eU9m++sfTqow+bkPH5e+/WHLnx @@ -167,7 +161,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADASURBVDhPYzAu22NmXLYrB0QzkAMMS3bn/v///wyIJkc/ + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAADASURBVDhPYzAu22NmXLYrB0QzkAMMS3bn/v///wyIJkc/ g1HZLguD4p15BqU7s3Qq94iTZQhIk2nJFgmDkh1xIJoyQ4q3xWtRYghIs07h1kSNgu2SZLsEpFknf3MS xYZoF2xK0ShYS75L1LM3SGnkbUwD0WR7B6RZPXtdBkWGqKavlFbLXJsFosl2CUizcvqaHIoMUUlZKyOf vLxBIXlFq1ziCheyXCMZu7APlHdANFkGiETM8QbiaSCaLAPQNQEAHzZMfWDTaNwAAAAASUVORK5CYII= @@ -176,7 +170,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADOSURBVDhPYzAu22NmXLYrB0QzkAMMS3bn/v///wyIJkc/ + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAADOSURBVDhPYzAu22NmXLYrB0QzkAMMS3bn/v///wyIJkc/ g1HZLguD4p15BqU7s3Qq94iTZQhIk2nJFgmDkh1xIJoyQ4q3xWtRYghIs07h1kSNgu2SZLsEpFknf3MS xYZoF2xK0ShYS75L1LM3SGnkbUwD0WR7B6RZPXtdBswQ7fzNDSQbppq+Ulotc22Wdt7mXrIMANkI0qyc viYHRJPsApCtUNwnn7y8QSF5Ratc4goXkg0CaZCMXdgHyjsgmiwDRCLmeAPxNBBNlgHomgDCEFXWJ2yt @@ -186,21 +180,21 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHZSURBVDhPY2AgATxnYBDDqzy1aatuSssWf2yKnjIw2Dxk + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAHZSURBVDhPY2AgATxnYBDDqzy1aatuSssWf2yKnjIw2Dxk ZFx3npGxHachKU1bt6Q0bQlDVxAQEKDm4OCQ/6+09P8jd/eXaxgYXDAMSWnalpbavHVm6KpVzMiSMM1/ //79v2bNmqurGBiOYHVBUvOWU0DbjZEl9y1lsN80i3HL9WNB//esMv7AycnZgdP5qfXbHiTX7xCCKYBp /vmi+v+VPX6vWvMZDuMPwOZt01Mat87IzMwUxNCcw3Y+Ozs7OC8vzystLY0LXyA21td4vlnYL/oWZPOJ - PUE/GsIk/0K8t3VVavOWrSnN254DwysEqyELyxnk5lbx1L67m/Z/y0Kz9y25HFfq6+tZkBWntG1VAxq0 + PUE/Glwk/0K8t3VVavOWrSnN254DwysEqyELyxnk5lbx1L67m/Z/y0Kz9y25HFfq6+tZkBWntG1VAxq0 Oq1+kwiKIf8ZGBj7sxmb/r87878ojHFBhj9DFS6npjZtW5HStF0bRb4thbHn2dVl/3OCGJdnBDB44guw 1KYtS5Jbt+mhq/mf7s+4KsWXAdVkNFWpLdslk5u3bsTwAjAaXwADqC2tZasJLtuBmriAzm8FqmvCTIn1 22SAoVue0rhtO9CJF4GhviCteVsF0K8JQHZcSvPWouSmbWuAqXV+Vv0WCZxeBIY6U0b9TjGgU72BthUC - NbcDDe5Mad5ek9KyzYKEzEucUgAHMNpyRhUBZAAAAABJRU5ErkJggg== + NbcDDe5Mad5ek9KyzYKEzEucUgDgY9pgutX3/gAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFZSURBVDhPY2CgBjAu2+NqVLYrihQM0gO326xqd9Lrj98u + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAFZSURBVDhPY2CgBjAu2+NqVLYrihQM0gO326xqd9Lrj98u vvz4/RQxGKQWpAdugG31zuwX776f3Hn++Rq3hl31MAwSA2FkMZAakBhID9wAx9pdJa8/fj/nVL+zDCYI Yj99//04CKOLg9SC9MANcG/YFetav7PGpX6XBUwQZMPT11+OgjCybSA1ILUgPXjD37xqZ8KdF1/2XXv4 aRuITXJkmZbujj504+XSQ9deLgGxSTbApHRX7OHrb5aBMIhNsgHmlbtSD117vRKEQWySDbCt2lFw+Mbr @@ -212,7 +206,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFRSURBVDhP1ZI/a8JQFMVPMFu3unVMCM3egkuHDkWEFgqF + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAFRSURBVDhP1ZI/a8JQFMVPMFu3unVMCM3egkuHDkWEFgqF jq4ODoLgB3AsOETc3EQN+AeVuroUUeuQUXAQRVEEUfMVbt99bQqWDHHsg8chL/f8uPe8B/isePw163fu e3Y44ON4BAml/R6024EymRfabkGbDWi9Bq1WoOUStFiAZjPcn4BcF9TpmJTP31G7bUpAOv0sd6NhSkC9 bsrvWs2k+Ryn3TGAO2i1rimVepIAVu6AdTQKS/U68AXkchFynEtKJmMSwMoA1uEwLNUDTKfIDga4+h2D @@ -224,7 +218,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPxZDdS1NhHID9ByLoJrrpIiGIMIy8MYVqrEhi + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAIFSURBVDhPxZDdS1NhHID9ByLoJrrpIiGIMIy8MYVqrEhi FpWCSUmmrCFzjPzooo0ZtiAzyD4u1k1hMLEtLTUUtlKwhrD8yGmWpWPamDr6OuLa2Pa0991VtF37wu/m /J7nec85OTmbfspNJs1Zs1mbaWqsYbLthCdf/pTJdJks59y1QLYVwksHmpp0iWSSg7ehuB1Ud0HdAfpu 0Bh8VD8FowNuDoHdCz1TIHjhyUBJQ0NdLJFA15UCndA6CG0uePQODl0cpWMY7o2k5ZF5GF8CwQtPBo7p @@ -239,7 +233,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF0SURBVDhPY2DAAU5tYghHltq7jHEzLrUY4ruWMOgeXMm4 + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAF0SURBVDhPY2DAAU5tYghHltq7jHEzLrUY4ruWMOgeXMm4 CUQTrQmmcMschtgtsxh3vrub9h9Eg/gwOU9PTzUnJ6cCAwMDLbwGb5nPYLB0AsOh9VMYDNA1f/jw4b+q qmoNTgNOrYf4fVYrQyouzTIyMti9BrQ5dut8xh0gGskGPyD7AcxmmGacgbqomyEZXXNZWdl/oNhzRUVF woEaHh5+IDs7+395efl/EB0UFPTf2tr6v4mJyX8rK6v/bm5u/0NDQ/+npKT8z8/PP4ArLPxMTU1/vH37 @@ -251,7 +245,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHWSURBVDhPY2CAgv1JLBkHEpm7QTi57c0BmDjR9N5E5t6/ + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAHWSURBVDhPY2CAgv1JLBkHEpm7QTi57c0BmDjR9N5E5t6/ N5f9/3Vl4f+4hmf/idYIs3l3ItOZX5cX/L+/se5/aPmd/zDXYKNBeuAWwGy+0uf6/8fFef8/n5j63zv3 ItgluDBID9yA3QnM/SCbL3Y7/f9+bvb/u+uq/9snHv3/9dR0sGuQaRAbhEF64AaYhe85YBq++39ZWPzL L0DJdwf7/oP42PD9TfVgF+6KZZ6IEUYbI5lnfTo+5f+tVeX/dfw2YgQiSAzkwo9HJ/3fFsc8BcOAtZHM @@ -265,32 +259,29 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGdSURBVDhPY2AYMiCp9fWy6JZXkiQ5OLL64f/g4usOIE0g - dmTVw0kEDXDPuKjumXPurHHOxT+uORcfeOVc/A/SBKIDCk69804/L43XEKuoA+vtEo6aghRZxRz475x8 + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAGdSURBVDhPY2AYMiCp9fWy6JZXkiQ5OLL64f/g4usOIE0g + dmTVw0kEDXDPuKjumXPurFbOxT+uORcfeOVc/A/SBKIDCk69804/L43XEKuoA+vtEo6aghRZxRz475x8 HOwCELtl3rULljEH8LvCIGibFzYbdPw2/b/68P0R46Ct7/S9N+N3BcSA/4za+Vs0tfM3g12g4rb6/4sP 365U9Z2+quK6Gr8rNLLXCWvmbvRPn3miUiNnQyrIACWXtf/vvPh84sLd98dUnde8U3XC4gr7+v0sytnr LO2qtmUtP3x/1vWHn46pZa3LBBmg7rnj//kHHw5eAuLS3kuX1Ty3o7pCPn25gmr6qoSKRafaj958s3Hr 2aer9l1+sVU5bVUuyAD9wBP/Vx17vGzCtltT9lx4scUw6MQ7/ZBj0gyioVN4JGMX+jtVbaneevrJ2lO3 3xzac+XVjm3nnm5etP/uCsmYRWUgAyyibv5fsvfp/i3nnm06eP3V7vrpT66YRd2YxCAUPjsIiOvw4CCQ - AQ5Jz5Y5Jj//j4xBYgQT1uBXAACS/dT2EjRCSQAAAABJRU5ErkJggg== + AQ5Jz5Y5Jj//j4xBYgQT1uBXAAB4ctTtvOBX4gAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGcSURBVDhPY2AYdCC65ZVkUuvrZWQ7LLLq4aTI6of/QQYE - F193gLGJMtA7/bx0QMGpd145F8EGgGjXnIsPjHMu/vHMOXfWPeOiOl6DLGMOTGqZd+2CVcwBsAHOyccd + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAGcSURBVDhPY2AYdCC65ZVkUuvrZWQ7LLLq4aTI6of/QQYE + F193gLGJMtA7/bx0QMGpd145F8EGgGjXnIsPtHIu/vHMOXfWPeOiOl6DLGMOTGqZd+2CVcwBsAHOyccd YGy7hKOmVlEH1uM0QN97s7Rx0NZ3Vx++P6LjtwlsADowCNrmhdMAFdfVk6r6Tl998eHbFRW31WADtPM3 O2jnb9FkYPjPiNfpqk6bpVWd17y7cPf9sTsvPp9QclkLNkAjZ0Nq+swTlZq5G/01stcJ4zREzXP7pNLe S5cvPfhw8DwQq3vuABuglrUu8/rDT8eWH74/y65qW5Zy9jpL+/r9LCgG6YcckzYMOvFuz4UXWyZsuzVl 1bHHy/QDT4ANUE5blbvv8outW88+XXX05puNFYtOtaumr0qQT1+uADfELOrGpPrpT64cvP5q95ZzzzYt 2ft0v0XUTbABkjGLyhbtv7ti27mnm/dcebXj1O03h7aefrLWqWpLtWTsQn/R0Ck8DA5Jz5Y5Jj//j4xB - YiADhMJnBwFxHR4cRFQCG9yKAAu41PZCFeCYAAAAAElFTkSuQmCC + YiADhMJnBwFxHR4cRFQCG9yKAPGK1O3Fnfm/AAAAAElFTkSuQmCC - - 662, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -506,13 +497,10 @@ AOypQZHMHzM4AAAAAElFTkSuQmCC - - 452, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFrSURBVDhPrZMxa8JAGIYVf4ybSwRBB0E36VIh/0CjaFBQ + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAFrSURBVDhPrZMxa8JAGIYVf4ybSwRBB0E36VIh/0CjaFBQ HAKiFJz6RxRsiwaktgGpFrEuTm4OXQpSEFrBWkHw7b0By1UkdTDwEO67556bzuU6x+d2u68EN2q1qp0C XZ75vVss7mq1Gvjt/oEOXZ6RA61KpYLtbofNdusIHboi0JIDZrlcxpc4/LleO0KHrgiYcqBjGAY+NhvM l0tH6NAVgY4c6JZKJbyL218XC0fo0BWBrhywCoUCxtMp3lYrR+jQFQFLDvRyuRySyeRJ0BWBnhzoZ7NZ @@ -524,7 +512,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFeSURBVDhPjZC9S0JhFIfP5NzeGA25RFRQQzVGa+o/0FBB + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAFeSURBVDhPjZC9S0JhFIfP5NzeGA25RFRQQzVGa+o/0FBB EC0uLQ4FIVFIH6ANRoYK4v/hcsBoSrtIhJWJYvnJ9et0f4EtR1564YGXcx6ee3mJxpyAz+3yeDybXq93 B+CO2Tj3b3a1RpHLVWJwPEcPUf/eez5vCcAds9EerophmbvekvTuomQyj5LNPkmhUPwFd8ywgwNXBc5X iMU5sdi9BIOnEg7fSDyelFQqLdHbOwmFLiSRSEIRuCpwtkw8dJb94VCeLWss2MGBqwLBJeKeI9j9vhE4 @@ -536,7 +524,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAI3SURBVDhPjZJvSBphHMeP9XJ7Iwh764v14no1fdHCAtsS + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAI3SURBVDhPjZJvSBphHMeP9XJ7Iwh764v14no1fdHCAtsS bzlvLLmJjoGDmH+QIYOUuE5OpkMJfOOovXL0IodvwnqxsCQDWW3CXm6DCb1YVMRgbfQHVlbf3e+GcFLK nuPDPXCf7/fu4X4Mo1muWIx/KMu+yxBk+YbWvXQvTEz4fzUa2D48xObBAb7v76ssVKugZ05J6u5Y8kAU A7+Pj7G5t4dvu7v4srODz9vbyC8ughY958JhQ9sSPhoNHpyc4IfyVm3Jq9lZNOnmOKltgWNsLHSoFPw8 @@ -552,7 +540,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPrVM9SEJRFL6GgoGICoqEruqswxsFB8Uh1EUS + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAG8SURBVDhPrVM9SEJRFL6GgoGICoqEruqswxsFB8Uh1EUS C6HZoaG1uYSGlpawv0EzKWwwiIIukYPE03wkVCAOvSBrcPPhIqdzxB4YZosPPt7hfj/vnPvuZWzWT56x hVPG0kXG8ojKCHlaI27q9wqMLZ7Pz3NREOSvRKLH/f4B4RNr0euViSPNxJAcEiWTqdZJJpWPVArkZHIM tPa+tKSUDIYaacdCsthaQa/nzXhceY3F4DkSmYiXaBSawaCS0+k4edSQA5zvHluUwmF4CASm4jEUgmuP @@ -566,7 +554,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGbSURBVDhPrZGxSwJhGMbfb/c/uEUEEadzEiQQBBeRBqUl + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAGbSURBVDhPrZGxSwJhGMbfb/c/uEUEEadzEiQQBBeRBqUl bPIPEKdDvuXACJxrMJKgLWqQWiISwkEIQriIW5KWg+KIW1oKCvLrfb40VFQMOnh5732e3/vc93FE//EU i8X1QqFgrpIFDvwUWy6XJSqfzy8NgT9mpwKi0ah0HEeVSiWZyWTmhkCHDw787GlNiK7rKj6iTCQSUyGY ocMfLc/9iBmLxeRgMFC5XE4yqCF0zNDhs7T0mjrE8zyVTqelYRgb6JhXWdbXWuMvxONx6fu+ymazV91u @@ -579,7 +567,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPrdFPSJNxHMfx56iWRqCXHcq6xKrLRlRUXuwg + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAH1SURBVDhPrdFPSJNxHMfx56iWRqCXHcq6xKrLRlRUXuwg WcKKGB3yECnliGCu7aA4OpR1igbmYiiTUhiDUJbhchuCTDJHJXhQWdIfzYMzoqYt/+3d851tbhC0wB98 +PI8fPj+ePFTlO08xpaWmot2+7V8I/2c+w1NTddRTzKPSE/6OQvOWa2m9WSSSgdUtcF51+a8oM6rPWDy QHcEfBMgPennLDhjNt/4tbHBvZc/cY0k8byBp2PgfQvuV/A4DJHPEI2B9KSvZLtrbDZP/+gohlYrDU4H @@ -594,7 +582,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJrSURBVDhPjZJdSJNRGMfP1W7yQujDiy5T0mGWbanL1MhF + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAJrSURBVDhPjZJdSJNRGMfP1W7yQujDiy5T0mGWbanL1MhF WQrqprE5c3PpMpfoctkSXaFhgmapZWrZl6WVpgutMCQoQXNv+BGUSYjREOqmCDNR2L89J3xvXosO/HgP //Pwew7nfRhbZTnT5DKNRpOq1WotBO0pW61WzBrjWHNDLBOIynA23mbPn5ue/giC9pStnFOtREaHHy5n w3V8J4aHJzE2NoWZGQ+H9pTR2fsGI6hWIrgQw4S3dQbcyQpF66FA3MqUo8O8DfdztqPduAVt+s24awrD @@ -611,7 +599,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKVSURBVDhPY2CgBrCf93Km/dwXMSCzrOa8lgLycxzmvVxm + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAKVSURBVDhPY2CgBrCf93Km/dwXMSCzrOa8lgLycxzmvVxm N/fFGRAGsUFiIDms9tnOeHwGjGc+aXWc+3R/+q6Pj5svffo68c6//yAMYoPEnBY8P289+4kvhiGW0x6e mfn0/38Q3Xv99/+2C7/+t1/6/b/r6p//HZd//2859+t/6/lf/yff+/vfbeHTSxZTH6IaYtJ380zXlZ9A 2/78rzr06T+IHbz66R2QOAj7LH56J3/9+++1R778n3j7z3+baXfOG06+jvCOfueVM23nv/4v2v7q/4Tb @@ -628,7 +616,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKUSURBVDhPY2CgNrCa81rKft7LHId5L5fZzX1xBoRBbJAY + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAKUSURBVDhPY2CgNrCa81rKft7LHId5L5fZzX1xBoRBbJAY SA5kn/3cFzFA/kwMu61nP/F1WvD8fPquj4+bL336OvHOv/8gDGKDxBznPt1vO/NJq+2Mx2dAGMUAi6kP fd0WPr00+d7f/63nf/1vOffrf8fl3/+7rv75337p9/+2C7/+917//d9y2sMzM5/+B9NwAwwnX5eymXbn /MTbf/7XHvnyP3/9++8+i5/eMem7eQaEg1c/vdN15ef/qkOfgC768x/EBonDDdDvuJITv/H544p97/5n @@ -645,7 +633,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHMSURBVDhPtZO/SwJxGMabFHQQB6cCIzRClFAIvBpEKMEU + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAHMSURBVDhPtZO/SwJxGMabFHQQB6cCIzRClFAIvBpEKMEU FPEPcIuIpuCgqAYhJAgsJGhoMaI9cMpKMLnAE/xxkkVWJqeJuwQub/dIiqKDBAkP34fn+bzvHXfnxMR/ /fx+PyNp7VfMWNfxeDyLXq933eVyTeJst9vUarWoPwMzcpnT6VxiWfa42WxSIBDYcbvdG/V6jSB4ZOjA gB1a4nA4NiuVCvF8mmo1kWKx2KsoigTBl8vlTgcG7NACm8025fP59vP5HOVyWXp/f6Nq9bMjeGTowIAd @@ -659,7 +647,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAI3SURBVDhPY2CgOtDaIsFksCuF2WDnLEb9XdtAGMQGiTEA + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAI3SURBVDhPY2CgOtDaIsFksCuF2WDnLEb9XdtAGMQGiTEA 5fDax6y3w4PbfO9mx4ybt1I63n4srr/ypwiIQWz75Bu3QHIgNVgNYdbb4iFqs+9QfNfbz6ntr/8HFN1A wantr/7Ht736LARUA1KLaojGWklukx1b4tvuf46sfvDfK+fSf3RQ0nfrP0guquT+Z26TrVsYgHrghjBp rUu1ib9wO6zizn+/gmv/PbMv/p+46CoYbzv0DGzWnLUPwHLBpbf+G4WfvA3SAzeAUXXV3LDKu5/cM8// @@ -672,9 +660,6 @@ f1UAAAAASUVORK5CYII= - - 116, 54 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -687,7 +672,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFdSURBVDhPldO9K8VRHMdxSSklJRYGxIDyOCBE8pA85Slk + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAFdSURBVDhPldO9K8VRHMdxSSklJRYGxIDyOCBE8pA85Slk 8JAFkyIlg2KiFKFsBovBKGUwGmTHopRSovAfeL91SLqXe0+9+p1fv+/9nPP7nt9NSIg+0nhUFuT+URf1 UQ5PutGLciTGE5JMcTPWsYsRpMcTkEXxNM5wiWUUxxrgViuxhms84RA9SIklJIOiFmzgCs+4wBzsy7+j iIo2LOAAN3jEPuyL/Yk6UnnSgFZ4AvbhFK84D/f2J+rID6u4UkEI2+H6gHtsoQ5JkRJskD+cwAzswzD2 @@ -699,7 +684,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFdSURBVDhPldO9K8VRHMdxSSklJRYGxIDyOCBE8pA85Slk + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAFdSURBVDhPldO9K8VRHMdxSSklJRYGxIDyOCBE8pA85Slk 8JAFkyIlg2KiFKFsBovBKGUwGmTHopRSovAfeL91SLqXe0+9+p1fv+/9nPP7nt9NSIg+0nhUFuT+URf1 UQ5PutGLciTGE5JMcTPWsYsRpMcTkEXxNM5wiWUUxxrgViuxhms84RA9SIklJIOiFmzgCs+4wBzsy7+j iIo2LOAAN3jEPuyL/Yk6UnnSgFZ4AvbhFK84D/f2J+rID6u4UkEI2+H6gHtsoQ5JkRJskD+cwAzswzD2 @@ -766,7 +751,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEUSURBVDhPY2CgBnBN9+yHYbc0z+NgdoarGLqYe6q7EVCs + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAEUSURBVDhPY2CgBnBN9+yHYbc0z+NgdoarGLqYe6q7EVCs DCTulu5RB7fbM8X3Y/LU0m/OyZ73wZKpnueABgWADIufEv87a0rJf7hhSZ4vYZZQw/EQM+Cmp3vGwb0A 9ZZHpocesphLuocXUH07SA/cBSAnY3MiyPluaW4aIAPcgE4Hew+JjdUL//8z/MeFcfoZanI4yGnnrjP8 n76S4f+uYwz/8zogbBD+/JUBHpBQ9QEYXgA57+AZhv+hJRDNMAzigwyEhQXEa57HqesFWKgCE0g1WsIK @@ -805,7 +790,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACKSURBVDhPY2AYBeghoM3IyLgGB54OVCxGTJA5AQ1YD8JA + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAACKSURBVDhPY2AYBeghoM3IyLgGB54OVCxGTJA5AQ1YD8JA xTpQDRFQfgQxBugBFW8BYaBiPaiGKCg/ihgD9IGKd2LDQM36xBhgANS8H4SBij2A2ACI46Fiy4FsLkKG GAEVHwVhoEIjqGJsYjjN8QNqPgPCQBUmUFXIYir4XGAFlHyIBxcQcv5IlAcAm4MjD8DlZQQAAAAASUVO RK5CYII= @@ -814,7 +799,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABgSURBVDhPY2AYBfhCQJuRkXENMgYq1iY1yHSABqwH4h5S + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAABgSURBVDhPY2AYBfhCQJuRkXENMgYq1iY1yHSABqwH4h5S NcLU6wE1bwFydMk1IA1owAZyNTMANW8Fas4k1wAjoAFHgZoNyTIAqHkJEJ8BajYh1QAroIaHaBgkNgpw hAAAm8EOmTkm1pMAAAAASUVORK5CYII= @@ -822,7 +807,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADMSURBVDhPY2AYBfAQsJ/9zMN2zvOZhIIEpAakFkWdxZT7 + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAADMSURBVDhPY2AYBfAQsJ/9zMN2zvOZhIIEpAakFkWdxZT7 HhaT750BYUIGwNSB9IDV6rVd8NBrv3Sm58bf/yCaGGy68ztELVAvg3Ll4TMT7vz/33j2z/+OK3/+N5// +b/u1Pf/lUe//C/f//5/8a5X/3O2v/iftO3l/5Btb/+77vj0X3zt1//qu//8B+llkMja4SGWtRXsAhBN DAa5AKQOpBfsDb74lR48McvPgDChMICpA+lBUcseONuDLXAOwVgAqQGpJWTRqDwJIQAAilGdHbgOJisA @@ -832,7 +817,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEFSURBVDhPY2CgNqievPN/y9xj/8kyt2Xe8f83btwA44aZ + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAEFSURBVDhPY2CgNqievPN/y9xj/8kyt2Xe8f83btwA44aZ B0k3JDa/5z8MxBf2k25A5/xDcBc0TlpDmgHItsNckVA0AcWQpUd//E+vnv3fK7Lgf82U3agWYDMAJAYK TJDiqJyO/6GpDf89wnL/57cs/7/k8DfiDABp9o0p+W/jHvXfwjkUzK6atAPTeyXd6//H5HUjArGg+39G 9Zz/PlFF/03tA/6b2Pn/t/GIBrsEZxSnVs6AGxCV3f4/rrAPrBGEHXwS/ieXTcUfsMjhAGKDNIKcnVY5 @@ -843,30 +828,30 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG4SURBVDhPY2AYWmCNhDzDKtEzDCtFPUh3+Hx+AYZlIhvS + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAG2SURBVDhPY2AYWmCNhDzDKtEzDCtFPUh3+Hx+AYZlIhvS 3pX/Z1gucoZhGSmGrGJgY1gsPE/nmP3TqEfZ/+Pvx/9mWAQ0hCjwn4GRYb5wq8JWo3sBNxL/e1/1+cWz - XO4Sw0IRH1T9swU9GGYLngFiVP/NFsgUWKZ8w21++D/7/fZ/+ZcoXmOYK5SMqnkKUNN0wTP2+53/gmgG - EB8Epgn4cMyVuCw/X/63Wr35P74F8rcYpgtUY7p8Ev8Zn6e5vzwuRP6PuJL5hwHIZ5jIl8s0VfC00GKT - H4qbjP5zz5a+DxTrYahnYMI0oJfPg6GX54z9zfifSnuM/5udCPgB4kttkv8svUPnP98iuScMPXzzgJo5 - cIdbG9CQdp4zWqecv0kc1vyvccbyv/ghjf/8i+VeMbTyrmPoB0YjQdDM5cHQxH1G+oDSF+GzKv/Zt4m/ - Z2zk2c3QwilNUC9cQQS7B0MB+xnWBQIvGMvYjjCEs2kSoxkUMPxALA/EugxGTGkM8UxnGLQYQoF8kAFK - QCwFxMJAzAPEbEDMiGwwiAMKIJA/xaGKJaFsUSAtCMS8QMwF1cyMbgAxrsSqBgBak4YA10f9zAAAAABJ - RU5ErkJggg== + XO4Sw0IRH1T9swU9GGYLngFiVP/NFsgUWKZ8w603/J/9fvu//EsUrzHMFUpG1TwFqGm64BmQAhDNAOKD + wDQBH465Epfl58v/Vqs3/8e3QP4Ww3SBakyXT+I/4/M095fHhcj/EVcy/zAA+QwT+XKZpgqeFlps8kNx + k9F/7tnS94FiPQz1DEyYBvTyeTD08pyxvxn/U2mP8X+zEwE/QHypTfKfpXfo/OdbJPeEoYdvHlAzB+5w + awMa0s5zRuuU8zeJw5r/Nc5Y/hc/pPGff7HcK4ZW3nUM/cBoJAiauTwYmrjPSB9Q+iJ8VuU/+zbx94yN + PLsZWjilCeqFK4hg92AoYD/DukDgBWMZ2xGGcDZNYjSDAoYfiOWBWJfBiCmNIZ7pDIMWQyiQDzJACYil + gFgYiHmAmA2IGZENBnFAAQTypzhUsSSULQqkBYGYF4i5oJqZ0Q0gxpVY1QAAJuuF6gTRvEgAAAAASUVO + RK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIMSURBVDhPrZI9SCNRFIWvY2RUAskQ8qOIFjbiYqEELJNG - SJNGsBEbiZ2ihQEbF3FBY2CLNFr4V5kYBRVRUWymUFAkQdFdYWzHLYJFCkEZFJ/3hJ0H0WDlwIE3757z - 3TvvDdF3Pxmixg2ikU2iDOv0vzLYQ+3Lflmi6FZdnZ7r7jYLQ0PW0+iogAqxmJXr6jJRg6ciJM2FHbc7 - LyYmxPPYmFj2+42Eql5CWJ/19BQfh4fFjtOZh7cMssyjZWtr9dd4XLyMj4uVpiZjimhyjsgFTROF+H1z - u739vjA4KNI1NToyErLK33fCIz7EYqUwOnEgx4rYplkiDyCHwWDxuK3NREYCFonWjVDISrndpc4I/xsY - +ATBJElVNY69XgsZCZjn0/4bjYoZRbnEyOgMyHU4XAZB7Rd7DlpaBDISkOKXq0hEoAgTCjbkorNTQmzA - UUODQEYCfvM4ejBopaqrDYxpF2zIWWurDZmE58jjsZCRACaPZH0+c1/TijgoHNhHyHkgUILsqmpxzeEw - kZGAJF9JsqpKv2luFun6+ntAMIl9jfbBLmnaW07TBLzIlP0LP/nnSChK/tbrFYfcZYFHneUzgbDG3h8O - wwNvxb+xlwtxpq/yiLrLZd1xAMIae6jBUyns4E0/60eArzBMlOgj2usnOoewxh5q7Olg8ZKQkY/CKyfL - x8K3fSU0ghcZegfkk+bpTvG6RAAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAIOSURBVDhPrZI9SCNRFIWvY2RUAskQ8qOIFjbisoUSSJk0 + Qpo0CzZiE5JO0cKAjcuyCxoDFmm0ELUyMQq7sqgY0kyhoEiC4h+M7WgRLFIs7DLs4tt7gvMgGqwcOPDm + 3XO+e+e9IXrvJ0/UvU00uUOUZx0/K4891N7sVyCKfe/o0MuhkFlNJq3fU1MCqiYSVnl42EQNnqaQHBd2 + 3e6KmJ0Vf6anxZrfb6RV9RzC+mRkpPZrYkLsOp0VeBsgazxaob1d/5dKib8zM2K9p8f4QjS3SOSCvhKF + +X3nx+DgfTUeF7m2Nh0ZCdng7zviER8TiXoYnThQZkVt0wKRB5DDYLBWGhgwkZGAVaItIxy2sm53vTPC + D+PjryCYJKOqRsnrtZCRgGU+7ZtYTMwryjlGRmdALiORBghq39hz0NcnkJGALL9cRKMCRZhQsCFnQ0MS + YgOKXV0CGQlY4nH0YNDKtrYaGNMu2JCT/n4bMgdP0eOxkJEAJk8WfD5zX9NqOCgc2EvIaSBQh/xU1dqm + w2EiIwEZvpJMS4t+1dsrcp2d94BgEvsa7YPNaNpTWdMEvMg0/Auf+edIK0rl1usVh9xlhUdd4DOBsMbe + NYfhgbfp3/iJCymmb/CIustl3XEAwhp7qMHTLOzgTT/rQ4CvMEKUHiXaGyM6hbDGHmrs+cjiJSEjH4VX + TpaPhW97S2gELzL0H9Dj5tei7xUOAAAAAElFTkSuQmCC @@ -881,6 +866,82 @@ IOYFBf/9IzP/jT+zZw/Woa9yPwAAAABJRU5ErkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAoklEQVQ4T7XTywqCQBSA4ZlH + b92qR2id2UXJIiQiIsRN7lz6JtN/oIkpDhKjCh8O6LnCGOecGWJQsBT+JLDWzrBCgjU22GKHDDkOOGLu + uw4TGD78TUsgVdOeql/JJ+lAZt0HsxacTzijxAVX3HCfpAPZcF/VcXZg3o82gjorXT1QoUZDfIsuage+ + ury1BAu/4Z+qT/5fhsFqgtgLNd5liu3gBRRIn3FPTkzqAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAoklEQVQ4T7WTywqDMBBFk093 + 7da/qGJf+ECklFJK6abddemfxBNwithGSqLCYQKSOXMHoowxKoSgy1b8aaC1jmADKWSQwxZ2cIAjFFBB + LFOPGyh+/M1cA5e1RtCIZJUJbNb9KGvJWawt5xOc4QLXVSaQBTqtmG/BO1DD9yuC3fBX1sF6pz7gxf03 + dF47ELutcw2SifUpVmrqjOD7oJZ7TL4T9ELIn+co5cQOAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAqklEQVQ4T7WTzQqCQBRG7zy6 + 6x7Ah0gpLfohIiJEoha1a+muTe8wngkcJrUYxhQOjsp857vCiNZahjBosxHbAKVUBFNIIIUZzCGDBSxh + BRuYNK3dAOGDNz4BbesWwQ72cPAJ+NmmL8DMmjuzrll/WHk+wgmKURq0K79nda2sSzjDdZQG9g9/sV54 + fxeRB1RBDdhoL5+AGKOx3hor9ye8IO8EhB6o/x2m0AY1iSqgdYRW23EAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABDElEQVQ4T2P4//8/AyWYIs0g + i+EGMDIyMuDC0sq2DCltb5DxfxCfaANABuvaFTJEVj+E4f8gNkkGgAzxyrkIw/9BbJINkNNPZLCKOQDC + /0E0ugGNQFtWA/FaIF4HxBuAeBMQbwXi7UDcA3KFjt8mEP4Pokl2AZeQDoOK22oQ/g+i0Q1YD7RhIxBv + htq6A0jvBuJ9sNgRUg5nUHJZC8L/QTQZLtBlUPfcAcL/QTS6ASC/Itt6EMg/AsQngPgMEF/hEzNlMAm7 + wKAfeOI/iCbJBQxAoO2yhMEi6uZ/IH4AotEN6AfaArL1KMxWoJ6rQLwcpBkErGLuMtjGP3RwTH7+H0Sj + GEBuhqJeZiLXBQDC0LFONyaX7QAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABLUlEQVQ4T2P4//8/AyUYrpmR + kZEBHzZ2KWdIbX8Lw/9BbJDFRBsAMjym7jEM/wexSTZA0yqHIaDoOgj/B9HoBjQCbVkNxGuBeB0QbwDi + TUC8FYi3A3GPrF48g03cQQanlBP/QTTJLtBw7GYwDd/1H4gfgGh0A9YDbdkIxJuhtu4A0ruBeB8scNXs + uxj0A7c6aPls+A+iSXYBAxBoem9mUHVfC6bRDQD5FdnWg0D+ESA+AcRngPgKp5Aug7LrBgcll7X/QTRJ + LgDZLmPWCbR9638gfgCi0Q3oB9oCsvUozFagnqtAvBykGQTUPLYzaHjtZtD2PfgfRBN0AUwjiOYTM2Uw + Dj0Pw/9BbJIMsI69y4CE/4PYRBugaFTK4Jj8Ehn/B/FRDCA3R1KUlUGWAgAiG3UaYBp/hAAAAABJRU5E + rkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABDUlEQVQ4T2P4//8/AyWYIs0g + i+EGMDIyNgLxaiBeC8TrgHgDEG8C4q1AvB2Ie/QdihniG587pLS9+Q+i0Q1gACrCi51jVjBEVj/8D8QP + QDS6AeuBBmwE4s1QW3cA6d1AvA9msGPUMoagkpsMXjkX/4Nokl0gIGHIYBVzAIT/g2h0A0B+Rbb1IJB/ + BIhPAPEZIL7CAAQ6fptA+D+IJskFIM2cgtoMKm6rQfg/iEY3oB9oC8jWozBbgXquAvFykGYQkDJuZlBy + WQvC/0E0QRfANIJoLmF9BnXPHTD8H8QmyQD9wBMMSPg/iE20ATK6uQwWUTeR8X8Qn2gDHJOfM6Dh/yA+ + igHkZijqZSZyXQAA4IG1TpHFZ2gAAAAASUVORK5CYII= + + + + 551, 17 + + + 17, 54 + + + 662, 17 + + + 452, 17 + + + 116, 54 + 17, 17 diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj index 48a959521..78e88fd2b 100644 --- a/Greenshot/Greenshot.csproj +++ b/Greenshot/Greenshot.csproj @@ -75,6 +75,7 @@ + diff --git a/Greenshot/Languages/language-de-DE.xml b/Greenshot/Languages/language-de-DE.xml index f7bbf6e0c..1916b52d2 100644 --- a/Greenshot/Languages/language-de-DE.xml +++ b/Greenshot/Languages/language-de-DE.xml @@ -5,18 +5,18 @@ Wenn Sie Greenshot mögen, können Sie uns gerne unterstützen: Greenshot wird von sourceforge.net gehostet unter Icons aus Yusuke Kamiyamane's Fugue icon set (Creative Commons Attribution 3.0 license) - Copyright (C) 2007-2012 Thomas Braun, Jens Klingen, Robin Krom -Für Greenshot besteht KEINERLEI GARANTIE. Greenshot ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. + Copyright (C) 2007-2012 Thomas Braun, Jens Klingen, Robin Krom +Für Greenshot besteht KEINERLEI GARANTIE. Greenshot ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. Detaillierte Informationen zur GNU General Public License: Über Greenshot Greenshot - das revolutionäre Screenshot-Tool Schließen - Tut uns leid, ein unerwarteter Fehler ist aufgetreten. -Die gute Nachricht ist: Sie können uns helfen, ihn zu beseitigen, indem Sie uns einen Fehlerbericht zukommen lassen. -Besuchen Sie die unten stehende URL und erstellen Sie einen neuen Fehlerbericht. -Bitte geben Sie eine aussgekräftige Zusammenfassung an, fügen Sie den Inhalt des Textfelds in die Beschreibung ein, und ergänzen Sie diese mit zusätzlichen -Informationen, die für das Nachvollziehen des Fehlers hilfreich sein könnten. -Wir wären sehr dankbar, wenn Sie vorher prüfen würden, ob dieser Fehler schon gemeldet wurde - nutzen Sie einfach die Suche, um bestehende Fehlerberichte + Tut uns leid, ein unerwarteter Fehler ist aufgetreten. +Die gute Nachricht ist: Sie können uns helfen, ihn zu beseitigen, indem Sie uns einen Fehlerbericht zukommen lassen. +Besuchen Sie die unten stehende URL und erstellen Sie einen neuen Fehlerbericht. +Bitte geben Sie eine aussgekräftige Zusammenfassung an, fügen Sie den Inhalt des Textfelds in die Beschreibung ein, und ergänzen Sie diese mit zusätzlichen +Informationen, die für das Nachvollziehen des Fehlers hilfreich sein könnten. +Wir wären sehr dankbar, wenn Sie vorher prüfen würden, ob dieser Fehler schon gemeldet wurde - nutzen Sie einfach die Suche, um bestehende Fehlerberichte schnell zu finden. Vielen Dank :) Fehler Abbrechen @@ -60,6 +60,14 @@ schnell zu finden. Vielen Dank :) Schnelleinstellungen Einstellungen... Fehler beim Exportieren nach '{0}'. Bitte wiederholen Sie den Vorgang. + Unten + Mitte + Horizontale Ausrichtung + Links + Mitte + Rechts + Oben + Vertikale Ausrichtung Anordnen Pfeilspitzen Beide @@ -147,7 +155,7 @@ schnell zu finden. Vielen Dank :) Outlook mit Text Fehler Greenshot läuft bereits. - Konnte Datei nicht nach {0} speichern. + Konnte Datei nicht nach {0} speichern. Bitte überprüfen Sie die Schreibrechte oder wählen Sie einen anderen Speicherort. Die Datei "{0}" konnte nicht geöffnet werden. Konnte Link '{0}' nicht öffnen. @@ -207,23 +215,23 @@ Bitte überprüfen Sie die Schreibrechte oder wählen Sie einen anderen Speicher Internet Explorer abfotografieren JPEG-Qualität Sprache - Die folgenden Platzhalter werden im festgelegten Muster automatisch ersetzt: -${YYYY} Jahr, 4-stellig -${MM} Monat, 2-stellig -${DD} Tag, 2-stellig -${hh} Stunde, 2-stellig -${mm} Minute, 2-stellig -${ss} Sekunde, 2-stellig -${NUM} inkrementierende Zahl, 6-stellig -${title} Fenstertitel -${user} Windows-Benutzername -${domain} Windows-Domäne -${hostname} Computername - -Greenshot kann auch Verzeichnisse dynamisch erstellen. -Verwenden Sie das Backslash-Symbol \ um Verzeichnisse vom Dateinamen zu trennen. -Zum Beispiel: ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss} -Dieses Muster legt ein Verzeichnis für den aktuellen Tag im Standard-Speicherort an und speichert die Bilddateien im Uhrzeit-Format, mit der vorgegebenen Dateiendung ab. + Die folgenden Platzhalter werden im festgelegten Muster automatisch ersetzt: +${YYYY} Jahr, 4-stellig +${MM} Monat, 2-stellig +${DD} Tag, 2-stellig +${hh} Stunde, 2-stellig +${mm} Minute, 2-stellig +${ss} Sekunde, 2-stellig +${NUM} inkrementierende Zahl, 6-stellig +${title} Fenstertitel +${user} Windows-Benutzername +${domain} Windows-Domäne +${hostname} Computername + +Greenshot kann auch Verzeichnisse dynamisch erstellen. +Verwenden Sie das Backslash-Symbol \ um Verzeichnisse vom Dateinamen zu trennen. +Zum Beispiel: ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss} +Dieses Muster legt ein Verzeichnis für den aktuellen Tag im Standard-Speicherort an und speichert die Bilddateien im Uhrzeit-Format, mit der vorgegebenen Dateiendung ab. z.B. C:\Users\MaxMustermann\Desktop\2012-08-13\12-58-32.png Netzwerk und Aktualisierungen Ausgabe @@ -247,7 +255,7 @@ z.B. C:\Users\MaxMustermann\Desktop\2012-08-13\12-58-32.png Muster, das beim Speichern von Screenshots zum Generieren von Dateinamen verwendet wird Sprache der Benutzeroberfläche Standard Bildformat - Legt fest ob beim Programmstart die Tastenkombinationen Drucken, Strg + Drucken, Alt + Drucken beim Betriebssystem zur globalen + Legt fest ob beim Programmstart die Tastenkombinationen Drucken, Strg + Drucken, Alt + Drucken beim Betriebssystem zur globalen Verwendung durch Greenshot reserviert werden, bis das Programm geschlossen wird. Standardpfad für Bildschirmausdrucke. Leer lassen für Desktop. Standard-Proxyserver des Betriebssystems verwenden @@ -259,10 +267,10 @@ Verwendung durch Greenshot reserviert werden, bis das Programm geschlossen wird. Eine neuere Greenshot Version steht zur Verfügung. Wollen Sie Greenshot {0} herunterladen? Bitte warten Sie während die Seite im Internet Explorer abfotografiert wird... Hinweis - Die globale Tastenkombination "{0}" konnten nicht aktiviert werden. -Vermutlich wurde dieselbe Tastenkombination bereits von einem anderen Programm reserviert. -Sie können die Tastenkombinationen für Greenshot ändern, oder das Programm das die Tastenkombination verwendet deaktivieren. - + Die globale Tastenkombination "{0}" konnten nicht aktiviert werden. +Vermutlich wurde dieselbe Tastenkombination bereits von einem anderen Programm reserviert. +Sie können die Tastenkombinationen für Greenshot ändern, oder das Programm das die Tastenkombination verwendet deaktivieren. + Sie können aber auch alle Greenshot-Funktionen über das Kontextmenü des Greenshot-Icons im Infobereich verwenden. Benutzerdefinierte Farbe verwenden Transparenz erhalten diff --git a/Greenshot/Languages/language-de-x-franconia.xml b/Greenshot/Languages/language-de-x-franconia.xml index 2ddb22bc5..469cb935f 100644 --- a/Greenshot/Languages/language-de-x-franconia.xml +++ b/Greenshot/Languages/language-de-x-franconia.xml @@ -58,6 +58,14 @@ Dangschee, wassd scho :) Zaggich rumdogdern Rumdogdern... Scheiße, des war nix '{0}'. Brobiers hald nochamal. + Undn + Middich + Lings/Rechds ausrichdna + Lings + Middich + Rechds + Ohm + Ohm/Undn ausrichdna Anordnen Bfeilschbidzn Beide diff --git a/Greenshot/Languages/language-en-US.xml b/Greenshot/Languages/language-en-US.xml index f1c90bf73..473045111 100644 --- a/Greenshot/Languages/language-en-US.xml +++ b/Greenshot/Languages/language-en-US.xml @@ -5,29 +5,29 @@ If you like Greenshot, you are welcome to support us: Greenshot is hosted by sourceforge.net at Icons from Yusuke Kamiyamane's Fugue icon set (Creative Commons Attribution 3.0 license) - Copyright (C) 2007-2012 Thomas Braun, Jens Klingen, Robin Krom -Greenshot comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions. + Copyright (C) 2007-2012 Thomas Braun, Jens Klingen, Robin Krom +Greenshot comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions. Details about the GNU General Public License: About Greenshot Greenshot - the revolutionary screenshot utility Close - Sorry, an unexpected error occured. - -The good news is: you can help us getting rid of it by filing a bug report. -Please visit the URL below, create a new bug report and paste the contents from the text area into the description. - -Please add a meaningful summary and enclose any information you consider to be helpful for reproducing the issue. + Sorry, an unexpected error occured. + +The good news is: you can help us getting rid of it by filing a bug report. +Please visit the URL below, create a new bug report and paste the contents from the text area into the description. + +Please add a meaningful summary and enclose any information you consider to be helpful for reproducing the issue. Also, we would highly appreciate if you checked whether a tracker item already exists for this bug. (You can use the search to find those quickly.) Thank you :) Error Cancel An unexpected error occured while writing to the clipboard. Greenshot wasn't able to write to the clipboard as the process {0} blocked the access. Couldn't find a clipboard image. + Windows Bitmap Device Independend Bitmap (DIB) HTML HTML with inline images PNG - Windows Bitmap Alpha Apply Blue @@ -62,6 +62,14 @@ Also, we would highly appreciate if you checked whether a tracker item already e Quick preferences Preferences... Error while exporting to {0}. Please try again. + Bottom + Center + Horizontal alignment + Left + Middle + Right + Top + Vertical alignment Arrange Arrow heads Both @@ -96,11 +104,11 @@ Also, we would highly appreciate if you checked whether a tracker item already e Draw line (L) Draw rectangle (R) Add textbox (T) - Dropshadow settings - Shadow thickness - Shadow offset - Shadow darkness - Duplicate selected element + Shadow darkness + Shadow offset + Dropshadow settings + Shadow thickness + Duplicate selected element Edit Effects E-Mail @@ -133,25 +141,25 @@ Also, we would highly appreciate if you checked whether a tracker item already e Print Redo {0} Reset size + Percent + Pixels Rotate counter clockwise (Control + ,) Rotate clockwise (Control + .) Save Save objects to file Save as... - Pixels - Percent - Select all + Select all Print job was sent to '{0}'. Drop shadow Image stored to clipboard. Line thickness Greenshot image editor Torn edge - Torn edges settings - Tooth size - Horizontal tooth range - Vertical tooth range - Undo {0} + Horizontal tooth range + Torn edges settings + Tooth size + Vertical tooth range + Undo {0} Up one level Up to top MAPI client @@ -159,7 +167,7 @@ Also, we would highly appreciate if you checked whether a tracker item already e Outlook with text Error An instance of Greenshot is already running. - Cannot save file to {0}. + Cannot save file to {0}. Please check write accessibility of the selected storage location. The file "{0}" could not be opened. Could not open link '{0}'. @@ -219,22 +227,22 @@ Please check write accessibility of the selected storage location. Internet Explorer capture JPEG quality Language - The following placeholders will be replaced automatically in the pattern defined: -${YYYY} year, 4 digits -${MM} month, 2 digits -${DD} day, 2 digits -${hh} hour, 2 digits -${mm} minute, 2 digits -${ss} second, 2 digits -${NUM} incrementing number, 6 digits -${title} Window title -${user} Windows user -${domain} Windows domain -${hostname} PC name - -You can also have Greenshot create directories dynamically, simply use the backslash symbol (\) to separate folders and filename. -Example: the pattern ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss} -will generate a folder for the current day in your default storage location, e.g. 2008-06-29, the contained screenshot file's name will be based on the current + The following placeholders will be replaced automatically in the pattern defined: +${YYYY} year, 4 digits +${MM} month, 2 digits +${DD} day, 2 digits +${hh} hour, 2 digits +${mm} minute, 2 digits +${ss} second, 2 digits +${NUM} incrementing number, 6 digits +${title} Window title +${user} Windows user +${domain} Windows domain +${hostname} PC name + +You can also have Greenshot create directories dynamically, simply use the backslash symbol (\) to separate folders and filename. +Example: the pattern ${YYYY}-${MM}-${DD}\${hh}-${mm}-${ss} +will generate a folder for the current day in your default storage location, e.g. 2008-06-29, the contained screenshot file's name will be based on the current time, e.g. 11_58_32 (plus extension defined in the settings) Network and updates Output @@ -269,8 +277,8 @@ time, e.g. 11_58_32 (plus extension defined in the settings) A newer version of Greenshot is available! Do you want to download Greenshot {0}? Please wait while the page in Internet Explorer is captured... Warning - The hotkey(s) "{0}" could not be registered. This problem is probably caused by another tool claiming usage of the same hotkey(s)! You could either change your hotkey settings or deactivate/change the software making use of the hotkey(s). - + The hotkey(s) "{0}" could not be registered. This problem is probably caused by another tool claiming usage of the same hotkey(s)! You could either change your hotkey settings or deactivate/change the software making use of the hotkey(s). + All Greenshot features still work directly from the tray icon context menu without hotkeys. Use custom color Preserve transparency diff --git a/Greenshot/icons/fugue/edit-alignment-center.png b/Greenshot/icons/fugue/edit-alignment-center.png new file mode 100644 index 000000000..8be29aaa1 Binary files /dev/null and b/Greenshot/icons/fugue/edit-alignment-center.png differ diff --git a/Greenshot/icons/fugue/edit-alignment-right.png b/Greenshot/icons/fugue/edit-alignment-right.png new file mode 100644 index 000000000..9a5094eb9 Binary files /dev/null and b/Greenshot/icons/fugue/edit-alignment-right.png differ diff --git a/Greenshot/icons/fugue/edit-alignment.png b/Greenshot/icons/fugue/edit-alignment.png new file mode 100644 index 000000000..341cebf1a Binary files /dev/null and b/Greenshot/icons/fugue/edit-alignment.png differ diff --git a/Greenshot/icons/fugue/edit-vertical-alignment-middle.png b/Greenshot/icons/fugue/edit-vertical-alignment-middle.png new file mode 100644 index 000000000..e65cfa4d7 Binary files /dev/null and b/Greenshot/icons/fugue/edit-vertical-alignment-middle.png differ diff --git a/Greenshot/icons/fugue/edit-vertical-alignment-top.png b/Greenshot/icons/fugue/edit-vertical-alignment-top.png new file mode 100644 index 000000000..d57850100 Binary files /dev/null and b/Greenshot/icons/fugue/edit-vertical-alignment-top.png differ diff --git a/Greenshot/icons/fugue/edit-vertical-alignment.png b/Greenshot/icons/fugue/edit-vertical-alignment.png new file mode 100644 index 000000000..d17f66921 Binary files /dev/null and b/Greenshot/icons/fugue/edit-vertical-alignment.png differ diff --git a/Greenshot/releases/additional_files/readme.template.txt b/Greenshot/releases/additional_files/readme.template.txt index 971a92dfb..e6b7d3674 100644 --- a/Greenshot/releases/additional_files/readme.template.txt +++ b/Greenshot/releases/additional_files/readme.template.txt @@ -35,6 +35,7 @@ Features: * General: Better Windows 8 integration: Capture window from list now has the apps and the interactive window capture is not confused by apps or the app launcher. * General: Added Special-Folder support for the OutputPath/Filenames, now one can use the following values: MyPictures, MyMusic, MyDocuments, Personal, Desktop, ApplicationData, LocalApplicationData. Meaning one can now set the output path to e.g. ${MyPictures} * Editor: The capture is now displayed in the center of the editor, the code for this was supplied by Viktar Karpach. +* Editor: Added horizontal and vertical alignment for text boxes. * Plug-in: Added Photobucket plugin * Plug-in: Removed unneeded code from the Confluence Plug-in, this makes the Greenshot installer / .zip a bit smaller.