Mercurial Repositories > eric / file comparison
comparison: src/eric7/RemoteServerInterface/EricServerFileDialog.py
src/eric7/RemoteServerInterface/EricServerFileDialog.py
- branch
- server
- changeset 10630
- 552a790fd9bc
- parent 10610
- bb0149571d94
- child 10633
- dda7e43934dc
equal
deleted
inserted
replaced
| 10629:b0d14cba79b1 | 10630:552a790fd9bc |
|---|---|
| 120 self.reloadButton.clicked.connect(self.__reload) | 120 self.reloadButton.clicked.connect(self.__reload) |
| 121 self.cancelButton.clicked.connect(self.reject) | 121 self.cancelButton.clicked.connect(self.reject) |
| 122 | 122 |
| 123 self.treeCombo.currentTextChanged.connect(self.setDirectory) | 123 self.treeCombo.currentTextChanged.connect(self.setDirectory) |
| 124 | 124 |
| 125 if self.__fsInterface.isfile(directory): | 125 self.setDirectory(directory) |
| 126 directory = self.__fsInterface.dirname(directory) | |
| 127 self.setDirectory(FileSystemUtilities.plainFileName(directory)) | |
| 128 | 126 |
| 129 def acceptMode(self): | 127 def acceptMode(self): |
| 130 """ | 128 """ |
| 131 Public method to get the accept mode of the dialog. | 129 Public method to get the accept mode of the dialog. |
| 132 | 130 |
| 485 server's current directory. | 483 server's current directory. |
| 486 @type str | 484 @type str |
| 487 """ | 485 """ |
| 488 self.__filenameCache.clear() | 486 self.__filenameCache.clear() |
| 489 self.__directoryCache.clear() | 487 self.__directoryCache.clear() |
| 488 | |
| 489 if self.__fsInterface.isfile(directory): | |
| 490 directory, basename = self.__fsInterface.split(directory) | |
| 491 else: | |
| 492 basename = "" | |
| 490 | 493 |
| 491 try: | 494 try: |
| 492 directory, sep, dirListing = self.__fsInterface.listdir(directory) | 495 directory, sep, dirListing = self.__fsInterface.listdir(directory) |
| 493 | 496 |
| 494 self.__sep = sep | 497 self.__sep = sep |
| 526 type_ = self.tr("File") | 529 type_ = self.tr("File") |
| 527 iconName = self.__iconProvider.fileIconName(dirEntry["name"]) | 530 iconName = self.__iconProvider.fileIconName(dirEntry["name"]) |
| 528 sizeStr = dataString(dirEntry["size"], QLocale.system()) | 531 sizeStr = dataString(dirEntry["size"], QLocale.system()) |
| 529 self.__filenameCache.append(dirEntry["name"]) | 532 self.__filenameCache.append(dirEntry["name"]) |
| 530 itm = QTreeWidgetItem( | 533 itm = QTreeWidgetItem( |
| 531 self.listing, [dirEntry["name"], sizeStr, type_, dirEntry["mtime"]] | 534 self.listing, [ |
| 535 dirEntry["name"], sizeStr, type_, dirEntry["mtime_str"] | |
| 536 ] | |
| 532 ) | 537 ) |
| 533 itm.setIcon(0, EricPixmapCache.getIcon(iconName)) | 538 itm.setIcon(0, EricPixmapCache.getIcon(iconName)) |
| 534 itm.setTextAlignment(1, Qt.AlignmentFlag.AlignRight) | 539 itm.setTextAlignment(1, Qt.AlignmentFlag.AlignRight) |
| 535 itm.setTextAlignment(2, Qt.AlignmentFlag.AlignHCenter) | 540 itm.setTextAlignment(2, Qt.AlignmentFlag.AlignHCenter) |
| 536 itm.setData(0, EricServerFileDialog.IsDirectoryRole, dirEntry["is_dir"]) | 541 itm.setData(0, EricServerFileDialog.IsDirectoryRole, dirEntry["is_dir"]) |
| 553 " reported by the eric-ide server.</p><p>Reason: {1}</p>" | 558 " reported by the eric-ide server.</p><p>Reason: {1}</p>" |
| 554 ).format(directory, str(err)), | 559 ).format(directory, str(err)), |
| 555 ) | 560 ) |
| 556 | 561 |
| 557 # 4. update some dependent states | 562 # 4. update some dependent states |
| 558 self.nameEdit.clear() | 563 if basename: |
| 564 self.nameEdit.setText(basename) | |
| 565 else: | |
| 566 self.nameEdit.clear() | |
| 559 self.__updateUpButton() | 567 self.__updateUpButton() |
| 560 | 568 |
| 561 @pyqtSlot(QPoint) | 569 @pyqtSlot(QPoint) |
| 562 def on_listing_customContextMenuRequested(self, pos): | 570 def on_listing_customContextMenuRequested(self, pos): |
| 563 """ | 571 """ |
