Mercurial Repositories > Selection Encloser Tool / changeset

--- a/.hgignore	Sat Dec 23 18:14:27 2023 +0100
+++ b/.hgignore	Sat Oct 26 16:29:19 2024 +0200
@@ -1,5 +1,4 @@
 glob:.eric7project
-glob:.eric6project
 glob:.ropeproject
 glob:.jedi
 glob:.directory
@@ -13,4 +12,3 @@
 glob:tmp
 glob:__pycache__
 glob:**.DS_Store
-glob:**Ui_*.py

--- a/ChangeLog	Sat Dec 23 18:14:27 2023 +0100
+++ b/ChangeLog	Sat Oct 26 16:29:19 2024 +0200
@@ -1,5 +1,10 @@
 ChangeLog
 ---------
+Version 10.1.1
+- change to the new style header
+- ensured proper parent relationship for modal dialogs
+- included compiled form files
+
 Version 10.1.0
 - adapted the import statements to the new structure
 

--- a/PKGLIST	Sat Dec 23 18:14:27 2023 +0100
+++ b/PKGLIST	Sat Oct 26 16:29:19 2024 +0200
@@ -1,7 +1,9 @@
 PluginSelectionEncloser.py
 SelectionEncloser/ConfigurationPage/SelectionEncloserEditDialog.py
+SelectionEncloser/ConfigurationPage/Ui_SelectionEncloserEditDialog.py
 SelectionEncloser/ConfigurationPage/SelectionEncloserEditDialog.ui
 SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py
+SelectionEncloser/ConfigurationPage/Ui_SelectionEncloserPage.py
 SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui
 SelectionEncloser/ConfigurationPage/__init__.py
 SelectionEncloser/Documentation/LICENSE.GPL3

--- a/PluginSelectionEncloser.py	Sat Dec 23 18:14:27 2023 +0100
+++ b/PluginSelectionEncloser.py	Sat Oct 26 16:29:19 2024 +0200
@@ -19,21 +19,24 @@
 from eric7.EricWidgets.EricApplication import ericApp
 
 # Start-Of-Header
-name = "Selection Encloser Plug-in"
-author = "Detlev Offenbach <detlev@die-offenbachs.de>"
-autoactivate = True
-deactivateable = True
-version = "10.1.0"
-className = "SelectionEncloserPlugin"
-packageName = "SelectionEncloser"
-shortDescription = "Enclose the selection with a string."
-longDescription = (
-    """This plug-in implements a tool to enclose the selection of"""
-    """ the current editor with a string. The enclosing string is"""
-    """ selectable via a configurable menu hierarchy."""
-)
-needsRestart = False
-pyqtApi = 2
+__header__ = {
+    "name": "Selection Encloser Plug-in",
+    "author": "Detlev Offenbach <detlev@die-offenbachs.de>",
+    "autoactivate": True,
+    "deactivateable": True,
+    "version": "10.1.1",
+    "className": "SelectionEncloserPlugin",
+    "packageName": "SelectionEncloser",
+    "shortDescription": "Enclose the selection with a string.",
+    "longDescription": (
+        """This plug-in implements a tool to enclose the selection of"""
+        """ the current editor with a string. The enclosing string is"""
+        """ selectable via a configurable menu hierarchy."""
+    ),
+    "needsRestart": False,
+    "hasCompiledForms": True,
+    "pyqtApi": 2,
+}
 # End-Of-Header
 
 error = ""

Binary file PluginSelectionEncloser.zip has changed

