eric: comparison src/eric7/RemoteServerInterface/EricServerFileDialog.py

-:ea35c92a3c7c
+:fbe93720ee9f
 self.__nameCompleter.activated.connect(self.__nameCompleterActivated)
 self.nameEdit.setCompleter(self.__nameCompleter)
 self.__contextMenu = QMenu(self)
-self.__fsInterface = ericApp().getObject("EricServer").getServiceInterface(
+self.__fsInterface = (
-"FileSystem"
+ericApp().getObject("EricServer").getServiceInterface("FileSystem")
 )
 # set some default values
 self.__fileMode = FileMode.ExistingFile
 self.__dirsOnly = False
 @param item reference to the activated item
 @type QTreeWidgetItem
 @param column column number (unused)
 @type int
 """
-if (
+if item.data(0, EricServerFileDialog.IsDirectoryRole):
-item.data(0, EricServerFileDialog.IsDirectoryRole)
-):
 self.setDirectory(self.__getFullPath(item.text(0)))
 else:
 self.accept()
 @pyqtSlot()
 selected.append(itm.text(0))
 if len(selected) == 1:
 self.nameEdit.setText(selected[0])
 elif len(selected) > 1:
-self.nameEdit.setText(
+self.nameEdit.setText('"{0}"'.format('" "'.join(selected)))
-'"{0}"'.format('" "'.join(selected))
-)
 self.__updateOkButton()
 @pyqtSlot()
 def __nameCompleterActivated(self):
 if self.__selectedDirectory and self.__fileMode != FileMode.Directory:
 self.okButton.setEnabled(True)
 elif self.__fileMode == FileMode.AnyFile:
 self.okButton.setEnabled(bool(self.nameEdit.text()))
 elif self.__fileMode == FileMode.ExistingFile:
-self.okButton.setEnabled(
+self.okButton.setEnabled(self.nameEdit.text() in self.__filenameCache)
-self.nameEdit.text() in self.__filenameCache
-)
 elif self.__fileMode == FileMode.ExistingFiles:
 names = self.__getNames()
-self.okButton.setEnabled(
+self.okButton.setEnabled(all(n in self.__filenameCache for n in names))
-all(n in self.__filenameCache for n in names)
-)
 elif self.__fileMode == FileMode.Directory:
 self.okButton.setEnabled(True)
 else:
 self.okButton.setEnabled(False)
 # 2. populate the directory listing
 self.listing.clear()
 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"]:
 type_ = self.tr("Directory")
 iconName = "dirClosed"
 type_ = self.tr("File")
 iconName = self.__iconProvider.fileIconName(dirEntry["name"])
 sizeStr = dataString(dirEntry["size"], QLocale.system())
 self.__filenameCache.append(dirEntry["name"])
 itm = QTreeWidgetItem(
-self.listing,
+self.listing, [dirEntry["name"], sizeStr, type_, dirEntry["mtime"]]
-[dirEntry["name"], sizeStr, type_, dirEntry["mtime"]]
 )
 itm.setIcon(0, EricPixmapCache.getIcon(iconName))
 itm.setTextAlignment(1, Qt.AlignmentFlag.AlignRight)
 itm.setTextAlignment(2, Qt.AlignmentFlag.AlignHCenter)
 itm.setData(0, EricServerFileDialog.IsDirectoryRole, dirEntry["is_dir"])
 else:
 EricMessageBox.critical(
 self,
 title,
 self.tr(
-"<p>The renaming operation failed.</p>"
+"<p>The renaming operation failed.</p><p>Reason: {0}</p>"
-"<p>Reason: {0}</p>"
 ).format(error if error else self.tr("Unknown")),
 )
 @pyqtSlot(QTreeWidgetItem)
 def __deleteItem(self, item):
 else:
 EricMessageBox.critical(
 self,
 title,
 self.tr(
-"<p>The deletion operation failed.</p>"
+"<p>The deletion operation failed.</p><p>Reason: {0}</p>"
-"<p>Reason: {0}</p>"
 ).format(error if error else self.tr("Unknown")),
 )
 @pyqtSlot(bool)
 def __showHiddenToggled(self, on):
 self.__filterList(filters)
 def selectedFiles(self):
 """
 Public method to get the selected files or the current viewport path.
 @return selected files or current viewport path
 @rtype str
 """
 if self.__fileMode == FileMode.Directory and not self.nameEdit.text():
 return [self.treeCombo.currentText()]
 return [self.__getFullPath(n) for n in self.__getNames()]
 def selectedNameFilter(self):
 """
 Public method to get the selected name filter.
 @return selected name filter
 @rtype str
 """
 return self.filterCombo.currentText()
 """
 self.listing.clearSelection()
 for row in range(self.listing.topLevelItemCount()):
 itm = self.listing.topLevelItem(row)
 name = itm.text(0)
-if (
+if self.__dirsOnly and not itm.data(
-self.__dirsOnly
+0, EricServerFileDialog.IsDirectoryRole
-and not itm.data(0, EricServerFileDialog.IsDirectoryRole)
 ):
 itm.setHidden(True)
 elif not self.__showHidden and self.__isHidden(name):
 # applies to files and directories
 itm.setHidden(True)
 # resize the columns
 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="",
+parent=None,
-withRemote=True
+caption="",
+directory="",
+filterStr="",
+initialFilter="",
+withRemote=True,
 ):
 """
 Module function to get the name of a file for opening it.
 @param parent parent widget of the dialog (defaults to None)
 parent, caption, directory, filterStr, initialFilter, withRemote
 )[0]
 def getOpenFileNameAndFilter(
-parent=None, caption="", directory="", filterStr="", initialFilter="",
+parent=None,
-withRemote=True
+caption="",
+directory="",
+filterStr="",
+initialFilter="",
+withRemote=True,
 ):
 """
 Module function to get the name of a file for opening it and the selected
 file name filter.
 return fileName, selectedFilter
 def getOpenFileNames(
-parent=None, caption="", directory="", filterStr="", initialFilter="",
+parent=None,
-withRemote=True
+caption="",
+directory="",
+filterStr="",
+initialFilter="",
+withRemote=True,
 ):
 """
 Module function to get a list of names of files for opening.
 @param parent parent widget of the dialog (defaults to None)
 parent, caption, directory, filterStr, initialFilter, withRemote
 )[0]
 def getOpenFileNamesAndFilter(
-parent=None, caption="", directory="", filterStr="", initialFilter="",
+parent=None,
-withRemote=True
+caption="",
+directory="",
+filterStr="",
+initialFilter="",
+withRemote=True,
 ):
 """
 Module function to get a list of names of files for opening and the
 selected file name filter.
 return filesList, selectedFilter
 def getSaveFileName(
-parent=None, caption="", directory="", filterStr="", initialFilter="",
+parent=None,
-withRemote=True
+caption="",
+directory="",
+filterStr="",
+initialFilter="",
+withRemote=True,
 ):
 """
 Module function to get the name of a file for saving.
 @param parent parent widget of the dialog (defaults to None)
 parent, caption, directory, filterStr, initialFilter, withRemote
 )[0]
 def getSaveFileNameAndFilter(
-parent=None, caption="", directory="", filterStr="", initialFilter="",
+parent=None,
-withRemote=True
+caption="",
+directory="",
+filterStr="",
+initialFilter="",
+withRemote=True,
 ):
 """
 Module function to get the name of a file for saving and the selected file name
 filter.

Mercurial Repositories > eric / file comparison

comparison: src/eric7/RemoteServerInterface/EricServerFileDialog.py

src/eric7/RemoteServerInterface/EricServerFileDialog.py