--- a/src/eric7/RemoteServerInterface/EricServerFileDialog.py Thu Feb 22 16:26:46 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerFileDialog.py Thu Feb 22 16:34:43 2024 +0100 @@ -95,8 +95,8 @@ self.__contextMenu = QMenu(self) - self.__fsInterface = ericApp().getObject("EricServer").getServiceInterface( - "FileSystem" + self.__fsInterface = ( + ericApp().getObject("EricServer").getServiceInterface("FileSystem") ) # set some default values @@ -335,9 +335,7 @@ @param column column number (unused) @type int """ - if ( - item.data(0, EricServerFileDialog.IsDirectoryRole) - ): + if item.data(0, EricServerFileDialog.IsDirectoryRole): self.setDirectory(self.__getFullPath(item.text(0))) else: self.accept() @@ -365,9 +363,7 @@ if len(selected) == 1: self.nameEdit.setText(selected[0]) elif len(selected) > 1: - self.nameEdit.setText( - '"{0}"'.format('" "'.join(selected)) - ) + self.nameEdit.setText('"{0}"'.format('" "'.join(selected))) self.__updateOkButton() @@ -445,14 +441,10 @@ elif self.__fileMode == FileMode.AnyFile: self.okButton.setEnabled(bool(self.nameEdit.text())) elif self.__fileMode == FileMode.ExistingFile: - self.okButton.setEnabled( - self.nameEdit.text() in self.__filenameCache - ) + self.okButton.setEnabled(self.nameEdit.text() in self.__filenameCache) elif self.__fileMode == FileMode.ExistingFiles: names = self.__getNames() - self.okButton.setEnabled( - all(n in self.__filenameCache for n in names) - ) + self.okButton.setEnabled(all(n in self.__filenameCache for n in names)) elif self.__fileMode == FileMode.Directory: self.okButton.setEnabled(True) else: @@ -517,7 +509,7 @@ for dirEntry in sorted( dirListing, key=lambda d: ( - " " + d['name'].lower() if d["is_dir"] else d["name"].lower() + " " + d["name"].lower() if d["is_dir"] else d["name"].lower() ), ): if dirEntry["is_dir"]: @@ -531,8 +523,7 @@ sizeStr = dataString(dirEntry["size"], QLocale.system()) self.__filenameCache.append(dirEntry["name"]) itm = QTreeWidgetItem( - self.listing, - [dirEntry["name"], sizeStr, type_, dirEntry["mtime"]] + self.listing, [dirEntry["name"], sizeStr, type_, dirEntry["mtime"]] ) itm.setIcon(0, EricPixmapCache.getIcon(iconName)) itm.setTextAlignment(1, Qt.AlignmentFlag.AlignRight) @@ -635,8 +626,7 @@ self, title, self.tr( - "<p>The renaming operation failed.</p>" - "<p>Reason: {0}</p>" + "<p>The renaming operation failed.</p><p>Reason: {0}</p>" ).format(error if error else self.tr("Unknown")), ) @@ -675,8 +665,7 @@ self, title, self.tr( - "<p>The deletion operation failed.</p>" - "<p>Reason: {0}</p>" + "<p>The deletion operation failed.</p><p>Reason: {0}</p>" ).format(error if error else self.tr("Unknown")), ) @@ -695,7 +684,7 @@ def selectedFiles(self): """ Public method to get the selected files or the current viewport path. - + @return selected files or current viewport path @rtype str """ @@ -707,7 +696,7 @@ def selectedNameFilter(self): """ Public method to get the selected name filter. - + @return selected name filter @rtype str """ @@ -737,9 +726,8 @@ for row in range(self.listing.topLevelItemCount()): itm = self.listing.topLevelItem(row) name = itm.text(0) - if ( - self.__dirsOnly - and not itm.data(0, EricServerFileDialog.IsDirectoryRole) + if self.__dirsOnly and not itm.data( + 0, EricServerFileDialog.IsDirectoryRole ): itm.setHidden(True) elif not self.__showHidden and self.__isHidden(name): @@ -755,14 +743,19 @@ for column in range(4): self.listing.resizeColumnToContents(column) + ########################################################################### ## Module functions mimicing the interface of EricFileDialog/QFileDialog ########################################################################### def getOpenFileName( - parent=None, caption="", directory="", filterStr="", initialFilter="", - withRemote=True + parent=None, + caption="", + directory="", + filterStr="", + initialFilter="", + withRemote=True, ): """ Module function to get the name of a file for opening it. @@ -789,8 +782,12 @@ def getOpenFileNameAndFilter( - parent=None, caption="", directory="", filterStr="", initialFilter="", - withRemote=True + parent=None, + caption="", + directory="", + filterStr="", + initialFilter="", + withRemote=True, ): """ Module function to get the name of a file for opening it and the selected @@ -832,8 +829,12 @@ def getOpenFileNames( - parent=None, caption="", directory="", filterStr="", initialFilter="", - withRemote=True + parent=None, + caption="", + directory="", + filterStr="", + initialFilter="", + withRemote=True, ): """ Module function to get a list of names of files for opening. @@ -860,8 +861,12 @@ def getOpenFileNamesAndFilter( - parent=None, caption="", directory="", filterStr="", initialFilter="", - withRemote=True + parent=None, + caption="", + directory="", + filterStr="", + initialFilter="", + withRemote=True, ): """ Module function to get a list of names of files for opening and the @@ -905,8 +910,12 @@ def getSaveFileName( - parent=None, caption="", directory="", filterStr="", initialFilter="", - withRemote=True + parent=None, + caption="", + directory="", + filterStr="", + initialFilter="", + withRemote=True, ): """ Module function to get the name of a file for saving. @@ -933,8 +942,12 @@ def getSaveFileNameAndFilter( - parent=None, caption="", directory="", filterStr="", initialFilter="", - withRemote=True + parent=None, + caption="", + directory="", + filterStr="", + initialFilter="", + withRemote=True, ): """ Module function to get the name of a file for saving and the selected file name