eric7/Project/ProjectBrowserModel.py

branch
eric7
changeset 8318
962bce857696
parent 8312
800c432b34c8
child 8464
9058a129177e
--- a/eric7/Project/ProjectBrowserModel.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Project/ProjectBrowserModel.py	Sun May 16 20:07:24 2021 +0200
@@ -11,8 +11,8 @@
 import re
 import contextlib
 
-from PyQt5.QtCore import QDir, QModelIndex, pyqtSignal, QFileSystemWatcher, Qt
-from PyQt5.QtGui import QColor
+from PyQt6.QtCore import QDir, QModelIndex, pyqtSignal, QFileSystemWatcher, Qt
+from PyQt6.QtGui import QColor
 
 from UI.BrowserModel import (
     BrowserModel, BrowserItem, BrowserDirectoryItem, BrowserFileItem
@@ -297,13 +297,13 @@
         if not index.isValid():
             return None
         
-        if role == Qt.ItemDataRole.TextColorRole:
+        if role == Qt.ItemDataRole.ForegroundRole:
             if index.column() == 0:
                 try:
                     return index.internalPointer().getTextColor()
                 except AttributeError:
                     return None
-        elif role == Qt.ItemDataRole.BackgroundColorRole:
+        elif role == Qt.ItemDataRole.BackgroundRole:
             try:
                 col = self.itemBackgroundColors[
                     index.internalPointer().vcsState]
@@ -346,13 +346,13 @@
         qdir = QDir(parentItem.dirName())
         
         fileFilter = (
-            QDir.Filters(
+            (
                 QDir.Filter.AllEntries |
                 QDir.Filter.Hidden |
                 QDir.Filter.NoDotAndDotDot
             )
             if Preferences.getProject("BrowsersListHiddenFiles") else
-            QDir.Filters(QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
+            QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot
         )
         entryInfoList = qdir.entryInfoList(fileFilter)
         
@@ -690,13 +690,13 @@
             return
         
         fileFilter = (
-            QDir.Filters(
+            (
                 QDir.Filter.AllEntries |
                 QDir.Filter.Hidden |
                 QDir.Filter.NoDotAndDotDot
             )
             if Preferences.getProject("BrowsersListHiddenFiles") else
-            QDir.Filters(QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
+            QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot
         )
         
         for itm in self.watchedItems[path]:

eric ide

mercurial