Mercurial Repositories > eric / file comparison
comparison: VCS/ProjectHelper.py
VCS/ProjectHelper.py
- changeset 538
- 7f1a56e80124
- parent 537
- 72b32daeb8d6
- child 543
- a558e3cb7b5a
equal
deleted
inserted
replaced
| 537:72b32daeb8d6 | 538:7f1a56e80124 |
|---|---|
| 153 self.project.closeProject() | 153 self.project.closeProject() |
| 154 projectdir, vcsDataDict = vcsdlg.getData() | 154 projectdir, vcsDataDict = vcsdlg.getData() |
| 155 self.project.pdata["VCS"] = [vcsSystem] | 155 self.project.pdata["VCS"] = [vcsSystem] |
| 156 self.project.vcs = self.project.initVCS(vcsSystem) | 156 self.project.vcs = self.project.initVCS(vcsSystem) |
| 157 # edit VCS command options | 157 # edit VCS command options |
| 158 vcores = QMessageBox.question(self.parent(), | 158 vcores = E5MessageBox.question(self.parent(), |
| 159 self.trUtf8("New Project"), | 159 self.trUtf8("New Project"), |
| 160 self.trUtf8("""Would you like to edit the VCS command options?"""), | 160 self.trUtf8("""Would you like to edit the VCS command options?"""), |
| 161 QMessageBox.StandardButtons(\ | 161 QMessageBox.StandardButtons(\ |
| 162 QMessageBox.No | \ | 162 QMessageBox.No | \ |
| 163 QMessageBox.Yes), | 163 QMessageBox.Yes), |
| 210 self.project.pdata["VCS"] = ['None'] | 210 self.project.pdata["VCS"] = ['None'] |
| 211 self.project.vcs = self.project.initVCS() | 211 self.project.vcs = self.project.initVCS() |
| 212 self.project.setDirty(True) | 212 self.project.setDirty(True) |
| 213 self.project.saveProject() | 213 self.project.saveProject() |
| 214 else: | 214 else: |
| 215 res = QMessageBox.question(self.parent(), | 215 res = E5MessageBox.question(self.parent(), |
| 216 self.trUtf8("New project from repository"), | 216 self.trUtf8("New project from repository"), |
| 217 self.trUtf8("The project retrieved from the repository" | 217 self.trUtf8("The project retrieved from the repository" |
| 218 " does not contain an eric project file" | 218 " does not contain an eric project file" |
| 219 " (*.e4p *.e4pz)." | 219 " (*.e4p *.e4pz)." |
| 220 " Create it?"), | 220 " Create it?"), |
| 241 ms = "" | 241 ms = "" |
| 242 self.project.newProjectAddFiles(ms) | 242 self.project.newProjectAddFiles(ms) |
| 243 self.project.saveProject() | 243 self.project.saveProject() |
| 244 self.project.openProject(self.project.pfile) | 244 self.project.openProject(self.project.pfile) |
| 245 if not export: | 245 if not export: |
| 246 res = QMessageBox.question(self.parent(), | 246 res = E5MessageBox.question(self.parent(), |
| 247 self.trUtf8("New project from repository"), | 247 self.trUtf8("New project from repository"), |
| 248 self.trUtf8("Shall the project file be added to" | 248 self.trUtf8("Shall the project file be added to" |
| 249 " the repository?"), | 249 " the repository?"), |
| 250 QMessageBox.StandardButtons(\ | 250 QMessageBox.StandardButtons(\ |
| 251 QMessageBox.No | \ | 251 QMessageBox.No | \ |
| 321 if self.project.vcs is not None: | 321 if self.project.vcs is not None: |
| 322 vcsdlg = self.project.vcs.vcsOptionsDialog(self.project, self.project.name, 1) | 322 vcsdlg = self.project.vcs.vcsOptionsDialog(self.project, self.project.name, 1) |
| 323 if vcsdlg.exec_() == QDialog.Accepted: | 323 if vcsdlg.exec_() == QDialog.Accepted: |
| 324 vcsDataDict = vcsdlg.getData() | 324 vcsDataDict = vcsdlg.getData() |
| 325 # edit VCS command options | 325 # edit VCS command options |
| 326 vcores = QMessageBox.question(self.parent(), | 326 vcores = E5MessageBox.question(self.parent(), |
| 327 self.trUtf8("Import Project"), | 327 self.trUtf8("Import Project"), |
| 328 self.trUtf8("""Would you like to edit the VCS command options?"""), | 328 self.trUtf8("""Would you like to edit the VCS command options?"""), |
| 329 QMessageBox.StandardButtons(\ | 329 QMessageBox.StandardButtons(\ |
| 330 QMessageBox.No | \ | 330 QMessageBox.No | \ |
| 331 QMessageBox.Yes), | 331 QMessageBox.Yes), |
| 354 """ | 354 """ |
| 355 Protected slot used to update the local project from the repository. | 355 Protected slot used to update the local project from the repository. |
| 356 """ | 356 """ |
| 357 shouldReopen = self.vcs.vcsUpdate(self.project.ppath) | 357 shouldReopen = self.vcs.vcsUpdate(self.project.ppath) |
| 358 if shouldReopen: | 358 if shouldReopen: |
| 359 res = QMessageBox.question(self.parent(), | 359 res = E5MessageBox.question(self.parent(), |
| 360 self.trUtf8("Update"), | 360 self.trUtf8("Update"), |
| 361 self.trUtf8("""The project should be reread. Do this now?"""), | 361 self.trUtf8("""The project should be reread. Do this now?"""), |
| 362 QMessageBox.StandardButtons(\ | 362 QMessageBox.StandardButtons(\ |
| 363 QMessageBox.No | \ | 363 QMessageBox.No | \ |
| 364 QMessageBox.Yes), | 364 QMessageBox.Yes), |
| 381 Protected slot used to remove the local project from the repository. | 381 Protected slot used to remove the local project from the repository. |
| 382 | 382 |
| 383 Depending on the parameters set in the vcs object the project | 383 Depending on the parameters set in the vcs object the project |
| 384 may be removed from the local disk as well. | 384 may be removed from the local disk as well. |
| 385 """ | 385 """ |
| 386 res = QMessageBox.question(self.parent(), | 386 res = E5MessageBox.question(self.parent(), |
| 387 self.trUtf8("Remove project from repository"), | 387 self.trUtf8("Remove project from repository"), |
| 388 self.trUtf8("Dou you really want to remove this project from" | 388 self.trUtf8("Dou you really want to remove this project from" |
| 389 " the repository (and disk)?"), | 389 " the repository (and disk)?"), |
| 390 QMessageBox.StandardButtons(\ | 390 QMessageBox.StandardButtons(\ |
| 391 QMessageBox.No | \ | 391 QMessageBox.No | \ |
