PrEditor 0.6.0__py2.py3-none-any.whl → 0.7.0__py2.py3-none-any.whl

preditor/gui/codehighlighter.py

@@ -35,15 +35,15 @@ class CodeHighlighter(QSyntaxHighlighter):
         # stylesheets
         parent = self.parent()
         if parent and hasattr(parent, 'commentColor'):
-            return parent.commentColor()
+            return parent.commentColor
         return self._commentColor
 
     def setCommentColor(self, color):
         # set the color for the parent if possible because this doesn't support
         # stylesheets
         parent = self.parent()
-        if parent and hasattr(parent, 'setCommentColor'):
-            parent.setCommentColor(color)
+        if parent and hasattr(parent, 'commentColor'):
+            parent.commentColor = color
         self._commentColor = color
 
     def commentFormat(self):
@@ -127,15 +127,15 @@ class CodeHighlighter(QSyntaxHighlighter):
         # stylesheets
         parent = self.parent()
         if parent and hasattr(parent, 'keywordColor'):
-            return parent.keywordColor()
+            return parent.keywordColor
         return self._keywordColor
 
     def setKeywordColor(self, color):
         # set the color for the parent if possible because this doesn't support
         # stylesheets
         parent = self.parent()
-        if parent and hasattr(parent, 'setKeywordColor'):
-            parent.setKeywordColor(color)
+        if parent and hasattr(parent, 'keywordColor'):
+            parent.keywordColor = color
         self._keywordColor = color
 
     def keywordFormat(self):
@@ -150,15 +150,15 @@ class CodeHighlighter(QSyntaxHighlighter):
         # stylesheets
         parent = self.parent()
         if parent and hasattr(parent, 'resultColor'):
-            return parent.resultColor()
+            return parent.resultColor
         return self._resultColor
 
     def setResultColor(self, color):
         # set the color for the parent if possible because this doesn't support
         # stylesheets
         parent = self.parent()
-        if parent and hasattr(parent, 'setResultColor'):
-            parent.setResultColor(color)
+        if parent and hasattr(parent, 'resultColor'):
+            parent.resultColor = color
         self._resultColor = color
 
     def resultFormat(self):
@@ -191,15 +191,15 @@ class CodeHighlighter(QSyntaxHighlighter):
         # stylesheets
         parent = self.parent()
         if parent and hasattr(parent, 'stringColor'):
-            return parent.stringColor()
+            return parent.stringColor
         return self._stringColor
 
     def setStringColor(self, color):
         # set the color for the parent if possible because this doesn't support
         # stylesheets
         parent = self.parent()
-        if parent and hasattr(parent, 'setStringColor'):
-            parent.setStringColor(color)
+        if parent and hasattr(parent, 'stringColor'):
+            parent.stringColor = color
         self._stringColor = color
 
     def stringFormat(self):

preditor/gui/console.py

@@ -20,6 +20,7 @@ from Qt.QtWidgets import QAbstractItemView, QAction, QApplication, QTextEdit
 
 from .. import debug, settings, stream
 from ..streamhandler_helper import StreamHandlerHelper
+from . import QtPropertyInit
 from .codehighlighter import CodeHighlighter
 from .completer import PythonCompleter
 from .suggest_path_quotes_dialog import SuggestPathQuotesDialog
@@ -28,8 +29,14 @@ from .suggest_path_quotes_dialog import SuggestPathQuotesDialog
 class ConsolePrEdit(QTextEdit):
     # Ensure the error prompt only shows up once.
     _errorPrompted = False
-    # the color error messages are displayed in, can be set by stylesheets
-    _errorMessageColor = QColor(Qt.red)
+
+    # These Qt Properties can be customized using style sheets.
+    commentColor = QtPropertyInit('_commentColor', QColor(0, 206, 52))
+    errorMessageColor = QtPropertyInit('_errorMessageColor', QColor(Qt.red))
+    keywordColor = QtPropertyInit('_keywordColor', QColor(17, 154, 255))
+    resultColor = QtPropertyInit('_resultColor', QColor(128, 128, 128))
+    stdoutColor = QtPropertyInit('_stdoutColor', QColor(17, 154, 255))
+    stringColor = QtPropertyInit('_stringColor', QColor(255, 128, 0))
 
     def __init__(self, parent):
         super(ConsolePrEdit, self).__init__(parent)
