resolved merge conflict in readme

.gitignore

@@ -0,0 +1,131 @@
+
+# Created by https://www.gitignore.io/api/python
+# Edit at https://www.gitignore.io/?templates=python
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don’t work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# End of https://www.gitignore.io/api/python
+ 

README.md

@@ -1,7 +1,7 @@
 # LinVAM
 Linux Voice Activated Macro
 ## Status
-This project is currently a work-in-progress and is minimally functional.
+This project is currently a work-in-progress and is minimally functional only for english.
 
 Utilising Pocketsphinx, a lightweight voice to text engine you can specify voice commands for the tool to recognise and actions to perform.
 
@@ -19,6 +19,7 @@ Known bugs and planned additions
 ## Install
 - $ pip3 install PyQt5
 - $ pip3 install python3-xlib
+- $ pip3 install pyaudio
 - $ pip3 install pocketsphinx
 - $ sudo apt-get install swig3.0
 - $ sudo ln -s /usr/bin/swig3.0 /usr/bin/swig
@@ -27,7 +28,7 @@ Known bugs and planned additions
 This script must be run with root privilege because it must hook and simulate input devices such as keyboard, mouse etc.
 - $ cd LinVAM
 - $ xhost +
-- $ sudo python3 ./main.py
+- $ sudo ./main.py
 
 ### Profiles
 Multiple profiles are supported.  To create a new profile for a specific task/game click new and the main profile editor window will be displayed

main.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 from PyQt5.QtWidgets import *
@@ -10,6 +11,7 @@ import pickle
 import time
 import keyboard
 import threading
+import signal
 
 class MainWnd(QWidget):
     def __init__(self, p_parent = None):
@@ -25,6 +27,7 @@ class MainWnd(QWidget):
         self.ui.listeningChk.stateChanged.connect(self.slotListeningEnabled)
         self.ui.ok.clicked.connect(self.slotOK)
         self.ui.cancel.clicked.connect(self.slotCancel)
+        signal.signal(signal.SIGINT, signal.SIG_DFL)
 
         if self.loadFromDatabase() > 0 :
         # if self.loadTestProfiles() > 0: