Mercurial Repositories > eric / file diff

--- a/eric7/E5Gui/E5PathPicker.py	Fri May 21 18:01:11 2021 +0200
+++ b/eric7/E5Gui/E5PathPicker.py	Fri May 21 20:14:48 2021 +0200
@@ -11,12 +11,12 @@
 import os
 
 from PyQt6.QtCore import pyqtSignal, Qt, QFileInfo, QCoreApplication, QDir
-from PyQt6.QtWidgets import QWidget, QHBoxLayout, QToolButton, QSizePolicy
+from PyQt6.QtWidgets import (
+    QWidget, QHBoxLayout, QToolButton, QSizePolicy, QLineEdit, QComboBox
+)
 
 from . import E5FileDialog
-from .E5LineEdit import E5ClearableLineEdit
 from .E5Completers import E5FileCompleter, E5DirCompleter
-from .E5ComboBox import E5ClearableComboBox
 
 import UI.PixmapCache
 
@@ -86,13 +86,17 @@
         self.setLayout(self.__layout)
         
         if useLineEdit:
-            self._editor = E5ClearableLineEdit(
+            self._editor = QLineEdit(
                 self, QCoreApplication.translate(
                     "E5PathPickerBase", "Enter Path Name"))
+            self._editor.setClearButtonEnabled(True)
         else:
-            self._editor = E5ClearableComboBox(
-                self, QCoreApplication.translate(
+            self._editor = QComboBox(self)
+            self._editor.setEditable(True)
+            self._editor.lineEdit().setPlaceholderText(
+                QCoreApplication.translate(
                     "E5PathPickerBase", "Enter Path Name"))
+            self._editor.lineEdit().setClearButtonEnabled(True)
         
         self.__button = QToolButton(self)
         self.__button.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
@@ -155,10 +159,10 @@
                 
                 # set inactive text
                 if mode == E5PathPickerModes.OPEN_FILES_MODE:
-                    self._editor.setInactiveText(
+                    self._editor.setPlaceholderText(
                         self.tr("Enter Path Names separated by ';'"))
                 else:
-                    self._editor.setInactiveText(
+                    self._editor.setPlaceholderText(
                         self.tr("Enter Path Name"))
         self.__button.setEnabled(self.__mode != E5PathPickerModes.NO_MODE)