--- a/SelectionEncloser.epj	Sat Dec 23 18:14:27 2023 +0100
+++ b/SelectionEncloser.epj	Sat Oct 26 16:29:19 2024 +0200
@@ -1,7 +1,7 @@
 {
   "header": {
     "comment": "eric project file for project SelectionEncloser",
-    "copyright": "Copyright (C) 2023 Detlev Offenbach, detlev@die-offenbachs.de"
+    "copyright": "Copyright (C) 2024 Detlev Offenbach, detlev@die-offenbachs.de"
   },
   "project": {
     "AUTHOR": "Detlev Offenbach",
@@ -27,6 +27,7 @@
           "OverloadDecorators": [
             "overload"
           ],
+          "RespectTypeIgnore": false,
           "SuppressDummyArgs": false,
           "SuppressNoneReturning": true
         },
@@ -68,7 +69,7 @@
         "DocstringType": "eric_black",
         "EnabledCheckerCategories": "C, D, E, I, L, M, NO, N, Y, U, W",
         "ExcludeFiles": "*/Ui_*.py, */*_rc.py",
-        "ExcludeMessages": "C101,E265,E266,E305,E402,M201,M301,M302,M303,M304,M305,M306,M307,M308,M311,M312,M313,M314,M315,M321,M701,M702,M811,M834,M852,N802,N803,N807,N808,N821,W293,W503,Y119,Y401,Y402",
+        "ExcludeMessages": "C101,E265,E266,E305,E402,M251,M301,M302,M303,M304,M305,M306,M307,M308,M311,M312,M313,M314,M315,M321,M701,M702,M811,M834,M852,N802,N803,N807,N808,N821,W293,W503,Y119,Y401,Y402",
         "FixCodes": "",
         "FixIssues": false,
         "FutureChecker": "",
@@ -187,7 +188,6 @@
       "Makefile": "OTHERS",
       "README": "OTHERS",
       "README.*": "OTHERS",
-      "Ui_*.py": "__IGNORE__",
       "makefile": "OTHERS"
     },
     "FORMS": [
@@ -233,14 +233,16 @@
     ],
     "OTHERTOOLSPARMS": {
       "Black": {
-        "exclude": "/(\\.direnv|\\.eggs|\\.git|\\.hg|\\.mypy_cache|\\.nox|\\.tox|\\.venv|venv|\\.svn|\\.ipynb_checkpoints|_build|buck-out|build|dist|__pypackages__)/",
-        "extend-exclude": "",
+        "exclude": "/(\\.direnv|\\.eggs|\\.git|\\.hg|\\.ipynb_checkpoints|\\.mypy_cache|\\.nox|\\.pytest_cache|\\.ruff_cache|\\.tox|\\.svn|\\.venv|\\.vscode|__pypackages__|_build|buck-out|build|dist|venv)/",
+        "extend-exclude": "Ui_.*\\.py",
         "force-exclude": "",
         "line-length": 88,
         "skip-magic-trailing-comma": false,
         "skip-string-normalization": false,
         "source": "project",
         "target-version": [
+          "py313",
+          "py312",
           "py311",
           "py310",
           "py39",
@@ -282,6 +284,8 @@
       "PluginSelectionEncloser.py",
       "SelectionEncloser/ConfigurationPage/SelectionEncloserEditDialog.py",
       "SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py",
+      "SelectionEncloser/ConfigurationPage/Ui_SelectionEncloserEditDialog.py",
+      "SelectionEncloser/ConfigurationPage/Ui_SelectionEncloserPage.py",
       "SelectionEncloser/ConfigurationPage/__init__.py",
       "SelectionEncloser/__init__.py",
       "__init__.py"
@@ -352,4 +356,4 @@
     "VCSOTHERDATA": {},
     "VERSION": ""
   }
-}
\ No newline at end of file
+}

