PrEditor 0.3.0__py2.py3-none-any.whl → 0.5.0__py2.py3-none-any.whl

preditor/gui/workbox_text_edit.py

@@ -32,6 +32,12 @@ class WorkboxTextEdit(WorkboxMixin, QTextEdit):
         highlight.setLanguage('Python')
         self.uiCodeHighlighter = highlight
 
+    def __auto_complete_enabled__(self):
+        pass
+
+    def __set_auto_complete_enabled__(self, state):
+        pass
+
     def __copy_indents_as_spaces__(self):
         """When copying code, should it convert leading tabs to spaces?"""
         return False
@@ -93,12 +99,25 @@ class WorkboxTextEdit(WorkboxMixin, QTextEdit):
         super(WorkboxTextEdit, self).__set_text__(text)
         self.setPlainText(text)
 
-    def __selected_text__(self, start_of_line=False):
+    def __selected_text__(self, start_of_line=False, selectText=False):
         cursor = self.textCursor()
 
+        # Get starting line number. Must set the cursor's position to the start of the
+        # selection, otherwise we may instead get the ending line number.
+        tempCursor = self.textCursor()
+        tempCursor.setPosition(tempCursor.selectionStart())
+        line = tempCursor.block().firstLineNumber()
+
         # If no selection, return the current line
         if cursor.selection().isEmpty():
-            return cursor.block().text()
+            text = cursor.block().text()
+
+            selectText = self.window().uiSelectTextACT.isChecked() or selectText
+            if selectText:
+                cursor.select(QTextCursor.LineUnderCursor)
+                self.setTextCursor(cursor)
+
+            return text, line
 
         # Otherwise return the selected text
         if start_of_line:
@@ -106,9 +125,10 @@ class WorkboxTextEdit(WorkboxMixin, QTextEdit):
             sc.setPosition(cursor.selectionStart())
             sc.movePosition(cursor.StartOfLine, sc.MoveAnchor)
             sc.setPosition(cursor.selectionEnd(), sc.KeepAnchor)
-            return sc.selection().toPlainText()
 
-        return self.textCursor().selection().toPlainText()
+            return sc.selection().toPlainText(), line
+
+        return self.textCursor().selection().toPlainText(), line
 
     def keyPressEvent(self, event):
         if self.process_shortcut(event):

preditor/gui/workboxwidget.py

@@ -37,6 +37,8 @@ class WorkboxWidget(WorkboxMixin, DocumentEditor):
         self.setLanguage('Python')
         # Default to unix newlines
         self.setEolMode(self.EolUnix)
+        if hasattr(self.window(), "setWorkboxFontBasedOnConsole"):
+            self.window().setWorkboxFontBasedOnConsole()
 
     def __auto_complete_enabled__(self):
         return self.autoCompletionSource() == self.AcsAll
@@ -142,19 +144,26 @@ class WorkboxWidget(WorkboxMixin, DocumentEditor):
     def __save__(self):
         self.save()
 
-    def __selected_text__(self, start_of_line=False):
+    def __selected_text__(self, start_of_line=False, selectText=False):
         line, s, end, e = self.getSelection()
         if line == -1:
             # Nothing is selected, return the current line of text
             line, index = self.getCursorPosition()
             txt = self.text(line)
+
+            lineLength = len(self.text(line).rstrip())
+            selectText = self.window().uiSelectTextACT.isChecked() or selectText
+
+            if selectText:
+                self.setSelection(line, 0, line, lineLength)
+
         elif start_of_line:
             ss = self.positionFromLineIndex(line, 0)
             ee = self.positionFromLineIndex(end, e)
             txt = self.text(ss, ee)
         else:
             txt = self.selectedText()
-        return self.regex.split(txt)[0]
+        return self.regex.split(txt)[0], line
 
     def __tab_width__(self):
         return self.tabWidth()
@@ -194,12 +203,25 @@ class WorkboxWidget(WorkboxMixin, DocumentEditor):
             fle.write(cls.__unix_end_lines__(txt))
 
     def keyPressEvent(self, event):
+        """Check for certain keyboard shortcuts, and handle them as needed,
+        otherwise pass the keyPress to the superclass.
+
+        NOTE! We handle the "shift+return" shortcut here, rather than the
+        QAction's shortcut, because the workbox will always intercept that
+        shortcut. So, we handle it here, and call the main window's
+        execSelected, which ultimately calls this workbox's __exec_selected__.
+
+        Also note, it would make sense to have ctrl+Enter also execute without
+        truncation, but no modifiers are registered when Enter is pressed (unlike
+        when Return is pressed), so this combination is not detectable.
+        """
         if self._software == 'softimage':
             DocumentEditor.keyPressEvent(self, event)
         else:
             if self.process_shortcut(event):
                 return
             else:
+                # Send regular keystroke
                 DocumentEditor.keyPressEvent(self, event)
 
     def initShortcuts(self):

preditor/scintilla/documenteditor.py

@@ -21,8 +21,9 @@ from functools import partial
 
 import six
 from PyQt5.Qsci import QsciScintilla
+from PyQt5.QtCore import QTextCodec
 from Qt import QtCompat
-from Qt.QtCore import Property, QFile, QPoint, Qt, QTextCodec, Signal
+from Qt.QtCore import Property, QFile, QPoint, Qt, Signal
 from Qt.QtGui import QColor, QFont, QFontMetrics, QIcon
 from Qt.QtWidgets import (
     QAction,
@@ -331,7 +332,6 @@ class DocumentEditor(QsciScintilla):
 
                 # Do not toggle comments on the last line if it contains no selection
                 if line != endLine or endCol:
-
                     if doWhich == "Comment":
                         self.setCursorPosition(line, indent)
                         self.insert(commentSpace)
@@ -431,7 +431,7 @@ class DocumentEditor(QsciScintilla):
         line, index = None, None
         if not self.hasSelectedText():
             line, index = self.getCursorPosition()
-            self.setSelection(line, 0, line, self.lineLength(line) - 2)
+            self.setSelection(line, 0, line, self.lineLength(line))
         return line, index
 
     def copy(self):

preditor/version.py

@@ -1,5 +1,5 @@
 # coding: utf-8
 # file generated by setuptools_scm
 # don't change, don't track in version control
-version = '0.3.0'
-version_tuple = (0, 3, 0)
+version = '0.5.0'
+version_tuple = (0, 5, 0)