diff -r f497097bb0aa -r b027b4f90994 ProjectDjango/Project.py
--- a/ProjectDjango/Project.py Fri Jul 12 08:31:32 2024 +0200
+++ b/ProjectDjango/Project.py Mon Oct 28 16:24:54 2024 +0100
@@ -1252,9 +1252,7 @@
@param path full directory path for the new form file
@type str
"""
- fileFilters = self.tr(
- "HTML Files (*.html);;HTML Files (*.htm);;All Files (*)"
- )
+ fileFilters = self.tr("HTML Files (*.html);;HTML Files (*.htm);;All Files (*)")
fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
self.__ui,
self.tr("New Form"),
@@ -1595,6 +1593,7 @@
).format(version, url),
modal=True,
buttons=EricMessageBox.Ok,
+ parent=self.__ui,
)
msgBox.setIconPixmap(
EricPixmapCache.getPixmap(
@@ -1931,7 +1930,9 @@
args.append(projectName)
dia = DjangoDialog(
- title, msgSuccess=self.tr("Django project created successfully.")
+ title,
+ msgSuccess=self.tr("Django project created successfully."),
+ parent=self.__ui,
)
res = dia.startProcess(args, path)
if res:
@@ -2020,7 +2021,9 @@
args.append(applName)
dia = DjangoDialog(
- title, msgSuccess=self.tr("Django application created successfully.")
+ title,
+ msgSuccess=self.tr("Django application created successfully."),
+ parent=self.__ui,
)
res = dia.startProcess(args, path)
if res:
@@ -2397,7 +2400,7 @@
except DjangoNoSiteSelectedError:
return
- dia = DjangoDialog(title, fixed=True, linewrap=False)
+ dia = DjangoDialog(title, fixed=True, linewrap=False, parent=self.__ui)
res = dia.startProcess(args, path, False)
if res:
dia.exec()
@@ -2429,7 +2432,9 @@
args.append("--database={0}".format(self.__currentDatabase))
dia = DjangoDialog(
- title, msgSuccess=self.tr("Database tables flushed successfully.")
+ title,
+ msgSuccess=self.tr("Database tables flushed successfully."),
+ parent=self.__ui,
)
res = dia.startProcess(args, path)
if res:
@@ -2499,7 +2504,9 @@
fileFilter = self.tr("SQL Files (*.sql)")
- dia = DjangoDialog(title, fixed=True, linewrap=False, saveFilters=fileFilter)
+ dia = DjangoDialog(
+ title, fixed=True, linewrap=False, saveFilters=fileFilter, parent=self.__ui
+ )
res = dia.startProcess(args, path, False)
if res:
dia.exec()
@@ -2544,7 +2551,10 @@
title = self.tr("SQL Migrate")
dlg = DjangoMigrationSelectionDialog(
- migrations, migrationRequired=True, suffix=self.__iconSuffix
+ migrations,
+ migrationRequired=True,
+ suffix=self.__iconSuffix,
+ parent=self.__ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
app, migration = dlg.getData()
@@ -2563,7 +2573,11 @@
fileFilter = self.tr("SQL Files (*.sql)")
dia = DjangoDialog(
- title, fixed=True, linewrap=False, saveFilters=fileFilter
+ title,
+ fixed=True,
+ linewrap=False,
+ saveFilters=fileFilter,
+ parent=self.__ui,
)
res = dia.startProcess(args, path, False)
if res:
@@ -2632,7 +2646,9 @@
)
return
- dlg = DjangoMigrationSelectionDialog(migrations, suffix=self.__iconSuffix)
+ dlg = DjangoMigrationSelectionDialog(
+ migrations, suffix=self.__iconSuffix, parent=self.__ui
+ )
if dlg.exec() == QDialog.DialogCode.Accepted:
app, migration = dlg.getData()
self.applyMigrations(app=app, migration=migration)
@@ -2667,7 +2683,7 @@
if migration:
args.append(migration)
- dia = DjangoDialog(title)
+ dia = DjangoDialog(title, parent=self.__ui)
res = dia.startProcess(args, path)
if res:
dia.exec()
@@ -2749,7 +2765,7 @@
"""
from .DjangoMakeMigrationsDialog import DjangoMakeMigrationsDialog
- dlg = DjangoMakeMigrationsDialog(self.getRecentApplications())
+ dlg = DjangoMakeMigrationsDialog(self.getRecentApplications(), parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
apps, migration, dryRun, empty, merge = dlg.getData()
if apps:
@@ -2797,7 +2813,7 @@
if apps:
args += apps
- dia = DjangoDialog(title, showInput=True)
+ dia = DjangoDialog(title, showInput=True, parent=self.__ui)
res = dia.startProcess(args, path)
if res:
dia.exec()
@@ -2819,7 +2835,9 @@
)
return
- dlg = DjangoSquashMigrationSelectionDialog(migrations, self, self.__iconSuffix)
+ dlg = DjangoSquashMigrationSelectionDialog(
+ migrations, self, self.__iconSuffix, parent=self.__ui
+ )
if dlg.exec() == QDialog.DialogCode.Accepted:
app, start, end, noOptimize, name = dlg.getData()
@@ -2844,7 +2862,7 @@
args.append(start)
args.append(end)
- dia = DjangoDialog(title)
+ dia = DjangoDialog(title, parent=self.__ui)
res = dia.startProcess(args, path)
if res:
dia.exec()
@@ -2861,7 +2879,7 @@
title = self.tr("Diff Settings")
- dlg = DjangoDiffsettingsDataDialog(self, self.__ui)
+ dlg = DjangoDiffsettingsDataDialog(self, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
showAll, defaultModule, outputFormat = dlg.getData()
@@ -2881,7 +2899,7 @@
except DjangoNoSiteSelectedError:
return
- dia = DjangoDialog(title, fixed=True, linewrap=False)
+ dia = DjangoDialog(title, fixed=True, linewrap=False, parent=self.__ui)
res = dia.startProcess(args, path, False)
if res:
dia.exec()
@@ -2923,7 +2941,7 @@
title = self.tr("Send Test Email")
- dlg = DjangoSendTestEmailDataDialog(self.__ui)
+ dlg = DjangoSendTestEmailDataDialog(parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
managers, admins, recipients = dlg.getData()
@@ -2947,6 +2965,7 @@
linewrap=False,
msgSuccess=self.tr("Test Email sent successfully."),
msgError=self.tr("Test Email could not be sent."),
+ parent=self.__ui,
)
res = dia.startProcess(args, path, False)
if res:
@@ -2975,7 +2994,9 @@
args.append("--database={0}".format(self.__currentDatabase))
dia = DjangoDialog(
- title, msgSuccess=self.tr("Cache tables created successfully.")
+ title,
+ msgSuccess=self.tr("Cache tables created successfully."),
+ parent=self.__ui,
)
res = dia.startProcess(args, wd)
if res:
@@ -2998,7 +3019,7 @@
except DjangoNoSiteSelectedError:
return
- dlg = DjangoDumpdataDataDialog(self, self.__ui)
+ dlg = DjangoDumpdataDataDialog(self, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
appls, excls, dumpFormat, indent = dlg.getData()
@@ -3022,7 +3043,11 @@
fileFilters = self.tr("YAML Files (*.yaml)")
dia = DjangoDialog(
- title, fixed=True, linewrap=False, saveFilters=fileFilters
+ title,
+ fixed=True,
+ linewrap=False,
+ saveFilters=fileFilters,
+ parent=self.__ui,
)
res = dia.startProcess(args, wd, showCommand=False)
if res:
@@ -3041,7 +3066,7 @@
except DjangoNoSiteSelectedError:
return
- dlg = DjangoLoaddataDataDialog(self, self.__ui)
+ dlg = DjangoLoaddataDataDialog(self, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
fixtures, excludes, appLabel, ignore = dlg.getData()
@@ -3059,7 +3084,7 @@
args.append("--database={0}".format(self.__currentDatabase))
args += fixtures
- dia = DjangoDialog(title)
+ dia = DjangoDialog(title, parent=self.__ui)
res = dia.startProcess(args, wd)
if res:
dia.exec()
@@ -3083,7 +3108,7 @@
return
dlg = DjangoTestDataDialog(
- self, self.__plugin.getPreferences("KeepTestDatabase"), self.__ui
+ self, self.__plugin.getPreferences("KeepTestDatabase"), parent=self.__ui
)
if dlg.exec() == QDialog.DialogCode.Accepted:
labels, pattern, tags, excludeTags, keep, reverse = dlg.getData()
@@ -3129,7 +3154,7 @@
self.__plugin.getPreferences("ConsoleCommand")
)[1]
if consoleCmd:
- dlg = DjangoRunTestServerDataDialog(self, self.__ui)
+ dlg = DjangoRunTestServerDataDialog(self, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
fixtures = dlg.getData()
@@ -3262,7 +3287,9 @@
args.append("clearsessions")
dia = DjangoDialog(
- title, msgSuccess=self.tr("Expired sessions cleared successfully.")
+ title,
+ msgSuccess=self.tr("Expired sessions cleared successfully."),
+ parent=self.__ui,
)
res = dia.startProcess(args, wd)
if res:
@@ -3357,7 +3384,9 @@
return
dia = DjangoDialog(
- title, msgSuccess=self.tr("\nMessage catalog initialized successfully.")
+ title,
+ msgSuccess=self.tr("\nMessage catalog initialized successfully."),
+ parent=self.__ui,
)
res = dia.startProcess(args, wd)
if res:
@@ -3407,7 +3436,9 @@
return
dia = DjangoDialog(
- title, msgSuccess=self.tr("\nMessage catalogs updated successfully.")
+ title,
+ msgSuccess=self.tr("\nMessage catalogs updated successfully."),
+ parent=self.__ui,
)
res = dia.startBatchProcesses(argsLists, wd)
if res:
@@ -3451,7 +3482,9 @@
return
dia = DjangoDialog(
- title, msgSuccess=self.tr("\nMessage catalogs updated successfully.")
+ title,
+ msgSuccess=self.tr("\nMessage catalogs updated successfully."),
+ parent=self.__ui,
)
res = dia.startBatchProcesses(argsLists, wd)
if res:
@@ -3484,7 +3517,9 @@
return
dia = DjangoDialog(
- title, msgSuccess=self.tr("\nMessage catalogs updated successfully.")
+ title,
+ msgSuccess=self.tr("\nMessage catalogs updated successfully."),
+ parent=self.__ui,
)
res = dia.startProcess(args, wd)
if res:
@@ -3516,7 +3551,9 @@
return
dia = DjangoDialog(
- title, msgSuccess=self.tr("\nMessage catalogs updated successfully.")
+ title,
+ msgSuccess=self.tr("\nMessage catalogs updated successfully."),
+ parent=self.__ui,
)
res = dia.startProcess(args, wd)
if res:
@@ -3562,7 +3599,9 @@
return
dia = DjangoDialog(
- title, msgSuccess=self.tr("\nMessage catalogs compiled successfully.")
+ title,
+ msgSuccess=self.tr("\nMessage catalogs compiled successfully."),
+ parent=self.__ui,
)
res = dia.startBatchProcesses(argsLists, wd, mergedOutput=True)
if res:
@@ -3601,7 +3640,9 @@
return
dia = DjangoDialog(
- title, msgSuccess=self.tr("\nMessage catalogs compiled successfully.")
+ title,
+ msgSuccess=self.tr("\nMessage catalogs compiled successfully."),
+ parent=self.__ui,
)
res = dia.startProcess(args, wd, mergedOutput=True)
if res:
@@ -3656,6 +3697,7 @@
path,
self.getRecentApplications(),
self.__plugin.getPreferences("CheckDeployMode"),
+ parent=self.__ui,
)
if dlg.exec() == QDialog.DialogCode.Accepted:
deploy, tags, appsStr, settingsFile = dlg.getData()
@@ -3677,7 +3719,7 @@
args.append("--settings={0}".format(settingsFile))
args += apps
- dia = DjangoDialog(self.tr("Check Project"))
+ dia = DjangoDialog(self.tr("Check Project"), parent=self.__ui)
res = dia.startProcess(args, path, mergedOutput=True)
if res:
dia.exec()
