diff -r fc1ab84c242f -r 529f1c17c93e ProjectDjangoTagsMenu/DjangoTagsMenuHandler.py
--- a/ProjectDjangoTagsMenu/DjangoTagsMenuHandler.py Sat Dec 23 16:54:25 2023 +0100
+++ b/ProjectDjangoTagsMenu/DjangoTagsMenuHandler.py Mon Oct 28 16:51:09 2024 +0100
@@ -860,7 +860,7 @@
replace = True
elif tag == "block":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Named Block"),
[self.tr("Enter block name:")],
["block_name"],
@@ -874,7 +874,7 @@
templateText = "{% csrf_token %}"
elif tag == "cycle":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Cycle Variables"),
[self.tr("Enter items to cycle, space separated")],
["item1 item2 item3"],
@@ -885,7 +885,7 @@
templateText = "{% debug %}"
elif tag == "extendsvariable":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Extends"),
[self.tr("Enter variable name:")],
["variable"],
@@ -894,7 +894,7 @@
templateText = "{{% extends {0} %}}".format(data[0])
elif tag == "extendsfile":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Extends"),
[self.tr("Enter parent file name:")],
["base.html"],
@@ -903,7 +903,7 @@
templateText = '{{% extends "{0}" %}}'.format(data[0])
elif tag == "filter":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Tag Filters"),
[self.tr("Multiple filters with arguments, pipes separated:")],
["lower|safe"],
@@ -915,7 +915,7 @@
replace = True
elif tag == "firstof":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("First Of"),
[
self.tr("Enter multiple variables, space separated:"),
@@ -931,7 +931,7 @@
replace = True
elif tag == "for":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("For Loop"),
[
self.tr("Enter variable to use for iteration:"),
@@ -946,7 +946,7 @@
replace = True
elif tag == "for...empty":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("For Loop"),
[
self.tr("Enter variable to use for iteration:"),
@@ -962,12 +962,12 @@
)
replace = True
elif tag == "if":
- dlg = IfTagInputDialog()
+ dlg = IfTagInputDialog(parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
templateText = dlg.getTag()
elif tag == "ifchanged":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Check Variables for Changes"),
[self.tr("Enter variables to check (space separated):")],
["variable1 variable2"],
@@ -979,7 +979,7 @@
replace = True
elif tag == "ifequal":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Check If Equal"),
[
self.tr("Enter first variable or string to check:"),
@@ -994,7 +994,7 @@
replace = True
elif tag == "ifnotequal":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Check If Not Equal"),
[
self.tr("Enter first variable or string to check:"),
@@ -1011,7 +1011,7 @@
replace = True
elif tag == "includevariable":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Include"),
[self.tr("Enter variable name:")],
["variable"],
@@ -1020,13 +1020,16 @@
templateText = "{{% include {0} %}}".format(data[0])
elif tag == "includefile":
data, ok = DjangoTagInputDialog.getText(
- None, self.tr("Include"), [self.tr("Enter file name:")], ["other.html"]
+ self.__ui,
+ self.tr("Include"),
+ [self.tr("Enter file name:")],
+ ["other.html"],
)
if ok:
templateText = '{{% include "{0}" %}}'.format(data[0])
elif tag == "load":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Load"),
[self.tr("Enter template tag set to load:")],
["foo bar"],
@@ -1051,7 +1054,7 @@
templateText = '{{% now "{0}" %}}'.format(dateformat)
elif tag == "regroup":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Regroup List"),
[
self.tr("List Variable:"),
@@ -1071,7 +1074,7 @@
replace = True
elif tag == "ssi":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("SSI"),
[self.tr("Full path to template:")],
["/tmp/ssi_template.html"],
@@ -1101,7 +1104,7 @@
replace = True
elif tag == "url":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("URL"),
[
self.tr("View method name:"),
@@ -1115,7 +1118,7 @@
templateText = '{{% url "{0}"{1} %}}'.format(data[0], data[1])
elif tag == "urlas":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("URL...as"),
[
self.tr("View method name:"),
@@ -1137,7 +1140,7 @@
replace = True
elif tag == "widthratio":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Width Ratio"),
[
self.tr("Variable:"),
@@ -1152,7 +1155,7 @@
)
elif tag == "with":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Cache Variables"),
[self.tr("Variables to cache as key=value (space separated):")],
["variable1=foo.bar variable2=bar.baz"],
@@ -1168,7 +1171,7 @@
elif tag == "add":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Add Variable or String"),
[self.tr("Variables or String to add:")],
["variable"],
@@ -1193,7 +1196,10 @@
templateText = '|center:"{0}"'.format(width)
elif tag == "cut":
data, ok = DjangoTagInputDialog.getText(
- None, self.tr("Cut Characters"), [self.tr("Characters to cut:")], [" "]
+ self.__ui,
+ self.tr("Cut Characters"),
+ [self.tr("Characters to cut:")],
+ [" "],
)
if ok:
templateText = '|cut:"{0}"'.format(data[0])
@@ -1218,7 +1224,7 @@
templateText = "|date"
elif tag == "default":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Default Value if False"),
[self.tr("Enter default value if result is False:")],
["nothing"],
@@ -1227,7 +1233,7 @@
templateText = '|default:"{0}"'.format(data[0])
elif tag == "default_if_none":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Default Value if None"),
[self.tr("Enter default value if result is None:")],
["nothing"],
@@ -1236,7 +1242,7 @@
templateText = '|default:"{0}"'.format(data[0])
elif tag == "dictsort":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Sort Dictionaries"),
[self.tr("Enter key to sort on:")],
["key"],
@@ -1245,7 +1251,7 @@
templateText = '|dictsort:"{0}"'.format(data[0])
elif tag == "dictsortreversed":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Sort Dictionaries reversed"),
[self.tr("Enter key to sort on:")],
["key"],
@@ -1304,7 +1310,7 @@
templateText = "|iriencode"
elif tag == "join":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Join List"),
[self.tr("Enter string to join by:")],
["//"],
@@ -1353,7 +1359,7 @@
templateText = "|phone2numeric"
elif tag == "pluralize":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Plural Suffix"),
[self.tr("Enter plural suffix (nothing for default):")],
[""],
@@ -1369,7 +1375,7 @@
templateText = "|random"
elif tag == "removetags":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Remove HTML Tags"),
[self.tr("Enter HTML tags to remove (space separated):")],
["b span"],
@@ -1394,7 +1400,7 @@
templateText = "|safeseq"
elif tag == "slice":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Extract slice of a list"),
[self.tr("Enter Python like slice expression:")],
["1:5"],
@@ -1405,7 +1411,7 @@
templateText = "|slugify"
elif tag == "stringformat":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Perform String Formatting"),
[self.tr("Enter Python like string format:")],
[""],
@@ -1430,7 +1436,7 @@
templateText = "|time"
elif tag == "timesince":
data[0], ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Time Since"),
[self.tr("Enter variable containing time reference:")],
["comment_date"],
@@ -1442,7 +1448,7 @@
templateText = "|timesince"
elif tag == "timeuntil":
data[0], ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Time Until"),
[self.tr("Enter variable containing time reference:")],
["from_date"],
@@ -1526,7 +1532,7 @@
templateText = "|wordwrap:{0}".format(characters)
elif tag == "yesno":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Map True, False and None"),
[self.tr("Enter mapping (comma separated):")],
["yeah,no,maybe"],
@@ -1563,7 +1569,7 @@
elif tag == "loadweb":
templateText = "{% load webdesign %}"
elif tag == "lorem":
- dlg = LoremTagInputDialog()
+ dlg = LoremTagInputDialog(parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
templateText = "{{% {0} %}}".format(dlg.getTag())
@@ -1575,7 +1581,7 @@
templateText = "{% load static %}"
elif tag == "staticfile":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Link to static file"),
[self.tr("Enter relative path of static file:")],
["images/hi.jpg"],
@@ -1584,7 +1590,7 @@
templateText = '{{% static "{0}" %}}'.format(data[0])
elif tag == "staticvariable":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Link to static file"),
[self.tr("Enter variable containing relative path of static file:")],
["user_stylesheet"],
@@ -1608,13 +1614,16 @@
replace = True
elif tag == "singlelinecommentdialog":
data, ok = DjangoTagInputDialog.getText(
- None, self.tr("Single Line Comment"), [self.tr("Enter comment:")], [""]
+ self.__ui,
+ self.tr("Single Line Comment"),
+ [self.tr("Enter comment:")],
+ [""],
)
if ok:
templateText = "{{# {0} #}}".format(data[0])
elif tag == "multilinecommentdialog":
comment, ok = MultiLineInputDialog.getText(
- None, self.tr("Multi Line Comment"), self.tr("Enter comment:"), ""
+ self.__ui, self.tr("Multi Line Comment"), self.tr("Enter comment:"), ""
)
if ok:
templateText = "{{% comment %}} {0} {{% endcomment %}}".format(comment)
@@ -1655,7 +1664,7 @@
templateText = "<!-- {0} -->".format(selectedText)
replace = True
elif tag == "iecomment":
- tag, ok = IeCommentDialog.getTag(selectedText)
+ tag, ok = IeCommentDialog.getTag(selectedText, parent=self.__ui)
if ok:
templateText = "<!--{0}-->".format(tag)
replace = True
@@ -1674,7 +1683,7 @@
replace = True
elif tag == "trans..as":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Translate String into Variable"),
[self.tr("Enter variable receiving translation:")],
["translation"],
@@ -1691,7 +1700,7 @@
replace = True
elif tag == "blocktrans..with":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Translate Block with Attributes"),
[self.tr("Enter attribute binding expressions (space separated):")],
["myvar1=value1 myvar2=value2"],
@@ -1708,7 +1717,10 @@
replace = True
elif tag == "language":
data, ok = DjangoTagInputDialog.getText(
- None, self.tr("Switch language"), [self.tr("Enter language:")], ["en"]
+ self.__ui,
+ self.tr("Switch language"),
+ [self.tr("Enter language:")],
+ ["en"],
)
if ok:
templateText = "{{% language '{0}' %}}{1}{{% endlanguage %}}".format(
@@ -1723,7 +1735,7 @@
templateText = "{% get_current_language_bidi as LANGUAGE_BIDI %}"
elif tag == "get_language_info":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Language Information"),
[
self.tr(
@@ -1742,7 +1754,7 @@
templateText = "{% get_language_info for LANGUAGE_CODE as lang %}"
elif tag == "get_language_info_list":
data, ok = DjangoTagInputDialog.getText(
- None,
+ self.__ui,
self.tr("Language Information for a list of languages"),
[self.tr("Enter language list variable (empty for LANGUAGES):")],
["available_languages"],
@@ -1805,7 +1817,7 @@
)
replace = True
elif tag == "timezone_set":
- timezone, ok = TimezoneSelectionDialog.getTimezone()
+ timezone, ok = TimezoneSelectionDialog.getTimezone(parent=self.__ui)
if ok:
templateText = '{{% timezone "{0}" %}}{1}{{% endtimezone %}}'.format(
timezone, selectedText
@@ -1824,7 +1836,7 @@
elif tag == "utc":
templateText = "|utc"
elif tag == "timezone":
- timezone, ok = TimezoneSelectionDialog.getTimezone()
+ timezone, ok = TimezoneSelectionDialog.getTimezone(parent=self.__ui)
if ok:
templateText = '|timezone:"{0}"'.format(timezone)
