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

preditor/gui/set_text_editor_path_dialog.py

@@ -17,7 +17,7 @@ class SetTextEditorPathDialog(QDialog):
         super(SetTextEditorPathDialog, self).__init__(parent)
         loadUi(__file__, self)
 
-        # Rerieve existing data from LoggerWindow
+        # Retrieve existing data from LoggerWindow
         path = self.parent().textEditorPath
         cmdTempl = self.parent().textEditorCmdTempl
 
@@ -29,9 +29,9 @@ class SetTextEditorPathDialog(QDialog):
 
         toolTip = (
             "Examples:\n"
-            "SublimeText: {exePath} {modulePath}:{lineNum}\n"
-            "notepad++: {exePath} {modulePath} -n{lineNum}\n"
-            "vim: {exePath} +{lineNum} {modulePath}"
+            'SublimeText: "{exePath}" "{modulePath}":{lineNum}\n'
+            'notepad++: "{exePath}" "{modulePath}" -n{lineNum}\n'
+            'vim: "{exePath}" + {lineNum} "{modulePath}'
         )
         self.uiTextEditorCommandPatternLE.setToolTip(toolTip)
 

preditor/gui/status_label.py

@@ -1,9 +1,10 @@
 from __future__ import absolute_import
 
 from collections import deque
+from functools import partial
 
 from Qt.QtCore import QPoint, QTimer
-from Qt.QtWidgets import QInputDialog, QLabel, QMenu
+from Qt.QtWidgets import QApplication, QInputDialog, QLabel, QMenu
 
 
 class StatusLabel(QLabel):
@@ -33,6 +34,10 @@ class StatusLabel(QLabel):
         if limit:
             self.setLimit(limit)
 
+    def copy_action_text(self, action):
+        """Copy the text of the provided action into the clipboard."""
+        QApplication.clipboard().setText(action.text())
+
     def mouseReleaseEvent(self, event):
         QTimer.singleShot(0, self.showMenu)
         super(StatusLabel, self).mouseReleaseEvent(event)
@@ -54,18 +59,33 @@ class StatusLabel(QLabel):
 
     def showSeconds(self, seconds):
         self.times.append(seconds)
-        self.setText(self.secondsText(seconds))
+        self.setText(self.secondsText(seconds[0]))
 
     def showMenu(self):
         menu = QMenu(self)
         if self.times:
             # Show the time it took to run the last X code calls
+            times = []
             for seconds in self.times:
-                menu.addAction(self.secondsText(seconds))
+                secs, cmd = seconds
+                times.append(secs)
+
+                # Add a simplified copy of the command that was run
+                cmd = cmd.strip()
+                cmds = cmd.split("\n")
+                if len(cmds) > 1 or len(cmds[0]) > 50:
+                    cmd = "{} ...".format(cmds[0][:50])
+                # Escape &'s so they dont' get turned into a shortcut'
+                cmd = cmd.replace("&", "&&")
+                act = menu.addAction("{}:  {}".format(self.secondsText(secs), cmd))
+                # Selecting this action should copy the time it took to run
+                act.triggered.connect(partial(self.copy_action_text, act))
 
             menu.addSeparator()
-            avg = sum(self.times) / len(self.times)
-            menu.addAction("Average: {:0.04f}s".format(avg))
+            avg = sum(times) / len(times)
+            act = menu.addAction("Average: {:0.04f}s".format(avg))
+            act.triggered.connect(partial(self.copy_action_text, act))
+
             act = menu.addAction("Clear")
             act.triggered.connect(self.clearTimes)
 

preditor/gui/suggest_path_quotes_dialog.py

