eric: comparison src/eric7/MicroPython/MicroPythonFileManagerWidget.py

-:f0e22f3a5878
+:2eed840795c0
 """
 super().__init__(parent)
 self.setupUi(self)
 self.__repl = parent
-self.__deviceWithLocalAccess = device.supportsLocalFileAccess()
+deviceWithLocalAccess = device.supportsLocalFileAccess()
 self.syncButton.setIcon(EricPixmapCache.getIcon("2rightarrow"))
 self.putButton.setIcon(EricPixmapCache.getIcon("1rightarrow"))
 self.putAsButton.setIcon(EricPixmapCache.getIcon("putAs"))
 self.getButton.setIcon(EricPixmapCache.getIcon("1leftarrow"))
 self.tr("Change Directory"), self.__changeDeviceDirectory
 )
 self.__deviceMenu.addAction(
 self.tr("Create Directory"), self.__createDeviceDirectory
 )
-if not self.__deviceWithLocalAccess:
+self.__devDelDirAct = self.__deviceMenu.addAction(
-self.__devDelDirAct = self.__deviceMenu.addAction(
+self.tr("Delete Directory"), self.__deleteDeviceDirectory
-self.tr("Delete Directory"), self.__deleteDeviceDirectory
+)
-)
 self.__devDelDirTreeAct = self.__deviceMenu.addAction(
 self.tr("Delete Directory Tree"), self.__deleteDeviceDirectoryTree
 )
 self.__deviceMenu.addSeparator()
 self.__devDelFileAct = self.__deviceMenu.addAction(
 or Preferences.getMultiProject("Workspace")
 or os.path.expanduser("~")
 )
 self.__listLocalFiles(dirname)
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 dirname = self.__repl.getDeviceWorkspace()
 if dirname:
 self.__listLocalFiles(dirname, True)
 return
 @param localDevice flag indicating device access via local file system
 @type bool
 """
 if not dirname:
 dirname = os.getcwd()
-if dirname.endswith(os.sep):
+if dirname != os.sep and dirname.endswith(os.sep):
 dirname = dirname[:-1]
 if localDevice:
 self.deviceCwd.setText(dirname)
 showHidden = Preferences.getMicroPython("ShowHiddenDevice")
 else:
 self.localFileTreeWidget.selectedItems()[0].text(0).endswith("/")
 )
 self.putButton.setEnabled(enable)
 self.putAsButton.setEnabled(enable)
