diff --git a/imagecatalog/DataModel.cs b/imagecatalog/DataModel.cs index 99d7dfd..1a6c349 100644 --- a/imagecatalog/DataModel.cs +++ b/imagecatalog/DataModel.cs @@ -1,4 +1,5 @@ -using System; +using ImageCatalog_2.Services; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; @@ -9,6 +10,11 @@ namespace ImageCatalog_2 { public class DataModel : ViewModelBase { + private readonly ITestService _service; + public DataModel(ITestService testService) + { + _service = testService; + } private string _sourcePath; diff --git a/imagecatalog/MainForm.cs b/imagecatalog/MainForm.cs index 80b9eb5..320d0a6 100644 --- a/imagecatalog/MainForm.cs +++ b/imagecatalog/MainForm.cs @@ -33,11 +33,9 @@ namespace ImageCatalog { _service = testService; - Model = new DataModel(); - InitializeComponent(); - bindingSource1.DataSource = Model; + BindControls(); @@ -199,6 +197,7 @@ namespace ImageCatalog private void Form1_Load(object sender, EventArgs e) { + bindingSource1.DataSource = Model; Application.EnableVisualStyles(); setDefaults(); /* TODO ERROR: Skipped IfDirectiveTrivia */ diff --git a/imagecatalog/Program.cs b/imagecatalog/Program.cs index 9d7da28..7cd5ffb 100644 --- a/imagecatalog/Program.cs +++ b/imagecatalog/Program.cs @@ -19,7 +19,12 @@ namespace ImageCatalog_2 ServiceProvider = serviceCollection.BuildServiceProvider(); - Application.Run(ServiceProvider.GetRequiredService()); + var mainForm = ServiceProvider.GetRequiredService(); + var mainViewModel = ServiceProvider.GetRequiredService(); + + mainForm.Model = mainViewModel; + + Application.Run(mainForm); } private static void ConfigureServices(ServiceCollection services) @@ -27,6 +32,8 @@ namespace ImageCatalog_2 // Register your services here services.AddTransient(); + services.AddTransient(); + // Register your forms services.AddTransient(); }