@@ -39,12 +46,6 @@ class ConsolePrEdit(QTextEdit):
         # If populated, also write to this interface
         self.outputPipe = None
 
-        self._stdoutColor = QColor(17, 154, 255)
-        self._commentColor = QColor(0, 206, 52)
-        self._keywordColor = QColor(17, 154, 255)
-        self._stringColor = QColor(255, 128, 0)
-        self._resultColor = QColor(128, 128, 128)
-
         self._consolePrompt = '>>> '
         # Note: Changing _outputPrompt may require updating resource\lang\python.xml
         # If still using a #
@@ -356,28 +357,10 @@ class ConsolePrEdit(QTextEdit):
         # Restore the cursor position to its original location
         self.setTextCursor(currentCursor)
 
-    def commentColor(self):
-        return self._commentColor
-
-    def setCommentColor(self, color):
-        self._commentColor = color
-
     def completer(self):
         """returns the completer instance that is associated with this editor"""
         return self._completer
 
-    def errorMessageColor(self):
-        return self.__class__._errorMessageColor
-
-    def setErrorMessageColor(self, color):
-        self.__class__._errorMessageColor = color
-
-    def foregroundColor(self):
-        return self._foregroundColor
-
-    def setForegroundColor(self, color):
-        self._foregroundColor = color
-
     def executeString(self, commandText, filename='<ConsolePrEdit>', extraPrint=True):
         if self.clearExecutionTime is not None:
             self.clearExecutionTime()
@@ -687,12 +670,6 @@ class ConsolePrEdit(QTextEdit):
                         completer.wasCompletingCounter = 0
                         completer.wasCompleting = False
 
-    def keywordColor(self):
-        return self._keywordColor
-
-    def setKeywordColor(self, color):
-        self._keywordColor = color
-
     def moveToHome(self):
         """moves the cursor to the home location"""
         mode = QTextCursor.MoveAnchor
@@ -718,12 +695,6 @@ class ConsolePrEdit(QTextEdit):
     def prompt(self):
         return self._consolePrompt
 
-    def resultColor(self):
-        return self._resultColor
-
-    def setResultColor(self, color):
-        self._resultColor = color
-
     def setCompleter(self, completer):
         """sets the completer instance for this widget"""
         if completer:
@@ -773,18 +744,6 @@ class ConsolePrEdit(QTextEdit):
         """Create a new line to show output text."""
         self.startPrompt(self._outputPrompt)
 
-    def stdoutColor(self):
-        return self._stdoutColor
-
-    def setStdoutColor(self, color):
-        self._stdoutColor = color
-
-    def stringColor(self):
-        return self._stringColor
-
-    def setStringColor(self, color):
-        self._stringColor = color
-
     def removeCurrentLine(self):
         self.moveCursor(QTextCursor.End, QTextCursor.MoveAnchor)
         self.moveCursor(QTextCursor.StartOfLine, QTextCursor.MoveAnchor)
@@ -833,9 +792,9 @@ class ConsolePrEdit(QTextEdit):
 
             charFormat = QTextCharFormat()
             if not error:
-                charFormat.setForeground(self.stdoutColor())
+                charFormat.setForeground(self.stdoutColor)
             else:
-                charFormat.setForeground(self.errorMessageColor())
+                charFormat.setForeground(self.errorMessageColor)
             self.setCurrentCharFormat(charFormat)
 
             # If showing Error Hyperlinks... Sometimes (when a syntax error, at least),

preditor/gui/errordialog.py

@@ -5,16 +5,19 @@ import os
 import traceback
 
 from Qt.QtCore import Qt
