Django Project: comparison ProjectDjango/Project.py

-:f497097bb0aa
+:b027b4f90994
 Public method to create a new form.
 @param path full directory path for the new form file
 @type str
 """
-fileFilters = self.tr(
+fileFilters = self.tr("HTML Files (*.html);;HTML Files (*.htm);;All Files (*)")
-"HTML Files (*.html);;HTML Files (*.htm);;All Files (*)"
-)
 fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
 self.__ui,
 self.tr("New Form"),
 path,
 fileFilters,
 "{1}</a></td></tr>"
 "</table></p>"
 ).format(version, url),
 modal=True,
 buttons=EricMessageBox.Ok,
+parent=self.__ui,
 )
 msgBox.setIconPixmap(
 EricPixmapCache.getPixmap(
 os.path.join(
 "ProjectDjango", "icons", "django64-{0}".format(self.__iconSuffix)
 args.append("startproject")
 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:
 dia.exec()
 return False
 args.append("startapp")
 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:
 dia.exec()
 return res
 try:
 path = self.__sitePath()
 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()
 def __databaseFlush(self):
 args.append("--noinput")
 if self.__currentDatabase:
 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:
 dia.exec()
 args.append("--database={0}".format(self.__currentDatabase))
 args += apps
 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()
 def __databaseSqlFlushDatabase(self):
 return
 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()
 args = []
 args.append(migration)
 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:
 dia.exec()
 self.tr("Apply Selected Migrations"),
 self.tr("""No migrations available."""),
 )
 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)
 def applyMigrations(self, app=None, migration=None):
 if app:
 args.append(app)
 if migration:
 args.append(migration)
-dia = DjangoDialog(title)
+dia = DjangoDialog(title, parent=self.__ui)
 res = dia.startProcess(args, path)
 if res:
 dia.exec()
 def __unapplyMigrations(self):
 """
 Private slot to generate migrations for the Django project.
 """
 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:
 self.setMostRecentApplication(apps)
 apps = apps.split()
 if merge:
 args.append("--merge")
 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()
 def __squashMigrations(self):
 self.tr("Squash Migrations"),
 self.tr("""No migrations available."""),
 )
 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()
 title = self.tr("Squash Migrations")
 args.append(app)
 if start:
 args.append(start)
 args.append(end)
-dia = DjangoDialog(title)
+dia = DjangoDialog(title, parent=self.__ui)
 res = dia.startProcess(args, path)
 if res:
 dia.exec()
 ##################################################################
 """
 from .DjangoDiffsettingsDataDialog import DjangoDiffsettingsDataDialog
 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()
 args = []
 args.append(self.__getPythonExecutable())
 try:
 path = self.__sitePath()
 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()
 def __runPythonShell(self):
 """
 from .DjangoSendTestEmailDataDialog import DjangoSendTestEmailDataDialog
 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()
 args = []
 args.append(self.__getPythonExecutable())
 dia = DjangoDialog(
 title,
 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:
 dia.exec()
 args.append("createcachetable")
 if self.__currentDatabase:
 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:
 dia.exec()
 try:
 wd = self.__sitePath()
 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()
 args = []
 args.append(self.__getPythonExecutable())
 fileFilters = self.tr("XML Files (*.xml)")
 elif dumpFormat == "yaml":
 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:
 dia.exec()
 try:
 wd = self.__sitePath()
 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()
 args = []
 args.append(self.__getPythonExecutable())
 args.append("--app={0}".format(appLabel))
 if self.__currentDatabase:
 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()
 def __runTestSuite(self, deprecation=False):
 wd = self.__sitePath()
 except DjangoNoSiteSelectedError:
 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()
 self.__plugin.setPreferences("KeepTestDatabase", keep)
 consoleCmd = self.__isSpawningConsole(
 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()
 args = Utilities.parseOptionString(consoleCmd)
 args[0] = getExecutablePath(args[0])
 args.append(self.__getPythonExecutable())
 args.append("manage.py")
 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:
 dia.exec()
 self.tr("No current site selected or no site created yet. Aborting..."),
 )
 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:
 dia.exec()
 None, title, self.tr("No locales detected. Aborting...")
 )
 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:
 dia.exec()
 None, title, self.tr("No locales detected. Aborting...")
 )
 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:
 dia.exec()
 self.tr("No current site selected or no site created yet. Aborting..."),
 )
 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:
 dia.exec()
 self.tr("No current site selected or no site created yet. Aborting..."),
 )
 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:
 dia.exec()
 None, title, self.tr("No locales detected. Aborting...")
 )
 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:
 dia.exec()
 self.tr("No current site selected or no site created yet. Aborting..."),
 )
 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:
 dia.exec()
 dlg = DjangoCheckOptionsDialog(
 self.__getPythonExecutable(),
 path,
 self.getRecentApplications(),
 self.__plugin.getPreferences("CheckDeployMode"),
+parent=self.__ui,
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
 deploy, tags, appsStr, settingsFile = dlg.getData()
 self.__plugin.setPreferences("CheckDeployMode", deploy)
 if appsStr != "":
 args.append("--deploy")
 if settingsFile:
 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()

Mercurial Repositories > Django Project / file comparison

comparison: ProjectDjango/Project.py

ProjectDjango/Project.py