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

fixes

Browse Source
This commit is contained in:
Tiago Conceição
2020-09-11 03:06:56 +01:00
parent 81288a78d9
commit a20ac92540
28 changed files with 126 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+2
View File
@@ -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
UVtools.Core/Operations/OperationEditParameters.cs
+2 -1
View File
@@ -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.";
UVtools.Core/Operations/OperationPattern.cs
+3 -3
View File
@@ -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";
UVtools.GUI/Controls/Tools/CtrlToolChangeResolution.Designer.cs
Generated
+2 -2
View File
@@ -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);
UVtools.GUI/Controls/Tools/CtrlToolEditEditParameters.cs
+1 -1
View File
@@ -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,
UVtools.GUI/Controls/Tools/CtrlToolFlip.Designer.cs
Generated
+4 -4
View File
@@ -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();
UVtools.GUI/Controls/Tools/CtrlToolLayerReHeight.Designer.cs
Generated
+2 -2
View File
@@ -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();
UVtools.GUI/Controls/Tools/CtrlToolMorph.Designer.cs
Generated
+3 -3
View File
@@ -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);
UVtools.GUI/Controls/Tools/CtrlToolMove.Designer.cs
Generated
+6 -3
View File
@@ -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();
}
UVtools.GUI/Controls/Tools/CtrlToolResize.Designer.cs
Generated
+5 -4
View File
@@ -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);
UVtools.GUI/Controls/Tools/CtrlToolTemplate.Designer.cs
Generated
+1 -2
View File
@@ -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);
}
UVtools.GUI/Controls/Tools/CtrlToolThreshold.Designer.cs
Generated
+11 -11
View File
@@ -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);
UVtools.GUI/Forms/FrmLoading.Designer.cs
Generated
+23 -15
View File
@@ -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;
}
}
UVtools.GUI/Forms/FrmSettings.Designer.cs
Generated
+1 -1
View File
@@ -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);
UVtools.GUI/Forms/FrmToolWindow.Designer.cs
Generated
+2 -2
View File
@@ -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";
UVtools.GUI/FrmMain.Designer.cs
Generated
+1 -1
View File
@@ -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);
UVtools.GUI/FrmMain.cs
+3 -2
View File
@@ -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
UVtools.GUI/FrmMain.resx
+1 -1
View File
@@ -174,7 +174,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABk
FAAAAk1TRnQBSQFMAgEBBgEAAZgBCgGYAQoBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
FAAAAk1TRnQBSQFMAgEBBgEAAaABCgGgAQoBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABIAMAAQEBAAEgBgABIC4AAxgBIgMwAUsDMAFMAzIBUDMAAQEDJAE2AysBQqwAAyIBMQNWAbkDXQHi
AwAB/wMAAf8BKgEtASgB/gNTAawDTQGVAwABARgAAwkBDAMzAVIDUAGdA1cB6AMAAf4DKwH8Ay8BSqQA
AyEBMANZAewBKwEuASkB+gNRAfcDUgH0A1MB8QNIAfYDQQH5AwAB/wNPAZsDAAEBCAADFQEdAz8BbgNV
UVtools.GUI/Images/Error-128x128.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 889 B

UVtools.GUI/Images/arrow-down.ico
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 160 KiB

UVtools.GUI/Images/arrow-up.ico
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 160 KiB

UVtools.GUI/Images/plus.ico
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 159 KiB

UVtools.GUI/Images/sync-16x16.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 245 B

UVtools.GUI/Images/undo-16x16.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 231 B

UVtools.GUI/Images/Rotate-16x16.png → UVtools.GUI/Images/undo-alt-16x16.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 259 B

After

Width:  |  Height:  |  Size: 259 B

UVtools.GUI/Properties/Resources.Designer.cs
Generated
+30 -50
View File
@@ -70,16 +70,6 @@ namespace UVtools.GUI.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap arrow_down {
get {
object obj = ResourceManager.GetObject("arrow-down", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -120,16 +110,6 @@ namespace UVtools.GUI.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap arrow_up {
get {
object obj = ResourceManager.GetObject("arrow-up", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -340,16 +320,6 @@ namespace UVtools.GUI.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Error_128x128 {
get {
object obj = ResourceManager.GetObject("Error-128x128", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -750,16 +720,6 @@ namespace UVtools.GUI.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap plus {
get {
object obj = ResourceManager.GetObject("plus", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -800,16 +760,6 @@ namespace UVtools.GUI.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Rotate_16x16 {
get {
object obj = ResourceManager.GetObject("Rotate-16x16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -870,6 +820,16 @@ namespace UVtools.GUI.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap sync_16x16 {
get {
object obj = ResourceManager.GetObject("sync-16x16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -900,6 +860,26 @@ namespace UVtools.GUI.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap undo_16x16 {
get {
object obj = ResourceManager.GetObject("undo-16x16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap undo_alt_16x16 {
get {
object obj = ResourceManager.GetObject("undo-alt-16x16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
UVtools.GUI/Properties/Resources.resx
+15 -21
View File
@@ -130,9 +130,6 @@
<data name="Wrench-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\Wrench-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Error-128x128" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\Error-128x128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="island-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\island-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -163,9 +160,6 @@
<data name="checkbox-unmarked-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\checkbox-unmarked-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="arrow-up" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\arrow-up.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="warning-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\warning-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -175,6 +169,9 @@
<data name="list-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\list-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="undo-alt-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\undo-alt-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UVtools" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\UVtools.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -187,8 +184,8 @@
<data name="Ok-24x24" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\Ok-24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="blur-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\blur-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="plus-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\plus-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Save-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\Save-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -220,9 +217,6 @@
<data name="cursor-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\cursor-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Rotate-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\Rotate-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="settings-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\settings-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -238,6 +232,9 @@
<data name="clipboard-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\clipboard-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sync-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\sync-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Exit-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\Exit-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -250,17 +247,17 @@
<data name="pattern-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\pattern-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\plus.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Extract-object-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\Extract-object-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="blur-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\blur-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbox-marked-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\checkbox-marked-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="arrow-down" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\arrow-down.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="minus_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\minus_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sort-alpha-up-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\sort-alpha-up-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -310,9 +307,6 @@
<data name="Button-Info-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\Button-Info-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="plus-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\plus-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Global-Network-icon-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\Global-Network-icon-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -376,7 +370,7 @@
<data name="expand-alt-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\expand-alt-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="minus_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\minus_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="undo-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\undo-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
UVtools.GUI/UVtools.GUI.csproj
+8 -7
View File
@@ -413,14 +413,9 @@
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="..\CHANGELOG.md">
<Link>CHANGELOG.md</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -441,6 +436,11 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
@@ -487,6 +487,7 @@
<None Include="Images\file-import-16x16.png" />
<None Include="Images\plus-16x16.png" />
<None Include="Images\minus_16x16.png" />
<None Include="Images\sync-16x16.png" />
<Content Include="UVtools.ico" />
<None Include="UVtools.png" />
<None Include="Images\Exit-16x16.png" />
@@ -497,7 +498,7 @@
<None Include="Images\Global-Network-icon-16x16.png" />
<None Include="Images\Convert-16x16.png" />
<None Include="Images\layers-16x16.png" />
<None Include="Images\Rotate-16x16.png" />
<None Include="Images\undo-16x16.png" />
<None Include="Images\Back-16x16.png" />
<None Include="Images\Next-16x16.png" />
<None Include="Images\Save-16x16.png" />