eric: comparison src/eric7/UI/BrowserModel.py

-:f6be97f4d96a
+:479cf39ac9cb
 PbSimpleDirectory = 100
 PbDirectory = 101
 PbFile = 102
+class BrowserModelType(enum.Enum):
+"""
+Class defining the various browser model types.
+"""
+Generic = 0
+Project = 1
+EditorOutline = 2
 class BrowserModel(QAbstractItemModel):
 """
 Class implementing the browser model.
 """
-def __init__(self, parent=None, nopopulate=False, fsInterface=None):
+def __init__(
+self,
+parent=None,
+nopopulate=False,
+fsInterface=None,
+modelType=BrowserModelType.Generic,
+):
 """
 Constructor
 @param parent reference to parent object (defaults to None)
 @type QObject (optional)
 @param nopopulate flag indicating to not populate the model (defaults to False)
 @type bool (optional)
 @param fsInterface reference to the 'eric-ide' server interface object
 (defaults to None)
 @type EricServerFileSystemInterface (optional)
+@param modelType type of the browser model (defaults to
+BrowserModelType.Generic)
+@type BrowserModelType (optional)
 """
 super().__init__(parent)
 self.progDir = None
 self.__sysPathInterpreter = ""
 self.__sysPathItem = None
 self.__remotefsInterface = fsInterface
+self._modelType = modelType
 if not nopopulate:
 self.watchedDirItems = {}
 self.watchedFileItems = {}
 watcher = EricFileSystemWatcher.instance()
 with contextlib.suppress(AttributeError):
 if cl.module == moduleName:
 if isinstance(
 cl, (ClbrBaseClasses.Class, ClbrBaseClasses.Module)
 ):
-node = BrowserClassItem(parentItem, cl, fileName)
+node = BrowserClassItem(
+parentItem, cl, fileName, modelType=self._modelType
+)
 elif isinstance(cl, ClbrBaseClasses.Function):
-node = BrowserMethodItem(parentItem, cl, fileName)
+node = BrowserMethodItem(
+parentItem, cl, fileName, modelType=self._modelType
+)
 else:
 node = None
 if node:
 self._addItem(node, parentItem)
 if "@@Coding@@" in dictionary and Preferences.getUI("BrowserShowCoding"):
 m_node = BrowserImportItem(
 node,
 importedModule.importedModuleName,
 importedModule.file,
 importedModule.linenos,
+modelType=self._modelType,
 )
 self._addItem(m_node, node)
 for (
 importedName,
 linenos,
 m_node,
 importedName,
 importedModule.file,
 linenos,
 isModule=False,
+modelType=self._modelType,
 )
 self._addItem(mn_node, m_node)
 if repopulate:
 self.endInsertRows()
 self.beginInsertRows(
 self.createIndex(parentItem.row(), 0, parentItem), 0, len(keys) - 1
 )
 for key, kind in keys:
 if kind == "c":
-node = BrowserClassItem(parentItem, cl.classes[key], file_)
+node = BrowserClassItem(
+parentItem, cl.classes[key], file_, modelType=self._modelType
+)
 elif kind == "m":
-node = BrowserMethodItem(parentItem, cl.methods[key], file_)
+node = BrowserMethodItem(
+parentItem, cl.methods[key], file_, modelType=self._modelType
+)
 self._addItem(node, parentItem)
 if repopulate:
 self.endInsertRows()
 def populateMethodItem(self, parentItem, repopulate=False):
 self.beginInsertRows(
 self.createIndex(parentItem.row(), 0, parentItem), 0, len(keys) - 1
 )
 for key, kind in keys:
 if kind == "c":
-node = BrowserClassItem(parentItem, fn.classes[key], file_)
+node = BrowserClassItem(
+parentItem, fn.classes[key], file_, modelType=self._modelType
+)
 elif kind == "m":
-node = BrowserMethodItem(parentItem, fn.methods[key], file_)
+node = BrowserMethodItem(
+parentItem, fn.methods[key], file_, modelType=self._modelType
+)
 elif kind == "a":
-node = BrowserClassAttributeItem(parentItem, fn.attributes[key])
+node = BrowserClassAttributeItem(
+parentItem, fn.attributes[key], modelType=self._modelType
+)
 self._addItem(node, parentItem)
 if repopulate:
 self.endInsertRows()
 def populateClassAttributesItem(self, parentItem, repopulate=False):
 self.beginInsertRows(
 self.createIndex(parentItem.row(), 0, parentItem), 0, len(keys) - 1
 )
 for key in keys:
 node = BrowserClassAttributeItem(
-parentItem, attributes[key], classAttributes
+parentItem,
+attributes[key],
+classAttributes,
+modelType=self._modelType,
 )
 self._addItem(node, parentItem)
 if repopulate:
 self.endInsertRows()
 class BrowserClassItem(BrowserItem):
 """
 Class implementing the data structure for browser class items.
 """
-def __init__(self, parent, cl, filename):
+def __init__(self, parent, cl, filename, modelType=BrowserModelType.Generic):
 """
 Constructor
 @param parent parent item
 @type BrowserItem
 @param cl Class object to be shown
 @type Class
 @param filename file name of the file defining this class
 @type str
+@param modelType type of the browser model (defaults to
+BrowserModelType.Generic)
+@type BrowserModelType (optional)
 """
 name = cl.name
 if hasattr(cl, "super") and cl.super:
 supers = []
 for sup in cl.super:
 supers.append(sname)
 name += "({0})".format(", ".join(supers))
 super().__init__(parent, name)
