github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 21:13:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from 0.8: Added "Editor match capture size" option, which was still missing. Also set this to default and added translations DE,EN,NL (which all need to be checked).

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1286 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2011-07-17 13:41:52 +00:00
commit 0ff3c6908c
8 changed files with 128 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Greenshot/Forms/SettingsForm.Designer.cs generated
View file

@ -95,6 +95,8 @@ namespace Greenshot {
this.window_hotkeyControl = new GreenshotPlugin.Controls.HotkeyControl();
this.fullscreen_hotkeyControl = new GreenshotPlugin.Controls.HotkeyControl();
this.tab_capture = new System.Windows.Forms.TabPage();
this.groupbox_editor = new System.Windows.Forms.GroupBox();
this.checkbox_editor_match_capture_size = new System.Windows.Forms.CheckBox();
this.groupbox_iecapture = new System.Windows.Forms.GroupBox();
this.checkbox_ie_capture = new System.Windows.Forms.CheckBox();
this.groupbox_windowscapture = new System.Windows.Forms.GroupBox();
@ -132,6 +134,7 @@ namespace Greenshot {
((System.ComponentModel.ISupportInitialize)(this.numericUpDown_daysbetweencheck)).BeginInit();
this.groupbox_hotkeys.SuspendLayout();
this.tab_capture.SuspendLayout();
this.groupbox_editor.SuspendLayout();
this.groupbox_iecapture.SuspendLayout();
this.groupbox_windowscapture.SuspendLayout();
this.groupbox_capture.SuspendLayout();
@ -611,6 +614,7 @@ namespace Greenshot {
//
// tab_capture
//
this.tab_capture.Controls.Add(this.groupbox_editor);
this.tab_capture.Controls.Add(this.groupbox_iecapture);
this.tab_capture.Controls.Add(this.groupbox_windowscapture);
this.tab_capture.Controls.Add(this.groupbox_capture);
@ -621,6 +625,25 @@ namespace Greenshot {
this.tab_capture.Text = "Capture";
this.tab_capture.UseVisualStyleBackColor = true;
//
// groupbox_editor
//
this.groupbox_editor.Controls.Add(this.checkbox_editor_match_capture_size);
this.groupbox_editor.Location = new System.Drawing.Point(4, 260);
this.groupbox_editor.Name = "groupbox_editor";
this.groupbox_editor.Size = new System.Drawing.Size(416, 50);
this.groupbox_editor.TabIndex = 27;
this.groupbox_editor.TabStop = false;
this.groupbox_editor.Text = "Editor";
//
// checkbox_editor_match_capture_size
//
this.checkbox_editor_match_capture_size.Location = new System.Drawing.Point(6, 19);
this.checkbox_editor_match_capture_size.Name = "checkbox_editor_match_capture_size";
this.checkbox_editor_match_capture_size.Size = new System.Drawing.Size(213, 24);
this.checkbox_editor_match_capture_size.TabIndex = 26;
this.checkbox_editor_match_capture_size.Text = "Match capture size";
this.checkbox_editor_match_capture_size.UseVisualStyleBackColor = true;
//
// groupbox_iecapture
//
this.groupbox_iecapture.Controls.Add(this.checkbox_ie_capture);
@ -952,6 +975,7 @@ namespace Greenshot {
this.groupbox_hotkeys.ResumeLayout(false);
this.groupbox_hotkeys.PerformLayout();
this.tab_capture.ResumeLayout(false);
this.groupbox_editor.ResumeLayout(false);
this.groupbox_iecapture.ResumeLayout(false);
this.groupbox_windowscapture.ResumeLayout(false);
this.groupbox_windowscapture.PerformLayout();
@ -965,6 +989,8 @@ namespace Greenshot {
this.groupbox_plugins.PerformLayout();
this.ResumeLayout(false);
}
private System.Windows.Forms.GroupBox groupbox_editor;
private System.Windows.Forms.CheckBox checkbox_editor_match_capture_size;
private System.Windows.Forms.NumericUpDown numericUpDown_daysbetweencheck;
private System.Windows.Forms.GroupBox groupbox_network;
private System.Windows.Forms.CheckBox checkbox_usedefaultproxy;