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

-:4543b7876047
+:11245ac9c258
 self.localHomeButton.setIcon(EricPixmapCache.getIcon("home"))
 self.localReloadButton.setIcon(EricPixmapCache.getIcon("reload"))
 self.deviceUpButton.setIcon(EricPixmapCache.getIcon("1uparrow"))
 self.deviceHomeButton.setIcon(EricPixmapCache.getIcon("home"))
 self.deviceReloadButton.setIcon(EricPixmapCache.getIcon("reload"))
+self.openButton.setIcon(EricPixmapCache.getIcon("open"))
+self.saveButton.setIcon(EricPixmapCache.getIcon("fileSave"))
+self.saveAsButton.setIcon(EricPixmapCache.getIcon("fileSaveAs"))
 self.deviceUpButton.setEnabled(not self.__repl.isMicrobit())
 self.deviceHomeButton.setEnabled(not self.__repl.isMicrobit())
 self.putButton.setEnabled(False)
 self.putAsButton.setEnabled(False)
 self.getButton.setEnabled(False)
 self.getAsButton.setEnabled(False)
+self.openButton.setEnabled(False)
+self.saveButton.setEnabled(False)
 self.localFileTreeWidget.header().setSortIndicator(
 0, Qt.SortOrder.AscendingOrder
 )
 self.deviceFileTreeWidget.header().setSortIndicator(
 )
 self.__fileManager.removeDirectoryDone.connect(self.__newDeviceList)
 self.__fileManager.createDirectoryDone.connect(self.__newDeviceList)
 self.__fileManager.deleteFileDone.connect(self.__newDeviceList)
 self.__fileManager.fsinfoDone.connect(self.__fsInfoResultReceived)
+self.__fileManager.putDataDone.connect(self.__newDeviceList)
 self.__fileManager.error.connect(self.__handleError)
 self.localFileTreeWidget.customContextMenuRequested.connect(
 self.__showLocalContextMenu
 Public method to start the widget.
 """
 dirname = ""
 vm = ericApp().getObject("ViewManager")
 aw = vm.activeWindow()
-if aw:
+if aw and aw.isLocalFile():
 dirname = os.path.dirname(aw.getFileName())
 if not dirname:
 dirname = (
 Preferences.getMicroPython("MpyWorkspace")
 or Preferences.getMultiProject("Workspace")
 self.__listLocalFiles(name[:-1], True)
 elif Utilities.MimeTypes.isTextFile(name):
 ericApp().getObject("ViewManager").getEditor(name)
 else:
 cwd = self.deviceCwd.text()
-if cwd.endswith("/"):
+if cwd:
-name = cwd + item.text(0)
+name = (
+cwd + item.text(0)
+if cwd.endswith("/")
+else"{0}/{1}".format(cwd, item.text(0))
+)
 else:
-name = "{0}/{1}".format(cwd, item.text(0))
+name = item.text(0)
 if name.endswith("/"):
 # directory names end with a '/'
 self.__fileManager.cd(name[:-1])
+else:
+data = self.__fileManager.getData(name)
+text = data.decode(encoding = "utf-8")
+ericApp().getObject("ViewManager").newEditorWithText(
+text, "Python3", "device:{0}".format(name)
+)
 @pyqtSlot()
 def on_deviceFileTreeWidget_itemSelectionChanged(self):
 """
 Private slot handling a change of selection in the local pane.
 enable &= not (
 self.deviceFileTreeWidget.selectedItems()[0].text(0).endswith("/")
 )
 self.getButton.setEnabled(enable)
 self.getAsButton.setEnabled(enable)
+self.openButton.setEnabled(enable)
+self.saveButton.setEnabled(enable)
 @pyqtSlot()
 def on_deviceUpButton_clicked(self):
 """
 Private slot to go up one directory level on the device.
 """
 self.__fileManager.lls(
 self.deviceCwd.text(),
 showHidden=Preferences.getMicroPython("ShowHiddenDevice"),
 )
+@pyqtSlot()
+def on_openButton_clicked(self):
+"""
+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:
+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()
+if cwd:
+name = (
+cwd + filename
+if cwd.endswith("/")
+else"{0}/{1}".format(cwd, filename)
+)
+else:
+name = filename
+if not name.endswith("/"):
+data = self.__fileManager.getData(name)
+text = data.decode(encoding = "utf-8")
+ericApp().getObject("ViewManager").newEditorWithText(
+text, "Python3", "device:{0}".format(name)
+)
+@pyqtSlot()
+def on_saveButton_clicked(self, saveAs=False):
+"""
+Private slot to save the text of the current editor to a file on the device.
+"""
+aw = ericApp().getObject("ViewManager").activeWindow()
+if not aw:
+return
+selectedItems = self.deviceFileTreeWidget.selectedItems()
+if selectedItems:
+filename = selectedItems[0].text(0).strip()
+if filename.endswith("/"):
+saveAs = True
+else:
+saveAs = True
+if saveAs:
+filename, ok = QInputDialog.getText(
+self,
+self.tr("Save File As"),
+self.tr("Enter a new name for the file"),
+QLineEdit.EchoMode.Normal,
+filename,
+)
+if not ok or not filename:
+return
+if saveAs and self.__isFileInList(filename, self.deviceFileTreeWidget):
+# ask for overwrite permission
+action, resultFilename = confirmOverwrite(
+filename,
+self.tr("Save File As"),
+self.tr(
+"The given file exists already (Enter file name only)."
+),
+False,
+self,
+)
+if action == "cancel":
+return
+elif action == "rename":
+filename = os.path.basename(resultFilename)
+text = aw.text()
+if self.__deviceWithLocalAccess:
+with open(os.path.join(self.deviceCwd.text(), filename), "w") as f:
+f.write(text)
+else:
+deviceCwd = self.deviceCwd.text()
+if deviceCwd:
+filename = (
+deviceCwd + "/" + filename
+if deviceCwd != "/"
+else "/" + filename
+)
+self.__fileManager.putData(filename, text.encode("utf-8"))
+aw.setModified(False)
+@pyqtSlot()
+def on_saveAsButton_clicked(self):
+"""
+Private slot to save the current editor in a new file on the connected device.
+"""
+self.on_saveButton_clicked(saveAs=True)
 ##################################################################
 ## Context menu methods for the local files below
 ##################################################################

Mercurial Repositories > eric / file comparison

comparison: src/eric7/MicroPython/MicroPythonFileManagerWidget.py

src/eric7/MicroPython/MicroPythonFileManagerWidget.py