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

Updated libraries and made horizontal text property

Browse source
This commit is contained in:
Marco 2025-07-28 09:49:55 +02:00
commit 65aeabdfee
6 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CatalogVbLib/CatalogVbLib.vbproj
View file

@ -36,9 +36,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Ben.Demystifier" Version="0.4.1" /> <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
<PackageReference Include="System.Collections.Immutable" Version="9.0.6" /> <PackageReference Include="System.Collections.Immutable" Version="9.0.7" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Reflection.Metadata" Version="9.0.6" /> <PackageReference Include="System.Reflection.Metadata" Version="9.0.7" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" /> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
MaddoShared/MaddoShared.csproj
View file

@ -13,12 +13,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AsyncEnumerator" Version="4.0.2" /> <PackageReference Include="AsyncEnumerator" Version="4.0.2" />
<PackageReference Include="Ben.Demystifier" Version="0.4.1" /> <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.6" /> <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.7" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" /> <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
<PackageReference Include="System.Buffers" Version="4.6.1" /> <PackageReference Include="System.Buffers" Version="4.6.1" />
<PackageReference Include="System.Collections.Immutable" Version="9.0.6" /> <PackageReference Include="System.Collections.Immutable" Version="9.0.7" />
<PackageReference Include="System.Memory" Version="4.6.3" /> <PackageReference Include="System.Memory" Version="4.6.3" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" /> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" /> <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
@ -26,6 +26,6 @@
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302"> <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.6" /> <PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.7" />
</ItemGroup> </ItemGroup>
</Project> </Project>

12
imagecatalog/DataModel.cs
View file

@ -54,6 +54,18 @@ namespace ImageCatalog_2
} }
} }
private string _horizontalText;
public string HorizontalText
{
get => _horizontalText;
set
{
_horizontalText = value;
NotifyPropertyChanged();
}
}
private bool _uiEnabled = true; private bool _uiEnabled = true;
public bool UiEnabled public bool UiEnabled

5
imagecatalog/MainForm.Designer.cs generated
View file

@ -466,7 +466,7 @@ namespace ImageCatalog
txtSorgente.Name = "txtSorgente"; txtSorgente.Name = "txtSorgente";
txtSorgente.Size = new Size(500, 27); txtSorgente.Size = new Size(500, 27);
txtSorgente.TabIndex = 0; txtSorgente.TabIndex = 0;
txtSorgente.Text = "TextBox1"; txtSorgente.Text = "";
// //
// txtDestinazione // txtDestinazione
// //
@ -991,12 +991,13 @@ namespace ImageCatalog
// //
// TextBox4 // TextBox4
// //
TextBox4.DataBindings.Add(new Binding("Text", bindingSource1, "HorizontalText", true, DataSourceUpdateMode.OnPropertyChanged));
TextBox4.Location = new Point(96, 37); TextBox4.Location = new Point(96, 37);
TextBox4.Margin = new Padding(4, 5, 4, 5); TextBox4.Margin = new Padding(4, 5, 4, 5);
TextBox4.Name = "TextBox4"; TextBox4.Name = "TextBox4";
TextBox4.Size = new Size(543, 27); TextBox4.Size = new Size(543, 27);
TextBox4.TabIndex = 8; TextBox4.TabIndex = 8;
TextBox4.Text = "TextBox4"; TextBox4.Text = "";
// //
// Label9 // Label9
// //

16
imagecatalog/MainForm.cs
View file

