add save as and save (existing file), show current save filepath in window title

Author: unitycoder

PixelArtTool/MainWindow.xaml

@@ -12,6 +12,7 @@
 		<CommandBinding Command="ApplicationCommands.Redo" Executed="Executed_Redo" CanExecute="CanExecute_Redo"/>
 		<CommandBinding Command="ApplicationCommands.Paste" Executed="Executed_Paste" CanExecute="CanExecute_Paste"/>
 		<CommandBinding Command="ApplicationCommands.Copy" Executed="Executed_Copy" CanExecute="CanExecute_Copy"/>
+		<CommandBinding Command="ApplicationCommands.Save" Executed="Executed_Save" CanExecute="CanExecute_Save"/>
 		<CommandBinding Command="ApplicationCommands.SaveAs" Executed="Executed_SaveAs" CanExecute="CanExecute_SaveAs"/>
 		<CommandBinding Command="ApplicationCommands.New" Executed="Executed_New" CanExecute="CanExecute_New"/>
 	</Window.CommandBindings>
@@ -21,6 +22,7 @@
 		<KeyBinding Command="ApplicationCommands.Paste" Gesture="Ctrl+V"/>
 		<KeyBinding Command="ApplicationCommands.Copy" Gesture="Ctrl+C"/>
 		<KeyBinding Command="ApplicationCommands.SaveAs" Gesture="Ctrl+Shift+S"/>
+		<KeyBinding Command="ApplicationCommands.Save" Gesture="Ctrl+S"/>
 		<KeyBinding Command="ApplicationCommands.New" Gesture="Ctrl+N"/>
 	</Window.InputBindings>
 	<Window.Resources>
@@ -108,7 +110,7 @@
 				<Button x:Name="btnNew" ToolTip="New (Ctrl+N)" Click="OnClearButton">
 					<Image Source="/Resources/Buttons/newimage.png"  Width="24" Height="24" RenderOptions.BitmapScalingMode="NearestNeighbor" />
 				</Button>
-				<Button x:Name="btnSave" ToolTip="Save as..(Ctrl+Shift+s)" Click="OnSaveButton">
+				<Button x:Name="btnSave" ToolTip="Save (Ctrl+S)" Click="OnSaveButton">
 					<Image Source="/Resources/Buttons/save.png" Width="24" Height="24" RenderOptions.BitmapScalingMode="NearestNeighbor" />
 				</Button>
 			</ToolBar>

PixelArtTool/MainWindow.xaml.cs

@@ -16,6 +16,8 @@ namespace PixelArtTool
 {
     public partial class MainWindow : Window, INotifyPropertyChanged
     {
+        string windowTitle = "";
+
         WriteableBitmap canvasBitmap;
         WriteableBitmap gridBitmap;
         WriteableBitmap outlineBitmap;
@@ -111,6 +113,10 @@ public ToolMode CurrentTool
             }
         }
 
+        // files
+        string saveFile = null;
+
+
         public MainWindow()
         {
             InitializeComponent();
@@ -123,6 +129,8 @@ public MainWindow()
 
         void Start()
         {
+            windowTitle = window.Title;
+
             // needed for binding
             DataContext = this;
 
@@ -594,7 +602,7 @@ void DrawingAreaMouseMoved(object sender, MouseEventArgs e)
             // snap preview rectangle to grid
             var left = x * canvasScaleX;
             var top = y * canvasScaleX;
-            rectPixelPos.Margin = new Thickness(89+left, 50+top, 0, 0);
+            rectPixelPos.Margin = new Thickness(89 + left, 50 + top, 0, 0);
 
         } // drawingareamousemoved
 
@@ -658,26 +666,47 @@ private void OnClearButton(object sender, RoutedEventArgs e)
             RegisterUndo();
             ClearImage(canvasBitmap, emptyRect, emptyPixels, emptyStride);
             UpdateOutline();
+            // reset title
+            window.Title = windowTitle;
+            saveFile = null;
         }
 
+        // if unsaved, this is same as save as.., if already saved, then overwrite current
         private void OnSaveButton(object sender, RoutedEventArgs e)
         {
             SaveFileDialog saveFileDialog = new SaveFileDialog();
-
             saveFileDialog.FileName = "pixel";
             saveFileDialog.DefaultExt = ".png";
             saveFileDialog.Filter = "PNG|*.png";
             UseDefaultExtensionAsFilterIndex(saveFileDialog);
 
-            if (saveFileDialog.ShowDialog() == true)
+            // save to current file
+            if (saveFile != null)// || doSaveAs==true)
             {
-                FileStream stream = new FileStream(saveFileDialog.FileName, FileMode.Create);
-                PngBitmapEncoder encoder = new PngBitmapEncoder();
-                encoder.Interlace = PngInterlaceOption.On;
-                encoder.Frames.Add(BitmapFrame.Create(canvasBitmap));
-                encoder.Save(stream);
-                stream.Close();
+                SaveImageAsPng(saveFile);
+            }
+            else // save as
+            {
+                if (saveFileDialog.ShowDialog() == true)
+                {
+                    SaveImageAsPng(saveFileDialog.FileName);
+                    // update window title
+                    window.Title = windowTitle + " - " + saveFileDialog.FileName;
+                    saveFile = saveFileDialog.FileName;
+                }
             }
+
+        }
+
+        void SaveImageAsPng(string file)
+        {
+            FileStream stream = new FileStream(file, FileMode.Create);
+            PngBitmapEncoder encoder = new PngBitmapEncoder();
+            encoder.Interlace = PngInterlaceOption.On;
+            encoder.Frames.Add(BitmapFrame.Create(canvasBitmap));
+            encoder.Save(stream);
+            stream.Close();
+
         }
 
         private void OpacitySliderValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
@@ -852,6 +881,7 @@ public void CanExecute_Copy(object sender, CanExecuteRoutedEventArgs e)
 
         public void Executed_SaveAs(object sender, ExecutedRoutedEventArgs e)
         {
+            saveFile = null;
             OnSaveButton(null, null);
         }
 
@@ -860,6 +890,16 @@ public void CanExecute_SaveAs(object sender, CanExecuteRoutedEventArgs e)
             e.CanExecute = true;
         }
 
+        public void Executed_Save(object sender, ExecutedRoutedEventArgs e)
+        {
+            OnSaveButton(null, null);
+        }
+
+        public void CanExecute_Save(object sender, CanExecuteRoutedEventArgs e)
+        {
+            e.CanExecute = true;
+        }
+
         public void Executed_New(object sender, ExecutedRoutedEventArgs e)
         {
             OnClearButton(null, null);