diff --git a/Greenshot/App.config b/Greenshot/App.config index 163c4c3a2..8a6b9a032 100644 --- a/Greenshot/App.config +++ b/Greenshot/App.config @@ -1,8 +1,6 @@ - - diff --git a/Greenshot/Drawing/ArrowContainer.cs b/Greenshot/Drawing/ArrowContainer.cs index 2fa92d85c..f5a942411 100644 --- a/Greenshot/Drawing/ArrowContainer.cs +++ b/Greenshot/Drawing/ArrowContainer.cs @@ -86,6 +86,8 @@ namespace Greenshot.Drawing { } using (Pen pen = new Pen(lineColor, lineThickness)) { SetArrowHeads(heads, pen); + graphics.Flush(FlushIntention.Sync); + graphics.SmoothingMode = SmoothingMode.None; graphics.DrawLine(pen, Left, Top, Left + Width, Top + Height); } } diff --git a/Greenshot/Drawing/LineContainer.cs b/Greenshot/Drawing/LineContainer.cs index 8b0393cf3..0e0845393 100644 --- a/Greenshot/Drawing/LineContainer.cs +++ b/Greenshot/Drawing/LineContainer.cs @@ -92,6 +92,8 @@ namespace Greenshot.Drawing { } using (Pen pen = new Pen(lineColor, lineThickness)) { + graphics.Flush(FlushIntention.Flush); + graphics.SmoothingMode = SmoothingMode.None; graphics.DrawLine(pen, Left, Top, Left + Width, Top + Height); } } diff --git a/Greenshot/Drawing/TextContainer.cs b/Greenshot/Drawing/TextContainer.cs index 1a6d4655a..4bb5ebdf6 100644 --- a/Greenshot/Drawing/TextContainer.cs +++ b/Greenshot/Drawing/TextContainer.cs @@ -247,7 +247,7 @@ namespace Greenshot.Drawing { rect = GuiRectangle.GetGuiRectangle(Left, Top, Width, Height); int pixelsAfter = rect.Width * rect.Height; - float factor = pixelsAfter / pixelsBefore; + float factor = pixelsAfter / (float)pixelsBefore; float fontSize = GetFieldValueAsFloat(FieldType.FONT_SIZE); fontSize *= factor; diff --git a/Greenshot/Forms/MainForm.Designer.cs b/Greenshot/Forms/MainForm.Designer.cs index d9f948c44..335f922d6 100644 --- a/Greenshot/Forms/MainForm.Designer.cs +++ b/Greenshot/Forms/MainForm.Designer.cs @@ -80,32 +80,32 @@ namespace Greenshot { // contextMenu // this.contextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.contextmenu_capturearea, - this.contextmenu_capturelastregion, - this.contextmenu_capturewindow, - this.contextmenu_capturefullscreen, - this.contextmenu_captureie, - this.toolStripListCaptureSeparator, - this.contextmenu_capturewindowfromlist, - this.contextmenu_captureiefromlist, - this.toolStripOtherSourcesSeparator, - this.contextmenu_captureclipboard, - this.contextmenu_openfile, - this.toolStripOpenFolderSeparator, - this.contextmenu_openrecentcapture, - this.toolStripPluginSeparator, - this.contextmenu_quicksettings, - this.contextmenu_settings, - this.toolStripMiscSeparator, - this.contextmenu_help, - this.contextmenu_donate, - this.contextmenu_about, - this.toolStripCloseSeparator, - this.contextmenu_exit}); + this.contextmenu_capturearea, + this.contextmenu_capturelastregion, + this.contextmenu_capturewindow, + this.contextmenu_capturefullscreen, + this.contextmenu_captureie, + this.toolStripListCaptureSeparator, + this.contextmenu_capturewindowfromlist, + this.contextmenu_captureiefromlist, + this.toolStripOtherSourcesSeparator, + this.contextmenu_captureclipboard, + this.contextmenu_openfile, + this.toolStripOpenFolderSeparator, + this.contextmenu_openrecentcapture, + this.toolStripPluginSeparator, + this.contextmenu_quicksettings, + this.contextmenu_settings, + this.toolStripMiscSeparator, + this.contextmenu_help, + this.contextmenu_donate, + this.contextmenu_about, + this.toolStripCloseSeparator, + this.contextmenu_exit}); this.contextMenu.Name = "contextMenu"; + this.contextMenu.Size = new System.Drawing.Size(171, 392); this.contextMenu.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.ContextMenuClosing); this.contextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuOpening); - this.contextMenu.Renderer = new Greenshot.Controls.ContextMenuToolStripProfessionalRenderer(); // // contextmenu_capturearea // @@ -203,7 +203,7 @@ namespace Greenshot { // contextmenu_quicksettings // this.contextmenu_quicksettings.Name = "contextmenu_quicksettings"; - this.contextmenu_quicksettings.Size = new System.Drawing.Size(170, coreConfiguration.IconSize.Height + 8); + this.contextmenu_quicksettings.Size = new System.Drawing.Size(170, 22); // // contextmenu_settings // @@ -276,6 +276,7 @@ namespace Greenshot { this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFormFormClosing); this.contextMenu.ResumeLayout(false); this.ResumeLayout(false); + } private GreenshotPlugin.Controls.GreenshotToolStripMenuItem contextmenu_captureiefromlist; private System.Windows.Forms.ToolStripSeparator toolStripOtherSourcesSeparator; diff --git a/Greenshot/Forms/MainForm.cs b/Greenshot/Forms/MainForm.cs index 89f065b48..7ba91b731 100644 --- a/Greenshot/Forms/MainForm.cs +++ b/Greenshot/Forms/MainForm.cs @@ -748,7 +748,7 @@ namespace Greenshot { } var now = DateTime.Now; - if ((now.Month == 12 && now.Day > 19 && now.Day < 27) || // christmas + if ((now.Month == 12 && now.Day > 14 && now.Day < 27) || // christmas (now.Month == 3 && now.Day > 13 && now.Day < 21)) { // birthday var resources = new ComponentResourceManager(typeof(MainForm)); contextmenu_donate.Image = (Image)resources.GetObject("contextmenu_present.Image"); diff --git a/Greenshot/Forms/PrintOptionsDialog.Designer.cs b/Greenshot/Forms/PrintOptionsDialog.Designer.cs index a32716dcc..7f7253cb3 100644 --- a/Greenshot/Forms/PrintOptionsDialog.Designer.cs +++ b/Greenshot/Forms/PrintOptionsDialog.Designer.cs @@ -48,251 +48,252 @@ namespace Greenshot.Forms /// private void InitializeComponent() { - this.checkbox_dontaskagain = new GreenshotPlugin.Controls.GreenshotCheckBox(); - this.checkboxAllowShrink = new GreenshotPlugin.Controls.GreenshotCheckBox(); - this.checkboxAllowEnlarge = new GreenshotPlugin.Controls.GreenshotCheckBox(); - this.checkboxAllowCenter = new GreenshotPlugin.Controls.GreenshotCheckBox(); - this.checkboxAllowRotate = new GreenshotPlugin.Controls.GreenshotCheckBox(); - this.button_ok = new GreenshotPlugin.Controls.GreenshotButton(); - this.checkboxDateTime = new GreenshotPlugin.Controls.GreenshotCheckBox(); - this.button_cancel = new GreenshotPlugin.Controls.GreenshotButton(); - this.checkboxPrintInverted = new GreenshotPlugin.Controls.GreenshotCheckBox(); - this.radioBtnGrayScale = new GreenshotPlugin.Controls.GreenshotRadioButton(); - this.radioBtnMonochrome = new GreenshotPlugin.Controls.GreenshotRadioButton(); - this.groupBoxPrintLayout = new GreenshotPlugin.Controls.GreenshotGroupBox(); - this.groupBoxColors = new GreenshotPlugin.Controls.GreenshotGroupBox(); - this.radioBtnColorPrint = new GreenshotPlugin.Controls.GreenshotRadioButton(); - this.groupBoxPrintLayout.SuspendLayout(); - this.groupBoxColors.SuspendLayout(); - this.SuspendLayout(); - // - // checkbox_dontaskagain - // - this.checkbox_dontaskagain.AutoSize = true; - this.checkbox_dontaskagain.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkbox_dontaskagain.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkbox_dontaskagain.LanguageKey = "printoptions_dontaskagain"; - this.checkbox_dontaskagain.Location = new System.Drawing.Point(25, 299); - this.checkbox_dontaskagain.Name = "checkbox_dontaskagain"; - this.checkbox_dontaskagain.Size = new System.Drawing.Size(240, 17); - this.checkbox_dontaskagain.TabIndex = 15; - this.checkbox_dontaskagain.Text = "Save options as default and do not ask again"; - this.checkbox_dontaskagain.TextAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkbox_dontaskagain.UseVisualStyleBackColor = true; - // - // checkboxAllowShrink - // - this.checkboxAllowShrink.AutoSize = true; - this.checkboxAllowShrink.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxAllowShrink.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxAllowShrink.LanguageKey = "printoptions_allowshrink"; - this.checkboxAllowShrink.Location = new System.Drawing.Point(13, 23); - this.checkboxAllowShrink.Name = "checkboxAllowShrink"; - this.checkboxAllowShrink.PropertyName = "OutputPrintAllowShrink"; - this.checkboxAllowShrink.Size = new System.Drawing.Size(168, 17); - this.checkboxAllowShrink.TabIndex = 2; - this.checkboxAllowShrink.Text = "Shrink printout to fit paper size"; - this.checkboxAllowShrink.TextAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxAllowShrink.UseVisualStyleBackColor = true; - // - // checkboxAllowEnlarge - // - this.checkboxAllowEnlarge.AutoSize = true; - this.checkboxAllowEnlarge.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxAllowEnlarge.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxAllowEnlarge.LanguageKey = "printoptions_allowenlarge"; - this.checkboxAllowEnlarge.Location = new System.Drawing.Point(13, 46); - this.checkboxAllowEnlarge.Name = "checkboxAllowEnlarge"; - this.checkboxAllowEnlarge.PropertyName = "OutputPrintAllowEnlarge"; - this.checkboxAllowEnlarge.Size = new System.Drawing.Size(174, 17); - this.checkboxAllowEnlarge.TabIndex = 3; - this.checkboxAllowEnlarge.Text = "Enlarge printout to fit paper size"; - this.checkboxAllowEnlarge.TextAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxAllowEnlarge.UseVisualStyleBackColor = true; - // - // checkboxAllowCenter - // - this.checkboxAllowCenter.AutoSize = true; - this.checkboxAllowCenter.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxAllowCenter.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxAllowCenter.LanguageKey = "printoptions_allowcenter"; - this.checkboxAllowCenter.Location = new System.Drawing.Point(13, 92); - this.checkboxAllowCenter.Name = "checkboxAllowCenter"; - this.checkboxAllowCenter.PropertyName = "OutputPrintCenter"; - this.checkboxAllowCenter.Size = new System.Drawing.Size(137, 17); - this.checkboxAllowCenter.TabIndex = 5; - this.checkboxAllowCenter.Text = "Center printout on page"; - this.checkboxAllowCenter.TextAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxAllowCenter.UseVisualStyleBackColor = true; - // - // checkboxAllowRotate - // - this.checkboxAllowRotate.AutoSize = true; - this.checkboxAllowRotate.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxAllowRotate.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxAllowRotate.LanguageKey = "printoptions_allowrotate"; - this.checkboxAllowRotate.Location = new System.Drawing.Point(13, 69); - this.checkboxAllowRotate.Name = "checkboxAllowRotate"; - this.checkboxAllowRotate.PropertyName = "OutputPrintAllowRotate"; - this.checkboxAllowRotate.Size = new System.Drawing.Size(187, 17); - this.checkboxAllowRotate.TabIndex = 4; - this.checkboxAllowRotate.Text = "Rotate printout to page orientation"; - this.checkboxAllowRotate.TextAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxAllowRotate.UseVisualStyleBackColor = true; - // - // button_ok - // - this.button_ok.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.button_ok.DialogResult = System.Windows.Forms.DialogResult.OK; - this.button_ok.LanguageKey = "OK"; - this.button_ok.Location = new System.Drawing.Point(187, 355); - this.button_ok.Name = "button_ok"; - this.button_ok.Size = new System.Drawing.Size(75, 23); - this.button_ok.TabIndex = 20; - this.button_ok.Text = "Ok"; - this.button_ok.UseVisualStyleBackColor = true; - this.button_ok.Click += new System.EventHandler(this.Button_okClick); - // - // checkboxDateTime - // - this.checkboxDateTime.AutoSize = true; - this.checkboxDateTime.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxDateTime.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxDateTime.LanguageKey = "printoptions_timestamp"; - this.checkboxDateTime.Location = new System.Drawing.Point(13, 115); - this.checkboxDateTime.Name = "checkboxDateTime"; - this.checkboxDateTime.PropertyName = "OutputPrintFooter"; - this.checkboxDateTime.Size = new System.Drawing.Size(187, 17); - this.checkboxDateTime.TabIndex = 6; - this.checkboxDateTime.Text = "Print date / time at bottom of page"; - this.checkboxDateTime.TextAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxDateTime.UseVisualStyleBackColor = true; - // - // button_cancel - // - this.button_cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.button_cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.button_cancel.LanguageKey = "CANCEL"; - this.button_cancel.Location = new System.Drawing.Point(268, 355); - this.button_cancel.Name = "button_cancel"; - this.button_cancel.Size = new System.Drawing.Size(75, 23); - this.button_cancel.TabIndex = 21; - this.button_cancel.Text = "Cancel"; - this.button_cancel.UseVisualStyleBackColor = true; - // - // checkboxPrintInverted - // - this.checkboxPrintInverted.AutoSize = true; - this.checkboxPrintInverted.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxPrintInverted.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxPrintInverted.LanguageKey = "printoptions_inverted"; - this.checkboxPrintInverted.Location = new System.Drawing.Point(13, 88); - this.checkboxPrintInverted.Name = "checkboxPrintInverted"; - this.checkboxPrintInverted.PropertyName = "OutputPrintInverted"; - this.checkboxPrintInverted.Size = new System.Drawing.Size(141, 17); - this.checkboxPrintInverted.TabIndex = 14; - this.checkboxPrintInverted.Text = "Print with inverted colors"; - this.checkboxPrintInverted.TextAlign = System.Drawing.ContentAlignment.TopLeft; - this.checkboxPrintInverted.UseVisualStyleBackColor = true; - // - // radioBtnGrayScale - // - this.radioBtnGrayScale.AutoSize = true; - this.radioBtnGrayScale.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.radioBtnGrayScale.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.radioBtnGrayScale.LanguageKey = "printoptions_printgrayscale"; - this.radioBtnGrayScale.Location = new System.Drawing.Point(13, 42); - this.radioBtnGrayScale.Name = "radioBtnGrayScale"; - this.radioBtnGrayScale.PropertyName = "OutputPrintGrayscale"; - this.radioBtnGrayScale.Size = new System.Drawing.Size(137, 17); - this.radioBtnGrayScale.TabIndex = 12; - this.radioBtnGrayScale.Text = "Force grayscale printing"; - this.radioBtnGrayScale.TextAlign = System.Drawing.ContentAlignment.TopLeft; - this.radioBtnGrayScale.UseVisualStyleBackColor = true; - // - // radioBtnMonochrome - // - this.radioBtnMonochrome.AutoSize = true; - this.radioBtnMonochrome.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.radioBtnMonochrome.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.radioBtnMonochrome.LanguageKey = "printoptions_printmonochrome"; - this.radioBtnMonochrome.Location = new System.Drawing.Point(13, 65); - this.radioBtnMonochrome.Name = "radioBtnMonochrome"; - this.radioBtnMonochrome.PropertyName = "OutputPrintMonochrome"; - this.radioBtnMonochrome.Size = new System.Drawing.Size(148, 17); - this.radioBtnMonochrome.TabIndex = 13; - this.radioBtnMonochrome.Text = "Force black/white printing"; - this.radioBtnMonochrome.TextAlign = System.Drawing.ContentAlignment.TopLeft; - this.radioBtnMonochrome.UseVisualStyleBackColor = true; - // - // groupBoxPrintLayout - // - this.groupBoxPrintLayout.AutoSize = true; - this.groupBoxPrintLayout.Controls.Add(this.checkboxDateTime); - this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowShrink); - this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowEnlarge); - this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowRotate); - this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowCenter); - this.groupBoxPrintLayout.LanguageKey = "printoptions_layout"; - this.groupBoxPrintLayout.Location = new System.Drawing.Point(12, 12); - this.groupBoxPrintLayout.Name = "groupBoxPrintLayout"; - this.groupBoxPrintLayout.Size = new System.Drawing.Size(331, 151); - this.groupBoxPrintLayout.TabIndex = 31; - this.groupBoxPrintLayout.TabStop = false; - this.groupBoxPrintLayout.Text = "Page layout settings"; - // - // groupBoxColors - // - this.groupBoxColors.AutoSize = true; - this.groupBoxColors.Controls.Add(this.checkboxPrintInverted); - this.groupBoxColors.Controls.Add(this.radioBtnColorPrint); - this.groupBoxColors.Controls.Add(this.radioBtnGrayScale); - this.groupBoxColors.Controls.Add(this.radioBtnMonochrome); - this.groupBoxColors.LanguageKey = "printoptions_colors"; - this.groupBoxColors.Location = new System.Drawing.Point(12, 169); - this.groupBoxColors.Name = "groupBoxColors"; - this.groupBoxColors.Size = new System.Drawing.Size(331, 127); - this.groupBoxColors.TabIndex = 32; - this.groupBoxColors.TabStop = false; - this.groupBoxColors.Text = "Color settings"; - // - // radioBtnColorPrint - // - this.radioBtnColorPrint.AutoSize = true; - this.radioBtnColorPrint.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.radioBtnColorPrint.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.radioBtnColorPrint.LanguageKey = "printoptions_printcolor"; - this.radioBtnColorPrint.Location = new System.Drawing.Point(13, 19); - this.radioBtnColorPrint.Name = "radioBtnColorPrint"; - this.radioBtnColorPrint.PropertyName = "OutputPrintColor"; - this.radioBtnColorPrint.Size = new System.Drawing.Size(90, 17); - this.radioBtnColorPrint.TabIndex = 11; - this.radioBtnColorPrint.TextAlign = System.Drawing.ContentAlignment.TopLeft; - this.radioBtnColorPrint.UseVisualStyleBackColor = true; - // - // PrintOptionsDialog - // - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.AutoSize = true; - this.ClientSize = new System.Drawing.Size(355, 390); - this.Controls.Add(this.groupBoxColors); - this.Controls.Add(this.groupBoxPrintLayout); - this.Controls.Add(this.button_cancel); - this.Controls.Add(this.button_ok); - this.Controls.Add(this.checkbox_dontaskagain); - this.LanguageKey = "printoptions_title"; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "PrintOptionsDialog"; - this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; - this.Text = "Greenshot print options"; - this.groupBoxPrintLayout.ResumeLayout(false); - this.groupBoxPrintLayout.PerformLayout(); - this.groupBoxColors.ResumeLayout(false); - this.groupBoxColors.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.checkbox_dontaskagain = new GreenshotPlugin.Controls.GreenshotCheckBox(); + this.checkboxAllowShrink = new GreenshotPlugin.Controls.GreenshotCheckBox(); + this.checkboxAllowEnlarge = new GreenshotPlugin.Controls.GreenshotCheckBox(); + this.checkboxAllowCenter = new GreenshotPlugin.Controls.GreenshotCheckBox(); + this.checkboxAllowRotate = new GreenshotPlugin.Controls.GreenshotCheckBox(); + this.button_ok = new GreenshotPlugin.Controls.GreenshotButton(); + this.checkboxDateTime = new GreenshotPlugin.Controls.GreenshotCheckBox(); + this.button_cancel = new GreenshotPlugin.Controls.GreenshotButton(); + this.checkboxPrintInverted = new GreenshotPlugin.Controls.GreenshotCheckBox(); + this.radioBtnGrayScale = new GreenshotPlugin.Controls.GreenshotRadioButton(); + this.radioBtnMonochrome = new GreenshotPlugin.Controls.GreenshotRadioButton(); + this.groupBoxPrintLayout = new GreenshotPlugin.Controls.GreenshotGroupBox(); + this.groupBoxColors = new GreenshotPlugin.Controls.GreenshotGroupBox(); + this.radioBtnColorPrint = new GreenshotPlugin.Controls.GreenshotRadioButton(); + this.groupBoxPrintLayout.SuspendLayout(); + this.groupBoxColors.SuspendLayout(); + this.SuspendLayout(); + // + // checkbox_dontaskagain + // + this.checkbox_dontaskagain.AutoSize = true; + this.checkbox_dontaskagain.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkbox_dontaskagain.ImageAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkbox_dontaskagain.LanguageKey = "printoptions_dontaskagain"; + this.checkbox_dontaskagain.Location = new System.Drawing.Point(25, 299); + this.checkbox_dontaskagain.Name = "checkbox_dontaskagain"; + this.checkbox_dontaskagain.Size = new System.Drawing.Size(240, 17); + this.checkbox_dontaskagain.TabIndex = 15; + this.checkbox_dontaskagain.Text = "Save options as default and do not ask again"; + this.checkbox_dontaskagain.TextAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkbox_dontaskagain.UseVisualStyleBackColor = true; + // + // checkboxAllowShrink + // + this.checkboxAllowShrink.AutoSize = true; + this.checkboxAllowShrink.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxAllowShrink.ImageAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxAllowShrink.LanguageKey = "printoptions_allowshrink"; + this.checkboxAllowShrink.Location = new System.Drawing.Point(13, 23); + this.checkboxAllowShrink.Name = "checkboxAllowShrink"; + this.checkboxAllowShrink.PropertyName = "OutputPrintAllowShrink"; + this.checkboxAllowShrink.Size = new System.Drawing.Size(168, 17); + this.checkboxAllowShrink.TabIndex = 2; + this.checkboxAllowShrink.Text = "Shrink printout to fit paper size"; + this.checkboxAllowShrink.TextAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxAllowShrink.UseVisualStyleBackColor = true; + // + // checkboxAllowEnlarge + // + this.checkboxAllowEnlarge.AutoSize = true; + this.checkboxAllowEnlarge.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxAllowEnlarge.ImageAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxAllowEnlarge.LanguageKey = "printoptions_allowenlarge"; + this.checkboxAllowEnlarge.Location = new System.Drawing.Point(13, 46); + this.checkboxAllowEnlarge.Name = "checkboxAllowEnlarge"; + this.checkboxAllowEnlarge.PropertyName = "OutputPrintAllowEnlarge"; + this.checkboxAllowEnlarge.Size = new System.Drawing.Size(174, 17); + this.checkboxAllowEnlarge.TabIndex = 3; + this.checkboxAllowEnlarge.Text = "Enlarge printout to fit paper size"; + this.checkboxAllowEnlarge.TextAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxAllowEnlarge.UseVisualStyleBackColor = true; + // + // checkboxAllowCenter + // + this.checkboxAllowCenter.AutoSize = true; + this.checkboxAllowCenter.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxAllowCenter.ImageAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxAllowCenter.LanguageKey = "printoptions_allowcenter"; + this.checkboxAllowCenter.Location = new System.Drawing.Point(13, 92); + this.checkboxAllowCenter.Name = "checkboxAllowCenter"; + this.checkboxAllowCenter.PropertyName = "OutputPrintCenter"; + this.checkboxAllowCenter.Size = new System.Drawing.Size(137, 17); + this.checkboxAllowCenter.TabIndex = 5; + this.checkboxAllowCenter.Text = "Center printout on page"; + this.checkboxAllowCenter.TextAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxAllowCenter.UseVisualStyleBackColor = true; + // + // checkboxAllowRotate + // + this.checkboxAllowRotate.AutoSize = true; + this.checkboxAllowRotate.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxAllowRotate.ImageAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxAllowRotate.LanguageKey = "printoptions_allowrotate"; + this.checkboxAllowRotate.Location = new System.Drawing.Point(13, 69); + this.checkboxAllowRotate.Name = "checkboxAllowRotate"; + this.checkboxAllowRotate.PropertyName = "OutputPrintAllowRotate"; + this.checkboxAllowRotate.Size = new System.Drawing.Size(187, 17); + this.checkboxAllowRotate.TabIndex = 4; + this.checkboxAllowRotate.Text = "Rotate printout to page orientation"; + this.checkboxAllowRotate.TextAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxAllowRotate.UseVisualStyleBackColor = true; + // + // button_ok + // + this.button_ok.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.button_ok.DialogResult = System.Windows.Forms.DialogResult.OK; + this.button_ok.LanguageKey = "OK"; + this.button_ok.Location = new System.Drawing.Point(187, 355); + this.button_ok.Name = "button_ok"; + this.button_ok.Size = new System.Drawing.Size(75, 23); + this.button_ok.TabIndex = 20; + this.button_ok.Text = "Ok"; + this.button_ok.UseVisualStyleBackColor = true; + this.button_ok.Click += new System.EventHandler(this.Button_okClick); + // + // checkboxDateTime + // + this.checkboxDateTime.AutoSize = true; + this.checkboxDateTime.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxDateTime.ImageAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxDateTime.LanguageKey = "printoptions_timestamp"; + this.checkboxDateTime.Location = new System.Drawing.Point(13, 115); + this.checkboxDateTime.Name = "checkboxDateTime"; + this.checkboxDateTime.PropertyName = "OutputPrintFooter"; + this.checkboxDateTime.Size = new System.Drawing.Size(187, 17); + this.checkboxDateTime.TabIndex = 6; + this.checkboxDateTime.Text = "Print date / time at bottom of page"; + this.checkboxDateTime.TextAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxDateTime.UseVisualStyleBackColor = true; + // + // button_cancel + // + this.button_cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.button_cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.button_cancel.LanguageKey = "CANCEL"; + this.button_cancel.Location = new System.Drawing.Point(268, 355); + this.button_cancel.Name = "button_cancel"; + this.button_cancel.Size = new System.Drawing.Size(75, 23); + this.button_cancel.TabIndex = 21; + this.button_cancel.Text = "Cancel"; + this.button_cancel.UseVisualStyleBackColor = true; + // + // checkboxPrintInverted + // + this.checkboxPrintInverted.AutoSize = true; + this.checkboxPrintInverted.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxPrintInverted.ImageAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxPrintInverted.LanguageKey = "printoptions_inverted"; + this.checkboxPrintInverted.Location = new System.Drawing.Point(13, 88); + this.checkboxPrintInverted.Name = "checkboxPrintInverted"; + this.checkboxPrintInverted.PropertyName = "OutputPrintInverted"; + this.checkboxPrintInverted.Size = new System.Drawing.Size(141, 17); + this.checkboxPrintInverted.TabIndex = 14; + this.checkboxPrintInverted.Text = "Print with inverted colors"; + this.checkboxPrintInverted.TextAlign = System.Drawing.ContentAlignment.TopLeft; + this.checkboxPrintInverted.UseVisualStyleBackColor = true; + // + // radioBtnGrayScale + // + this.radioBtnGrayScale.AutoSize = true; + this.radioBtnGrayScale.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.radioBtnGrayScale.ImageAlign = System.Drawing.ContentAlignment.TopLeft; + this.radioBtnGrayScale.LanguageKey = "printoptions_printgrayscale"; + this.radioBtnGrayScale.Location = new System.Drawing.Point(13, 42); + this.radioBtnGrayScale.Name = "radioBtnGrayScale"; + this.radioBtnGrayScale.PropertyName = "OutputPrintGrayscale"; + this.radioBtnGrayScale.Size = new System.Drawing.Size(137, 17); + this.radioBtnGrayScale.TabIndex = 12; + this.radioBtnGrayScale.Text = "Force grayscale printing"; + this.radioBtnGrayScale.TextAlign = System.Drawing.ContentAlignment.TopLeft; + this.radioBtnGrayScale.UseVisualStyleBackColor = true; + // + // radioBtnMonochrome + // + this.radioBtnMonochrome.AutoSize = true; + this.radioBtnMonochrome.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.radioBtnMonochrome.ImageAlign = System.Drawing.ContentAlignment.TopLeft; + this.radioBtnMonochrome.LanguageKey = "printoptions_printmonochrome"; + this.radioBtnMonochrome.Location = new System.Drawing.Point(13, 65); + this.radioBtnMonochrome.Name = "radioBtnMonochrome"; + this.radioBtnMonochrome.PropertyName = "OutputPrintMonochrome"; + this.radioBtnMonochrome.Size = new System.Drawing.Size(148, 17); + this.radioBtnMonochrome.TabIndex = 13; + this.radioBtnMonochrome.Text = "Force black/white printing"; + this.radioBtnMonochrome.TextAlign = System.Drawing.ContentAlignment.TopLeft; + this.radioBtnMonochrome.UseVisualStyleBackColor = true; + // + // groupBoxPrintLayout + // + this.groupBoxPrintLayout.AutoSize = true; + this.groupBoxPrintLayout.Controls.Add(this.checkboxDateTime); + this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowShrink); + this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowEnlarge); + this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowRotate); + this.groupBoxPrintLayout.Controls.Add(this.checkboxAllowCenter); + this.groupBoxPrintLayout.LanguageKey = "printoptions_layout"; + this.groupBoxPrintLayout.Location = new System.Drawing.Point(12, 12); + this.groupBoxPrintLayout.Name = "groupBoxPrintLayout"; + this.groupBoxPrintLayout.Size = new System.Drawing.Size(331, 151); + this.groupBoxPrintLayout.TabIndex = 31; + this.groupBoxPrintLayout.TabStop = false; + this.groupBoxPrintLayout.Text = "Page layout settings"; + // + // groupBoxColors + // + this.groupBoxColors.AutoSize = true; + this.groupBoxColors.Controls.Add(this.checkboxPrintInverted); + this.groupBoxColors.Controls.Add(this.radioBtnColorPrint); + this.groupBoxColors.Controls.Add(this.radioBtnGrayScale); + this.groupBoxColors.Controls.Add(this.radioBtnMonochrome); + this.groupBoxColors.LanguageKey = "printoptions_colors"; + this.groupBoxColors.Location = new System.Drawing.Point(12, 169); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.Size = new System.Drawing.Size(331, 127); + this.groupBoxColors.TabIndex = 32; + this.groupBoxColors.TabStop = false; + this.groupBoxColors.Text = "Color settings"; + // + // radioBtnColorPrint + // + this.radioBtnColorPrint.AutoSize = true; + this.radioBtnColorPrint.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.radioBtnColorPrint.ImageAlign = System.Drawing.ContentAlignment.TopLeft; + this.radioBtnColorPrint.LanguageKey = "printoptions_printcolor"; + this.radioBtnColorPrint.Location = new System.Drawing.Point(13, 19); + this.radioBtnColorPrint.Name = "radioBtnColorPrint"; + this.radioBtnColorPrint.PropertyName = "OutputPrintColor"; + this.radioBtnColorPrint.Size = new System.Drawing.Size(90, 17); + this.radioBtnColorPrint.TabIndex = 11; + this.radioBtnColorPrint.Text = "Full color print"; + this.radioBtnColorPrint.TextAlign = System.Drawing.ContentAlignment.TopLeft; + this.radioBtnColorPrint.UseVisualStyleBackColor = true; + // + // PrintOptionsDialog + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.AutoSize = true; + this.ClientSize = new System.Drawing.Size(355, 390); + this.Controls.Add(this.groupBoxColors); + this.Controls.Add(this.groupBoxPrintLayout); + this.Controls.Add(this.button_cancel); + this.Controls.Add(this.button_ok); + this.Controls.Add(this.checkbox_dontaskagain); + this.LanguageKey = "printoptions_title"; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "PrintOptionsDialog"; + this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; + this.Text = "Greenshot print options"; + this.groupBoxPrintLayout.ResumeLayout(false); + this.groupBoxPrintLayout.PerformLayout(); + this.groupBoxColors.ResumeLayout(false); + this.groupBoxColors.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } private GreenshotPlugin.Controls.GreenshotRadioButton radioBtnGrayScale; diff --git a/Greenshot/Forms/PrintOptionsDialog.resx b/Greenshot/Forms/PrintOptionsDialog.resx new file mode 100644 index 000000000..7080a7d11 --- /dev/null +++ b/Greenshot/Forms/PrintOptionsDialog.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Greenshot/Forms/TornEdgeSettingsForm.resx b/Greenshot/Forms/TornEdgeSettingsForm.resx new file mode 100644 index 000000000..7080a7d11 --- /dev/null +++ b/Greenshot/Forms/TornEdgeSettingsForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj index 79b2f4666..04b080de7 100644 --- a/Greenshot/Greenshot.csproj +++ b/Greenshot/Greenshot.csproj @@ -1,5 +1,5 @@  - + {CD642BF4-D815-4D67-A0B5-C69F0B8231AF} @@ -18,7 +18,8 @@ 3.5 - + + @@ -201,6 +202,11 @@ MovableShowColorForm.cs + + True + True + Sounds.resx + @@ -241,10 +247,19 @@ MainForm.cs + + PrintOptionsDialog.cs + SettingsForm.cs - + + TornEdgeSettingsForm.cs + + + ResXFileCodeGenerator + Sounds.Designer.cs + Always @@ -331,6 +346,7 @@ Always + Designer diff --git a/Greenshot/Greenshot.v12.suo b/Greenshot/Greenshot.v12.suo new file mode 100644 index 000000000..c029a0910 Binary files /dev/null and b/Greenshot/Greenshot.v12.suo differ diff --git a/Greenshot/Languages/language-website-lv-LV.html.part b/Greenshot/Languages/language-website-lv-LV.html.part new file mode 100644 index 000000000..7e785220b --- /dev/null +++ b/Greenshot/Languages/language-website-lv-LV.html.part @@ -0,0 +1,22 @@ +
+ +

Kas tad ir „Greenshot”?

+

„Greenshot” ir ātrdarbīga un ērta ekrānattēlu ieguves programmatūra „Windows” lietotājiem. Ar to iespējams:

+

+ātri iegūt ekranattēlus no visa ekrāna, tā daļas vai notikta loga, kā arī iegūt pilnu „Internet Explorer” lapu; vienkārši pievienot piezīmes, izcelt vai aizmiglot atsevišķas attēla daļas; saglabāt ekrānattēlu daudz dažādos veidos: saglabāt failā, izdrukājot, ievietojot starpliktuvē, nosūtot uz kādu citu programmatūru vai augšupielādēt tīmekļa servisos; ... un veikt daudzas citas brīnišķīgas lietas ikdienas vajadzībām. +

+

Tā kā „Greenshot” ir vienkārši lietojams un pielāgojams, tas ir piemērots rīks projektu vadītājiem, programmatūru izstrādātājiem, pielietojumu aprakstu veidotājiem, testētājiem un viesiem pārējiem, kam vien nepieciešams iegūt ekrānattēlus.

+ +
+
+ +

Vēlies uzzināt ko vairāk?

+

Ar „Greenshot” iespējams paveikt daudz ko. Iepazīsties ar „Greenshot” izmantošanas piemēriem vai lejupielādē jaunāko pārbaudīto „Greenshot” versiju.

+ +Lejupielādes + +

„Greenshot” ir brīvi lietojama atvērtā koda programmatūra

+

„Greenshot” programmatūra ir pieejama ar GPL licenci. Tas nozīmē, ka to var brīvi lietot jebkurš gan personīgām, gan darba vajadzībām..

+

Ja „Greenshot” Tev ļoti palīdz darbā un ļauj ietaupīt laiku un naudu, novērtē to atbalstot tās izstrādi..

+ +
\ No newline at end of file diff --git a/Greenshot/Languages/language-website-sv-SE.html.part b/Greenshot/Languages/language-website-sv-SE.html.part new file mode 100644 index 000000000..352fe43ac --- /dev/null +++ b/Greenshot/Languages/language-website-sv-SE.html.part @@ -0,0 +1,22 @@ +
+ +

Vad är Greenshot????

+

Greenshot är ett litet skärmdumpsverktyg för Windows med följande huvudfunktioner:

+

+Skapa snabbt skärmdumpar av valda ytor, fönster eller fullskärm; du kan till och med ta skärmdumpar på hela (skrollande) webbsidor från Internet Explorer. Du kan enkelt kommentera, framhäva eller censurera delar av skärmdumpen. Exportera skärmdumpen på olika sätt: spara till fil, skicka till skrivare, kopiera till urklippet, bifoga i e-post, skicka till Office-program eller ladda upp till fotosidor som Flickr, Picasa m.m. ...och många fler möjligheter som förenklar sättet att skapa och ändra skärmdumpar varje dag. +

+

Genom att vara lätt att förstå och konfigurera, är Greenshot ett effektivt verktyg för projektledare, mjukvaruutvecklare, tekniska skribenter, testare och alla andra som skapar skärmdumpar.

+ +
+
+ +

Vill du se mer?

+

Självklart finns det mer Greenshot kan göra för dig. Ta en titt på några skärmdumpar av Greenshot i praktiken eller testa den senaste versionen.

+ +Ladda ner + +

Greenshot är gratis och med öppen källkod

+

Greenshot publiceras under GPL, d.v.s. att denna mjukvara kan laddas ner och användas kostnadsfritt, även kommersiellt.

+

Om du tycker att Greenshot sparar dig en massa tid och pengar, är du välkommen att stödja utvecklingen av detta skärmdumpprogram.

+ +
\ No newline at end of file diff --git a/Greenshot/Sounds.Designer.cs b/Greenshot/Sounds.Designer.cs new file mode 100644 index 000000000..4099c11cd --- /dev/null +++ b/Greenshot/Sounds.Designer.cs @@ -0,0 +1,73 @@ +//------------------------------------------------------------------------------ +// +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.34014 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// +//------------------------------------------------------------------------------ + +namespace Greenshot { + using System; + + + /// + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// + // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Sounds { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Sounds() { + } + + /// + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Greenshot.Sounds", typeof(Sounds).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Byte[]. + /// + internal static byte[] camera { + get { + object obj = ResourceManager.GetObject("camera", resourceCulture); + return ((byte[])(obj)); + } + } + } +} diff --git a/Greenshot/releases/Greenshot-DEBUGSYMBOLS--.zip b/Greenshot/releases/Greenshot-DEBUGSYMBOLS--.zip new file mode 100644 index 000000000..15cb0ecb3 Binary files /dev/null and b/Greenshot/releases/Greenshot-DEBUGSYMBOLS--.zip differ diff --git a/GreenshotConfluencePlugin/Web References/confluence/RemoteAttachment.datasource b/GreenshotConfluencePlugin/Web References/confluence/RemoteAttachment.datasource new file mode 100644 index 000000000..9e99d4051 --- /dev/null +++ b/GreenshotConfluencePlugin/Web References/confluence/RemoteAttachment.datasource @@ -0,0 +1,10 @@ + + + + GreenshotConfluencePlugin.confluence.RemoteAttachment, Web References.confluence.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/GreenshotConfluencePlugin/Web References/confluence/RemotePage.datasource b/GreenshotConfluencePlugin/Web References/confluence/RemotePage.datasource new file mode 100644 index 000000000..73627d934 --- /dev/null +++ b/GreenshotConfluencePlugin/Web References/confluence/RemotePage.datasource @@ -0,0 +1,10 @@ + + + + GreenshotConfluencePlugin.confluence.RemotePage, Web References.confluence.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/GreenshotConfluencePlugin/Web References/confluence/RemotePageSummary.datasource b/GreenshotConfluencePlugin/Web References/confluence/RemotePageSummary.datasource new file mode 100644 index 000000000..649edf254 --- /dev/null +++ b/GreenshotConfluencePlugin/Web References/confluence/RemotePageSummary.datasource @@ -0,0 +1,10 @@ + + + + GreenshotConfluencePlugin.confluence.RemotePageSummary, Web References.confluence.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/GreenshotConfluencePlugin/Web References/confluence/RemoteSearchResult.datasource b/GreenshotConfluencePlugin/Web References/confluence/RemoteSearchResult.datasource new file mode 100644 index 000000000..2b9d25aab --- /dev/null +++ b/GreenshotConfluencePlugin/Web References/confluence/RemoteSearchResult.datasource @@ -0,0 +1,10 @@ + + + + GreenshotConfluencePlugin.confluence.RemoteSearchResult, Web References.confluence.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/GreenshotConfluencePlugin/Web References/confluence/RemoteSpace.datasource b/GreenshotConfluencePlugin/Web References/confluence/RemoteSpace.datasource new file mode 100644 index 000000000..fdd1e4bb8 --- /dev/null +++ b/GreenshotConfluencePlugin/Web References/confluence/RemoteSpace.datasource @@ -0,0 +1,10 @@ + + + + GreenshotConfluencePlugin.confluence.RemoteSpace, Web References.confluence.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/GreenshotConfluencePlugin/Web References/confluence/RemoteSpaceSummary.datasource b/GreenshotConfluencePlugin/Web References/confluence/RemoteSpaceSummary.datasource new file mode 100644 index 000000000..dfe2bc867 --- /dev/null +++ b/GreenshotConfluencePlugin/Web References/confluence/RemoteSpaceSummary.datasource @@ -0,0 +1,10 @@ + + + + GreenshotConfluencePlugin.confluence.RemoteSpaceSummary, Web References.confluence.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj index 8cdaff142..f96f50398 100644 --- a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj +++ b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj @@ -1,5 +1,5 @@  - + {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50} @@ -17,7 +17,8 @@ 3.5 - + + diff --git a/GreenshotPlugin/GreenshotPlugin.csproj b/GreenshotPlugin/GreenshotPlugin.csproj index bac1fe128..51e5f2469 100644 --- a/GreenshotPlugin/GreenshotPlugin.csproj +++ b/GreenshotPlugin/GreenshotPlugin.csproj @@ -1,5 +1,5 @@  - + {5B924697-4DCD-4F98-85F1-105CB84B7341} @@ -14,6 +14,11 @@ 4 false + + + + + 3.5