PrEditor 0.1.0__py2.py3-none-any.whl → 0.1.0rc2__py2.py3-none-any.whl

{PrEditor-0.1.0.dist-info → PrEditor-0.1.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PrEditor
-Version: 0.1.0
+Version: 0.1.0rc2
 Summary: A python REPL and Editor and console based on Qt.
 Home-page: https://github.com/blurstudio/PrEditor.git
 Author: Blur Studio
@@ -20,13 +20,13 @@ Requires-Python: !=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: Qt.py
-Requires-Dist: configparser >=4.0.2
-Requires-Dist: future >=0.18.2
-Requires-Dist: python-redmine >=2.1.1
-Requires-Dist: signalslot >=0.1.2
-Requires-Dist: importlib-metadata >=4.8.3 ; python_version >= "3.6"
+Requires-Dist: configparser (>=4.0.2)
+Requires-Dist: future (>=0.18.2)
+Requires-Dist: python-redmine (>=2.1.1)
+Requires-Dist: signalslot (>=0.1.2)
+Requires-Dist: importlib-metadata (>=4.8.3) ; python_version >= "3.6"
 Provides-Extra: cli
-Requires-Dist: click >=7.1.2 ; extra == 'cli'
+Requires-Dist: click (>=7.1.2) ; extra == 'cli'
 Requires-Dist: click-default-group ; extra == 'cli'
 Provides-Extra: dev
 Requires-Dist: black ; extra == 'dev'
@@ -38,7 +38,7 @@ Requires-Dist: pep8-naming ; extra == 'dev'
 Requires-Dist: pytest ; extra == 'dev'
 Requires-Dist: tox ; extra == 'dev'
 Provides-Extra: shortcut
-Requires-Dist: casement >=0.1.0 ; (platform_system == "Windows") and extra == 'shortcut'
+Requires-Dist: casement (>=0.1.0) ; (platform_system == "Windows") and extra == 'shortcut'
 
 # PrEditor
 

{PrEditor-0.1.0.dist-info → PrEditor-0.1.0rc2.dist-info}/RECORD

@@ -1,7 +1,7 @@
-preditor/__init__.py,sha256=JlIK0Gp7g7DsKbyt1c5PMD9-3EyeE7q7wv1sJmhrlYc,10585
+preditor/__init__.py,sha256=9EeqALlJ18tsP6kuvg8jk93dxRJp8WqFUHckxg6BVaQ,10323
 preditor/__main__.py,sha256=boRVSmxX6eF8EkzbePtCZbzdcaPseqVae4RPPLp3U1A,449
 preditor/about_module.py,sha256=KIvCxZrMLhm5TR6lYskM4Y9VctJ0QtSQD5Nu8Ip1CGY,5267
-preditor/cli.py,sha256=kyVr0V43KYSMLIEWXH54CA0ByFmPcpbFF-8cli6PVow,5300
+preditor/cli.py,sha256=xwW75wPHp-fjSQoZ5LXSvCJnQktt-LI5hfi07BhLvmg,5283
 preditor/contexts.py,sha256=xxRbOFORsvlG___EuSiKuT1aiKJvnkFojFZFZE0HPNk,5147
 preditor/debug.py,sha256=xcOslCByK7nSebh5DR6m-uC6uV9tuJBZu-JAAPBl8aA,9515
 preditor/enum.py,sha256=snG5V259dH9SI1kwBqZeZdhat36F1iAmIjYErosnDUg,23489
@@ -11,7 +11,7 @@ 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=xwUxqNB1me5mfO6PXPXd-gWwNTAl_-Idf0ktsITBEpU,142
+preditor/version.py,sha256=Ff7DlJZp6xbq0kxOMwDY4PnhOQdzCeVT0lbvo05JvRo,150
 preditor/weakref.py,sha256=b--KomFAHcMWr3DEAIN2j3XxRhjDWKw0WABXyn1nxDg,12177
 preditor/cores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 preditor/cores/core.py,sha256=ZXB4bts05DMQtc-dtkk81chIWNqYXImMuWCYuUHwLdA,2389
@@ -30,24 +30,21 @@ preditor/gui/editor_chooser.py,sha256=v82SPuxPgai3XiRWi9ypT0aRkbV6_IrbfBoAljM9pR
 preditor/gui/errordialog.py,sha256=FZzSykNtqgTZ-CKEsLFXfcw_k8zwx7g_aMaHbpnq2xI,3110
 preditor/gui/level_buttons.py,sha256=yPFIWKc0bgKLrP2XHyBqNuvvTnXZqGdtN_p27jSb1Og,11925
 preditor/gui/logger_window_handler.py,sha256=VTNhaoFUnConE3NHj9KaDZlVoifix8xCbCuN5Ozjz0M,1482
-preditor/gui/loggerwindow.py,sha256=o0CBcKBeNV0ZV9o_3g_Bk12LGhDZfS6FgsVGi9j3v5o,46366
+preditor/gui/loggerwindow.py,sha256=JM4PIEso1Sw4AtsIXzpvT52ALxVSsvbE4FXsEK3jnm8,42537
 preditor/gui/newtabwidget.py,sha256=5aCWn9xAl5h1oZACqVuEsOAbzKTS2RegrLI41gROC8A,1971
 preditor/gui/redmine_login_dialog.py,sha256=cMPBuecSZD5yjycNkMwHa1AbdwgGoyHvX8anIvWjEFo,1893
 preditor/gui/set_text_editor_path_dialog.py,sha256=6mbHAXEVQhaWyg0N67f54aZpd5fp6puGWzeM0tPepiU,2251
 preditor/gui/window.py,sha256=bZAEKQDM6V4aew1nlSTPyq_tG-_IoSvyXHcZxrdFMaE,6924
-preditor/gui/workbox_mixin.py,sha256=4tUiOWRFc0tEOAAo9BDD3idlkfO6t4VCuL4tklYNnTY,12543
-preditor/gui/workbox_text_edit.py,sha256=fJY7eo1bpMyzLri5DfdVb2vad9znJjBvzLkY34T8gb4,3678
-preditor/gui/workboxwidget.py,sha256=1uGSPZv3GxmOAIsA4oTaiPUHl003Yp6IA_rXanIToC4,8966
-preditor/gui/fuzzy_search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-preditor/gui/fuzzy_search/fuzzy_search.py,sha256=6npanW6aLmG_ezdHmpsKN7p2zwck_Qq6YUy9duCNN8Q,3595
-preditor/gui/group_tab_widget/__init__.py,sha256=KpQKkX_FyFQLy2UtBQcLoMuj0eRA7E_2-KXrTwPqA9k,12530
+preditor/gui/workbox_mixin.py,sha256=8Lk7zxM4sl6__28LDOlDpqDKhooqDQba9ZYPsikEFds,11174
+preditor/gui/workbox_text_edit.py,sha256=gc0QT--zX2Z3q-PAbod3eqjFDWQaoGQxWNygTfrEl5U,3890
+preditor/gui/workboxwidget.py,sha256=JZzM3HUmtaEcXOq6-rNucP0WV4ZwUhqqZMwR18fnk-w,9208
+preditor/gui/group_tab_widget/__init__.py,sha256=Jh3QeDbH7UhIELJAxZ7F7r6dc-pq4_82lmp03cej96g,12157
 preditor/gui/group_tab_widget/grouped_tab_menu.py,sha256=lopd3mjHJIE_5xLdlZL0ghuBzsYo36vO1OZE6L6tqbI,1288
-preditor/gui/group_tab_widget/grouped_tab_models.py,sha256=zlmbcv3JAC5BzjKpm4CM7Hobibm1T_3GjaPoWIQbXiQ,3970
 preditor/gui/group_tab_widget/grouped_tab_widget.py,sha256=EwzYVqhJaBaYS9tdd4FXUl-PxjplWtOi7f0t99De_bw,2803
 preditor/gui/group_tab_widget/one_tab_widget.py,sha256=PdZAXjmV9oTHakh8aFYRlLnfwcoT459vQWVKgpZZx4Y,1971
 preditor/gui/ui/editor_chooser.ui,sha256=cYSVHK0A4-zst6JyDkrBZK9qcAontbhV4Mmnw5ps72E,2736
 preditor/gui/ui/errordialog.ui,sha256=H1wJJVU1t7kbnYkzGtGa8SBVpKjesJG_0imdBkJaEUY,2034
-preditor/gui/ui/loggerwindow.ui,sha256=gHtU5ZyEyPXaLTCf1eNpu24L-61e0KEXZ18SWOj_C0w,29088
+preditor/gui/ui/loggerwindow.ui,sha256=e2Y7kSyP__d1I8ixFNZLzrEdfAbfdC-TqPVUJ7Urr0U,28476
 preditor/gui/ui/redmine_login_dialog.ui,sha256=PmGuJWvBcSDLya5UblFj5brwDH9VL2fJEveH-r5-nJ8,2911
 preditor/gui/ui/set_text_editor_path_dialog.ui,sha256=QoSorDlyfUoNSrHQRP1Yrls5az4TyUsTQw_qYOe_Ljc,4004
 preditor/resource/environment_variables.html,sha256=-uWicgOkour-sxtY-crrjMiLMyJzAzshwUXKqSm6TmI,3134
@@ -89,7 +86,6 @@ preditor/resource/img/preditor.ico,sha256=HjJbjJ3MYBmw5pFmkY2hEaomK-zPO7LJsOgGgA
 preditor/resource/img/preditor.png,sha256=y-AdFUy_zDnkylDe8kX1BTfwZS_TIgmEBqrHhx_IhWE,32788
 preditor/resource/img/preditor.psd,sha256=SZgadVDuDAzlUcg6ymlfAL7uw_JzLb1PsmkSAoSazv0,200136
 preditor/resource/img/preditor.svg,sha256=MRsRxcZw3HSJ4ZRDA3XMLytJX34QPJVIAET4lG613KU,3804
-preditor/resource/img/restart.svg,sha256=v3CFD1bROBch5n8vSQAzQqQc-bzvL_YwkD0JAhn4fuc,403
 preditor/resource/img/skip-forward-outline.png,sha256=5PAOknMYBZcuzskG8OO_QGAjLvA8g9M08MgjTvxfDrM,475
 preditor/resource/img/skip-next-outline.png,sha256=FUTDclE-U4nF5JhjvX-31QTwfv5pKgaX4UziY6UUioU,478
 preditor/resource/img/skip-next.png,sha256=q9V896VWgwatGShqSL7Ebv8sia3Q2XwBv5Y4KaZA60o,446
@@ -141,9 +137,9 @@ preditor/stream/manager.py,sha256=NP4lf6hd5L_Ui-9Ws66gVEk6ZL8YqF7BxOzUsdrh3v0,28
 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-0.1.0.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-PrEditor-0.1.0.dist-info/METADATA,sha256=Xor6RHAfzmJVlVeqPqQq9XEpDukJJPeTwFmXuDDhWKc,9277
-PrEditor-0.1.0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-PrEditor-0.1.0.dist-info/entry_points.txt,sha256=mpe0HFD_oIEBNPTJNyUEbmMV6Ivrp4EuYyZ34C5d_PU,519
-PrEditor-0.1.0.dist-info/top_level.txt,sha256=iX1_mrUOky_BQr2oG0l_MbEUYF6idyjiWSzu9z3irIw,9
-PrEditor-0.1.0.dist-info/RECORD,,
+PrEditor-0.1.0rc2.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+PrEditor-0.1.0rc2.dist-info/METADATA,sha256=w6CX92U_pkq-JVEWhGZKWkvaZQXXQqwaXPavac2G2Ac,9294
+PrEditor-0.1.0rc2.dist-info/WHEEL,sha256=k3vXr0c0OitO0k9eCWBlI2yTYnpb_n_I2SGzrrfY7HY,110
+PrEditor-0.1.0rc2.dist-info/entry_points.txt,sha256=mpe0HFD_oIEBNPTJNyUEbmMV6Ivrp4EuYyZ34C5d_PU,519
+PrEditor-0.1.0rc2.dist-info/top_level.txt,sha256=iX1_mrUOky_BQr2oG0l_MbEUYF6idyjiWSzu9z3irIw,9
+PrEditor-0.1.0rc2.dist-info/RECORD,,

{PrEditor-0.1.0.dist-info → PrEditor-0.1.0rc2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.41.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

preditor/__init__.py

@@ -113,7 +113,7 @@ def configure(name, parent_callback=None, excepthook=True, logging=True, streams
         preditor.debug.BlurExcepthook.install()
 
 
-def launch(run_workbox=False, app_id=None, name=None, standalone=False):
+def launch(run_workbox=False, app_id=None, name=None):
     """Launches the preditor gui creating the QApplication instance if not
     already created.
 
@@ -125,9 +125,6 @@ def launch(run_workbox=False, app_id=None, name=None, standalone=False):
         app_id (str, optional): Set the QApplication's applicationName to this
             value. This is normally only used when launching a standalone
             instance of the PrEditor gui.
-        standalone (bool, optional): Launch PrEditor in standalone mode. This
-            enables extra options that only make sense when it is running as
-            its own app, not inside of another app.
 
     Returns:
         preditor.gui.loggerwindow.LoggerWindow: The instance of the PrEditor
@@ -150,9 +147,7 @@ def launch(run_workbox=False, app_id=None, name=None, standalone=False):
 
     # Check if we can actually run the PrEditor gui and setup Qt if required
     app = App(name=app_id)
-    widget = LoggerWindow.instance(
-        run_workbox=run_workbox, name=name, standalone=standalone
-    )
+    widget = LoggerWindow.instance(run_workbox=run_workbox, name=name)
 
     # Show the PrEditor instance and make sure it regains focus and visibility
     widget.show()

preditor/cli.py

@@ -66,7 +66,7 @@ def launch(name, run_workbox):
     parameter_source = click.get_current_context().get_parameter_source('name')
     app_id = get_app_id(name, parameter_source == ParameterSource.DEFAULT)
 
-    preditor.launch(run_workbox=run_workbox, app_id=app_id, name=name, standalone=True)
+    preditor.launch(run_workbox=run_workbox, app_id=app_id, name=name)
 
 
 # shortcut

preditor/gui/group_tab_widget/__init__.py

@@ -114,20 +114,11 @@ class GroupTabWidget(OneTabWidget):
         return parent, editor
 
     def all_widgets(self):
-        """A generator yielding information about every widget under every group.
-
-        Yields:
-            widget, group tab name, widget tab name, group tab index, widget tab index
-        """
-        for group_index in range(self.count()):
-            group_name = self.tabText(group_index)
-
-            tab_widget = self.widget(group_index)
-            for tab_index in range(tab_widget.count()):
-                tab_name = tab_widget.tabText(tab_index)
-                yield tab_widget.widget(
-                    tab_index
-                ), group_name, tab_name, group_index, tab_index
+        """Returns every widget under every group."""
+        for i in range(self.count()):
+            tab_widget = self.widget(i)
+            for j in range(tab_widget.count()):
+                yield tab_widget.widget(j)
 
     def close_current_tab(self):
         """Convenient method to close the currently open editor tab prompting

preditor/gui/loggerwindow.py

@@ -37,8 +37,6 @@ from .. import (
 )
 from ..delayable_engine import DelayableEngine
 from ..gui import Dialog, Window, loadUi
-from ..gui.fuzzy_search.fuzzy_search import FuzzySearch
-from ..gui.group_tab_widget.grouped_tab_models import GroupTabListItemModel
 from ..logging_config import LoggingConfig
 from ..utils import stylesheets
 from .completer import CompleterMode
@@ -57,7 +55,7 @@ class LoggerWindow(Window):
     _instance = None
     styleSheetChanged = Signal(str)
 
-    def __init__(self, parent, name=None, run_workbox=False, standalone=False):
+    def __init__(self, parent, name=None, run_workbox=False):
         super(LoggerWindow, self).__init__(parent=parent)
         self.name = name if name else DEFAULT_CORE_NAME
         self.aboutToClearPathsEnabled = False
@@ -110,7 +108,6 @@ class LoggerWindow(Window):
         self._stds = None
         self.uiLogToFileClearACT.setVisible(False)
 
-        self.uiRestartACT.triggered.connect(self.restartLogger)
         self.uiCloseLoggerACT.triggered.connect(self.closeLogger)
 
         self.uiRunAllACT.triggered.connect(self.execAll)
@@ -182,8 +179,6 @@ class LoggerWindow(Window):
         self.uiGroup8ACT.triggered.connect(partial(self.gotoGroupByIndex, 8))
         self.uiGroupLastACT.triggered.connect(partial(self.gotoGroupByIndex, -1))
 
-        self.uiFocusNameACT.triggered.connect(self.show_focus_name)
-
         self.uiCommentToggleACT.triggered.connect(self.comment_toggle)
 
         self.uiSpellCheckEnabledACT.toggled.connect(self.setSpellCheckEnabled)
@@ -223,7 +218,6 @@ class LoggerWindow(Window):
             QIcon(resourcePath('img/content-save.png'))
         )
         self.uiAboutPreditorACT.setIcon(QIcon(resourcePath('img/information.png')))
-        self.uiRestartACT.setIcon(QIcon(resourcePath('img/restart.svg')))
         self.uiCloseLoggerACT.setIcon(QIcon(resourcePath('img/close-thick.png')))
 
         # Make action shortcuts available anywhere in the Logger
@@ -273,10 +267,6 @@ class LoggerWindow(Window):
 
         self.setup_run_workbox()
 
-        if not standalone:
-            # This action only is valid when running in standalone mode
-            self.uiRestartACT.setVisible(False)
-
         # Run the current workbox after the LoggerWindow is shown.
         if run_workbox:
             # By using two singleShot timers, we can show and draw the LoggerWindow,
@@ -315,61 +305,7 @@ class LoggerWindow(Window):
         return self.uiWorkboxTAB.current_groups_widget()
 
     @classmethod
-    def name_for_workbox(cls, workbox):
-        """Returns the name for a given workbox.
-        The name is the group tab text and the workbox tab text joined by a `/`"""
-        ret = []
-        logger = cls.instance()
-        index = logger.uiWorkboxTAB.currentIndex()
-        ret.append(logger.uiWorkboxTAB.tabText(index))
-        group_widget = logger.uiWorkboxTAB.currentWidget()
-        index = group_widget.currentIndex()
-        ret.append(group_widget.tabText(index))
-        return "/".join(ret)
-
-    @classmethod
-    def workbox_for_name(cls, name, show=False, visible=False):
-        """Used to find a workbox for a given name. It accepts a string matching
-        the "{group}/{workbox}" format, or if True, the current workbox.
-
-        Args:
-            name(str, boolean): Used to define which workbox to run.
-            show (bool, optional): If a workbox is found, call `__show__` on it
-                to ensure that it is initialized and its text is loaded.
-            visible (bool, optional): Make the this workbox visible if found.
-        """
-        logger = cls.instance()
-
-        workbox = None
-
-        # If name is True, run the current workbox
-        if isinstance(name, bool):
-            if name:
-                workbox = logger.current_workbox()
-
-        # If name is a string, find first tab with that name
-        elif isinstance(name, six.string_types):
-            split = name.split('/', 1)
-            if len(split) < 2:
-                return None
-            group, editor = split
-            group_index = logger.uiWorkboxTAB.index_for_text(group)
-            if group_index != -1:
-                tab_widget = logger.uiWorkboxTAB.widget(group_index)
-                index = tab_widget.index_for_text(editor)
-                if index != -1:
-                    workbox = tab_widget.widget(index)
-                    if visible:
-                        tab_widget.setCurrentIndex(index)
-                        logger.uiWorkboxTAB.setCurrentIndex(group_index)
-
-        if show and workbox:
-            workbox.__show__()
-
-        return workbox
-
-    @classmethod
-    def run_workbox(cls, name):
+    def run_workbox(cls, indicator):
         """This is a function which will be added to __main__, and therefore
         available to PythonLogger users. It will accept a string matching the
         "{group}/{workbox}" format, or a boolean that will run the current tab
@@ -377,7 +313,7 @@ class LoggerWindow(Window):
         current workbox on launch.
 
         Args:
-            name(str, boolean): Used to define which workbox to run.
+            indicator(str, boolean): Used to define which workbox to run.
 
         Raises:
             Exception: "Cannot call current workbox."
@@ -387,12 +323,30 @@ class LoggerWindow(Window):
             run_workbox('some/stuff.py')
             (from command line): blurdev launch Python_Logger --run_workbox
         """
-        workbox = cls.workbox_for_name(name)
+        logger = cls.instance()
+
+        # Determine the workbox widget
+        workbox = None
+
+        # If indicator is True, run the current workbox
+        if isinstance(indicator, bool):
+            if indicator:
+                workbox = logger.current_workbox()
+
+        # If indicator is a string, find first tab with that name
+        elif isinstance(indicator, six.string_types):
+            group, editor = indicator.split('/', 1)
+            index = logger.uiWorkboxTAB.index_for_text(group)
+            if index != -1:
+                tab_widget = logger.uiWorkboxTAB.widget(index)
+                index = tab_widget.index_for_text(editor)
+                if index != -1:
+                    workbox = tab_widget.widget(index)
 
         if workbox is not None:
-            # if name is True, its ok to run the workbox, this option
+            # if indicator is True, its ok to run the workbox, this option
             # is passed by the cli to run the current tab
-            if workbox.hasFocus() and name is not True:
+            if workbox.hasFocus() and indicator is not True:
                 raise Exception("Cannot call current workbox.")
             else:
                 # Make sure the workbox text is loaded as it likely has not
@@ -612,10 +566,6 @@ class LoggerWindow(Window):
         if self.uiConsoleTOOLBAR.isFloating():
             self.uiConsoleTOOLBAR.hide()
 
-        # Handle any cleanup each workbox tab may need to do before closing
-        for editor, _, _, _, _ in self.uiWorkboxTAB.all_widgets():
-            editor.__close__()
-
     def closeLogger(self):
         self.close()
 
@@ -714,28 +664,6 @@ class LoggerWindow(Window):
         with open(filename, 'w') as fp:
             json.dump(pref, fp, indent=4)
 
-    def restartLogger(self):
-        """Closes this PrEditor instance and starts a new process with the same
-        cli arguments.
-
-        Note: This only works if PrEditor is running in standalone mode. It doesn't
-        quit the QApplication or other host process. It simply closes this instance
-        of PrEditor, saving its preferences, which should allow Qt to exit if no
-        other windows are open.
-        """
-        self.close()
-
-        # Get the current command and launch it as a new process. This handles
-        # use of the preditor/preditor executable launchers.
-        cmd = sys.argv[0]
-        args = sys.argv[1:]
-
-        if os.path.basename(cmd) == "__main__.py":
-            # Handles using `python -m preditor` style launch.
-            cmd = sys.executable
-            args = ["-m", "preditor"] + args
-        QtCore.QProcess.startDetached(cmd, args)
-
     def restorePrefs(self):
         pref = self.load_prefs()
 
@@ -827,7 +755,7 @@ class LoggerWindow(Window):
 
     def setAutoCompleteEnabled(self, state):
         self.uiConsoleTXT.completer().setEnabled(state)
-        for workbox, _, _, _, _ in self.uiWorkboxTAB.all_widgets():
+        for workbox in self.uiWorkboxTAB.all_widgets():
             workbox.__set_auto_complete_enabled__(state)
 
     def setSpellCheckEnabled(self, state):
@@ -1023,30 +951,14 @@ class LoggerWindow(Window):
     def show_workbox_options(self):
         self.uiWorkboxSTACK.setCurrentIndex(WorkboxPages.Options)
 
-    @Slot()
-    def show_focus_name(self):
-        model = GroupTabListItemModel(manager=self.uiWorkboxTAB)
-        model.process()
-
-        def update_tab(index):
-            group, tab = model.workbox_indexes_from_model_index(index)
-            if group is not None:
-                self.uiWorkboxTAB.set_current_groups_from_index(group, tab)
-
-        w = FuzzySearch(model, parent=self)
-        w.selected.connect(update_tab)
-        w.canceled.connect(update_tab)
-        w.highlighted.connect(update_tab)
-        w.popup()
-
     def updateCopyIndentsAsSpaces(self):
-        for workbox, _, _, _, _ in self.uiWorkboxTAB.all_widgets():
+        for workbox in self.uiWorkboxTAB.all_widgets():
             workbox.__set_copy_indents_as_spaces__(
                 self.uiCopyTabsToSpacesACT.isChecked()
             )
 
     def updateIndentationsUseTabs(self):
-        for workbox, _, _, _, _ in self.uiWorkboxTAB.all_widgets():
+        for workbox in self.uiWorkboxTAB.all_widgets():
             workbox.__set_indentations_use_tabs__(
                 self.uiIndentationsTabsACT.isChecked()
             )
@@ -1125,9 +1037,7 @@ class LoggerWindow(Window):
         group_tab.setCurrentIndex(index)
 
     @staticmethod
-    def instance(
-        parent=None, name=None, run_workbox=False, create=True, standalone=False
-    ):
+    def instance(parent=None, name=None, run_workbox=False, create=True):
         """Returns the existing instance of the PrEditor gui creating it on first call.
 
         Args:
@@ -1136,9 +1046,6 @@ class LoggerWindow(Window):
             run_workbox (bool, optional): If the instance hasn't been created yet, this
                 will execute the active workbox's code once fully initialized.
             create (bool, optional): Returns None if the instance has not been created.
-            standalone (bool, optional): Launch PrEditor in standalone mode. This
-                enables extra options that only make sense when it is running as
-                its own app, not inside of another app.
 
         Returns:
             Returns a fully initialized instance of the PrEditor gui. If called more
@@ -1151,9 +1058,7 @@ class LoggerWindow(Window):
                 return None
 
             # create the logger instance
-            inst = LoggerWindow(
-                parent, name=name, run_workbox=run_workbox, standalone=standalone
-            )
+            inst = LoggerWindow(parent, name=name, run_workbox=run_workbox)
 
             # RV has a Unique window structure. It makes more sense to not parent a
             # singleton window than to parent it to a specific top level window.

preditor/gui/ui/loggerwindow.ui

@@ -110,7 +110,6 @@
     <addaction name="uiCloseWorkboxACT"/>
     <addaction name="separator"/>
     <addaction name="uiSaveConsoleSettingsACT"/>
-    <addaction name="uiRestartACT"/>
     <addaction name="uiCloseLoggerACT"/>
    </widget>
    <widget class="QMenu" name="uiHelpMENU">
@@ -322,7 +321,6 @@
     <addaction name="separator"/>
     <addaction name="menuFocus_to_Group"/>
     <addaction name="menuFocus_to_Tab"/>
-    <addaction name="uiFocusNameACT"/>
    </widget>
    <addaction name="uiScriptingMENU"/>
    <addaction name="menuEdit"/>
@@ -932,25 +930,6 @@ at the indicated line in the specified text editor.
     <string>Backup</string>
    </property>
   </action>
-  <action name="uiFocusNameACT">
-   <property name="text">
-    <string>Focus To Name</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+P</string>
-   </property>
-  </action>
-  <action name="uiRestartACT">
-   <property name="text">
-    <string>Restart PrEditor</string>
-   </property>
-   <property name="toolTip">
-    <string>Closes PrEditor and launches a new process with the same cli arguments.</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+Alt+Shift+R</string>
-   </property>
-  </action>
  </widget>
  <customwidgets>
   <customwidget>

preditor/gui/workbox_mixin.py

@@ -4,7 +4,6 @@ import os
 import tempfile
 import textwrap
 
-from Qt.QtCore import Qt
 from Qt.QtWidgets import QStackedWidget
 
 from ..prefs import prefs_path
@@ -33,9 +32,6 @@ class WorkboxMixin(object):
     def __clear__(self):
         raise NotImplementedError("Mixin method not overridden.")
 
-    def __close__(self):
-        """Called just before the LoggerWindow is closed to allow for workbox cleanup"""
-
     def __comment_toggle__(self):
         raise NotImplementedError("Mixin method not overridden.")
 
@@ -325,33 +321,3 @@ class WorkboxMixin(object):
         elif self._tempfile:
             txt = self.__open_file__(self.__tempfile__())
             self.__set_text__(txt)
-
-    def process_shortcut(self, event, run=True):
-        """Check for workbox shortcuts and optionally call them.
-
-        Args:
-            event (QEvent): The keyPressEvent to process.
-            run (bool, optional): Run the expected action if possible.
-
-        Returns:
-            str or False: Returns False if the key press was not handled, indicating
-                that the subclass needs to handle it(or call super). If a known
-                shortcut was detected, a string indicating the action is returned
-                after running the action if enabled and supported.
-
-        Known actions:
-            __exec_selected__: If the user pressed Shift + Return or pressed the
-                number pad enter key calling `__exec_selected__`.
-        """
-        if event.key() == Qt.Key_Enter or (
-            event.key() == Qt.Key_Return and event.modifiers() == Qt.ShiftModifier
-        ):
-            # Number pad enter, or Shift + Return pressed, execute selected
-            if run:
-                self.__exec_selected__()
-
-                if self.window().uiAutoPromptACT.isChecked():
-                    self.__console__().startInputLine()
-            return '__exec_selected__'
-
-        return False

preditor/gui/workbox_text_edit.py

@@ -2,6 +2,7 @@ from __future__ import absolute_import
 
 import logging
 
+from Qt.QtCore import Qt
 from Qt.QtGui import QFont, QFontMetrics, QTextCursor
 from Qt.QtWidgets import QTextEdit
 
@@ -86,7 +87,7 @@ class WorkboxTextEdit(WorkboxMixin, QTextEdit):
         # TODO: Implement custom tab widths
         return 4
 
-    def __text__(self, line=None, start=None, end=None):
+    def __text__(self):
         return self.toPlainText()
 
     def __set_text__(self, text):
@@ -111,7 +112,11 @@ class WorkboxTextEdit(WorkboxMixin, QTextEdit):
         return self.textCursor().selection().toPlainText()
 
     def keyPressEvent(self, event):
-        if self.process_shortcut(event):
-            return
+        # If number pad enter key or Shift and keyboard return key
+        # are used run selected text.
+        if event.key() == Qt.Key_Enter or (
+            event.key() == Qt.Key_Return and event.modifiers() == Qt.ShiftModifier
+        ):
+            self.__exec_selected__()
         else:
             super(WorkboxTextEdit, self).keyPressEvent(event)

preditor/gui/workboxwidget.py

@@ -197,8 +197,13 @@ class WorkboxWidget(WorkboxMixin, DocumentEditor):
         if self._software == 'softimage':
             DocumentEditor.keyPressEvent(self, event)
         else:
-            if self.process_shortcut(event):
-                return
+            if event.key() == Qt.Key_Enter or (
+                event.key() == Qt.Key_Return and event.modifiers() == Qt.ShiftModifier
+            ):
+                self.__exec_selected__()
+
+                if self.window().uiAutoPromptACT.isChecked():
+                    self.__console__().startInputLine()
             else:
                 DocumentEditor.keyPressEvent(self, event)
 

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.1.0'
-version_tuple = (0, 1, 0)
+version = '0.1.0rc2'
+version_tuple = (0, 1, '0rc2')

preditor/gui/fuzzy_search/fuzzy_search.py

@@ -1,93 +0,0 @@
-from __future__ import absolute_import
-
-from functools import partial
-
-from Qt.QtCore import QModelIndex, QPoint, Qt, Signal
-from Qt.QtWidgets import QFrame, QLineEdit, QListView, QShortcut, QVBoxLayout
-
-from ..group_tab_widget.grouped_tab_models import GroupTabFuzzyFilterProxyModel
-
-
-class FuzzySearch(QFrame):
-    canceled = Signal("QModelIndex")
-    """Passes the original QModelIndex for the tab that was selected when the
-    widget was first shown. This lets you reset back to the orignal state."""
-    highlighted = Signal("QModelIndex")
-    """Emitted when the user navitages to the given index, but hasn't selected."""
-    selected = Signal("QModelIndex")
-    """Emitted when the user selects a item."""
-
-    def __init__(self, model, parent=None, **kwargs):
-        super(FuzzySearch, self).__init__(parent=parent, **kwargs)
-        self.y_offset = 100
-        self.setMinimumSize(400, 200)
-        self.uiCloseSCT = QShortcut(
-            Qt.Key_Escape, self, context=Qt.WidgetWithChildrenShortcut
-        )
-        self.uiCloseSCT.activated.connect(self._canceled)
-
-        self.uiUpSCT = QShortcut(Qt.Key_Up, self, context=Qt.WidgetWithChildrenShortcut)
-        self.uiUpSCT.activated.connect(partial(self.increment_selection, -1))
-        self.uiDownSCT = QShortcut(
-            Qt.Key_Down, self, context=Qt.WidgetWithChildrenShortcut
-        )
-        self.uiDownSCT.activated.connect(partial(self.increment_selection, 1))
-
-        lyt = QVBoxLayout(self)
-        self.uiLineEDIT = QLineEdit(parent=self)
-        self.uiLineEDIT.textChanged.connect(self.update_completer)
-        self.uiLineEDIT.returnPressed.connect(self.activated)
-        lyt.addWidget(self.uiLineEDIT)
-        self.uiResultsLIST = QListView(self)
-        self.uiResultsLIST.activated.connect(self.activated)
-        self.proxy_model = GroupTabFuzzyFilterProxyModel(self)
-        self.proxy_model.setSourceModel(model)
-        self.uiResultsLIST.setModel(self.proxy_model)
-        lyt.addWidget(self.uiResultsLIST)
-
-        self.original_model_index = model.original_model_index
-
-    def activated(self):
-        current = self.uiResultsLIST.currentIndex()
-        self.selected.emit(current)
-        self.hide()
-
-    def increment_selection(self, direction):
-        current = self.uiResultsLIST.currentIndex()
-        col = 0
-        row = 0
-        if current.isValid():
-            col = current.column()
-            row = current.row() + direction
-        new = self.uiResultsLIST.model().index(row, col)
-        self.uiResultsLIST.setCurrentIndex(new)
-        self.highlighted.emit(new)
-
-    def update_completer(self, wildcard):
-        if wildcard:
-            if not self.uiResultsLIST.currentIndex().isValid():
-                new = self.uiResultsLIST.model().index(0, 0)
-                self.uiResultsLIST.setCurrentIndex(new)
-        else:
-            self.uiResultsLIST.clearSelection()
-            self.uiResultsLIST.setCurrentIndex(QModelIndex())
-        self.proxy_model.setFuzzySearch(wildcard)
-        self.highlighted.emit(self.uiResultsLIST.currentIndex())
-
-    def _canceled(self):
-        # Restore the original tab as the user didn't choose the new tab
-        self.canceled.emit(self.original_model_index)
-        self.hide()
-
-    def reposition(self):
-        pgeo = self.parent().geometry()
-        geo = self.geometry()
-        center = QPoint(pgeo.width() // 2, 0)
-        geo.moveCenter(center)
-        geo.setY(self.y_offset)
-        self.setGeometry(geo)
-
-    def popup(self):
-        self.show()
-        self.reposition()
-        self.uiLineEDIT.setFocus(Qt.PopupFocusReason)

preditor/gui/group_tab_widget/grouped_tab_models.py

@@ -1,108 +0,0 @@
-from __future__ import absolute_import
-
-import re
-
-from Qt.QtCore import QSortFilterProxyModel, Qt
-from Qt.QtGui import QStandardItem, QStandardItemModel
-
-
-class GroupTabItemModel(QStandardItemModel):
-    GroupIndexRole = Qt.UserRole + 1
-    TabIndexRole = GroupIndexRole + 1
-
-    def __init__(self, manager, *args, **kwargs):
-        super(GroupTabItemModel, self).__init__(*args, **kwargs)
-        self.manager = manager
-
-    def workbox_indexes_from_model_index(self, index):
-        """Returns the group_index and tab_index for the provided QModelIndex"""
-        return (
-            index.data(self.GroupIndexRole),
-            index.data(self.TabIndexRole),
-        )
-
-    def pathFromIndex(self, index):
-        parts = [""]
-        while index.isValid():
-            parts.append(self.data(index, Qt.DisplayRole))
-            index = index.parent()
-        if len(parts) == 1:
-            return ""
-        return "/".join([x for x in parts[::-1] if x])
-
-
-class GroupTabTreeItemModel(GroupTabItemModel):
-    def process(self):
-        root = self.invisibleRootItem()
-        current_group = self.manager.currentIndex()
-        current_tab = self.manager.currentWidget().currentIndex()
-
-        prev_group = -1
-        all_widgets = self.manager.all_widgets()
-        for _, group_name, tab_name, group_index, tab_index in all_widgets:
-            if prev_group != group_index:
-                group_item = QStandardItem(group_name)
-                group_item.setData(group_index, self.GroupIndexRole)
-                root.appendRow(group_item)
-                prev_group = group_index
-
-            tab_item = QStandardItem(tab_name)
-            tab_item.setData(group_index, self.GroupIndexRole)
-            tab_item.setData(tab_index, self.TabIndexRole)
-            group_item.appendRow(tab_item)
-            if group_index == current_group and tab_index == current_tab:
-                self.original_model_index = self.indexFromItem(tab_item)
-
-
-class GroupTabListItemModel(GroupTabItemModel):
-    def flags(self, index):
-        return Qt.ItemIsEnabled | Qt.ItemIsSelectable
-
-    def process(self):
-        root = self.invisibleRootItem()
-        current_group = self.manager.currentIndex()
-        current_tab = self.manager.currentWidget().currentIndex()
-
-        all_widgets = self.manager.all_widgets()
-        for _, group_name, tab_name, group_index, tab_index in all_widgets:
-            tab_item = QStandardItem('/'.join((group_name, tab_name)))
-            tab_item.setData(group_index, self.GroupIndexRole)
-            tab_item.setData(tab_index, self.TabIndexRole)
-            root.appendRow(tab_item)
-            if group_index == current_group and tab_index == current_tab:
-                self.original_model_index = self.indexFromItem(tab_item)
-
-
-class GroupTabFuzzyFilterProxyModel(QSortFilterProxyModel):
-    """Implements a fuzzy search filter proxy model."""
-
-    def __init__(self, parent=None):
-        super(GroupTabFuzzyFilterProxyModel, self).__init__(parent=parent)
-        self._fuzzy_regex = None
-
-    def setFuzzySearch(self, search):
-        search = '.*'.join(search)
-        # search = '.*{}.*'.format(search)
-        self._fuzzy_regex = re.compile(search, re.I)
-        self.invalidateFilter()
-
-    def filterAcceptsRow(self, sourceRow, sourceParent):
-        if self.filterKeyColumn() == 0 and self._fuzzy_regex:
-
-            index = self.sourceModel().index(sourceRow, 0, sourceParent)
-            data = self.sourceModel().data(index)
-            ret = bool(self._fuzzy_regex.search(data))
-            return ret
-
-        return super(GroupTabFuzzyFilterProxyModel, self).filterAcceptsRow(
-            sourceRow, sourceParent
-        )
-
-    def pathFromIndex(self, index):
-        parts = [""]
-        while index.isValid():
-            parts.append(self.data(index, Qt.DisplayRole))
-            index = index.parent()
-        if len(parts) == 1:
-            return ""
-        return "/".join([x for x in parts[::-1] if x])

preditor/resource/img/restart.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12,4C14.1,4 16.1,4.8 17.6,6.3C20.7,9.4 20.7,14.5 17.6,17.6C15.8,19.5 13.3,20.2 10.9,19.9L11.4,17.9C13.1,18.1 14.9,17.5 16.2,16.2C18.5,13.9 18.5,10.1 16.2,7.7C15.1,6.6 13.5,6 12,6V10.6L7,5.6L12,0.6V4M6.3,17.6C3.7,15 3.3,11 5.1,7.9L6.6,9.4C5.5,11.6 5.9,14.4 7.8,16.2C8.3,16.7 8.9,17.1 9.6,17.4L9,19.4C8,19 7.1,18.4 6.3,17.6Z" /></svg>