diff -r face142f8fa5 -r 318d7ebbdce2 SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py
--- a/SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py Tue Jun 01 18:01:14 2021 +0200
+++ b/SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py Tue Jun 01 18:45:45 2021 +0200
@@ -9,10 +9,10 @@
import os
-from PyQt5.QtCore import pyqtSlot, Qt
-from PyQt5.QtWidgets import QTreeWidgetItem, QInputDialog, QLineEdit, QDialog
+from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtWidgets import QTreeWidgetItem, QInputDialog, QLineEdit, QDialog
-from E5Gui.E5Application import e5App
+from EricWidgets.EricApplication import ericApp
from Preferences.ConfigurationPages.ConfigurationPageBase import (
ConfigurationPageBase
@@ -31,19 +31,13 @@
Constructor
@param plugin reference to the plugin object
+ @type SelectionEncloserPlugin
"""
super().__init__()
self.setupUi(self)
self.setObjectName("SelectionEncloserPage")
- try:
- usesDarkPalette = e5App().usesDarkPalette()
- except AttributeError:
- # for eric6 < 20.4
- from PyQt5.QtGui import QPalette
- palette = e5App().palette()
- lightness = palette.color(QPalette.Window).lightness()
- usesDarkPalette = lightness <= 128
+ usesDarkPalette = ericApp().usesDarkPalette()
iconSuffix = "dark" if usesDarkPalette else "light"
self.editButton.setIcon(UI.PixmapCache.getIcon(
@@ -79,7 +73,7 @@
if title == '--Separator--':
title = self.tr('--Separator--')
itm = QTreeWidgetItem(top, [title])
- itm.setData(0, Qt.UserRole, encString)
+ itm.setData(0, Qt.ItemDataRole.UserRole, encString)
top.setExpanded(True)
def save(self):
@@ -98,7 +92,9 @@
title = itm.text(0)
if title == self.tr('--Separator--'):
title = '--Separator--'
- topEntry[1].append([title, itm.data(0, Qt.UserRole)])
+ topEntry[1].append(
+ [title, itm.data(0, Qt.ItemDataRole.UserRole)]
+ )
hierarchy.append(topEntry)
self.__plugin.setPreferences("MenuHierarchy", hierarchy)
@@ -111,7 +107,7 @@
self,
self.tr("Menu Title"),
self.tr("Enter menu title:"),
- QLineEdit.Normal)
+ QLineEdit.EchoMode.Normal)
if ok and menuTitle:
top = QTreeWidgetItem(self.menuTree, [menuTitle])
top.setExpanded(True)
@@ -123,10 +119,10 @@
"""
from .SelectionEncloserEditDialog import SelectionEncloserEditDialog
dlg = SelectionEncloserEditDialog(parent=self)
- if dlg.exec() == QDialog.Accepted:
+ if dlg.exec() == QDialog.DialogCode.Accepted:
title, encString = dlg.getData()
itm = QTreeWidgetItem(self.menuTree.selectedItems()[0], [title])
- itm.setData(0, Qt.UserRole, encString)
+ itm.setData(0, Qt.ItemDataRole.UserRole, encString)
@pyqtSlot()
def on_addSeparatorButton_clicked(self):
@@ -178,7 +174,8 @@
"""
Private method to move the selected entry up or down.
- @param moveUp flag indicating to move the entry up (boolean)
+ @param moveUp flag indicating to move the entry up
+ @type bool
"""
itm = self.menuTree.selectedItems()[0]
parent = itm.parent()
@@ -211,7 +208,7 @@
self,
self.tr("Menu Entry"),
self.tr("Enter menu entry text:"),
- QLineEdit.Normal,
+ QLineEdit.EchoMode.Normal,
itm.text(0))
if ok and menuTitle:
itm.setText(0, menuTitle)
@@ -220,11 +217,11 @@
SelectionEncloserEditDialog
)
dlg = SelectionEncloserEditDialog(
- itm.text(0), itm.data(0, Qt.UserRole), self)
- if dlg.exec() == QDialog.Accepted:
+ itm.text(0), itm.data(0, Qt.ItemDataRole.UserRole), self)
+ if dlg.exec() == QDialog.DialogCode.Accepted:
title, encString = dlg.getData()
itm.setText(0, title)
- itm.setData(0, Qt.UserRole, encString)
+ itm.setData(0, Qt.ItemDataRole.UserRole, encString)
@pyqtSlot()
def on_menuTree_itemSelectionChanged(self):