+@pyqtSlot(str)
+def on_localCwd_textChanged(self, cwd):
+"""
+Public slot handling a change of the current local working directory.
+@param cwd current local working directory
+@type str
+"""
+self.localUpButton.setEnabled(cwd != os.sep)
 @pyqtSlot()
 def on_localUpButton_clicked(self):
 """
 Private slot to go up one directory level.
 """
 @param item reference to the activated item
 @type QTreeWidgetItem
 @param column column of the activation
 @type int
 """
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 name = os.path.join(self.deviceCwd.text(), item.text(0))
 if name.endswith("/"):
 # directory names end with a '/'
 self.__listLocalFiles(name[:-1], True)
 elif Utilities.MimeTypes.isTextFile(name):
 self.getAsButton.setEnabled(enable)
 self.openButton.setEnabled(enable)
 self.saveButton.setEnabled(enable)
+@pyqtSlot(str)
+def on_deviceCwd_textChanged(self, cwd):
+"""
+Public slot handling a change of the current device working directory.
+@param cwd current device working directory
+@type str
+"""
+self.deviceUpButton.setEnabled(cwd != "/")
 @pyqtSlot()
 def on_deviceUpButton_clicked(self):
 """
 Private slot to go up one directory level on the device.
 """
 cwd = self.deviceCwd.text()
 dirname = os.path.dirname(cwd)
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 self.__listLocalFiles(dirname, True)
 else:
 self.__fileManager.cd(dirname)
 @pyqtSlot()
 def on_deviceHomeButton_clicked(self):
 """
 Private slot to move to the device home directory.
 """
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 dirname = self.__repl.getDeviceWorkspace()
 if dirname:
 self.__listLocalFiles(dirname, True)
 return
 def on_deviceReloadButton_clicked(self):
 """
 Private slot to reload the device list.
 """
 dirname = self.deviceCwd.text()
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 self.__listLocalFiles(dirname, True)
 else:
 if dirname:
 self.__newDeviceList()
 else:
 if action == "cancel":
 return
 elif action == "rename":
 deviceFilename = os.path.basename(resultFilename)
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 shutil.copy2(
 os.path.join(self.localCwd.text(), filename),
 os.path.join(self.deviceCwd.text(), deviceFilename),
 )
 self.__listLocalFiles(self.deviceCwd.text(), localDevice=True)
 if action == "cancel":
 return
 elif action == "rename":
 localFilename = resultFilename
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 shutil.copy2(
 os.path.join(self.deviceCwd.text(), filename),
 os.path.join(self.localCwd.text(), localFilename),
 )
 self.__listLocalFiles(self.localCwd.text())
 """
 self.__fileManager.rsync(
 self.localCwd.text(),
 self.deviceCwd.text(),
 mirror=True,
-localDevice=self.__deviceWithLocalAccess,
+localDevice=self.__repl.deviceSupportsLocalFileAccess(),
 )
 @pyqtSlot(str, str)
 def __handleRsyncDone(self, localDir, deviceDir):
 """
 Private slot to open the selected file in a new editor.
 """
 selectedItems = self.deviceFileTreeWidget.selectedItems()
 if selectedItems:
 filename = selectedItems[0].text(0).strip()
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 name = os.path.join(self.deviceCwd.text(), filename)
 if not name.endswith("/") and Utilities.MimeTypes.isTextFile(name):
 ericApp().getObject("ViewManager").getEditor(name)
 else:
 cwd = self.deviceCwd.text()
 return
 elif action == "rename":
 filename = os.path.basename(resultFilename)
 text = aw.text()
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 with open(os.path.join(self.deviceCwd.text(), filename), "w") as f:
 f.write(text)
 else:
 deviceCwd = self.deviceCwd.text()
 if deviceCwd:
 isFile = not isDir
 else:
 isDir = False
 isFile = False
 if not self.__repl.isMicrobit():
-if not self.__deviceWithLocalAccess:
+self.__devDelDirAct.setEnabled(isDir)
-self.__devDelDirAct.setEnabled(isDir)
 self.__devDelDirTreeAct.setEnabled(isDir)
 self.__devDelFileAct.setEnabled(isFile)
 self.__deviceMenu.exec(self.deviceFileTreeWidget.mapToGlobal(pos))
 Private slot to change the current directory of the device.
 Note: This triggers a re-population of the device list for the new
 current directory.
 """
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 self.__changeLocalDirectory(True)
 else:
 dirPath, ok = QInputDialog.getText(
 self,
 self.tr("Change Directory"),
 @pyqtSlot()
 def __createDeviceDirectory(self):
 """
 Private slot to create a directory on the device.
 """
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 self.__createLocalDirectory(True)
 else:
 dirPath, ok = QInputDialog.getText(
 self,
 self.tr("Create Directory"),
 @pyqtSlot()
 def __deleteDeviceDirectory(self):
 """
 Private slot to delete an empty directory on the device.
 """
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 self.__deleteLocalDirectoryTree(True)
 else:
 if bool(len(self.deviceFileTreeWidget.selectedItems())):
 name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
 cwd = self.deviceCwd.text()
 def __deleteDeviceDirectoryTree(self):
 """
 Private slot to delete a directory and all its subdirectories
 recursively.
 """
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 self.__deleteLocalDirectoryTree(True)
 else:
 if bool(len(self.deviceFileTreeWidget.selectedItems())):
 name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
 cwd = self.deviceCwd.text()
 @pyqtSlot()
 def __deleteDeviceFile(self):
 """
 Private slot to delete a file.
 """
-if self.__deviceWithLocalAccess:
+if self.__repl.deviceSupportsLocalFileAccess():
 self.__deleteLocalFile(True)
 else:
 if bool(len(self.deviceFileTreeWidget.selectedItems())):
 name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
 dirname = self.deviceCwd.text()

Mercurial Repositories > eric / file comparison

comparison: src/eric7/MicroPython/MicroPythonFileManagerWidget.py

src/eric7/MicroPython/MicroPythonFileManagerWidget.py