maker/UVtools
1
0
Fork 0
mirror of https://github.com/riegera2412/UVtools.git synced 2026-07-08 17:42:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Settings Dialog Refresh

Browse Source 
-Adjusted wording for clarity across all tabs
-Adjusted capitilzation for consistency
-Color buttons are now 24x24 instead of 32x32.
-Misc adjustments to spacing and layouts.
-Replaced ZoomToFitiPringBounds checkbox with Combobox and mapped index to existing
config item.
-Added color selection for crosshair.
This commit is contained in:
Bryce Yancey
2020-09-05 15:46:35 -06:00
parent 4bbef72acb
commit b25e6dec3a
8 changed files with 1110 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UVtools.GUI/App.config
+1 -1
View File
@@ -231,7 +231,7 @@
<setting name="CrosshairLineMargin" serializeAs="String">
<value>5</value>
</setting>
<setting name="CrossharirColor" serializeAs="String">
<setting name="CrosshairColor" serializeAs="String">
<value>Red</value>
</setting>
<setting name="ZoomIssuesAuto" serializeAs="String">
UVtools.GUI/Forms/FrmSettings.Designer.cs
Generated
+1087 -909
View File
File diff suppressed because it is too large Load Diff
UVtools.GUI/Forms/FrmSettings.cs
+6 -3
View File
@@ -57,7 +57,8 @@ namespace UVtools.GUI.Forms
btnResinTrapColor.BackColor = Settings.Default.ResinTrapColor;
btnResinTrapHLColor.BackColor = Settings.Default.ResinTrapHLColor;
btnTouchingBoundsColor.BackColor = Settings.Default.TouchingBoundsColor;
btnCrosshairColor.BackColor = Settings.Default.CrosshairColor;
btnOutlinePrintVolumeBoundsColor.BackColor = Settings.Default.OutlinePrintVolumeBoundsColor;
btnOutlineLayerBoundsColor.BackColor = Settings.Default.OutlineLayerBoundsColor;
@@ -73,7 +74,7 @@ namespace UVtools.GUI.Forms
cbLayerAutoRotateBestView.Checked = Settings.Default.LayerAutoRotateBestView;
cbLayerZoomToFit.Checked = Settings.Default.LayerZoomToFit;
cbZoomToFitPrintVolumeBounds.Checked = Settings.Default.ZoomToFitPrintVolumeBounds;
cbZoomToFit.SelectedIndex = Settings.Default.ZoomToFitPrintVolumeBounds == true ? 0 : 1;
cbZoomIssues.Checked = Settings.Default.ZoomIssues;
cbZoomLockLevel.SelectedIndex = Settings.Default.ZoomLockLevel;
cbZoomIssuesAuto.Checked = Settings.Default.ZoomIssuesAuto;
@@ -143,6 +144,7 @@ namespace UVtools.GUI.Forms
ReferenceEquals(sender, btnResinTrapColor) ||
ReferenceEquals(sender, btnResinTrapHLColor) ||
ReferenceEquals(sender, btnTouchingBoundsColor) ||
ReferenceEquals(sender, btnCrosshairColor) ||
ReferenceEquals(sender, btnOutlinePrintVolumeBoundsColor) ||
ReferenceEquals(sender, btnOutlineLayerBoundsColor) ||
ReferenceEquals(sender, btnOutlineHollowAreasColor) ||
@@ -237,6 +239,7 @@ namespace UVtools.GUI.Forms
Settings.Default.ResinTrapColor = btnResinTrapColor.BackColor;
Settings.Default.ResinTrapHLColor = btnResinTrapHLColor.BackColor;
Settings.Default.TouchingBoundsColor = btnTouchingBoundsColor.BackColor;
Settings.Default.CrosshairColor = btnCrosshairColor.BackColor;
Settings.Default.OutlinePrintVolumeBoundsColor = btnOutlinePrintVolumeBoundsColor.BackColor;
Settings.Default.OutlineLayerBoundsColor = btnOutlineLayerBoundsColor.BackColor;
@@ -252,7 +255,7 @@ namespace UVtools.GUI.Forms
Settings.Default.LayerAutoRotateBestView = cbLayerAutoRotateBestView.Checked;
Settings.Default.LayerZoomToFit = cbLayerZoomToFit.Checked;
Settings.Default.ZoomToFitPrintVolumeBounds = cbZoomToFitPrintVolumeBounds.Checked;
Settings.Default.ZoomToFitPrintVolumeBounds = cbZoomToFit.SelectedIndex == 0 ? true : false;
Settings.Default.ZoomIssues = cbZoomIssues.Checked;
Settings.Default.ZoomLockLevel = (byte)cbZoomLockLevel.SelectedIndex;
Settings.Default.ZoomIssuesAuto = cbZoomIssuesAuto.Checked;
UVtools.GUI/Forms/FrmSettings.resx
+7 -1
View File
@@ -125,8 +125,14 @@
</metadata>
<data name="cbIslandAllowDiagonalBonds.ToolTip" xml:space="preserve">
<value> If true, all 8 neighbors of a pixel (including diagonals) will be considered when finding individual components on the layer.
If false only 4 neighbors (right, left, above, below) will be considered. (Slower but more islands)</value>
If false only 4 neighbors (right, left, above, below) will be considered. (Slower but more islands detected)</value>
</data>
<data name="nmLayerRepairDefaultOpeningIterations.ToolTip" xml:space="preserve">
<value>Default number of noise removal iterations the repair algorithm will apply to remove noise and fine details from the layer. This setting has the potential to introduce new islands. Set to 0 to disable.</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>47</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
UVtools.GUI/FrmMain.Designer.cs
Generated
+2 -2
View File
@@ -850,7 +850,7 @@ namespace UVtools.GUI
this.btnLayerImageLayerOutlinePrintVolumeBounds.CheckOnClick = true;
this.btnLayerImageLayerOutlinePrintVolumeBounds.Name = "btnLayerImageLayerOutlinePrintVolumeBounds";
this.btnLayerImageLayerOutlinePrintVolumeBounds.Size = new System.Drawing.Size(185, 22);
this.btnLayerImageLayerOutlinePrintVolumeBounds.Text = "Print Volume Bounds";
this.btnLayerImageLayerOutlinePrintVolumeBounds.Text = "Print Volume Boundary";
this.btnLayerImageLayerOutlinePrintVolumeBounds.Click += new System.EventHandler(this.EventClick);
//
// btnLayerImageLayerOutlineLayerBounds
@@ -858,7 +858,7 @@ namespace UVtools.GUI
this.btnLayerImageLayerOutlineLayerBounds.CheckOnClick = true;
this.btnLayerImageLayerOutlineLayerBounds.Name = "btnLayerImageLayerOutlineLayerBounds";
this.btnLayerImageLayerOutlineLayerBounds.Size = new System.Drawing.Size(185, 22);
this.btnLayerImageLayerOutlineLayerBounds.Text = "Layer Bounds";
this.btnLayerImageLayerOutlineLayerBounds.Text = "Layer Boundary";
this.btnLayerImageLayerOutlineLayerBounds.Click += new System.EventHandler(this.EventClick);
//
// btnLayerImageLayerOutlineHollowAreas
UVtools.GUI/FrmMain.cs
+1 -1
View File
@@ -2496,7 +2496,7 @@ namespace UVtools.GUI
// This prevents the crosshair lines from disappearing due to being too thin to
// render at very low zoom factors.
var lineThickness = (pbLayer.Zoom > 100) ? 1 : (pbLayer.Zoom < 50) ? 3 : 2;
var color = new MCvScalar(Settings.Default.CrossharirColor.B, Settings.Default.CrossharirColor.G, Settings.Default.CrossharirColor.R);
var color = new MCvScalar(Settings.Default.CrosshairColor.B, Settings.Default.CrosshairColor.G, Settings.Default.CrosshairColor.R);
// LEFT
UVtools.GUI/Properties/Settings.Designer.cs
Generated
+4 -4
View File
@@ -12,7 +12,7 @@ namespace UVtools.GUI.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -830,12 +830,12 @@ namespace UVtools.GUI.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Red")]
public global::System.Drawing.Color CrossharirColor {
public global::System.Drawing.Color CrosshairColor {
get {
return ((global::System.Drawing.Color)(this["CrossharirColor"]));
return ((global::System.Drawing.Color)(this["CrosshairColor"]));
}
set {
this["CrossharirColor"] = value;
this["CrosshairColor"] = value;
}
}
UVtools.GUI/Properties/Settings.settings
+2 -2
View File
@@ -203,7 +203,7 @@
<Setting Name="CrosshairLineMargin" Type="System.Byte" Scope="User">
<Value Profile="(Default)">5</Value>
</Setting>
<Setting Name="CrossharirColor" Type="System.Drawing.Color" Scope="User">
<Setting Name="CrosshairColor" Type="System.Drawing.Color" Scope="User">
<Value Profile="(Default)">Red</Value>
</Setting>
<Setting Name="ZoomIssuesAuto" Type="System.Boolean" Scope="User">
@@ -216,4 +216,4 @@
<Value Profile="(Default)">True</Value>
</Setting>
</Settings>
</SettingsFile>
</SettingsFile>