-from Qt.QtGui import QPixmap
+from Qt.QtGui import QColor, QPixmap
 from Qt.QtWidgets import QDialog
 from redminelib.exceptions import ImpersonateError
 
 from .. import __file__ as pfile
-from . import Dialog, loadUi
+from . import Dialog, QtPropertyInit, loadUi
 from .redmine_login_dialog import RedmineLoginDialog
 
 
 class ErrorDialog(Dialog):
+    # These Qt Properties can be customized using style sheets.
+    errorMessageColor = QtPropertyInit('_errorMessageColor', QColor(Qt.GlobalColor.red))
+
     def __init__(self, parent):
         super(ErrorDialog, self).__init__(parent)
 
@@ -40,8 +43,6 @@ class ErrorDialog(Dialog):
         self.ignoreButton.clicked.connect(self.close)
 
     def setText(self, exc_info):
-        from .console import ConsolePrEdit
-
         self.traceback_msg = "".join(traceback.format_exception(*exc_info))
         msg = (
             'The following error has occurred:<br>'
@@ -51,7 +52,7 @@ class ErrorDialog(Dialog):
             msg
             % {
                 'text': self.traceback_msg.split('\n')[-2],
-                'color': ConsolePrEdit._errorMessageColor.name(),
+                'color': self.errorMessageColor.name(),
             }
         )
 

preditor/gui/find_files.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import, print_function
 
-from Qt.QtCore import Qt
+from Qt.QtCore import Qt, Slot
 from Qt.QtGui import QIcon, QKeySequence
 from Qt.QtWidgets import QApplication, QShortcut, QWidget
 
@@ -54,6 +54,7 @@ class FindFiles(QWidget):
         self.show()
         self.uiFindTXT.setFocus()
 
+    @Slot()
     def find(self):
         find_text = self.uiFindTXT.text()
         context = self.uiContextSPN.value()

preditor/resource/stylesheet/Bright.css

@@ -50,7 +50,16 @@ DocumentEditor {
 	qproperty-paperDecorator: "white";
 }
 
