bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- for auto-completer, now clicking an entry in the completer popup will select that entry and insert it

Browse Source
This commit is contained in:
Marius Stanciu
2020-01-02 05:06:08 +02:00
committed by Marius
parent fd9d18b52b
commit 6f5a775388
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing.
2.01.2020 2.01.2020
- started to rework the NCC Tool GUI in preparation for adding a Tool DB feature - started to rework the NCC Tool GUI in preparation for adding a Tool DB feature
- for auto-completer, now clicking an entry in the completer popup will select that entry and insert it
1.01.2020 1.01.2020

15
flatcamGUI/GUIElements.py
View File

@@ -794,12 +794,17 @@ class FCTextAreaExtended(QtWidgets.QTextEdit):
self.completer.setModel(self.model) self.completer.setModel(self.model)
self.set_model_data(keyword_list=[]) self.set_model_data(keyword_list=[])
self.completer.insertText.connect(self.insertCompletion) self.completer.insertText.connect(self.insertCompletion)
self.completer.popup().clicked.connect(self.insert_completion_click)
self.completer_enable = False self.completer_enable = False
def set_model_data(self, keyword_list): def set_model_data(self, keyword_list):
self.model.setStringList(keyword_list) self.model.setStringList(keyword_list)
def insert_completion_click(self):
self.completer.insertText.emit(self.completer.getSelected())
self.completer.setCompletionMode(QCompleter.PopupCompletion)
def insertCompletion(self, completion): def insertCompletion(self, completion):
tc = self.textCursor() tc = self.textCursor()
extra = (len(completion) - len(self.completer.completionPrefix())) extra = (len(completion) - len(self.completer.completionPrefix()))
@@ -958,6 +963,7 @@ class FCPlainTextAreaExtended(QtWidgets.QPlainTextEdit):
self.completer.setModel(self.model) self.completer.setModel(self.model)
self.set_model_data(keyword_list=[]) self.set_model_data(keyword_list=[])
self.completer.insertText.connect(self.insertCompletion) self.completer.insertText.connect(self.insertCompletion)
self.completer.popup().clicked.connect(self.insert_completion_click)
self.completer_enable = False self.completer_enable = False
@@ -972,6 +978,10 @@ class FCPlainTextAreaExtended(QtWidgets.QPlainTextEdit):
def set_model_data(self, keyword_list): def set_model_data(self, keyword_list):
self.model.setStringList(keyword_list) self.model.setStringList(keyword_list)
def insert_completion_click(self):
self.completer.insertText.emit(self.completer.getSelected())
self.completer.setCompletionMode(QCompleter.PopupCompletion)
def insertCompletion(self, completion): def insertCompletion(self, completion):
tc = self.textCursor() tc = self.textCursor()
extra = (len(completion) - len(self.completer.completionPrefix())) extra = (len(completion) - len(self.completer.completionPrefix()))
@@ -2370,10 +2380,15 @@ class _ExpandableTextEdit(QTextEdit):
self.completer.setModel(self.model) self.completer.setModel(self.model)
self.set_model_data(keyword_list=[]) self.set_model_data(keyword_list=[])
self.completer.insertText.connect(self.insertCompletion) self.completer.insertText.connect(self.insertCompletion)
self.completer.popup().clicked.connect(self.insert_completion_click)
def set_model_data(self, keyword_list): def set_model_data(self, keyword_list):
self.model.setStringList(keyword_list) self.model.setStringList(keyword_list)
def insert_completion_click(self):
self.completer.insertText.emit(self.completer.getSelected())
self.completer.setCompletionMode(QCompleter.PopupCompletion)
def insertCompletion(self, completion): def insertCompletion(self, completion):
tc = self.textCursor() tc = self.textCursor()
extra = (len(completion) - len(self.completer.completionPrefix())) extra = (len(completion) - len(self.completer.completionPrefix()))