@@ -0,0 +1,50 @@
+from __future__ import absolute_import
+
+from Qt.QtWidgets import QDialog
+
+from . import loadUi
+
+
+class SuggestPathQuotesDialog(QDialog):
+    """A dialog to suggest to enclose paths in double-quotes in the cmdTempl which is
+    used to launch an external text editor.
+    """
+
+    def __init__(self, parent, oldCmdTempl, newCmdTempl):
+        super(SuggestPathQuotesDialog, self).__init__(parent)
+        loadUi(__file__, self)
+
+        self.parentWindow = self.parent().window()
+
+        self.uiTextEditorOldCommandPatternLE.setText(oldCmdTempl)
+        self.uiTextEditorNewCommandPatternLE.setText(newCmdTempl)
+
+        toolTip = (
+            "Examples:\n"
+            'SublimeText: "{exePath}" "{modulePath}":{lineNum}\n'
+            'notepad++: "{exePath}" "{modulePath}" -n{lineNum}\n'
+            'vim: "{exePath}" + {lineNum} "{modulePath}'
+        )
+        self.uiTextEditorNewCommandPatternLE.setToolTip(toolTip)
+
+    def accept(self):
+        """Set the parentWindow's textEditorCmdTempl property from the dialog, and
+        optionally add dialog to parent's dont_ask_again list, and accept.
+        """
+
+        cmdTempl = self.uiTextEditorNewCommandPatternLE.text()
+        self.parentWindow.textEditorCmdTempl = cmdTempl
+
+        if self.uiDontAskAgainCHK.isChecked():
+            if hasattr(self.parentWindow, "dont_ask_again"):
+                self.parentWindow.dont_ask_again.append(self.objectName())
+
+        super(SuggestPathQuotesDialog, self).accept()
+
+    def reject(self):
+        """Optionally add dialog to parentWindow's dont_ask_again list, and reject"""
+        if self.uiDontAskAgainCHK.isChecked():
+            if hasattr(self.parentWindow, "dont_ask_again"):
+                self.parentWindow.dont_ask_again.append(self.objectName())
+
+        super(SuggestPathQuotesDialog, self).reject()

preditor/gui/ui/loggerwindow.ui

@@ -92,7 +92,7 @@
      <x>0</x>
      <y>0</y>
      <width>796</width>
-     <height>21</height>
+     <height>29</height>
     </rect>
    </property>
    <widget class="QMenu" name="uiDebugMENU">
@@ -137,10 +137,12 @@
      <string>Run</string>
     </property>
     <addaction name="uiRunSelectedACT"/>
+    <addaction name="uiRunSelectedDontTruncateACT"/>
     <addaction name="uiRunAllACT"/>
     <addaction name="separator"/>
     <addaction name="uiClearBeforeRunningACT"/>
     <addaction name="uiClearToLastPromptACT"/>
+    <addaction name="uiSelectTextACT"/>
    </widget>
    <widget class="QMenu" name="uiFileMENU">
     <property name="title">
@@ -160,34 +162,25 @@
      </property>
      <addaction name="separator"/>
     </widget>
-    <widget class="QMenu" name="uiFont_MENU">
+    <widget class="QMenu" name="uiSelectFontsMENU">
      <property name="title">
-      <string>Font</string>
+      <string>Select Font</string>
      </property>
-     <widget class="QMenu" name="uiMonospaceFontMENU">
-      <property name="title">
-       <string>Monospace</string>
-      </property>
-      <addaction name="uiFontMENU"/>
-     </widget>
-     <widget class="QMenu" name="uiProportionalFontMENU">
-      <property name="title">
-       <string>Proportional</string>
-      </property>
-      <addaction name="actionPlaceHolderProportionalFont"/>
-     </widget>
-     <addaction name="uiMonospaceFontMENU"/>
-     <addaction name="uiProportionalFontMENU"/>
+     <addaction name="uiSelectMonospaceFontACT"/>
+     <addaction name="uiSelectProportionalFontACT"/>
+     <addaction name="uiSelectAllFontACT"/>
     </widget>
-    <addaction name="uiAutoCompleteEnabledACT"/>
+    <addaction name="uiConsoleAutoCompleteEnabledACT"/>
+    <addaction name="uiWorkboxAutoCompleteEnabledACT"/>
     <addaction name="uiSpellCheckEnabledACT"/>
     <addaction name="uiAutoCompleteCaseSensitiveACT"/>
     <addaction name="uiCompleterModeMENU"/>