-ConsolePrEdit{
+ConsolePrEdit, ErrorDialog {
+	qproperty-errorMessageColor: rgb(255, 0, 0);
+}
+
+ConsolePrEdit {
 	color: rgb(0,0,0);
 	background-color: rgb(255,255,255);
+	qproperty-commentColor: rgb(0, 206, 52);
+	qproperty-keywordColor: rgb(17, 154, 255);
+	qproperty-resultColor: rgb(128, 128, 128);
+	qproperty-stdoutColor: rgb(17, 154, 255);
+	qproperty-stringColor: rgb(255, 128, 0);
 }

preditor/resource/stylesheet/Dark.css

@@ -184,7 +184,16 @@ DocumentEditor {
 }
 
 
+ConsolePrEdit, ErrorDialog {
+  qproperty-errorMessageColor: rgb(255, 0, 0);
+}
+
 ConsolePrEdit {
   color: rgb(255, 255, 255);
   background-color: rgb(70, 70, 73);
+  qproperty-commentColor: rgb(0, 206, 52);
+  qproperty-keywordColor: rgb(17, 154, 255);
+  qproperty-resultColor: rgb(128, 128, 128);
+  qproperty-stdoutColor: rgb(17, 154, 255);
+  qproperty-stringColor: rgb(255, 128, 0);
 }

{preditor-0.6.0.dist-info → preditor-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PrEditor
-Version: 0.6.0
+Version: 0.7.0
 Summary: A python REPL and Editor and console based on Qt.
 Home-page: https://github.com/blurstudio/PrEditor.git
 Author: Blur Studio

{preditor-0.6.0.dist-info → preditor-0.7.0.dist-info}/RECORD

@@ -11,7 +11,6 @@ preditor/plugins.py,sha256=W3DfdDEE5DtEXOXioEyIe4tuIVV1V-RLcV8LoZJWpWU,1916
 preditor/prefs.py,sha256=BPtSsdv2yuiRpIaqEml9fxlVYKHNfqQ77hp5YIQRDBg,2172
 preditor/settings.py,sha256=DV9_DbJorEnhdIvW15E7h7PswlQUsy0UlA8bXUYN0og,2206
 preditor/streamhandler_helper.py,sha256=kiU6T9WqJ3JKTTKCa7IUU8brwK7zO5UUpEzLhEfKe44,1788
-preditor/version.py,sha256=EkMSrLesUk3YwILml18un292fCmaA26avBUvLZyjx5Y,142
 preditor/weakref.py,sha256=b--KomFAHcMWr3DEAIN2j3XxRhjDWKw0WABXyn1nxDg,12177
 preditor/cores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 preditor/cores/core.py,sha256=ZXB4bts05DMQtc-dtkk81chIWNqYXImMuWCYuUHwLdA,2389
@@ -21,14 +20,14 @@ preditor/delayable_engine/__init__.py,sha256=7GNnc2996zCzBtkB3U9Ic0EcXToVYrlewSM
 preditor/delayable_engine/delayables.py,sha256=GWxv4iTcqFeo7703SMrtotKx4cfq1ujJMNdpmtawPqc,2708
 preditor/gui/__init__.py,sha256=vie2aDVpGjrDYxK1H2pTVIgFjIk6B8nNf6rWNwCVJ3Y,3132
 preditor/gui/app.py,sha256=RRiaDpUdWYoVkCFThMfsSSFG63jRt7LKx2QOx8lSdK4,5810
-preditor/gui/codehighlighter.py,sha256=fYrEi2qzKmZcTOCv3qRymGAqC7z4bRzO9IGa6cn-LF4,7199
+preditor/gui/codehighlighter.py,sha256=3JxXZpZqN3KVZbQgSmO-JldSlf4zFQ0PojWwucTsy5U,7171
 preditor/gui/completer.py,sha256=T6fl_4xGVjVtGNuR6ajD1ngjEhrKR6tZ9zPJDYoKn8E,7379
-preditor/gui/console.py,sha256=jl-Sp65Qw6ZgZNxrKCkVI1jkryPbHjxx3fxDwRs1QAA,35712
+preditor/gui/console.py,sha256=qjr1OtAQ0dAUv4_u_j3Tz8XGRMwkdBAw3JYt46FzlwI,34876
 preditor/gui/dialog.py,sha256=Vw8Wflb2P3TngO8b-2suWP6JKHBVHdbGgYiRDKzYRlQ,7488
 preditor/gui/drag_tab_bar.py,sha256=5J-BSKQzS6_WuYxxGqmnUJr6AriTAvwfVK7Q3p7knrM,7933
 preditor/gui/editor_chooser.py,sha256=lv1eY0UJOulX1l-P-ZQEoneYz6BNX2VkXEbg3GUu1ag,1991
-preditor/gui/errordialog.py,sha256=FZzSykNtqgTZ-CKEsLFXfcw_k8zwx7g_aMaHbpnq2xI,3110
-preditor/gui/find_files.py,sha256=vh19jY571Z4E9IWSL4VyYcNJWYXzwxBHzBOzxWjI9QM,4223
+preditor/gui/errordialog.py,sha256=Re-rc4r24bwfUL3YkZGELNhAJD9B220xznbDcXC6EEg,3234
+preditor/gui/find_files.py,sha256=8_b0oQgL6u8U2FqpR2RzMChME9eYdJq3c3bgXXDeceY,4241
 preditor/gui/level_buttons.py,sha256=yPFIWKc0bgKLrP2XHyBqNuvvTnXZqGdtN_p27jSb1Og,11925
 preditor/gui/logger_window_handler.py,sha256=VTNhaoFUnConE3NHj9KaDZlVoifix8xCbCuN5Ozjz0M,1482
 preditor/gui/loggerwindow.py,sha256=zOIzq12ffLF0xp3oChP0bc7KB_4BJ8kK5Oy0gQSGRuI,51303
@@ -105,8 +104,8 @@ preditor/resource/img/subdirectory-arrow-right.png,sha256=PXmp15L0nBHgq_YJlG4WLd
 preditor/resource/img/text-search-variant.png,sha256=98uwrqOgxmraS1DJ8kJskr9_J7cF3e-niwVuBDqYinA,718
 preditor/resource/img/warning-big.png,sha256=z5QKX3DNLo_UDRKdjwtELbXL_JLf2zOwhkMPnIeu3vw,1065
 preditor/resource/lang/python.json,sha256=CXiQh0jcgd-OCrM-s9IF7s4o-g5WRA4vDaAyTRAxAQo,316
-preditor/resource/stylesheet/Bright.css,sha256=wxzpkhcOC9GzALb0NYAMASnZmXEe9urZBniHNImwTc4,2186
-preditor/resource/stylesheet/Dark.css,sha256=l3n9Z89JNlVDWKDtMTlipQkSSVPSJXbKd0tOMWnx7PQ,5085
+preditor/resource/stylesheet/Bright.css,sha256=SfnPRBqfqEL4IF8RGt9PpLX_cSiGpfG9Q2hE1F9uTsk,2480
+preditor/resource/stylesheet/Dark.css,sha256=Sige7beBhRyfav9_mXvn-LhksxbX0_WEgpZSKhmPavc,5384
 preditor/scintilla/__init__.py,sha256=AoUc-fcp2D3F10FDFsp_ZzUr4zioDH0mvdubSF7sRG0,523
 preditor/scintilla/documenteditor.py,sha256=6EfqJLcG2ZqzDUxvdtIrHyuVSF47goWpGrVEBMJN3pw,77919
 preditor/scintilla/finddialog.py,sha256=vcYPj74LbCy4KXdh0eJyOb8i31pJKgOZitKpgW4zhBM,2346
@@ -149,9 +148,9 @@ preditor/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 preditor/utils/cute.py,sha256=LfF8gXMAkkQAdo4mm6J9aVkDLwWZbE6prQ0moDbtCys,1045
 preditor/utils/stylesheets.py,sha256=EVWZNq3WnaRiyUPoYMKQo_dLEwbRyKu26b03I1JDA-s,1622
 preditor/utils/text_search.py,sha256=21kuSDTpLIPUcriB81WP1kWfzuDBuP13ZtHUtypP5jE,14218
-preditor-0.6.0.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-preditor-0.6.0.dist-info/METADATA,sha256=od__v42wWO_m7_ZSETaUIOJvup_rF_7czhcVDbd__AA,9278
-preditor-0.6.0.dist-info/WHEEL,sha256=joeZ_q2kZqPjVkNy_YbjGrynLS6bxmBj74YkvIORXVI,109
-preditor-0.6.0.dist-info/entry_points.txt,sha256=mpe0HFD_oIEBNPTJNyUEbmMV6Ivrp4EuYyZ34C5d_PU,519
-preditor-0.6.0.dist-info/top_level.txt,sha256=iX1_mrUOky_BQr2oG0l_MbEUYF6idyjiWSzu9z3irIw,9
-preditor-0.6.0.dist-info/RECORD,,
+preditor-0.7.0.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+preditor-0.7.0.dist-info/METADATA,sha256=DXT7s09fyqqvGN51fnGnuNpUfgTEbK_eTo26Vg9sIjU,9278
+preditor-0.7.0.dist-info/WHEEL,sha256=egKm5cKfE6OqlHwodY8Jjp4yqZDBXgsj09UsV5ojd_U,109
+preditor-0.7.0.dist-info/entry_points.txt,sha256=mpe0HFD_oIEBNPTJNyUEbmMV6Ivrp4EuYyZ34C5d_PU,519
+preditor-0.7.0.dist-info/top_level.txt,sha256=iX1_mrUOky_BQr2oG0l_MbEUYF6idyjiWSzu9z3irIw,9
+preditor-0.7.0.dist-info/RECORD,,

{preditor-0.6.0.dist-info → preditor-0.7.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

preditor/version.py

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