qtvcp -macroTab: fix saving data to specified path

4am is too early to get this all right the first time it seems

Author: c-morley

docs/src/gui/qtvcp-widgets.adoc

@@ -1420,7 +1420,7 @@ If the keyword is present but the entries are missing, no images will be used.
 
 This _optional line must be the fourth_ line in the O-word file.
 
-It is a comma separated list of keyword and data, all of wgich are optional:
+It is a comma separated list of keyword and data, all of which are optional:
 
 *`LOAD:yes`*::
   Shows a load button.

lib/python/qtvcp/widgets/macro_widget.py

@@ -633,16 +633,15 @@ def getFileName(self):
         macro = self.stack.currentWidget().objectName()
         dirct = self[macro][2].get('PATH')
         defaultfilename = self[macro][2].get('DEFAULT')
+
         mess = {'NAME':self.load_dialog_code,'ID':'%s__' % self.objectName(),
             'TITLE':'Load Macro',
-            'FILENAME':'%s_data.txt' % str(self.stack.currentWidget().objectName()),
             'EXTENSIONS':'Text Files (*.txt);;ALL Files (*.*)'
             }
         if not defaultfilename is None:
             mess['FILENAME'] = defaultfilename
         else:
-            pass
-            #mess['FILENAME'] = '{}_data.txt'.format( str(self.stack.currentWidget().objectName()))
+            mess['FILENAME'] = '{}_data.txt'.format( str(self.stack.currentWidget().objectName()))
         if not dirct is None:
             mess['DIRECTORY'] = dirct
         STATUS.emit('dialog-request', mess)
@@ -651,9 +650,20 @@ def getFileName(self):
     # do this so the system is consistent and things like dialog
     # placement are done.
     def getSaveFileName(self):
+        macro = self.stack.currentWidget().objectName()
+        dirct = self[macro][2].get('PATH')
+        defaultfilename = self[macro][2].get('DEFAULT')
+
         mess = {'NAME':self.save_dialog_code,'ID':'%s__' % self.objectName(),
-            'TITLE':'Save Macro', 'FILENAME':'%s_data.txt' % str(self.stack.currentWidget().objectName()),
-            'EXTENSIONS':'Text Files (*.txt);;ALL Files (*.*)'}
+            'TITLE':'Save Macro',
+            'EXTENSIONS':'Text Files (*.txt);;ALL Files (*.*)'
+            }
+        if not defaultfilename is None:
+            mess['FILENAME'] = defaultfilename
+        else:
+            mess['FILENAME'] = '{}_data.txt'.format( str(self.stack.currentWidget().objectName()))
+        if not dirct is None:
+            mess['DIRECTORY'] = dirct
         STATUS.emit('dialog-request', mess)
 
     # process the STATUS return message from dialogs