unimacro 4.1.7.dev1__tar.gz → 4.1.7.dev3__tar.gz

{unimacro-4.1.7.dev1 → unimacro-4.1.7.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unimacro
-Version: 4.1.7.dev1
+Version: 4.1.7.dev3
 Summary: Unimacro __init__
 Author-email: "Quintijn Hoogenboom (maintainer)" <q.hoogenboom@antenna.nl>
 Requires-Python: >=3.10
@@ -20,7 +20,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: dtactions ~= 1.6.4.dev3
 Requires-Dist: debugpy >= 1.2.0
 Requires-Dist: pywin32 >= 304
-Requires-Dist: natlinkcore >= 5.4.1
+Requires-Dist: natlinkcore ~= 5.4.2.dev1
 Requires-Dist: FreeSimpleGUI>=5.1.0
 Requires-Dist: pyenvutils ; extra == "dev"
 Requires-Dist: entry-point-inspector ; extra == "dev"

{unimacro-4.1.7.dev1 → unimacro-4.1.7.dev3}/pyproject.toml

@@ -1,3 +1,12 @@
+
+
+
+
+
+
+
+
+
 [build-system]
 requires = ["flit_core >=2,<4"]
 build-backend = "flit_core.buildapi"
@@ -6,7 +15,7 @@ build-backend = "flit_core.buildapi"
 name = "unimacro"
 authors = [{name = "Quintijn Hoogenboom (maintainer)", email = "q.hoogenboom@antenna.nl"}]
 dynamic = ["description"]
-version = "4.1.7.dev1"
+version = "4.1.7.dev3"
 requires-python = ">=3.10"
 readme = "README.md"
 
@@ -19,7 +28,7 @@ readme = "README.md"
 dependencies = ["dtactions ~= 1.6.4.dev3",
         "debugpy >= 1.2.0",
 		"pywin32 >= 304",
-		"natlinkcore >= 5.4.1",
+		"natlinkcore ~= 5.4.2.dev1",
         "FreeSimpleGUI>=5.1.0"]
 		  		
 classifiers=[	"Development Status :: 2 - Pre-Alpha",

{unimacro-4.1.7.dev1 → unimacro-4.1.7.dev3}/src/unimacro/UnimacroGrammars/_folders.py

@@ -2372,7 +2372,7 @@ def makeFromTemplateAndExecute(unimacrofolder, templatefile, unimacrogrammarsfol
     Text = rwfile.readAnything(os.path.join(unimacrofolder, templatefile))
     # print(f'OldText: {Text}')
     for orig, toreplace in  [('$prompt$', prompt), ('$default$', default), ('$text$', text),
-         ('$inifile$', inifile) , ('$value$', value), ('$section$', section),
+         ('$inifile$', inifile) , ('$value$', value), ('$section$', section), 
          ('"$pausetime$"', str(pausetime))]:
         Text = Text.replace(orig, toreplace)
     # print(f'newText: {Text}')
@@ -2384,8 +2384,10 @@ def makeFromTemplateAndExecute(unimacrofolder, templatefile, unimacrogrammarsfol
     else:
         outputfile = exefile + 'w'
         pythonexe = Path(sys.prefix)/'pythonw.exe'
+   
+    unimacrodatafolder = Path(status.getUnimacroDataDirectory())
         
-    outputpath = os.path.join(unimacrogrammarsfolder, outputfile)
+    outputpath = unimacrodatafolder/outputfile
     rwfile.writeAnything(outputpath, Text)
     # print('wrote to: %s'% outputfile)
     # print(f'output dialog: {outputpath}, python: {pythonexe}')

{unimacro-4.1.7.dev1 → unimacro-4.1.7.dev3}/src/unimacro/natlinkutilsbj.py

@@ -2057,9 +2057,10 @@ noot mies
         
         commandDir = os.path.join(userDir,
                                         self.language +"_inifiles")
-        inifile = os.path.join(commandDir, inifile_stem + '.ini')
+        inifile_name = inifile_stem + '.ini'
+        inifile = os.path.join(commandDir, inifile_name)
         if not os.path.isfile(inifile):
-            print(f'\tCannot find inifile: {inifile}')
+            print(f'\n\tCannot find inifile: {inifile_name}')
             self.lookForExampleInifile(commandDir, inifile_stem + '.ini')
             if not os.path.isfile(inifile):
                 print(f'\tcannot find an example inifile for {inifile_stem}')
@@ -2076,7 +2077,7 @@ noot mies
             except KeyError:
                 commandWord = "edit"
             name = self.getName()
-            self.message(f'===Created new inifile for grammar "{inifile_stem}"\n===Please edit this file by calling the command "{commandWord} {name}"')
+            self.message(f'\tCreated new inifile: "{inifile}"\n\tYou can inspect and edit this file by calling the command "{commandWord} {name}"\n')
         self.inifile = inifile
         #self.ini = inivars.IniVars(self.inifile, repairErrors=1)
 
@@ -2160,10 +2161,10 @@ noot mies
         if not os.path.isfile(inifile):
             if inifileSamples:
                 sample = inifileSamples[0]
-                print('\ttake sample inifile: %s'% sample)
+                print('\tTake sample inifile: %s'% sample)
                 shutil.copyfile(sample, inifile)
             else:
-                print('could not find a valid sample inifile "%s" in directories: %s'%\
+                print('Could not find a valid sample inifile "%s" in directories: %s'%\
                         (fileName, sampleDirs))
 
     def TryToMakeDefaultInifile(self, commandDir, inifileName, language):

{unimacro-4.1.7.dev1 → unimacro-4.1.7.dev3}/src/unimacro/unimacrofoldersremembertemplate.py

@@ -4,7 +4,7 @@ is put in the _folders.ini config file.
 """
 #pylint:disable=W0621
 import time
-import PySimpleGUI as sg      
+import FreeSimpleGUI as sg      
 from dtactions import inivars
 
 prompt = """$prompt$"""  # readable text
@@ -12,15 +12,15 @@ text = """$text$"""          # input text, the key of the
 inifile = "$inifile$"
 section = "$section$"
 value = "$value$"
-title = "test"
 default = "$default$"
 pausetime = "$pausetime$"  # should be replaced by 0 or a positive int value
 
+title = f'Remember in "{section}"'
 
 
 def InputBox(text, prompt, title, default):
     """the dialog, which returns the wanted spoken form"""
-    layout = [[sg.Text(prompt)],      
+    layout = [[sg.Text(text)],      
                      [sg.InputText(default)],      
                      [sg.OK(), sg.Cancel()]]