+    <addaction name="uiHighlightExactCompletionACT"/>
     <addaction name="separator"/>
     <addaction name="uiClearLogACT"/>
     <addaction name="uiClearLogOnRefreshACT"/>
     <addaction name="separator"/>
-    <addaction name="uiFont_MENU"/>
+    <addaction name="uiSelectFontsMENU"/>
     <addaction name="uiStyleMENU"/>
     <addaction name="separator"/>
     <addaction name="uiIndentationsTabsACT"/>
@@ -399,15 +392,21 @@
     <string>Ctrl+Alt+Shift+D</string>
    </property>
   </action>
-  <action name="uiAutoCompleteEnabledACT">
+  <action name="uiConsoleAutoCompleteEnabledACT">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="checked">
-    <bool>true</bool>
+    <bool>false</bool>
    </property>
    <property name="text">
-    <string>Use &amp;Auto-Complete</string>
+    <string>Use Auto-Complete in console</string>
+   </property>
+   <property name="iconText">
+    <string>Use Auto-Complete in console</string>
+   </property>
+   <property name="toolTip">
+    <string>Use Auto-Complete in console</string>
    </property>
   </action>
   <action name="uiRunLineACT">
@@ -420,7 +419,7 @@
   </action>
   <action name="uiRunAllACT">
    <property name="text">
-    <string>Run All...</string>
+    <string>Run All</string>
    </property>
    <property name="toolTip">
     <string>Run all code from the current workbox</string>
@@ -436,7 +435,7 @@
   </action>
   <action name="uiRunSelectedACT">
    <property name="text">
-    <string>Run Selected...</string>
+    <string>Run Selected  - truncate return value</string>
    </property>
    <property name="toolTip">
     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Run some code from the current workbox. If you have text selected, only the selected text is run. With no text selected, the current line is run. You can also use the Number Pad Enter key to activate this.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -648,16 +647,6 @@
     <string>FullFuzzy</string>
    </property>
   </action>
-  <action name="uiFontMENU">
-   <property name="text">
-    <string>PlaceHolderMonospaceFont</string>
-   </property>
-  </action>
-  <action name="actionPlaceHolderProportionalFont">
-   <property name="text">
-    <string>PlaceHolderProportionalFont</string>
-   </property>
-  </action>
   <action name="uiCycleCompleterModeACT">
    <property name="text">
     <string>Cycle Completer Modes</string>
@@ -964,6 +953,65 @@ at the indicated line in the specified text editor.
     <string>Ctrl+Shift+F</string>
    </property>
   </action>
+  <action name="uiSelectTextACT">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Select text when Run Selected w/o selection</string>
+   </property>
+  </action>
+  <action name="uiWorkboxAutoCompleteEnabledACT">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Use Auto-Complete in workbox</string>
+   </property>
+  </action>
+  <action name="uiSelectMonospaceFontACT">
+   <property name="text">
+    <string>Choose from monospace fonts</string>
+   </property>
+   <property name="toolTip">
+    <string>Choose from monospace fonts</string>
+   </property>
+  </action>
+  <action name="uiSelectProportionalFontACT">
+   <property name="text">
+    <string>Choose from proportional fonts</string>
+   </property>
+   <property name="toolTip">
+    <string>Choose from proportional fonts</string>
+   </property>
+  </action>
+  <action name="uiSelectAllFontACT">
+   <property name="text">
+    <string>Choose from all fonts</string>
+   </property>
+   <property name="toolTip">
+    <string>Choose from all fonts</string>
+   </property>
+  </action>
+  <action name="uiRunSelectedDontTruncateACT">
+   <property name="text">
+    <string>Run Selected - don't truncate return value</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+Return</string>
+   </property>
+  </action>
+  <action name="uiHighlightExactCompletionACT">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Highlight Exact Completion</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

preditor/gui/ui/set_text_editor_path_dialog.ui

