- Fix Save/Load mechanism

Author: ehsan-torabi

controlFunctions.go

@@ -201,14 +201,17 @@ func addButtonFunction() {
 	}
 	dialog.ShowError(fmt.Errorf("please enter valid label"), Application.mainWindow)
 }
-func applyProjectSetting() {
+func applyProjectSetting(withInitial bool) {
 	rowInput.Disable()
 	colInput.Disable()
 	flatMatrixCheck.Disable()
 	matlabSaveCheck.Disable()
 	oneHotEncodingSaveCheck.Disable()
 	Options.SettingsSaved = true
-	InitializeTemps()
+	if withInitial {
+		InitializeTemps()
+	}
+
 }
 func resetProjectSetting() {
 	dialog.ShowConfirm("Warning", "Are you sure you want to do that?\nthis is delete your added matrix if you dont saves it. ",
@@ -279,8 +282,11 @@ func loadProjectFile(reader io.ReadCloser) error {
 	}
 	Options = SavedProject.Options
 	TempData = SavedProject.TempData
+	copy(TempData.TempMatrix, SavedProject.TempData.TempMatrix)
+	copy(TempData.TempTarget, SavedProject.TempData.TempTarget)
 	TempData.buffer.Write(SavedProject.Buffer)
 	OneHotDictionary = SavedProject.OneHotDictionary
+	copy(OneHotDictionary.Values, SavedProject.OneHotDictionary.Values)
 	err = countValue.Set(SavedProject.CounterValue)
 	if err != nil {
 		log.Println(err)
@@ -329,7 +335,7 @@ func loadProjectFileFunction() {
 						dialog.ShowError(fmt.Errorf("error loading project file"), Application.mainWindow)
 						return
 					}
-					applyProjectSetting()
+					applyProjectSetting(false)
 				}
 
 			}, Application.mainWindow)
@@ -339,7 +345,7 @@ func loadProjectFileFunction() {
 				dialog.ShowError(fmt.Errorf("error loading project file"), Application.mainWindow)
 				return
 			}
-			applyProjectSetting()
+			applyProjectSetting(false)
 			statusLabel.Text = "Project loaded!"
 			addLabelAnimation(statusLabel)
 		}

mainWidgets.go

@@ -23,9 +23,9 @@ var (
 	targetFileEntry = widget.NewEntry()
 	openPaint       = widget.NewButtonWithIcon("OpenPaint", theme.WindowMaximizeIcon(), openPaintWindowOperation)
 	changePath      = widget.NewButtonWithIcon("Browse", theme.FolderIcon(), browseOperation)
-	saveBtn         = widget.NewButtonWithIcon("Save File", theme.DocumentSaveIcon(), saveOperation)
+	saveBtn         = widget.NewButtonWithIcon("Save file", theme.DocumentSaveIcon(), exportFileOperation)
 	input           = widget.NewEntry()
-	exportBtn       = widget.NewButtonWithIcon("Export PNG", theme.FileImageIcon(), expertOperation)
+	exportBtn       = widget.NewButtonWithIcon("Export PNG", theme.FileImageIcon(), expertPNGOperation)
 	flatMatrixCheck = widget.NewCheck("Flat Matrix", func(b bool) {
 		Options.FlatMatrix = b
 	})
@@ -38,8 +38,13 @@ var (
 		addButtonFunction()
 		Application.paintObject.Clear()
 	})
-	saveOptionsBtn  = widget.NewButtonWithIcon("Save Settings", theme.SettingsIcon(), saveProjectButtonFunction)
-	resetProjectBtn = widget.NewButtonWithIcon("Reset Project", theme.ContentClearIcon(), resetProjectButtonFunction)
+	saveOptionsBtn = widget.NewButtonWithIcon("Save Settings", theme.SettingsIcon(), func() {
+		applyProjectSetting(true)
+	})
+	resetProjectBtn = widget.NewButtonWithIcon("Reset Project", theme.ContentClearIcon(), resetProjectSetting)
+	toolbar         = widget.NewToolbar(
+		widget.NewToolbarAction(theme.DocumentSaveIcon(), saveProjectFileFunction),
+		widget.NewToolbarAction(theme.ContentUndoIcon(), loadProjectFileFunction))
 )
 
 // Layout containers
@@ -74,6 +79,7 @@ var (
 	)
 
 	bottomContainer = container.NewVBox(
+		container.NewPadded(toolbar),
 		container.NewPadded(settingsContainer),
 		container.NewPadded(actionContainer),
 		container.NewPadded(labelContainer),