From a20ac92540ced88d87b99594d79c51481ca9e8ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Concei=C3=A7=C3=A3o?= Date: Fri, 11 Sep 2020 03:06:56 +0100 Subject: [PATCH] fixes --- CHANGELOG.md | 2 + .../Operations/OperationEditParameters.cs | 3 +- UVtools.Core/Operations/OperationPattern.cs | 6 +- .../CtrlToolChangeResolution.Designer.cs | 4 +- .../Tools/CtrlToolEditEditParameters.cs | 2 +- .../Controls/Tools/CtrlToolFlip.Designer.cs | 8 +- .../Tools/CtrlToolLayerReHeight.Designer.cs | 4 +- .../Controls/Tools/CtrlToolMorph.Designer.cs | 6 +- .../Controls/Tools/CtrlToolMove.Designer.cs | 9 +- .../Controls/Tools/CtrlToolResize.Designer.cs | 9 +- .../Tools/CtrlToolTemplate.Designer.cs | 3 +- .../Tools/CtrlToolThreshold.Designer.cs | 22 ++--- UVtools.GUI/Forms/FrmLoading.Designer.cs | 38 +++++---- UVtools.GUI/Forms/FrmSettings.Designer.cs | 2 +- UVtools.GUI/Forms/FrmToolWindow.Designer.cs | 4 +- UVtools.GUI/FrmMain.Designer.cs | 2 +- UVtools.GUI/FrmMain.cs | 5 +- UVtools.GUI/FrmMain.resx | 2 +- UVtools.GUI/Images/Error-128x128.png | Bin 889 -> 0 bytes UVtools.GUI/Images/arrow-down.ico | Bin 163498 -> 0 bytes UVtools.GUI/Images/arrow-up.ico | Bin 163464 -> 0 bytes UVtools.GUI/Images/plus.ico | Bin 162918 -> 0 bytes UVtools.GUI/Images/sync-16x16.png | Bin 0 -> 245 bytes UVtools.GUI/Images/undo-16x16.png | Bin 0 -> 231 bytes .../{Rotate-16x16.png => undo-alt-16x16.png} | Bin UVtools.GUI/Properties/Resources.Designer.cs | 80 +++++++----------- UVtools.GUI/Properties/Resources.resx | 36 ++++---- UVtools.GUI/UVtools.GUI.csproj | 15 ++-- 28 files changed, 126 insertions(+), 136 deletions(-) delete mode 100644 UVtools.GUI/Images/Error-128x128.png delete mode 100644 UVtools.GUI/Images/arrow-down.ico delete mode 100644 UVtools.GUI/Images/arrow-up.ico delete mode 100644 UVtools.GUI/Images/plus.ico create mode 100644 UVtools.GUI/Images/sync-16x16.png create mode 100644 UVtools.GUI/Images/undo-16x16.png rename UVtools.GUI/Images/{Rotate-16x16.png => undo-alt-16x16.png} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3185c6..4fd5e24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * (Add) Layer issue Z map paired with layer navigation tracker bar * (Add) Setting: Pixel editor can be configured to exit after each apply operation (#45) * (Add) More abstraction on GUI and operations +* (Add) Verbose log - More a developer feature to cath bugs * (Improvement) Redesign tools and mutator windows * (Improvement) Erode, dilate, gap closing and noise removal converted into one window (Morph model) * (Improvement) Convert add edit parameters into one tool window, edit all at once now @@ -24,6 +25,7 @@ * (Improvement) Tool - Rotate: Disallow operation when selecting an angle of -360, 0 and 360 * (Improvement) Shortcuts: + and - to go up and down on layers were change to W and S keys. Reason: + and - are bound to zoom and can lead to problems Less frequently used settings for gap and noise removal iterations have been moved to an advanced settings group that is hidden by default, and can be shown if changes in those settings is desired. For many users, those advanced settings can be left on default and never adjusted. (#43) +* (Change) Tool - Rotate - icon * (Upgrade) OpenCV from 4.2 to 4.3 * (Upgrade) BinarySerializer from 8.5.2 to 8.5.3 * (Remove) Menu - Tools - Layer Removal and Layer clone for redudancy they now home at layer preview toolbar under "Actions" dropdown button diff --git a/UVtools.Core/Operations/OperationEditParameters.cs b/UVtools.Core/Operations/OperationEditParameters.cs index 93a5df9..7d55dca 100644 --- a/UVtools.Core/Operations/OperationEditParameters.cs +++ b/UVtools.Core/Operations/OperationEditParameters.cs @@ -12,7 +12,8 @@ namespace UVtools.Core.Operations { public class OperationEditParameters : Operation { - public override string Title => "Edit Parameters"; + public override string Title => "Edit print parameters"; + public override string Description => "Edits the available print parameters."; diff --git a/UVtools.Core/Operations/OperationPattern.cs b/UVtools.Core/Operations/OperationPattern.cs index f6e55f2..039c0dd 100644 --- a/UVtools.Core/Operations/OperationPattern.cs +++ b/UVtools.Core/Operations/OperationPattern.cs @@ -15,14 +15,14 @@ namespace UVtools.Core.Operations { #region Overrides - public override string Title => "Duplicate"; + public override string Title => "Pattern"; public override string Description => "Duplicates the model in a rectangular pattern around the build plate."; public override string ConfirmationText => - $"duplicate the object across {Cols} columns and {Rows} rows?"; + $"pattern the object across {Cols} columns and {Rows} rows?"; public override string ProgressTitle => - $"Duplicating the object across {Cols} columns and {Rows} rowss"; + $"Patterning the object across {Cols} columns and {Rows} rows"; public override string ProgressAction => "Patterned layers"; diff --git a/UVtools.GUI/Controls/Tools/CtrlToolChangeResolution.Designer.cs b/UVtools.GUI/Controls/Tools/CtrlToolChangeResolution.Designer.cs index 7c02991..b5b80d4 100644 --- a/UVtools.GUI/Controls/Tools/CtrlToolChangeResolution.Designer.cs +++ b/UVtools.GUI/Controls/Tools/CtrlToolChangeResolution.Designer.cs @@ -147,7 +147,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.AutoSize = true; this.Controls.Add(this.lbObjectVolume); this.Controls.Add(this.nmNewY); this.Controls.Add(this.label3); @@ -160,7 +160,7 @@ this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LayerRangeVisible = false; this.Name = "CtrlToolChangeResolution"; - this.Size = new System.Drawing.Size(540, 123); + this.Size = new System.Drawing.Size(540, 106); ((System.ComponentModel.ISupportInitialize)(this.nmNewY)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nmNewX)).EndInit(); this.ResumeLayout(false); diff --git a/UVtools.GUI/Controls/Tools/CtrlToolEditEditParameters.cs b/UVtools.GUI/Controls/Tools/CtrlToolEditEditParameters.cs index 0527892..c0e49f6 100644 --- a/UVtools.GUI/Controls/Tools/CtrlToolEditEditParameters.cs +++ b/UVtools.GUI/Controls/Tools/CtrlToolEditEditParameters.cs @@ -79,7 +79,7 @@ namespace UVtools.GUI.Controls.Tools ResetButton = new Button { - Image = Properties.Resources.refresh_16x16, + Image = Properties.Resources.undo_16x16, Dock = DockStyle.Fill, BackColor = Color.LightGray, Enabled = false, diff --git a/UVtools.GUI/Controls/Tools/CtrlToolFlip.Designer.cs b/UVtools.GUI/Controls/Tools/CtrlToolFlip.Designer.cs index f2c8891..6d34da4 100644 --- a/UVtools.GUI/Controls/Tools/CtrlToolFlip.Designer.cs +++ b/UVtools.GUI/Controls/Tools/CtrlToolFlip.Designer.cs @@ -51,8 +51,8 @@ this.cbMakeCopy.Size = new System.Drawing.Size(120, 24); this.cbMakeCopy.TabIndex = 22; this.cbMakeCopy.Text = "Blend Layers"; - this.toolTip.SetToolTip(this.cbMakeCopy, "If checked, rather than simply flipping the layer, a copy of each layer will be " + - "flipped and blended with the layer."); + this.toolTip.SetToolTip(this.cbMakeCopy, "If checked, rather than simply flipping the layer, a copy of each layer will be f" + + "lipped and blended with the layer."); this.cbMakeCopy.UseVisualStyleBackColor = true; // // cbFlipDirection @@ -68,14 +68,14 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.AutoSize = true; this.Controls.Add(this.cbMakeCopy); this.Controls.Add(this.cbFlipDirection); this.Controls.Add(this.lbX); this.Description = ""; this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "CtrlToolFlip"; - this.Size = new System.Drawing.Size(720, 45); + this.Size = new System.Drawing.Size(540, 37); this.ResumeLayout(false); this.PerformLayout(); diff --git a/UVtools.GUI/Controls/Tools/CtrlToolLayerReHeight.Designer.cs b/UVtools.GUI/Controls/Tools/CtrlToolLayerReHeight.Designer.cs index 7b4907a..62b00c6 100644 --- a/UVtools.GUI/Controls/Tools/CtrlToolLayerReHeight.Designer.cs +++ b/UVtools.GUI/Controls/Tools/CtrlToolLayerReHeight.Designer.cs @@ -65,7 +65,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.AutoSize = true; this.ButtonOkEnabled = false; this.Controls.Add(this.cbMultiplier); this.Controls.Add(this.label2); @@ -74,7 +74,7 @@ this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.LayerRangeVisible = false; this.Name = "CtrlToolLayerReHeight"; - this.Size = new System.Drawing.Size(540, 94); + this.Size = new System.Drawing.Size(540, 68); this.ResumeLayout(false); this.PerformLayout(); diff --git a/UVtools.GUI/Controls/Tools/CtrlToolMorph.Designer.cs b/UVtools.GUI/Controls/Tools/CtrlToolMorph.Designer.cs index 433e561..229e215 100644 --- a/UVtools.GUI/Controls/Tools/CtrlToolMorph.Designer.cs +++ b/UVtools.GUI/Controls/Tools/CtrlToolMorph.Designer.cs @@ -47,7 +47,7 @@ this.ctrlKernel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ctrlKernel.Location = new System.Drawing.Point(3, 87); this.ctrlKernel.Name = "ctrlKernel"; - this.ctrlKernel.Size = new System.Drawing.Size(580, 217); + this.ctrlKernel.Size = new System.Drawing.Size(533, 217); this.ctrlKernel.TabIndex = 22; this.ctrlKernel.Visible = false; // @@ -129,7 +129,7 @@ this.cbMorphOperation.FormattingEnabled = true; this.cbMorphOperation.Location = new System.Drawing.Point(93, 46); this.cbMorphOperation.Name = "cbMorphOperation"; - this.cbMorphOperation.Size = new System.Drawing.Size(495, 28); + this.cbMorphOperation.Size = new System.Drawing.Size(443, 28); this.cbMorphOperation.TabIndex = 23; // // label1 @@ -156,7 +156,7 @@ this.ExtraCheckboxVisible = true; this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "CtrlToolMorph"; - this.Size = new System.Drawing.Size(591, 307); + this.Size = new System.Drawing.Size(540, 307); ((System.ComponentModel.ISupportInitialize)(this.nmIterationsEnd)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nmIterationsStart)).EndInit(); this.ResumeLayout(false); diff --git a/UVtools.GUI/Controls/Tools/CtrlToolMove.Designer.cs b/UVtools.GUI/Controls/Tools/CtrlToolMove.Designer.cs index 78ddd05..c142242 100644 --- a/UVtools.GUI/Controls/Tools/CtrlToolMove.Designer.cs +++ b/UVtools.GUI/Controls/Tools/CtrlToolMove.Designer.cs @@ -62,6 +62,8 @@ // // groupBox1 // + this.groupBox1.AutoSize = true; + this.groupBox1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.groupBox1.Controls.Add(this.lbInsideBounds); this.groupBox1.Controls.Add(this.lbPlacementY); this.groupBox1.Controls.Add(this.lbPlacementX); @@ -79,7 +81,7 @@ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox1.Location = new System.Drawing.Point(0, 0); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(720, 210); + this.groupBox1.Size = new System.Drawing.Size(570, 214); this.groupBox1.TabIndex = 24; this.groupBox1.TabStop = false; this.groupBox1.Text = "Location && Margins"; @@ -389,13 +391,13 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.AutoSize = true; this.Controls.Add(this.groupBox1); this.Description = ""; this.ExtraButtonVisible = true; this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "CtrlToolMove"; - this.Size = new System.Drawing.Size(720, 210); + this.Size = new System.Drawing.Size(570, 214); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.tableAnchor.ResumeLayout(false); @@ -405,6 +407,7 @@ ((System.ComponentModel.ISupportInitialize)(this.nmMarginRight)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nmMarginLeft)).EndInit(); this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/UVtools.GUI/Controls/Tools/CtrlToolResize.Designer.cs b/UVtools.GUI/Controls/Tools/CtrlToolResize.Designer.cs index d9fcc7c..226becd 100644 --- a/UVtools.GUI/Controls/Tools/CtrlToolResize.Designer.cs +++ b/UVtools.GUI/Controls/Tools/CtrlToolResize.Designer.cs @@ -49,8 +49,9 @@ this.cbFade.Size = new System.Drawing.Size(283, 24); this.cbFade.TabIndex = 26; this.cbFade.Text = "Increase or decrease towards 100%"; - this.toolTip.SetToolTip(this.cbFade, "If checked, resize will gradually adjust the scale factor from the percentage specified" + - " to 100% as the operation progresses from the starting layer to the ending layer."); + this.toolTip.SetToolTip(this.cbFade, "If checked, resize will gradually adjust the scale factor from the percentage spe" + + "cified to 100% as the operation progresses from the starting layer to the ending" + + " layer."); this.cbFade.UseVisualStyleBackColor = true; // // label2 @@ -163,7 +164,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.AutoSize = true; this.ButtonOkEnabled = false; this.Controls.Add(this.cbFade); this.Controls.Add(this.label2); @@ -176,7 +177,7 @@ this.Description = ""; this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "CtrlToolResize"; - this.Size = new System.Drawing.Size(720, 77); + this.Size = new System.Drawing.Size(572, 68); ((System.ComponentModel.ISupportInitialize)(this.nmY)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nmX)).EndInit(); this.ResumeLayout(false); diff --git a/UVtools.GUI/Controls/Tools/CtrlToolTemplate.Designer.cs b/UVtools.GUI/Controls/Tools/CtrlToolTemplate.Designer.cs index 998bcac..84d6152 100644 --- a/UVtools.GUI/Controls/Tools/CtrlToolTemplate.Designer.cs +++ b/UVtools.GUI/Controls/Tools/CtrlToolTemplate.Designer.cs @@ -34,10 +34,9 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "CtrlToolTemplate"; - this.Size = new System.Drawing.Size(540, 403); + this.Size = new System.Drawing.Size(540, 268); this.ResumeLayout(false); } diff --git a/UVtools.GUI/Controls/Tools/CtrlToolThreshold.Designer.cs b/UVtools.GUI/Controls/Tools/CtrlToolThreshold.Designer.cs index 7505902..9e5ee5d 100644 --- a/UVtools.GUI/Controls/Tools/CtrlToolThreshold.Designer.cs +++ b/UVtools.GUI/Controls/Tools/CtrlToolThreshold.Designer.cs @@ -41,7 +41,7 @@ // // nmMaximum // - this.nmMaximum.Location = new System.Drawing.Point(305, 51); + this.nmMaximum.Location = new System.Drawing.Point(270, 51); this.nmMaximum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.nmMaximum.Maximum = new decimal(new int[] { 255, @@ -49,7 +49,7 @@ 0, 0}); this.nmMaximum.Name = "nmMaximum"; - this.nmMaximum.Size = new System.Drawing.Size(120, 26); + this.nmMaximum.Size = new System.Drawing.Size(70, 26); this.nmMaximum.TabIndex = 23; this.nmMaximum.Value = new decimal(new int[] { 255, @@ -60,7 +60,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(251, 54); + this.label2.Location = new System.Drawing.Point(216, 54); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(46, 20); @@ -69,7 +69,7 @@ // // nmThreshold // - this.nmThreshold.Location = new System.Drawing.Point(109, 51); + this.nmThreshold.Location = new System.Drawing.Point(128, 51); this.nmThreshold.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.nmThreshold.Maximum = new decimal(new int[] { 255, @@ -77,7 +77,7 @@ 0, 0}); this.nmThreshold.Name = "nmThreshold"; - this.nmThreshold.Size = new System.Drawing.Size(120, 26); + this.nmThreshold.Size = new System.Drawing.Size(70, 26); this.nmThreshold.TabIndex = 21; this.nmThreshold.Value = new decimal(new int[] { 127, @@ -99,9 +99,9 @@ // this.cbThresholdType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbThresholdType.FormattingEnabled = true; - this.cbThresholdType.Location = new System.Drawing.Point(437, 50); + this.cbThresholdType.Location = new System.Drawing.Point(347, 50); this.cbThresholdType.Name = "cbThresholdType"; - this.cbThresholdType.Size = new System.Drawing.Size(138, 28); + this.cbThresholdType.Size = new System.Drawing.Size(189, 28); this.cbThresholdType.TabIndex = 19; // // cbPresetHelpers @@ -114,7 +114,7 @@ "Set pixel brightness"}); this.cbPresetHelpers.Location = new System.Drawing.Point(128, 10); this.cbPresetHelpers.Name = "cbPresetHelpers"; - this.cbPresetHelpers.Size = new System.Drawing.Size(212, 28); + this.cbPresetHelpers.Size = new System.Drawing.Size(408, 28); this.cbPresetHelpers.TabIndex = 25; this.cbPresetHelpers.SelectedIndexChanged += new System.EventHandler(this.cbPresetHelpers_SelectedIndexChanged); // @@ -123,9 +123,9 @@ this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(4, 13); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(118, 20); + this.label3.Size = new System.Drawing.Size(115, 20); this.label3.TabIndex = 26; - this.label3.Text = "Preset Helpers:"; + this.label3.Text = "Preset helpers:"; // // CtrlToolThreshold // @@ -142,7 +142,7 @@ this.Description = ""; this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "CtrlToolThreshold"; - this.Size = new System.Drawing.Size(578, 82); + this.Size = new System.Drawing.Size(540, 82); ((System.ComponentModel.ISupportInitialize)(this.nmMaximum)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nmThreshold)).EndInit(); this.ResumeLayout(false); diff --git a/UVtools.GUI/Forms/FrmLoading.Designer.cs b/UVtools.GUI/Forms/FrmLoading.Designer.cs index 35d2f11..4d9c721 100644 --- a/UVtools.GUI/Forms/FrmLoading.Designer.cs +++ b/UVtools.GUI/Forms/FrmLoading.Designer.cs @@ -37,15 +37,16 @@ this.lbWait = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); this.lbOperation = new System.Windows.Forms.Label(); - this.panel2 = new System.Windows.Forms.Panel(); + this.pnActions = new System.Windows.Forms.Panel(); this.btnCancel = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); - this.panel2.SuspendLayout(); + this.pnActions.SuspendLayout(); this.SuspendLayout(); // // progressBar // - this.progressBar.Dock = System.Windows.Forms.DockStyle.Left; + this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.progressBar.Location = new System.Drawing.Point(0, 0); this.progressBar.Name = "progressBar"; this.progressBar.Size = new System.Drawing.Size(374, 29); @@ -88,15 +89,18 @@ // // panel1 // + this.panel1.AutoSize = true; + this.panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel1.Controls.Add(this.lbOperation); this.panel1.Controls.Add(this.lbDescription); this.panel1.Controls.Add(this.lbWait); this.panel1.Controls.Add(this.lbElapsedTime); - this.panel1.Controls.Add(this.panel2); + this.panel1.Controls.Add(this.pnActions); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.MinimumSize = new System.Drawing.Size(470, 124); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(470, 124); this.panel1.TabIndex = 4; @@ -111,19 +115,20 @@ this.lbOperation.Text = "Operation"; this.lbOperation.TextAlign = System.Drawing.ContentAlignment.TopCenter; // - // panel2 + // pnActions // - this.panel2.Controls.Add(this.btnCancel); - this.panel2.Controls.Add(this.progressBar); - this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 93); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(468, 29); - this.panel2.TabIndex = 5; + this.pnActions.Controls.Add(this.btnCancel); + this.pnActions.Controls.Add(this.progressBar); + this.pnActions.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pnActions.Location = new System.Drawing.Point(0, 93); + this.pnActions.Name = "pnActions"; + this.pnActions.Size = new System.Drawing.Size(468, 29); + this.pnActions.TabIndex = 5; // // btnCancel // - this.btnCancel.Dock = System.Windows.Forms.DockStyle.Fill; + this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnCancel.AutoSize = true; this.btnCancel.Location = new System.Drawing.Point(374, 0); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(94, 29); @@ -135,6 +140,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.ClientSize = new System.Drawing.Size(470, 124); this.ControlBox = false; this.Controls.Add(this.panel1); @@ -150,8 +156,10 @@ this.Text = "Loading"; this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - this.panel2.ResumeLayout(false); + this.pnActions.ResumeLayout(false); + this.pnActions.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout(); } @@ -164,7 +172,7 @@ private System.Windows.Forms.Label lbWait; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Label lbOperation; - private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel pnActions; private System.Windows.Forms.Button btnCancel; } } \ No newline at end of file diff --git a/UVtools.GUI/Forms/FrmSettings.Designer.cs b/UVtools.GUI/Forms/FrmSettings.Designer.cs index 53dc6bd..97500d7 100644 --- a/UVtools.GUI/Forms/FrmSettings.Designer.cs +++ b/UVtools.GUI/Forms/FrmSettings.Designer.cs @@ -278,7 +278,7 @@ // btnReset // this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnReset.Image = global::UVtools.GUI.Properties.Resources.Rotate_16x16; + this.btnReset.Image = global::UVtools.GUI.Properties.Resources.undo_alt_16x16; this.btnReset.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnReset.Location = new System.Drawing.Point(13, 15); this.btnReset.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); diff --git a/UVtools.GUI/Forms/FrmToolWindow.Designer.cs b/UVtools.GUI/Forms/FrmToolWindow.Designer.cs index a0ce5c2..469b5e9 100644 --- a/UVtools.GUI/Forms/FrmToolWindow.Designer.cs +++ b/UVtools.GUI/Forms/FrmToolWindow.Designer.cs @@ -347,7 +347,7 @@ namespace UVtools.GUI.Forms // this.cbActionExtra.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.cbActionExtra.AutoSize = true; - this.cbActionExtra.Location = new System.Drawing.Point(4, 32); + this.cbActionExtra.Location = new System.Drawing.Point(10, 31); this.cbActionExtra.Name = "cbActionExtra"; this.cbActionExtra.Size = new System.Drawing.Size(202, 24); this.cbActionExtra.TabIndex = 26; @@ -360,7 +360,7 @@ namespace UVtools.GUI.Forms // this.btnActionExtra.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnActionExtra.AutoSize = true; - this.btnActionExtra.Image = global::UVtools.GUI.Properties.Resources.Rotate_16x16; + this.btnActionExtra.Image = global::UVtools.GUI.Properties.Resources.undo_alt_16x16; this.btnActionExtra.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnActionExtra.Location = new System.Drawing.Point(4, 19); this.btnActionExtra.Name = "btnActionExtra"; diff --git a/UVtools.GUI/FrmMain.Designer.cs b/UVtools.GUI/FrmMain.Designer.cs index d21a8be..aa8a531 100644 --- a/UVtools.GUI/FrmMain.Designer.cs +++ b/UVtools.GUI/FrmMain.Designer.cs @@ -682,7 +682,7 @@ namespace UVtools.GUI this.btnLayerImageRotate.Checked = true; this.btnLayerImageRotate.CheckOnClick = true; this.btnLayerImageRotate.CheckState = System.Windows.Forms.CheckState.Checked; - this.btnLayerImageRotate.Image = global::UVtools.GUI.Properties.Resources.Rotate_16x16; + this.btnLayerImageRotate.Image = global::UVtools.GUI.Properties.Resources.undo_alt_16x16; this.btnLayerImageRotate.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnLayerImageRotate.Name = "btnLayerImageRotate"; this.btnLayerImageRotate.Size = new System.Drawing.Size(117, 22); diff --git a/UVtools.GUI/FrmMain.cs b/UVtools.GUI/FrmMain.cs index 0ea4832..167cd82 100644 --- a/UVtools.GUI/FrmMain.cs +++ b/UVtools.GUI/FrmMain.cs @@ -50,7 +50,7 @@ namespace UVtools.GUI new OperationMenuItem(new OperationMove(), Resources.move_16x16), new OperationMenuItem(new OperationResize(), Resources.crop_16x16), new OperationMenuItem(new OperationFlip(), Resources.flip_16x16), - new OperationMenuItem(new OperationRotate(), Resources.Rotate_16x16), + new OperationMenuItem(new OperationRotate(), Resources.sync_16x16), new OperationMenuItem(new OperationSolidify(), Resources.square_solid_16x16), new OperationMenuItem(new OperationMorph(), Resources.Geometry_16x16), new OperationMenuItem(new OperationMask(), Resources.mask_16x16), @@ -180,9 +180,9 @@ namespace UVtools.GUI { var item = new ToolStripMenuItem(menuItem.Operation.Title) { + AutoToolTip = true, ToolTipText = menuItem.Operation.Description, Tag = menuItem.Operation, - AutoToolTip = true, Image = menuItem.Icon }; item.Click += EventClick; @@ -291,6 +291,7 @@ namespace UVtools.GUI #endregion #region Overrides + protected override CreateParams CreateParams { get diff --git a/UVtools.GUI/FrmMain.resx b/UVtools.GUI/FrmMain.resx index 08f3456..124d9d2 100644 --- a/UVtools.GUI/FrmMain.resx +++ b/UVtools.GUI/FrmMain.resx @@ -174,7 +174,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABk - FAAAAk1TRnQBSQFMAgEBBgEAAZgBCgGYAQoBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + FAAAAk1TRnQBSQFMAgEBBgEAAaABCgGgAQoBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABIAMAAQEBAAEgBgABIC4AAxgBIgMwAUsDMAFMAzIBUDMAAQEDJAE2AysBQqwAAyIBMQNWAbkDXQHi AwAB/wMAAf8BKgEtASgB/gNTAawDTQGVAwABARgAAwkBDAMzAVIDUAGdA1cB6AMAAf4DKwH8Ay8BSqQA AyEBMANZAewBKwEuASkB+gNRAfcDUgH0A1MB8QNIAfYDQQH5AwAB/wNPAZsDAAEBCAADFQEdAz8BbgNV diff --git a/UVtools.GUI/Images/Error-128x128.png b/UVtools.GUI/Images/Error-128x128.png deleted file mode 100644 index d676c15f60a1d58d36937cda152db1625fd0e625..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 889 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 R?IA>jG7^lrbd2@b`~Ly?ZOs4x diff --git a/UVtools.GUI/Images/arrow-up.ico b/UVtools.GUI/Images/arrow-up.ico deleted file mode 100644 index 19ee15fc9560d180f115c6e5b812f098dc01d3f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163464 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 G-v0-FR72|k diff --git a/UVtools.GUI/Images/plus.ico b/UVtools.GUI/Images/plus.ico deleted file mode 100644 index 2bfd834a14c492ac29a2ea943638abb4d737a05e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162918 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 diff --git a/UVtools.GUI/Images/sync-16x16.png b/UVtools.GUI/Images/sync-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..c5f7827087ff79cedfab80d96d7fead583fcc211 GIT binary patch literal 245 zcmV6S85jg%X_!SVhOgMx!#aq3*z1FtMUjWaszrnL@`PjiJciNV zmE-RCzxPQFT)J`V%8?ygrdEbjoqbdb;cPwr^60@w^lxe$;v@#WxsCIbgx6S)W%c)9 z63t9jb3%z`BwOg#Rs4g};+C>ee7exJAF8rh%=YO1T#xkzFXV(%8*_bod>mBoG5GZ4 v*|#C;LRhMpxHqI)ncA}J*tI)Vaj5wLIOc9Ey+Hpl00000NkvXXu0mjfI{b5b literal 0 HcmV?d00001 diff --git a/UVtools.GUI/Images/undo-16x16.png b/UVtools.GUI/Images/undo-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..a9b83da720c883436c20bde37f15f6e6fd8bb193 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6)_J-(hEyca0-E2rsKE1p!_zx3bdhr9dQtUC5+V}np$Er}kDB?N`F1E-9) fYU%Fm+7G#o#U?nX7o=zdUC!X?>gTe~DWM4fyj@%h literal 0 HcmV?d00001 diff --git a/UVtools.GUI/Images/Rotate-16x16.png b/UVtools.GUI/Images/undo-alt-16x16.png similarity index 100% rename from UVtools.GUI/Images/Rotate-16x16.png rename to UVtools.GUI/Images/undo-alt-16x16.png diff --git a/UVtools.GUI/Properties/Resources.Designer.cs b/UVtools.GUI/Properties/Resources.Designer.cs index 006371c..659af52 100644 --- a/UVtools.GUI/Properties/Resources.Designer.cs +++ b/UVtools.GUI/Properties/Resources.Designer.cs @@ -70,16 +70,6 @@ namespace UVtools.GUI.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrow_down { - get { - object obj = ResourceManager.GetObject("arrow-down", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -120,16 +110,6 @@ namespace UVtools.GUI.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap arrow_up { - get { - object obj = ResourceManager.GetObject("arrow-up", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -340,16 +320,6 @@ namespace UVtools.GUI.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Error_128x128 { - get { - object obj = ResourceManager.GetObject("Error-128x128", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -750,16 +720,6 @@ namespace UVtools.GUI.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap plus { - get { - object obj = ResourceManager.GetObject("plus", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -800,16 +760,6 @@ namespace UVtools.GUI.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Rotate_16x16 { - get { - object obj = ResourceManager.GetObject("Rotate-16x16", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -870,6 +820,16 @@ namespace UVtools.GUI.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap sync_16x16 { + get { + object obj = ResourceManager.GetObject("sync-16x16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -900,6 +860,26 @@ namespace UVtools.GUI.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap undo_16x16 { + get { + object obj = ResourceManager.GetObject("undo-16x16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap undo_alt_16x16 { + get { + object obj = ResourceManager.GetObject("undo-alt-16x16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/UVtools.GUI/Properties/Resources.resx b/UVtools.GUI/Properties/Resources.resx index ff8ece6..eae12a1 100644 --- a/UVtools.GUI/Properties/Resources.resx +++ b/UVtools.GUI/Properties/Resources.resx @@ -130,9 +130,6 @@ ..\Images\Wrench-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\Error-128x128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Images\island-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -163,9 +160,6 @@ ..\Images\checkbox-unmarked-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\arrow-up.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Images\warning-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -175,6 +169,9 @@ ..\Images\list-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Images\undo-alt-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\UVtools.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -187,8 +184,8 @@ ..\Images\Ok-24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\blur-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Images\plus-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Images\Save-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -220,9 +217,6 @@ ..\Images\cursor-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\Rotate-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Images\settings-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -238,6 +232,9 @@ ..\Images\clipboard-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Images\sync-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Images\Exit-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -250,17 +247,17 @@ ..\Images\pattern-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\plus.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Images\Extract-object-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Images\blur-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Images\checkbox-marked-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\arrow-down.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Images\minus_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Images\sort-alpha-up-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -310,9 +307,6 @@ ..\Images\Button-Info-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\plus-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Images\Global-Network-icon-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -376,7 +370,7 @@ ..\Images\expand-alt-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\minus_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Images\undo-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/UVtools.GUI/UVtools.GUI.csproj b/UVtools.GUI/UVtools.GUI.csproj index 3152bd0..c020e9d 100644 --- a/UVtools.GUI/UVtools.GUI.csproj +++ b/UVtools.GUI/UVtools.GUI.csproj @@ -413,14 +413,9 @@ ResXFileCodeGenerator - Resources.Designer.cs Designer + Resources.Designer.cs - - True - Resources.resx - True - CHANGELOG.md PreserveNewest @@ -441,6 +436,11 @@ SettingsSingleFileGenerator Settings.Designer.cs + + True + True + Resources.resx + True Settings.settings @@ -487,6 +487,7 @@ + @@ -497,7 +498,7 @@ - +