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

Cleanup of the previous changes for FEATURE-758, changed the settings ui to use a NummericUpDown, with steps of 16.

Browse source
This commit is contained in:
RKrom 2014-11-08 22:46:52 +01:00
commit 680b2baf22
4 changed files with 16 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,9 +94,7 @@ namespace Greenshot {
this.fullscreen_hotkeyControl = new GreenshotPlugin.Controls.HotkeyControl();
this.tab_capture = new GreenshotPlugin.Controls.GreenshotTabPage();
this.groupbox_editor = new GreenshotPlugin.Controls.GreenshotGroupBox();
this.xLabel = new System.Windows.Forms.Label();
this.text_icon_width = new System.Windows.Forms.TextBox();
this.text_icon_height = new System.Windows.Forms.TextBox();
this.numericUpdownIconWidth = new System.Windows.Forms.NumericUpDown();
this.label_icon_size = new GreenshotPlugin.Controls.GreenshotLabel();
this.checkbox_editor_match_capture_size = new GreenshotPlugin.Controls.GreenshotCheckBox();
this.groupbox_iecapture = new GreenshotPlugin.Controls.GreenshotGroupBox();
@ -630,9 +628,7 @@ namespace Greenshot {
//
// groupbox_editor
//
this.groupbox_editor.Controls.Add(this.xLabel);
this.groupbox_editor.Controls.Add(this.text_icon_width);
this.groupbox_editor.Controls.Add(this.text_icon_height);
this.groupbox_editor.Controls.Add(this.numericUpdownIconWidth);
this.groupbox_editor.Controls.Add(this.label_icon_size);
this.groupbox_editor.Controls.Add(this.checkbox_editor_match_capture_size);
this.groupbox_editor.LanguageKey = "settings_editor";
@ -642,34 +638,22 @@ namespace Greenshot {
this.groupbox_editor.TabIndex = 27;
this.groupbox_editor.TabStop = false;
//
// xLabel
// numericUpdownIconWidth
//
this.xLabel.Location = new System.Drawing.Point(358, 45);
this.xLabel.Name = "xLabel";
this.xLabel.Size = new System.Drawing.Size(10, 16);
this.xLabel.TabIndex = 14;
this.xLabel.Text = "X";
//
// text_icon_width
//
this.text_icon_width.Location = new System.Drawing.Point(318, 42);
this.text_icon_width.Name = "text_icon_width";
this.text_icon_width.Size = new System.Drawing.Size(36, 20);
this.text_icon_width.TabIndex = 12;
//
// text_icon_height
//
this.text_icon_height.Location = new System.Drawing.Point(374, 42);
this.text_icon_height.Name = "text_icon_height";
this.text_icon_height.Size = new System.Drawing.Size(36, 20);
this.text_icon_height.TabIndex = 13;
this.numericUpdownIconWidth.Location = new System.Drawing.Point(365, 42);
this.numericUpdownIconWidth.Name = "numericUpdownIconWidth";
this.numericUpdownIconWidth.Size = new System.Drawing.Size(44, 20);
this.numericUpdownIconWidth.TabIndex = 12;
this.numericUpdownIconWidth.Maximum = 256;
this.numericUpdownIconWidth.Minimum = 16;
this.numericUpdownIconWidth.Increment = 16;
//
// label_icon_size
//
this.label_icon_size.LanguageKey = "settings_iconsize";
this.label_icon_size.Location = new System.Drawing.Point(3, 44);
this.label_icon_size.Name = "label_icon_size";
this.label_icon_size.Size = new System.Drawing.Size(309, 16);
this.label_icon_size.Size = new System.Drawing.Size(355, 16);
this.label_icon_size.TabIndex = 6;
//
// checkbox_editor_match_capture_size
@ -1432,8 +1416,6 @@ namespace Greenshot {
private GreenshotPlugin.Controls.GreenshotCheckBox checkboxAllowCenter;
private GreenshotPlugin.Controls.GreenshotCheckBox checkbox_zoomer;
private GreenshotPlugin.Controls.GreenshotLabel label_icon_size;
private System.Windows.Forms.Label xLabel;
private System.Windows.Forms.TextBox text_icon_width;
private System.Windows.Forms.TextBox text_icon_height;
private System.Windows.Forms.NumericUpDown numericUpdownIconWidth;
}
}

12
Greenshot/Forms/SettingsForm.cs
View file

@ -369,8 +369,7 @@ namespace Greenshot {
numericUpDown_daysbetweencheck.Value = coreConfiguration.UpdateCheckInterval;
numericUpDown_daysbetweencheck.Enabled = !coreConfiguration.Values["UpdateCheckInterval"].IsFixed;
coreConfiguration.FixIconSize();
text_icon_width.Text = coreConfiguration.IconSize.Width.ToString(CultureInfo.InvariantCulture);
text_icon_height.Text = coreConfiguration.IconSize.Height.ToString(CultureInfo.InvariantCulture);
numericUpdownIconWidth.Value = (coreConfiguration.IconSize.Width /16) * 16;
CheckDestinationSettings();
}
@ -415,14 +414,7 @@ namespace Greenshot {
coreConfiguration.DWMBackgroundColor = colorButton_window_background.SelectedColor;
coreConfiguration.UpdateCheckInterval = (int)numericUpDown_daysbetweencheck.Value;
int iconWidth;
if (int.TryParse(text_icon_width.Text, out iconWidth)) {
coreConfiguration.IconSize.Width = iconWidth;
}
int iconHeight;
if (int.TryParse(text_icon_height.Text, out iconHeight)) {
coreConfiguration.IconSize.Height = iconHeight;
}
coreConfiguration.IconSize = new Size((int)numericUpdownIconWidth.Value, (int)numericUpdownIconWidth.Value);
coreConfiguration.FixIconSize();
try {
if (checkbox_autostartshortcut.Checked) {

1
Greenshot/Languages/language-de-DE.xml
View file

@ -310,5 +310,6 @@ Sie können aber auch alle Greenshot-Funktionen über das Kontextmenü des Green
<resource name="editor_resize_aspectratio">Seitenverhältnis beibehalten</resource>
<resource name="editor_resize_width">Breite</resource>
<resource name="editor_resize_height">Höhe</resource>
<resource name="settings_iconsize">UI Symbolgröße</resource>
</resources>
</language>

1
Greenshot/Languages/language-nl-NL.xml
View file

@ -280,5 +280,6 @@ Alle Greenshot functies werken ook over het context menu.</resource>
<resource name="editor_resize_aspectratio">Aspect ratio behouden</resource>
<resource name="editor_resize_width">Breedte</resource>
<resource name="editor_resize_height">Hoogte</resource>
<resource name="settings_iconsize">UI pictogram grootte</resource>
</resources>
</language>