Moved startup popup and load file from argument to on content rendered

PixiEditor/Models/IO/Importer.cs

@@ -31,5 +31,10 @@ namespace PixiEditor.Models.IO
         {
             return BinarySerialization.ReadFromBinaryFile<SerializableDocument>(path).ToDocument();
         }
+
+        public static bool IsSupportedFile(string path)
+        {
+            return path.EndsWith(".pixi") || path.EndsWith(".png") || path.EndsWith(".jpg") || path.EndsWith(".jpeg");
+        }
     }
 }

PixiEditor/ViewModels/ViewModelMain.cs

@@ -56,6 +56,7 @@ namespace PixiEditor.ViewModels
         public RelayCommand SelectColorCommand { get; set; }
         public RelayCommand RemoveSwatchCommand { get; set; }
         public RelayCommand SaveDocumentCommand { get; set; }
+        public RelayCommand OnStartupCommand { get; set; }
 
 
         private double _mouseXonCanvas;
@@ -208,6 +209,7 @@ namespace PixiEditor.ViewModels
             SelectColorCommand = new RelayCommand(SelectColor);
             RemoveSwatchCommand = new RelayCommand(RemoveSwatch);
             SaveDocumentCommand = new RelayCommand(SaveDocument, DocumentIsNotNull);
+            OnStartupCommand = new RelayCommand(OnStartup);
             ToolSet = new ObservableCollection<Tool> {new MoveTool(), new PenTool(), new SelectTool(), new FloodFill(), new LineTool(),
             new CircleTool(), new RectangleTool(), new EarserTool(), new ColorPickerTool(), new BrightnessTool()};            
             ShortcutController = new ShortcutController
@@ -249,6 +251,19 @@ namespace PixiEditor.ViewModels
             Current = this;
         }
 
+        private void OnStartup(object parameter)
+        {
+            var lastArg = Environment.GetCommandLineArgs().Last();
+            if (Importer.IsSupportedFile(lastArg) && File.Exists(lastArg))
+            {
+                Open(lastArg);
+            }
+            else
+            {
+                OpenNewFilePopup(null);
+            }
+        }
+
         private void BitmapManager_DocumentChanged(object sender, Models.Events.DocumentChangedEventArgs e)
         {
             e.NewDocument.DocumentSizeChanged += ActiveDocument_DocumentSizeChanged;
@@ -275,6 +290,19 @@ namespace PixiEditor.ViewModels
             }
         }
 
+        private void Open(string path)
+        {
+            if (path.EndsWith(".pixi"))
+            {
+                OpenDocument(path);
+            }
+            else
+            {
+                OpenFile(path);
+            }
+            RecenterZoombox = !RecenterZoombox;
+        }
+
         private void OpenDocument(string path)
         {
             BitmapManager.ActiveDocument = Importer.ImportDocument(path);
@@ -408,7 +436,10 @@ namespace PixiEditor.ViewModels
 
         public void Deselect(object parameter)
         {
-            ActiveSelection.Clear();
+            if (ActiveSelection != null)
+            {
+                ActiveSelection.Clear();
+            }
         }
 
         private bool SelectionIsNotEmpty(object property)

PixiEditor/Views/MainWindow.xaml

@@ -39,7 +39,7 @@
             <cmd:EventToCommand Command="{Binding KeyDownCommand}" PassEventArgsToCommand="True"/>
         </i:EventTrigger>
         <i:EventTrigger EventName="ContentRendered">
-            <i:InvokeCommandAction Command="{Binding OpenNewFilePopupCommand}"/>
+            <i:InvokeCommandAction Command="{Binding OnStartupCommand}"/>
         </i:EventTrigger>
     </i:Interaction.Triggers>
     <Grid Name="mainGrid" Margin="5">