mirror of
https://github.com/riegera2412/UVtools.git
synced 2026-07-08 17:42:31 +02:00
v0.6.3.1
* (Add) Preview: Allow import images from disk and replace preview image * (Add) Issue and Pixel Editor ListView can now reorder columns * (Add) Pixel Editor: Button "Clear" remove all the modifications * (Add) Pixel Editor: Button "Apply All" to apply the modifications * (Add) Pixel Editor: Double click items will track and position over the draw * (Fix) Pixel Editor: Label "Operations" was not reset to 0 after apply the modifications * (Fix) Pixel Editor: Button "Remove" tooltip * (Fix) Pixel Editor: Drawing - Bursh Area - px to px²
This commit is contained in:
@@ -1,5 +1,16 @@
|
||||
# Changelog
|
||||
|
||||
## 20/07/2020 - v0.6.3.1
|
||||
|
||||
* (Add) Preview: Allow import images from disk and replace preview image
|
||||
* (Add) Issue and Pixel Editor ListView can now reorder columns
|
||||
* (Add) Pixel Editor: Button "Clear" remove all the modifications
|
||||
* (Add) Pixel Editor: Button "Apply All" to apply the modifications
|
||||
* (Add) Pixel Editor: Double click items will track and position over the draw
|
||||
* (Fix) Pixel Editor: Label "Operations" was not reset to 0 after apply the modifications
|
||||
* (Fix) Pixel Editor: Button "Remove" tooltip
|
||||
* (Fix) Pixel Editor: Drawing - Bursh Area - px to px²
|
||||
|
||||
## 19/07/2020 - v0.6.3.0
|
||||
|
||||
* (Add) Layer remove button
|
||||
|
||||
@@ -15,6 +15,7 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Emgu.CV;
|
||||
using Emgu.CV.CvEnum;
|
||||
using UVtools.Core.Extensions;
|
||||
using UVtools.Core.Operations;
|
||||
|
||||
@@ -462,6 +463,15 @@ namespace UVtools.Core.FileFormats
|
||||
}
|
||||
}
|
||||
|
||||
public void SetThumbnail(int index, string filePath)
|
||||
{
|
||||
Thumbnails[index] = CvInvoke.Imread(filePath, ImreadModes.AnyColor);
|
||||
if (Thumbnails[index].Size != ThumbnailsOriginalSize[index])
|
||||
{
|
||||
CvInvoke.Resize(Thumbnails[index], Thumbnails[index], ThumbnailsOriginalSize[index]);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void Encode(string fileFullPath, OperationProgress progress = null)
|
||||
{
|
||||
FileFullPath = fileFullPath;
|
||||
|
||||
@@ -75,6 +75,8 @@ namespace UVtools.Core.FileFormats
|
||||
/// </summary>
|
||||
Mat[] Thumbnails { get; set; }
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Gets the cached layers into compressed bytes
|
||||
/// </summary>
|
||||
@@ -230,6 +232,13 @@ namespace UVtools.Core.FileFormats
|
||||
/// <param name="images">Image to set</param>
|
||||
void SetThumbnails(Mat images);
|
||||
|
||||
/// <summary>
|
||||
/// Sets a thumbnail from a disk file
|
||||
/// </summary>
|
||||
/// <param name="index">Thumbnail index</param>
|
||||
/// <param name="filePath"></param>
|
||||
void SetThumbnail(int index, string filePath);
|
||||
|
||||
/// <summary>
|
||||
/// Encode to an output file
|
||||
/// </summary>
|
||||
|
||||
@@ -16,6 +16,7 @@ namespace UVtools.Core.PixelEditor
|
||||
public PixelDrainHole(uint layerIndex, Point location, byte diameter) : base(PixelOperationType.DrainHole, layerIndex, location)
|
||||
{
|
||||
Diameter = diameter;
|
||||
Size = new Size(diameter, diameter);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,6 +40,7 @@ namespace UVtools.Core.PixelEditor
|
||||
|
||||
int shiftPos = brushSize / 2;
|
||||
Rectangle = new Rectangle(Math.Max(0, location.X - shiftPos), Math.Max(0, location.Y - shiftPos), brushSize-1, brushSize-1);
|
||||
Size = new Size(BrushSize, BrushSize);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,6 +23,8 @@ namespace UVtools.Core.PixelEditor
|
||||
|
||||
public Point Location { get; }
|
||||
|
||||
public Size Size { get; private protected set; } = Size.Empty;
|
||||
|
||||
|
||||
public PixelOperation(PixelOperationType operationType, uint layerIndex, Point location)
|
||||
{
|
||||
|
||||
@@ -22,6 +22,7 @@ namespace UVtools.Core.PixelEditor
|
||||
TipDiameter = tipDiameter;
|
||||
PillarDiameter = pillarDiameter;
|
||||
BaseDiameter = baseDiameter;
|
||||
Size = new Size(TipDiameter, TipDiameter);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<RepositoryUrl>https://github.com/sn4k3/UVtools</RepositoryUrl>
|
||||
<PackageProjectUrl>https://github.com/sn4k3/UVtools</PackageProjectUrl>
|
||||
<Description>MSLA/DLP, file analysis, repair, conversion and manipulation</Description>
|
||||
<Version>0.6.3.0</Version>
|
||||
<Version>0.6.3.1</Version>
|
||||
<Copyright>Copyright © 2020 PTRTECH</Copyright>
|
||||
<PackageIcon>UVtools.png</PackageIcon>
|
||||
<Platforms>AnyCPU;x64</Platforms>
|
||||
|
||||
@@ -171,6 +171,9 @@
|
||||
<setting name="FileExtractDefaultDirectory" serializeAs="String">
|
||||
<value />
|
||||
</setting>
|
||||
<setting name="AutoZoomIssues" serializeAs="String">
|
||||
<value>True</value>
|
||||
</setting>
|
||||
</UVtools.GUI.Properties.Settings>
|
||||
</userSettings>
|
||||
</configuration>
|
||||
|
||||
+276
-263
@@ -93,8 +93,31 @@
|
||||
this.cbAutoComputeIssuesClickOnTab = new System.Windows.Forms.CheckBox();
|
||||
this.tabSettings = new System.Windows.Forms.TabControl();
|
||||
this.tabPage1 = new System.Windows.Forms.TabPage();
|
||||
this.groupBox5 = new System.Windows.Forms.GroupBox();
|
||||
this.btnFileExtractDefaultDirectoryClear = new System.Windows.Forms.Button();
|
||||
this.btnFileExtractDefaultDirectorySearch = new System.Windows.Forms.Button();
|
||||
this.label32 = new System.Windows.Forms.Label();
|
||||
this.tbFileExtractDefaultDirectory = new System.Windows.Forms.TextBox();
|
||||
this.btnFileConvertDefaultDirectoryClear = new System.Windows.Forms.Button();
|
||||
this.btnFileConvertDefaultDirectorySearch = new System.Windows.Forms.Button();
|
||||
this.label31 = new System.Windows.Forms.Label();
|
||||
this.tbFileConvertDefaultDirectory = new System.Windows.Forms.TextBox();
|
||||
this.btnFileSaveDefaultDirectoryClear = new System.Windows.Forms.Button();
|
||||
this.btnFileSaveDefaultDirectorySearch = new System.Windows.Forms.Button();
|
||||
this.label30 = new System.Windows.Forms.Label();
|
||||
this.tbFileSaveDefaultDirectory = new System.Windows.Forms.TextBox();
|
||||
this.btnFileOpenDefaultDirectoryClear = new System.Windows.Forms.Button();
|
||||
this.btnFileOpenDefaultDirectorySearch = new System.Windows.Forms.Button();
|
||||
this.label29 = new System.Windows.Forms.Label();
|
||||
this.tbFileOpenDefaultDirectory = new System.Windows.Forms.TextBox();
|
||||
this.label22 = new System.Windows.Forms.Label();
|
||||
this.cbDefaultOpenFileExtension = new System.Windows.Forms.ComboBox();
|
||||
this.label28 = new System.Windows.Forms.Label();
|
||||
this.cbFileSavePromptOverwrite = new System.Windows.Forms.CheckBox();
|
||||
this.tbFileSaveNameSuffix = new System.Windows.Forms.TextBox();
|
||||
this.label27 = new System.Windows.Forms.Label();
|
||||
this.tbFileSaveNamePreffix = new System.Windows.Forms.TextBox();
|
||||
this.groupBox4 = new System.Windows.Forms.GroupBox();
|
||||
this.tabPage2 = new System.Windows.Forms.TabPage();
|
||||
this.tabPage3 = new System.Windows.Forms.TabPage();
|
||||
this.tabPage4 = new System.Windows.Forms.TabPage();
|
||||
@@ -107,29 +130,7 @@
|
||||
this.label23 = new System.Windows.Forms.Label();
|
||||
this.btnPixelEditorAddPixelColor = new System.Windows.Forms.Button();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.cbFileSavePromptOverwrite = new System.Windows.Forms.CheckBox();
|
||||
this.label27 = new System.Windows.Forms.Label();
|
||||
this.tbFileSaveNamePreffix = new System.Windows.Forms.TextBox();
|
||||
this.tbFileSaveNameSuffix = new System.Windows.Forms.TextBox();
|
||||
this.label28 = new System.Windows.Forms.Label();
|
||||
this.groupBox4 = new System.Windows.Forms.GroupBox();
|
||||
this.groupBox5 = new System.Windows.Forms.GroupBox();
|
||||
this.tbFileOpenDefaultDirectory = new System.Windows.Forms.TextBox();
|
||||
this.label29 = new System.Windows.Forms.Label();
|
||||
this.btnFileOpenDefaultDirectorySearch = new System.Windows.Forms.Button();
|
||||
this.btnFileOpenDefaultDirectoryClear = new System.Windows.Forms.Button();
|
||||
this.btnFileSaveDefaultDirectoryClear = new System.Windows.Forms.Button();
|
||||
this.btnFileSaveDefaultDirectorySearch = new System.Windows.Forms.Button();
|
||||
this.label30 = new System.Windows.Forms.Label();
|
||||
this.tbFileSaveDefaultDirectory = new System.Windows.Forms.TextBox();
|
||||
this.btnFileConvertDefaultDirectoryClear = new System.Windows.Forms.Button();
|
||||
this.btnFileConvertDefaultDirectorySearch = new System.Windows.Forms.Button();
|
||||
this.label31 = new System.Windows.Forms.Label();
|
||||
this.tbFileConvertDefaultDirectory = new System.Windows.Forms.TextBox();
|
||||
this.btnFileExtractDefaultDirectoryClear = new System.Windows.Forms.Button();
|
||||
this.btnFileExtractDefaultDirectorySearch = new System.Windows.Forms.Button();
|
||||
this.label32 = new System.Windows.Forms.Label();
|
||||
this.tbFileExtractDefaultDirectory = new System.Windows.Forms.TextBox();
|
||||
this.cbAutoZoomIssues = new System.Windows.Forms.CheckBox();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nmOutlineHollowAreasLineThickness)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nmOutlineLayerBoundsLineThickness)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nmOutlinePrintVolumeBoundsLineThickness)).BeginInit();
|
||||
@@ -147,12 +148,12 @@
|
||||
this.groupBox1.SuspendLayout();
|
||||
this.tabSettings.SuspendLayout();
|
||||
this.tabPage1.SuspendLayout();
|
||||
this.groupBox5.SuspendLayout();
|
||||
this.groupBox4.SuspendLayout();
|
||||
this.tabPage2.SuspendLayout();
|
||||
this.tabPage3.SuspendLayout();
|
||||
this.tabPage4.SuspendLayout();
|
||||
this.panel1.SuspendLayout();
|
||||
this.groupBox4.SuspendLayout();
|
||||
this.groupBox5.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// label1
|
||||
@@ -581,7 +582,7 @@
|
||||
// cbLayerDifferenceDefault
|
||||
//
|
||||
this.cbLayerDifferenceDefault.AutoSize = true;
|
||||
this.cbLayerDifferenceDefault.Location = new System.Drawing.Point(11, 305);
|
||||
this.cbLayerDifferenceDefault.Location = new System.Drawing.Point(11, 333);
|
||||
this.cbLayerDifferenceDefault.Name = "cbLayerDifferenceDefault";
|
||||
this.cbLayerDifferenceDefault.Size = new System.Drawing.Size(234, 22);
|
||||
this.cbLayerDifferenceDefault.TabIndex = 13;
|
||||
@@ -996,6 +997,187 @@
|
||||
this.tabPage1.Text = "General";
|
||||
this.tabPage1.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// groupBox5
|
||||
//
|
||||
this.groupBox5.Controls.Add(this.btnFileExtractDefaultDirectoryClear);
|
||||
this.groupBox5.Controls.Add(this.btnFileExtractDefaultDirectorySearch);
|
||||
this.groupBox5.Controls.Add(this.label32);
|
||||
this.groupBox5.Controls.Add(this.tbFileExtractDefaultDirectory);
|
||||
this.groupBox5.Controls.Add(this.btnFileConvertDefaultDirectoryClear);
|
||||
this.groupBox5.Controls.Add(this.btnFileConvertDefaultDirectorySearch);
|
||||
this.groupBox5.Controls.Add(this.label31);
|
||||
this.groupBox5.Controls.Add(this.tbFileConvertDefaultDirectory);
|
||||
this.groupBox5.Controls.Add(this.btnFileSaveDefaultDirectoryClear);
|
||||
this.groupBox5.Controls.Add(this.btnFileSaveDefaultDirectorySearch);
|
||||
this.groupBox5.Controls.Add(this.label30);
|
||||
this.groupBox5.Controls.Add(this.tbFileSaveDefaultDirectory);
|
||||
this.groupBox5.Controls.Add(this.btnFileOpenDefaultDirectoryClear);
|
||||
this.groupBox5.Controls.Add(this.btnFileOpenDefaultDirectorySearch);
|
||||
this.groupBox5.Controls.Add(this.label29);
|
||||
this.groupBox5.Controls.Add(this.tbFileOpenDefaultDirectory);
|
||||
this.groupBox5.Controls.Add(this.label22);
|
||||
this.groupBox5.Controls.Add(this.cbDefaultOpenFileExtension);
|
||||
this.groupBox5.Controls.Add(this.label28);
|
||||
this.groupBox5.Controls.Add(this.cbFileSavePromptOverwrite);
|
||||
this.groupBox5.Controls.Add(this.tbFileSaveNameSuffix);
|
||||
this.groupBox5.Controls.Add(this.label27);
|
||||
this.groupBox5.Controls.Add(this.tbFileSaveNamePreffix);
|
||||
this.groupBox5.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupBox5.Location = new System.Drawing.Point(3, 86);
|
||||
this.groupBox5.Name = "groupBox5";
|
||||
this.groupBox5.Size = new System.Drawing.Size(610, 250);
|
||||
this.groupBox5.TabIndex = 16;
|
||||
this.groupBox5.TabStop = false;
|
||||
this.groupBox5.Text = "File operations";
|
||||
//
|
||||
// btnFileExtractDefaultDirectoryClear
|
||||
//
|
||||
this.btnFileExtractDefaultDirectoryClear.Image = global::UVtools.GUI.Properties.Resources.delete_16x16;
|
||||
this.btnFileExtractDefaultDirectoryClear.Location = new System.Drawing.Point(574, 115);
|
||||
this.btnFileExtractDefaultDirectoryClear.Name = "btnFileExtractDefaultDirectoryClear";
|
||||
this.btnFileExtractDefaultDirectoryClear.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileExtractDefaultDirectoryClear.TabIndex = 30;
|
||||
this.btnFileExtractDefaultDirectoryClear.UseVisualStyleBackColor = true;
|
||||
this.btnFileExtractDefaultDirectoryClear.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// btnFileExtractDefaultDirectorySearch
|
||||
//
|
||||
this.btnFileExtractDefaultDirectorySearch.Image = global::UVtools.GUI.Properties.Resources.Open_16x16;
|
||||
this.btnFileExtractDefaultDirectorySearch.Location = new System.Drawing.Point(538, 115);
|
||||
this.btnFileExtractDefaultDirectorySearch.Name = "btnFileExtractDefaultDirectorySearch";
|
||||
this.btnFileExtractDefaultDirectorySearch.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileExtractDefaultDirectorySearch.TabIndex = 29;
|
||||
this.btnFileExtractDefaultDirectorySearch.UseVisualStyleBackColor = true;
|
||||
this.btnFileExtractDefaultDirectorySearch.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// label32
|
||||
//
|
||||
this.label32.AutoSize = true;
|
||||
this.label32.Location = new System.Drawing.Point(6, 118);
|
||||
this.label32.Name = "label32";
|
||||
this.label32.Size = new System.Drawing.Size(191, 18);
|
||||
this.label32.TabIndex = 28;
|
||||
this.label32.Text = "File extract default directory:";
|
||||
//
|
||||
// tbFileExtractDefaultDirectory
|
||||
//
|
||||
this.tbFileExtractDefaultDirectory.Location = new System.Drawing.Point(225, 115);
|
||||
this.tbFileExtractDefaultDirectory.Name = "tbFileExtractDefaultDirectory";
|
||||
this.tbFileExtractDefaultDirectory.ReadOnly = true;
|
||||
this.tbFileExtractDefaultDirectory.Size = new System.Drawing.Size(307, 24);
|
||||
this.tbFileExtractDefaultDirectory.TabIndex = 27;
|
||||
//
|
||||
// btnFileConvertDefaultDirectoryClear
|
||||
//
|
||||
this.btnFileConvertDefaultDirectoryClear.Image = global::UVtools.GUI.Properties.Resources.delete_16x16;
|
||||
this.btnFileConvertDefaultDirectoryClear.Location = new System.Drawing.Point(574, 145);
|
||||
this.btnFileConvertDefaultDirectoryClear.Name = "btnFileConvertDefaultDirectoryClear";
|
||||
this.btnFileConvertDefaultDirectoryClear.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileConvertDefaultDirectoryClear.TabIndex = 26;
|
||||
this.btnFileConvertDefaultDirectoryClear.UseVisualStyleBackColor = true;
|
||||
this.btnFileConvertDefaultDirectoryClear.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// btnFileConvertDefaultDirectorySearch
|
||||
//
|
||||
this.btnFileConvertDefaultDirectorySearch.Image = global::UVtools.GUI.Properties.Resources.Open_16x16;
|
||||
this.btnFileConvertDefaultDirectorySearch.Location = new System.Drawing.Point(538, 145);
|
||||
this.btnFileConvertDefaultDirectorySearch.Name = "btnFileConvertDefaultDirectorySearch";
|
||||
this.btnFileConvertDefaultDirectorySearch.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileConvertDefaultDirectorySearch.TabIndex = 25;
|
||||
this.btnFileConvertDefaultDirectorySearch.UseVisualStyleBackColor = true;
|
||||
this.btnFileConvertDefaultDirectorySearch.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// label31
|
||||
//
|
||||
this.label31.AutoSize = true;
|
||||
this.label31.Location = new System.Drawing.Point(6, 148);
|
||||
this.label31.Name = "label31";
|
||||
this.label31.Size = new System.Drawing.Size(196, 18);
|
||||
this.label31.TabIndex = 24;
|
||||
this.label31.Text = "File convert default directory:";
|
||||
//
|
||||
// tbFileConvertDefaultDirectory
|
||||
//
|
||||
this.tbFileConvertDefaultDirectory.Location = new System.Drawing.Point(225, 145);
|
||||
this.tbFileConvertDefaultDirectory.Name = "tbFileConvertDefaultDirectory";
|
||||
this.tbFileConvertDefaultDirectory.ReadOnly = true;
|
||||
this.tbFileConvertDefaultDirectory.Size = new System.Drawing.Size(307, 24);
|
||||
this.tbFileConvertDefaultDirectory.TabIndex = 23;
|
||||
//
|
||||
// btnFileSaveDefaultDirectoryClear
|
||||
//
|
||||
this.btnFileSaveDefaultDirectoryClear.Image = global::UVtools.GUI.Properties.Resources.delete_16x16;
|
||||
this.btnFileSaveDefaultDirectoryClear.Location = new System.Drawing.Point(574, 85);
|
||||
this.btnFileSaveDefaultDirectoryClear.Name = "btnFileSaveDefaultDirectoryClear";
|
||||
this.btnFileSaveDefaultDirectoryClear.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileSaveDefaultDirectoryClear.TabIndex = 22;
|
||||
this.btnFileSaveDefaultDirectoryClear.UseVisualStyleBackColor = true;
|
||||
this.btnFileSaveDefaultDirectoryClear.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// btnFileSaveDefaultDirectorySearch
|
||||
//
|
||||
this.btnFileSaveDefaultDirectorySearch.Image = global::UVtools.GUI.Properties.Resources.Open_16x16;
|
||||
this.btnFileSaveDefaultDirectorySearch.Location = new System.Drawing.Point(538, 85);
|
||||
this.btnFileSaveDefaultDirectorySearch.Name = "btnFileSaveDefaultDirectorySearch";
|
||||
this.btnFileSaveDefaultDirectorySearch.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileSaveDefaultDirectorySearch.TabIndex = 21;
|
||||
this.btnFileSaveDefaultDirectorySearch.UseVisualStyleBackColor = true;
|
||||
this.btnFileSaveDefaultDirectorySearch.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// label30
|
||||
//
|
||||
this.label30.AutoSize = true;
|
||||
this.label30.Location = new System.Drawing.Point(6, 88);
|
||||
this.label30.Name = "label30";
|
||||
this.label30.Size = new System.Drawing.Size(198, 18);
|
||||
this.label30.TabIndex = 20;
|
||||
this.label30.Text = "File save as default directory:";
|
||||
//
|
||||
// tbFileSaveDefaultDirectory
|
||||
//
|
||||
this.tbFileSaveDefaultDirectory.Location = new System.Drawing.Point(225, 85);
|
||||
this.tbFileSaveDefaultDirectory.Name = "tbFileSaveDefaultDirectory";
|
||||
this.tbFileSaveDefaultDirectory.ReadOnly = true;
|
||||
this.tbFileSaveDefaultDirectory.Size = new System.Drawing.Size(307, 24);
|
||||
this.tbFileSaveDefaultDirectory.TabIndex = 19;
|
||||
//
|
||||
// btnFileOpenDefaultDirectoryClear
|
||||
//
|
||||
this.btnFileOpenDefaultDirectoryClear.Image = global::UVtools.GUI.Properties.Resources.delete_16x16;
|
||||
this.btnFileOpenDefaultDirectoryClear.Location = new System.Drawing.Point(574, 55);
|
||||
this.btnFileOpenDefaultDirectoryClear.Name = "btnFileOpenDefaultDirectoryClear";
|
||||
this.btnFileOpenDefaultDirectoryClear.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileOpenDefaultDirectoryClear.TabIndex = 18;
|
||||
this.btnFileOpenDefaultDirectoryClear.UseVisualStyleBackColor = true;
|
||||
this.btnFileOpenDefaultDirectoryClear.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// btnFileOpenDefaultDirectorySearch
|
||||
//
|
||||
this.btnFileOpenDefaultDirectorySearch.Image = global::UVtools.GUI.Properties.Resources.Open_16x16;
|
||||
this.btnFileOpenDefaultDirectorySearch.Location = new System.Drawing.Point(538, 55);
|
||||
this.btnFileOpenDefaultDirectorySearch.Name = "btnFileOpenDefaultDirectorySearch";
|
||||
this.btnFileOpenDefaultDirectorySearch.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileOpenDefaultDirectorySearch.TabIndex = 17;
|
||||
this.btnFileOpenDefaultDirectorySearch.UseVisualStyleBackColor = true;
|
||||
this.btnFileOpenDefaultDirectorySearch.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// label29
|
||||
//
|
||||
this.label29.AutoSize = true;
|
||||
this.label29.Location = new System.Drawing.Point(6, 58);
|
||||
this.label29.Name = "label29";
|
||||
this.label29.Size = new System.Drawing.Size(180, 18);
|
||||
this.label29.TabIndex = 16;
|
||||
this.label29.Text = "File open default directory:";
|
||||
//
|
||||
// tbFileOpenDefaultDirectory
|
||||
//
|
||||
this.tbFileOpenDefaultDirectory.Location = new System.Drawing.Point(225, 55);
|
||||
this.tbFileOpenDefaultDirectory.Name = "tbFileOpenDefaultDirectory";
|
||||
this.tbFileOpenDefaultDirectory.ReadOnly = true;
|
||||
this.tbFileOpenDefaultDirectory.Size = new System.Drawing.Size(307, 24);
|
||||
this.tbFileOpenDefaultDirectory.TabIndex = 15;
|
||||
//
|
||||
// label22
|
||||
//
|
||||
this.label22.AutoSize = true;
|
||||
@@ -1015,8 +1197,63 @@
|
||||
this.cbDefaultOpenFileExtension.Size = new System.Drawing.Size(379, 26);
|
||||
this.cbDefaultOpenFileExtension.TabIndex = 8;
|
||||
//
|
||||
// label28
|
||||
//
|
||||
this.label28.AutoSize = true;
|
||||
this.label28.Location = new System.Drawing.Point(361, 206);
|
||||
this.label28.Name = "label28";
|
||||
this.label28.Size = new System.Drawing.Size(48, 18);
|
||||
this.label28.TabIndex = 14;
|
||||
this.label28.Text = "Suffix:";
|
||||
//
|
||||
// cbFileSavePromptOverwrite
|
||||
//
|
||||
this.cbFileSavePromptOverwrite.AutoSize = true;
|
||||
this.cbFileSavePromptOverwrite.Location = new System.Drawing.Point(9, 175);
|
||||
this.cbFileSavePromptOverwrite.Name = "cbFileSavePromptOverwrite";
|
||||
this.cbFileSavePromptOverwrite.Size = new System.Drawing.Size(381, 22);
|
||||
this.cbFileSavePromptOverwrite.TabIndex = 10;
|
||||
this.cbFileSavePromptOverwrite.Text = "On file \"Save\" prompt for file overwrite for the first time";
|
||||
this.cbFileSavePromptOverwrite.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// tbFileSaveNameSuffix
|
||||
//
|
||||
this.tbFileSaveNameSuffix.Location = new System.Drawing.Point(420, 203);
|
||||
this.tbFileSaveNameSuffix.Name = "tbFileSaveNameSuffix";
|
||||
this.tbFileSaveNameSuffix.Size = new System.Drawing.Size(184, 24);
|
||||
this.tbFileSaveNameSuffix.TabIndex = 13;
|
||||
//
|
||||
// label27
|
||||
//
|
||||
this.label27.AutoSize = true;
|
||||
this.label27.Location = new System.Drawing.Point(9, 206);
|
||||
this.label27.Name = "label27";
|
||||
this.label27.Size = new System.Drawing.Size(147, 18);
|
||||
this.label27.TabIndex = 11;
|
||||
this.label27.Text = "File \"Save as\" Preffix:";
|
||||
//
|
||||
// tbFileSaveNamePreffix
|
||||
//
|
||||
this.tbFileSaveNamePreffix.Location = new System.Drawing.Point(162, 203);
|
||||
this.tbFileSaveNamePreffix.Name = "tbFileSaveNamePreffix";
|
||||
this.tbFileSaveNamePreffix.Size = new System.Drawing.Size(184, 24);
|
||||
this.tbFileSaveNamePreffix.TabIndex = 12;
|
||||
//
|
||||
// groupBox4
|
||||
//
|
||||
this.groupBox4.Controls.Add(this.cbStartMaximized);
|
||||
this.groupBox4.Controls.Add(this.cbCheckForUpdatesOnStartup);
|
||||
this.groupBox4.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupBox4.Location = new System.Drawing.Point(3, 3);
|
||||
this.groupBox4.Name = "groupBox4";
|
||||
this.groupBox4.Size = new System.Drawing.Size(610, 83);
|
||||
this.groupBox4.TabIndex = 15;
|
||||
this.groupBox4.TabStop = false;
|
||||
this.groupBox4.Text = "Startup";
|
||||
//
|
||||
// tabPage2
|
||||
//
|
||||
this.tabPage2.Controls.Add(this.cbAutoZoomIssues);
|
||||
this.tabPage2.Controls.Add(this.cbZoomToFitPrintVolumeBounds);
|
||||
this.tabPage2.Controls.Add(this.label1);
|
||||
this.tabPage2.Controls.Add(this.label2);
|
||||
@@ -1194,240 +1431,15 @@
|
||||
this.panel1.Size = new System.Drawing.Size(624, 77);
|
||||
this.panel1.TabIndex = 19;
|
||||
//
|
||||
// cbFileSavePromptOverwrite
|
||||
// cbAutoZoomIssues
|
||||
//
|
||||
this.cbFileSavePromptOverwrite.AutoSize = true;
|
||||
this.cbFileSavePromptOverwrite.Location = new System.Drawing.Point(9, 175);
|
||||
this.cbFileSavePromptOverwrite.Name = "cbFileSavePromptOverwrite";
|
||||
this.cbFileSavePromptOverwrite.Size = new System.Drawing.Size(381, 22);
|
||||
this.cbFileSavePromptOverwrite.TabIndex = 10;
|
||||
this.cbFileSavePromptOverwrite.Text = "On file \"Save\" prompt for file overwrite for the first time";
|
||||
this.cbFileSavePromptOverwrite.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// label27
|
||||
//
|
||||
this.label27.AutoSize = true;
|
||||
this.label27.Location = new System.Drawing.Point(9, 206);
|
||||
this.label27.Name = "label27";
|
||||
this.label27.Size = new System.Drawing.Size(147, 18);
|
||||
this.label27.TabIndex = 11;
|
||||
this.label27.Text = "File \"Save as\" Preffix:";
|
||||
//
|
||||
// tbFileSaveNamePreffix
|
||||
//
|
||||
this.tbFileSaveNamePreffix.Location = new System.Drawing.Point(162, 203);
|
||||
this.tbFileSaveNamePreffix.Name = "tbFileSaveNamePreffix";
|
||||
this.tbFileSaveNamePreffix.Size = new System.Drawing.Size(184, 24);
|
||||
this.tbFileSaveNamePreffix.TabIndex = 12;
|
||||
//
|
||||
// tbFileSaveNameSuffix
|
||||
//
|
||||
this.tbFileSaveNameSuffix.Location = new System.Drawing.Point(420, 203);
|
||||
this.tbFileSaveNameSuffix.Name = "tbFileSaveNameSuffix";
|
||||
this.tbFileSaveNameSuffix.Size = new System.Drawing.Size(184, 24);
|
||||
this.tbFileSaveNameSuffix.TabIndex = 13;
|
||||
//
|
||||
// label28
|
||||
//
|
||||
this.label28.AutoSize = true;
|
||||
this.label28.Location = new System.Drawing.Point(361, 206);
|
||||
this.label28.Name = "label28";
|
||||
this.label28.Size = new System.Drawing.Size(48, 18);
|
||||
this.label28.TabIndex = 14;
|
||||
this.label28.Text = "Suffix:";
|
||||
//
|
||||
// groupBox4
|
||||
//
|
||||
this.groupBox4.Controls.Add(this.cbStartMaximized);
|
||||
this.groupBox4.Controls.Add(this.cbCheckForUpdatesOnStartup);
|
||||
this.groupBox4.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupBox4.Location = new System.Drawing.Point(3, 3);
|
||||
this.groupBox4.Name = "groupBox4";
|
||||
this.groupBox4.Size = new System.Drawing.Size(610, 83);
|
||||
this.groupBox4.TabIndex = 15;
|
||||
this.groupBox4.TabStop = false;
|
||||
this.groupBox4.Text = "Startup";
|
||||
//
|
||||
// groupBox5
|
||||
//
|
||||
this.groupBox5.Controls.Add(this.btnFileExtractDefaultDirectoryClear);
|
||||
this.groupBox5.Controls.Add(this.btnFileExtractDefaultDirectorySearch);
|
||||
this.groupBox5.Controls.Add(this.label32);
|
||||
this.groupBox5.Controls.Add(this.tbFileExtractDefaultDirectory);
|
||||
this.groupBox5.Controls.Add(this.btnFileConvertDefaultDirectoryClear);
|
||||
this.groupBox5.Controls.Add(this.btnFileConvertDefaultDirectorySearch);
|
||||
this.groupBox5.Controls.Add(this.label31);
|
||||
this.groupBox5.Controls.Add(this.tbFileConvertDefaultDirectory);
|
||||
this.groupBox5.Controls.Add(this.btnFileSaveDefaultDirectoryClear);
|
||||
this.groupBox5.Controls.Add(this.btnFileSaveDefaultDirectorySearch);
|
||||
this.groupBox5.Controls.Add(this.label30);
|
||||
this.groupBox5.Controls.Add(this.tbFileSaveDefaultDirectory);
|
||||
this.groupBox5.Controls.Add(this.btnFileOpenDefaultDirectoryClear);
|
||||
this.groupBox5.Controls.Add(this.btnFileOpenDefaultDirectorySearch);
|
||||
this.groupBox5.Controls.Add(this.label29);
|
||||
this.groupBox5.Controls.Add(this.tbFileOpenDefaultDirectory);
|
||||
this.groupBox5.Controls.Add(this.label22);
|
||||
this.groupBox5.Controls.Add(this.cbDefaultOpenFileExtension);
|
||||
this.groupBox5.Controls.Add(this.label28);
|
||||
this.groupBox5.Controls.Add(this.cbFileSavePromptOverwrite);
|
||||
this.groupBox5.Controls.Add(this.tbFileSaveNameSuffix);
|
||||
this.groupBox5.Controls.Add(this.label27);
|
||||
this.groupBox5.Controls.Add(this.tbFileSaveNamePreffix);
|
||||
this.groupBox5.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.groupBox5.Location = new System.Drawing.Point(3, 86);
|
||||
this.groupBox5.Name = "groupBox5";
|
||||
this.groupBox5.Size = new System.Drawing.Size(610, 250);
|
||||
this.groupBox5.TabIndex = 16;
|
||||
this.groupBox5.TabStop = false;
|
||||
this.groupBox5.Text = "File operations";
|
||||
//
|
||||
// tbFileOpenDefaultDirectory
|
||||
//
|
||||
this.tbFileOpenDefaultDirectory.Location = new System.Drawing.Point(225, 55);
|
||||
this.tbFileOpenDefaultDirectory.Name = "tbFileOpenDefaultDirectory";
|
||||
this.tbFileOpenDefaultDirectory.ReadOnly = true;
|
||||
this.tbFileOpenDefaultDirectory.Size = new System.Drawing.Size(307, 24);
|
||||
this.tbFileOpenDefaultDirectory.TabIndex = 15;
|
||||
//
|
||||
// label29
|
||||
//
|
||||
this.label29.AutoSize = true;
|
||||
this.label29.Location = new System.Drawing.Point(6, 58);
|
||||
this.label29.Name = "label29";
|
||||
this.label29.Size = new System.Drawing.Size(180, 18);
|
||||
this.label29.TabIndex = 16;
|
||||
this.label29.Text = "File open default directory:";
|
||||
//
|
||||
// btnFileOpenDefaultDirectorySearch
|
||||
//
|
||||
this.btnFileOpenDefaultDirectorySearch.Image = global::UVtools.GUI.Properties.Resources.Open_16x16;
|
||||
this.btnFileOpenDefaultDirectorySearch.Location = new System.Drawing.Point(538, 55);
|
||||
this.btnFileOpenDefaultDirectorySearch.Name = "btnFileOpenDefaultDirectorySearch";
|
||||
this.btnFileOpenDefaultDirectorySearch.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileOpenDefaultDirectorySearch.TabIndex = 17;
|
||||
this.btnFileOpenDefaultDirectorySearch.UseVisualStyleBackColor = true;
|
||||
this.btnFileOpenDefaultDirectorySearch.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// btnFileOpenDefaultDirectoryClear
|
||||
//
|
||||
this.btnFileOpenDefaultDirectoryClear.Image = global::UVtools.GUI.Properties.Resources.delete_16x16;
|
||||
this.btnFileOpenDefaultDirectoryClear.Location = new System.Drawing.Point(574, 55);
|
||||
this.btnFileOpenDefaultDirectoryClear.Name = "btnFileOpenDefaultDirectoryClear";
|
||||
this.btnFileOpenDefaultDirectoryClear.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileOpenDefaultDirectoryClear.TabIndex = 18;
|
||||
this.btnFileOpenDefaultDirectoryClear.UseVisualStyleBackColor = true;
|
||||
this.btnFileOpenDefaultDirectoryClear.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// btnFileSaveDefaultDirectoryClear
|
||||
//
|
||||
this.btnFileSaveDefaultDirectoryClear.Image = global::UVtools.GUI.Properties.Resources.delete_16x16;
|
||||
this.btnFileSaveDefaultDirectoryClear.Location = new System.Drawing.Point(574, 85);
|
||||
this.btnFileSaveDefaultDirectoryClear.Name = "btnFileSaveDefaultDirectoryClear";
|
||||
this.btnFileSaveDefaultDirectoryClear.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileSaveDefaultDirectoryClear.TabIndex = 22;
|
||||
this.btnFileSaveDefaultDirectoryClear.UseVisualStyleBackColor = true;
|
||||
this.btnFileSaveDefaultDirectoryClear.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// btnFileSaveDefaultDirectorySearch
|
||||
//
|
||||
this.btnFileSaveDefaultDirectorySearch.Image = global::UVtools.GUI.Properties.Resources.Open_16x16;
|
||||
this.btnFileSaveDefaultDirectorySearch.Location = new System.Drawing.Point(538, 85);
|
||||
this.btnFileSaveDefaultDirectorySearch.Name = "btnFileSaveDefaultDirectorySearch";
|
||||
this.btnFileSaveDefaultDirectorySearch.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileSaveDefaultDirectorySearch.TabIndex = 21;
|
||||
this.btnFileSaveDefaultDirectorySearch.UseVisualStyleBackColor = true;
|
||||
this.btnFileSaveDefaultDirectorySearch.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// label30
|
||||
//
|
||||
this.label30.AutoSize = true;
|
||||
this.label30.Location = new System.Drawing.Point(6, 88);
|
||||
this.label30.Name = "label30";
|
||||
this.label30.Size = new System.Drawing.Size(198, 18);
|
||||
this.label30.TabIndex = 20;
|
||||
this.label30.Text = "File save as default directory:";
|
||||
//
|
||||
// tbFileSaveDefaultDirectory
|
||||
//
|
||||
this.tbFileSaveDefaultDirectory.Location = new System.Drawing.Point(225, 85);
|
||||
this.tbFileSaveDefaultDirectory.Name = "tbFileSaveDefaultDirectory";
|
||||
this.tbFileSaveDefaultDirectory.ReadOnly = true;
|
||||
this.tbFileSaveDefaultDirectory.Size = new System.Drawing.Size(307, 24);
|
||||
this.tbFileSaveDefaultDirectory.TabIndex = 19;
|
||||
//
|
||||
// btnFileConvertDefaultDirectoryClear
|
||||
//
|
||||
this.btnFileConvertDefaultDirectoryClear.Image = global::UVtools.GUI.Properties.Resources.delete_16x16;
|
||||
this.btnFileConvertDefaultDirectoryClear.Location = new System.Drawing.Point(574, 145);
|
||||
this.btnFileConvertDefaultDirectoryClear.Name = "btnFileConvertDefaultDirectoryClear";
|
||||
this.btnFileConvertDefaultDirectoryClear.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileConvertDefaultDirectoryClear.TabIndex = 26;
|
||||
this.btnFileConvertDefaultDirectoryClear.UseVisualStyleBackColor = true;
|
||||
this.btnFileConvertDefaultDirectoryClear.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// btnFileConvertDefaultDirectorySearch
|
||||
//
|
||||
this.btnFileConvertDefaultDirectorySearch.Image = global::UVtools.GUI.Properties.Resources.Open_16x16;
|
||||
this.btnFileConvertDefaultDirectorySearch.Location = new System.Drawing.Point(538, 145);
|
||||
this.btnFileConvertDefaultDirectorySearch.Name = "btnFileConvertDefaultDirectorySearch";
|
||||
this.btnFileConvertDefaultDirectorySearch.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileConvertDefaultDirectorySearch.TabIndex = 25;
|
||||
this.btnFileConvertDefaultDirectorySearch.UseVisualStyleBackColor = true;
|
||||
this.btnFileConvertDefaultDirectorySearch.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// label31
|
||||
//
|
||||
this.label31.AutoSize = true;
|
||||
this.label31.Location = new System.Drawing.Point(6, 148);
|
||||
this.label31.Name = "label31";
|
||||
this.label31.Size = new System.Drawing.Size(196, 18);
|
||||
this.label31.TabIndex = 24;
|
||||
this.label31.Text = "File convert default directory:";
|
||||
//
|
||||
// tbFileConvertDefaultDirectory
|
||||
//
|
||||
this.tbFileConvertDefaultDirectory.Location = new System.Drawing.Point(225, 145);
|
||||
this.tbFileConvertDefaultDirectory.Name = "tbFileConvertDefaultDirectory";
|
||||
this.tbFileConvertDefaultDirectory.ReadOnly = true;
|
||||
this.tbFileConvertDefaultDirectory.Size = new System.Drawing.Size(307, 24);
|
||||
this.tbFileConvertDefaultDirectory.TabIndex = 23;
|
||||
//
|
||||
// btnFileExtractDefaultDirectoryClear
|
||||
//
|
||||
this.btnFileExtractDefaultDirectoryClear.Image = global::UVtools.GUI.Properties.Resources.delete_16x16;
|
||||
this.btnFileExtractDefaultDirectoryClear.Location = new System.Drawing.Point(574, 115);
|
||||
this.btnFileExtractDefaultDirectoryClear.Name = "btnFileExtractDefaultDirectoryClear";
|
||||
this.btnFileExtractDefaultDirectoryClear.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileExtractDefaultDirectoryClear.TabIndex = 30;
|
||||
this.btnFileExtractDefaultDirectoryClear.UseVisualStyleBackColor = true;
|
||||
this.btnFileExtractDefaultDirectoryClear.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// btnFileExtractDefaultDirectorySearch
|
||||
//
|
||||
this.btnFileExtractDefaultDirectorySearch.Image = global::UVtools.GUI.Properties.Resources.Open_16x16;
|
||||
this.btnFileExtractDefaultDirectorySearch.Location = new System.Drawing.Point(538, 115);
|
||||
this.btnFileExtractDefaultDirectorySearch.Name = "btnFileExtractDefaultDirectorySearch";
|
||||
this.btnFileExtractDefaultDirectorySearch.Size = new System.Drawing.Size(30, 24);
|
||||
this.btnFileExtractDefaultDirectorySearch.TabIndex = 29;
|
||||
this.btnFileExtractDefaultDirectorySearch.UseVisualStyleBackColor = true;
|
||||
this.btnFileExtractDefaultDirectorySearch.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// label32
|
||||
//
|
||||
this.label32.AutoSize = true;
|
||||
this.label32.Location = new System.Drawing.Point(6, 118);
|
||||
this.label32.Name = "label32";
|
||||
this.label32.Size = new System.Drawing.Size(191, 18);
|
||||
this.label32.TabIndex = 28;
|
||||
this.label32.Text = "File extract default directory:";
|
||||
//
|
||||
// tbFileExtractDefaultDirectory
|
||||
//
|
||||
this.tbFileExtractDefaultDirectory.Location = new System.Drawing.Point(225, 115);
|
||||
this.tbFileExtractDefaultDirectory.Name = "tbFileExtractDefaultDirectory";
|
||||
this.tbFileExtractDefaultDirectory.ReadOnly = true;
|
||||
this.tbFileExtractDefaultDirectory.Size = new System.Drawing.Size(307, 24);
|
||||
this.tbFileExtractDefaultDirectory.TabIndex = 27;
|
||||
this.cbAutoZoomIssues.AutoSize = true;
|
||||
this.cbAutoZoomIssues.Location = new System.Drawing.Point(11, 305);
|
||||
this.cbAutoZoomIssues.Name = "cbAutoZoomIssues";
|
||||
this.cbAutoZoomIssues.Size = new System.Drawing.Size(395, 22);
|
||||
this.cbAutoZoomIssues.TabIndex = 35;
|
||||
this.cbAutoZoomIssues.Text = "Auto zoom to issues and drawings portrait area (best fit)";
|
||||
this.cbAutoZoomIssues.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// FrmSettings
|
||||
//
|
||||
@@ -1466,16 +1478,16 @@
|
||||
this.groupBox1.PerformLayout();
|
||||
this.tabSettings.ResumeLayout(false);
|
||||
this.tabPage1.ResumeLayout(false);
|
||||
this.groupBox5.ResumeLayout(false);
|
||||
this.groupBox5.PerformLayout();
|
||||
this.groupBox4.ResumeLayout(false);
|
||||
this.groupBox4.PerformLayout();
|
||||
this.tabPage2.ResumeLayout(false);
|
||||
this.tabPage2.PerformLayout();
|
||||
this.tabPage3.ResumeLayout(false);
|
||||
this.tabPage4.ResumeLayout(false);
|
||||
this.tabPage4.PerformLayout();
|
||||
this.panel1.ResumeLayout(false);
|
||||
this.groupBox4.ResumeLayout(false);
|
||||
this.groupBox4.PerformLayout();
|
||||
this.groupBox5.ResumeLayout(false);
|
||||
this.groupBox5.PerformLayout();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
@@ -1583,5 +1595,6 @@
|
||||
private System.Windows.Forms.Button btnFileExtractDefaultDirectorySearch;
|
||||
private System.Windows.Forms.Label label32;
|
||||
private System.Windows.Forms.TextBox tbFileExtractDefaultDirectory;
|
||||
private System.Windows.Forms.CheckBox cbAutoZoomIssues;
|
||||
}
|
||||
}
|
||||
@@ -62,6 +62,7 @@ namespace UVtools.GUI.Forms
|
||||
cbLayerAutoRotateBestView.Checked = Settings.Default.LayerAutoRotateBestView;
|
||||
cbLayerZoomToFit.Checked = Settings.Default.LayerZoomToFit;
|
||||
cbZoomToFitPrintVolumeBounds.Checked = Settings.Default.ZoomToFitPrintVolumeBounds;
|
||||
cbAutoZoomIssues.Checked = Settings.Default.AutoZoomIssues;
|
||||
cbLayerDifferenceDefault.Checked = Settings.Default.LayerDifferenceDefault;
|
||||
cbComputeIssuesOnLoad.Checked = Settings.Default.ComputeIssuesOnLoad;
|
||||
cbComputeIslands.Checked = Settings.Default.ComputeIslands;
|
||||
@@ -204,6 +205,7 @@ namespace UVtools.GUI.Forms
|
||||
Settings.Default.LayerAutoRotateBestView = cbLayerAutoRotateBestView.Checked;
|
||||
Settings.Default.LayerZoomToFit = cbLayerZoomToFit.Checked;
|
||||
Settings.Default.ZoomToFitPrintVolumeBounds = cbZoomToFitPrintVolumeBounds.Checked;
|
||||
Settings.Default.AutoZoomIssues = cbAutoZoomIssues.Checked;
|
||||
Settings.Default.LayerDifferenceDefault = cbLayerDifferenceDefault.Checked;
|
||||
Settings.Default.ComputeIssuesOnLoad = cbComputeIssuesOnLoad.Checked;
|
||||
Settings.Default.ComputeIslands = cbComputeIslands.Checked;
|
||||
|
||||
+147
@@ -0,0 +1,147 @@
|
||||
|
||||
namespace UVtools.GUI.Forms
|
||||
{
|
||||
partial class FrmToolLayerReHeight
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmToolLayerReHeight));
|
||||
this.lbDescription = new System.Windows.Forms.Label();
|
||||
this.btnCancel = new System.Windows.Forms.Button();
|
||||
this.btnOk = new System.Windows.Forms.Button();
|
||||
this.lbCurrent = new System.Windows.Forms.Label();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.cbMultiplier = new System.Windows.Forms.ComboBox();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// lbDescription
|
||||
//
|
||||
this.lbDescription.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.lbDescription.Location = new System.Drawing.Point(13, 14);
|
||||
this.lbDescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.lbDescription.Name = "lbDescription";
|
||||
this.lbDescription.Size = new System.Drawing.Size(584, 95);
|
||||
this.lbDescription.TabIndex = 0;
|
||||
this.lbDescription.Text = resources.GetString("lbDescription.Text");
|
||||
//
|
||||
// btnCancel
|
||||
//
|
||||
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||
this.btnCancel.Image = global::UVtools.GUI.Properties.Resources.Cancel_24x24;
|
||||
this.btnCancel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
this.btnCancel.Location = new System.Drawing.Point(434, 324);
|
||||
this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.btnCancel.Name = "btnCancel";
|
||||
this.btnCancel.Size = new System.Drawing.Size(150, 48);
|
||||
this.btnCancel.TabIndex = 6;
|
||||
this.btnCancel.Text = "&Cancel";
|
||||
this.btnCancel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
|
||||
this.btnCancel.UseVisualStyleBackColor = true;
|
||||
this.btnCancel.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// btnOk
|
||||
//
|
||||
this.btnOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.btnOk.Image = global::UVtools.GUI.Properties.Resources.Ok_24x24;
|
||||
this.btnOk.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
this.btnOk.Location = new System.Drawing.Point(276, 324);
|
||||
this.btnOk.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.btnOk.Name = "btnOk";
|
||||
this.btnOk.Size = new System.Drawing.Size(150, 48);
|
||||
this.btnOk.TabIndex = 5;
|
||||
this.btnOk.Text = "Re-Height";
|
||||
this.btnOk.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
|
||||
this.btnOk.UseVisualStyleBackColor = true;
|
||||
this.btnOk.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// lbCurrent
|
||||
//
|
||||
this.lbCurrent.AutoSize = true;
|
||||
this.lbCurrent.Location = new System.Drawing.Point(13, 109);
|
||||
this.lbCurrent.Name = "lbCurrent";
|
||||
this.lbCurrent.Size = new System.Drawing.Size(234, 20);
|
||||
this.lbCurrent.TabIndex = 7;
|
||||
this.lbCurrent.Text = "Current layers: xxxxxxxxxxxxxxxxx";
|
||||
//
|
||||
// label2
|
||||
//
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.Location = new System.Drawing.Point(13, 136);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(75, 20);
|
||||
this.label2.TabIndex = 8;
|
||||
this.label2.Text = "Multiplier:";
|
||||
//
|
||||
// cbMultiplier
|
||||
//
|
||||
this.cbMultiplier.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.cbMultiplier.FormattingEnabled = true;
|
||||
this.cbMultiplier.Location = new System.Drawing.Point(126, 132);
|
||||
this.cbMultiplier.Name = "cbMultiplier";
|
||||
this.cbMultiplier.Size = new System.Drawing.Size(121, 28);
|
||||
this.cbMultiplier.TabIndex = 9;
|
||||
//
|
||||
// FrmToolLayerReHeight
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.CancelButton = this.btnCancel;
|
||||
this.ClientSize = new System.Drawing.Size(599, 386);
|
||||
this.Controls.Add(this.cbMultiplier);
|
||||
this.Controls.Add(this.label2);
|
||||
this.Controls.Add(this.lbCurrent);
|
||||
this.Controls.Add(this.btnOk);
|
||||
this.Controls.Add(this.btnCancel);
|
||||
this.Controls.Add(this.lbDescription);
|
||||
this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
|
||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||
this.KeyPreview = true;
|
||||
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
||||
this.MaximizeBox = false;
|
||||
this.MinimizeBox = false;
|
||||
this.Name = "FrmToolLayerReHeight";
|
||||
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||
this.Text = "Layer Re-Height";
|
||||
this.TopMost = true;
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.Label lbDescription;
|
||||
private System.Windows.Forms.Button btnCancel;
|
||||
private System.Windows.Forms.Button btnOk;
|
||||
private System.Windows.Forms.Label lbCurrent;
|
||||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.ComboBox cbMultiplier;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,106 @@
|
||||
/*
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* Version 3, 19 November 2007
|
||||
* Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
* Everyone is permitted to copy and distribute verbatim copies
|
||||
* of this license document, but changing it is not allowed.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Globalization;
|
||||
using System.Windows.Forms;
|
||||
|
||||
|
||||
namespace UVtools.GUI.Forms
|
||||
{
|
||||
public partial class FrmToolLayerReHeight : Form
|
||||
{
|
||||
private uint LayerCount { get; }
|
||||
private decimal LayerHeight { get; }
|
||||
|
||||
#region Constructors
|
||||
public FrmToolLayerReHeight(uint layerCount, float layerHeight)
|
||||
{
|
||||
InitializeComponent();
|
||||
DialogResult = DialogResult.Cancel;
|
||||
|
||||
LayerCount = layerCount;
|
||||
LayerHeight = (decimal) layerHeight;
|
||||
|
||||
lbCurrent.Text = $"Current layers: {LayerCount} at {layerHeight}mm";
|
||||
|
||||
for (byte i = 2; i < 255; i++)
|
||||
{
|
||||
var countStr = (LayerCount / (decimal)i).ToString();
|
||||
if (countStr.IndexOf(".") >= 0) continue; // Cant multiply layers
|
||||
countStr = (LayerHeight / i).ToString();
|
||||
int decimalCount = countStr.Substring(countStr.IndexOf(".")).Length;
|
||||
if (decimalCount > 2) continue; // Cant multiply height
|
||||
|
||||
cbMultiplier.Items.Add($"/ {i}");
|
||||
}
|
||||
|
||||
for (byte i = 2; i < 255; i++)
|
||||
{
|
||||
var countStr = (LayerCount / (decimal)i).ToString(CultureInfo.InvariantCulture);
|
||||
if (countStr.IndexOf(".", StringComparison.Ordinal) >= 0) continue; // Cant multiply layers
|
||||
if(LayerHeight * i > 0.2m) break;
|
||||
|
||||
countStr = (LayerHeight * i).ToString(CultureInfo.InvariantCulture);
|
||||
int decimalCount = countStr.Substring(countStr.IndexOf(".", StringComparison.Ordinal)).Length;
|
||||
if (decimalCount > 2) continue; // Cant multiply height
|
||||
|
||||
cbMultiplier.Items.Add($"x {i}");
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Overrides
|
||||
protected override void OnKeyUp(KeyEventArgs e)
|
||||
{
|
||||
base.OnKeyUp(e);
|
||||
if (e.KeyCode == Keys.Enter)
|
||||
{
|
||||
btnOk.PerformClick();
|
||||
e.Handled = true;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Events
|
||||
private void EventClick(object sender, EventArgs e)
|
||||
{
|
||||
if (ReferenceEquals(sender, btnOk))
|
||||
{
|
||||
if (!btnOk.Enabled) return;
|
||||
|
||||
|
||||
if (MessageBox.Show($"Are you sure you want change layer height?", Text, MessageBoxButtons.YesNo,
|
||||
MessageBoxIcon.Question) == DialogResult.Yes)
|
||||
{
|
||||
DialogResult = DialogResult.OK;
|
||||
Close();
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (ReferenceEquals(sender, btnCancel))
|
||||
{
|
||||
DialogResult = DialogResult.Cancel;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Methods
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Generated
+110
-20
@@ -49,6 +49,8 @@
|
||||
this.menuMutate = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuTools = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuToolsRepairLayers = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuToolsLayerReHeight = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuToolsLayerRemoval = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuToolsPattern = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
@@ -106,6 +108,9 @@
|
||||
this.tsThumbnailsExport = new System.Windows.Forms.ToolStripSplitButton();
|
||||
this.tsThumbnailsExportFile = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsThumbnailsExportClipboard = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.tsThumbnailsImport = new System.Windows.Forms.ToolStripButton();
|
||||
this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.tsThumbnailsResolution = new System.Windows.Forms.ToolStripLabel();
|
||||
this.lvProperties = new System.Windows.Forms.ListView();
|
||||
this.lvChKey = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
@@ -149,6 +154,10 @@
|
||||
this.tsPixelEditorHistory = new System.Windows.Forms.ToolStrip();
|
||||
this.lbPixelHistoryOperations = new System.Windows.Forms.ToolStripLabel();
|
||||
this.btnPixelHistoryRemove = new System.Windows.Forms.ToolStripButton();
|
||||
this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.btnPixelHistoryApply = new System.Windows.Forms.ToolStripButton();
|
||||
this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.btnPixelHistoryClear = new System.Windows.Forms.ToolStripButton();
|
||||
this.tabControlPixelEditor = new System.Windows.Forms.TabControl();
|
||||
this.tabPage1 = new System.Windows.Forms.TabPage();
|
||||
this.label6 = new System.Windows.Forms.Label();
|
||||
@@ -191,7 +200,6 @@
|
||||
this.btnFirstLayer = new System.Windows.Forms.Button();
|
||||
this.toolTipInformation = new System.Windows.Forms.ToolTip(this.components);
|
||||
this.layerScrollTimer = new System.Windows.Forms.Timer(this.components);
|
||||
this.menuToolsLayerRemoval = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menu.SuspendLayout();
|
||||
this.mainTable.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.scCenter)).BeginInit();
|
||||
@@ -397,6 +405,7 @@
|
||||
//
|
||||
this.menuTools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.menuToolsRepairLayers,
|
||||
this.menuToolsLayerReHeight,
|
||||
this.menuToolsLayerRemoval,
|
||||
this.menuToolsPattern});
|
||||
this.menuTools.Enabled = false;
|
||||
@@ -415,6 +424,25 @@
|
||||
this.menuToolsRepairLayers.Text = "&Repair layers and Issues";
|
||||
this.menuToolsRepairLayers.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// menuToolsLayerReHeight
|
||||
//
|
||||
this.menuToolsLayerReHeight.Enabled = false;
|
||||
this.menuToolsLayerReHeight.Image = global::UVtools.GUI.Properties.Resources.ladder_16x16;
|
||||
this.menuToolsLayerReHeight.Name = "menuToolsLayerReHeight";
|
||||
this.menuToolsLayerReHeight.Size = new System.Drawing.Size(261, 22);
|
||||
this.menuToolsLayerReHeight.Text = "Layer Re-Height";
|
||||
this.menuToolsLayerReHeight.Visible = false;
|
||||
this.menuToolsLayerReHeight.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// menuToolsLayerRemoval
|
||||
//
|
||||
this.menuToolsLayerRemoval.Enabled = false;
|
||||
this.menuToolsLayerRemoval.Image = global::UVtools.GUI.Properties.Resources.delete_16x16;
|
||||
this.menuToolsLayerRemoval.Name = "menuToolsLayerRemoval";
|
||||
this.menuToolsLayerRemoval.Size = new System.Drawing.Size(261, 22);
|
||||
this.menuToolsLayerRemoval.Text = "Layer Re&moval";
|
||||
this.menuToolsLayerRemoval.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// menuToolsPattern
|
||||
//
|
||||
this.menuToolsPattern.Enabled = false;
|
||||
@@ -941,6 +969,9 @@
|
||||
this.tsThumbnailsCount,
|
||||
this.tsThumbnailsNext,
|
||||
this.tsThumbnailsExport,
|
||||
this.toolStripSeparator21,
|
||||
this.tsThumbnailsImport,
|
||||
this.toolStripSeparator22,
|
||||
this.tsThumbnailsResolution});
|
||||
this.tsThumbnails.Location = new System.Drawing.Point(0, 0);
|
||||
this.tsThumbnails.Name = "tsThumbnails";
|
||||
@@ -956,7 +987,6 @@
|
||||
this.tsThumbnailsPrevious.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.tsThumbnailsPrevious.Name = "tsThumbnailsPrevious";
|
||||
this.tsThumbnailsPrevious.Size = new System.Drawing.Size(23, 22);
|
||||
this.tsThumbnailsPrevious.Text = "toolStripButton1";
|
||||
this.tsThumbnailsPrevious.ToolTipText = "Show previous thumbnail";
|
||||
this.tsThumbnailsPrevious.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
@@ -976,7 +1006,6 @@
|
||||
this.tsThumbnailsNext.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.tsThumbnailsNext.Name = "tsThumbnailsNext";
|
||||
this.tsThumbnailsNext.Size = new System.Drawing.Size(23, 22);
|
||||
this.tsThumbnailsNext.Text = "toolStripButton2";
|
||||
this.tsThumbnailsNext.ToolTipText = "Show next thumbnail";
|
||||
this.tsThumbnailsNext.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
@@ -1012,6 +1041,30 @@
|
||||
this.tsThumbnailsExportClipboard.Text = "To &Clipboard";
|
||||
this.tsThumbnailsExportClipboard.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// toolStripSeparator21
|
||||
//
|
||||
this.toolStripSeparator21.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
|
||||
this.toolStripSeparator21.Name = "toolStripSeparator21";
|
||||
this.toolStripSeparator21.Size = new System.Drawing.Size(6, 25);
|
||||
//
|
||||
// tsThumbnailsImport
|
||||
//
|
||||
this.tsThumbnailsImport.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
|
||||
this.tsThumbnailsImport.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
|
||||
this.tsThumbnailsImport.Image = global::UVtools.GUI.Properties.Resources.photo_16x16;
|
||||
this.tsThumbnailsImport.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.tsThumbnailsImport.Name = "tsThumbnailsImport";
|
||||
this.tsThumbnailsImport.Size = new System.Drawing.Size(23, 22);
|
||||
this.tsThumbnailsImport.Text = "toolStripButton1";
|
||||
this.tsThumbnailsImport.ToolTipText = "Replace the current preview image";
|
||||
this.tsThumbnailsImport.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// toolStripSeparator22
|
||||
//
|
||||
this.toolStripSeparator22.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
|
||||
this.toolStripSeparator22.Name = "toolStripSeparator22";
|
||||
this.toolStripSeparator22.Size = new System.Drawing.Size(6, 25);
|
||||
//
|
||||
// tsThumbnailsResolution
|
||||
//
|
||||
this.tsThumbnailsResolution.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
|
||||
@@ -1172,6 +1225,7 @@
|
||||
// lvIssues
|
||||
//
|
||||
this.lvIssues.Activation = System.Windows.Forms.ItemActivation.TwoClick;
|
||||
this.lvIssues.AllowColumnReorder = true;
|
||||
this.lvIssues.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.lvIssuesType,
|
||||
this.lvIssuesCount,
|
||||
@@ -1350,6 +1404,7 @@
|
||||
//
|
||||
// lvPixelHistory
|
||||
//
|
||||
this.lvPixelHistory.AllowColumnReorder = true;
|
||||
this.lvPixelHistory.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||
this.columnHeader5,
|
||||
this.columnHeader1,
|
||||
@@ -1393,7 +1448,11 @@
|
||||
this.tsPixelEditorHistory.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
|
||||
this.tsPixelEditorHistory.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.lbPixelHistoryOperations,
|
||||
this.btnPixelHistoryRemove});
|
||||
this.btnPixelHistoryRemove,
|
||||
this.toolStripSeparator19,
|
||||
this.btnPixelHistoryApply,
|
||||
this.toolStripSeparator20,
|
||||
this.btnPixelHistoryClear});
|
||||
this.tsPixelEditorHistory.Location = new System.Drawing.Point(3, 325);
|
||||
this.tsPixelEditorHistory.Name = "tsPixelEditorHistory";
|
||||
this.tsPixelEditorHistory.Size = new System.Drawing.Size(380, 25);
|
||||
@@ -1414,11 +1473,43 @@
|
||||
this.btnPixelHistoryRemove.Name = "btnPixelHistoryRemove";
|
||||
this.btnPixelHistoryRemove.Size = new System.Drawing.Size(70, 22);
|
||||
this.btnPixelHistoryRemove.Text = "Remove";
|
||||
this.btnPixelHistoryRemove.ToolTipText = "Remove selected issue when possible\r\nIslands: All pixels are removed (turn black)" +
|
||||
"\r\nResinTrap: All trap areas are filled with white pixels.\r\nTouchingBounds: No ac" +
|
||||
"tion, need reslice.";
|
||||
this.btnPixelHistoryRemove.ToolTipText = "Remove selected operations\r\n";
|
||||
this.btnPixelHistoryRemove.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// toolStripSeparator19
|
||||
//
|
||||
this.toolStripSeparator19.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
|
||||
this.toolStripSeparator19.Name = "toolStripSeparator19";
|
||||
this.toolStripSeparator19.Size = new System.Drawing.Size(6, 25);
|
||||
//
|
||||
// btnPixelHistoryApply
|
||||
//
|
||||
this.btnPixelHistoryApply.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
|
||||
this.btnPixelHistoryApply.Enabled = false;
|
||||
this.btnPixelHistoryApply.Image = global::UVtools.GUI.Properties.Resources.accept_16x16;
|
||||
this.btnPixelHistoryApply.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.btnPixelHistoryApply.Name = "btnPixelHistoryApply";
|
||||
this.btnPixelHistoryApply.Size = new System.Drawing.Size(75, 22);
|
||||
this.btnPixelHistoryApply.Text = "&Apply All";
|
||||
this.btnPixelHistoryApply.ToolTipText = "Apply all operations/modifications";
|
||||
this.btnPixelHistoryApply.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// toolStripSeparator20
|
||||
//
|
||||
this.toolStripSeparator20.Name = "toolStripSeparator20";
|
||||
this.toolStripSeparator20.Size = new System.Drawing.Size(6, 25);
|
||||
//
|
||||
// btnPixelHistoryClear
|
||||
//
|
||||
this.btnPixelHistoryClear.Enabled = false;
|
||||
this.btnPixelHistoryClear.Image = global::UVtools.GUI.Properties.Resources.delete_16x16;
|
||||
this.btnPixelHistoryClear.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.btnPixelHistoryClear.Name = "btnPixelHistoryClear";
|
||||
this.btnPixelHistoryClear.Size = new System.Drawing.Size(54, 22);
|
||||
this.btnPixelHistoryClear.Text = "Clear";
|
||||
this.btnPixelHistoryClear.ToolTipText = "Clears all operations";
|
||||
this.btnPixelHistoryClear.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// tabControlPixelEditor
|
||||
//
|
||||
this.tabControlPixelEditor.Controls.Add(this.tabPage1);
|
||||
@@ -1451,11 +1542,11 @@
|
||||
//
|
||||
this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.label6.AutoSize = true;
|
||||
this.label6.Location = new System.Drawing.Point(343, 101);
|
||||
this.label6.Location = new System.Drawing.Point(338, 101);
|
||||
this.label6.Name = "label6";
|
||||
this.label6.Size = new System.Drawing.Size(23, 18);
|
||||
this.label6.Size = new System.Drawing.Size(28, 18);
|
||||
this.label6.TabIndex = 6;
|
||||
this.label6.Text = "px";
|
||||
this.label6.Text = "px²";
|
||||
//
|
||||
// nmPixelEditorBrushSize
|
||||
//
|
||||
@@ -1473,7 +1564,7 @@
|
||||
0,
|
||||
0});
|
||||
this.nmPixelEditorBrushSize.Name = "nmPixelEditorBrushSize";
|
||||
this.nmPixelEditorBrushSize.Size = new System.Drawing.Size(229, 24);
|
||||
this.nmPixelEditorBrushSize.Size = new System.Drawing.Size(224, 24);
|
||||
this.nmPixelEditorBrushSize.TabIndex = 5;
|
||||
this.nmPixelEditorBrushSize.Value = new decimal(new int[] {
|
||||
1,
|
||||
@@ -1960,15 +2051,6 @@
|
||||
this.layerScrollTimer.Interval = 150;
|
||||
this.layerScrollTimer.Tick += new System.EventHandler(this.EventTimerTick);
|
||||
//
|
||||
// menuToolsLayerRemoval
|
||||
//
|
||||
this.menuToolsLayerRemoval.Enabled = false;
|
||||
this.menuToolsLayerRemoval.Image = global::UVtools.GUI.Properties.Resources.delete_16x16;
|
||||
this.menuToolsLayerRemoval.Name = "menuToolsLayerRemoval";
|
||||
this.menuToolsLayerRemoval.Size = new System.Drawing.Size(261, 22);
|
||||
this.menuToolsLayerRemoval.Text = "Layer Re&moval";
|
||||
this.menuToolsLayerRemoval.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// FrmMain
|
||||
//
|
||||
this.AllowDrop = true;
|
||||
@@ -2214,6 +2296,14 @@
|
||||
private System.Windows.Forms.ToolStripButton tsLayerRmove;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator18;
|
||||
private System.Windows.Forms.ToolStripMenuItem menuToolsLayerRemoval;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator19;
|
||||
private System.Windows.Forms.ToolStripButton btnPixelHistoryApply;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator20;
|
||||
private System.Windows.Forms.ToolStripButton btnPixelHistoryClear;
|
||||
private System.Windows.Forms.ToolStripButton tsThumbnailsImport;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator21;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator22;
|
||||
private System.Windows.Forms.ToolStripMenuItem menuToolsLayerReHeight;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+154
-11
@@ -766,6 +766,14 @@ namespace UVtools.GUI
|
||||
return;
|
||||
}
|
||||
|
||||
if (ReferenceEquals(sender, menuToolsLayerReHeight))
|
||||
{
|
||||
using (var frm = new FrmToolLayerReHeight(SlicerFile.LayerCount, SlicerFile.LayerHeight))
|
||||
{
|
||||
if (frm.ShowDialog() != DialogResult.OK) return;
|
||||
}
|
||||
}
|
||||
|
||||
if (ReferenceEquals(sender, menuToolsLayerRemoval))
|
||||
{
|
||||
using (var frm = new FrmToolEmpty(ActualLayer, "Layer Removal", "Removes layer(s) in a given range", "Remove"))
|
||||
@@ -999,6 +1007,23 @@ namespace UVtools.GUI
|
||||
return;
|
||||
}
|
||||
|
||||
if (ReferenceEquals(sender, tsThumbnailsImport))
|
||||
{
|
||||
using (var fileOpen = new OpenFileDialog
|
||||
{
|
||||
CheckFileExists = true,
|
||||
Filter = "Image Files(*.PNG;*.BMP;*.JPEG;*.JPG;*.GIF)|*.PNG;*.BMP;*.JPEG;*.JPG;*.GIF"
|
||||
})
|
||||
{
|
||||
if (fileOpen.ShowDialog() != DialogResult.OK) return;
|
||||
byte i = byte.Parse(tsThumbnailsCount.Tag.ToString());
|
||||
SlicerFile.SetThumbnail(i, fileOpen.FileName);
|
||||
pbThumbnail.Image = SlicerFile.Thumbnails[i].ToBitmap();
|
||||
SlicerFile.RequireFullEncode = true;
|
||||
menuFileSave.Enabled = menuFileSaveAs.Enabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (ReferenceEquals(sender, tsThumbnailsExport))
|
||||
{
|
||||
tsThumbnailsExport.ShowDropDown();
|
||||
@@ -1312,7 +1337,68 @@ namespace UVtools.GUI
|
||||
|
||||
ShowLayer();
|
||||
}
|
||||
|
||||
|
||||
if (ReferenceEquals(sender, btnPixelHistoryClear))
|
||||
{
|
||||
if (!btnPixelHistoryApply.Enabled) return;
|
||||
if (PixelHistory.Count == 0) return;
|
||||
if (MessageBox.Show(
|
||||
"Are you sure you want to clear all operations?",
|
||||
"Clear operations?", MessageBoxButtons.YesNo,
|
||||
MessageBoxIcon.Question) != DialogResult.Yes) return;
|
||||
|
||||
PixelHistory.Clear();
|
||||
RefreshPixelHistory();
|
||||
ShowLayer();
|
||||
|
||||
}
|
||||
|
||||
if (ReferenceEquals(sender, btnPixelHistoryApply))
|
||||
{
|
||||
if (!btnPixelHistoryApply.Enabled) return;
|
||||
if (PixelHistory.Count == 0) return;
|
||||
if (MessageBox.Show(
|
||||
"There are unsaved changes on image editor, do you want to apply modifications?",
|
||||
"Unsaved changes on image editor", MessageBoxButtons.YesNo,
|
||||
MessageBoxIcon.Question) != DialogResult.Yes) return;
|
||||
|
||||
btnPixelHistoryApply.Enabled = false;
|
||||
DisableGUI();
|
||||
FrmLoading.SetDescription("Drawing pixels");
|
||||
|
||||
Task task = Task.Factory.StartNew(() =>
|
||||
{
|
||||
try
|
||||
{
|
||||
SlicerFile.LayerManager.DrawModifications(PixelHistory, FrmLoading.RestartProgress());
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show($"{ex.Message}", "Drawing was unsuccessful!", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
finally
|
||||
{
|
||||
Invoke((MethodInvoker)delegate {
|
||||
// Running on the UI thread
|
||||
EnableGUI(true);
|
||||
});
|
||||
}
|
||||
|
||||
return false;
|
||||
});
|
||||
|
||||
FrmLoading.ShowDialog();
|
||||
|
||||
//lvPixelHistory.Items.Clear();
|
||||
PixelHistory.Clear();
|
||||
RefreshPixelHistory();
|
||||
ShowLayer();
|
||||
}
|
||||
|
||||
|
||||
/************************
|
||||
* Layer Menu *
|
||||
@@ -1395,8 +1481,9 @@ namespace UVtools.GUI
|
||||
FrmLoading.ShowDialog();
|
||||
}
|
||||
|
||||
lvPixelHistory.Items.Clear();
|
||||
//lvPixelHistory.Items.Clear();
|
||||
PixelHistory.Clear();
|
||||
RefreshPixelHistory();
|
||||
ShowLayer();
|
||||
}
|
||||
|
||||
@@ -1666,19 +1753,42 @@ namespace UVtools.GUI
|
||||
x = ActualLayerImage.Height - 1 - issue.Y;
|
||||
y = issue.X;
|
||||
}
|
||||
|
||||
pbLayer.ZoomToRegion(x, y, 5, 5);
|
||||
pbLayer.ZoomOut(true);
|
||||
|
||||
if (Settings.Default.AutoZoomIssues)
|
||||
{
|
||||
pbLayer.ZoomToRegion(x, y, 5, 5);
|
||||
pbLayer.ZoomOut(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
pbLayer.CenterAt(x, y);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
pbLayer.ZoomToRegion(
|
||||
tsLayerImageRotate.Checked ? ActualLayerImage.Height - 1 - issue.BoundingRectangle.Bottom : issue.BoundingRectangle.X,
|
||||
tsLayerImageRotate.Checked ? issue.BoundingRectangle.X : issue.BoundingRectangle.Y,
|
||||
tsLayerImageRotate.Checked ? issue.BoundingRectangle.Height : issue.BoundingRectangle.Width,
|
||||
tsLayerImageRotate.Checked ? issue.BoundingRectangle.Width : issue.BoundingRectangle.Height
|
||||
int x = tsLayerImageRotate.Checked
|
||||
? ActualLayerImage.Height - 1 - issue.BoundingRectangle.Bottom
|
||||
: issue.BoundingRectangle.X;
|
||||
int y = tsLayerImageRotate.Checked ? issue.BoundingRectangle.X : issue.BoundingRectangle.Y;
|
||||
if (Settings.Default.AutoZoomIssues)
|
||||
{
|
||||
|
||||
pbLayer.ZoomToRegion(
|
||||
x,
|
||||
y,
|
||||
tsLayerImageRotate.Checked
|
||||
? issue.BoundingRectangle.Height
|
||||
: issue.BoundingRectangle.Width,
|
||||
tsLayerImageRotate.Checked
|
||||
? issue.BoundingRectangle.Width
|
||||
: issue.BoundingRectangle.Height
|
||||
);
|
||||
pbLayer.ZoomOut(true);
|
||||
pbLayer.ZoomOut(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
pbLayer.CenterAt(x, y);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1687,6 +1797,37 @@ namespace UVtools.GUI
|
||||
return;
|
||||
}
|
||||
|
||||
if (ReferenceEquals(sender, lvPixelHistory))
|
||||
{
|
||||
if (lvPixelHistory.SelectedItems.Count == 0) return;
|
||||
var item = lvPixelHistory.SelectedItems[0];
|
||||
|
||||
if (!(item.Tag is PixelOperation operation)) return;
|
||||
if (operation.LayerIndex != ActualLayer)
|
||||
{
|
||||
ShowLayer(operation.LayerIndex);
|
||||
}
|
||||
|
||||
int x = operation.Location.X;
|
||||
int y = operation.Location.Y;
|
||||
|
||||
if (tsLayerImageRotate.Checked)
|
||||
{
|
||||
x = ActualLayerImage.Height - 1 - operation.Location.Y;
|
||||
y = operation.Location.X;
|
||||
}
|
||||
|
||||
if (Settings.Default.AutoZoomIssues)
|
||||
{
|
||||
pbLayer.ZoomToRegion(x, y, operation.Size.Width, operation.Size.Height);
|
||||
pbLayer.ZoomOut(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
pbLayer.CenterAt(x, y);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void TbLayerOnMouseWheel(object sender, MouseEventArgs e)
|
||||
@@ -2837,6 +2978,8 @@ namespace UVtools.GUI
|
||||
|
||||
lvPixelHistory.EndUpdate();
|
||||
btnPixelHistoryRemove.Enabled = false;
|
||||
btnPixelHistoryClear.Enabled =
|
||||
btnPixelHistoryApply.Enabled = PixelHistory.Count > 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
+68
-80
@@ -129,6 +129,12 @@
|
||||
<metadata name="tsLayer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>201, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsThumbnails.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>291, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsProperties.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>649, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsGCode.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>551, 17</value>
|
||||
</metadata>
|
||||
@@ -145,13 +151,13 @@
|
||||
<value>
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAw
|
||||
EQAAAk1TRnQBSQFMAgEBBQEAAcABBQHAAQUBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
|
||||
AwABIAMAAQEBAAEgBgABIC4AAxgBIgMwAUsDMAFMAzIBUOgAAyIBMQNWAbkDXQHiAQ0BEAELAf8BDQEQ
|
||||
AQsB/wEqAS0BKAH+A1MBrANNAZUDAAEB2AADIQEwA1kB7AErAS4BKQH6A1EB9wNSAfQDUwHxA0gB9gNB
|
||||
AfkBDQEQAQsB/wNPAZsDAAEB0AADHAEoA1kB6wEqAS0BKAH+A1YBtgNMAZIDSAGFA0gBhQNGAYADSAGF
|
||||
ASoBLQEoAf4BDQEQAQsB/wNOAZTQAAMmATgBKgEtASgB/gNMAZMDSwGQA00BlgNKAYsDRQF/A0MBeAND
|
||||
AXgDRwGCAz4B+ANTAbDQAANcAdQBDQEQAQsB/wNRAaADTgGYA1ABnwM6AWEDOAFdA0IBdANGAYADSAGE
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq
|
||||
EQAAAk1TRnQBSQFMAgEBBQEAARgBBgEYAQYBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
|
||||
AwABIAMAAQEBAAEgBgABIC4AAxgBIgMwAUsDMAFMAzIBUOgAAyIBMQNWAbkDXQHiAQIBBQEAAf8BAgEF
|
||||
AQAB/wEqAS0BKAH+A1MBrANNAZUDAAEB2AADIQEwA1kB7AErAS4BKQH6A1EB9wNSAfQDUwHxA0gB9gNB
|
||||
AfkBAgEFAQAB/wNPAZsDAAEB0AADHAEoA1kB6wEqAS0BKAH+A1YBtgNMAZIDSAGFA0gBhQNGAYADSAGF
|
||||
ASoBLQEoAf4BAgEFAQAB/wNOAZTQAAMmATgBKgEtASgB/gNMAZMDSwGQA00BlgNKAYsDRQF/A0MBeAND
|
||||
AXgDRwGCAz4B+ANTAbDQAANcAdQBAgEFAQAB/wNRAaADTgGYA1ABnwM6AWEDOAFdA0IBdANGAYADSAGE
|
||||
A0wBkwNYAeMDMAFMyAADNgFZA0ABcANZAdcDRwGCA0wBkwNJAYkDAQECBAADMAFLA0QBeQNIAYcDSwGQ
|
||||
A1cB6AMwAUzIAAMtAUYDOAFeA0oBjQMSARgDUAGjEAADKQE+A0sBkANNAZUDWQHsAzABTMgAAxQBHAMw
|
||||
AU0DTwGcA1EBogNTAbAQAAMrAUMDTwGbA1ABngNWAbsDFQEdyAADRAF5Az8BbgMqAUADHgErAyoBQANV
|
||||
@@ -163,83 +169,65 @@
|
||||
A1IBqQNSAakDUgGpA1IBqQNQAaNcAAMVAR0BQgJZAfUBUQJtAfcDQwF3A1sByAJCAVkB9QJYAV8B4wNK
|
||||
AYwDCgENBAADVQG0A1kBxwMvAUkDAAEBAxsBJgMcAScDHAEnAxwBJwMcAScDHAEnAxwBJwMcAScDHAEn
|
||||
AxwBJwMcAScDAgEDBAADUgGpMAADUgGpEAADJwE6AzABTAMwAUwDMAFMAzABTAMwAUwDMAFMAzABTAMw
|
||||
AUwDJwE6FAADBQEHA0wBkgFWAlgBwQMVAR0DPQFpAQAByAHzAf8BAAGQAeYB/wIAAdwB/wIAAd0B/wIu
|
||||
AeMB/wIEAd4B/wIAAd0B/wJYAVsBywMGAQgDAAH/AwAB/wNDAXcDKQE+AwAB/wMAAf8DAAH/AwAB/wMA
|
||||
AUwDJwE6FAADBQEHA0wBkgFWAlgBwQMVAR0DPQFpAQAByAHzAf8BAAGQAeYB/wIAAdwB/wIAAd0B/wIj
|
||||
AeMB/wIAAd4B/wIAAd0B/wJYAVsBywMGAQgDAAH/AwAB/wNDAXcDKQE+AwAB/wMAAf8DAAH/AwAB/wMA
|
||||
Af8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DMgFRBAADUgGpBAADUAGdA1MBqgNTAaoDUwGqA1MBqgNT
|
||||
AaoDUwGqA1ABnQwAA1IBqRAAA04B+wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/A04B+xQA
|
||||
ATACMQFNAQAByQHzAf8BAAHJAfQB/wFZAmAB6wFbAl4B2QEAAcAB8QH/AQABAgHfAf8CAAHgAf8CAAHg
|
||||
Af8CNQHpAf8CBwHiAf8CAAHgAf8CAAHgAf8DQAFxA1EBogNWAbYDKgFABAADEAEVAxEBFwMRARcDEQEX
|
||||
AxEBFwMRARcDEQEXAxEBFwMRARcDEQEXAxABFggAA1IBqQQAA1ABnQNTAaoDUwGqAx8BLBwAA1IBqRMA
|
||||
Af8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8UAAMHAQoBWQJnAfIBAAHKAfQB/wEA
|
||||
AcoB9AH/AQABygH0Af8BAAGhAe4B/wIAAeMB/wIAAeMB/wIAAeMB/wKpAe8B/wIGAeMB/wIAAeMB/wIA
|
||||
AeMB/wJWAVgBuQMKAQ4DEQEXAwABATgAA1IBqTAAA1IBqRMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMA
|
||||
Af8DAAH/AwAB/wMAAf8MAAMVAR0DPQFpAzoBYgFcAmAB1AEAAcsB9QH/AQABywH1Af8BAAHLAfUB/wEA
|
||||
AaAB8AH/AgIB5gH/AgIB5gH/AgIB5gH/AsIB9gH/AhoB6AH/AgIB5gH/AgIB5gH/AlcBWQG/A1IB9AMA
|
||||
Af8DPgFsAw4BEwNCAXYDQwF3A0MBdwNDAXcDQwF3A0MBdwNDAXcDQwF3A0MBdwNDAXcDQgF2AxQBGwQA
|
||||
A1IBqQMiATIDUgGpA1IBqQNSAakDUgGpA1IBqQNSAakDUgGpA1IBqQNSAakDUgGpAyIBMgNSAakTAAH/
|
||||
AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/DAABSwJMAZABAAHLAfYB/wEAAcsB9gH/
|
||||
AQABywH2Af8BAAHLAfYB/wEpAU0BUAH6A0MBeAMiATICSwFfAfsCBQHpAf8CBQHpAf8CzQH4Af8CKQHt
|
||||
Af8CBQHpAf8CBQHpAf8DUAGeAwAB/gMAAf8DQwF3Ax4BKwNXAcUDWQHHA1kBxwNZAccDWQHHA1kBxwNZ
|
||||
AccDWQHHA1kBxwNZAccDWAHGAyYBOQQAA1IBqQM0AVUDNAFVIAADNAFVAzQBVQNSAakTAAH/AwAB/wMA
|
||||
Af8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/DAADUQGgAQABzAH3Af8BAAHMAfcB/wEAAcwB9wH/
|
||||
AQABzAH3Af8DQwF3CAADSgGNAggB7AH/AggB7AH/AiQB7wH/AgwB7AH/AggB7AH/AQQBFQHtAf8BUgJT
|
||||
AagDMwFTAzwBZwMUARw4AANSAakDNAFVAzQBVQNGAYADUgGpA1IBqQNSAakDUgGpA1IBqQNSAakDRQF/
|
||||
AzQBVQM0AVUDUgGpEwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/w8AAQEBPwJA
|
||||
AW8BPgJcAfgBAAHNAfcB/wEAAc0B9wH/AxIBGAgAAwEBAgNGAX4CUgFdAfACCwHuAf8BCwEMAe4B/wJA
|
||||
AagB/QFFAkYBfgMDAQQDMwFTAzwBZwMUARw4AANSAakDNAFVAzQBVQM/AW4DMgFQEAADJwE7A0QBfAM0
|
||||
AVUDNAFVA1IBqRMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8PAAEBAT8CQAFv
|
||||
AT4CXAH4AQABzgH4Af8BAAHOAfgB/wMSARgQAAMXASABAAG8AfcB/wEAAcQB9wH/AUACqAH9AUUCRgF+
|
||||
AwMBBAMAAf4DAAH/A0MBdwMfASwDVwHFA1kBxwNZAccDWQHHA1kBxwNZAccDWQHHA1kBxwNZAccDWQHH
|
||||
A1gBxgMmATkEAANSAakDNAFVAzQBVQMFAQcDVQG1AxEBFwNSAakDKQE+BAADUAGfAxEBFwM0AVUDNAFV
|
||||
A1IBqRMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8MAANRAaABAAHOAfgB/wEA
|
||||
Ac8B+QH/AQABzwH5Af8BAAHPAfkB/wNDAXcQAANEAXoBAAHPAfkB/wEAAc8B+QH/AQABzwH5Af8BAAHO
|
||||
AfgB/wFSAlMBqANSAfQDAAH/Az4BbAMOARMDQgF1A0MBdwNDAXcDQwF3A0MBdwNDAXcDQwF3A0MBdwND
|
||||
AXcDQwF3A0MBdwMUARsEAANSAakDNAFVAzQBVQQAAzwBaANWAb4DIwE0A1UBtQMSARkDUQGgBAADNAFV
|
||||
AzQBVQNSAakTAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DXAHfDAABSwJMAZABAAHQ
|
||||
AfoB/wEAAdAB+gH/AQAB0AH6Af8BAAHQAfoB/wEpAU0BUAH6A0MBeAMSARkDEwEaA0QBegEoAl8B+wEA
|
||||
AdAB+gH/AQAB0AH6Af8BAAHQAfoB/wEAAdAB+gH/A0oBjAMKAQ4DEQEXAwABATgAA1IBqQM0AVUDNAFV
|
||||
AwABAQMtAUYDCgEOBAADOQFfA1wBzgMoATwEAAM0AVUDNAFVA1IBqRMAAf8DggH/AwAB/wMAAf8DAAH/
|
||||
AwAB/wMAAf8DAAH/A1wB3wMXASAMAAMVAR0DPQFpAzoBYgFcAmAB1AEAAdEB+gH/AQAB0QH6Af8BAAHQ
|
||||
AfoB/wEAAcsB8wH/AQABywHzAf8BAAHQAfoB/wEAAdEB+gH/AQAB0QH6Af8BXQJhAeIDOgFiAz0BaQMU
|
||||
ARwDUQGiA1YBtgMqAUAEAAMQARUDEQEXAxEBFwMRARcDEQEXAxEBFwMRARcDEQEXAxEBFwMRARcDEAEW
|
||||
CAADUgGpAzQBVQM0AVUDMwFTA1IBpgNKAYwHAAEBA0cBgwgAAzQBVQM0AVUDUgGpEwAB/wOZAf8DhQH/
|
||||
AwAB/wMAAf8DAAH/AwAB/wNcAd8DFwEgGAADBwEKAVkCZwHyAQAB0gH7Af8BAAHSAfsB/wEAAdIB+wH/
|
||||
AQAB0gH7Af8BAAHSAfsB/wEAAdIB+wH/AQAB0gH7Af8BAAHSAfsB/wErAl8B+wMRARcLAAH/AwAB/wND
|
||||
AXcDKQE+AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DMgFRBAADUgGp
|
||||
AzQBVQM0AVUDEQEXA1ABngMkATYUAAM0AVUDNAFVA1IBqRAAA1AB+wMAAf8DAAH/AwAB/wMAAf8DAAH/
|
||||
A1wB3wMXASAcAAEwAjEBTQEAAdIB/AH/AQAB0gH8Af8BWQJgAesBWwJeAdkBAAHSAfwB/wEAAdIB/AH/
|
||||
AVsCYQHhAV0CYQHiAQAB0gH8Af8BAAHSAfwB/wM4AV4IAANVAbQDWQHHAy8BSQMAAQEDGwEmAxwBJwMc
|
||||
AScDHAEnAxwBJwMcAScDHAEnAxwBJwMcAScDHAEnAxwBJwMCAQMEAANSAakDIgEyA1IBqQNSAakDUgGp
|
||||
A1IBqQNSAakDUgGpA1IBqQNSAakDUgGpA1IBqQMiATIDUgGpEAADIAEuAykBPwMpAT8DKQE/AykBPwMp
|
||||
AT8DEQEXIAADBQEHA0wBkgFWAlgBwQMVAR0DPQFpAQAB0wH8Af8BAAHTAfwB/wFFAkYBfwMQARUDVgGz
|
||||
AUsCTAGPAwQBBkwAA1ABowNSAakDUgGpA1IBqQNSAakDUgGpA1IBqQNSAakDUgGpA1IBqQNSAakDUgGp
|
||||
A1IBqQNQAaNcAAMVAR0BQgJZAfUBUQJtAfcDIAEvGAABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEA
|
||||
AQEGAAEBFgAD/wEAAf4BHwYAAfgBAwYAAfABAQYAAeABAQYAAeABAQYAAeAHAAHAAUAGAAHBAeAGAAHB
|
||||
AeAGAAHAAUEGAAGAAQEGAAGAAQMGAAEQAQcGAAGEAX8GAAHBAf8GAAHPAf8GAAL/AYABAQL/AfwBAQIA
|
||||
Ab8B/QHgAQcBwAMAAaABHQHgAQcBwAEAARABAQGhAf0B4AEHAcABAAEfAf8BvwH9AeABBwQAAYABAQHg
|
||||
AQcEAAGPAfEB4AEHAQMBAAEfAf8BgAEBAeABBwEDAQABHwH/AYMBwQHgAQcBAwHAAgABgAFBAeABBwED
|
||||
AcACAAGIAREB4AEHAgABHwH/AYEBEQHgAQcCAAEQAQEBgQExAeABDwHAAQMCAAGBAfEB4AEfAcABAwIA
|
||||
AYABAQHgAT8BwAEDAv8BgAEBAv8B/AE/Cw==
|
||||
ATACMQFNAQAByQHzAf8BAAHJAfQB/wFZAmAB6wFbAl4B2QEAAcAB8QH/AgAB3wH/AgAB4AH/AgAB4AH/
|
||||
AioB6QH/AgAB4gH/AgAB4AH/AgAB4AH/A0ABcQNRAaIDVgG2AyoBQAQAAxABFQMRARcDEQEXAxEBFwMR
|
||||
ARcDEQEXAxEBFwMRARcDEQEXAxEBFwMQARYIAANSAakEAANQAZ0DUwGqA1MBqgMfASwcAANSAakTAAH/
|
||||
AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/FAADBwEKAVkCZwHyAQABygH0Af8BAAHK
|
||||
AfQB/wEAAcoB9AH/AQABoQHuAf8CAAHjAf8CAAHjAf8CAAHjAf8CqQHvAf8CAAHjAf8CAAHjAf8CAAHj
|
||||
Af8CVgFYAbkDCgEOAxEBFwMAAQE4AANSAakwAANSAakTAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
|
||||
AwAB/wMAAf8DAAH/DAADFQEdAz0BaQM6AWIBXAJgAdQBAAHLAfUB/wEAAcsB9QH/AQABywH1Af8BAAGg
|
||||
AfAB/wIAAeYB/wIAAeYB/wIAAeYB/wLCAfYB/wIPAegB/wIAAeYB/wIAAeYB/wJXAVkBvwNSAfQDAAH/
|
||||
Az4BbAMOARMDQgF2A0MBdwNDAXcDQwF3A0MBdwNDAXcDQwF3A0MBdwNDAXcDQwF3A0IBdgMUARsEAANS
|
||||
AakDIgEyA1IBqQNSAakDUgGpA1IBqQNSAakDUgGpA1IBqQNSAakDUgGpA1IBqQMiATIDUgGpEwAB/wMA
|
||||
Af8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wwAAUsCTAGQAQABywH2Af8BAAHLAfYB/wEA
|
||||
AcsB9gH/AQABywH2Af8BKQJNAfoDQwF4AyIBMgJLAV8B+wIAAekB/wIAAekB/wLNAfgB/wIeAe0B/wIA
|
||||
AekB/wIAAekB/wNQAZ4DAAH+AwAB/wNDAXcDHgErA1cBxQNZAccDWQHHA1kBxwNZAccDWQHHA1kBxwNZ
|
||||
AccDWQHHA1kBxwNYAcYDJgE5BAADUgGpAzQBVQM0AVUgAAM0AVUDNAFVA1IBqRMAAf8DAAH/AwAB/wMA
|
||||
Af8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8MAANRAaABAAHMAfcB/wEAAcwB9wH/AQABzAH3Af8BAAHM
|
||||
AfcB/wNDAXcIAANKAY0CAAHsAf8CAAHsAf8CGQHvAf8CAQHsAf8CAAHsAf8BAAEKAe0B/wFSAlMBqAMz
|
||||
AVMDPAFnAxQBHDgAA1IBqQM0AVUDNAFVA0YBgANSAakDUgGpA1IBqQNSAakDUgGpA1IBqQNFAX8DNAFV
|
||||
AzQBVQNSAakTAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/DwABAQE/AkABbwE+
|
||||
AlwB+AEAAc0B9wH/AQABzQH3Af8DEgEYCAADAQECA0YBfgJSAV0B8AIAAe4B/wEAAQEB7gH/AkABqAH9
|
||||
AUUCRgF+AwMBBAMzAVMDPAFnAxQBHDgAA1IBqQM0AVUDNAFVAz8BbgMyAVAQAAMnATsDRAF8AzQBVQM0
|
||||
AVUDUgGpEwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/w8AAQEBPwJAAW8BPgJc
|
||||
AfgBAAHOAfgB/wEAAc4B+AH/AxIBGBAAAxcBIAEAAbwB9wH/AQABxAH3Af8BQAKoAf0BRQJGAX4DAwEE
|
||||
AwAB/gMAAf8DQwF3Ax8BLANXAcUDWQHHA1kBxwNZAccDWQHHA1kBxwNZAccDWQHHA1kBxwNZAccDWAHG
|
||||
AyYBOQQAA1IBqQM0AVUDNAFVAwUBBwNVAbUDEQEXA1IBqQMpAT4EAANQAZ8DEQEXAzQBVQM0AVUDUgGp
|
||||
EwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wwAA1EBoAEAAc4B+AH/AQABzwH5
|
||||
Af8BAAHPAfkB/wEAAc8B+QH/A0MBdxAAA0QBegEAAc8B+QH/AQABzwH5Af8BAAHPAfkB/wEAAc4B+AH/
|
||||
AVICUwGoA1IB9AMAAf8DPgFsAw4BEwNCAXUDQwF3A0MBdwNDAXcDQwF3A0MBdwNDAXcDQwF3A0MBdwND
|
||||
AXcDQwF3AxQBGwQAA1IBqQM0AVUDNAFVBAADPAFoA1YBvgMjATQDVQG1AxIBGQNRAaAEAAM0AVUDNAFV
|
||||
A1IBqRMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wNcAd8MAAFLAkwBkAEAAdAB+gH/
|
||||
AQAB0AH6Af8BAAHQAfoB/wEAAdAB+gH/ASkCTQH6A0MBeAMSARkDEwEaA0QBegEoAl8B+wEAAdAB+gH/
|
||||
AQAB0AH6Af8BAAHQAfoB/wEAAdAB+gH/A0oBjAMKAQ4DEQEXAwABATgAA1IBqQM0AVUDNAFVAwABAQMt
|
||||
AUYDCgEOBAADOQFfA1wBzgMoATwEAAM0AVUDNAFVA1IBqRMAAf8DggH/AwAB/wMAAf8DAAH/AwAB/wMA
|
||||
Af8DAAH/A1wB3wMXASAMAAMVAR0DPQFpAzoBYgFcAmAB1AEAAdEB+gH/AQAB0QH6Af8BAAHQAfoB/wEA
|
||||
AcsB8wH/AQABywHzAf8BAAHQAfoB/wEAAdEB+gH/AQAB0QH6Af8BXQJhAeIDOgFiAz0BaQMUARwDUQGi
|
||||
A1YBtgMqAUAEAAMQARUDEQEXAxEBFwMRARcDEQEXAxEBFwMRARcDEQEXAxEBFwMRARcDEAEWCAADUgGp
|
||||
AzQBVQM0AVUDMwFTA1IBpgNKAYwHAAEBA0cBgwgAAzQBVQM0AVUDUgGpEwAB/wOZAf8DhQH/AwAB/wMA
|
||||
Af8DAAH/AwAB/wNcAd8DFwEgGAADBwEKAVkCZwHyAQAB0gH7Af8BAAHSAfsB/wEAAdIB+wH/AQAB0gH7
|
||||
Af8BAAHSAfsB/wEAAdIB+wH/AQAB0gH7Af8BAAHSAfsB/wErAl8B+wMRARcLAAH/AwAB/wNDAXcDKQE+
|
||||
AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DMgFRBAADUgGpAzQBVQM0
|
||||
AVUDEQEXA1ABngMkATYUAAM0AVUDNAFVA1IBqRAAA1AB+wMAAf8DAAH/AwAB/wMAAf8DAAH/A1wB3wMX
|
||||
ASAcAAEwAjEBTQEAAdIB/AH/AQAB0gH8Af8BWQJgAesBWwJeAdkBAAHSAfwB/wEAAdIB/AH/AVsCYQHh
|
||||
AV0CYQHiAQAB0gH8Af8BAAHSAfwB/wM4AV4IAANVAbQDWQHHAy8BSQMAAQEDGwEmAxwBJwMcAScDHAEn
|
||||
AxwBJwMcAScDHAEnAxwBJwMcAScDHAEnAxwBJwMCAQMEAANSAakDIgEyA1IBqQNSAakDUgGpA1IBqQNS
|
||||
AakDUgGpA1IBqQNSAakDUgGpA1IBqQMiATIDUgGpEAADIAEuAykBPwMpAT8DKQE/AykBPwMpAT8DEQEX
|
||||
IAADBQEHA0wBkgFWAlgBwQMVAR0DPQFpAQAB0wH8Af8BAAHTAfwB/wFFAkYBfwMQARUDVgGzAUsCTAGP
|
||||
AwQBBkwAA1ABowNSAakDUgGpA1IBqQNSAakDUgGpA1IBqQNSAakDUgGpA1IBqQNSAakDUgGpA1IBqQNQ
|
||||
AaNcAAMVAR0BQgJZAfUBUQJtAfcDIAEvGAABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEB
|
||||
FgAD/wEAAf4BHwYAAfgBAwYAAfABAQYAAeABAQYAAeABAQYAAeAHAAHAAUAGAAHBAeAGAAHBAeAGAAHA
|
||||
AUEGAAGAAQEGAAGAAQMGAAEQAQcGAAGEAX8GAAHBAf8GAAHPAf8GAAL/AYABAQL/AfwBAQIAAb8B/QHg
|
||||
AQcBwAMAAaABHQHgAQcBwAEAARABAQGhAf0B4AEHAcABAAEfAf8BvwH9AeABBwQAAYABAQHgAQcEAAGP
|
||||
AfEB4AEHAQMBAAEfAf8BgAEBAeABBwEDAQABHwH/AYMBwQHgAQcBAwHAAgABgAFBAeABBwEDAcACAAGI
|
||||
AREB4AEHAgABHwH/AYEBEQHgAQcCAAEQAQEBgQExAeABDwHAAQMCAAGBAfEB4AEfAcABAwIAAYABAQHg
|
||||
AT8BwAEDAv8BgAEBAv8B/AE/Cw==
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="tsThumbnails.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>291, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsProperties.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>649, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsGCode.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>551, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsIssues.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>765, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsPixelEditorHistory.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1155, 17</value>
|
||||
</metadata>
|
||||
<metadata name="toolTipInformation.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>863, 17</value>
|
||||
</metadata>
|
||||
<metadata name="toolTipInformation.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>863, 17</value>
|
||||
</metadata>
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 382 B |
Binary file not shown.
|
After Width: | Height: | Size: 241 B |
Binary file not shown.
|
After Width: | Height: | Size: 221 B |
@@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("0.6.3.0")]
|
||||
[assembly: AssemblyFileVersion("0.6.3.0")]
|
||||
[assembly: AssemblyVersion("0.6.3.1")]
|
||||
[assembly: AssemblyFileVersion("0.6.3.1")]
|
||||
|
||||
+30
@@ -60,6 +60,16 @@ namespace UVtools.GUI.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap accept_16x16 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("accept-16x16", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
@@ -370,6 +380,16 @@ namespace UVtools.GUI.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap ladder_16x16 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("ladder-16x16", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
@@ -500,6 +520,16 @@ namespace UVtools.GUI.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap photo_16x16 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("photo-16x16", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
||||
@@ -118,23 +118,23 @@
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="layers-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\layers-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="search-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\search-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<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>
|
||||
<data name="resize-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\resize-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Cancel-24x24" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\Cancel-24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="arrow-top-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\arrow-top-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="mutation_closing" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\gui\mutation_closing.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="mutation_solidify" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\gui\mutation_solidify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="eye-24x24" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\eye-24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
@@ -148,6 +148,9 @@
|
||||
<data name="File-Refresh-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\File-Refresh-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="pointer-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\pointer-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>
|
||||
@@ -169,12 +172,12 @@
|
||||
<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>
|
||||
<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="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="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="arrow-down-double-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\arrow-down-double-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@@ -196,6 +199,9 @@
|
||||
<data name="Next-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\Next-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="accept-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\accept-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="filter-filled-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\filter-filled-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@@ -205,14 +211,17 @@
|
||||
<data name="Open-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\Open-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<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 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="File-Close-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\File-Close-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="SaveAs-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\SaveAs-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="search-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\search-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="mutation_blackhat" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\gui\mutation_blackhat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Cancel-32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\Cancel-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
@@ -232,8 +241,8 @@
|
||||
<data name="Convert-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\Convert-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<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 name="layers-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\layers-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="mutation_dilation" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\gui\mutation_dilation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
@@ -253,26 +262,23 @@
|
||||
<data name="arrow-end-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\arrow-end-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>
|
||||
<data name="delete-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\delete-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="SaveAs-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\SaveAs-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="CNCMachine-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\CNCMachine-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="pointer-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\pointer-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="delete-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\delete-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="mutation_solidify" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\gui\mutation_solidify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<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="mutation_blackhat" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\gui\mutation_blackhat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<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="Cancel-24x24" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\Cancel-24x24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="mutation_closing" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\gui\mutation_closing.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<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>
|
||||
@@ -286,7 +292,10 @@
|
||||
<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>
|
||||
<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 name="photo-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\photo-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ladder-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Images\ladder-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
+12
@@ -586,5 +586,17 @@ namespace UVtools.GUI.Properties {
|
||||
this["FileExtractDefaultDirectory"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("True")]
|
||||
public bool AutoZoomIssues {
|
||||
get {
|
||||
return ((bool)(this["AutoZoomIssues"]));
|
||||
}
|
||||
set {
|
||||
this["AutoZoomIssues"] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -143,5 +143,8 @@
|
||||
<Setting Name="FileExtractDefaultDirectory" Type="System.String" Scope="User">
|
||||
<Value Profile="(Default)" />
|
||||
</Setting>
|
||||
<Setting Name="AutoZoomIssues" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">True</Value>
|
||||
</Setting>
|
||||
</Settings>
|
||||
</SettingsFile>
|
||||
@@ -164,6 +164,12 @@
|
||||
<Compile Include="Forms\FrmMutationPixelDimming.Designer.cs">
|
||||
<DependentUpon>FrmMutationPixelDimming.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Forms\FrmToolLayerReHeight.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Forms\FrmToolLayerReHeight.Designer.cs">
|
||||
<DependentUpon>FrmToolLayerReHeight.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Forms\FrmToolEmpty.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
@@ -255,6 +261,9 @@
|
||||
<EmbeddedResource Include="Forms\FrmMutationPixelDimming.resx">
|
||||
<DependentUpon>FrmMutationPixelDimming.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\FrmToolLayerReHeight.resx">
|
||||
<DependentUpon>FrmToolLayerReHeight.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\FrmToolEmpty.resx">
|
||||
<DependentUpon>FrmToolEmpty.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -339,6 +348,9 @@
|
||||
<None Include="Images\pattern-16x16.png" />
|
||||
<None Include="Images\resize-16x16.png" />
|
||||
<None Include="Images\cursor-16x16.png" />
|
||||
<None Include="Images\accept-16x16.png" />
|
||||
<None Include="Images\photo-16x16.png" />
|
||||
<None Include="Images\ladder-16x16.png" />
|
||||
<Content Include="UVtools.ico" />
|
||||
<None Include="UVtools.png" />
|
||||
<None Include="Images\Exit-16x16.png" />
|
||||
|
||||
Reference in New Issue
Block a user