Merge pull request #16 from mrexodia/ux-improvements

UX improvements

Author: psifertex

QCodeEditor.py

@@ -153,8 +153,9 @@ def __init__(self, editor):
             self.editor = editor
             self.editor.blockCountChanged.connect(self.updateWidth)
             self.editor.updateRequest.connect(self.updateContents)
-            self.font = QFont()
+            self.font = editor.font()
             self.numberBarColor = bnstyles["numberBar"]
+            self.updateWidth()
 
         def paintEvent(self, event):
             painter = QPainter(self)

__init__.py

@@ -153,7 +153,7 @@ class Snippets(QDialog):
     def __init__(self, context, parent=None):
         super(Snippets, self).__init__(parent)
         # Create widgets
-        self.setWindowModality(Qt.ApplicationModal)
+        self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
         self.title = QLabel(self.tr("Snippet Editor"))
         self.saveButton = QPushButton(self.tr("&Save"))
         self.saveButton.setShortcut(QKeySequence(self.tr("Ctrl+S")))
@@ -315,12 +315,19 @@ def clearSelection(self):
         self.tree.clearSelection()
         self.currentFile = ""
 
+    def askSave(self):
+        return QMessageBox.question(self, self.tr("Save?"), self.tr("Do you want to save changes to {}?").format(self.currentFileLabel.text()), QMessageBox.Yes | QMessageBox.No | QMessageBox.Cancel)
+
     def reject(self):
         self.settings.setValue("ui/snippeteditor/geometry", self.saveGeometry())
 
         if self.snippetChanged():
-            question = QMessageBox.question(self, self.tr("Discard"), self.tr("You have unsaved changes, quit anyway?"))
-            if question != QMessageBox.StandardButton.Yes:
+            save = self.askSave()
+            if save == QMessageBox.Yes:
+                self.save()
+            elif save == QMessageBox.No:
+                pass
+            elif save == QMessageBox.Cancel:
                 return
         self.accept()
 
@@ -358,8 +365,12 @@ def selectFile(self, new, old):
         if old and old.length() > 0:
             oldSelection = self.files.filePath(old.indexes()[0])
             if not QFileInfo(oldSelection).isDir() and self.snippetChanged():
-                question = QMessageBox.question(self, self.tr("Discard"), self.tr("Snippet changed. Discard changes?"))
-                if question != QMessageBox.StandardButton.Yes:
+                save = self.askSave()
+                if save == QMessageBox.Yes:
+                    self.save()
+                elif save == QMessageBox.No:
+                    pass
+                elif save == QMessageBox.Cancel:
                     self.resetting = True
                     self.tree.selectionModel().select(old, QItemSelectionModel.ClearAndSelect | QItemSelectionModel.Rows)
                     return False
@@ -376,7 +387,7 @@ def loadSnippet(self):
         self.readOnly(False)
 
     def newFileDialog(self):
-        (snippetName, ok) = QInputDialog.getText(self, self.tr("Snippet Name"), self.tr("Snippet Name: "))
+        (snippetName, ok) = QInputDialog.getText(self, self.tr("Snippet Name"), self.tr("Snippet Name: "), flags=self.windowFlags())
         if ok and snippetName:
             if not snippetName.endswith(".py"):
                 snippetName += ".py"
@@ -437,11 +448,7 @@ def run(self):
             log_warn("Cannot run snippets outside of the UI at this time.")
             return
         if self.snippetChanged():
-            question = QMessageBox.question(self, self.tr("Confirm"), self.tr("You have unsaved changes, must save first. Save?"))
-            if (question == QMessageBox.StandardButton.No):
-                return
-            else:
-                self.save()
+            self.save()
         actionText = actionFromSnippet(self.currentFile, self.snippetDescription.text())
         UIActionHandler.globalActions().executeAction(actionText, self.context)
 
@@ -457,10 +464,13 @@ def clearHotkey(self):
         self.keySequenceEdit.clear()
 
 
-def launchPlugin(context):
-    snippets = Snippets(context)
-    snippets.exec_()
+snippets = None
 
+def launchPlugin(context):
+    global snippets
+    if not snippets:
+        snippets = Snippets(context)
+    snippets.show()
 
 if __name__ == '__main__':
     app = QApplication(sys.argv)

plugin.json

@@ -1 +1,31 @@
-{"pluginmetadataversion": 2, "name": "Snippet UI Plugin", "type": ["ui"], "api": ["python2", "python3"], "description": "Powerful code-editing plugin for writing and managing python code-snippets with syntax highlightingd, hotkey binding and other features", "longdescription": "The snippet editor started as a simple example UI plugin to demonstrate new features available to UI plugins. It has turned into a functionally useful plugin in its own right. The snippet editor allows you to write small bits of code that might not be big enough to warrant the effort of a full plugin but are longer enough that you don't want to retype them every time in the python-console!\n\nAs an added bonus, all snippets are added to the snippets menu and hot-keys can be associated with them as they make use of the action system. All action-system items are also available through the command-palette (CTL/CMD-p).\n\n![](https://github.com/Vector35/snippets/blob/master/media/snippets.gif?raw=true)\n\n.", "license": {"name": "MIT", "text": "Copyright (c) 2019 Vector 35 Inc\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."}, "platforms": ["Darwin", "Linux", "Windows"], "installinstructions": {"Darwin": "no special instructions, package manager is recommended", "Linux": "no special instructions, package manager is recommended", "Windows": "no special instructions, package manager is recommended"}, "dependencies": {}, "version": "1.10", "author": "Vector 35 Inc", "minimumbinaryninjaversion": 1528}
+{
+    "pluginmetadataversion": 2,
+    "name": "Snippet UI Plugin",
+    "type": [
+        "ui"
+    ],
+    "api": [
+        "python2",
+        "python3"
+    ],
+    "description": "Powerful code-editing plugin for writing and managing python code-snippets with syntax highlightingd, hotkey binding and other features",
+    "longdescription": "The snippet editor started as a simple example UI plugin to demonstrate new features available to UI plugins. It has turned into a functionally useful plugin in its own right. The snippet editor allows you to write small bits of code that might not be big enough to warrant the effort of a full plugin but are longer enough that you don't want to retype them every time in the python-console!\n\nAs an added bonus, all snippets are added to the snippets menu and hot-keys can be associated with them as they make use of the action system. All action-system items are also available through the command-palette (CTL/CMD-p).\n\n![](https://github.com/Vector35/snippets/blob/master/media/snippets.gif?raw=true)\n\n.",
+    "license": {
+        "name": "MIT",
+        "text": "Copyright (c) 2019 Vector 35 Inc\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+    },
+    "platforms": [
+        "Darwin",
+        "Linux",
+        "Windows"
+    ],
+    "installinstructions": {
+        "Darwin": "no special instructions, package manager is recommended",
+        "Linux": "no special instructions, package manager is recommended",
+        "Windows": "no special instructions, package manager is recommended"
+    },
+    "dependencies": "pygments>=2.7.0,<2.9.0\n",
+    "version": "1.11",
+    "author": "Vector 35 Inc",
+    "minimumbinaryninjaversion": 1528
+}