Added the possibility to import a "Template" when there is already Bl…

…ocks (#30)
Leo-Corporation · Nov 5, 2021 · a37cdbf · a37cdbf
1 parent 435d928
commit a37cdbf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/Datalya/Classes/BlockTemplate.cs b/Datalya/Classes/BlockTemplate.cs
@@ -68,7 +68,10 @@ public static void Import(string filePath, bool fromNew = false)
 
 			if (!fromNew)
 			{
-				Global.CurrentDataBase.Blocks = template.Blocks; // Set 
+				for (int i = 0; i < template.Blocks.Count; i++)
+				{
+					Global.CurrentDataBase.Blocks.Add(template.Blocks[i]); // Set 
+				}
 			}
 			else
 			{

diff --git a/Datalya/Pages/CreatorPage.xaml.cs b/Datalya/Pages/CreatorPage.xaml.cs
@@ -165,22 +165,15 @@ internal void SaveChanges()
 
 		private void ImportBlockBtn_Click(object sender, RoutedEventArgs e)
 		{
-			if (Global.CurrentDataBase.Blocks.Count == 0)
+			OpenFileDialog openFileDialog = new()
 			{
-				OpenFileDialog openFileDialog = new()
-				{
-					Filter = $"{Properties.Resources.Template}|*.datalyabt",
-					Title = Properties.Resources.ImportTemplate
-				}; // Create OpenFileDialog
+				Filter = $"{Properties.Resources.Template}|*.datalyabt",
+				Title = Properties.Resources.ImportTemplate
+			}; // Create OpenFileDialog
 
-				if (openFileDialog.ShowDialog() ?? true)
-				{
-					BlockTemplateManager.Import(openFileDialog.FileName); // Import
-				}
-			}
-			else
+			if (openFileDialog.ShowDialog() ?? true)
 			{
-				MessageBox.Show(Properties.Resources.CannotImportTemplateBlockExists, Properties.Resources.Datalya, MessageBoxButton.OK, MessageBoxImage.Error); // Show message
+				BlockTemplateManager.Import(openFileDialog.FileName); // Import
 			}
 		}