+self._modelType = modelType
 self.type_ = BrowserItemType.Class
 self._name = name
 self._classObject = cl
 self._filename = filename
 @rtype bool
 """
 if issubclass(other.__class__, (BrowserCodingItem, BrowserClassAttributesItem)):
 return order == Qt.SortOrder.DescendingOrder
-if Preferences.getUI("BrowsersListContentsByOccurrence") and column == 0:
+if column == 0 and (
+(
+self._modelType == BrowserModelType.EditorOutline
+and Preferences.getEditor("SourceOutlineListContentsByOccurrence")
+)
+or (
+self._modelType != BrowserModelType.EditorOutline
+and Preferences.getUI("BrowsersListContentsByOccurrence")
+)
+):
 if order == Qt.SortOrder.AscendingOrder:
 return self.lineno() < other.lineno()
 else:
 return self.lineno() > other.lineno()
 class BrowserMethodItem(BrowserItem):
 """
 Class implementing the data structure for browser method items.
 """
-def __init__(self, parent, fn, filename):
+def __init__(self, parent, fn, filename, modelType=BrowserModelType.Generic):
 """
 Constructor
 @param parent parent item
 @type BrowserItem
 @param fn Function object to be shown
 @type Function
 @param filename filename of the file defining this class
 @type str
+@param modelType type of the browser model (defaults to
+BrowserModelType.Generic)
+@type BrowserModelType (optional)
 """
 name = fn.name
 super().__init__(parent, name)
+self._modelType = modelType
 self.type_ = BrowserItemType.Method
 self._name = name
 self._functionObject = fn
 self._filename = filename
 if self._functionObject.modifier == ClbrBaseClasses.Function.Static:
 if other._name.startswith("__init__"):
 return order == Qt.SortOrder.DescendingOrder
 elif issubclass(other.__class__, BrowserClassAttributesItem):
 return order == Qt.SortOrder.DescendingOrder
-if Preferences.getUI("BrowsersListContentsByOccurrence") and column == 0:
+if column == 0 and (
+(
+self._modelType == BrowserModelType.EditorOutline
+and Preferences.getEditor("SourceOutlineListContentsByOccurrence")
+)
+or (
+self._modelType != BrowserModelType.EditorOutline
+and Preferences.getUI("BrowsersListContentsByOccurrence")
+)
+):
 if order == Qt.SortOrder.AscendingOrder:
 return self.lineno() < other.lineno()
 else:
 return self.lineno() > other.lineno()
 class BrowserClassAttributeItem(BrowserItem):
 """
 Class implementing the data structure for browser class attribute items.
 """
-def __init__(self, parent, attribute, isClass=False):
+def __init__(
+self, parent, attribute, isClass=False, modelType=BrowserModelType.Generic
+):
 """
 Constructor
 @param parent parent item
 @type BrowserItem
 @param attribute reference to the attribute object
 @type Attribute
-@param isClass flag indicating a class attribute
+@param isClass flag indicating a class attribute (defaults to False)
-@type bool
+@type bool (optional)
+@param modelType type of the browser model (defaults to
+BrowserModelType.Generic)
+@type BrowserModelType (optional)
 """
 super().__init__(parent, attribute.name)
+self._modelType = modelType
 self.type_ = BrowserItemType.Attribute
 self._attributeObject = attribute
 self.__public = attribute.isPublic()
 if isClass:
 self.icon = EricPixmapCache.getIcon("attribute_class")
 @param order sort order (for special sorting)
 @type Qt.SortOrder
 @return true, if this item is less than other
 @rtype bool
 """
-if Preferences.getUI("BrowsersListContentsByOccurrence") and column == 0:
+if column == 0 and (
+(
+self._modelType == BrowserModelType.EditorOutline
+and Preferences.getEditor("SourceOutlineListContentsByOccurrence")
+)
+or (
+self._modelType != BrowserModelType.EditorOutline
+and Preferences.getUI("BrowsersListContentsByOccurrence")
+)
+):
 if order == Qt.SortOrder.AscendingOrder:
 return self.lineno() < other.lineno()
 else:
 return self.lineno() > other.lineno()
 """
 Class implementing the data structure for browser imported module and
 imported names items.
 """
-def __init__(self, parent, text, filename, lineNumbers, isModule=True):
+def __init__(
+self,
+parent,
+text,
+filename,
+lineNumbers,
+isModule=True,
+modelType=BrowserModelType.Generic,
+):
 """
 Constructor
 @param parent parent item
 @type BrowserItem
 @type str
 @param filename name of the file
 @type str
 @param lineNumbers list of line numbers of the import statement
 @type list of int
-@param isModule flag indicating a module item entry
+@param isModule flag indicating a module item entry (defaults to True)
-@type bool
+@type bool (optional)
+@param modelType type of the browser model (defaults to
+BrowserModelType.Generic)
+@type BrowserModelType (optional)
 """
 super().__init__(parent, text)
 self.__filename = filename
 self.__linenos = lineNumbers[:]
+self._modelType = modelType
 self.type_ = BrowserItemType.Import
 if isModule:
 self.icon = EricPixmapCache.getIcon("importedModule")
 else:
 self.icon = EricPixmapCache.getIcon("importedName")
 @param order sort order (for special sorting)
 @type Qt.SortOrder
 @return true, if this item is less than other
 @rtype bool
 """
-if Preferences.getUI("BrowsersListContentsByOccurrence") and column == 0:
+if column == 0 and (
+(
+self._modelType == BrowserModelType.EditorOutline
+and Preferences.getEditor("SourceOutlineListContentsByOccurrence")
+)
+or (
+self._modelType != BrowserModelType.EditorOutline
+and Preferences.getUI("BrowsersListContentsByOccurrence")
+)
+):
 if order == Qt.SortOrder.AscendingOrder:
 return self.lineno() < other.lineno()
 else:
 return self.lineno() > other.lineno()

Mercurial Repositories > eric / file comparison

comparison: src/eric7/UI/BrowserModel.py

src/eric7/UI/BrowserModel.py