@ -24,8 +24,7 @@ public delegate void XyThreadAdd(string Info);
public partial class MainForm public partial class MainForm
{ {
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] private readonly DataModel Model;
public DataModel Model { get; set; }
private readonly ILogger<MainForm> _logger; private readonly ILogger<MainForm> _logger;
@ -33,8 +32,9 @@ public partial class MainForm
private readonly ParametriSetup _parametriSetup; private readonly ParametriSetup _parametriSetup;
public MainForm( ImageCreationStuff imageCreationStuff, ParametriSetup parametriSetup, ILogger<MainForm> logger) public MainForm(DataModel model, ImageCreationStuff imageCreationStuff, ParametriSetup parametriSetup, ILogger<MainForm> logger)
{ {
Model = model;
_imageCreationService = imageCreationStuff; _imageCreationService = imageCreationStuff;
_parametriSetup = parametriSetup; _parametriSetup = parametriSetup;
_logger = logger; _logger = logger;
@ -133,7 +133,7 @@ public partial class MainForm
Model.SourcePath = string.Empty; Model.SourcePath = string.Empty;
Model.DestinationPath = string.Empty; Model.DestinationPath = string.Empty;
TextBox3.Text = "tn_"; TextBox3.Text = "tn_";
TextBox4.Text = ""; Model.HorizontalText = "";
TextBox5.Text = "350"; TextBox5.Text = "350";
TextBox6.Text = "350"; TextBox6.Text = "350";
TextBox27.Text = "2240"; TextBox27.Text = "2240";
@ -431,7 +431,7 @@ public partial class MainForm
_parametriSetup.AggiornaParametro("FontDimensioneMiniatura", TextBox25.Text); _parametriSetup.AggiornaParametro("FontDimensioneMiniatura", TextBox25.Text);
_parametriSetup.AggiornaParametro("FontBold", CheckBox3.Checked); _parametriSetup.AggiornaParametro("FontBold", CheckBox3.Checked);
_parametriSetup.AggiornaParametro("FontNome", ComboBox3.Text); _parametriSetup.AggiornaParametro("FontNome", ComboBox3.Text);
_parametriSetup.AggiornaParametro("TestoTesto", TextBox4.Text); _parametriSetup.AggiornaParametro("TestoTesto", Model.HorizontalText);
_parametriSetup.AggiornaParametro("TestoTrasparente", TextBox9.Text); _parametriSetup.AggiornaParametro("TestoTrasparente", TextBox9.Text);
_parametriSetup.AggiornaParametro("TestoMargine", TextBox12.Text); _parametriSetup.AggiornaParametro("TestoMargine", TextBox12.Text);
_parametriSetup.AggiornaParametro("TestoPosizione", ComboBox1.Text); _parametriSetup.AggiornaParametro("TestoPosizione", ComboBox1.Text);
@ -519,7 +519,7 @@ public partial class MainForm
TextBox25.Text = "0"; TextBox25.Text = "0";
} }
TextBox4.Text = _parametriSetup.LeggiParametroString("TestoTesto"); Model.HorizontalText = _parametriSetup.LeggiParametroString("TestoTesto");
TextBox9.Text = _parametriSetup.LeggiParametroString("TestoTrasparente"); TextBox9.Text = _parametriSetup.LeggiParametroString("TestoTrasparente");
TextBox12.Text = _parametriSetup.LeggiParametroString("TestoMargine"); TextBox12.Text = _parametriSetup.LeggiParametroString("TestoMargine");
ComboBox1.Text = _parametriSetup.LeggiParametroString("TestoPosizione"); ComboBox1.Text = _parametriSetup.LeggiParametroString("TestoPosizione");
@ -611,7 +611,7 @@ public partial class MainForm
PicSettings.NomeData = false; PicSettings.NomeData = false;
} }
PicSettings.TestoFirmaStart = TextBox4.Text; PicSettings.TestoFirmaStart = Model.HorizontalText;
PicSettings.TestoFirmaStartV = TextBox29.Text; PicSettings.TestoFirmaStartV = TextBox29.Text;
PicSettings.DataPartenza = DateTimePicker1.Value; PicSettings.DataPartenza = DateTimePicker1.Value;
PicSettings.TestoOrario = TextBox18.Text; PicSettings.TestoOrario = TextBox18.Text;
@ -1198,7 +1198,7 @@ public partial class MainForm
ClsCreaImmagine.NomeData = false; ClsCreaImmagine.NomeData = false;
} }
ClsCreaImmagine.TestoFirmaStart = TextBox4.Text; ClsCreaImmagine.TestoFirmaStart = Model.HorizontalText;
ClsCreaImmagine.TestoFirmaStartV = TextBox29.Text; ClsCreaImmagine.TestoFirmaStartV = TextBox29.Text;
ClsCreaImmagine.DataPartenza = DateTimePicker1.Value; ClsCreaImmagine.DataPartenza = DateTimePicker1.Value;
ClsCreaImmagine.TestoOrario = TextBox18.Text; ClsCreaImmagine.TestoOrario = TextBox18.Text;

4
imagecatalog/Program.cs
View file

@ -67,9 +67,9 @@ namespace ImageCatalog_2
ServiceProvider = serviceCollection.BuildServiceProvider(); ServiceProvider = serviceCollection.BuildServiceProvider();
var mainForm = ServiceProvider.GetRequiredService<MainForm>(); var mainForm = ServiceProvider.GetRequiredService<MainForm>();
var mainViewModel = ServiceProvider.GetRequiredService<DataModel>(); //var mainViewModel = ServiceProvider.GetRequiredService<DataModel>();
mainForm.Model = mainViewModel; //mainForm.Model = mainViewModel;
Application.Run(mainForm); Application.Run(mainForm);
} }