Dr16issues, starting to solve several issues that arose with Dragon 16

src/natlinkcore/configure/natlinkconfig_gui.py

@@ -1,4 +1,4 @@
-#pylint:disable=W0621, W0703
+#pylint:disable=W0621, W0703, W0603
 import sys
 import platform
 
@@ -116,7 +116,7 @@ def OpenNatlinkConfig(values, event):
 try:
     while True:
         event, values = window.read()
-        if (event == '-WINDOW CLOSE ATTEMPTED-' or event == 'Exit') and not Thread_Running:
+        if (event in ['-WINDOW CLOSE ATTEMPTED-', 'Exit']) and not Thread_Running:
             break
         # Hidden Columns logic
         # TODO: if project is enabled, update the project state to enabled.
@@ -140,7 +140,7 @@ def OpenNatlinkConfig(values, event):
             Thread_Running = not Thread_Running
 
         elif Thread_Running:
-            choice = sg.popup(f'Please Wait: Pip install is in progress', keep_on_top=True, custom_text=('Wait','Force Close'))
+            choice = sg.popup('Please Wait: Pip install is in progress', keep_on_top=True, custom_text=('Wait','Force Close'))
             if choice == 'Force Close':
                 break
 

src/natlinkcore/configure/natlinkconfigfunctions.py

@@ -8,7 +8,7 @@
 #   Quintijn Hoogenboom, January 2008 (...), August 2022
 #
 
-#pylint:disable=C0302, W0702, R0904, C0116, W0613, R0914, R0912
+#pylint:disable=C0302, W0702, R0904, C0116, W0613, R0914, R0912, R1732, W1514, W0107
 """With the functions in this module Natlink can be configured.
 
 These functions are called in different ways:
@@ -308,6 +308,44 @@ def disable_unimacro(self, arg=None):
         self.config_remove('directories', 'unimacrodirectory')  # could still be there...
         self.status.refresh()
 
+    ### Dragonfly:
+
+    def enable_dragonfly(self, arg):
+        dragonfly_user_dir = self.status.getDragonflyUserDirectory()
+        if dragonfly_user_dir and isdir(dragonfly_user_dir):
+            print(f'DragonflyUserDirectory is already defined: "{dragonfly_user_dir}"\n\tto change, first clear (option "D") and then set again')
+            print('\nWhen you want to upgrade Dragonfly, also first clear ("D"), then choose this option ("d") again.\n')
+            return
+
+        df_dir = self.status.getDragonflyDirectory()
+        if df_dir:
+            print('==== instal and/or update dragonfly2====\n')            
+            try:
+                subprocess.check_call([sys.executable, "-m", "pip", "install", "--upgrade", "dragonfly2"])
+            except subprocess.CalledProcessError:
+                print('====\ncould not pip install --upgrade dragonfly2\n====\n')
+                return
+        else:
+            try:
+                subprocess.check_call([sys.executable, "-m", "pip", "install", "dragonfly2"])
+            except subprocess.CalledProcessError:
+                print('====\ncould not pip install dragonfly2\n====\n')
+                return
+        self.status.refresh()   # refresh status
+        df_dir = self.status.getDragonflyDirectory()
+
+        self.setDirectory('DragonflyUserDirectory', arg)
+        dragonfly_user_dir = self.config_get('dragonfly', 'dragonflyuserdirectory')
+        if not dragonfly_user_dir:
+            return
+
+
+    def disable_dragonfly(self, arg=None):
+        """disable dragonfly, do not expect arg
+        """
+        self.config_remove('directories', 'dragonflyuserdirectory')  # could still be there...
+        self.status.refresh()
+
 
     def enable_vocola(self, arg):
         """enable vocola, by setting arg (prompting if False), and other settings

src/natlinkcore/natlinkstatus.py

@@ -138,7 +138,7 @@ class NatlinkStatus(metaclass=singleton.Singleton):
 
     """
     known_directory_options = ['userdirectory', 'dragonflyuserdirectory',
-                               'unimacrodirectory', 
+                               'unimacrodirectory', 'unimacrogrammarsdirectory',
                                'vocoladirectory', 'vocolagrammarsdirectory']
 
     def __init__(self):
@@ -165,6 +165,9 @@ def __init__(self):
         ## Dragonfly
         self.DragonflyDirectory = None
         self.DragonflyUserDirectory = None
+        ## dtactions
+        self.DtactionsDirectory = None
+
         ## AutoHotkey:
         self.AhkUserDir = None
         self.AhkExeDir = None
@@ -500,12 +503,12 @@ def getDragonflyDirectory(self):
         if self.DragonflyDirectory is not None:
             return self.DragonflyDirectory
         try:
-            import dragonfly
+            import dragonfly2
         except ImportError:
             self.DragonflyDirectory = ""
             return ""
 
-        self.DragonflyDirectory = str(Path(dragonfly.__file__).parent)
+        self.DragonflyDirectory = str(Path(dragonfly2.__file__).parent)
         return self.DragonflyDirectory
 
 
@@ -597,6 +600,20 @@ def getVocolaGrammarsDirectory(self):
         self.VocolaGrammarsDirectory = voc_grammars_dir
         return voc_grammars_dir
 
+    def getDtactionsDirectory(self):
+        """dtactions directory should be found with an import (like getUnimacroDirectory)
+        """
+
+        if self.DtactionsDirectory is not None:
+            return self.DtactionsDirectory
+        try:
+            import dtactions
+        except ImportError:
+            self.DtactionsDirectory = ""
+            return ""
+        self.DtactionsDirectory = dtactions.__path__[-1]
+        return self.DtactionsDirectory
+
     def getAhkUserDir(self):
         return self.getAhkUserDirFromIni()
 
@@ -733,6 +750,7 @@ def getNatlinkStatusDict(self):
                     'UserDirectory',
                     'DragonflyDirectory', 'DragonflyUserDirectory',
                     'ExtraGrammarDirectories',
+                    'DtactionsDirectory',
                     'InstallVersion',
                     # 'IncludeUnimacroInPythonPath',
                     'AhkExeDir', 'AhkUserDir']:
@@ -803,7 +821,7 @@ def getNatlinkStatusString(self):
                 self.appendAndRemove(L, D, key)
         else:
             self.appendAndRemove(L, D, 'unimacroIsEnabled', "---Unimacro is disabled")
-            for key in ('UnimacroUserDirectory', 'UnimacroDirectory'):
+            for key in ('UnimacroUserDirectory', 'UnimacroGrammarsDirectory', 'UnimacroDirectory'):
                 del D[key]
         ##  UserDirectory:
         if D['userIsEnabled']: