Mercurial Repositories > eric / file comparison
comparison: src/eric7/Project/ProjectSourcesBrowser.py
src/eric7/Project/ProjectSourcesBrowser.py
- branch
- server
- changeset 10633
- dda7e43934dc
- parent 10631
- 00f5aae565a3
- child 10680
- 306373ccf8fd
equal
deleted
inserted
replaced
| 10632:1109854f15f9 | 10633:dda7e43934dc |
|---|---|
| 1125 Private method to add a new package to the project. | 1125 Private method to add a new package to the project. |
| 1126 """ | 1126 """ |
| 1127 from .NewPythonPackageDialog import NewPythonPackageDialog | 1127 from .NewPythonPackageDialog import NewPythonPackageDialog |
| 1128 | 1128 |
| 1129 isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()) | 1129 isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()) |
| 1130 remotefsInterface = ericApp().getObject("EricServer").getServiceInterface( | 1130 remotefsInterface = ( |
| 1131 "FileSystem" | 1131 ericApp().getObject("EricServer").getServiceInterface("FileSystem") |
| 1132 ) | 1132 ) |
| 1133 separator = remotefsInterface.separator() if isRemote else os.sep | 1133 separator = remotefsInterface.separator() if isRemote else os.sep |
| 1134 | 1134 |
| 1135 dn = self.currentDirectory(relative=True) | 1135 dn = self.currentDirectory(relative=True) |
| 1136 if dn.startswith(separator): | 1136 if dn.startswith(separator): |
| 1204 def __addNewSourceFile(self): | 1204 def __addNewSourceFile(self): |
| 1205 """ | 1205 """ |
| 1206 Private method to add a new source file to the project. | 1206 Private method to add a new source file to the project. |
| 1207 """ | 1207 """ |
| 1208 isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()) | 1208 isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()) |
| 1209 remotefsInterface = ericApp().getObject("EricServer").getServiceInterface( | 1209 remotefsInterface = ( |
| 1210 "FileSystem" | 1210 ericApp().getObject("EricServer").getServiceInterface("FileSystem") |
| 1211 ) | 1211 ) |
| 1212 | 1212 |
| 1213 dn = self.currentDirectory() | 1213 dn = self.currentDirectory() |
| 1214 filename, ok = EricPathPickerDialog.getStrPath( | 1214 filename, ok = EricPathPickerDialog.getStrPath( |
| 1215 self, | 1215 self, |
| 1453 def __showImportsDiagram(self): | 1453 def __showImportsDiagram(self): |
| 1454 """ | 1454 """ |
| 1455 Private method to handle the imports diagram context menu action. | 1455 Private method to handle the imports diagram context menu action. |
| 1456 """ | 1456 """ |
| 1457 isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()) | 1457 isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()) |
| 1458 remotefsInterface = ericApp().getObject("EricServer").getServiceInterface( | 1458 remotefsInterface = ( |
| 1459 "FileSystem" | 1459 ericApp().getObject("EricServer").getServiceInterface("FileSystem") |
| 1460 ) | 1460 ) |
| 1461 | 1461 |
| 1462 itm = self.model().item(self.currentIndex()) | 1462 itm = self.model().item(self.currentIndex()) |
| 1463 try: | 1463 try: |
| 1464 fn = itm.fileName() | 1464 fn = itm.fileName() |
| 1465 except AttributeError: | 1465 except AttributeError: |
| 1466 fn = itm.dirName() | 1466 fn = itm.dirName() |
| 1467 if isRemote: | 1467 package = ( |
| 1468 package = ( | 1468 fn |
| 1469 fn if remotefsInterface.isdir(fn) else remotefsInterface.dirname(fn) | 1469 if remotefsInterface.isdir(fn) |
| 1470 else ( | |
| 1471 remotefsInterface.dirname(fn) | |
| 1472 if isRemote | |
| 1473 else fn if os.path.isdir(fn) else os.path.dirname(fn) | |
| 1470 ) | 1474 ) |
| 1471 else: | 1475 ) |
| 1472 package = fn if os.path.isdir(fn) else os.path.dirname(fn) | |
| 1473 res = EricMessageBox.yesNo( | 1476 res = EricMessageBox.yesNo( |
| 1474 self, | 1477 self, |
| 1475 self.tr("Imports Diagram"), | 1478 self.tr("Imports Diagram"), |
| 1476 self.tr("""Include imports from external modules?"""), | 1479 self.tr("""Include imports from external modules?"""), |
| 1477 ) | 1480 ) |
| 1488 def __showPackageDiagram(self): | 1491 def __showPackageDiagram(self): |
| 1489 """ | 1492 """ |
| 1490 Private method to handle the package diagram context menu action. | 1493 Private method to handle the package diagram context menu action. |
| 1491 """ | 1494 """ |
| 1492 isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()) | 1495 isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()) |
| 1493 remotefsInterface = ericApp().getObject("EricServer").getServiceInterface( | 1496 remotefsInterface = ( |
| 1494 "FileSystem" | 1497 ericApp().getObject("EricServer").getServiceInterface("FileSystem") |
| 1495 ) | 1498 ) |
| 1496 | 1499 |
| 1497 itm = self.model().item(self.currentIndex()) | 1500 itm = self.model().item(self.currentIndex()) |
| 1498 try: | 1501 try: |
| 1499 fn = itm.fileName() | 1502 fn = itm.fileName() |
| 1500 except AttributeError: | 1503 except AttributeError: |
| 1501 fn = itm.dirName() | 1504 fn = itm.dirName() |
| 1502 if isRemote: | 1505 package = ( |
| 1503 package = ( | 1506 fn |
| 1504 fn if remotefsInterface.isdir(fn) else remotefsInterface.dirname(fn) | 1507 if remotefsInterface.isdir(fn) |
| 1508 else ( | |
| 1509 remotefsInterface.dirname(fn) | |
| 1510 if isRemote | |
| 1511 else fn if os.path.isdir(fn) else os.path.dirname(fn) | |
| 1505 ) | 1512 ) |
| 1506 else: | 1513 ) |
| 1507 package = fn if os.path.isdir(fn) else os.path.dirname(fn) | |
| 1508 res = EricMessageBox.yesNo( | 1514 res = EricMessageBox.yesNo( |
| 1509 self, | 1515 self, |
| 1510 self.tr("Package Diagram"), | 1516 self.tr("Package Diagram"), |
| 1511 self.tr("""Include class attributes?"""), | 1517 self.tr("""Include class attributes?"""), |
| 1512 yesDefault=True, | 1518 yesDefault=True, |
