Mercurial Repositories > eric / file comparison
comparison: Project/Project.py
Project/Project.py
- branch
- maintenance
- changeset 6206
- a02b03b7bfec
- parent 6188
- 5a6ae3be31e6
- child 6209
- 05b9989c1977
equal
deleted
inserted
replaced
| 6205:ad8ed15f90e5 | 6206:a02b03b7bfec |
|---|---|
| 2335 for indicator, vcsData in list( | 2335 for indicator, vcsData in list( |
| 2336 pluginManager.getVcsSystemIndicators().items()): | 2336 pluginManager.getVcsSystemIndicators().items()): |
| 2337 if os.path.exists(os.path.join(self.ppath, indicator)): | 2337 if os.path.exists(os.path.join(self.ppath, indicator)): |
| 2338 if len(vcsData) > 1: | 2338 if len(vcsData) > 1: |
| 2339 vcsList = [] | 2339 vcsList = [] |
| 2340 for vcsSystemStr, vcsSystemDisplay in vcsData: | 2340 for _vcsSystemStr, vcsSystemDisplay in vcsData: |
| 2341 vcsList.append(vcsSystemDisplay) | 2341 vcsList.append(vcsSystemDisplay) |
| 2342 res, vcs_ok = QInputDialog.getItem( | 2342 res, vcs_ok = QInputDialog.getItem( |
| 2343 None, | 2343 None, |
| 2344 self.tr("New Project"), | 2344 self.tr("New Project"), |
| 2345 self.tr("Select Version Control System"), | 2345 self.tr("Select Version Control System"), |
| 2410 vcsSystemsDisplay, | 2410 vcsSystemsDisplay, |
| 2411 0, False) | 2411 0, False) |
| 2412 if ok and vcsSelected != self.tr("None"): | 2412 if ok and vcsSelected != self.tr("None"): |
| 2413 for vcsSystem, vcsSystemDisplay in vcsSystemsDict.items(): | 2413 for vcsSystem, vcsSystemDisplay in vcsSystemsDict.items(): |
| 2414 if vcsSystemDisplay == vcsSelected: | 2414 if vcsSystemDisplay == vcsSelected: |
| 2415 self.pdata["VCS"] = vcsSystem | |
| 2415 break | 2416 break |
| 2416 else: | 2417 else: |
| 2417 vcsSystem = "None" | 2418 self.pdata["VCS"] = 'None' |
| 2418 self.pdata["VCS"] = vcsSystem | |
| 2419 else: | 2419 else: |
| 2420 self.pdata["VCS"] = 'None' | 2420 self.pdata["VCS"] = 'None' |
| 2421 self.vcs = self.initVCS() | 2421 self.vcs = self.initVCS() |
| 2422 if self.vcs is not None: | 2422 if self.vcs is not None: |
| 2423 vcsdlg = self.vcs.vcsOptionsDialog(self, self.name) | 2423 vcsdlg = self.vcs.vcsOptionsDialog(self, self.name) |
| 2755 pluginManager.getVcsSystemIndicators().items(): | 2755 pluginManager.getVcsSystemIndicators().items(): |
| 2756 if os.path.exists( | 2756 if os.path.exists( |
| 2757 os.path.join(self.ppath, indicator)): | 2757 os.path.join(self.ppath, indicator)): |
| 2758 if len(vcsData) > 1: | 2758 if len(vcsData) > 1: |
| 2759 vcsList = [] | 2759 vcsList = [] |
| 2760 for vcsSystemStr, vcsSystemDisplay in \ | 2760 for _vcsSystemStr, vcsSystemDisplay in \ |
| 2761 vcsData: | 2761 vcsData: |
| 2762 vcsList.append(vcsSystemDisplay) | 2762 vcsList.append(vcsSystemDisplay) |
| 2763 QApplication.restoreOverrideCursor() | 2763 QApplication.restoreOverrideCursor() |
| 2764 res, vcs_ok = QInputDialog.getItem( | 2764 res, vcs_ok = QInputDialog.getItem( |
| 2765 None, | 2765 None, |