@@ -6,21 +6,33 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>682</width>
-    <height>151</height>
+    <width>1064</width>
+    <height>325</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Set Text Editor Executable Path</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>15</number>
+   </property>
    <item>
     <widget class="QWidget" name="widget" native="true">
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="spacing">
+       <number>3</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
        <number>0</number>
       </property>
-      <property name="margin">
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
@@ -31,6 +43,11 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="font">
+         <font>
+          <pointsize>10</pointsize>
+         </font>
+        </property>
         <property name="text">
          <string>Path to the executable of your preferred text editor</string>
         </property>
@@ -38,6 +55,11 @@
       </item>
       <item>
        <widget class="QLineEdit" name="uiTextEditorExecutablePathLE">
+        <property name="font">
+         <font>
+          <pointsize>10</pointsize>
+         </font>
+        </property>
         <property name="text">
          <string>C:\Program Files\Sublime Text 3\sublime_text.exe</string>
         </property>
@@ -50,9 +72,18 @@
     <widget class="QWidget" name="widget_2" native="true">
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <property name="spacing">
+       <number>3</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
        <number>0</number>
       </property>
-      <property name="margin">
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
@@ -63,10 +94,14 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="font">
+         <font>
+          <pointsize>10</pointsize>
+         </font>
+        </property>
         <property name="text">
-         <string>Command Prompt template (template of how your chosen text editor may implement line numbers in a Command Prompt command).
-Use these template strings: {exePath}, {modulePath}, {lineNum}
-</string>
+         <string>Command Prompt template (template of the Command Prompt command to launch your text editor, including how it may implement specifying line numbers).
+Use these template strings: &quot;{exePath}&quot;, &quot;{modulePath}&quot;, {lineNum}. Include quotes around exePath and modulePath to handle filepaths which contain spaces.</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
@@ -75,11 +110,16 @@ Use these template strings: {exePath}, {modulePath}, {lineNum}
       </item>
       <item>
        <widget class="QLineEdit" name="uiTextEditorCommandPatternLE">
+        <property name="font">
+         <font>
+          <pointsize>10</pointsize>
+         </font>
+        </property>
         <property name="toolTip">
          <string/>
         </property>
         <property name="text">
-         <string>{exePath} {modulePath}:{lineNum}</string>
+         <string>&quot;{exePath}&quot; &quot;{modulePath}&quot;:{lineNum}</string>
         </property>
        </widget>
       </item>

preditor/gui/ui/suggest_path_quotes_dialog.ui

@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>uiSuggestPathQuotesDLG</class>
+ <widget class="QDialog" name="uiSuggestPathQuotesDLG">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>716</width>
+    <height>342</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Set Text Editor Executable Path</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>15</number>
+   </property>
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <property name="spacing">
+       <number>3</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="label">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <pointsize>10</pointsize>
+         </font>
+        </property>
+        <property name="text">
+         <string>It is recommended to wrap filepaths in double-quotes in case of spaces in the paths. Would you like to update the command template from:</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="uiTextEditorOldCommandPatternLE">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="font">
+         <font>
+          <pointsize>10</pointsize>
+         </font>
+        </property>
+        <property name="toolTip">
+         <string/>
+        </property>
+        <property name="text">
+         <string>uiTextEditorOldCommandPatternLE</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="widget_3" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout_4">
+      <property name="spacing">
+       <number>3</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="label_2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <pointsize>10</pointsize>
+         </font>
+        </property>
+        <property name="text">
+         <string>to:</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="uiTextEditorNewCommandPatternLE">
+        <property name="font">
+         <font>
+          <pointsize>10</pointsize>
+         </font>
+        </property>
+        <property name="toolTip">
+         <string/>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="widget_4" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout_5">
+      <property name="spacing">
+       <number>3</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="uiDontAskAgainCHK">
+     <property name="text">
+      <string>Don't Ask Again</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="uiDialogButtonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::No|QDialogButtonBox::Yes</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>uiDialogButtonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>uiSuggestPathQuotesDLG</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>uiDialogButtonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>uiSuggestPathQuotesDLG</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>