maddo/Catalog
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Lockdown mode for old catalog

Browse source
This commit is contained in:
Maddo 2017-09-27 17:12:36 +02:00
commit 3d1f92321e
19 changed files with 1309 additions and 731 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Catalog.sln
View file

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.15
VisualStudioVersion = 15.0.26730.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ImageCatalog 2", "imagecatalog\ImageCatalog 2.vbproj", "{8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}"
EndProject
@ -32,6 +32,7 @@ Global
{8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|x64.ActiveCfg = Debug|x64
{8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|x64.Build.0 = Debug|x64
{8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|x86.ActiveCfg = Debug|x86
{8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|x86.Build.0 = Debug|x86
{8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Release|Any CPU.ActiveCfg = Release|Any CPU

1
CatalogLib/CatalogLib.csproj
View file

@ -158,6 +158,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Class1.cs" />
<Compile Include="Enums.cs" />
<Compile Include="IImageProcessor.cs" />
<Compile Include="ImageCreator.cs" />
<Compile Include="ImageCreator2.cs" />

15
CatalogLib/Enums.cs Normal file
View file

@ -0,0 +1,15 @@
namespace CatalogLib
{
public enum Positions
{
Alto,
Basso
}
public enum Alignments
{
Sinistra,
Centro,
Destra
}
}

22
CatalogLib/ImgSharpCreator.cs
View file

@ -124,7 +124,7 @@ namespace CatalogLib
if (PicSettings.Instance.EnableText)
{
//SetTextTest(image);
SetExtraText(image, isRotated);
@ -150,6 +150,16 @@ namespace CatalogLib
MaddoLogger.Log("Time Taken for {0}: {1}", workFile.FullName, s.Elapsed);
}
private void SetTextTest(Image<Rgba32> 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<Rgba32> image, bool isRotated)
{
if (string.IsNullOrWhiteSpace(PicSettings.Instance.TestoApplicareOrizzontale))
@ -258,10 +268,10 @@ namespace CatalogLib
switch (PicSettings.Instance.TextPosition)
{
case PicSettings.Positions.Alto:
case Positions.Alto:
yPosFromBottom = PicSettings.Instance.Margine;
break;
case PicSettings.Positions.Basso:
case Positions.Basso:
yPosFromBottom = image.Height - size.Height - (image.Height * PicSettings.Instance.Margine / 100);
break;
}
@ -272,17 +282,17 @@ namespace CatalogLib
switch (PicSettings.Instance.TextAlignment)
{
case PicSettings.Alignments.Sinistra:
case Alignments.Sinistra:
xCenterofImg = PicSettings.Instance.Margine + (larghezzaStandard / 2);
if ((larghezzaStandard / 2) > (image.Width / 2) - PicSettings.Instance.Margine)
{
xCenterofImg = image.Width / 2;
}
break;
case PicSettings.Alignments.Centro:
case Alignments.Centro:
xCenterofImg = image.Width / 2;
break;
case PicSettings.Alignments.Destra:
case Alignments.Destra:
xCenterofImg = image.Width - PicSettings.Instance.Margine - larghezzaStandard / 2;
if (larghezzaStandard / 2 > image.Width / 2 - PicSettings.Instance.Margine)

13
CatalogLib/PicSettings.cs
View file

@ -492,18 +492,7 @@ namespace CatalogLib
#region Enums
public enum Positions
{
Alto,
Basso
}
public enum Alignments
{
Sinistra,
Centro,
Destra
}
#endregion
}

5
WPFCatalog/Controls/GeneralSettingsControl.xaml
View file

@ -7,10 +7,15 @@
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}"
>
<UserControl.Resources>
</UserControl.Resources>
<Grid>
<ScrollViewer>
<StackPanel Orientation="Vertical">

19
WPFCatalog/Controls/TextSettingsControl.xaml
View file

@ -6,12 +6,19 @@
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}" >
<UserControl.Resources>
<wpfCatalog:FontFamilyStringConverter x:Key="FontFamilyConverter" />
<wpfCatalog:MaddoColorConverter x:Key="ColorConverter" />
<ObjectDataProvider x:Key="PositionsEnum" MethodName="GetValues" ObjectType="{x:Type System:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="catalogLib:Positions" />
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
</UserControl.Resources>
<ScrollViewer>
<StackPanel Orientation="Vertical">
@ -43,7 +50,7 @@
></TextBox>
<Label Content="Grassetto" Grid.Row="2" Grid.Column="0"></Label>
<CheckBox Grid.Row="2" Grid.Column="1"></CheckBox>
<Label Content="Corsivo" Grid.Row="3" Grid.Column="0"></Label>
<CheckBox Grid.Row="3" Grid.Column="1"></CheckBox>
@ -135,13 +142,15 @@
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Content="Trasparenza(0-100%)" />
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding TestoApplicareTrasparenza}" />
<Label Grid.Row="1" Grid.Column="0" Content="Posizione" />
<ComboBox Grid.Row="1" Grid.Column="1" />
<Label Grid.Row="1" Grid.Column="0" Content="Allineamento Verticale" />
<ComboBox Grid.Row="1" Grid.Column="1" ItemsSource="{Binding Source={StaticResource PositionsEnum}}" SelectedItem="{Binding TextPosition}">
</ComboBox>
<!--ToDo-->
<CheckBox Grid.Row="2" Grid.Column="1" Content="Orario" IsChecked="{Binding TestoApplicareOrario}"/>

11
WPFCatalog/MainWindowViewModel.cs
View file

@ -811,6 +811,17 @@ namespace WPFCatalog
set { PicSettings.Margine = value; RaisePropertyChanged("Margine"); }
}
public Positions TextPosition
{
get => PicSettings.TextPosition;
set { PicSettings.TextPosition = value; RaisePropertyChanged("TextPosition"); }
}
//public PicSettings.Positions Positions
//{
// get => PicSettings.Positions;
//}
#endregion
#region Testo

6
imagecatalog/ImageCatalog 2.vbproj
View file

@ -287,6 +287,12 @@
<ItemGroup>
<Folder Include="Sorgenti\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="collini_canon.xml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="LOG_ITA.jpg" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<PropertyGroup>
<PreBuildEvent>

16
imagecatalog/ImageCreator.vb
View file

@ -193,6 +193,12 @@ Catch ex As Exception
testoFirmaV = PicSettings.TestoFirmaStartV
End If
If (PicSettings.LockDownMode)
testoFirma += Environment.NewLine + PicSettings.BuiltInText
testoFirmaV += Environment.NewLine + PicSettings.BuiltInText
End If
End Sub
''' <summary>
@ -560,7 +566,13 @@ Catch ex As Exception
'imgOutputBig
If PicSettings.LogoAggiungi = True And File.Exists(PicSettings.LogoNomeFile) Then
Dim ImmagineLogo As Image = Image.FromFile(PicSettings.LogoNomeFile)
Dim ImmagineLogo As Image
If (PicSettings.LockDownMode)
ImmagineLogo = PicSettings.BuiltInImage
Else
ImmagineLogo = Image.FromFile(PicSettings.LogoNomeFile)
End If
Dim LogoColoreTrasparente As Color = Color.White
'Dim bmWatermark As Bitmap
@ -571,7 +583,7 @@ Catch ex As Exception
'* Load this Bitmap into a new Graphic Object
Dim grWatermark As Graphics = Graphics.FromImage(imgOutputBig)
'* To achieve a translucent watermark we will apply (2) color manipulations
Dim imageAttributes As Imaging.ImageAttributes = New Imaging.ImageAttributes

BIN
imagecatalog/LOG_ITA.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 313 KiB

1358
imagecatalog/MainForm.Designer.vb generated
View file

File diff suppressed because it is too large Load diff

267
imagecatalog/MainForm.vb
View file

@ -1,15 +1,20 @@
Imports System.IO
Option Infer On
Imports System.IO
Imports System.Drawing.Drawing2D
Imports System.Drawing.Imaging
Imports System.Threading
Imports System.Collections.Generic
Imports System.Drawing.Text
Imports System.Reflection
Imports System.Threading.Tasks
Public Delegate Sub XyThreadAdd(ByVal Info As String)
Public Class MainForm
#Const MULTI_THREADED_UI = True
Private LockdownMode As Boolean = true
Dim _assembly As [Assembly]
Private StopAttivo As Boolean
Private WaterSelectColor As Boolean = False
@ -98,11 +103,53 @@ Public Class MainForm
ComboBox5.SelectedIndex = 2
End Sub
Private Sub LockDown()
grpAvanzate.Visible = False
grpSottocartelle.Visible = False
grpGenerale.Visible = False
tabFoto.Visible = False
tabLogo.Visible = False
tabMiniature.Visible = False
tabTesto.Visible = True
tabFoto.Enabled = False
tabLogo.Enabled = False
tabMiniature.Enabled = False
tabTesto.Enabled = True
btnCaricaImpostazioni.Visible = False
btnSalvaImpostazioni.Visible = False
grpCarattere.Visible = False
grpTestoFotoVerticali.Visible = False
grpSlideShow.Visible = False
TextBox9.Visible = False
TextBox12.Visible = False
ComboBox1.Visible = False
ComboBox2.Visible = false
CheckBox8.Visible = False
CheckBox7.Visible = False
TextBox18.Visible = false
DateTimePicker1.Visible = False
CheckBox2.Visible = False
LoadDefaultConfig()
End Sub
dim _imageStream As Stream
private Sub LoadDefaultConfig()
_imageStream = _assembly.GetManifestResourceStream("ImageCatalog.LOG_ITA.jpg")
'dim _textStreamReader = new StreamReader(_assembly.GetManifestResourceStream("ImageCatalog.collini_canon.xml"))
Dim _textStream = _assembly.GetManifestResourceStream("ImageCatalog.collini_canon.xml")
SetupIni.CaricaParametriSetupStream(_textStream)
LoadSettings()
End Sub
Private Sub Form1_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load
Application.EnableVisualStyles()
_assembly = [Assembly].GetExecutingAssembly()
setDefaults()
If (LockdownMode) Then LockDown()
End Sub
Private Sub FixPaths()
@ -115,17 +162,17 @@ Public Class MainForm
End Sub
Private Sub lockUI()
TabControl1.Enabled = False
Button5.Enabled = False
Button6.Enabled = False
tabControl.Enabled = False
btnSalvaImpostazioni.Enabled = False
btnCaricaImpostazioni.Enabled = False
btnCreaCatalogo.Enabled = False
End Sub
Private Sub unlockUI()
TabControl1.Enabled = True
Button5.Enabled = True
Button6.Enabled = True
tabControl.Enabled = True
btnSalvaImpostazioni.Enabled = True
btnCaricaImpostazioni.Enabled = True
btnCreaCatalogo.Enabled = True
End Sub
@ -295,7 +342,7 @@ Public Class MainForm
'End If
End Sub
Private Sub Button5_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button5.Click
Private Sub Button5_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnSalvaImpostazioni.Click
Dim SaveFileDlg As SaveFileDialog = New SaveFileDialog
'SaveFileDlg.InitialDirectory = "c:\"
@ -381,7 +428,7 @@ Public Class MainForm
End If
End Sub
Private Sub Button6_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button6.Click
Private Sub Button6_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnCaricaImpostazioni.Click
Dim openFileDialog As OpenFileDialog = New OpenFileDialog
'openFileDialog.InitialDirectory = TextBox1.Text
@ -391,108 +438,122 @@ Public Class MainForm
If DialogResult.OK = openFileDialog.ShowDialog() Then
Dim IlNome As String = openFileDialog.FileName
SetupIni.NomeFileSetup = IlNome
SetupIni.CaricaParametriSetup()
txtSorgente.Text = SetupIni.LeggiParametroString("DirSorgente")
txtDestinazione.Text = SetupIni.LeggiParametroString("DirDestinazione")
chkAggiornaSottodirectory.Checked = SetupIni.LeggiParametroBoolean("DirSottoDirectory")
chkCreaSottocartelle.Checked = SetupIni.LeggiParametroBoolean("DirDividiDestinazione")
txtFilePerCartella.Text = SetupIni.LeggiParametroString("DirDividiNumFile")
txtSuffissoCartelle.Text = SetupIni.LeggiParametroString("DirDividiSuffisso")
txtCifreContatore.Text = SetupIni.LeggiParametroString("DirDividiNumCifre")
Dim TestoTemp As String = SetupIni.LeggiParametroString("DirDividiTipoNumerazione")
If TestoTemp.ToUpper = "PROGRESSIVA" Then
rdbNumProgressiva.Checked = True
Else
rdbNumFiles.Checked = True
End If
CheckBox1.Checked = SetupIni.LeggiParametroBoolean("MiniatureCrea")
TextBox3.Text = SetupIni.LeggiParametroString("MiniatureSuffisso")
TextBox5.Text = SetupIni.LeggiParametroString("MiniatureAltezza")
TextBox6.Text = SetupIni.LeggiParametroString("MiniatureLarghezza")
RadioButton3.Checked = SetupIni.LeggiParametroBoolean("MiniatureAddScritta")
RadioButton4.Checked = SetupIni.LeggiParametroBoolean("MiniatureAddOrario")
TextBox27.Text = SetupIni.LeggiParametroString("FotoAltezza")
TextBox28.Text = SetupIni.LeggiParametroString("FotoLarghezza")
'TextBox13.Text = SetupIni.LeggiParametroString("FotoCodice")
'CheckBox2.Checked = SetupIni.LeggiParametroBoolean("FotoDimOriginali")
TextBox11.Text = SetupIni.LeggiParametroString("FontDimensione")
TextBox25.Text = SetupIni.LeggiParametroString("FontDimensioneMiniatura")
CheckBox3.Checked = SetupIni.LeggiParametroBoolean("FontBold")
ComboBox3.Text = SetupIni.LeggiParametroString("FontNome")
If TextBox25.Text = "" Then
TextBox25.Text = "0"
End If
TextBox4.Text = SetupIni.LeggiParametroString("TestoTesto")
TextBox9.Text = SetupIni.LeggiParametroString("TestoTrasparente")
TextBox12.Text = SetupIni.LeggiParametroString("TestoMargine")
ComboBox1.Text = SetupIni.LeggiParametroString("TestoPosizione")
ComboBox2.Text = SetupIni.LeggiParametroString("TestoAllineamento")
TextBox10.Text = SetupIni.LeggiParametroString("MarchioFile")
TextBox14.Text = SetupIni.LeggiParametroString("MarchioAltezza")
TextBox15.Text = SetupIni.LeggiParametroString("MarchioLarghezza")
TextBox16.Text = SetupIni.LeggiParametroString("MarchioMargine")
ComboBox4.Text = SetupIni.LeggiParametroString("MarchioAllOrizzontale")
ComboBox5.Text = SetupIni.LeggiParametroString("MarchioAllVerticale")
TextBox19.Text = SetupIni.LeggiParametroString("MarchioTrasparenza")
CheckBox5.Checked = SetupIni.LeggiParametroBoolean("MarchioAggiungi")
CheckBox7.Checked = SetupIni.LeggiParametroBoolean("TempoGara")
CheckBox8.Checked = SetupIni.LeggiParametroBoolean("Orario")
TextBox18.Text = SetupIni.LeggiParametroString("EtichettaOrario")
chkForzaJpg.Checked = SetupIni.LeggiParametroBoolean("GeneraleForzaJpg")
chkRotazioneAutomatica.Checked = SetupIni.LeggiParametroBoolean("GeneraleRotazioneAutomatica")
TextBox30.Text = SetupIni.LeggiParametroString("GrandezzaVerticale")
TextBox31.Text = SetupIni.LeggiParametroString("MargineVerticale")
CheckBox15.Checked = SetupIni.LeggiParametroBoolean("DimensioniOriginali")
TextBox29.Text = SetupIni.LeggiParametroString("TestoVerticale")
RadioButton6.Checked = SetupIni.LeggiParametroBoolean("NomeMiniatura")
CheckBox16.Checked = SetupIni.LeggiParametroBoolean("DataFoto")
CheckBox17.Checked = SetupIni.LeggiParametroBoolean("NumeroFoto")
RadioButton5.Checked = SetupIni.LeggiParametroBoolean("TempoSmall")
RadioButton7.Checked = SetupIni.LeggiParametroBoolean("NumTempoSmall")
TextBox32.Text = SetupIni.LeggiParametroString("CompressioneJpeg")
TextBox33.Text = SetupIni.LeggiParametroString("CompressioneJpegMiniatura")
TextBox34.Text = SetupIni.LeggiParametroString("ColoreTestoRGB")
If File.Exists(TextBox10.Text) Then
PictureBox1.Image = Image.FromFile(TextBox10.Text)
If PictureBox1.Image.Height >= PictureBox1.Image.Width Then
PictureBox1.Height = 160
PictureBox1.Width = CType(160 * PictureBox1.Image.Width / PictureBox1.Image.Height, Integer)
Else
PictureBox1.Width = 224
PictureBox1.Height = CType(224 * PictureBox1.Image.Height / PictureBox1.Image.Width, Integer)
End If
End If
LoadSettings()
Me.Text = "Image Catalog - " & LeggiSoloNomeFile(IlNome)
End If
End Sub
Public Sub LoadSettings()
txtSorgente.Text = SetupIni.LeggiParametroString("DirSorgente")
txtDestinazione.Text = SetupIni.LeggiParametroString("DirDestinazione")
chkAggiornaSottodirectory.Checked = SetupIni.LeggiParametroBoolean("DirSottoDirectory")
chkCreaSottocartelle.Checked = SetupIni.LeggiParametroBoolean("DirDividiDestinazione")
txtFilePerCartella.Text = SetupIni.LeggiParametroString("DirDividiNumFile")
txtSuffissoCartelle.Text = SetupIni.LeggiParametroString("DirDividiSuffisso")
txtCifreContatore.Text = SetupIni.LeggiParametroString("DirDividiNumCifre")
Dim TestoTemp As String = SetupIni.LeggiParametroString("DirDividiTipoNumerazione")
If TestoTemp.ToUpper = "PROGRESSIVA" Then
rdbNumProgressiva.Checked = True
Else
rdbNumFiles.Checked = True
End If
CheckBox1.Checked = SetupIni.LeggiParametroBoolean("MiniatureCrea")
TextBox3.Text = SetupIni.LeggiParametroString("MiniatureSuffisso")
TextBox5.Text = SetupIni.LeggiParametroString("MiniatureAltezza")
TextBox6.Text = SetupIni.LeggiParametroString("MiniatureLarghezza")
RadioButton3.Checked = SetupIni.LeggiParametroBoolean("MiniatureAddScritta")
RadioButton4.Checked = SetupIni.LeggiParametroBoolean("MiniatureAddOrario")
TextBox27.Text = SetupIni.LeggiParametroString("FotoAltezza")
TextBox28.Text = SetupIni.LeggiParametroString("FotoLarghezza")
'TextBox13.Text = SetupIni.LeggiParametroString("FotoCodice")
'CheckBox2.Checked = SetupIni.LeggiParametroBoolean("FotoDimOriginali")
TextBox11.Text = SetupIni.LeggiParametroString("FontDimensione")
TextBox25.Text = SetupIni.LeggiParametroString("FontDimensioneMiniatura")
CheckBox3.Checked = SetupIni.LeggiParametroBoolean("FontBold")
ComboBox3.Text = SetupIni.LeggiParametroString("FontNome")
If TextBox25.Text = "" Then
TextBox25.Text = "0"
End If
TextBox4.Text = SetupIni.LeggiParametroString("TestoTesto")
TextBox9.Text = SetupIni.LeggiParametroString("TestoTrasparente")
TextBox12.Text = SetupIni.LeggiParametroString("TestoMargine")
ComboBox1.Text = SetupIni.LeggiParametroString("TestoPosizione")
ComboBox2.Text = SetupIni.LeggiParametroString("TestoAllineamento")
TextBox10.Text = SetupIni.LeggiParametroString("MarchioFile")
TextBox14.Text = SetupIni.LeggiParametroString("MarchioAltezza")
TextBox15.Text = SetupIni.LeggiParametroString("MarchioLarghezza")
TextBox16.Text = SetupIni.LeggiParametroString("MarchioMargine")
ComboBox4.Text = SetupIni.LeggiParametroString("MarchioAllOrizzontale")
ComboBox5.Text = SetupIni.LeggiParametroString("MarchioAllVerticale")
TextBox19.Text = SetupIni.LeggiParametroString("MarchioTrasparenza")
CheckBox5.Checked = SetupIni.LeggiParametroBoolean("MarchioAggiungi")
CheckBox7.Checked = SetupIni.LeggiParametroBoolean("TempoGara")
CheckBox8.Checked = SetupIni.LeggiParametroBoolean("Orario")
TextBox18.Text = SetupIni.LeggiParametroString("EtichettaOrario")
chkForzaJpg.Checked = SetupIni.LeggiParametroBoolean("GeneraleForzaJpg")
chkRotazioneAutomatica.Checked = SetupIni.LeggiParametroBoolean("GeneraleRotazioneAutomatica")
TextBox30.Text = SetupIni.LeggiParametroString("GrandezzaVerticale")
TextBox31.Text = SetupIni.LeggiParametroString("MargineVerticale")
CheckBox15.Checked = SetupIni.LeggiParametroBoolean("DimensioniOriginali")
TextBox29.Text = SetupIni.LeggiParametroString("TestoVerticale")
RadioButton6.Checked = SetupIni.LeggiParametroBoolean("NomeMiniatura")
CheckBox16.Checked = SetupIni.LeggiParametroBoolean("DataFoto")
CheckBox17.Checked = SetupIni.LeggiParametroBoolean("NumeroFoto")
RadioButton5.Checked = SetupIni.LeggiParametroBoolean("TempoSmall")
RadioButton7.Checked = SetupIni.LeggiParametroBoolean("NumTempoSmall")
TextBox32.Text = SetupIni.LeggiParametroString("CompressioneJpeg")
TextBox33.Text = SetupIni.LeggiParametroString("CompressioneJpegMiniatura")
TextBox34.Text = SetupIni.LeggiParametroString("ColoreTestoRGB")
If File.Exists(TextBox10.Text) Then
PictureBox1.Image = Image.FromFile(TextBox10.Text)
If PictureBox1.Image.Height >= PictureBox1.Image.Width Then
PictureBox1.Height = 160
PictureBox1.Width = CType(160 * PictureBox1.Image.Width / PictureBox1.Image.Height, Integer)
Else
PictureBox1.Width = 224
PictureBox1.Height = CType(224 * PictureBox1.Image.Height / PictureBox1.Image.Width, Integer)
End If
End If
End Sub
Private Sub setPicSettings(ByVal SourcePath As String, ByVal DestPath As String)
Dim SourceDir As DirectoryInfo = New DirectoryInfo(SourcePath)
Dim DestDirStart As DirectoryInfo = New DirectoryInfo(DestPath)
Dim DestDir As DirectoryInfo = Nothing
PicSettings.LockDownMode = me.LockdownMode
If (me.LockdownMode)
dim i = Image.FromStream(_imageStream)
PicSettings.BuiltInImage = i
PicSettings.BuiltInText = "Property of REGALAMI UN SORRISO ONLUS"
End If
PicSettings.DirectorySorgente = txtSorgente.Text
PicSettings.DirectoryDestinazione = txtDestinazione.Text
@ -526,6 +587,8 @@ Public Class MainForm
PicSettings.TestoFirmaStart = TextBox4.Text
PicSettings.TestoFirmaStartV = TextBox29.Text
PicSettings.DataPartenza = DateTimePicker1.Value
PicSettings.TestoOrario = TextBox18.Text
@ -898,7 +961,7 @@ Public Class MainForm
End Sub
Private Function getNumerazione() As Integer
dim numerazione As Integer
Dim numerazione As Integer
If rdbNumProgressiva.Checked Then
numerazione = FileHelper.numerazione.Progressiva
Else

2
imagecatalog/My Project/Application.Designer.vb generated
View file

@ -8,7 +8,7 @@
' </auto-generated>
'------------------------------------------------------------------------------
Option Strict On
'Option Strict On
Option Explicit On

2
imagecatalog/My Project/Settings.Designer.vb generated
View file

@ -8,7 +8,7 @@
' </auto-generated>
'------------------------------------------------------------------------------
Option Strict On
'Option Strict On
Option Explicit On

25
imagecatalog/ParametriSetup.vb
View file

@ -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

31
imagecatalog/PicSettings.vb
View file

@ -82,6 +82,9 @@ Module PicSettings
Private TempMinText As String = ""
Private _mainForm As MainForm
Private _lockDownMode As Boolean = false
Private _builtInImage As Image
Private _builtInText As String
'Private progressBar As System.Windows.Forms.ProgressBar
@ -601,4 +604,32 @@ Module PicSettings
End Set
End Property
Public Property LockDownMode As Boolean
Get
Return _lockDownMode
End Get
Set(value As Boolean)
_lockDownMode = value
End Set
End Property
Public Property BuiltInImage As Image
Get
return _builtInImage
End Get
Set(value As Image)
_builtInImage = value
End Set
End Property
public Property BuiltInText as String
Get
return _builtInText
End Get
Set(value as String)
_builtInText = value
End Set
End Property
End Module

2
imagecatalog/XYThreadPool.vb
View file

@ -1,5 +1,5 @@
Option Explicit On
Option Strict On
'Option Strict On
Imports System.Threading
Imports System.Collections

248
imagecatalog/collini_canon.xml Normal file
View file

@ -0,0 +1,248 @@
<?xml version="1.0" standalone="yes"?>
<NewDataSet>
<Setup>
<Nome>DirSorgente</Nome>
<Valore />
</Setup>
<Setup>
<Nome>DirDestinazione</Nome>
<Valore />
</Setup>
<Setup>
<Nome>DirSottoDirectory</Nome>
<Valore>True</Valore>
</Setup>
<Setup>
<Nome>DirDividiDestinazione</Nome>
<Valore>True</Valore>
</Setup>
<Setup>
<Nome>DirDividiNumFile</Nome>
<Valore>200</Valore>
</Setup>
<Setup>
<Nome>DirDividiSuffisso</Nome>
<Valore />
</Setup>
<Setup>
<Nome>DirDividiNumCifre</Nome>
<Valore>2</Valore>
</Setup>
<Setup>
<Nome>DirDividiTipoNumerazione</Nome>
<Valore>Progressiva</Valore>
</Setup>
<Setup>
<Nome>MiniatureCrea</Nome>
<Valore>True</Valore>
</Setup>
<Setup>
<Nome>MiniatureSuffisso</Nome>
<Valore>tn_</Valore>
</Setup>
<Setup>
<Nome>MiniatureAltezza</Nome>
<Valore>350</Valore>
</Setup>
<Setup>
<Nome>MiniatureLarghezza</Nome>
<Valore>350</Valore>
</Setup>
<Setup>
<Nome>MiniatureAddScritta</Nome>
<Valore>False</Valore>
</Setup>
<Setup>
<Nome>FotoAltezza</Nome>
<Valore>2240</Valore>
</Setup>
<Setup>
<Nome>FotoLarghezza</Nome>
<Valore>2240</Valore>
</Setup>
<Setup>
<Nome>FotoCodice</Nome>
<Valore />
</Setup>
<Setup>
<Nome>FotoDimOriginali</Nome>
<Valore>False</Valore>
</Setup>
<Setup>
<Nome>FontDimensione</Nome>
<Valore>110</Valore>
</Setup>
<Setup>
<Nome>FontBold</Nome>
<Valore>True</Valore>
</Setup>
<Setup>
<Nome>FontNome</Nome>
<Valore>Verdana</Valore>
</Setup>
<Setup>
<Nome>TestoTesto</Nome>
<Valore />
</Setup>
<Setup>
<Nome>TestoTrasparente</Nome>
<Valore>0</Valore>
</Setup>
<Setup>
<Nome>TestoMargine</Nome>
<Valore>6</Valore>
</Setup>
<Setup>
<Nome>TestoPosizione</Nome>
<Valore>Basso</Valore>
</Setup>
<Setup>
<Nome>TestoAllineamento</Nome>
<Valore>Centro</Valore>
</Setup>
<Setup>
<Nome>MarchioFile</Nome>
<Valore>C:\catalog_1\LOGO.jpg</Valore>
</Setup>
<Setup>
<Nome>MarchioAltezza</Nome>
<Valore>390</Valore>
</Setup>
<Setup>
<Nome>MarchioLarghezza</Nome>
<Valore>390</Valore>
</Setup>
<Setup>
<Nome>MarchioMargine</Nome>
<Valore>250</Valore>
</Setup>
<Setup>
<Nome>MarchioAllOrizzontale</Nome>
<Valore>Destra</Valore>
</Setup>
<Setup>
<Nome>MarchioAllVerticale</Nome>
<Valore>Alto</Valore>
</Setup>
<Setup>
<Nome>MarchioTrasparenza</Nome>
<Valore>100</Valore>
</Setup>
<Setup>
<Nome>MarchioAggiungi</Nome>
<Valore>True</Valore>
</Setup>
<Setup>
<Nome>TempoGara</Nome>
<Valore>False</Valore>
</Setup>
<Setup>
<Nome>Orario</Nome>
<Valore>False</Valore>
</Setup>
<Setup>
<Nome>EtichettaOrario</Nome>
<Valore />
</Setup>
<Setup>
<Nome>GeneraleForzaJpg</Nome>
<Valore>True</Valore>
</Setup>
<Setup>
<Nome>GeneraleRotazioneAutomatica</Nome>
<Valore>True</Valore>
</Setup>
<Setup>
<Nome>MiniatureAddOrario</Nome>
<Valore>False</Valore>
</Setup>
<Setup>
<Nome>FontColoreR</Nome>
<Valore>255</Valore>
</Setup>
<Setup>
<Nome>FontColoreG</Nome>
<Valore>255</Valore>
</Setup>
<Setup>
<Nome>FontColoreB</Nome>
<Valore>0</Valore>
</Setup>
<Setup>
<Nome>FontDimensioneMiniatura</Nome>
<Valore>200</Valore>
</Setup>
<Setup>
<Nome>GrandezzaVerticale</Nome>
<Valore>110</Valore>
</Setup>
<Setup>
<Nome>MargineVerticale</Nome>
<Valore>6</Valore>
</Setup>
<Setup>
<Nome>DimensioniOriginali</Nome>
<Valore>False</Valore>
</Setup>
<Setup>
<Nome>TestoVerticale</Nome>
<Valore xml:space="preserve">
</Valore>
</Setup>
<Setup>
<Nome>NomeMiatura</Nome>
<Valore>True</Valore>
</Setup>
<Setup>
<Nome>DataFoto</Nome>
<Valore>False</Valore>
</Setup>
<Setup>
<Nome>NumeroFoto</Nome>
<Valore>False</Valore>
</Setup>
<Setup>
<Nome>NomeMiniatura</Nome>
<Valore>True</Valore>
</Setup>
<Setup>
<Nome>SegretoSmall</Nome>
<Valore>False</Valore>
</Setup>
<Setup>
<Nome>SegretoBig</Nome>
<Valore>False</Valore>
</Setup>
<Setup>
<Nome>SegretoDefault</Nome>
<Valore>False</Valore>
</Setup>
<Setup>
<Nome>PathSmall</Nome>
<Valore />
</Setup>
<Setup>
<Nome>PathBig</Nome>
<Valore />
</Setup>
<Setup>
<Nome>TempoSmall</Nome>
<Valore>False</Valore>
</Setup>
<Setup>
<Nome>NumTempoSmall</Nome>
<Valore>False</Valore>
</Setup>
<Setup>
<Nome>ColoreTestoRGB</Nome>
<Valore>Yellow</Valore>
</Setup>
<Setup>
<Nome>CompressioneJpeg</Nome>
<Valore>85</Valore>
</Setup>
<Setup>
<Nome>CompressioneJpegMiniatura</Nome>
<Valore>30</Valore>
</Setup>
</NewDataSet>