From 6a1a5cd6eb931f5f9316f89c680ca318f845a746 Mon Sep 17 00:00:00 2001 From: tassaron Date: Sun, 25 Jun 2017 15:31:42 -0400 Subject: --export commandline option overrides -i and -o to use saved fields from a project file --- src/mainwindow.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/mainwindow.py') diff --git a/src/mainwindow.py b/src/mainwindow.py index e4e4f38..203992b 100644 --- a/src/mainwindow.py +++ b/src/mainwindow.py @@ -229,7 +229,9 @@ class MainWindow(QtWidgets.QMainWindow): project += '.avp' # open a project from the commandline if not os.path.dirname(project): - project = os.path.join(os.path.expanduser('~'), project) + project = os.path.join( + self.settings.value("projectDir"), project + ) self.currentProject = project self.settings.setValue("currentProject", project) if os.path.exists(self.autosavePath): @@ -433,7 +435,8 @@ class MainWindow(QtWidgets.QMainWindow): self.showMessage( msg='Chosen filename matches a directory, which ' 'cannot be overwritten. Please choose a different ' - 'filename or move the directory.' + 'filename or move the directory.', + icon='Warning', ) return else: -- cgit v1.2.3