diff -r 7d955b1995d5 -r eb28b4b6f7f5 ProjectPyramid/ConfigurationPage/PyramidPage.py
--- a/ProjectPyramid/ConfigurationPage/PyramidPage.py Sat May 29 15:05:16 2021 +0200
+++ b/ProjectPyramid/ConfigurationPage/PyramidPage.py Tue Jun 01 19:37:46 2021 +0200
@@ -7,18 +7,16 @@
Module implementing the Pyramid configuration page.
"""
-from PyQt5.QtCore import pyqtSlot
+from PyQt6.QtCore import pyqtSlot
-from E5Gui.E5Completers import E5DirCompleter
-from E5Gui import E5FileDialog
-from E5Gui.E5Application import e5App
+from EricWidgets.EricApplication import ericApp
+from EricWidgets.EricPathPicker import EricPathPickerModes
from Preferences.ConfigurationPages.ConfigurationPageBase import (
ConfigurationPageBase
)
from .Ui_PyramidPage import Ui_PyramidPage
-import Utilities
import UI.PixmapCache
from Globals import isWindowsPlatform, isMacPlatform
@@ -33,6 +31,7 @@
Constructor
@param plugin reference to the plugin object
+ @type ProjectPyramidPlugin
"""
super().__init__()
self.setupUi(self)
@@ -48,28 +47,27 @@
consoleList.append("/opt/X11/bin/xterm -e")
else:
consoleList.append("@konsole --workdir . -e")
- # KDE4/5 konsole spawns
+ # KDE 5 konsole spawns
consoleList.append("gnome-terminal -e")
consoleList.append("mate-terminal -e")
consoleList.append("xfce4-terminal -e")
consoleList.append("xterm -e")
self.consoleCommandCombo.addItems(consoleList)
- self.virtualEnvPy3Button.setIcon(UI.PixmapCache.getIcon("open"))
- self.translationsButton.setIcon(UI.PixmapCache.getIcon("open"))
self.urlResetButton.setIcon(UI.PixmapCache.getIcon("editUndo"))
- self.virtualEnvPy3Completer = E5DirCompleter(self.virtualEnvPy3Edit)
-
self.py3ShellCombo.addItem(self.tr("Plain Python"), "python")
self.py3ShellCombo.addItem(self.tr("IPython"), "ipython")
self.py3ShellCombo.addItem(self.tr("bpython"), "bpython")
- venvManager = e5App().getObject("VirtualEnvManager")
+ venvManager = ericApp().getObject("VirtualEnvManager")
self.py3VenvNameComboBox.addItems(
[""] + sorted(venvManager.getVirtualenvNames()))
- self.pyramidVirtualEnvPy3Group.hide()
+
+ self.translationsEditorPicker.setMode(
+ EricPathPickerModes.OPEN_FILE_MODE)
+ self.translationsEditorPicker.setFilters(self.tr("All Files (*)"))
# set initial values
self.consoleCommandCombo.setEditText(
@@ -91,7 +89,7 @@
self.urlEdit.setText(
self.__plugin.getPreferences("PyramidDocUrl"))
- self.translationsEdit.setText(
+ self.translationsEditorPicker.setText(
self.__plugin.getPreferences("TranslationsEditor"))
def save(self):
@@ -115,40 +113,7 @@
"PyramidDocUrl", self.urlEdit.text())
self.__plugin.setPreferences(
- "TranslationsEditor", self.translationsEdit.text())
-
- @pyqtSlot()
- def on_virtualEnvPy3Button_clicked(self):
- """
- Private slot to select the virtual environment for Python 3 via a
- directory selection dialog.
- """
- vDir = self.virtualEnvPy3Edit.text()
- if not vDir:
- vDir = Utilities.getHomeDir()
- virtualEnv = E5FileDialog.getExistingDirectory(
- self,
- self.tr("Select Virtual Environment for Python 3"),
- vDir,
- E5FileDialog.Options(E5FileDialog.Option(0)))
-
- if virtualEnv:
- self.virtualEnvPy3Edit.setText(Utilities.toNativeSeparators(
- virtualEnv))
-
- @pyqtSlot()
- def on_translationsButton_clicked(self):
- """
- Private slot to select the translations editor via a file selection
- dialog.
- """
- editor = E5FileDialog.getOpenFileName(
- self,
- self.tr("Translations Editor"),
- self.translationsEdit.text(),
- self.tr("All Files (*)"))
- if editor:
- self.translationsEdit.setText(Utilities.toNativeSeparators(editor))
+ "TranslationsEditor", self.translationsEditorPicker.text())
@pyqtSlot()
def on_urlResetButton_clicked(self):