--- a/SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py	Sat Dec 23 18:14:27 2023 +0100
+++ b/SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py	Sat Oct 26 16:29:19 2024 +0200
@@ -233,7 +233,7 @@
                 itm.setText(0, menuTitle)
         else:
             dlg = SelectionEncloserEditDialog(
-                itm.text(0), itm.data(0, Qt.ItemDataRole.UserRole), self
+                itm.text(0), itm.data(0, Qt.ItemDataRole.UserRole), parent=self
             )
             if dlg.exec() == QDialog.DialogCode.Accepted:
                 title, encString = dlg.getData()

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SelectionEncloser/ConfigurationPage/Ui_SelectionEncloserEditDialog.py	Sat Oct 26 16:29:19 2024 +0200
@@ -0,0 +1,54 @@
+# Form implementation generated from reading ui file 'SelectionEncloser/ConfigurationPage/SelectionEncloserEditDialog.ui'
+#
+# Created by: PyQt6 UI code generator 6.7.1
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt6 import QtCore, QtGui, QtWidgets
+
+
+class Ui_SelectionEncloserEditDialog(object):
+    def setupUi(self, SelectionEncloserEditDialog):
+        SelectionEncloserEditDialog.setObjectName("SelectionEncloserEditDialog")
+        SelectionEncloserEditDialog.resize(500, 130)
+        SelectionEncloserEditDialog.setSizeGripEnabled(True)
+        self.gridLayout = QtWidgets.QGridLayout(SelectionEncloserEditDialog)
+        self.gridLayout.setObjectName("gridLayout")
+        self.label = QtWidgets.QLabel(parent=SelectionEncloserEditDialog)
+        self.label.setObjectName("label")
+        self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
+        self.titleEdit = QtWidgets.QLineEdit(parent=SelectionEncloserEditDialog)
+        self.titleEdit.setClearButtonEnabled(True)
+        self.titleEdit.setObjectName("titleEdit")
+        self.gridLayout.addWidget(self.titleEdit, 0, 1, 1, 1)
+        self.label_2 = QtWidgets.QLabel(parent=SelectionEncloserEditDialog)
+        self.label_2.setObjectName("label_2")
+        self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1)
+        self.stringEdit = QtWidgets.QLineEdit(parent=SelectionEncloserEditDialog)
+        self.stringEdit.setClearButtonEnabled(True)
+        self.stringEdit.setObjectName("stringEdit")
+        self.gridLayout.addWidget(self.stringEdit, 1, 1, 1, 1)
+        self.label_3 = QtWidgets.QLabel(parent=SelectionEncloserEditDialog)
+        self.label_3.setObjectName("label_3")
+        self.gridLayout.addWidget(self.label_3, 2, 0, 1, 2)
+        self.buttonBox = QtWidgets.QDialogButtonBox(parent=SelectionEncloserEditDialog)
+        self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok)
+        self.buttonBox.setObjectName("buttonBox")
+        self.gridLayout.addWidget(self.buttonBox, 3, 0, 1, 2)
+
+        self.retranslateUi(SelectionEncloserEditDialog)
+        self.buttonBox.accepted.connect(SelectionEncloserEditDialog.accept) # type: ignore
+        self.buttonBox.rejected.connect(SelectionEncloserEditDialog.reject) # type: ignore
+        QtCore.QMetaObject.connectSlotsByName(SelectionEncloserEditDialog)
+
+    def retranslateUi(self, SelectionEncloserEditDialog):
+        _translate = QtCore.QCoreApplication.translate
+        SelectionEncloserEditDialog.setWindowTitle(_translate("SelectionEncloserEditDialog", "Menu Entry"))
+        self.label.setText(_translate("SelectionEncloserEditDialog", "Title:"))
+        self.titleEdit.setToolTip(_translate("SelectionEncloserEditDialog", "Enter the menu entry title"))
+        self.label_2.setText(_translate("SelectionEncloserEditDialog", "String:"))
+        self.stringEdit.setToolTip(_translate("SelectionEncloserEditDialog", "Enter the enclosing string or string format expression"))
+        self.label_3.setText(_translate("SelectionEncloserEditDialog", "<b>Note</b>: \'%s\', \'{0}\' or \'{}\' is replace by the selected text"))

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SelectionEncloser/ConfigurationPage/Ui_SelectionEncloserPage.py	Sat Oct 26 16:29:19 2024 +0200
@@ -0,0 +1,83 @@
+# Form implementation generated from reading ui file 'SelectionEncloser/ConfigurationPage/SelectionEncloserPage.ui'
+#
+# Created by: PyQt6 UI code generator 6.7.1
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt6 import QtCore, QtGui, QtWidgets
+
+
+class Ui_SelectionEncloserPage(object):
+    def setupUi(self, SelectionEncloserPage):
+        SelectionEncloserPage.setObjectName("SelectionEncloserPage")
+        SelectionEncloserPage.resize(482, 363)
+        self.verticalLayout = QtWidgets.QVBoxLayout(SelectionEncloserPage)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.headerLabel = QtWidgets.QLabel(parent=SelectionEncloserPage)
+        self.headerLabel.setObjectName("headerLabel")
+        self.verticalLayout.addWidget(self.headerLabel)
+        self.line15 = QtWidgets.QFrame(parent=SelectionEncloserPage)
+        self.line15.setFrameShape(QtWidgets.QFrame.Shape.HLine)
+        self.line15.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
+        self.line15.setFrameShape(QtWidgets.QFrame.Shape.HLine)
+        self.line15.setObjectName("line15")
+        self.verticalLayout.addWidget(self.line15)
+        self.label = QtWidgets.QLabel(parent=SelectionEncloserPage)
+        self.label.setObjectName("label")
+        self.verticalLayout.addWidget(self.label)
+        self.gridLayout = QtWidgets.QGridLayout()
+        self.gridLayout.setObjectName("gridLayout")
+        self.menuTree = QtWidgets.QTreeWidget(parent=SelectionEncloserPage)
+        self.menuTree.setAlternatingRowColors(True)
+        self.menuTree.setHeaderHidden(True)
+        self.menuTree.setObjectName("menuTree")
+        self.menuTree.headerItem().setText(0, "1")
+        self.gridLayout.addWidget(self.menuTree, 0, 0, 8, 1)
+        self.editButton = QtWidgets.QToolButton(parent=SelectionEncloserPage)
+        self.editButton.setObjectName("editButton")
+        self.gridLayout.addWidget(self.editButton, 0, 1, 1, 1)
+        self.addMenuButton = QtWidgets.QToolButton(parent=SelectionEncloserPage)
+        self.addMenuButton.setObjectName("addMenuButton")
+        self.gridLayout.addWidget(self.addMenuButton, 1, 1, 1, 1)
+        self.addButton = QtWidgets.QToolButton(parent=SelectionEncloserPage)
+        self.addButton.setObjectName("addButton")
+        self.gridLayout.addWidget(self.addButton, 2, 1, 1, 1)
+        self.addSeparatorButton = QtWidgets.QToolButton(parent=SelectionEncloserPage)
+        self.addSeparatorButton.setObjectName("addSeparatorButton")
+        self.gridLayout.addWidget(self.addSeparatorButton, 3, 1, 1, 1)
+        self.deleteButton = QtWidgets.QToolButton(parent=SelectionEncloserPage)
+        self.deleteButton.setObjectName("deleteButton")
+        self.gridLayout.addWidget(self.deleteButton, 4, 1, 1, 1)
+        self.upButton = QtWidgets.QToolButton(parent=SelectionEncloserPage)
+        self.upButton.setObjectName("upButton")
+        self.gridLayout.addWidget(self.upButton, 5, 1, 1, 1)
+        self.downButton = QtWidgets.QToolButton(parent=SelectionEncloserPage)
+        self.downButton.setObjectName("downButton")
+        self.gridLayout.addWidget(self.downButton, 6, 1, 1, 1)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+        self.gridLayout.addItem(spacerItem, 7, 1, 1, 1)
+        self.verticalLayout.addLayout(self.gridLayout)
+
+        self.retranslateUi(SelectionEncloserPage)
+        QtCore.QMetaObject.connectSlotsByName(SelectionEncloserPage)
+        SelectionEncloserPage.setTabOrder(self.menuTree, self.editButton)
+        SelectionEncloserPage.setTabOrder(self.editButton, self.addMenuButton)
+        SelectionEncloserPage.setTabOrder(self.addMenuButton, self.addButton)
+        SelectionEncloserPage.setTabOrder(self.addButton, self.addSeparatorButton)
+        SelectionEncloserPage.setTabOrder(self.addSeparatorButton, self.deleteButton)
+        SelectionEncloserPage.setTabOrder(self.deleteButton, self.upButton)
+        SelectionEncloserPage.setTabOrder(self.upButton, self.downButton)
+
+    def retranslateUi(self, SelectionEncloserPage):
+        _translate = QtCore.QCoreApplication.translate
+        self.headerLabel.setText(_translate("SelectionEncloserPage", "<b>Configure Selection Encloser</b>"))
+        self.label.setText(_translate("SelectionEncloserPage", "Menu Hierarchy:"))
+        self.editButton.setToolTip(_translate("SelectionEncloserPage", "Press to edit the selected entry"))
+        self.addMenuButton.setToolTip(_translate("SelectionEncloserPage", "Press to add a new top level menu item"))
+        self.addButton.setToolTip(_translate("SelectionEncloserPage", "Press to add a new menu item"))
+        self.addSeparatorButton.setToolTip(_translate("SelectionEncloserPage", "Press to add a separator entry below the selected entry"))
+        self.deleteButton.setToolTip(_translate("SelectionEncloserPage", "Press to delete the selected item"))
+        self.upButton.setToolTip(_translate("SelectionEncloserPage", "Press to move the selected entry up"))
+        self.downButton.setToolTip(_translate("SelectionEncloserPage", "Press to move the selected entry down"))