diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..99a1b50
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "MaddoLibrary"]
+ path = MaddoLibrary
+ url = git@gitlab.com:MaddoTools/MaddoLibrary.git
diff --git a/Catalog.sln b/Catalog.sln
index 7108485..f6e15ec 100644
--- a/Catalog.sln
+++ b/Catalog.sln
@@ -17,6 +17,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaddoShared", "MaddoShared\MaddoShared.csproj", "{AEBFE9E3-277C-4A7B-8448-145D1B11998B}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaddoLibrary.Base.NET46", "MaddoLibrary\MaddoLibrary.Base.NET46\MaddoLibrary.Base.NET46.csproj", "{E93DAAE6-4AA9-4A45-AFB6-58209B3AD3C9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaddoLibrary.WPF.NET46", "MaddoLibrary\MaddoLibrary.WPF.NET46\MaddoLibrary.WPF.NET46.csproj", "{73DA19D7-196D-4B16-B610-93250978A607}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/CatalogLib/CatalogLib.csproj b/CatalogLib/CatalogLib.csproj
index c88f86e..f90a343 100644
--- a/CatalogLib/CatalogLib.csproj
+++ b/CatalogLib/CatalogLib.csproj
@@ -60,28 +60,33 @@
..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
True
-
- ..\packages\SixLabors.Core.0.1.0-alpha0002\lib\netstandard1.1\SixLabors.Core.dll
+
+ ..\packages\SixLabors.Core.1.0.0-beta0002\lib\netstandard1.1\SixLabors.Core.dll
- ..\packages\SixLabors.Fonts.0.1.0-alpha0014\lib\netstandard1.3\SixLabors.Fonts.dll
+ ..\packages\SixLabors.Fonts.1.0.0-beta0001\lib\netstandard1.3\SixLabors.Fonts.dll
+
+
+ ..\packages\SixLabors.ImageSharp.1.0.0-beta0001\lib\netstandard1.3\SixLabors.ImageSharp.dll
+
+
+ ..\packages\SixLabors.ImageSharp.Drawing.1.0.0-beta0001\lib\netstandard1.1\SixLabors.ImageSharp.Drawing.dll
- ..\packages\SixLabors.Shapes.0.1.0-alpha0018\lib\netstandard1.1\SixLabors.Shapes.dll
+ ..\packages\SixLabors.Shapes.1.0.0-beta0001\lib\netstandard1.1\SixLabors.Shapes.dll
- ..\packages\SixLabors.Shapes.Text.0.1.0-alpha0018\lib\netstandard1.1\SixLabors.Shapes.Text.dll
+ ..\packages\SixLabors.Shapes.Text.1.0.0-beta0001\lib\netstandard1.1\SixLabors.Shapes.Text.dll
..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll
-
- ..\packages\System.Buffers.4.3.0\lib\netstandard1.1\System.Buffers.dll
+
+ ..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll
-
- ..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
- True
+
+ ..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
@@ -109,7 +114,7 @@
..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll
- ..\packages\System.Memory.4.4.0-preview1-25305-02\lib\netstandard1.0\System.Memory.dll
+ ..\packages\System.Memory.4.4.0-preview2-25405-01\lib\netstandard1.0\System.Memory.dll
..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll
@@ -118,11 +123,11 @@
..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll
-
- ..\packages\System.Numerics.Vectors.4.3.0\lib\net46\System.Numerics.Vectors.dll
+
+ ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll
- ..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0-preview1-25305-02\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll
+ ..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll
..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -140,7 +145,7 @@
..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net46\System.Security.Cryptography.X509Certificates.dll
- ..\packages\System.ValueTuple.4.4.0-preview1-25305-02\lib\netstandard1.0\System.ValueTuple.dll
+ ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll
@@ -153,11 +158,11 @@
+
-
@@ -167,10 +172,15 @@
{44465926-240d-473f-90b8-786ba4384406}
CatalogVbLib
+
+ {e93daae6-4aa9-4a45-afb6-58209b3ad3c9}
+ MaddoLibrary.Base.NET46
+
+
diff --git a/CatalogLib/Enums.cs b/CatalogLib/Enums.cs
new file mode 100644
index 0000000..831a7c4
--- /dev/null
+++ b/CatalogLib/Enums.cs
@@ -0,0 +1,41 @@
+namespace CatalogLib
+{
+ public enum Positions
+ {
+ Alto,
+ Centro,
+ Basso
+ }
+
+ public enum Alignments
+ {
+ Sinistra,
+ Centro,
+ Destra
+ }
+
+ public enum ResizeModes
+ {
+ Bicubic,
+ Box,
+ CatmullRom,
+ Hermite,
+ Lanczos2,
+ Lanczos3,
+ Lanczos5,
+ Lanczos8,
+ MitchellNetravali,
+ NearestNeighbor,
+ Robidoux,
+ Spline,
+ Triangle,
+ Welch
+
+ }
+
+ public enum ResizeDimensions
+ {
+ LatoLungo,
+ LatoCorto
+ }
+}
\ No newline at end of file
diff --git a/CatalogLib/ImageCreator.cs b/CatalogLib/ImageCreator.cs
index d338c95..869544b 100644
--- a/CatalogLib/ImageCreator.cs
+++ b/CatalogLib/ImageCreator.cs
@@ -394,7 +394,7 @@ namespace CatalogLib
}
- switch (_picSettings.Posizione.ToUpper())
+ switch (_picSettings.TextPosition.ToString().ToUpper())
{
case "ALTO":
yPosFromBottom1 = _picSettings.Margine;
diff --git a/CatalogLib/ImgSharpCreator.cs b/CatalogLib/ImgSharpCreator.cs
index 1f5ac0d..aa053a6 100644
--- a/CatalogLib/ImgSharpCreator.cs
+++ b/CatalogLib/ImgSharpCreator.cs
@@ -1,41 +1,76 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using System.Drawing;
using System.IO;
using System.Linq;
using System.Numerics;
-using System.Text;
using System.Threading.Tasks;
-using ImageSharp;
-using ImageSharp.Drawing;
-using ImageSharp.PixelFormats;
-using ImageSharp.Processing;
+using MaddoLibrary.Base.Log;
using SixLabors.Fonts;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Drawing;
+using SixLabors.ImageSharp.Formats.Jpeg;
+using SixLabors.ImageSharp.MetaData.Profiles.Exif;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.Primitives;
using Font = SixLabors.Fonts.Font;
using FontFamily = SixLabors.Fonts.FontFamily;
using FontStyle = SixLabors.Fonts.FontStyle;
-using Image = ImageSharp.Image;
-
+using Rgba32 = SixLabors.ImageSharp.Rgba32;
+using Image = SixLabors.ImageSharp.Image;
namespace CatalogLib
{
public class ImgSharpCreator : IImageProcessor
{
+ private Image _logo;
+ public ImgSharpCreator()
+ {
+ if (!PicSettings.Instance.EnableLogo) return;
+ if (string.IsNullOrWhiteSpace(PicSettings.Instance.LogoPath)) return;
+ if (!File.Exists(PicSettings.Instance.LogoPath)) return;
+
+ _logo = Image.Load(PicSettings.Instance.LogoPath);
+
+ }
private FileInfo _currentFile;
public void Start(FileInfo workFile)
{
+
+ Stopwatch s = new Stopwatch();
+ s.Start();
+
_currentFile = workFile;
using (Image image = Image.Load(workFile.FullName)/* new Image(workFile.FullName)*/)
{
+ MaddoLogger.Log("Loaded Image: {0}", workFile.FullName);
//image.Rotate(-90);
+ bool isRotated;
+
+ var orientation = image.MetaData.ExifProfile.GetValue(ExifTag.Orientation);
+ if ((ushort)orientation.Value != 1)
+ {
+ isRotated = true;
+ }
+ else
+ {
+ isRotated = false;
+ }
+
+ if (PicSettings.Instance.FotoRidimensiona)
+ {
+ Resize(image);
+ }
+
if (PicSettings.Instance.GeneraleRotazioneAutomatica)
{
- image.AutoOrient();
+ image.Mutate(img => img.AutoOrient());
+ MaddoLogger.Log("Rotated Image: {0}", workFile.FullName);
+ //image.AutoOrient();
//var exif = image.MetaData.ExifProfile;
//if (exif != null)
@@ -98,25 +133,134 @@ namespace CatalogLib
if (PicSettings.Instance.EnableText)
{
- SetExtraText(image);
+ //SetTextTest(image);
+ SetExtraText(image, isRotated);
+
+
+ MaddoLogger.Log("Drawn text on Image: {0}", workFile.FullName);
}
//JpegDecoder j = new JpegDecoder();
var va = Vector.IsHardwareAccelerated;
+ MaddoLogger.Log("Hardware Accelerated: {0}", va);
//image.Resize(PicSettings.Instance.FotoLarghezza, PicSettings.Instance.FotoAltezza);
//image.Resize(2240, 2240);
//var fff = FontCollection.SystemFonts.Find(PicSettings.Instance.NomeFont);
//var font = new Font(fff, (float)PicSettings.Instance.DimensioneFont, FontStyle.Regular);
//image.DrawText("sssssssssssssssssssssssssssssssssssssssssssssss", font, Color.Black, new Vector2(200, 200));
- image.Save(Path.Combine(PicSettings.Instance.DirectoryDestinazione, workFile.Name));
+ image.Save(Path.Combine(PicSettings.Instance.DirectoryDestinazione, workFile.Name), new JpegEncoder() { Quality = PicSettings.Instance.CompressioneJpeg });
//image.Resize(200, 200).Save("");
+
+ MaddoLogger.Log("Saved Image: {0} to: {1}", workFile.FullName, Path.Combine(PicSettings.Instance.DirectoryDestinazione, workFile.Name));
+ }
+ s.Stop();
+ MaddoLogger.Log("Time Taken for {0}: {1}", workFile.FullName, s.Elapsed);
+ }
+
+ private void Resize(Image image)
+ {
+ IResampler resampler;
+ switch (PicSettings.Instance.ResizeMode)
+ {
+ case ResizeModes.Bicubic:
+ resampler = new BicubicResampler();
+ break;
+ case ResizeModes.Box:
+ resampler = new BoxResampler();
+ break;
+ case ResizeModes.CatmullRom:
+ resampler = new CatmullRomResampler();
+ break;
+ case ResizeModes.Hermite:
+ resampler = new HermiteResampler();
+ break;
+ case ResizeModes.Lanczos2:
+ resampler = new Lanczos2Resampler();
+ break;
+ case ResizeModes.Lanczos3:
+ resampler = new Lanczos3Resampler();
+ break;
+ case ResizeModes.Lanczos5:
+ resampler = new Lanczos5Resampler();
+ break;
+ case ResizeModes.Lanczos8:
+ resampler = new Lanczos8Resampler();
+ break;
+ case ResizeModes.MitchellNetravali:
+ resampler = new MitchellNetravaliResampler();
+ break;
+ case ResizeModes.NearestNeighbor:
+ resampler = new NearestNeighborResampler();
+ break;
+ case ResizeModes.Robidoux:
+ resampler = new RobidouxResampler();
+ break;
+ case ResizeModes.Spline:
+ resampler = new SplineResampler();
+ break;
+ case ResizeModes.Triangle:
+ resampler = new TriangleResampler();
+ break;
+ case ResizeModes.Welch:
+ resampler = new WelchResampler();
+ break;
+ default:
+ throw new ArgumentOutOfRangeException();
+ }
+ // todo calcolare ridimensionamento
+ var size = new Size(PicSettings.Instance.FotoLarghezza, PicSettings.Instance.FotoAltezza);
+ if (PicSettings.Instance.FotoMantieniDimensioni)
+ {
+ size = ResizeImage(image, size, PicSettings.Instance.ResizeDimension);
+ image.Mutate(x => x.Resize((size.Width), (size.Height), resampler));
+
+ //Width Formula:
+ //original height / original width * new width = new height
+ //Height Formula:
+ //orignal width / orignal height * new height = new width
+ }
+ else
+ {
+
+ image.Mutate(x => x.Resize(PicSettings.Instance.FotoAltezza, PicSettings.Instance.FotoLarghezza, resampler));
}
}
- private void SetExtraText(Image image)
+ private Size ResizeImage(Image image, Size size, ResizeDimensions side)
+ {
+ switch (side)
+ {
+ case ResizeDimensions.LatoLungo:
+ size = GetResizeDimensions(new Size(image.Width, image.Height), size, image.Width > image.Height);
+ break;
+ case ResizeDimensions.LatoCorto:
+ size = GetResizeDimensions(new Size(image.Width, image.Height), size, image.Width <= image.Height);
+ break;
+ default:
+ throw new ArgumentOutOfRangeException();
+ }
+ return size;
+ }
+
+ private Size GetResizeDimensions(Size originalSize, Size newSize, bool adjustHeight)
+ {
+ return adjustHeight ? new Size(newSize.Width, originalSize.Height / originalSize.Width * newSize.Height) : new Size(originalSize.Width / originalSize.Height * newSize.Height, newSize.Height);
+ }
+
+ private void SetTextTest(Image image)
+ {
+ string text = "test test test test test testtest test test test test test test";
+ Font font = new Font(SystemFonts.Find("verdana"), 300, FontStyle.Regular);
+ image.Mutate(x => x.DrawText(text, font, Rgba32.Yellow, new PointF(2760, 3295.54932f), new TextGraphicsOptions()
+ {
+ HorizontalAlignment = HorizontalAlignment.Center
+ }));
+ }
+
+ private void SetExtraText(Image image, bool isRotated)
{
if (string.IsNullOrWhiteSpace(PicSettings.Instance.TestoApplicareOrizzontale))
{
@@ -124,6 +268,24 @@ namespace CatalogLib
return;
}
+ string text;
+ if (isRotated)
+ {
+ if (PicSettings.Instance.TestoApplicareOrizzontale.Contains("$_"))
+ {
+ text = PicSettings.Instance.TestoApplicareOrizzontale.Replace("$_", "\r\n");
+ }
+ else
+ {
+ text = PicSettings.Instance.TestoApplicareOrizzontale.Replace("$_", "");
+ }
+
+ }
+ else
+ {
+ text = PicSettings.Instance.TestoApplicareOrizzontale.Replace("$_", "");
+ }
+
var fo = SixLabors.Fonts.SystemFonts.Find(PicSettings.Instance.NomeFont);
@@ -131,12 +293,27 @@ namespace CatalogLib
//var fff = FontCollection.SystemFonts.Find(PicSettings.Instance.NomeFont);
//var fff = FontCollection.SystemFonts.Find("Segoe Print");
- var font = new Font(fo, (float)PicSettings.Instance.DimensioneFont, FontStyle.Regular);
+ Font font;
+
+ if (!PicSettings.Instance.Grassetto)
+ {
+ font = new Font(fo, (float)PicSettings.Instance.DimensioneFont, FontStyle.Regular);
+ }
+ else
+ {
+ font = new Font(fo, (float)PicSettings.Instance.DimensioneFont, FontStyle.Bold);
+ }
+ // todo corsivo
+
+
+
//var font = new Font(fff, 8f, FontStyle.Regular);
//Color c = Color.FromHex(FlipRgbString(PicSettings.Instance.ColoreTestoRGB));
Rgba32 g = Rgba32.FromHex(FlipRgbString(PicSettings.Instance.ColoreTestoRGB));
+
+ Rgba32 gBack = Rgba32.Black; // todo alpha
//TextMeasurer measurer = new TextMeasurer();
//var size = measurer.MeasureText(PicSettings.Instance.TestoApplicareOrizzontale, font, 72);
@@ -147,13 +324,197 @@ namespace CatalogLib
Vector2 center = new Vector2(image.Width / 2, image.Height / 2); //center horizontally, 10px down
- var size = TextMeasurer.Measure(PicSettings.Instance.TestoApplicareOrizzontale, new RendererOptions(font));
+ var size = TextMeasurer.Measure(text, new RendererOptions(font));
+
+ var larghezzaStandard = size.Width;
+ var dimensioneStandard = (int)Math.Round(PicSettings.Instance.DimensioneFont);
+ if (size.Width > image.Width)
+ {
+ var c = dimensioneStandard;
+ do
+ {
+ if (c > 20)
+ {
+ c -= 5;
+ }
+ else
+ {
+ c -= 1;
+ }
+
+ if (PicSettings.Instance.Grassetto)
+ {
+ font = new Font(fo, c, FontStyle.Bold);
+ }
+ else
+ {
+ font = new Font(fo, c, FontStyle.Regular);
+ }
+ size = TextMeasurer.Measure(text,
+ new RendererOptions(font));
+ if (size.Width < image.Width)
+ {
+ larghezzaStandard = (int)Math.Round(size.Width);
+ break;
+ }
+ if (c <= 5)
+ {
+ break;
+ }
+ } while (dimensioneStandard == c);
+ }
+
+ float yPosFromBottom = 0;
+
+ switch (PicSettings.Instance.TextPosition)
+ {
+ case Positions.Alto:
+ yPosFromBottom = PicSettings.Instance.Margine;
+ break;
+ case Positions.Basso:
+ yPosFromBottom = image.Height - size.Height - (image.Height * PicSettings.Instance.Margine / 100);
+ break;
+ }
+
+ float xCenterofImg = 0;
+
+ // stringformat
+
+ switch (PicSettings.Instance.TextAlignment)
+ {
+ case Alignments.Sinistra:
+ xCenterofImg = PicSettings.Instance.Margine + (larghezzaStandard / 2);
+ if ((larghezzaStandard / 2) > (image.Width / 2) - PicSettings.Instance.Margine)
+ {
+ xCenterofImg = image.Width / 2;
+ }
+ break;
+ case Alignments.Centro:
+ xCenterofImg = image.Width / 2;
+ break;
+ case Alignments.Destra:
+ xCenterofImg = image.Width - PicSettings.Instance.Margine - larghezzaStandard / 2;
+
+ if (larghezzaStandard / 2 > image.Width / 2 - PicSettings.Instance.Margine)
+ {
+ xCenterofImg = image.Width / 2;
+ }
+
+ break;
+ }
+ // stringformat alignment center
+
+ if (PicSettings.Instance.Grassetto)
+ {
+ font = new Font(fo, dimensioneStandard, FontStyle.Bold);
+ }
+ else
+ {
+ font = new Font(fo, dimensioneStandard, FontStyle.Regular);
+ }
+
+ image.Mutate(x => x.DrawText(text, font, gBack, new PointF((float)Math.Round(xCenterofImg + 1), (float)Math.Round(yPosFromBottom + 1)), new TextGraphicsOptions()
+ {
+ HorizontalAlignment = HorizontalAlignment.Center
+ }));
+
+ image.Mutate(x => x.DrawText(text, font, g, new PointF((float)Math.Round(xCenterofImg), (float)Math.Round(yPosFromBottom)), new TextGraphicsOptions()
+ {
+ HorizontalAlignment = HorizontalAlignment.Center
+ }));
+
+ return;
+
+
float scalingFactor = Math.Min(image.Width / size.Width, image.Height / size.Height);
Font scaledFont = new Font(font, scalingFactor * font.Size);
+ image.Mutate(x =>
+ x.DrawText(PicSettings.Instance.TestoApplicareOrizzontale, scaledFont, g, center,
+ new TextGraphicsOptions(true)
+ {
+ HorizontalAlignment = HorizontalAlignment.Center,
+ VerticalAlignment = VerticalAlignment.Bottom
+ }));
+ //image.DrawText(PicSettings.Instance.TestoApplicareOrizzontale, scaledFont, g, center, new TextGraphicsOptions(true) { HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Bottom });
- image.DrawText(PicSettings.Instance.TestoApplicareOrizzontale, scaledFont, g, center, new TextGraphicsOptions(true) { HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Bottom });
+ }
+
+ private void AddLogo(Image image)
+ {
+ //if (string.IsNullOrWhiteSpace(PicSettings.Instance.LogoPath)) return;
+ //if (!File.Exists(PicSettings.Instance.LogoPath)) return;
+ //using (Image logo = Image.Load(PicSettings.Instance.LogoPath))
+ //{
+ // Size size = new Size();
+ // Point location = new Point();
+ // image.Mutate(x => x.DrawImage(logo, size, location, new GraphicsOptions()
+ // {
+
+ // }));
+
+ //}
+
+ Size size = new Size();
+ Point location = new Point();
+
+ if (_logo != null)
+ {
+ var width = PicSettings.Instance.LogoWidth;
+ var height = PicSettings.Instance.LogoHeight;
+ var heightFactor = _logo.Height / height;
+ var widthFactor = _logo.Width / width;
+ var newLogoSize = new Size();
+
+ newLogoSize = GetResizeDimensions(new Size(_logo.Width, _logo.Height), new Size(width, height), PicSettings.Instance.LogoResizeSide.Equals(ResizeDimensions.LatoCorto));
+ //todo riguardare perché non torna cosa ho fatto
+
+ int margineUsato = 0;
+ int margineL;
+ bool inPercentualeL;
+
+ inPercentualeL = PicSettings.Instance.LogoMargin.EndsWith("%");
+ if (inPercentualeL)
+ {
+ margineL = int.Parse(PicSettings.Instance.LogoMargin.Replace("%", ""));
+ }
+ else
+ {
+ margineL = int.Parse(PicSettings.Instance.LogoMargin);
+ }
+
+ switch (PicSettings.Instance.LogoPosition)
+ {
+ case Positions.Alto:
+ break;
+ case Positions.Centro:
+ break;
+ case Positions.Basso:
+ break;
+ default:
+ throw new ArgumentOutOfRangeException();
+ }
+
+ switch (PicSettings.Instance.LogoAlignment)
+ {
+ case Alignments.Sinistra:
+ location.X = margineUsato;
+ break;
+ case Alignments.Centro:
+ //location.X = image.Width -
+ break;
+ case Alignments.Destra:
+ break;
+ default:
+ throw new ArgumentOutOfRangeException();
+ }
+ image.Mutate(x => x.DrawImage(_logo, size, location, new GraphicsOptions()));
+
+
+
+
+ }
}
@@ -166,7 +527,7 @@ namespace CatalogLib
var size = TextMeasurer.Measure("Test test test test test", new RendererOptions(font));
float scalingFactor = Math.Min(image.Width / size.Width, image.Height / size.Height);
Font scaledFont = new Font(font, scalingFactor * font.Size);
- image.DrawText("Test test test test test", scaledFont, g, center, new TextGraphicsOptions(true) { HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Bottom });
+ image.Mutate(x => x.DrawText("Test test test test test", scaledFont, g, center, new TextGraphicsOptions(true) { HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Bottom }));
}
private string FlipRgbString(string originalString)
diff --git a/CatalogLib/MaddoLogger.cs b/CatalogLib/MaddoLogger.cs
deleted file mode 100644
index 3eba4b7..0000000
--- a/CatalogLib/MaddoLogger.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CatalogLib
-{
- public class MaddoLogger
- {
- public void AddToLog(string data)
- {
- string dest = Path.Combine(PicSettings.Instance.DirectoryDestinazione, "log.txt");
-
- }
- }
-}
diff --git a/CatalogLib/PicSettings.cs b/CatalogLib/PicSettings.cs
index 9453628..795b004 100644
--- a/CatalogLib/PicSettings.cs
+++ b/CatalogLib/PicSettings.cs
@@ -6,7 +6,7 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-
+using MaddoLibrary.Base.Log;
using Newtonsoft.Json;
namespace CatalogLib
@@ -71,6 +71,11 @@ namespace CatalogLib
SetBase(key, value);
}
+ public void SetFloat(string key, float value)
+ {
+ SetBase(key, value);
+ }
+
public void Set(string key, T value)
{
SetBase(key, value);
@@ -134,6 +139,23 @@ namespace CatalogLib
return (double)_settingsDict[key];
}
+ public float GetFloat(string key, float defaultValue = 0)
+ {
+ if (!_settingsDict.ContainsKey(key))
+ {
+ SetFloat(key, defaultValue);
+ }
+
+ if (_settingsDict[key] is float f) return f;
+ MaddoLogger.LogError("Error while parsing {0}", key);
+
+ float fl = 0;
+ SetFloat(key, float.TryParse(_settingsDict[key].ToString(), out f) ? fl : defaultValue);
+ return (float)_settingsDict[key];
+ }
+
+
+
public T Get(string key, T defaultValue)
{
if (!_settingsDict.ContainsKey(key))
@@ -146,6 +168,8 @@ namespace CatalogLib
}
+
+
public string GetString(string key, string defaultValue = "")
{
if (!_settingsDict.ContainsKey(key))
@@ -184,7 +208,10 @@ namespace CatalogLib
//return _settingsDict.ContainsKey(key) ? _settingsDict[key] : defaultValue;
}
-
+ public T GetEnum(string name, T defaultValue)
+ {
+ return (T)Enum.Parse(typeof(T), GetString(name, defaultValue.ToString()));
+ }
public void SetDefaults()
{
@@ -193,8 +220,8 @@ namespace CatalogLib
public bool DirAggiornaSottoDirectory
{
- get { return this.GetBool("DirAggiornaSottoDirectory", true); }
- set { this.SetBool("DirAggiornaSottoDirectory", value); }
+ get => this.GetBool("DirAggiornaSottoDirectory", true);
+ set => this.SetBool("DirAggiornaSottoDirectory", value);
}
public bool Grassetto
@@ -262,12 +289,8 @@ namespace CatalogLib
get { return 0; }
}
- public string Posizione
- {
- get { return string.Empty; }
- }
-
+
public DateTime DataPartenza { get; set; }
public string TestoOrario { get; internal set; }
public int DimStandard { get; internal set; }
@@ -290,7 +313,11 @@ namespace CatalogLib
set { SetString("DirDestinazione", value); }
}
- public float Margine { get; set; }
+ public int Margine
+ {
+ get => GetInt("Margin", 1);
+ set => SetInt("Margin", value);
+ }
public float MargVert { get; set; }
public string Allineamento { get; set; }
@@ -432,8 +459,90 @@ namespace CatalogLib
}
}
+ public bool FotoRidimensiona
+ {
+ get => GetBool("FotoRidimensiona", false);
+ set => Set("FotoRidimensiona", value);
+ }
+
+ public Positions TextPosition
+ {
+ get => GetEnum("TextPosition", Positions.Alto); //(Positions)Enum.Parse(typeof(Positions), GetString("TextPosition", Positions.Alto.ToString()));
+ set => SetString("TextPosition", value.ToString());
+ }
+
+ public Alignments TextAlignment
+ {
+ get => GetEnum("TextAlignment", Alignments.Centro);
+ set => SetString("TextAlignment", value.ToString());
+ }
+
+ public bool Threading
+ {
+ get => GetBool("Threading", true);
+ set => SetBool("Threading", value);
+ }
+
+ public ResizeModes ResizeMode
+ {
+ get => GetEnum("ResizeMode", ResizeModes.Bicubic);
+ set => SetString("ResizeMode", value.ToString());
+ }
+
+ public ResizeDimensions ResizeDimension
+ {
+ get => GetEnum("ResizeDimension", CatalogLib.ResizeDimensions.LatoCorto);
+ set => SetString("ResizeDimension", value.ToString());
+ }
+
+ public string LogoPath
+ {
+ get => GetString("LogoPath");
+ set => SetString("LogoPath", value);
+ }
+
+ public int LogoWidth
+ {
+ get => GetInt("LogoWidth");
+ set => SetInt("LogoWidth", value);
+ }
+
+ public int LogoHeight
+ {
+ get => GetInt("LogoHeight");
+ set => SetInt("LogoHeight", value);
+ }
+
+ public string LogoMargin
+ {
+ get => GetString("LogoMargin");
+ set => SetString("LogoMargin", value);
+ }
+
+ public Positions LogoPosition
+ {
+ get => GetEnum("LogoPositions", Positions.Alto);
+ set => SetString("LogoPositions", value.ToString());
+ }
+
+ public Alignments LogoAlignment
+ {
+ get => GetEnum("LogoAlignments", Alignments.Centro);
+ set => SetString("LogoAlignments", value.ToString());
+ }
+
+ public ResizeDimensions LogoResizeSide
+ {
+ get => GetEnum("LogoResizeMode", ResizeDimensions.LatoCorto);
+ set => SetString("LogoResizeMode", value.ToString());
+ }
+
#endregion
+ #region Enums
+
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/CatalogLib/app.config b/CatalogLib/app.config
index b5d559f..3fcefdf 100644
--- a/CatalogLib/app.config
+++ b/CatalogLib/app.config
@@ -16,11 +16,11 @@
-
+
-
+
diff --git a/CatalogLib/packages.config b/CatalogLib/packages.config
index 8beea34..3740a21 100644
--- a/CatalogLib/packages.config
+++ b/CatalogLib/packages.config
@@ -1,20 +1,20 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
@@ -29,18 +29,18 @@
-
+
-
+
-
+
@@ -57,7 +57,7 @@
-
+
\ No newline at end of file
diff --git a/CatalogLib/stylecop.json b/CatalogLib/stylecop.json
new file mode 100644
index 0000000..c67c0db
--- /dev/null
+++ b/CatalogLib/stylecop.json
@@ -0,0 +1,15 @@
+{
+ "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
+ "settings":
+ {
+ "orderingRules":
+ {
+ "usingDirectivesPlacement": "outsideNamespace"
+ },
+ "documentationRules":
+ {
+ "xmlHeader": false,
+ "copyrightText": "Copyright (c) Six Labors and contributors.\nLicensed under the Apache License, Version 2.0."
+ }
+ }
+}
\ No newline at end of file
diff --git a/MaddoLibrary b/MaddoLibrary
new file mode 160000
index 0000000..5987cc2
--- /dev/null
+++ b/MaddoLibrary
@@ -0,0 +1 @@
+Subproject commit 5987cc26521d839bf81bdaab19d101488294da19
diff --git a/WPFCatalog/App.config b/WPFCatalog/App.config
index ff1c544..ca0daff 100644
--- a/WPFCatalog/App.config
+++ b/WPFCatalog/App.config
@@ -20,11 +20,11 @@
-
+
-
+
@@ -38,6 +38,14 @@
+
+
+
+
+
+
+
+
diff --git a/WPFCatalog/Controls/GeneralSettingsControl.xaml b/WPFCatalog/Controls/GeneralSettingsControl.xaml
index 9f511c8..bfa637d 100644
--- a/WPFCatalog/Controls/GeneralSettingsControl.xaml
+++ b/WPFCatalog/Controls/GeneralSettingsControl.xaml
@@ -7,10 +7,24 @@
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+ xmlns:System="clr-namespace:System;assembly=mscorlib"
+ xmlns:catalogLib="clr-namespace:CatalogLib;assembly=CatalogLib"
mc:Ignorable="d"
d:DesignHeight="900" d:DesignWidth="500"
d:DataContext="{d:DesignInstance wpfCatalog:MainWindowViewModel}"
>
+
+
+
+
+
+
+
+
+
+
+
+
@@ -65,6 +79,7 @@
+
@@ -80,6 +95,7 @@
+
@@ -112,6 +128,8 @@
+
+
@@ -125,16 +143,19 @@
-
-
+
+
+
+
+
-
-
+
+
-
+
-
+
@@ -144,13 +165,19 @@
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/WPFCatalog/Controls/TextSettingsControl.xaml b/WPFCatalog/Controls/TextSettingsControl.xaml
index 27566c6..7d7ac19 100644
--- a/WPFCatalog/Controls/TextSettingsControl.xaml
+++ b/WPFCatalog/Controls/TextSettingsControl.xaml
@@ -6,12 +6,24 @@
xmlns:wpfCatalog="clr-namespace:WPFCatalog"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
- mc:Ignorable="d"
+ xmlns:System="clr-namespace:System;assembly=mscorlib"
+ xmlns:catalogLib="clr-namespace:CatalogLib;assembly=CatalogLib"
+ mc:Ignorable="d"
d:DesignHeight="900" d:DesignWidth="500"
d:DataContext="{d:DesignInstance wpfCatalog:MainWindowViewModel}" >
+
+
+
+
+
+
+
+
+
+
@@ -42,8 +54,8 @@
Text="{Binding FontName}"
>
-
-
+
+
@@ -81,28 +93,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -117,9 +109,19 @@
-
-
-
+
+
+
@@ -135,28 +137,28 @@
-
+
-
-
-
+
+
-
-
+
-
+
+
+
+
-
+
-
-
-
+
+
diff --git a/WPFCatalog/MainWindow.xaml b/WPFCatalog/MainWindow.xaml
index e9fb26c..c7cd8fe 100644
--- a/WPFCatalog/MainWindow.xaml
+++ b/WPFCatalog/MainWindow.xaml
@@ -24,7 +24,7 @@
-
+
@@ -67,7 +67,7 @@
-
+
@@ -182,12 +182,15 @@
-
-
+
+
-
+
+
+
+
diff --git a/WPFCatalog/MainWindowViewModel.cs b/WPFCatalog/MainWindowViewModel.cs
index 73cef20..a9d0ce3 100644
--- a/WPFCatalog/MainWindowViewModel.cs
+++ b/WPFCatalog/MainWindowViewModel.cs
@@ -1,12 +1,15 @@
using System;
+using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
+using System.Threading;
using System.Threading.Tasks;
using CatalogLib;
using GalaSoft.MvvmLight.Command;
+using MaddoLibrary.Base.Log;
using MaddoLibrary.Helpers;
using WPFCatalog.Messages;
@@ -40,6 +43,7 @@ namespace WPFCatalog
public RelayCommand OpenDestinationFolderCommand { get; private set; }
public RelayCommand StartCommand { get; private set; }
+ public RelayCommand StopCommand { get; private set; }
public RelayCommand PickFontCommand { get; private set; }
@@ -55,6 +59,8 @@ namespace WPFCatalog
OpenDestinationFolderCommand = new RelayCommand(OpenDestinationFolder);
StartCommand = new RelayCommand(Start);
+ StopCommand = new RelayCommand(Stop);
+
PickFontCommand = new RelayCommand(PickFont);
}
@@ -76,19 +82,179 @@ namespace WPFCatalog
//string s = d.Name;
}
- private void Start()
+ private struct ImageTask
+ {
+ public Task TaskImage;
+ public string ImageName;
+ public bool Completed;
+ }
+
+ private Task _workTask;
+ //private List _tasks;
+ private async void Start()
+ {
+
+ //Task outerTask = new Task(() =>
+ //{
+ // Stopwatch s = new Stopwatch();
+
+ // var tasks = new List();
+ // // todo folder mode
+ // MaddoLogger.Log("Starting elaboration");
+ // foreach (var file in Directory.EnumerateFiles(PicSettings.DirectorySorgente))
+ // {
+ // //Task t = new Task(() =>
+ // //{
+
+ // // //CompleteFile(file);
+ // //});
+ // var t = FileTask(file);
+ // if (t != null)
+ // {
+ // tasks.Add(t);
+ // }
+ // else
+ // {
+ // MaddoLogger.LogError("Task was null for file: {0}", file);
+ // }
+ // //_tasks.Add(new ImageTask() { ImageName = file, TaskImage = t, Completed = false });
+ // //t.Start();
+
+
+
+ // }
+ // s.Start();
+
+ // await Task.WhenAll(tasks);
+
+ // Task.WhenAll(tasks).Start();
+ // s.Stop();
+ // //tt.RunSynchronously();
+ // MaddoLogger.Log("Finished: {0}, {1}", s.Elapsed, s.ElapsedMilliseconds);
+ // DialogHelper.PopUpAlert($"Finished: {s.Elapsed}, {s.ElapsedMilliseconds}", "message");
+ //});
+ if (/*_workTask == null || _workTask.IsCanceled || _workTask.IsCompleted || _workTask.IsFaulted*/!_isRunning)
+ {
+ _workTask = OuterTask();
+ try
+ {
+ await _workTask;
+ }
+ catch (TaskCanceledException e)
+ {
+ MaddoLogger.LogError(e);
+ MaddoLogger.LogError("Master Task cancelled");
+ //throw;
+ }
+
+ }
+
+
+
+ }
+
+
+
+ private void Stop()
+ {
+ if (_isRunning)
+ {
+ _tokenSource.Cancel();
+ }
+ }
+
+ private CancellationTokenSource _tokenSource;
+ private bool _isRunning = false;
+ private async Task OuterTask()
+ {
+ _isRunning = true;
+ _tokenSource = new CancellationTokenSource();
+ var token = _tokenSource.Token;
+
+ var tasks = new ConcurrentBag();
+
+ IsUiActive = false;
+ Stopwatch s = new Stopwatch();
+
+ //var tasks = new List();
+ // todo folder mode
+ MaddoLogger.Log("Starting elaboration");
+ var files = Directory.EnumerateFiles(PicSettings.DirectorySorgente).ToArray();
+
+ TotalPictures = files.Count();
+
+ IImageProcessor i = new ImgSharpCreator();
+
+ foreach (var file in files)
+ {
+ //Task t = new Task(() =>
+ //{
+
+ // //CompleteFile(file);
+ //});
+ var t = FileTask(file, i, token);
+
+ tasks.Add(t);
+
+ //_tasks.Add(new ImageTask() { ImageName = file, TaskImage = t, Completed = false });
+ //t.Start();
+
+
+
+ }
+ s.Start();
+
+
+
+ try
+ {
+ await Task.WhenAll(tasks);
+ }
+ catch (AggregateException e)
+ {
+ MaddoLogger.LogError(e);
+ MaddoLogger.LogError("Task cancelled");
+ //Console.WriteLine(e);
+ //Console.WriteLine("Task cancelled");
+ //throw;
+ }
+ finally
+ {
+ _tokenSource.Dispose();
+
+ //Task.WhenAll(tasks).Start();
+ s.Stop();
+ //tt.RunSynchronously();
+ MaddoLogger.Log("Finished: {0}, {1}", s.Elapsed, s.ElapsedMilliseconds);
+ DialogHelper.PopUpAlert($"Finished: {s.Elapsed}, {s.ElapsedMilliseconds}", "message");
+
+ IsUiActive = true;
+ _isRunning = false;
+ }
+
+
+
+
+
+ }
+
+
+ private async Task FileTask(string file, IImageProcessor i, CancellationToken token)
+ {
+ if (token.IsCancellationRequested == true)
+ {
+ token.ThrowIfCancellationRequested();
+ }
+ MaddoLogger.Log("Starting task for image {0}", file);
+ //IImageProcessor i = new ImgSharpCreator();
+ await Task.Run(() => i.Start(new FileInfo(file)), token);
+ CurrentImage = file;
+ TotalPictures--;
+ }
+
+ private void CompleteFile(string file)
{
- // todo folder mode
-
- foreach (var file in Directory.EnumerateFiles(PicSettings.DirectorySorgente))
- {
- IImageProcessor i = new ImgSharpCreator();
-
- //ImageCreator2 i = new ImageCreator2();
- i.Start(new FileInfo(file));
- }
- DialogHelper.PopUpAlert("Finished", "message");
}
private void OpenSourceFolder()
@@ -164,6 +330,30 @@ namespace WPFCatalog
#region Proprietà
+ private bool _isUiActive = true;
+ public bool IsUiActive
+ {
+ get => _isUiActive;
+ set { _isUiActive = value; RaisePropertyChanged("IsUiActive"); }
+ }
+
+ private string _currentImage;
+
+ public string CurrentImage
+ {
+ get => _currentImage;
+ set { _currentImage = value; RaisePropertyChanged("CurrentImage"); }
+ }
+
+ private int _totalPictures;
+
+ public int TotalPictures
+ {
+ get => _totalPictures;
+ set { _totalPictures = value; RaisePropertyChanged("TotalPictures"); }
+ }
+
+
public PicSettings SettingsString
{
get { return PicSettings; }
@@ -291,6 +481,16 @@ namespace WPFCatalog
}
}
+ public bool FotoRidimensiona
+ {
+ get { return PicSettings.FotoRidimensiona; }
+ set
+ {
+ PicSettings.FotoRidimensiona = value;
+ RaisePropertyChanged("FotoRidimensiona");
+ }
+ }
+
public int FotoAltezza
{
get
@@ -671,7 +871,52 @@ namespace WPFCatalog
}
}
+ public bool Threading
+ {
+ get => PicSettings.Threading;
+ set { PicSettings.Threading = value; RaisePropertyChanged("Threading"); }
+ }
+ public int Margine
+ {
+ get => PicSettings.Margine;
+ set { PicSettings.Margine = value; RaisePropertyChanged("Margine"); }
+ }
+
+ public Positions TextPosition
+ {
+ get => PicSettings.TextPosition;
+ set { PicSettings.TextPosition = value; RaisePropertyChanged("TextPosition"); }
+ }
+
+ public Alignments TextAlignment
+ {
+ get => PicSettings.TextAlignment;
+ set { PicSettings.TextAlignment = value; RaisePropertyChanged("TextAlignment"); }
+ }
+
+ public ResizeModes ResizeMode
+ {
+ get => PicSettings.ResizeMode;
+ set { PicSettings.ResizeMode = value; RaisePropertyChanged("ResizeMode"); }
+ }
+
+ public ResizeDimensions ResizeDimension
+ {
+ get => PicSettings.ResizeDimension;
+ set { PicSettings.ResizeDimension = value; RaisePropertyChanged("ResizeDimension"); }
+ }
+
+ public bool Grassetto
+ {
+ get => PicSettings.Grassetto;
+ set { PicSettings.Grassetto = value; RaisePropertyChanged("Grassetto"); }
+ }
+
+ //public PicSettings.Positions Positions
+ //{
+ // get => PicSettings.Positions;
+ //}
#endregion
@@ -687,7 +932,7 @@ namespace WPFCatalog
public string ColoreTestoRGB
- {
+ {
get { return PicSettings.ColoreTestoRGB; }
set
{
diff --git a/WPFCatalog/WPFCatalog.csproj b/WPFCatalog/WPFCatalog.csproj
index f1c1b72..baf5b7a 100644
--- a/WPFCatalog/WPFCatalog.csproj
+++ b/WPFCatalog/WPFCatalog.csproj
@@ -66,14 +66,6 @@
..\packages\MvvmLightLibs.4.1.27.1\lib\net45\GalaSoft.MvvmLight.WPF45.dll
-
- False
- ..\lib\MaddoLibrary.Base.NET45.dll
-
-
- False
- ..\lib\MaddoLibrary.WPF.NET46.dll
-
..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll
@@ -86,9 +78,8 @@
-
- ..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
- True
+
+ ..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
@@ -233,6 +224,14 @@
{d27accf2-80fc-4de8-aeb8-351ff076e6d5}
CatalogLib
+
+ {e93daae6-4aa9-4a45-afb6-58209b3ad3c9}
+ MaddoLibrary.Base.NET46
+
+
+ {73da19d7-196d-4b16-b610-93250978a607}
+ MaddoLibrary.WPF.NET46
+
diff --git a/WPFCatalog/packages.config b/WPFCatalog/packages.config
index 189ae99..183cb0a 100644
--- a/WPFCatalog/packages.config
+++ b/WPFCatalog/packages.config
@@ -6,5 +6,5 @@
-
+
\ No newline at end of file
diff --git a/imagecatalog/ImageCatalog 2.vbproj b/imagecatalog/ImageCatalog 2.vbproj
index d254204..b8cc359 100644
--- a/imagecatalog/ImageCatalog 2.vbproj
+++ b/imagecatalog/ImageCatalog 2.vbproj
@@ -331,6 +331,12 @@
MaddoShared
+
+
+
+
+
+
diff --git a/imagecatalog/LOG_ITA.jpg b/imagecatalog/LOG_ITA.jpg
new file mode 100644
index 0000000..b382369
Binary files /dev/null and b/imagecatalog/LOG_ITA.jpg differ
diff --git a/imagecatalog/MainForm.Designer.vb b/imagecatalog/MainForm.Designer.vb
index 0150130..7c6943d 100644
--- a/imagecatalog/MainForm.Designer.vb
+++ b/imagecatalog/MainForm.Designer.vb
@@ -1,9 +1,9 @@
- _
+
Partial Class MainForm
Inherits System.Windows.Forms.Form
'Form overrides dispose to clean up the component list.
- _
+
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
Try
If disposing AndAlso components IsNot Nothing Then
@@ -20,14 +20,14 @@ Partial Class MainForm
'NOTE: The following procedure is required by the Windows Form Designer
'It can be modified using the Windows Form Designer.
'Do not modify it using the code editor.
- _
+
Private Sub InitializeComponent()
Me.ProgressBar1 = New System.Windows.Forms.ProgressBar()
Me.CheckBox22 = New System.Windows.Forms.CheckBox()
Me.Label43 = New System.Windows.Forms.Label()
- Me.TabControl1 = New System.Windows.Forms.TabControl()
- Me.TabPage5 = New System.Windows.Forms.TabPage()
- Me.GroupBox11 = New System.Windows.Forms.GroupBox()
+ Me.tabControl = New System.Windows.Forms.TabControl()
+ Me.tabGenerale = New System.Windows.Forms.TabPage()
+ Me.grpAvanzate = New System.Windows.Forms.GroupBox()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.rdbNuovoMetodo = New System.Windows.Forms.RadioButton()
Me.rdbVecchioMetodo = New System.Windows.Forms.RadioButton()
@@ -43,7 +43,7 @@ Partial Class MainForm
Me.Label2 = New System.Windows.Forms.Label()
Me.txtSorgente = New System.Windows.Forms.TextBox()
Me.txtDestinazione = New System.Windows.Forms.TextBox()
- Me.GroupBox8 = New System.Windows.Forms.GroupBox()
+ Me.grpSottocartelle = New System.Windows.Forms.GroupBox()
Me.rdbNumFiles = New System.Windows.Forms.RadioButton()
Me.rdbNumProgressiva = New System.Windows.Forms.RadioButton()
Me.txtCifreContatore = New System.Windows.Forms.TextBox()
@@ -54,21 +54,21 @@ Partial Class MainForm
Me.chkCreaSottocartelle = New System.Windows.Forms.CheckBox()
Me.txtFilePerCartella = New System.Windows.Forms.TextBox()
Me.Label32 = New System.Windows.Forms.Label()
- Me.GroupBox7 = New System.Windows.Forms.GroupBox()
+ Me.grpGenerale = New System.Windows.Forms.GroupBox()
Me.chkSovrascriviFile = New System.Windows.Forms.CheckBox()
Me.chkRotazioneAutomatica = New System.Windows.Forms.CheckBox()
Me.chkForzaJpg = New System.Windows.Forms.CheckBox()
- Me.TabPage3 = New System.Windows.Forms.TabPage()
+ Me.tabTesto = New System.Windows.Forms.TabPage()
Me.CheckBox2 = New System.Windows.Forms.CheckBox()
- Me.GroupBox10 = New System.Windows.Forms.GroupBox()
+ Me.grpTestoFotoVerticali = New System.Windows.Forms.GroupBox()
Me.Label42 = New System.Windows.Forms.Label()
Me.Label41 = New System.Windows.Forms.Label()
Me.TextBox31 = New System.Windows.Forms.TextBox()
Me.TextBox30 = New System.Windows.Forms.TextBox()
- Me.GroupBox9 = New System.Windows.Forms.GroupBox()
+ Me.grpSlideShow = New System.Windows.Forms.GroupBox()
Me.CheckBox17 = New System.Windows.Forms.CheckBox()
Me.CheckBox16 = New System.Windows.Forms.CheckBox()
- Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+ Me.grpCarattere = New System.Windows.Forms.GroupBox()
Me.TextBox34 = New System.Windows.Forms.TextBox()
Me.Button8 = New System.Windows.Forms.Button()
Me.Label36 = New System.Windows.Forms.Label()
@@ -97,7 +97,7 @@ Partial Class MainForm
Me.Label14 = New System.Windows.Forms.Label()
Me.TextBox12 = New System.Windows.Forms.TextBox()
Me.Label15 = New System.Windows.Forms.Label()
- Me.TabPage2 = New System.Windows.Forms.TabPage()
+ Me.tabFoto = New System.Windows.Forms.TabPage()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
Me.Label45 = New System.Windows.Forms.Label()
Me.TextBox32 = New System.Windows.Forms.TextBox()
@@ -108,7 +108,7 @@ Partial Class MainForm
Me.Label39 = New System.Windows.Forms.Label()
Me.TextBox28 = New System.Windows.Forms.TextBox()
Me.CheckBox15 = New System.Windows.Forms.CheckBox()
- Me.TabPage1 = New System.Windows.Forms.TabPage()
+ Me.tabMiniature = New System.Windows.Forms.TabPage()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.CheckBox18 = New System.Windows.Forms.CheckBox()
Me.CheckBox4 = New System.Windows.Forms.CheckBox()
@@ -129,7 +129,7 @@ Partial Class MainForm
Me.Label3 = New System.Windows.Forms.Label()
Me.TextBox3 = New System.Windows.Forms.TextBox()
Me.CheckBox1 = New System.Windows.Forms.CheckBox()
- Me.TabPage4 = New System.Windows.Forms.TabPage()
+ Me.tabLogo = New System.Windows.Forms.TabPage()
Me.GroupBox6 = New System.Windows.Forms.GroupBox()
Me.PictureBox2 = New System.Windows.Forms.PictureBox()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
@@ -152,7 +152,7 @@ Partial Class MainForm
Me.PictureBox3 = New System.Windows.Forms.PictureBox()
Me.Label27 = New System.Windows.Forms.Label()
Me.Button7 = New System.Windows.Forms.Button()
- Me.Button5 = New System.Windows.Forms.Button()
+ Me.btnSalvaImpostazioni = New System.Windows.Forms.Button()
Me.Label20 = New System.Windows.Forms.Label()
Me.Label19 = New System.Windows.Forms.Label()
Me.Label18 = New System.Windows.Forms.Label()
@@ -188,17 +188,19 @@ Partial Class MainForm
'
'ProgressBar1
'
- Me.ProgressBar1.Location = New System.Drawing.Point(539, 243)
+ Me.ProgressBar1.Location = New System.Drawing.Point(719, 299)
+ Me.ProgressBar1.Margin = New System.Windows.Forms.Padding(4)
Me.ProgressBar1.Name = "ProgressBar1"
- Me.ProgressBar1.Size = New System.Drawing.Size(192, 23)
+ Me.ProgressBar1.Size = New System.Drawing.Size(256, 28)
Me.ProgressBar1.TabIndex = 67
'
'CheckBox22
'
Me.CheckBox22.AutoSize = True
- Me.CheckBox22.Location = New System.Drawing.Point(539, 358)
+ Me.CheckBox22.Location = New System.Drawing.Point(719, 441)
+ Me.CheckBox22.Margin = New System.Windows.Forms.Padding(4)
Me.CheckBox22.Name = "CheckBox22"
- Me.CheckBox22.Size = New System.Drawing.Size(104, 17)
+ Me.CheckBox22.Size = New System.Drawing.Size(138, 21)
Me.CheckBox22.TabIndex = 65
Me.CheckBox22.Text = "Arresta il sistema"
Me.CheckBox22.UseVisualStyleBackColor = True
@@ -206,70 +208,77 @@ Partial Class MainForm
'Label43
'
Me.Label43.AutoSize = True
- Me.Label43.Location = New System.Drawing.Point(536, 342)
+ Me.Label43.Location = New System.Drawing.Point(715, 421)
+ Me.Label43.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label43.Name = "Label43"
- Me.Label43.Size = New System.Drawing.Size(25, 13)
+ Me.Label43.Size = New System.Drawing.Size(32, 17)
Me.Label43.TabIndex = 64
Me.Label43.Text = "000"
Me.Label43.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
- 'TabControl1
+ 'tabControl
'
- Me.TabControl1.Controls.Add(Me.TabPage5)
- Me.TabControl1.Controls.Add(Me.TabPage3)
- Me.TabControl1.Controls.Add(Me.TabPage2)
- Me.TabControl1.Controls.Add(Me.TabPage1)
- Me.TabControl1.Controls.Add(Me.TabPage4)
- Me.TabControl1.Location = New System.Drawing.Point(12, 12)
- Me.TabControl1.Name = "TabControl1"
- Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New System.Drawing.Size(521, 377)
- Me.TabControl1.TabIndex = 63
+ Me.tabControl.Controls.Add(Me.tabGenerale)
+ Me.tabControl.Controls.Add(Me.tabTesto)
+ Me.tabControl.Controls.Add(Me.tabFoto)
+ Me.tabControl.Controls.Add(Me.tabMiniature)
+ Me.tabControl.Controls.Add(Me.tabLogo)
+ Me.tabControl.Location = New System.Drawing.Point(16, 15)
+ Me.tabControl.Margin = New System.Windows.Forms.Padding(4)
+ Me.tabControl.Name = "tabControl"
+ Me.tabControl.SelectedIndex = 0
+ Me.tabControl.Size = New System.Drawing.Size(695, 464)
+ Me.tabControl.TabIndex = 63
'
- 'TabPage5
+ 'tabGenerale
'
- Me.TabPage5.Controls.Add(Me.GroupBox11)
- Me.TabPage5.Controls.Add(Me.GroupBox3)
- Me.TabPage5.Controls.Add(Me.GroupBox8)
- Me.TabPage5.Controls.Add(Me.GroupBox7)
- Me.TabPage5.Location = New System.Drawing.Point(4, 22)
- Me.TabPage5.Name = "TabPage5"
- Me.TabPage5.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage5.Size = New System.Drawing.Size(513, 351)
- Me.TabPage5.TabIndex = 4
- Me.TabPage5.Text = "Generale"
- Me.TabPage5.UseVisualStyleBackColor = True
+ Me.tabGenerale.Controls.Add(Me.grpAvanzate)
+ Me.tabGenerale.Controls.Add(Me.GroupBox3)
+ Me.tabGenerale.Controls.Add(Me.grpSottocartelle)
+ Me.tabGenerale.Controls.Add(Me.grpGenerale)
+ Me.tabGenerale.Location = New System.Drawing.Point(4, 25)
+ Me.tabGenerale.Margin = New System.Windows.Forms.Padding(4)
+ Me.tabGenerale.Name = "tabGenerale"
+ Me.tabGenerale.Padding = New System.Windows.Forms.Padding(4)
+ Me.tabGenerale.Size = New System.Drawing.Size(687, 435)
+ Me.tabGenerale.TabIndex = 4
+ Me.tabGenerale.Text = "Generale"
+ Me.tabGenerale.UseVisualStyleBackColor = True
'
- 'GroupBox11
+ 'grpAvanzate
'
- Me.GroupBox11.Controls.Add(Me.Panel3)
- Me.GroupBox11.Controls.Add(Me.Label8)
- Me.GroupBox11.Controls.Add(Me.TextBox8)
- Me.GroupBox11.Controls.Add(Me.Label7)
- Me.GroupBox11.Controls.Add(Me.TextBox7)
- Me.GroupBox11.Location = New System.Drawing.Point(7, 209)
- Me.GroupBox11.Name = "GroupBox11"
- Me.GroupBox11.Size = New System.Drawing.Size(191, 132)
- Me.GroupBox11.TabIndex = 48
- Me.GroupBox11.TabStop = False
- Me.GroupBox11.Text = "Avanzate (ATTENZIONE)"
+ Me.grpAvanzate.Controls.Add(Me.Panel3)
+ Me.grpAvanzate.Controls.Add(Me.Label8)
+ Me.grpAvanzate.Controls.Add(Me.TextBox8)
+ Me.grpAvanzate.Controls.Add(Me.Label7)
+ Me.grpAvanzate.Controls.Add(Me.TextBox7)
+ Me.grpAvanzate.Location = New System.Drawing.Point(9, 257)
+ Me.grpAvanzate.Margin = New System.Windows.Forms.Padding(4)
+ Me.grpAvanzate.Name = "grpAvanzate"
+ Me.grpAvanzate.Padding = New System.Windows.Forms.Padding(4)
+ Me.grpAvanzate.Size = New System.Drawing.Size(255, 162)
+ Me.grpAvanzate.TabIndex = 48
+ Me.grpAvanzate.TabStop = False
+ Me.grpAvanzate.Text = "Avanzate (ATTENZIONE)"
'
'Panel3
'
Me.Panel3.Controls.Add(Me.rdbNuovoMetodo)
Me.Panel3.Controls.Add(Me.rdbVecchioMetodo)
- Me.Panel3.Location = New System.Drawing.Point(7, 73)
+ Me.Panel3.Location = New System.Drawing.Point(9, 90)
+ Me.Panel3.Margin = New System.Windows.Forms.Padding(4)
Me.Panel3.Name = "Panel3"
- Me.Panel3.Size = New System.Drawing.Size(178, 53)
+ Me.Panel3.Size = New System.Drawing.Size(237, 65)
Me.Panel3.TabIndex = 4
'
'rdbNuovoMetodo
'
Me.rdbNuovoMetodo.AutoSize = True
Me.rdbNuovoMetodo.Checked = True
- Me.rdbNuovoMetodo.Location = New System.Drawing.Point(8, 28)
+ Me.rdbNuovoMetodo.Location = New System.Drawing.Point(11, 34)
+ Me.rdbNuovoMetodo.Margin = New System.Windows.Forms.Padding(4)
Me.rdbNuovoMetodo.Name = "rdbNuovoMetodo"
- Me.rdbNuovoMetodo.Size = New System.Drawing.Size(95, 17)
+ Me.rdbNuovoMetodo.Size = New System.Drawing.Size(121, 21)
Me.rdbNuovoMetodo.TabIndex = 1
Me.rdbNuovoMetodo.TabStop = True
Me.rdbNuovoMetodo.Text = "Nuovo metodo"
@@ -278,9 +287,10 @@ Partial Class MainForm
'rdbVecchioMetodo
'
Me.rdbVecchioMetodo.AutoSize = True
- Me.rdbVecchioMetodo.Location = New System.Drawing.Point(8, 4)
+ Me.rdbVecchioMetodo.Location = New System.Drawing.Point(11, 5)
+ Me.rdbVecchioMetodo.Margin = New System.Windows.Forms.Padding(4)
Me.rdbVecchioMetodo.Name = "rdbVecchioMetodo"
- Me.rdbVecchioMetodo.Size = New System.Drawing.Size(102, 17)
+ Me.rdbVecchioMetodo.Size = New System.Drawing.Size(130, 21)
Me.rdbVecchioMetodo.TabIndex = 0
Me.rdbVecchioMetodo.Text = "Vecchio metodo"
Me.rdbVecchioMetodo.UseVisualStyleBackColor = True
@@ -288,7 +298,8 @@ Partial Class MainForm
'Label8
'
Me.Label8.AutoSize = True
- Me.Label8.Location = New System.Drawing.Point(64, 26)
+ Me.Label8.Location = New System.Drawing.Point(85, 32)
+ Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label8.Name = "Label8"
Me.Label8.Size = New System.Drawing.Size(111, 13)
Me.Label8.TabIndex = 3
@@ -296,16 +307,18 @@ Partial Class MainForm
'
'TextBox8
'
- Me.TextBox8.Location = New System.Drawing.Point(7, 20)
+ Me.TextBox8.Location = New System.Drawing.Point(9, 25)
+ Me.TextBox8.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox8.Name = "TextBox8"
- Me.TextBox8.Size = New System.Drawing.Size(47, 20)
+ Me.TextBox8.Size = New System.Drawing.Size(61, 22)
Me.TextBox8.TabIndex = 2
Me.TextBox8.Text = "0"
'
'Label7
'
Me.Label7.AutoSize = True
- Me.Label7.Location = New System.Drawing.Point(61, 48)
+ Me.Label7.Location = New System.Drawing.Point(81, 59)
+ Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label7.Name = "Label7"
Me.Label7.Size = New System.Drawing.Size(108, 13)
Me.Label7.TabIndex = 1
@@ -313,9 +326,10 @@ Partial Class MainForm
'
'TextBox7
'
- Me.TextBox7.Location = New System.Drawing.Point(7, 46)
+ Me.TextBox7.Location = New System.Drawing.Point(9, 57)
+ Me.TextBox7.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox7.Name = "TextBox7"
- Me.TextBox7.Size = New System.Drawing.Size(47, 20)
+ Me.TextBox7.Size = New System.Drawing.Size(61, 22)
Me.TextBox7.TabIndex = 0
Me.TextBox7.Text = "0"
'
@@ -329,35 +343,42 @@ Partial Class MainForm
Me.GroupBox3.Controls.Add(Me.txtSorgente)
Me.GroupBox3.Controls.Add(Me.txtDestinazione)
Me.GroupBox3.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
- Me.GroupBox3.Location = New System.Drawing.Point(6, 6)
+ Me.GroupBox3.Location = New System.Drawing.Point(8, 7)
+ Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4)
Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Size = New System.Drawing.Size(496, 101)
+ Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4)
+ Me.GroupBox3.Size = New System.Drawing.Size(661, 124)
Me.GroupBox3.TabIndex = 35
Me.GroupBox3.TabStop = False
Me.GroupBox3.Text = "Directory"
'
'chkAggiornaSottodirectory
'
+ Me.chkAggiornaSottodirectory.Checked = True
+ Me.chkAggiornaSottodirectory.CheckState = System.Windows.Forms.CheckState.Checked
Me.chkAggiornaSottodirectory.ForeColor = System.Drawing.Color.Black
- Me.chkAggiornaSottodirectory.Location = New System.Drawing.Point(80, 64)
+ Me.chkAggiornaSottodirectory.Location = New System.Drawing.Point(107, 79)
+ Me.chkAggiornaSottodirectory.Margin = New System.Windows.Forms.Padding(4)
Me.chkAggiornaSottodirectory.Name = "chkAggiornaSottodirectory"
- Me.chkAggiornaSottodirectory.Size = New System.Drawing.Size(152, 24)
+ Me.chkAggiornaSottodirectory.Size = New System.Drawing.Size(203, 30)
Me.chkAggiornaSottodirectory.TabIndex = 25
Me.chkAggiornaSottodirectory.Text = "aggiorna le sottodirectory"
'
'Button3
'
- Me.Button3.Location = New System.Drawing.Point(462, 40)
+ Me.Button3.Location = New System.Drawing.Point(616, 49)
+ Me.Button3.Margin = New System.Windows.Forms.Padding(4)
Me.Button3.Name = "Button3"
- Me.Button3.Size = New System.Drawing.Size(24, 20)
+ Me.Button3.Size = New System.Drawing.Size(32, 25)
Me.Button3.TabIndex = 6
Me.Button3.Text = "..."
'
'Button2
'
- Me.Button2.Location = New System.Drawing.Point(462, 16)
+ Me.Button2.Location = New System.Drawing.Point(616, 20)
+ Me.Button2.Margin = New System.Windows.Forms.Padding(4)
Me.Button2.Name = "Button2"
- Me.Button2.Size = New System.Drawing.Size(24, 20)
+ Me.Button2.Size = New System.Drawing.Size(32, 25)
Me.Button2.TabIndex = 5
Me.Button2.Text = "..."
'
@@ -365,9 +386,10 @@ Partial Class MainForm
'
Me.Label1.AutoSize = True
Me.Label1.ForeColor = System.Drawing.Color.Black
- Me.Label1.Location = New System.Drawing.Point(6, 19)
+ Me.Label1.Location = New System.Drawing.Point(8, 23)
+ Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(50, 13)
+ Me.Label1.Size = New System.Drawing.Size(66, 17)
Me.Label1.TabIndex = 3
Me.Label1.Text = "Sorgente"
'
@@ -375,54 +397,60 @@ Partial Class MainForm
'
Me.Label2.AutoSize = True
Me.Label2.ForeColor = System.Drawing.Color.Black
- Me.Label2.Location = New System.Drawing.Point(6, 43)
+ Me.Label2.Location = New System.Drawing.Point(8, 53)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(68, 13)
+ Me.Label2.Size = New System.Drawing.Size(90, 17)
Me.Label2.TabIndex = 4
Me.Label2.Text = "Destinazione"
'
'txtSorgente
'
- Me.txtSorgente.Location = New System.Drawing.Point(80, 16)
+ Me.txtSorgente.Location = New System.Drawing.Point(107, 20)
+ Me.txtSorgente.Margin = New System.Windows.Forms.Padding(4)
Me.txtSorgente.Name = "txtSorgente"
- Me.txtSorgente.Size = New System.Drawing.Size(376, 20)
+ Me.txtSorgente.Size = New System.Drawing.Size(500, 22)
Me.txtSorgente.TabIndex = 0
Me.txtSorgente.Text = "TextBox1"
'
'txtDestinazione
'
- Me.txtDestinazione.Location = New System.Drawing.Point(80, 40)
+ Me.txtDestinazione.Location = New System.Drawing.Point(107, 49)
+ Me.txtDestinazione.Margin = New System.Windows.Forms.Padding(4)
Me.txtDestinazione.Name = "txtDestinazione"
- Me.txtDestinazione.Size = New System.Drawing.Size(376, 20)
+ Me.txtDestinazione.Size = New System.Drawing.Size(500, 22)
Me.txtDestinazione.TabIndex = 1
Me.txtDestinazione.Text = "TextBox2"
'
- 'GroupBox8
+ 'grpSottocartelle
'
- Me.GroupBox8.Controls.Add(Me.rdbNumFiles)
- Me.GroupBox8.Controls.Add(Me.rdbNumProgressiva)
- Me.GroupBox8.Controls.Add(Me.txtCifreContatore)
- Me.GroupBox8.Controls.Add(Me.Label34)
- Me.GroupBox8.Controls.Add(Me.txtSuffissoCartelle)
- Me.GroupBox8.Controls.Add(Me.Label33)
- Me.GroupBox8.Controls.Add(Me.Label31)
- Me.GroupBox8.Controls.Add(Me.chkCreaSottocartelle)
- Me.GroupBox8.Controls.Add(Me.txtFilePerCartella)
- Me.GroupBox8.Controls.Add(Me.Label32)
- Me.GroupBox8.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
- Me.GroupBox8.Location = New System.Drawing.Point(204, 113)
- Me.GroupBox8.Name = "GroupBox8"
- Me.GroupBox8.Size = New System.Drawing.Size(192, 152)
- Me.GroupBox8.TabIndex = 47
- Me.GroupBox8.TabStop = False
- Me.GroupBox8.Text = "Sottocartelle"
+ Me.grpSottocartelle.Controls.Add(Me.rdbNumFiles)
+ Me.grpSottocartelle.Controls.Add(Me.rdbNumProgressiva)
+ Me.grpSottocartelle.Controls.Add(Me.txtCifreContatore)
+ Me.grpSottocartelle.Controls.Add(Me.Label34)
+ Me.grpSottocartelle.Controls.Add(Me.txtSuffissoCartelle)
+ Me.grpSottocartelle.Controls.Add(Me.Label33)
+ Me.grpSottocartelle.Controls.Add(Me.Label31)
+ Me.grpSottocartelle.Controls.Add(Me.chkCreaSottocartelle)
+ Me.grpSottocartelle.Controls.Add(Me.txtFilePerCartella)
+ Me.grpSottocartelle.Controls.Add(Me.Label32)
+ Me.grpSottocartelle.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+ Me.grpSottocartelle.Location = New System.Drawing.Point(272, 139)
+ Me.grpSottocartelle.Margin = New System.Windows.Forms.Padding(4)
+ Me.grpSottocartelle.Name = "grpSottocartelle"
+ Me.grpSottocartelle.Padding = New System.Windows.Forms.Padding(4)
+ Me.grpSottocartelle.Size = New System.Drawing.Size(256, 187)
+ Me.grpSottocartelle.TabIndex = 47
+ Me.grpSottocartelle.TabStop = False
+ Me.grpSottocartelle.Text = "Sottocartelle"
'
'rdbNumFiles
'
Me.rdbNumFiles.ForeColor = System.Drawing.Color.Black
- Me.rdbNumFiles.Location = New System.Drawing.Point(32, 128)
+ Me.rdbNumFiles.Location = New System.Drawing.Point(43, 158)
+ Me.rdbNumFiles.Margin = New System.Windows.Forms.Padding(4)
Me.rdbNumFiles.Name = "rdbNumFiles"
- Me.rdbNumFiles.Size = New System.Drawing.Size(136, 16)
+ Me.rdbNumFiles.Size = New System.Drawing.Size(181, 20)
Me.rdbNumFiles.TabIndex = 38
Me.rdbNumFiles.Text = "Numerazione files"
'
@@ -430,102 +458,114 @@ Partial Class MainForm
'
Me.rdbNumProgressiva.Checked = True
Me.rdbNumProgressiva.ForeColor = System.Drawing.Color.Black
- Me.rdbNumProgressiva.Location = New System.Drawing.Point(32, 112)
+ Me.rdbNumProgressiva.Location = New System.Drawing.Point(43, 138)
+ Me.rdbNumProgressiva.Margin = New System.Windows.Forms.Padding(4)
Me.rdbNumProgressiva.Name = "rdbNumProgressiva"
- Me.rdbNumProgressiva.Size = New System.Drawing.Size(152, 16)
+ Me.rdbNumProgressiva.Size = New System.Drawing.Size(203, 20)
Me.rdbNumProgressiva.TabIndex = 37
Me.rdbNumProgressiva.TabStop = True
Me.rdbNumProgressiva.Text = "Numerazione progressiva"
'
'txtCifreContatore
'
- Me.txtCifreContatore.Location = New System.Drawing.Point(128, 88)
+ Me.txtCifreContatore.Location = New System.Drawing.Point(171, 108)
+ Me.txtCifreContatore.Margin = New System.Windows.Forms.Padding(4)
Me.txtCifreContatore.Name = "txtCifreContatore"
- Me.txtCifreContatore.Size = New System.Drawing.Size(56, 20)
+ Me.txtCifreContatore.Size = New System.Drawing.Size(73, 22)
Me.txtCifreContatore.TabIndex = 34
Me.txtCifreContatore.Text = "4"
'
'Label34
'
Me.Label34.ForeColor = System.Drawing.Color.Black
- Me.Label34.Location = New System.Drawing.Point(8, 88)
+ Me.Label34.Location = New System.Drawing.Point(11, 108)
+ Me.Label34.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label34.Name = "Label34"
- Me.Label34.Size = New System.Drawing.Size(112, 16)
+ Me.Label34.Size = New System.Drawing.Size(149, 20)
Me.Label34.TabIndex = 33
Me.Label34.Text = "Num. cifre contatore"
Me.Label34.TextAlign = System.Drawing.ContentAlignment.MiddleRight
'
'txtSuffissoCartelle
'
- Me.txtSuffissoCartelle.Location = New System.Drawing.Point(56, 64)
+ Me.txtSuffissoCartelle.Location = New System.Drawing.Point(75, 79)
+ Me.txtSuffissoCartelle.Margin = New System.Windows.Forms.Padding(4)
Me.txtSuffissoCartelle.Name = "txtSuffissoCartelle"
- Me.txtSuffissoCartelle.Size = New System.Drawing.Size(128, 20)
+ Me.txtSuffissoCartelle.Size = New System.Drawing.Size(169, 22)
Me.txtSuffissoCartelle.TabIndex = 32
Me.txtSuffissoCartelle.Text = "TextBox20"
'
'Label33
'
Me.Label33.ForeColor = System.Drawing.Color.Black
- Me.Label33.Location = New System.Drawing.Point(6, 67)
+ Me.Label33.Location = New System.Drawing.Point(8, 82)
+ Me.Label33.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label33.Name = "Label33"
- Me.Label33.Size = New System.Drawing.Size(48, 16)
+ Me.Label33.Size = New System.Drawing.Size(64, 20)
Me.Label33.TabIndex = 31
Me.Label33.Text = "Suffisso"
'
'Label31
'
Me.Label31.ForeColor = System.Drawing.Color.Black
- Me.Label31.Location = New System.Drawing.Point(24, 40)
+ Me.Label31.Location = New System.Drawing.Point(32, 49)
+ Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label31.Name = "Label31"
- Me.Label31.Size = New System.Drawing.Size(32, 16)
+ Me.Label31.Size = New System.Drawing.Size(43, 20)
Me.Label31.TabIndex = 30
Me.Label31.Text = "ogni"
'
'chkCreaSottocartelle
'
Me.chkCreaSottocartelle.ForeColor = System.Drawing.Color.Black
- Me.chkCreaSottocartelle.Location = New System.Drawing.Point(56, 16)
+ Me.chkCreaSottocartelle.Location = New System.Drawing.Point(75, 20)
+ Me.chkCreaSottocartelle.Margin = New System.Windows.Forms.Padding(4)
Me.chkCreaSottocartelle.Name = "chkCreaSottocartelle"
- Me.chkCreaSottocartelle.Size = New System.Drawing.Size(112, 16)
+ Me.chkCreaSottocartelle.Size = New System.Drawing.Size(149, 20)
Me.chkCreaSottocartelle.TabIndex = 29
Me.chkCreaSottocartelle.Text = "crea sottocartelle"
'
'txtFilePerCartella
'
- Me.txtFilePerCartella.Location = New System.Drawing.Point(56, 40)
+ Me.txtFilePerCartella.Location = New System.Drawing.Point(75, 49)
+ Me.txtFilePerCartella.Margin = New System.Windows.Forms.Padding(4)
Me.txtFilePerCartella.Name = "txtFilePerCartella"
- Me.txtFilePerCartella.Size = New System.Drawing.Size(64, 20)
+ Me.txtFilePerCartella.Size = New System.Drawing.Size(84, 22)
Me.txtFilePerCartella.TabIndex = 27
Me.txtFilePerCartella.Text = "99"
'
'Label32
'
Me.Label32.ForeColor = System.Drawing.Color.Black
- Me.Label32.Location = New System.Drawing.Point(128, 40)
+ Me.Label32.Location = New System.Drawing.Point(171, 49)
+ Me.Label32.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label32.Name = "Label32"
- Me.Label32.Size = New System.Drawing.Size(24, 16)
+ Me.Label32.Size = New System.Drawing.Size(32, 20)
Me.Label32.TabIndex = 28
Me.Label32.Text = "file"
'
- 'GroupBox7
+ 'grpGenerale
'
- Me.GroupBox7.Controls.Add(Me.chkSovrascriviFile)
- Me.GroupBox7.Controls.Add(Me.chkRotazioneAutomatica)
- Me.GroupBox7.Controls.Add(Me.chkForzaJpg)
- Me.GroupBox7.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
- Me.GroupBox7.Location = New System.Drawing.Point(6, 113)
- Me.GroupBox7.Name = "GroupBox7"
- Me.GroupBox7.Size = New System.Drawing.Size(192, 88)
- Me.GroupBox7.TabIndex = 45
- Me.GroupBox7.TabStop = False
- Me.GroupBox7.Text = "Generale"
+ Me.grpGenerale.Controls.Add(Me.chkSovrascriviFile)
+ Me.grpGenerale.Controls.Add(Me.chkRotazioneAutomatica)
+ Me.grpGenerale.Controls.Add(Me.chkForzaJpg)
+ Me.grpGenerale.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+ Me.grpGenerale.Location = New System.Drawing.Point(8, 139)
+ Me.grpGenerale.Margin = New System.Windows.Forms.Padding(4)
+ Me.grpGenerale.Name = "grpGenerale"
+ Me.grpGenerale.Padding = New System.Windows.Forms.Padding(4)
+ Me.grpGenerale.Size = New System.Drawing.Size(256, 108)
+ Me.grpGenerale.TabIndex = 45
+ Me.grpGenerale.TabStop = False
+ Me.grpGenerale.Text = "Generale"
'
'chkSovrascriviFile
'
Me.chkSovrascriviFile.AutoSize = True
- Me.chkSovrascriviFile.Location = New System.Drawing.Point(16, 61)
+ Me.chkSovrascriviFile.Location = New System.Drawing.Point(21, 75)
+ Me.chkSovrascriviFile.Margin = New System.Windows.Forms.Padding(4)
Me.chkSovrascriviFile.Name = "chkSovrascriviFile"
- Me.chkSovrascriviFile.Size = New System.Drawing.Size(94, 17)
+ Me.chkSovrascriviFile.Size = New System.Drawing.Size(121, 21)
Me.chkSovrascriviFile.TabIndex = 2
Me.chkSovrascriviFile.Text = "Sovrascrivi file"
Me.chkSovrascriviFile.UseVisualStyleBackColor = True
@@ -533,9 +573,10 @@ Partial Class MainForm
'chkRotazioneAutomatica
'
Me.chkRotazioneAutomatica.ForeColor = System.Drawing.Color.Black
- Me.chkRotazioneAutomatica.Location = New System.Drawing.Point(16, 39)
+ Me.chkRotazioneAutomatica.Location = New System.Drawing.Point(21, 48)
+ Me.chkRotazioneAutomatica.Margin = New System.Windows.Forms.Padding(4)
Me.chkRotazioneAutomatica.Name = "chkRotazioneAutomatica"
- Me.chkRotazioneAutomatica.Size = New System.Drawing.Size(136, 16)
+ Me.chkRotazioneAutomatica.Size = New System.Drawing.Size(181, 20)
Me.chkRotazioneAutomatica.TabIndex = 1
Me.chkRotazioneAutomatica.Text = "Rotazione automatica"
'
@@ -544,99 +585,113 @@ Partial Class MainForm
Me.chkForzaJpg.Checked = True
Me.chkForzaJpg.CheckState = System.Windows.Forms.CheckState.Checked
Me.chkForzaJpg.ForeColor = System.Drawing.Color.Black
- Me.chkForzaJpg.Location = New System.Drawing.Point(16, 18)
+ Me.chkForzaJpg.Location = New System.Drawing.Point(21, 22)
+ Me.chkForzaJpg.Margin = New System.Windows.Forms.Padding(4)
Me.chkForzaJpg.Name = "chkForzaJpg"
- Me.chkForzaJpg.Size = New System.Drawing.Size(80, 16)
+ Me.chkForzaJpg.Size = New System.Drawing.Size(107, 20)
Me.chkForzaJpg.TabIndex = 0
Me.chkForzaJpg.Text = "Forza Jpg"
'
- 'TabPage3
+ 'tabTesto
'
- Me.TabPage3.Controls.Add(Me.CheckBox2)
- Me.TabPage3.Controls.Add(Me.GroupBox10)
- Me.TabPage3.Controls.Add(Me.GroupBox9)
- Me.TabPage3.Controls.Add(Me.GroupBox5)
- Me.TabPage3.Controls.Add(Me.GroupBox4)
- Me.TabPage3.Location = New System.Drawing.Point(4, 22)
- Me.TabPage3.Name = "TabPage3"
- Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage3.Size = New System.Drawing.Size(513, 351)
- Me.TabPage3.TabIndex = 2
- Me.TabPage3.Text = "Testo"
- Me.TabPage3.UseVisualStyleBackColor = True
+ Me.tabTesto.Controls.Add(Me.CheckBox2)
+ Me.tabTesto.Controls.Add(Me.grpTestoFotoVerticali)
+ Me.tabTesto.Controls.Add(Me.grpSlideShow)
+ Me.tabTesto.Controls.Add(Me.grpCarattere)
+ Me.tabTesto.Controls.Add(Me.GroupBox4)
+ Me.tabTesto.Location = New System.Drawing.Point(4, 25)
+ Me.tabTesto.Margin = New System.Windows.Forms.Padding(4)
+ Me.tabTesto.Name = "tabTesto"
+ Me.tabTesto.Padding = New System.Windows.Forms.Padding(4)
+ Me.tabTesto.Size = New System.Drawing.Size(687, 435)
+ Me.tabTesto.TabIndex = 2
+ Me.tabTesto.Text = "Testo"
+ Me.tabTesto.UseVisualStyleBackColor = True
'
'CheckBox2
'
Me.CheckBox2.AutoSize = True
- Me.CheckBox2.Location = New System.Drawing.Point(7, 8)
+ Me.CheckBox2.Checked = True
+ Me.CheckBox2.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.CheckBox2.Location = New System.Drawing.Point(9, 10)
+ Me.CheckBox2.Margin = New System.Windows.Forms.Padding(4)
Me.CheckBox2.Name = "CheckBox2"
- Me.CheckBox2.Size = New System.Drawing.Size(93, 17)
+ Me.CheckBox2.Size = New System.Drawing.Size(120, 21)
Me.CheckBox2.TabIndex = 40
Me.CheckBox2.Text = "Aggiungi testo"
Me.CheckBox2.UseVisualStyleBackColor = True
'
- 'GroupBox10
+ 'grpTestoFotoVerticali
'
- Me.GroupBox10.Controls.Add(Me.Label42)
- Me.GroupBox10.Controls.Add(Me.Label41)
- Me.GroupBox10.Controls.Add(Me.TextBox31)
- Me.GroupBox10.Controls.Add(Me.TextBox30)
- Me.GroupBox10.Location = New System.Drawing.Point(316, 78)
- Me.GroupBox10.Name = "GroupBox10"
- Me.GroupBox10.Size = New System.Drawing.Size(186, 73)
- Me.GroupBox10.TabIndex = 39
- Me.GroupBox10.TabStop = False
- Me.GroupBox10.Text = "Testo foto verticali"
+ Me.grpTestoFotoVerticali.Controls.Add(Me.Label42)
+ Me.grpTestoFotoVerticali.Controls.Add(Me.Label41)
+ Me.grpTestoFotoVerticali.Controls.Add(Me.TextBox31)
+ Me.grpTestoFotoVerticali.Controls.Add(Me.TextBox30)
+ Me.grpTestoFotoVerticali.Location = New System.Drawing.Point(421, 96)
+ Me.grpTestoFotoVerticali.Margin = New System.Windows.Forms.Padding(4)
+ Me.grpTestoFotoVerticali.Name = "grpTestoFotoVerticali"
+ Me.grpTestoFotoVerticali.Padding = New System.Windows.Forms.Padding(4)
+ Me.grpTestoFotoVerticali.Size = New System.Drawing.Size(248, 90)
+ Me.grpTestoFotoVerticali.TabIndex = 39
+ Me.grpTestoFotoVerticali.TabStop = False
+ Me.grpTestoFotoVerticali.Text = "Testo foto verticali"
'
'Label42
'
Me.Label42.AutoSize = True
- Me.Label42.Location = New System.Drawing.Point(7, 46)
+ Me.Label42.Location = New System.Drawing.Point(9, 57)
+ Me.Label42.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label42.Name = "Label42"
- Me.Label42.Size = New System.Drawing.Size(45, 13)
+ Me.Label42.Size = New System.Drawing.Size(59, 17)
Me.Label42.TabIndex = 3
Me.Label42.Text = "Margine"
'
'Label41
'
Me.Label41.AutoSize = True
- Me.Label41.Location = New System.Drawing.Point(7, 25)
+ Me.Label41.Location = New System.Drawing.Point(9, 31)
+ Me.Label41.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label41.Name = "Label41"
- Me.Label41.Size = New System.Drawing.Size(108, 13)
+ Me.Label41.Size = New System.Drawing.Size(145, 17)
Me.Label41.TabIndex = 2
Me.Label41.Text = "Dimensione Carattere"
'
'TextBox31
'
- Me.TextBox31.Location = New System.Drawing.Point(131, 46)
+ Me.TextBox31.Location = New System.Drawing.Point(175, 57)
+ Me.TextBox31.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox31.Name = "TextBox31"
- Me.TextBox31.Size = New System.Drawing.Size(39, 20)
+ Me.TextBox31.Size = New System.Drawing.Size(51, 22)
Me.TextBox31.TabIndex = 1
'
'TextBox30
'
- Me.TextBox30.Location = New System.Drawing.Point(131, 22)
+ Me.TextBox30.Location = New System.Drawing.Point(175, 27)
+ Me.TextBox30.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox30.Name = "TextBox30"
- Me.TextBox30.Size = New System.Drawing.Size(39, 20)
+ Me.TextBox30.Size = New System.Drawing.Size(51, 22)
Me.TextBox30.TabIndex = 0
'
- 'GroupBox9
+ 'grpSlideShow
'
- Me.GroupBox9.Controls.Add(Me.CheckBox17)
- Me.GroupBox9.Controls.Add(Me.CheckBox16)
- Me.GroupBox9.Location = New System.Drawing.Point(316, 31)
- Me.GroupBox9.Name = "GroupBox9"
- Me.GroupBox9.Size = New System.Drawing.Size(186, 45)
- Me.GroupBox9.TabIndex = 38
- Me.GroupBox9.TabStop = False
- Me.GroupBox9.Text = "Slide show"
+ Me.grpSlideShow.Controls.Add(Me.CheckBox17)
+ Me.grpSlideShow.Controls.Add(Me.CheckBox16)
+ Me.grpSlideShow.Location = New System.Drawing.Point(421, 38)
+ Me.grpSlideShow.Margin = New System.Windows.Forms.Padding(4)
+ Me.grpSlideShow.Name = "grpSlideShow"
+ Me.grpSlideShow.Padding = New System.Windows.Forms.Padding(4)
+ Me.grpSlideShow.Size = New System.Drawing.Size(248, 55)
+ Me.grpSlideShow.TabIndex = 38
+ Me.grpSlideShow.TabStop = False
+ Me.grpSlideShow.Text = "Slide show"
'
'CheckBox17
'
Me.CheckBox17.AutoSize = True
- Me.CheckBox17.Location = New System.Drawing.Point(96, 18)
+ Me.CheckBox17.Location = New System.Drawing.Point(128, 22)
+ Me.CheckBox17.Margin = New System.Windows.Forms.Padding(4)
Me.CheckBox17.Name = "CheckBox17"
- Me.CheckBox17.Size = New System.Drawing.Size(84, 17)
+ Me.CheckBox17.Size = New System.Drawing.Size(108, 21)
Me.CheckBox17.TabIndex = 1
Me.CheckBox17.Text = "Numero foto"
Me.CheckBox17.UseVisualStyleBackColor = True
@@ -644,91 +699,101 @@ Partial Class MainForm
'CheckBox16
'
Me.CheckBox16.AutoSize = True
- Me.CheckBox16.Location = New System.Drawing.Point(6, 19)
+ Me.CheckBox16.Location = New System.Drawing.Point(8, 23)
+ Me.CheckBox16.Margin = New System.Windows.Forms.Padding(4)
Me.CheckBox16.Name = "CheckBox16"
- Me.CheckBox16.Size = New System.Drawing.Size(49, 17)
+ Me.CheckBox16.Size = New System.Drawing.Size(60, 21)
Me.CheckBox16.TabIndex = 0
Me.CheckBox16.Text = "Data"
Me.CheckBox16.UseVisualStyleBackColor = True
'
- 'GroupBox5
+ 'grpCarattere
'
- Me.GroupBox5.Controls.Add(Me.TextBox34)
- Me.GroupBox5.Controls.Add(Me.Button8)
- Me.GroupBox5.Controls.Add(Me.Label36)
- Me.GroupBox5.Controls.Add(Me.TextBox25)
- Me.GroupBox5.Controls.Add(Me.Label35)
- Me.GroupBox5.Controls.Add(Me.ComboBox3)
- Me.GroupBox5.Controls.Add(Me.TextBox11)
- Me.GroupBox5.Controls.Add(Me.Label12)
- Me.GroupBox5.Controls.Add(Me.Label11)
- Me.GroupBox5.Controls.Add(Me.CheckBox3)
- Me.GroupBox5.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
- Me.GroupBox5.Location = New System.Drawing.Point(6, 31)
- Me.GroupBox5.Name = "GroupBox5"
- Me.GroupBox5.Size = New System.Drawing.Size(304, 120)
- Me.GroupBox5.TabIndex = 37
- Me.GroupBox5.TabStop = False
- Me.GroupBox5.Text = "Carattere"
+ Me.grpCarattere.Controls.Add(Me.TextBox34)
+ Me.grpCarattere.Controls.Add(Me.Button8)
+ Me.grpCarattere.Controls.Add(Me.Label36)
+ Me.grpCarattere.Controls.Add(Me.TextBox25)
+ Me.grpCarattere.Controls.Add(Me.Label35)
+ Me.grpCarattere.Controls.Add(Me.ComboBox3)
+ Me.grpCarattere.Controls.Add(Me.TextBox11)
+ Me.grpCarattere.Controls.Add(Me.Label12)
+ Me.grpCarattere.Controls.Add(Me.Label11)
+ Me.grpCarattere.Controls.Add(Me.CheckBox3)
+ Me.grpCarattere.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+ Me.grpCarattere.Location = New System.Drawing.Point(8, 38)
+ Me.grpCarattere.Margin = New System.Windows.Forms.Padding(4)
+ Me.grpCarattere.Name = "grpCarattere"
+ Me.grpCarattere.Padding = New System.Windows.Forms.Padding(4)
+ Me.grpCarattere.Size = New System.Drawing.Size(405, 148)
+ Me.grpCarattere.TabIndex = 37
+ Me.grpCarattere.TabStop = False
+ Me.grpCarattere.Text = "Carattere"
'
'TextBox34
'
- Me.TextBox34.Location = New System.Drawing.Point(160, 91)
+ Me.TextBox34.Location = New System.Drawing.Point(213, 112)
+ Me.TextBox34.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox34.Name = "TextBox34"
- Me.TextBox34.Size = New System.Drawing.Size(56, 20)
+ Me.TextBox34.Size = New System.Drawing.Size(73, 22)
Me.TextBox34.TabIndex = 36
Me.TextBox34.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'Button8
'
Me.Button8.ForeColor = System.Drawing.Color.Black
- Me.Button8.Location = New System.Drawing.Point(222, 89)
+ Me.Button8.Location = New System.Drawing.Point(296, 110)
+ Me.Button8.Margin = New System.Windows.Forms.Padding(4)
Me.Button8.Name = "Button8"
- Me.Button8.Size = New System.Drawing.Size(74, 24)
+ Me.Button8.Size = New System.Drawing.Size(99, 30)
Me.Button8.TabIndex = 35
Me.Button8.Text = "Scegli..."
'
'Label36
'
Me.Label36.ForeColor = System.Drawing.Color.Black
- Me.Label36.Location = New System.Drawing.Point(8, 60)
+ Me.Label36.Location = New System.Drawing.Point(11, 74)
+ Me.Label36.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label36.Name = "Label36"
- Me.Label36.Size = New System.Drawing.Size(120, 19)
+ Me.Label36.Size = New System.Drawing.Size(160, 23)
Me.Label36.TabIndex = 34
Me.Label36.Text = "Dimensione miniatura"
Me.Label36.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'TextBox25
'
- Me.TextBox25.Location = New System.Drawing.Point(160, 59)
+ Me.TextBox25.Location = New System.Drawing.Point(213, 73)
+ Me.TextBox25.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox25.Name = "TextBox25"
- Me.TextBox25.Size = New System.Drawing.Size(56, 20)
+ Me.TextBox25.Size = New System.Drawing.Size(73, 22)
Me.TextBox25.TabIndex = 33
Me.TextBox25.Text = "TextBox25"
'
'Label35
'
Me.Label35.ForeColor = System.Drawing.Color.Black
- Me.Label35.Location = New System.Drawing.Point(8, 93)
+ Me.Label35.Location = New System.Drawing.Point(11, 114)
+ Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label35.Name = "Label35"
- Me.Label35.Size = New System.Drawing.Size(72, 16)
+ Me.Label35.Size = New System.Drawing.Size(96, 20)
Me.Label35.TabIndex = 32
Me.Label35.Text = "Colore RGB"
Me.Label35.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'ComboBox3
'
- Me.ComboBox3.Location = New System.Drawing.Point(96, 8)
+ Me.ComboBox3.Location = New System.Drawing.Point(128, 10)
+ Me.ComboBox3.Margin = New System.Windows.Forms.Padding(4)
Me.ComboBox3.Name = "ComboBox3"
- Me.ComboBox3.Size = New System.Drawing.Size(120, 21)
+ Me.ComboBox3.Size = New System.Drawing.Size(159, 24)
Me.ComboBox3.TabIndex = 28
Me.ComboBox3.Text = "ComboBox3"
'
'TextBox11
'
- Me.TextBox11.Location = New System.Drawing.Point(160, 35)
+ Me.TextBox11.Location = New System.Drawing.Point(213, 43)
+ Me.TextBox11.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox11.Name = "TextBox11"
- Me.TextBox11.Size = New System.Drawing.Size(56, 20)
+ Me.TextBox11.Size = New System.Drawing.Size(73, 22)
Me.TextBox11.TabIndex = 27
Me.TextBox11.Text = "TextBox11"
'
@@ -736,9 +801,10 @@ Partial Class MainForm
'
Me.Label12.AutoSize = True
Me.Label12.ForeColor = System.Drawing.Color.Black
- Me.Label12.Location = New System.Drawing.Point(8, 38)
+ Me.Label12.Location = New System.Drawing.Point(11, 47)
+ Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(62, 13)
+ Me.Label12.Size = New System.Drawing.Size(82, 17)
Me.Label12.TabIndex = 26
Me.Label12.Text = "Dimensione"
Me.Label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -747,18 +813,20 @@ Partial Class MainForm
'
Me.Label11.AutoSize = True
Me.Label11.ForeColor = System.Drawing.Color.Black
- Me.Label11.Location = New System.Drawing.Point(56, 8)
+ Me.Label11.Location = New System.Drawing.Point(75, 10)
+ Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(28, 13)
+ Me.Label11.Size = New System.Drawing.Size(36, 17)
Me.Label11.TabIndex = 22
Me.Label11.Text = "Font"
'
'CheckBox3
'
Me.CheckBox3.ForeColor = System.Drawing.Color.Black
- Me.CheckBox3.Location = New System.Drawing.Point(224, 8)
+ Me.CheckBox3.Location = New System.Drawing.Point(299, 10)
+ Me.CheckBox3.Margin = New System.Windows.Forms.Padding(4)
Me.CheckBox3.Name = "CheckBox3"
- Me.CheckBox3.Size = New System.Drawing.Size(72, 24)
+ Me.CheckBox3.Size = New System.Drawing.Size(96, 30)
Me.CheckBox3.TabIndex = 24
Me.CheckBox3.Text = "Grassetto"
'
@@ -782,9 +850,11 @@ Partial Class MainForm
Me.GroupBox4.Controls.Add(Me.TextBox12)
Me.GroupBox4.Controls.Add(Me.Label15)
Me.GroupBox4.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
- Me.GroupBox4.Location = New System.Drawing.Point(6, 157)
+ Me.GroupBox4.Location = New System.Drawing.Point(8, 193)
+ Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4)
Me.GroupBox4.Name = "GroupBox4"
- Me.GroupBox4.Size = New System.Drawing.Size(496, 186)
+ Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4)
+ Me.GroupBox4.Size = New System.Drawing.Size(661, 229)
Me.GroupBox4.TabIndex = 36
Me.GroupBox4.TabStop = False
Me.GroupBox4.Text = "Testo da applicare"
@@ -792,68 +862,76 @@ Partial Class MainForm
'Label40
'
Me.Label40.AutoSize = True
- Me.Label40.Location = New System.Drawing.Point(8, 52)
+ Me.Label40.Location = New System.Drawing.Point(11, 64)
+ Me.Label40.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label40.Name = "Label40"
- Me.Label40.Size = New System.Drawing.Size(48, 13)
+ Me.Label40.Size = New System.Drawing.Size(63, 17)
Me.Label40.TabIndex = 40
Me.Label40.Text = "Verticale"
'
'TextBox29
'
- Me.TextBox29.Location = New System.Drawing.Point(72, 49)
+ Me.TextBox29.Location = New System.Drawing.Point(96, 60)
+ Me.TextBox29.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox29.Multiline = True
Me.TextBox29.Name = "TextBox29"
- Me.TextBox29.Size = New System.Drawing.Size(408, 44)
+ Me.TextBox29.Size = New System.Drawing.Size(543, 53)
Me.TextBox29.TabIndex = 39
'
'TextBox18
'
- Me.TextBox18.Location = New System.Drawing.Point(232, 156)
+ Me.TextBox18.Location = New System.Drawing.Point(309, 192)
+ Me.TextBox18.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox18.Name = "TextBox18"
- Me.TextBox18.Size = New System.Drawing.Size(100, 20)
+ Me.TextBox18.Size = New System.Drawing.Size(132, 22)
Me.TextBox18.TabIndex = 38
'
'Label26
'
Me.Label26.AutoSize = True
Me.Label26.ForeColor = System.Drawing.Color.Black
- Me.Label26.Location = New System.Drawing.Point(344, 156)
+ Me.Label26.Location = New System.Drawing.Point(459, 192)
+ Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label26.Name = "Label26"
- Me.Label26.Size = New System.Drawing.Size(48, 13)
+ Me.Label26.Size = New System.Drawing.Size(64, 17)
Me.Label26.TabIndex = 37
Me.Label26.Text = "partenza"
'
'DateTimePicker1
'
Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Time
- Me.DateTimePicker1.Location = New System.Drawing.Point(392, 156)
+ Me.DateTimePicker1.Location = New System.Drawing.Point(523, 192)
+ Me.DateTimePicker1.Margin = New System.Windows.Forms.Padding(4)
Me.DateTimePicker1.Name = "DateTimePicker1"
- Me.DateTimePicker1.Size = New System.Drawing.Size(88, 20)
+ Me.DateTimePicker1.Size = New System.Drawing.Size(116, 22)
Me.DateTimePicker1.TabIndex = 36
'
'CheckBox8
'
Me.CheckBox8.ForeColor = System.Drawing.Color.Black
- Me.CheckBox8.Location = New System.Drawing.Point(72, 156)
+ Me.CheckBox8.Location = New System.Drawing.Point(96, 192)
+ Me.CheckBox8.Margin = New System.Windows.Forms.Padding(4)
Me.CheckBox8.Name = "CheckBox8"
- Me.CheckBox8.Size = New System.Drawing.Size(56, 16)
+ Me.CheckBox8.Size = New System.Drawing.Size(75, 20)
Me.CheckBox8.TabIndex = 35
Me.CheckBox8.Text = "Orario"
'
'TextBox9
'
- Me.TextBox9.Location = New System.Drawing.Point(120, 108)
+ Me.TextBox9.Location = New System.Drawing.Point(160, 133)
+ Me.TextBox9.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox9.Name = "TextBox9"
- Me.TextBox9.Size = New System.Drawing.Size(56, 20)
+ Me.TextBox9.Size = New System.Drawing.Size(73, 22)
Me.TextBox9.TabIndex = 20
Me.TextBox9.Text = "TextBox9"
'
'CheckBox7
'
Me.CheckBox7.ForeColor = System.Drawing.Color.Black
- Me.CheckBox7.Location = New System.Drawing.Point(136, 156)
+ Me.CheckBox7.Location = New System.Drawing.Point(181, 192)
+ Me.CheckBox7.Margin = New System.Windows.Forms.Padding(4)
Me.CheckBox7.Name = "CheckBox7"
- Me.CheckBox7.Size = New System.Drawing.Size(88, 16)
+ Me.CheckBox7.Size = New System.Drawing.Size(117, 20)
Me.CheckBox7.TabIndex = 34
Me.CheckBox7.Text = "Tempo gara"
'
@@ -861,17 +939,19 @@ Partial Class MainForm
'
Me.Label4.AutoSize = True
Me.Label4.ForeColor = System.Drawing.Color.Black
- Me.Label4.Location = New System.Drawing.Point(8, 24)
+ Me.Label4.Location = New System.Drawing.Point(11, 30)
+ Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(59, 13)
+ Me.Label4.Size = New System.Drawing.Size(80, 17)
Me.Label4.TabIndex = 9
Me.Label4.Text = "Orizzontale"
'
'TextBox4
'
- Me.TextBox4.Location = New System.Drawing.Point(72, 24)
+ Me.TextBox4.Location = New System.Drawing.Point(96, 30)
+ Me.TextBox4.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox4.Name = "TextBox4"
- Me.TextBox4.Size = New System.Drawing.Size(408, 20)
+ Me.TextBox4.Size = New System.Drawing.Size(543, 22)
Me.TextBox4.TabIndex = 8
Me.TextBox4.Text = "TextBox4"
'
@@ -879,9 +959,10 @@ Partial Class MainForm
'
Me.Label9.AutoSize = True
Me.Label9.ForeColor = System.Drawing.Color.Black
- Me.Label9.Location = New System.Drawing.Point(8, 108)
+ Me.Label9.Location = New System.Drawing.Point(11, 133)
+ Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(110, 13)
+ Me.Label9.Size = New System.Drawing.Size(152, 17)
Me.Label9.TabIndex = 19
Me.Label9.Text = "Trasparenza (0-100%)"
'
@@ -889,25 +970,28 @@ Partial Class MainForm
'
Me.Label13.AutoSize = True
Me.Label13.ForeColor = System.Drawing.Color.Black
- Me.Label13.Location = New System.Drawing.Point(16, 132)
+ Me.Label13.Location = New System.Drawing.Point(21, 162)
+ Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(52, 13)
+ Me.Label13.Size = New System.Drawing.Size(69, 17)
Me.Label13.TabIndex = 29
Me.Label13.Text = "Posizione"
'
'ComboBox1
'
- Me.ComboBox1.Location = New System.Drawing.Point(72, 132)
+ Me.ComboBox1.Location = New System.Drawing.Point(96, 162)
+ Me.ComboBox1.Margin = New System.Windows.Forms.Padding(4)
Me.ComboBox1.Name = "ComboBox1"
- Me.ComboBox1.Size = New System.Drawing.Size(104, 21)
+ Me.ComboBox1.Size = New System.Drawing.Size(137, 24)
Me.ComboBox1.TabIndex = 28
Me.ComboBox1.Text = "ComboBox1"
'
'ComboBox2
'
- Me.ComboBox2.Location = New System.Drawing.Point(376, 132)
+ Me.ComboBox2.Location = New System.Drawing.Point(501, 162)
+ Me.ComboBox2.Margin = New System.Windows.Forms.Padding(4)
Me.ComboBox2.Name = "ComboBox2"
- Me.ComboBox2.Size = New System.Drawing.Size(104, 21)
+ Me.ComboBox2.Size = New System.Drawing.Size(137, 24)
Me.ComboBox2.TabIndex = 31
Me.ComboBox2.Text = "ComboBox2"
'
@@ -915,17 +999,19 @@ Partial Class MainForm
'
Me.Label14.AutoSize = True
Me.Label14.ForeColor = System.Drawing.Color.Black
- Me.Label14.Location = New System.Drawing.Point(304, 132)
+ Me.Label14.Location = New System.Drawing.Point(405, 162)
+ Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(67, 13)
+ Me.Label14.Size = New System.Drawing.Size(89, 17)
Me.Label14.TabIndex = 30
Me.Label14.Text = "Allineamento"
'
'TextBox12
'
- Me.TextBox12.Location = New System.Drawing.Point(376, 108)
+ Me.TextBox12.Location = New System.Drawing.Point(501, 133)
+ Me.TextBox12.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox12.Name = "TextBox12"
- Me.TextBox12.Size = New System.Drawing.Size(104, 20)
+ Me.TextBox12.Size = New System.Drawing.Size(137, 22)
Me.TextBox12.TabIndex = 33
Me.TextBox12.Text = "TextBox12"
'
@@ -933,22 +1019,24 @@ Partial Class MainForm
'
Me.Label15.AutoSize = True
Me.Label15.ForeColor = System.Drawing.Color.Black
- Me.Label15.Location = New System.Drawing.Point(296, 108)
+ Me.Label15.Location = New System.Drawing.Point(395, 133)
+ Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(75, 13)
+ Me.Label15.Size = New System.Drawing.Size(101, 17)
Me.Label15.TabIndex = 32
Me.Label15.Text = "Margine (pixel)"
'
- 'TabPage2
+ 'tabFoto
'
- Me.TabPage2.Controls.Add(Me.GroupBox2)
- Me.TabPage2.Location = New System.Drawing.Point(4, 22)
- Me.TabPage2.Name = "TabPage2"
- Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage2.Size = New System.Drawing.Size(513, 351)
- Me.TabPage2.TabIndex = 5
- Me.TabPage2.Text = "Foto"
- Me.TabPage2.UseVisualStyleBackColor = True
+ Me.tabFoto.Controls.Add(Me.GroupBox2)
+ Me.tabFoto.Location = New System.Drawing.Point(4, 25)
+ Me.tabFoto.Margin = New System.Windows.Forms.Padding(4)
+ Me.tabFoto.Name = "tabFoto"
+ Me.tabFoto.Padding = New System.Windows.Forms.Padding(4)
+ Me.tabFoto.Size = New System.Drawing.Size(687, 435)
+ Me.tabFoto.TabIndex = 5
+ Me.tabFoto.Text = "Foto"
+ Me.tabFoto.UseVisualStyleBackColor = True
'
'GroupBox2
'
@@ -962,9 +1050,11 @@ Partial Class MainForm
Me.GroupBox2.Controls.Add(Me.TextBox28)
Me.GroupBox2.Controls.Add(Me.CheckBox15)
Me.GroupBox2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
- Me.GroupBox2.Location = New System.Drawing.Point(3, 6)
+ Me.GroupBox2.Location = New System.Drawing.Point(4, 7)
+ Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4)
Me.GroupBox2.Name = "GroupBox2"
- Me.GroupBox2.Size = New System.Drawing.Size(304, 156)
+ Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4)
+ Me.GroupBox2.Size = New System.Drawing.Size(405, 192)
Me.GroupBox2.TabIndex = 36
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Foto grande"
@@ -972,34 +1062,38 @@ Partial Class MainForm
'Label45
'
Me.Label45.AutoSize = True
- Me.Label45.Location = New System.Drawing.Point(11, 86)
+ Me.Label45.Location = New System.Drawing.Point(15, 106)
+ Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label45.Name = "Label45"
- Me.Label45.Size = New System.Drawing.Size(40, 13)
+ Me.Label45.Size = New System.Drawing.Size(53, 17)
Me.Label45.TabIndex = 22
Me.Label45.Text = "Qualità"
'
'TextBox32
'
- Me.TextBox32.Location = New System.Drawing.Point(72, 80)
+ Me.TextBox32.Location = New System.Drawing.Point(96, 98)
+ Me.TextBox32.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox32.Name = "TextBox32"
- Me.TextBox32.Size = New System.Drawing.Size(72, 20)
+ Me.TextBox32.Size = New System.Drawing.Size(95, 22)
Me.TextBox32.TabIndex = 21
Me.TextBox32.Text = "100"
'
'TextBox26
'
- Me.TextBox26.Location = New System.Drawing.Point(224, 48)
+ Me.TextBox26.Location = New System.Drawing.Point(299, 59)
+ Me.TextBox26.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox26.Name = "TextBox26"
- Me.TextBox26.Size = New System.Drawing.Size(56, 20)
+ Me.TextBox26.Size = New System.Drawing.Size(73, 22)
Me.TextBox26.TabIndex = 20
Me.TextBox26.Text = "TextBox26"
'
'Label37
'
Me.Label37.ForeColor = System.Drawing.Color.Black
- Me.Label37.Location = New System.Drawing.Point(168, 48)
+ Me.Label37.Location = New System.Drawing.Point(224, 59)
+ Me.Label37.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label37.Name = "Label37"
- Me.Label37.Size = New System.Drawing.Size(48, 16)
+ Me.Label37.Size = New System.Drawing.Size(64, 20)
Me.Label37.TabIndex = 19
Me.Label37.Text = "Suffisso"
Me.Label37.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -1008,17 +1102,19 @@ Partial Class MainForm
'
Me.Label38.AutoSize = True
Me.Label38.ForeColor = System.Drawing.Color.Black
- Me.Label38.Location = New System.Drawing.Point(24, 24)
+ Me.Label38.Location = New System.Drawing.Point(32, 30)
+ Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label38.Name = "Label38"
- Me.Label38.Size = New System.Drawing.Size(41, 13)
+ Me.Label38.Size = New System.Drawing.Size(54, 17)
Me.Label38.TabIndex = 16
Me.Label38.Text = "Altezza"
'
'TextBox27
'
- Me.TextBox27.Location = New System.Drawing.Point(72, 24)
+ Me.TextBox27.Location = New System.Drawing.Point(96, 30)
+ Me.TextBox27.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox27.Name = "TextBox27"
- Me.TextBox27.Size = New System.Drawing.Size(72, 20)
+ Me.TextBox27.Size = New System.Drawing.Size(95, 22)
Me.TextBox27.TabIndex = 14
Me.TextBox27.Text = "TextBox27"
'
@@ -1026,17 +1122,19 @@ Partial Class MainForm
'
Me.Label39.AutoSize = True
Me.Label39.ForeColor = System.Drawing.Color.Black
- Me.Label39.Location = New System.Drawing.Point(8, 48)
+ Me.Label39.Location = New System.Drawing.Point(11, 59)
+ Me.Label39.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label39.Name = "Label39"
- Me.Label39.Size = New System.Drawing.Size(56, 13)
+ Me.Label39.Size = New System.Drawing.Size(75, 17)
Me.Label39.TabIndex = 17
Me.Label39.Text = "Larghezza"
'
'TextBox28
'
- Me.TextBox28.Location = New System.Drawing.Point(72, 48)
+ Me.TextBox28.Location = New System.Drawing.Point(96, 59)
+ Me.TextBox28.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox28.Name = "TextBox28"
- Me.TextBox28.Size = New System.Drawing.Size(72, 20)
+ Me.TextBox28.Size = New System.Drawing.Size(95, 22)
Me.TextBox28.TabIndex = 15
Me.TextBox28.Text = "TextBox28"
'
@@ -1045,41 +1143,45 @@ Partial Class MainForm
Me.CheckBox15.Checked = True
Me.CheckBox15.CheckState = System.Windows.Forms.CheckState.Checked
Me.CheckBox15.ForeColor = System.Drawing.Color.Black
- Me.CheckBox15.Location = New System.Drawing.Point(168, 16)
+ Me.CheckBox15.Location = New System.Drawing.Point(224, 20)
+ Me.CheckBox15.Margin = New System.Windows.Forms.Padding(4)
Me.CheckBox15.Name = "CheckBox15"
- Me.CheckBox15.Size = New System.Drawing.Size(120, 32)
+ Me.CheckBox15.Size = New System.Drawing.Size(160, 39)
Me.CheckBox15.TabIndex = 18
Me.CheckBox15.Text = "Mantieni dimensioni originali"
'
- 'TabPage1
+ 'tabMiniature
'
- Me.TabPage1.Controls.Add(Me.Panel1)
- Me.TabPage1.Controls.Add(Me.GroupBox1)
- Me.TabPage1.Location = New System.Drawing.Point(4, 22)
- Me.TabPage1.Name = "TabPage1"
- Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage1.Size = New System.Drawing.Size(513, 351)
- Me.TabPage1.TabIndex = 0
- Me.TabPage1.Text = "Miniature"
- Me.TabPage1.UseVisualStyleBackColor = True
+ Me.tabMiniature.Controls.Add(Me.Panel1)
+ Me.tabMiniature.Controls.Add(Me.GroupBox1)
+ Me.tabMiniature.Location = New System.Drawing.Point(4, 25)
+ Me.tabMiniature.Margin = New System.Windows.Forms.Padding(4)
+ Me.tabMiniature.Name = "tabMiniature"
+ Me.tabMiniature.Padding = New System.Windows.Forms.Padding(4)
+ Me.tabMiniature.Size = New System.Drawing.Size(687, 435)
+ Me.tabMiniature.TabIndex = 0
+ Me.tabMiniature.Text = "Miniature"
+ Me.tabMiniature.UseVisualStyleBackColor = True
'
'Panel1
'
Me.Panel1.Controls.Add(Me.CheckBox18)
Me.Panel1.Controls.Add(Me.CheckBox4)
Me.Panel1.Controls.Add(Me.CheckBox12)
- Me.Panel1.Location = New System.Drawing.Point(52, 236)
+ Me.Panel1.Location = New System.Drawing.Point(69, 290)
+ Me.Panel1.Margin = New System.Windows.Forms.Padding(4)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(304, 73)
+ Me.Panel1.Size = New System.Drawing.Size(405, 90)
Me.Panel1.TabIndex = 26
Me.Panel1.Visible = False
'
'CheckBox18
'
Me.CheckBox18.AutoSize = True
- Me.CheckBox18.Location = New System.Drawing.Point(140, 3)
+ Me.CheckBox18.Location = New System.Drawing.Point(187, 4)
+ Me.CheckBox18.Margin = New System.Windows.Forms.Padding(4)
Me.CheckBox18.Name = "CheckBox18"
- Me.CheckBox18.Size = New System.Drawing.Size(84, 17)
+ Me.CheckBox18.Size = New System.Drawing.Size(108, 21)
Me.CheckBox18.TabIndex = 36
Me.CheckBox18.Text = "Numero foto"
Me.CheckBox18.UseVisualStyleBackColor = True
@@ -1087,18 +1189,20 @@ Partial Class MainForm
'CheckBox4
'
Me.CheckBox4.ForeColor = System.Drawing.Color.Black
- Me.CheckBox4.Location = New System.Drawing.Point(10, 3)
+ Me.CheckBox4.Location = New System.Drawing.Point(13, 4)
+ Me.CheckBox4.Margin = New System.Windows.Forms.Padding(4)
Me.CheckBox4.Name = "CheckBox4"
- Me.CheckBox4.Size = New System.Drawing.Size(104, 17)
+ Me.CheckBox4.Size = New System.Drawing.Size(139, 21)
Me.CheckBox4.TabIndex = 34
Me.CheckBox4.Text = "Aggiungi scritta"
'
'CheckBox12
'
Me.CheckBox12.ForeColor = System.Drawing.Color.Black
- Me.CheckBox12.Location = New System.Drawing.Point(10, 19)
+ Me.CheckBox12.Location = New System.Drawing.Point(13, 23)
+ Me.CheckBox12.Margin = New System.Windows.Forms.Padding(4)
Me.CheckBox12.Name = "CheckBox12"
- Me.CheckBox12.Size = New System.Drawing.Size(104, 21)
+ Me.CheckBox12.Size = New System.Drawing.Size(139, 26)
Me.CheckBox12.TabIndex = 35
Me.CheckBox12.Text = "Aggiungi orario"
'
@@ -1115,9 +1219,11 @@ Partial Class MainForm
Me.GroupBox1.Controls.Add(Me.TextBox3)
Me.GroupBox1.Controls.Add(Me.CheckBox1)
Me.GroupBox1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
- Me.GroupBox1.Location = New System.Drawing.Point(6, 5)
+ Me.GroupBox1.Location = New System.Drawing.Point(8, 6)
+ Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(350, 210)
+ Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4)
+ Me.GroupBox1.Size = New System.Drawing.Size(467, 258)
Me.GroupBox1.TabIndex = 25
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Miniature"
@@ -1125,17 +1231,19 @@ Partial Class MainForm
'Label46
'
Me.Label46.AutoSize = True
- Me.Label46.Location = New System.Drawing.Point(198, 43)
+ Me.Label46.Location = New System.Drawing.Point(264, 53)
+ Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label46.Name = "Label46"
- Me.Label46.Size = New System.Drawing.Size(40, 13)
+ Me.Label46.Size = New System.Drawing.Size(53, 17)
Me.Label46.TabIndex = 21
Me.Label46.Text = "Qualità"
'
'TextBox33
'
- Me.TextBox33.Location = New System.Drawing.Point(244, 40)
+ Me.TextBox33.Location = New System.Drawing.Point(325, 49)
+ Me.TextBox33.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox33.Name = "TextBox33"
- Me.TextBox33.Size = New System.Drawing.Size(100, 20)
+ Me.TextBox33.Size = New System.Drawing.Size(132, 22)
Me.TextBox33.TabIndex = 20
'
'Panel2
@@ -1145,17 +1253,19 @@ Partial Class MainForm
Me.Panel2.Controls.Add(Me.RadioButton4)
Me.Panel2.Controls.Add(Me.RadioButton6)
Me.Panel2.Controls.Add(Me.RadioButton5)
- Me.Panel2.Location = New System.Drawing.Point(56, 114)
+ Me.Panel2.Location = New System.Drawing.Point(75, 140)
+ Me.Panel2.Margin = New System.Windows.Forms.Padding(4)
Me.Panel2.Name = "Panel2"
- Me.Panel2.Size = New System.Drawing.Size(235, 90)
+ Me.Panel2.Size = New System.Drawing.Size(313, 111)
Me.Panel2.TabIndex = 19
'
'RadioButton3
'
Me.RadioButton3.AutoSize = True
- Me.RadioButton3.Location = New System.Drawing.Point(15, 16)
+ Me.RadioButton3.Location = New System.Drawing.Point(20, 20)
+ Me.RadioButton3.Margin = New System.Windows.Forms.Padding(4)
Me.RadioButton3.Name = "RadioButton3"
- Me.RadioButton3.Size = New System.Drawing.Size(99, 17)
+ Me.RadioButton3.Size = New System.Drawing.Size(128, 21)
Me.RadioButton3.TabIndex = 14
Me.RadioButton3.TabStop = True
Me.RadioButton3.Text = "Aggiungi Scritta"
@@ -1164,9 +1274,10 @@ Partial Class MainForm
'RadioButton7
'
Me.RadioButton7.AutoSize = True
- Me.RadioButton7.Location = New System.Drawing.Point(129, 40)
+ Me.RadioButton7.Location = New System.Drawing.Point(172, 49)
+ Me.RadioButton7.Margin = New System.Windows.Forms.Padding(4)
Me.RadioButton7.Name = "RadioButton7"
- Me.RadioButton7.Size = New System.Drawing.Size(95, 17)
+ Me.RadioButton7.Size = New System.Drawing.Size(124, 21)
Me.RadioButton7.TabIndex = 18
Me.RadioButton7.TabStop = True
Me.RadioButton7.Text = "numero+tempo"
@@ -1175,9 +1286,10 @@ Partial Class MainForm
'RadioButton4
'
Me.RadioButton4.AutoSize = True
- Me.RadioButton4.Location = New System.Drawing.Point(15, 40)
+ Me.RadioButton4.Location = New System.Drawing.Point(20, 49)
+ Me.RadioButton4.Margin = New System.Windows.Forms.Padding(4)
Me.RadioButton4.Name = "RadioButton4"
- Me.RadioButton4.Size = New System.Drawing.Size(95, 17)
+ Me.RadioButton4.Size = New System.Drawing.Size(125, 21)
Me.RadioButton4.TabIndex = 15
Me.RadioButton4.TabStop = True
Me.RadioButton4.Text = "Aggiungi orario"
@@ -1186,9 +1298,10 @@ Partial Class MainForm
'RadioButton6
'
Me.RadioButton6.AutoSize = True
- Me.RadioButton6.Location = New System.Drawing.Point(129, 16)
+ Me.RadioButton6.Location = New System.Drawing.Point(172, 20)
+ Me.RadioButton6.Margin = New System.Windows.Forms.Padding(4)
Me.RadioButton6.Name = "RadioButton6"
- Me.RadioButton6.Size = New System.Drawing.Size(83, 17)
+ Me.RadioButton6.Size = New System.Drawing.Size(107, 21)
Me.RadioButton6.TabIndex = 17
Me.RadioButton6.TabStop = True
Me.RadioButton6.Text = "Numero foto"
@@ -1197,9 +1310,10 @@ Partial Class MainForm
'RadioButton5
'
Me.RadioButton5.AutoSize = True
- Me.RadioButton5.Location = New System.Drawing.Point(15, 65)
+ Me.RadioButton5.Location = New System.Drawing.Point(20, 80)
+ Me.RadioButton5.Margin = New System.Windows.Forms.Padding(4)
Me.RadioButton5.Name = "RadioButton5"
- Me.RadioButton5.Size = New System.Drawing.Size(84, 17)
+ Me.RadioButton5.Size = New System.Drawing.Size(109, 21)
Me.RadioButton5.TabIndex = 16
Me.RadioButton5.TabStop = True
Me.RadioButton5.Text = "Tempo Gara"
@@ -1209,17 +1323,19 @@ Partial Class MainForm
'
Me.Label5.AutoSize = True
Me.Label5.ForeColor = System.Drawing.Color.Black
- Me.Label5.Location = New System.Drawing.Point(24, 88)
+ Me.Label5.Location = New System.Drawing.Point(32, 108)
+ Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(41, 13)
+ Me.Label5.Size = New System.Drawing.Size(54, 17)
Me.Label5.TabIndex = 12
Me.Label5.Text = "Altezza"
'
'TextBox5
'
- Me.TextBox5.Location = New System.Drawing.Point(72, 64)
+ Me.TextBox5.Location = New System.Drawing.Point(96, 79)
+ Me.TextBox5.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox5.Name = "TextBox5"
- Me.TextBox5.Size = New System.Drawing.Size(88, 20)
+ Me.TextBox5.Size = New System.Drawing.Size(116, 22)
Me.TextBox5.TabIndex = 10
Me.TextBox5.Text = "TextBox5"
'
@@ -1227,17 +1343,19 @@ Partial Class MainForm
'
Me.Label6.AutoSize = True
Me.Label6.ForeColor = System.Drawing.Color.Black
- Me.Label6.Location = New System.Drawing.Point(8, 64)
+ Me.Label6.Location = New System.Drawing.Point(11, 79)
+ Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(56, 13)
+ Me.Label6.Size = New System.Drawing.Size(75, 17)
Me.Label6.TabIndex = 13
Me.Label6.Text = "Larghezza"
'
'TextBox6
'
- Me.TextBox6.Location = New System.Drawing.Point(72, 88)
+ Me.TextBox6.Location = New System.Drawing.Point(96, 108)
+ Me.TextBox6.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox6.Name = "TextBox6"
- Me.TextBox6.Size = New System.Drawing.Size(88, 20)
+ Me.TextBox6.Size = New System.Drawing.Size(116, 22)
Me.TextBox6.TabIndex = 11
Me.TextBox6.Text = "TextBox6"
'
@@ -1245,39 +1363,45 @@ Partial Class MainForm
'
Me.Label3.AutoSize = True
Me.Label3.ForeColor = System.Drawing.Color.Black
- Me.Label3.Location = New System.Drawing.Point(24, 40)
+ Me.Label3.Location = New System.Drawing.Point(32, 49)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(44, 13)
+ Me.Label3.Size = New System.Drawing.Size(58, 17)
Me.Label3.TabIndex = 7
Me.Label3.Text = "Suffisso"
'
'TextBox3
'
- Me.TextBox3.Location = New System.Drawing.Point(72, 40)
+ Me.TextBox3.Location = New System.Drawing.Point(96, 49)
+ Me.TextBox3.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox3.Name = "TextBox3"
- Me.TextBox3.Size = New System.Drawing.Size(88, 20)
+ Me.TextBox3.Size = New System.Drawing.Size(116, 22)
Me.TextBox3.TabIndex = 6
Me.TextBox3.Text = "TextBox3"
'
'CheckBox1
'
+ Me.CheckBox1.Checked = True
+ Me.CheckBox1.CheckState = System.Windows.Forms.CheckState.Checked
Me.CheckBox1.ForeColor = System.Drawing.Color.Black
- Me.CheckBox1.Location = New System.Drawing.Point(72, 16)
+ Me.CheckBox1.Location = New System.Drawing.Point(96, 20)
+ Me.CheckBox1.Margin = New System.Windows.Forms.Padding(4)
Me.CheckBox1.Name = "CheckBox1"
- Me.CheckBox1.Size = New System.Drawing.Size(104, 24)
+ Me.CheckBox1.Size = New System.Drawing.Size(139, 30)
Me.CheckBox1.TabIndex = 5
Me.CheckBox1.Text = "Crea miniature"
'
- 'TabPage4
+ 'tabLogo
'
- Me.TabPage4.Controls.Add(Me.GroupBox6)
- Me.TabPage4.Location = New System.Drawing.Point(4, 22)
- Me.TabPage4.Name = "TabPage4"
- Me.TabPage4.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage4.Size = New System.Drawing.Size(513, 351)
- Me.TabPage4.TabIndex = 3
- Me.TabPage4.Text = "Logo"
- Me.TabPage4.UseVisualStyleBackColor = True
+ Me.tabLogo.Controls.Add(Me.GroupBox6)
+ Me.tabLogo.Location = New System.Drawing.Point(4, 25)
+ Me.tabLogo.Margin = New System.Windows.Forms.Padding(4)
+ Me.tabLogo.Name = "tabLogo"
+ Me.tabLogo.Padding = New System.Windows.Forms.Padding(4)
+ Me.tabLogo.Size = New System.Drawing.Size(687, 435)
+ Me.tabLogo.TabIndex = 3
+ Me.tabLogo.Text = "Logo"
+ Me.tabLogo.UseVisualStyleBackColor = True
'
'GroupBox6
'
@@ -1301,9 +1425,11 @@ Partial Class MainForm
Me.GroupBox6.Controls.Add(Me.Label30)
Me.GroupBox6.Controls.Add(Me.PictureBox3)
Me.GroupBox6.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
- Me.GroupBox6.Location = New System.Drawing.Point(6, 6)
+ Me.GroupBox6.Location = New System.Drawing.Point(8, 7)
+ Me.GroupBox6.Margin = New System.Windows.Forms.Padding(4)
Me.GroupBox6.Name = "GroupBox6"
- Me.GroupBox6.Size = New System.Drawing.Size(496, 224)
+ Me.GroupBox6.Padding = New System.Windows.Forms.Padding(4)
+ Me.GroupBox6.Size = New System.Drawing.Size(661, 276)
Me.GroupBox6.TabIndex = 42
Me.GroupBox6.TabStop = False
Me.GroupBox6.Text = "Logo"
@@ -1311,9 +1437,10 @@ Partial Class MainForm
'PictureBox2
'
Me.PictureBox2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PictureBox2.Location = New System.Drawing.Point(144, 192)
+ Me.PictureBox2.Location = New System.Drawing.Point(192, 236)
+ Me.PictureBox2.Margin = New System.Windows.Forms.Padding(4)
Me.PictureBox2.Name = "PictureBox2"
- Me.PictureBox2.Size = New System.Drawing.Size(24, 24)
+ Me.PictureBox2.Size = New System.Drawing.Size(31, 29)
Me.PictureBox2.TabIndex = 44
Me.PictureBox2.TabStop = False
Me.PictureBox2.Visible = False
@@ -1321,69 +1448,79 @@ Partial Class MainForm
'PictureBox1
'
Me.PictureBox1.Cursor = System.Windows.Forms.Cursors.Cross
- Me.PictureBox1.Location = New System.Drawing.Point(256, 56)
+ Me.PictureBox1.Location = New System.Drawing.Point(341, 69)
+ Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(224, 160)
+ Me.PictureBox1.Size = New System.Drawing.Size(299, 197)
Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
Me.PictureBox1.TabIndex = 43
Me.PictureBox1.TabStop = False
'
'ComboBox5
'
- Me.ComboBox5.Location = New System.Drawing.Point(144, 168)
+ Me.ComboBox5.Location = New System.Drawing.Point(192, 207)
+ Me.ComboBox5.Margin = New System.Windows.Forms.Padding(4)
Me.ComboBox5.Name = "ComboBox5"
- Me.ComboBox5.Size = New System.Drawing.Size(96, 21)
+ Me.ComboBox5.Size = New System.Drawing.Size(127, 24)
Me.ComboBox5.TabIndex = 42
Me.ComboBox5.Text = "ComboBox5"
'
'ComboBox4
'
- Me.ComboBox4.Location = New System.Drawing.Point(144, 144)
+ Me.ComboBox4.Location = New System.Drawing.Point(192, 177)
+ Me.ComboBox4.Margin = New System.Windows.Forms.Padding(4)
Me.ComboBox4.Name = "ComboBox4"
- Me.ComboBox4.Size = New System.Drawing.Size(96, 21)
+ Me.ComboBox4.Size = New System.Drawing.Size(127, 24)
Me.ComboBox4.TabIndex = 41
Me.ComboBox4.Text = "ComboBox4"
'
'TextBox19
'
- Me.TextBox19.Location = New System.Drawing.Point(144, 96)
+ Me.TextBox19.Location = New System.Drawing.Point(192, 118)
+ Me.TextBox19.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox19.Name = "TextBox19"
- Me.TextBox19.Size = New System.Drawing.Size(96, 20)
+ Me.TextBox19.Size = New System.Drawing.Size(127, 22)
Me.TextBox19.TabIndex = 40
Me.TextBox19.Text = "TextBox19"
'
'Label28
'
Me.Label28.ForeColor = System.Drawing.Color.Black
- Me.Label28.Location = New System.Drawing.Point(17, 97)
+ Me.Label28.Location = New System.Drawing.Point(23, 119)
+ Me.Label28.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label28.Name = "Label28"
- Me.Label28.Size = New System.Drawing.Size(120, 16)
+ Me.Label28.Size = New System.Drawing.Size(160, 20)
Me.Label28.TabIndex = 39
Me.Label28.Text = "Trasparenza (0-100%)"
Me.Label28.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'CheckBox5
'
+ Me.CheckBox5.Checked = True
+ Me.CheckBox5.CheckState = System.Windows.Forms.CheckState.Checked
Me.CheckBox5.ForeColor = System.Drawing.Color.Black
- Me.CheckBox5.Location = New System.Drawing.Point(0, 26)
+ Me.CheckBox5.Location = New System.Drawing.Point(0, 32)
+ Me.CheckBox5.Margin = New System.Windows.Forms.Padding(4)
Me.CheckBox5.Name = "CheckBox5"
- Me.CheckBox5.Size = New System.Drawing.Size(72, 20)
+ Me.CheckBox5.Size = New System.Drawing.Size(96, 25)
Me.CheckBox5.TabIndex = 38
Me.CheckBox5.Text = "Aggiungi"
'
'TextBox15
'
- Me.TextBox15.Location = New System.Drawing.Point(144, 72)
+ Me.TextBox15.Location = New System.Drawing.Point(192, 89)
+ Me.TextBox15.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox15.Name = "TextBox15"
- Me.TextBox15.Size = New System.Drawing.Size(96, 20)
+ Me.TextBox15.Size = New System.Drawing.Size(127, 22)
Me.TextBox15.TabIndex = 19
Me.TextBox15.Text = "TextBox15"
'
'TextBox14
'
- Me.TextBox14.Location = New System.Drawing.Point(144, 48)
+ Me.TextBox14.Location = New System.Drawing.Point(192, 59)
+ Me.TextBox14.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox14.Name = "TextBox14"
- Me.TextBox14.Size = New System.Drawing.Size(96, 20)
+ Me.TextBox14.Size = New System.Drawing.Size(127, 22)
Me.TextBox14.TabIndex = 18
Me.TextBox14.Text = "TextBox14"
'
@@ -1391,18 +1528,20 @@ Partial Class MainForm
'
Me.Label25.AutoSize = True
Me.Label25.ForeColor = System.Drawing.Color.Black
- Me.Label25.Location = New System.Drawing.Point(17, 168)
+ Me.Label25.Location = New System.Drawing.Point(23, 207)
+ Me.Label25.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label25.Name = "Label25"
- Me.Label25.Size = New System.Drawing.Size(95, 13)
+ Me.Label25.Size = New System.Drawing.Size(126, 17)
Me.Label25.TabIndex = 36
Me.Label25.Text = "Posizione verticale"
Me.Label25.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'TextBox16
'
- Me.TextBox16.Location = New System.Drawing.Point(144, 120)
+ Me.TextBox16.Location = New System.Drawing.Point(192, 148)
+ Me.TextBox16.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox16.Name = "TextBox16"
- Me.TextBox16.Size = New System.Drawing.Size(96, 20)
+ Me.TextBox16.Size = New System.Drawing.Size(127, 22)
Me.TextBox16.TabIndex = 35
Me.TextBox16.Text = "TextBox16"
'
@@ -1410,9 +1549,10 @@ Partial Class MainForm
'
Me.Label24.AutoSize = True
Me.Label24.ForeColor = System.Drawing.Color.Black
- Me.Label24.Location = New System.Drawing.Point(19, 123)
+ Me.Label24.Location = New System.Drawing.Point(25, 151)
+ Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label24.Name = "Label24"
- Me.Label24.Size = New System.Drawing.Size(88, 13)
+ Me.Label24.Size = New System.Drawing.Size(117, 17)
Me.Label24.TabIndex = 34
Me.Label24.Text = "Margine (pixel/%)"
Me.Label24.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -1421,9 +1561,10 @@ Partial Class MainForm
'
Me.Label22.AutoSize = True
Me.Label22.ForeColor = System.Drawing.Color.Black
- Me.Label22.Location = New System.Drawing.Point(19, 51)
+ Me.Label22.Location = New System.Drawing.Point(25, 63)
+ Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label22.Name = "Label22"
- Me.Label22.Size = New System.Drawing.Size(41, 13)
+ Me.Label22.Size = New System.Drawing.Size(54, 17)
Me.Label22.TabIndex = 20
Me.Label22.Text = "Altezza"
Me.Label22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -1432,26 +1573,29 @@ Partial Class MainForm
'
Me.Label23.AutoSize = True
Me.Label23.ForeColor = System.Drawing.Color.Black
- Me.Label23.Location = New System.Drawing.Point(19, 75)
+ Me.Label23.Location = New System.Drawing.Point(25, 92)
+ Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label23.Name = "Label23"
- Me.Label23.Size = New System.Drawing.Size(56, 13)
+ Me.Label23.Size = New System.Drawing.Size(75, 17)
Me.Label23.TabIndex = 21
Me.Label23.Text = "Larghezza"
Me.Label23.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'Button4
'
- Me.Button4.Location = New System.Drawing.Point(464, 24)
+ Me.Button4.Location = New System.Drawing.Point(619, 30)
+ Me.Button4.Margin = New System.Windows.Forms.Padding(4)
Me.Button4.Name = "Button4"
- Me.Button4.Size = New System.Drawing.Size(24, 20)
+ Me.Button4.Size = New System.Drawing.Size(32, 25)
Me.Button4.TabIndex = 8
Me.Button4.Text = "..."
'
'TextBox10
'
- Me.TextBox10.Location = New System.Drawing.Point(144, 24)
+ Me.TextBox10.Location = New System.Drawing.Point(192, 30)
+ Me.TextBox10.Margin = New System.Windows.Forms.Padding(4)
Me.TextBox10.Name = "TextBox10"
- Me.TextBox10.Size = New System.Drawing.Size(312, 20)
+ Me.TextBox10.Size = New System.Drawing.Size(415, 22)
Me.TextBox10.TabIndex = 6
Me.TextBox10.Text = "TextBox10"
'
@@ -1459,9 +1603,10 @@ Partial Class MainForm
'
Me.Label29.AutoSize = True
Me.Label29.ForeColor = System.Drawing.Color.Black
- Me.Label29.Location = New System.Drawing.Point(17, 147)
+ Me.Label29.Location = New System.Drawing.Point(23, 181)
+ Me.Label29.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label29.Name = "Label29"
- Me.Label29.Size = New System.Drawing.Size(105, 13)
+ Me.Label29.Size = New System.Drawing.Size(142, 17)
Me.Label29.TabIndex = 36
Me.Label29.Text = "Posizione orizzontale"
Me.Label29.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -1470,9 +1615,10 @@ Partial Class MainForm
'
Me.Label30.AutoSize = True
Me.Label30.ForeColor = System.Drawing.Color.Black
- Me.Label30.Location = New System.Drawing.Point(19, 203)
+ Me.Label30.Location = New System.Drawing.Point(25, 250)
+ Me.Label30.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label30.Name = "Label30"
- Me.Label30.Size = New System.Drawing.Size(93, 13)
+ Me.Label30.Size = New System.Drawing.Size(126, 17)
Me.Label30.TabIndex = 36
Me.Label30.Text = "Colore trasparente"
Me.Label30.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -1481,18 +1627,20 @@ Partial Class MainForm
'PictureBox3
'
Me.PictureBox3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PictureBox3.Location = New System.Drawing.Point(216, 192)
+ Me.PictureBox3.Location = New System.Drawing.Point(288, 236)
+ Me.PictureBox3.Margin = New System.Windows.Forms.Padding(4)
Me.PictureBox3.Name = "PictureBox3"
- Me.PictureBox3.Size = New System.Drawing.Size(24, 24)
+ Me.PictureBox3.Size = New System.Drawing.Size(31, 29)
Me.PictureBox3.TabIndex = 44
Me.PictureBox3.TabStop = False
Me.PictureBox3.Visible = False
'
'Label27
'
- Me.Label27.Location = New System.Drawing.Point(591, 378)
+ Me.Label27.Location = New System.Drawing.Point(788, 465)
+ Me.Label27.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label27.Name = "Label27"
- Me.Label27.Size = New System.Drawing.Size(140, 20)
+ Me.Label27.Size = New System.Drawing.Size(187, 25)
Me.Label27.TabIndex = 62
Me.Label27.Text = "Versione 2.2 2021"
Me.Label27.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -1500,28 +1648,31 @@ Partial Class MainForm
'Button7
'
Me.Button7.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Button7.Location = New System.Drawing.Point(539, 120)
+ Me.Button7.Location = New System.Drawing.Point(719, 148)
+ Me.Button7.Margin = New System.Windows.Forms.Padding(4)
Me.Button7.Name = "Button7"
- Me.Button7.Size = New System.Drawing.Size(192, 40)
+ Me.Button7.Size = New System.Drawing.Size(256, 49)
Me.Button7.TabIndex = 61
Me.Button7.Text = "stop creazione"
'
- 'Button5
+ 'btnSalvaImpostazioni
'
- Me.Button5.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Button5.Location = New System.Drawing.Point(539, 43)
- Me.Button5.Name = "Button5"
- Me.Button5.Size = New System.Drawing.Size(192, 32)
- Me.Button5.TabIndex = 60
- Me.Button5.Text = "Salva impostazioni"
+ Me.btnSalvaImpostazioni.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.btnSalvaImpostazioni.Location = New System.Drawing.Point(719, 53)
+ Me.btnSalvaImpostazioni.Margin = New System.Windows.Forms.Padding(4)
+ Me.btnSalvaImpostazioni.Name = "btnSalvaImpostazioni"
+ Me.btnSalvaImpostazioni.Size = New System.Drawing.Size(256, 39)
+ Me.btnSalvaImpostazioni.TabIndex = 60
+ Me.btnSalvaImpostazioni.Text = "Salva impostazioni"
'
'Label20
'
Me.Label20.AutoSize = True
Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label20.Location = New System.Drawing.Point(539, 294)
+ Me.Label20.Location = New System.Drawing.Point(719, 362)
+ Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label20.Name = "Label20"
- Me.Label20.Size = New System.Drawing.Size(104, 16)
+ Me.Label20.Size = New System.Drawing.Size(126, 20)
Me.Label20.TabIndex = 59
Me.Label20.Text = "foto generate:"
'
@@ -1529,9 +1680,10 @@ Partial Class MainForm
'
Me.Label19.AutoSize = True
Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label19.Location = New System.Drawing.Point(539, 275)
+ Me.Label19.Location = New System.Drawing.Point(719, 338)
+ Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label19.Name = "Label19"
- Me.Label19.Size = New System.Drawing.Size(80, 16)
+ Me.Label19.Size = New System.Drawing.Size(101, 20)
Me.Label19.TabIndex = 58
Me.Label19.Text = "foto totali: "
'
@@ -1539,9 +1691,10 @@ Partial Class MainForm
'
Me.Label18.AutoSize = True
Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label18.Location = New System.Drawing.Point(643, 294)
+ Me.Label18.Location = New System.Drawing.Point(857, 362)
+ Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(19, 20)
+ Me.Label18.Size = New System.Drawing.Size(24, 25)
Me.Label18.TabIndex = 57
Me.Label18.Text = "0"
'
@@ -1549,38 +1702,42 @@ Partial Class MainForm
'
Me.lblFotoTotaliNum.AutoSize = True
Me.lblFotoTotaliNum.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.lblFotoTotaliNum.Location = New System.Drawing.Point(643, 275)
+ Me.lblFotoTotaliNum.Location = New System.Drawing.Point(857, 338)
+ Me.lblFotoTotaliNum.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblFotoTotaliNum.Name = "lblFotoTotaliNum"
- Me.lblFotoTotaliNum.Size = New System.Drawing.Size(19, 20)
+ Me.lblFotoTotaliNum.Size = New System.Drawing.Size(24, 25)
Me.lblFotoTotaliNum.TabIndex = 56
Me.lblFotoTotaliNum.Text = "0"
'
'Label10
'
Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label10.Location = New System.Drawing.Point(539, 163)
+ Me.Label10.Location = New System.Drawing.Point(719, 201)
+ Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(192, 72)
+ Me.Label10.Size = New System.Drawing.Size(256, 89)
Me.Label10.TabIndex = 55
Me.Label10.Text = "file"
'
'btnCreaCatalogo
'
Me.btnCreaCatalogo.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.btnCreaCatalogo.Location = New System.Drawing.Point(539, 77)
+ Me.btnCreaCatalogo.Location = New System.Drawing.Point(719, 95)
+ Me.btnCreaCatalogo.Margin = New System.Windows.Forms.Padding(4)
Me.btnCreaCatalogo.Name = "btnCreaCatalogo"
Me.btnCreaCatalogo.Size = New System.Drawing.Size(102, 39)
Me.btnCreaCatalogo.TabIndex = 53
Me.btnCreaCatalogo.Text = "crea catalogo"
'
- 'Button6
+ 'btnCaricaImpostazioni
'
- Me.Button6.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Button6.Location = New System.Drawing.Point(539, 12)
- Me.Button6.Name = "Button6"
- Me.Button6.Size = New System.Drawing.Size(192, 32)
- Me.Button6.TabIndex = 54
- Me.Button6.Text = "Carica impostazioni"
+ Me.btnCaricaImpostazioni.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.btnCaricaImpostazioni.Location = New System.Drawing.Point(719, 15)
+ Me.btnCaricaImpostazioni.Margin = New System.Windows.Forms.Padding(4)
+ Me.btnCaricaImpostazioni.Name = "btnCaricaImpostazioni"
+ Me.btnCaricaImpostazioni.Size = New System.Drawing.Size(256, 39)
+ Me.btnCaricaImpostazioni.TabIndex = 54
+ Me.btnCaricaImpostazioni.Text = "Carica impostazioni"
'
'btnCreaCatalogoAsync
'
@@ -1593,74 +1750,75 @@ Partial Class MainForm
'
'MainForm
'
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(739, 401)
Me.Controls.Add(Me.btnCreaCatalogoAsync)
Me.Controls.Add(Me.ProgressBar1)
Me.Controls.Add(Me.CheckBox22)
Me.Controls.Add(Me.Label43)
- Me.Controls.Add(Me.TabControl1)
+ Me.Controls.Add(Me.tabControl)
Me.Controls.Add(Me.Label27)
Me.Controls.Add(Me.Button7)
- Me.Controls.Add(Me.Button5)
+ Me.Controls.Add(Me.btnSalvaImpostazioni)
Me.Controls.Add(Me.Label20)
Me.Controls.Add(Me.Label19)
Me.Controls.Add(Me.Label18)
Me.Controls.Add(Me.lblFotoTotaliNum)
Me.Controls.Add(Me.Label10)
Me.Controls.Add(Me.btnCreaCatalogo)
- Me.Controls.Add(Me.Button6)
+ Me.Controls.Add(Me.btnCaricaImpostazioni)
+ Me.Margin = New System.Windows.Forms.Padding(4)
Me.MaximizeBox = False
Me.Name = "MainForm"
Me.Text = "Image Catalog"
- Me.TabControl1.ResumeLayout(False)
- Me.TabPage5.ResumeLayout(False)
- Me.GroupBox11.ResumeLayout(False)
- Me.GroupBox11.PerformLayout()
+ Me.tabControl.ResumeLayout(False)
+ Me.tabGenerale.ResumeLayout(False)
+ Me.grpAvanzate.ResumeLayout(False)
+ Me.grpAvanzate.PerformLayout
Me.Panel3.ResumeLayout(False)
- Me.Panel3.PerformLayout()
+ Me.Panel3.PerformLayout
Me.GroupBox3.ResumeLayout(False)
- Me.GroupBox3.PerformLayout()
- Me.GroupBox8.ResumeLayout(False)
- Me.GroupBox8.PerformLayout()
- Me.GroupBox7.ResumeLayout(False)
- Me.GroupBox7.PerformLayout()
- Me.TabPage3.ResumeLayout(False)
- Me.TabPage3.PerformLayout()
- Me.GroupBox10.ResumeLayout(False)
- Me.GroupBox10.PerformLayout()
- Me.GroupBox9.ResumeLayout(False)
- Me.GroupBox9.PerformLayout()
- Me.GroupBox5.ResumeLayout(False)
- Me.GroupBox5.PerformLayout()
+ Me.GroupBox3.PerformLayout
+ Me.grpSottocartelle.ResumeLayout(False)
+ Me.grpSottocartelle.PerformLayout
+ Me.grpGenerale.ResumeLayout(False)
+ Me.grpGenerale.PerformLayout
+ Me.tabTesto.ResumeLayout(False)
+ Me.tabTesto.PerformLayout
+ Me.grpTestoFotoVerticali.ResumeLayout(False)
+ Me.grpTestoFotoVerticali.PerformLayout
+ Me.grpSlideShow.ResumeLayout(False)
+ Me.grpSlideShow.PerformLayout
+ Me.grpCarattere.ResumeLayout(False)
+ Me.grpCarattere.PerformLayout
Me.GroupBox4.ResumeLayout(False)
- Me.GroupBox4.PerformLayout()
- Me.TabPage2.ResumeLayout(False)
+ Me.GroupBox4.PerformLayout
+ Me.tabFoto.ResumeLayout(False)
Me.GroupBox2.ResumeLayout(False)
- Me.GroupBox2.PerformLayout()
- Me.TabPage1.ResumeLayout(False)
+ Me.GroupBox2.PerformLayout
+ Me.tabMiniature.ResumeLayout(False)
Me.Panel1.ResumeLayout(False)
- Me.Panel1.PerformLayout()
+ Me.Panel1.PerformLayout
Me.GroupBox1.ResumeLayout(False)
- Me.GroupBox1.PerformLayout()
+ Me.GroupBox1.PerformLayout
Me.Panel2.ResumeLayout(False)
- Me.Panel2.PerformLayout()
- Me.TabPage4.ResumeLayout(False)
+ Me.Panel2.PerformLayout
+ Me.tabLogo.ResumeLayout(False)
Me.GroupBox6.ResumeLayout(False)
- Me.GroupBox6.PerformLayout()
+ Me.GroupBox6.PerformLayout
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
- Me.PerformLayout()
+ Me.PerformLayout
End Sub
Friend WithEvents ProgressBar1 As System.Windows.Forms.ProgressBar
Friend WithEvents CheckBox22 As System.Windows.Forms.CheckBox
Friend WithEvents Label43 As System.Windows.Forms.Label
- Friend WithEvents TabControl1 As System.Windows.Forms.TabControl
- Friend WithEvents TabPage5 As System.Windows.Forms.TabPage
+ Friend WithEvents tabControl As System.Windows.Forms.TabControl
+ Friend WithEvents tabGenerale As System.Windows.Forms.TabPage
Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox
Friend WithEvents chkAggiornaSottodirectory As System.Windows.Forms.CheckBox
Friend WithEvents Button3 As System.Windows.Forms.Button
@@ -1669,7 +1827,7 @@ Partial Class MainForm
Friend WithEvents Label2 As System.Windows.Forms.Label
Friend WithEvents txtSorgente As System.Windows.Forms.TextBox
Friend WithEvents txtDestinazione As System.Windows.Forms.TextBox
- Friend WithEvents GroupBox8 As System.Windows.Forms.GroupBox
+ Friend WithEvents grpSottocartelle As System.Windows.Forms.GroupBox
Friend WithEvents rdbNumFiles As System.Windows.Forms.RadioButton
Friend WithEvents rdbNumProgressiva As System.Windows.Forms.RadioButton
Friend WithEvents txtCifreContatore As System.Windows.Forms.TextBox
@@ -1680,19 +1838,19 @@ Partial Class MainForm
Friend WithEvents chkCreaSottocartelle As System.Windows.Forms.CheckBox
Friend WithEvents txtFilePerCartella As System.Windows.Forms.TextBox
Friend WithEvents Label32 As System.Windows.Forms.Label
- Friend WithEvents GroupBox7 As System.Windows.Forms.GroupBox
+ Friend WithEvents grpGenerale As System.Windows.Forms.GroupBox
Friend WithEvents chkRotazioneAutomatica As System.Windows.Forms.CheckBox
Friend WithEvents chkForzaJpg As System.Windows.Forms.CheckBox
- Friend WithEvents TabPage3 As System.Windows.Forms.TabPage
- Friend WithEvents GroupBox10 As System.Windows.Forms.GroupBox
+ Friend WithEvents tabTesto As System.Windows.Forms.TabPage
+ Friend WithEvents grpTestoFotoVerticali As System.Windows.Forms.GroupBox
Friend WithEvents Label42 As System.Windows.Forms.Label
Friend WithEvents Label41 As System.Windows.Forms.Label
Friend WithEvents TextBox31 As System.Windows.Forms.TextBox
Friend WithEvents TextBox30 As System.Windows.Forms.TextBox
- Friend WithEvents GroupBox9 As System.Windows.Forms.GroupBox
+ Friend WithEvents grpSlideShow As System.Windows.Forms.GroupBox
Friend WithEvents CheckBox17 As System.Windows.Forms.CheckBox
Friend WithEvents CheckBox16 As System.Windows.Forms.CheckBox
- Friend WithEvents GroupBox5 As System.Windows.Forms.GroupBox
+ Friend WithEvents grpCarattere As System.Windows.Forms.GroupBox
Friend WithEvents TextBox34 As System.Windows.Forms.TextBox
Friend WithEvents Button8 As System.Windows.Forms.Button
Friend WithEvents Label36 As System.Windows.Forms.Label
@@ -1721,7 +1879,7 @@ Partial Class MainForm
Friend WithEvents Label14 As System.Windows.Forms.Label
Friend WithEvents TextBox12 As System.Windows.Forms.TextBox
Friend WithEvents Label15 As System.Windows.Forms.Label
- Friend WithEvents TabPage2 As System.Windows.Forms.TabPage
+ Friend WithEvents tabFoto As System.Windows.Forms.TabPage
Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
Friend WithEvents Label45 As System.Windows.Forms.Label
Friend WithEvents TextBox32 As System.Windows.Forms.TextBox
@@ -1732,7 +1890,7 @@ Partial Class MainForm
Friend WithEvents Label39 As System.Windows.Forms.Label
Friend WithEvents TextBox28 As System.Windows.Forms.TextBox
Friend WithEvents CheckBox15 As System.Windows.Forms.CheckBox
- Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
+ Friend WithEvents tabMiniature As System.Windows.Forms.TabPage
Friend WithEvents Panel1 As System.Windows.Forms.Panel
Friend WithEvents CheckBox18 As System.Windows.Forms.CheckBox
Friend WithEvents CheckBox4 As System.Windows.Forms.CheckBox
@@ -1753,7 +1911,7 @@ Partial Class MainForm
Friend WithEvents Label3 As System.Windows.Forms.Label
Friend WithEvents TextBox3 As System.Windows.Forms.TextBox
Friend WithEvents CheckBox1 As System.Windows.Forms.CheckBox
- Friend WithEvents TabPage4 As System.Windows.Forms.TabPage
+ Friend WithEvents tabLogo As System.Windows.Forms.TabPage
Friend WithEvents GroupBox6 As System.Windows.Forms.GroupBox
Friend WithEvents PictureBox2 As System.Windows.Forms.PictureBox
Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
@@ -1776,15 +1934,15 @@ Partial Class MainForm
Friend WithEvents PictureBox3 As System.Windows.Forms.PictureBox
Friend WithEvents Label27 As System.Windows.Forms.Label
Friend WithEvents Button7 As System.Windows.Forms.Button
- Friend WithEvents Button5 As System.Windows.Forms.Button
+ Friend WithEvents btnSalvaImpostazioni As System.Windows.Forms.Button
Friend WithEvents Label20 As System.Windows.Forms.Label
Friend WithEvents Label19 As System.Windows.Forms.Label
Friend WithEvents Label18 As System.Windows.Forms.Label
Friend WithEvents lblFotoTotaliNum As System.Windows.Forms.Label
Friend WithEvents Label10 As System.Windows.Forms.Label
Friend WithEvents btnCreaCatalogo As System.Windows.Forms.Button
- Friend WithEvents Button6 As System.Windows.Forms.Button
- Friend WithEvents GroupBox11 As System.Windows.Forms.GroupBox
+ Friend WithEvents btnCaricaImpostazioni As System.Windows.Forms.Button
+ Friend WithEvents grpAvanzate As System.Windows.Forms.GroupBox
Friend WithEvents Label7 As System.Windows.Forms.Label
Friend WithEvents TextBox7 As System.Windows.Forms.TextBox
Friend WithEvents Label8 As System.Windows.Forms.Label
diff --git a/imagecatalog/ParametriSetup.vb b/imagecatalog/ParametriSetup.vb
index 104335c..aca5993 100644
--- a/imagecatalog/ParametriSetup.vb
+++ b/imagecatalog/ParametriSetup.vb
@@ -1,3 +1,5 @@
+Imports System.IO
+
Public Class ParametriSetup
@@ -22,6 +24,10 @@ Public Class ParametriSetup
_ElencoParametri = LeggiXmlDataSet("Setup", _NomeFileSetup, "Nome")
End Sub
+ public sub CaricaParametriSetupStream(ByVal stream As Stream)
+ _ElencoParametri = LeggiXmlDataSetStream("Setup", stream, "Nome")
+ End sub
+
Public Sub SalvaParametriSetup()
If System.IO.File.Exists(_NomeFileSetup) = True Then
Kill(_NomeFileSetup)
@@ -118,11 +124,12 @@ Public Class ParametriSetup
Return DataSetXml.Tables(NomeTabella)
End Function
- Private Shared Function LeggiXmlDataSet(ByVal NomeTabella As String, ByVal NomeFileXml As String, Optional ByVal NomeColonnaChiave As String = "") As DataSet
+ Private Shared Function LeggiXmlDataSetStream(ByVal NomeTabella As String, ByVal stream As Stream, Optional ByVal NomeColonnaChiave As String = "") As DataSet
'* Crea e Legge il dataset dal file xml
Dim DataSetXml As New System.Data.DataSet
- DataSetXml.ReadXml(NomeFileXml)
-
+ 'DataSetXml.ReadXml(NomeFileXml)
+ DataSetXml.ReadXml(stream)
+
'* Aggiunge il campo chiave
If NomeColonnaChiave <> "" Then
DataSetXml.Tables(NomeTabella).Constraints.Add(NomeColonnaChiave, DataSetXml.Tables(NomeTabella).Columns(NomeColonnaChiave), True)
@@ -132,7 +139,19 @@ Public Class ParametriSetup
Return DataSetXml
End Function
+ Private Shared Function LeggiXmlDataSet(ByVal NomeTabella As String, ByVal NomeFileXml As String, Optional ByVal NomeColonnaChiave As String = "") As DataSet
+ '* Crea e Legge il dataset dal file xml
+ Dim DataSetXml As New System.Data.DataSet
+ DataSetXml.ReadXml(NomeFileXml)
+
+ '* Aggiunge il campo chiave
+ If NomeColonnaChiave <> "" Then
+ DataSetXml.Tables(NomeTabella).Constraints.Add(NomeColonnaChiave, DataSetXml.Tables(NomeTabella).Columns(NomeColonnaChiave), True)
+ End If
+ '* Restituisce la risposta
+ Return DataSetXml
+ End Function
Public Property NomeFileSetup() As String
diff --git a/imagecatalog/collini_canon.xml b/imagecatalog/collini_canon.xml
new file mode 100644
index 0000000..19568f2
--- /dev/null
+++ b/imagecatalog/collini_canon.xml
@@ -0,0 +1,248 @@
+
+
+
+ DirSorgente
+
+
+
+ DirDestinazione
+
+
+
+ DirSottoDirectory
+ True
+
+
+ DirDividiDestinazione
+ True
+
+
+ DirDividiNumFile
+ 200
+
+
+ DirDividiSuffisso
+
+
+
+ DirDividiNumCifre
+ 2
+
+
+ DirDividiTipoNumerazione
+ Progressiva
+
+
+ MiniatureCrea
+ True
+
+
+ MiniatureSuffisso
+ tn_
+
+
+ MiniatureAltezza
+ 350
+
+
+ MiniatureLarghezza
+ 350
+
+
+ MiniatureAddScritta
+ False
+
+
+ FotoAltezza
+ 2240
+
+
+ FotoLarghezza
+ 2240
+
+
+ FotoCodice
+
+
+
+ FotoDimOriginali
+ False
+
+
+ FontDimensione
+ 110
+
+
+ FontBold
+ True
+
+
+ FontNome
+ Verdana
+
+
+ TestoTesto
+
+
+
+ TestoTrasparente
+ 0
+
+
+ TestoMargine
+ 6
+
+
+ TestoPosizione
+ Basso
+
+
+ TestoAllineamento
+ Centro
+
+
+ MarchioFile
+ C:\catalog_1\LOGO.jpg
+
+
+ MarchioAltezza
+ 500
+
+
+ MarchioLarghezza
+ 500
+
+
+ MarchioMargine
+ 250
+
+
+ MarchioAllOrizzontale
+ Destra
+
+
+ MarchioAllVerticale
+ Alto
+
+
+ MarchioTrasparenza
+ 100
+
+
+ MarchioAggiungi
+ True
+
+
+ TempoGara
+ False
+
+
+ Orario
+ False
+
+
+ EtichettaOrario
+
+
+
+ GeneraleForzaJpg
+ True
+
+
+ GeneraleRotazioneAutomatica
+ True
+
+
+ MiniatureAddOrario
+ False
+
+
+ FontColoreR
+ 255
+
+
+ FontColoreG
+ 255
+
+
+ FontColoreB
+ 0
+
+
+ FontDimensioneMiniatura
+ 200
+
+
+ GrandezzaVerticale
+ 110
+
+
+ MargineVerticale
+ 6
+
+
+ DimensioniOriginali
+ False
+
+
+ TestoVerticale
+
+
+
+
+ NomeMiatura
+ True
+
+
+ DataFoto
+ False
+
+
+ NumeroFoto
+ False
+
+
+ NomeMiniatura
+ True
+
+
+ SegretoSmall
+ False
+
+
+ SegretoBig
+ False
+
+
+ SegretoDefault
+ False
+
+
+ PathSmall
+
+
+
+ PathBig
+
+
+
+ TempoSmall
+ False
+
+
+ NumTempoSmall
+ False
+
+
+ ColoreTestoRGB
+ Yellow
+
+
+ CompressioneJpeg
+ 85
+
+
+ CompressioneJpegMiniatura
+ 30
+
+
\ No newline at end of file