Mercurial Repositories > eric / file diff

--- a/eric6/Project/Project.py	Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/Project/Project.py	Tue Oct 06 17:52:44 2020 +0200
@@ -1284,7 +1284,7 @@
         """
         from .DebuggerPropertiesDialog import DebuggerPropertiesDialog
         dlg = DebuggerPropertiesDialog(self)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             dlg.storeData()
         
     def getDebugProperty(self, key):
@@ -1376,7 +1376,7 @@
         
         from .AddLanguageDialog import AddLanguageDialog
         dlg = AddLanguageDialog(self.parent())
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             lang = dlg.getSelectedLanguage()
             if self.pdata["PROJECTTYPE"] in [
                 "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
@@ -1620,7 +1620,7 @@
         from .AddFileDialog import AddFileDialog
         dlg = AddFileDialog(self, self.parent(), fileTypeFilter,
                             startdir=startdir)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             fnames, target, isSource = dlg.getData()
             if target != '':
                 for fn in fnames:
@@ -1786,7 +1786,7 @@
         from .AddDirectoryDialog import AddDirectoryDialog
         dlg = AddDirectoryDialog(
             self, fileTypeFilter, self.parent(), startdir=startdir)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             filetype, source, target, recursive = dlg.getData()
             if target == '':
                 E5MessageBox.critical(
@@ -2284,7 +2284,7 @@
             
         from .PropertiesDialog import PropertiesDialog
         dlg = PropertiesDialog(self, True)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             self.closeProject()
             dlg.storeData()
             self.pdata["VCS"] = 'None'
@@ -2518,7 +2518,7 @@
                                     VcsCommandOptionsDialog
                                 )
                                 codlg = VcsCommandOptionsDialog(self.vcs)
-                                if codlg.exec_() == QDialog.Accepted:
+                                if codlg.exec() == QDialog.Accepted:
                                     self.vcs.vcsSetOptions(codlg.getOptions())
                             # add project file to repository
                             if res == 0:
@@ -2570,7 +2570,7 @@
                 self.vcs = self.initVCS()
                 if self.vcs is not None:
                     vcsdlg = self.vcs.vcsOptionsDialog(self, self.name)
-                    if vcsdlg.exec_() == QDialog.Accepted:
+                    if vcsdlg.exec() == QDialog.Accepted:
                         vcsDataDict = vcsdlg.getData()
                     else:
                         self.pdata["VCS"] = 'None'
@@ -2592,7 +2592,7 @@
                             VcsCommandOptionsDialog
                         )
                         codlg = VcsCommandOptionsDialog(self.vcs)
-                        if codlg.exec_() == QDialog.Accepted:
+                        if codlg.exec() == QDialog.Accepted:
                             self.vcs.vcsSetOptions(codlg.getOptions())
                     
                     # create the project in the VCS
@@ -2709,7 +2709,7 @@
         """
         from .PropertiesDialog import PropertiesDialog
         dlg = PropertiesDialog(self, False)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             projectType = self.pdata["PROJECTTYPE"]
             dlg.storeData()
             self.setDirty(True)
@@ -2784,7 +2784,7 @@
         
         from .UserPropertiesDialog import UserPropertiesDialog
         dlg = UserPropertiesDialog(self)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             dlg.storeData()
             
             if (
@@ -2829,7 +2829,7 @@
         """
         from .FiletypeAssociationDialog import FiletypeAssociationDialog
         dlg = FiletypeAssociationDialog(self)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             dlg.transferData()
             self.setDirty(True)
             self.__reorganizeFiles()
@@ -2840,7 +2840,7 @@
         """
         from .LexerAssociationDialog import LexerAssociationDialog
         dlg = LexerAssociationDialog(self)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             dlg.transferData()
             self.setDirty(True)
             self.lexerAssociationsChanged.emit()
@@ -4700,7 +4700,7 @@
         # autoInclude is not set, show a dialog
         from .AddFoundFilesDialog import AddFoundFilesDialog
         dlg = AddFoundFilesDialog(newFiles, self.parent(), None)
-        res = dlg.exec_()
+        res = dlg.exec()
         
         # the 'Add All' button was pressed
         if res == 1:
@@ -5324,7 +5324,7 @@
                 sorted(pkglists), title=self.tr("Create Plugin Archive"),
                 message=self.tr("Select package lists:"),
                 checkBoxSelection=True)
-            if dlg.exec_() == QDialog.Accepted:
+            if dlg.exec() == QDialog.Accepted:
                 selectedLists = [os.path.join(self.ppath, s)
                                  for s in dlg.getSelection()]
             else: