src/eric7/Project/ProjectBrowserModel.py

Thu, 05 Sep 2024 16:47:03 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Thu, 05 Sep 2024 16:47:03 +0200
branch
eric7
changeset 10915
80828634d6b0
parent 10845
bbcad422aea7
child 10977
b88dccafc3aa
permissions
-rw-r--r--

***

0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1 # -*- coding: utf-8 -*-
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2
10439
21c28b0f9e41 Updated copyright for 2024.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10430
diff changeset
3 # Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
4 #
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
5
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
6 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
7 Module implementing the browser model.
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
8 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
9
9473
3f23dbf37dbe Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9413
diff changeset
10 import contextlib
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
11 import os
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
12 import re
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
13
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
14 from PyQt6.QtCore import QDir, QModelIndex, Qt, pyqtSignal
8318
962bce857696 Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8312
diff changeset
15 from PyQt6.QtGui import QColor
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
16
9624
b47dfa7a137d Refactored the Utilities and Globals modules in order to enhance the maintainability.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9527
diff changeset
17 from eric7 import Preferences
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
18 from eric7.EricCore import EricFileSystemWatcher
9624
b47dfa7a137d Refactored the Utilities and Globals modules in order to enhance the maintainability.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9527
diff changeset
19 from eric7.SystemUtilities import FileSystemUtilities
9413
80c06d472826 Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9221
diff changeset
20 from eric7.UI.BrowserModel import (
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
21 BrowserDirectoryItem,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
22 BrowserFileItem,
9473
3f23dbf37dbe Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9413
diff changeset
23 BrowserItem,
10470
cd7bfd539ac9 Changed the browser item types to an enum in BrowserModel and ProjectBrowserModel.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
24 BrowserItemType,
9473
3f23dbf37dbe Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9413
diff changeset
25 BrowserModel,
10832
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10759
diff changeset
26 BrowserModelType,
10398
ef1ea18994d5 Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10378
diff changeset
27 BrowserSimpleDirectoryItem,
7266
d001bc703c29 Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7229
diff changeset
28 )
9413
80c06d472826 Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9221
diff changeset
29 from eric7.Utilities import ModuleParser
10491
acabc60b19a2 Version Control
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10470
diff changeset
30 from eric7.VCS.VersionControl import VersionControlState
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
31
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
32
8207
d359172d11be Applied some more code simplifications suggested by the new Simplify checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8143
diff changeset
33 class ProjectBrowserItemMixin:
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
34 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
35 Class implementing common methods of project browser items.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
36
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
37 It is meant to be used as a mixin class.
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
38 """
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
39
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
40 def __init__(self, type_, bold=False):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
41 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
42 Constructor
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
43
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
44 @param type_ type of file/directory in the project
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
45 @type str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
46 @param bold flag indicating a highlighted font
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
47 @type bool
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
48 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
49 self._projectTypes = [type_]
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
50 self.bold = bold
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
51 self.vcsState = " "
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
52
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
53 def getTextColor(self):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
54 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
55 Public method to get the items text color.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
56
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
57 @return text color
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
58 @rtype QColor
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
59 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
60 if self.bold:
7
c679fb30c8f3 Change code dealing with QVariant (and QSettings) to use the PyQt4 QVariant v2 API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
61 return Preferences.getProjectBrowserColour("Highlighted")
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
62 else:
7
c679fb30c8f3 Change code dealing with QVariant (and QSettings) to use the PyQt4 QVariant v2 API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
63 return None
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
64
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
65 def setVcsState(self, state):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
66 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
67 Public method to set the items VCS state.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
68
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
69 @param state VCS state (one of A, C, M, U or " ")
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
70 @type str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
71 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
72 self.vcsState = state
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
73
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
74 def addVcsStatus(self, vcsStatus):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
75 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
76 Public method to add the VCS status.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
77
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
78 @param vcsStatus VCS status text
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
79 @type str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
80 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
81 self.itemData.append(vcsStatus)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
82
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
83 def setVcsStatus(self, vcsStatus):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
84 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
85 Public method to set the VCS status.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
86
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
87 @param vcsStatus VCS status text
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
88 @type str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
89 """
10757
7eed48700225 Modified the icon of the document open actions and added an icon for the recent documents menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10692
diff changeset
90 try:
7eed48700225 Modified the icon of the document open actions and added an icon for the recent documents menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10692
diff changeset
91 self.itemData[1] = vcsStatus
7eed48700225 Modified the icon of the document open actions and added an icon for the recent documents menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10692
diff changeset
92 except IndexError:
7eed48700225 Modified the icon of the document open actions and added an icon for the recent documents menu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10692
diff changeset
93 self.addVcsStatus(vcsStatus)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
94
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
95 def getProjectTypes(self):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
96 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
97 Public method to get the project type.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
98
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
99 @return project type
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
100 @rtype str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
101 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
102 return self._projectTypes[:]
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
103
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
104 def addProjectType(self, type_):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
105 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
106 Public method to add a type to the list.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
107
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
108 @param type_ type to add to the list
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
109 @type str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
110 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
111 self._projectTypes.append(type_)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
112
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
113
10398
ef1ea18994d5 Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10378
diff changeset
114 class ProjectBrowserSimpleDirectoryItem(
ef1ea18994d5 Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10378
diff changeset
115 BrowserSimpleDirectoryItem, ProjectBrowserItemMixin
ef1ea18994d5 Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10378
diff changeset
116 ):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
117 """
2995
63d874899b8b Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2769
diff changeset
118 Class implementing the data structure for project browser simple directory
63d874899b8b Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2769
diff changeset
119 items.
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
120 """
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
121
10610
bb0149571d94 Finished adapting the project functions to support an 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10605
diff changeset
122 def __init__(self, parent, projectType, text, path="", fsInterface=None):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
123 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
124 Constructor
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
125
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
126 @param parent parent item
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
127 @type BrowserItem
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
128 @param projectType type of file/directory in the project
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
129 @type str
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
130 @param text text to be displayed
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
131 @type str
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
132 @param path path of the directory
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
133 @type str
10610
bb0149571d94 Finished adapting the project functions to support an 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10605
diff changeset
134 @param fsInterface reference to the 'eric-ide' server file system interface
bb0149571d94 Finished adapting the project functions to support an 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10605
diff changeset
135 (defaults to None)
bb0149571d94 Finished adapting the project functions to support an 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10605
diff changeset
136 @type EricServerFileSystemInterface (optional)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
137 """
10610
bb0149571d94 Finished adapting the project functions to support an 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10605
diff changeset
138 BrowserSimpleDirectoryItem.__init__(
bb0149571d94 Finished adapting the project functions to support an 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10605
diff changeset
139 self, parent, text, path=path, fsInterface=fsInterface
bb0149571d94 Finished adapting the project functions to support an 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10605
diff changeset
140 )
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
141 ProjectBrowserItemMixin.__init__(self, projectType)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
142
10470
cd7bfd539ac9 Changed the browser item types to an enum in BrowserModel and ProjectBrowserModel.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
143 self.type_ = BrowserItemType.PbSimpleDirectory
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
144
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
145
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
146 class ProjectBrowserDirectoryItem(BrowserDirectoryItem, ProjectBrowserItemMixin):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
147 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
148 Class implementing the data structure for project browser directory items.
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
149 """
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
150
10597
fbe93720ee9f Corrected a few formatting and style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
151 def __init__(
fbe93720ee9f Corrected a few formatting and style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
152 self, parent, dinfo, projectType, full=True, bold=False, fsInterface=None
fbe93720ee9f Corrected a few formatting and style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
153 ):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
154 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
155 Constructor
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
156
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
157 @param parent parent item
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
158 @type BrowserItem
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
159 @param dinfo dinfo is the string for the directory
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
160 @type str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
161 @param projectType type of file/directory in the project
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
162 @type str
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
163 @param full flag indicating full pathname should be displayed
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
164 @type bool
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
165 @param bold flag indicating a highlighted font
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
166 @type bool
10596
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
167 @param fsInterface reference to the 'eric-ide' server file system interface
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
168 (defaults to None)
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
169 @type EricServerFileSystemInterface (optional)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
170 """
10596
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
171 BrowserDirectoryItem.__init__(self, parent, dinfo, full, fsInterface)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
172 ProjectBrowserItemMixin.__init__(self, projectType, bold)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
173
10470
cd7bfd539ac9 Changed the browser item types to an enum in BrowserModel and ProjectBrowserModel.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
174 self.type_ = BrowserItemType.PbDirectory
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
175
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
176
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
177 class ProjectBrowserFileItem(BrowserFileItem, ProjectBrowserItemMixin):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
178 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
179 Class implementing the data structure for project browser file items.
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
180 """
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
181
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
182 def __init__(
10597
fbe93720ee9f Corrected a few formatting and style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
183 self,
fbe93720ee9f Corrected a few formatting and style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
184 parent,
fbe93720ee9f Corrected a few formatting and style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
185 finfo,
fbe93720ee9f Corrected a few formatting and style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
186 projectType,
fbe93720ee9f Corrected a few formatting and style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
187 full=True,
fbe93720ee9f Corrected a few formatting and style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
188 bold=False,
fbe93720ee9f Corrected a few formatting and style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
189 sourceLanguage="",
fbe93720ee9f Corrected a few formatting and style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10596
diff changeset
190 fsInterface=None,
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
191 ):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
192 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
193 Constructor
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
194
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
195 @param parent parent item
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
196 @type BrowserItem
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
197 @param finfo the string for the file
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
198 @type str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
199 @param projectType type of file/directory in the project
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
200 @type str
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
201 @param full flag indicating full pathname should be displayed
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
202 @type bool
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
203 @param bold flag indicating a highlighted font
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
204 @type bool
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
205 @param sourceLanguage source code language of the project
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
206 @type str
10596
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
207 @param fsInterface reference to the 'eric-ide' server file system interface
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
208 (defaults to None)
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
209 @type EricServerFileSystemInterface (optional)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
210 """
10596
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
211 BrowserFileItem.__init__(self, parent, finfo, full, sourceLanguage, fsInterface)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
212 ProjectBrowserItemMixin.__init__(self, projectType, bold)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
213
10470
cd7bfd539ac9 Changed the browser item types to an enum in BrowserModel and ProjectBrowserModel.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
214 self.type_ = BrowserItemType.PbFile
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
215
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
216
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
217 class ProjectBrowserModel(BrowserModel):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
218 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
219 Class implementing the project browser model.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
220
501
5c615a85241a Finished porting signal/slot usage to the new API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 500
diff changeset
221 @signal vcsStateChanged(str) emitted after the VCS state has changed
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
222 """
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
223
500
c3abc7895a01 Continued porting signal/slot usage to the new API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 427
diff changeset
224 vcsStateChanged = pyqtSignal(str)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
225
10596
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
226 def __init__(self, parent, fsInterface=None):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
227 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
228 Constructor
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
229
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
230 @param parent reference to parent object
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
231 @type Project.Project
10596
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
232 @param fsInterface reference to the 'eric-ide' server interface object
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
233 (defaults to None)
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
234 @type EricServerFileSystemInterface (optional)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
235 """
10832
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10759
diff changeset
236 super().__init__(parent, nopopulate=True, modelType=BrowserModelType.Project)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
237
3190
a9a94491c4fd Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3160
diff changeset
238 rootData = self.tr("Name")
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
239 self.rootItem = BrowserItem(None, rootData)
3190
a9a94491c4fd Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3160
diff changeset
240 self.rootItem.itemData.append(self.tr("VCS Status"))
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
241
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
242 self.progDir = None
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
243 self.project = parent
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
244 self.__projectBrowser = None
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
245
10596
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
246 self.__remotefsInterface = fsInterface
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
247
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
248 self.watchedDirItems = {}
10680
306373ccf8fd Merged with branch 'eric7' in order to track these changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10631 10679
diff changeset
249
7518
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
250 self.__watcherActive = True
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
251 watcher = EricFileSystemWatcher.instance()
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
252 watcher.directoryCreated.connect(lambda x: self.entryCreated(x, isDir=True))
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
253 watcher.directoryDeleted.connect(lambda x: self.entryDeleted(x, isDir=True))
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
254 watcher.fileCreated.connect(lambda x: self.entryCreated(x, isDir=False))
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
255 watcher.fileDeleted.connect(lambda x: self.entryDeleted(x, isDir=False))
10842
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
256 watcher.fileMoved.connect(self.entryMoved)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
257
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
258 self.inRefresh = False
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
259
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
260 self.colorNames = {
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
261 "A": "VcsAdded",
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
262 "M": "VcsModified",
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
263 "O": "VcsRemoved",
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
264 "R": "VcsReplaced",
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
265 "U": "VcsUpdate",
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
266 "Z": "VcsConflict",
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
267 }
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
268 self.itemBackgroundColors = {
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
269 " ": QColor(),
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
270 "A": Preferences.getProjectBrowserColour(self.colorNames["A"]),
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
271 "M": Preferences.getProjectBrowserColour(self.colorNames["M"]),
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
272 "O": Preferences.getProjectBrowserColour(self.colorNames["O"]),
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
273 "R": Preferences.getProjectBrowserColour(self.colorNames["R"]),
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
274 "U": Preferences.getProjectBrowserColour(self.colorNames["U"]),
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
275 "Z": Preferences.getProjectBrowserColour(self.colorNames["Z"]),
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
276 }
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
277
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
278 self.highLightColor = Preferences.getProjectBrowserColour("Highlighted")
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
279 # needed by preferencesChanged()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
280
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
281 self.vcsStatusReport = {}
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
282
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
283 def setProjectBrowserReference(self, projectBrowser):
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
284 """
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
285 Public method to set a reference to the project browser instance.
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
286
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
287 @param projectBrowser reference to the project browser instance
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
288 @type ProjectBrowser
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
289 """
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
290 self.__projectBrowser = projectBrowser
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
291
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
292 def data(self, index, role):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
293 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
294 Public method to get data of an item.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
295
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
296 @param index index of the data to retrieve
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
297 @type QModelIndex
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
298 @param role role of data
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
299 @type Qt.ItemDataRole
7
c679fb30c8f3 Change code dealing with QVariant (and QSettings) to use the PyQt4 QVariant v2 API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
300 @return requested data
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
301 @rtype Any
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
302 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
303 if not index.isValid():
7
c679fb30c8f3 Change code dealing with QVariant (and QSettings) to use the PyQt4 QVariant v2 API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
304 return None
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
305
8318
962bce857696 Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8312
diff changeset
306 if role == Qt.ItemDataRole.ForegroundRole:
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
307 if index.column() == 0:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
308 try:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
309 return index.internalPointer().getTextColor()
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
310 except AttributeError:
7
c679fb30c8f3 Change code dealing with QVariant (and QSettings) to use the PyQt4 QVariant v2 API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
311 return None
8318
962bce857696 Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8312
diff changeset
312 elif role == Qt.ItemDataRole.BackgroundRole:
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
313 try:
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
314 col = self.itemBackgroundColors[index.internalPointer().vcsState]
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
315 if col.isValid():
7
c679fb30c8f3 Change code dealing with QVariant (and QSettings) to use the PyQt4 QVariant v2 API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
316 return col
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
317 else:
7
c679fb30c8f3 Change code dealing with QVariant (and QSettings) to use the PyQt4 QVariant v2 API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
318 return None
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
319 except AttributeError:
7
c679fb30c8f3 Change code dealing with QVariant (and QSettings) to use the PyQt4 QVariant v2 API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
320 return None
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
321 except KeyError:
7
c679fb30c8f3 Change code dealing with QVariant (and QSettings) to use the PyQt4 QVariant v2 API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
322 return None
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
323
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
324 return BrowserModel.data(self, index, role)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
325
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
326 def populateItem(self, parentItem, repopulate=False):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
327 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
328 Public method to populate an item's subtree.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
329
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
330 @param parentItem reference to the item to be populated
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
331 @type BrowserItem
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
332 @param repopulate flag indicating a repopulation
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
333 @type bool
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
334 """
10470
cd7bfd539ac9 Changed the browser item types to an enum in BrowserModel and ProjectBrowserModel.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
335 if parentItem.type() == BrowserItemType.PbSimpleDirectory:
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
336 return # nothing to do
10470
cd7bfd539ac9 Changed the browser item types to an enum in BrowserModel and ProjectBrowserModel.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
337 elif parentItem.type() == BrowserItemType.PbDirectory:
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
338 self.populateProjectDirectoryItem(parentItem, repopulate)
10470
cd7bfd539ac9 Changed the browser item types to an enum in BrowserModel and ProjectBrowserModel.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10439
diff changeset
339 elif parentItem.type() == BrowserItemType.PbFile:
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
340 self.populateFileItem(parentItem, repopulate)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
341 else:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
342 BrowserModel.populateItem(self, parentItem, repopulate)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
343
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
344 def populateProjectDirectoryItem(self, parentItem, repopulate=False):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
345 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
346 Public method to populate a directory item's subtree.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
347
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
348 @param parentItem reference to the directory item to be populated
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
349 @type BrowserItem
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
350 @param repopulate flag indicating a repopulation
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
351 @type bool
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
352 """
234
caed45a134f8 Added code to update the Others tab of the project browser (mostly) automatically.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 216
diff changeset
353 self._addWatchedItem(parentItem)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
354
10631
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
355 dirName = parentItem.dirName()
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
356 if FileSystemUtilities.isPlainFileName(dirName):
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
357 qdir = QDir(parentItem.dirName())
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
358
10631
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
359 fileFilter = (
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
360 (
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
361 QDir.Filter.AllEntries
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
362 | QDir.Filter.Hidden
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
363 | QDir.Filter.NoDotAndDotDot
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
364 )
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
365 if Preferences.getProject("BrowsersListHiddenFiles")
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
366 else QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
367 )
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
368 entryInfoList = qdir.entryInfoList(fileFilter)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
369
10631
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
370 if len(entryInfoList) > 0:
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
371 if repopulate:
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
372 self.beginInsertRows(
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
373 self.createIndex(parentItem.row(), 0, parentItem),
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
374 0,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
375 len(entryInfoList) - 1,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
376 )
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
377 states = {}
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
378 if self.project.vcs is not None:
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
379 for f in entryInfoList:
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
380 fname = f.absoluteFilePath()
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
381 states[os.path.normcase(fname)] = 0
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
382 dname = parentItem.dirName()
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
383 self.project.vcs.clearStatusCache()
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
384 states = self.project.vcs.vcsAllRegisteredStates(states, dname)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
385
10631
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
386 for f in entryInfoList:
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
387 node = (
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
388 ProjectBrowserDirectoryItem(
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
389 parentItem,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
390 FileSystemUtilities.toNativeSeparators(
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
391 f.absoluteFilePath()
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
392 ),
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
393 parentItem.getProjectTypes()[0],
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
394 False,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
395 fsInterface=self.__remotefsInterface,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
396 )
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
397 if f.isDir()
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
398 else ProjectBrowserFileItem(
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
399 parentItem,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
400 FileSystemUtilities.toNativeSeparators(
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
401 f.absoluteFilePath()
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
402 ),
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
403 parentItem.getProjectTypes()[0],
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
404 fsInterface=self.__remotefsInterface,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
405 )
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
406 )
10631
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
407 if self.project.vcs is not None:
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
408 fname = f.absoluteFilePath()
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
409 if (
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
410 states[os.path.normcase(fname)]
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
411 == VersionControlState.Controlled
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
412 ):
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
413 node.addVcsStatus(self.project.vcs.vcsName())
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
414 self.project.clearStatusMonitorCachedState(
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
415 f.absoluteFilePath()
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
416 )
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
417 else:
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
418 node.addVcsStatus(self.tr("local"))
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
419 else:
10631
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
420 node.addVcsStatus("")
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
421 self._addItem(node, parentItem)
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
422 if repopulate:
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
423 self.endInsertRows()
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
424
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
425 elif FileSystemUtilities.isRemoteFileName(dirName):
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
426 entriesList = self.__remotefsInterface.listdir(dirName)[2]
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
427 if len(entriesList) > 0:
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
428 if repopulate:
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
429 self.beginInsertRows(
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
430 self.createIndex(parentItem.row(), 0, parentItem),
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
431 0,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
432 len(entryInfoList) - 1,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
433 )
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
434 for entry in entriesList:
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
435 node = (
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
436 ProjectBrowserDirectoryItem(
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
437 parentItem,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
438 entry["path"],
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
439 parentItem.getProjectTypes()[0],
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
440 False,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
441 fsInterface=self.__remotefsInterface,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
442 )
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
443 if entry["is_dir"]
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
444 else ProjectBrowserFileItem(
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
445 parentItem,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
446 entry["path"],
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
447 parentItem.getProjectTypes()[0],
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
448 fsInterface=self.__remotefsInterface,
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
449 )
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
450 )
5367
7123b86157b5 Fixed a little issue in the project browser model populating nodes of a non-VCS controlled project.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5100
diff changeset
451 node.addVcsStatus("")
10631
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
452 self._addItem(node, parentItem)
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
453 if repopulate:
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
454 self.endInsertRows()
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
455
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
456 def projectClosed(self):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
457 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
458 Public method called after a project has been closed.
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
459 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
460 self.__vcsStatus = {}
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
461
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
462 paths = list(self.watchedDirItems.keys())
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
463 if paths:
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
464 watcher = EricFileSystemWatcher.instance()
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
465 watcher.removePaths(paths)
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
466 self.watchedDirItems.clear()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
467
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
468 self.rootItem.removeChildren()
3656
441956d8fce5 Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3600
diff changeset
469 self.beginResetModel()
441956d8fce5 Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3600
diff changeset
470 self.endResetModel()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
471
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
472 # reset the module parser cache
9413
80c06d472826 Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9221
diff changeset
473 ModuleParser.resetParsedModules()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
474
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
475 def projectOpened(self):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
476 """
2995
63d874899b8b Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2769
diff changeset
477 Public method used to populate the model after a project has been
63d874899b8b Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2769
diff changeset
478 opened.
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
479 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
480 self.__vcsStatus = {}
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
481 states = {}
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
482 fileCategories = self.project.getFileCategories()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
483
10631
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
484 if self.project.vcs is not None and not FileSystemUtilities.isRemoteFileName(
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
485 self.project.ppath
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
486 ):
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
487 for fileCategory in fileCategories:
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
488 for fn in self.project.getProjectData(dataKey=fileCategory):
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
489 states[os.path.normcase(os.path.join(self.project.ppath, fn))] = 0
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
490
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
491 self.project.vcs.clearStatusCache()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
492 states = self.project.vcs.vcsAllRegisteredStates(states, self.project.ppath)
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
493
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
494 self.inRefresh = True
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
495 for fileCategory in fileCategories:
2995
63d874899b8b Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2769
diff changeset
496 # Show the entry in bold in the others browser to make it more
63d874899b8b Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2769
diff changeset
497 # distinguishable
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
498 bold = fileCategory == "OTHERS"
8235
78e6d29eb773 Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator) (batch 3).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8222
diff changeset
499 sourceLanguage = (
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
500 self.project.getProjectLanguage() if fileCategory == "SOURCES" else ""
8235
78e6d29eb773 Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator) (batch 3).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8222
diff changeset
501 )
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
502
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
503 for fn in self.project.getProjectData(dataKey=fileCategory):
10596
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
504 fname = (
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
505 self.__remotefsInterface.join(self.project.ppath, fn)
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
506 if FileSystemUtilities.isRemoteFileName(self.project.ppath)
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
507 else os.path.join(self.project.ppath, fn)
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
508 )
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
509 isdir = (
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
510 self.__remotefsInterface.isdir(fname)
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
511 if FileSystemUtilities.isRemoteFileName(fname)
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
512 else os.path.isdir(fname)
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
513 )
10692
9becf9ca115c Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10679
diff changeset
514 parentItem, _dt = self.findParentItemByName(
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
515 self.__projectBrowser.getProjectBrowserFilter(fileCategory), fn
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
516 )
8259
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8243
diff changeset
517 itm = (
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8243
diff changeset
518 ProjectBrowserDirectoryItem(
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
519 parentItem,
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
520 fname,
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
521 self.__projectBrowser.getProjectBrowserFilter(fileCategory),
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
522 False,
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
523 bold,
10596
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
524 fsInterface=self.__remotefsInterface,
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
525 )
10596
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
526 if isdir
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
527 else ProjectBrowserFileItem(
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
528 parentItem,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
529 fname,
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
530 self.__projectBrowser.getProjectBrowserFilter(fileCategory),
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
531 False,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
532 bold,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
533 sourceLanguage=sourceLanguage,
10596
ea35c92a3c7c Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
534 fsInterface=self.__remotefsInterface,
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
535 )
8259
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8243
diff changeset
536 )
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
537 self._addItem(itm, parentItem)
10631
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
538 if (
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
539 self.project.vcs is not None
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
540 and not FileSystemUtilities.isRemoteFileName(self.project.ppath)
00f5aae565a3 Extended the project support for eric-ide server projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10610
diff changeset
541 ):
7266
d001bc703c29 Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7229
diff changeset
542 if (
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
543 states[os.path.normcase(fname)]
10491
acabc60b19a2 Version Control
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10470
diff changeset
544 == VersionControlState.Controlled
7266
d001bc703c29 Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7229
diff changeset
545 ):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
546 itm.addVcsStatus(self.project.vcs.vcsName())
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
547 else:
3190
a9a94491c4fd Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3160
diff changeset
548 itm.addVcsStatus(self.tr("local"))
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
549 else:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
550 itm.addVcsStatus("")
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
551 self.inRefresh = False
3656
441956d8fce5 Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3600
diff changeset
552 self.beginResetModel()
441956d8fce5 Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3600
diff changeset
553 self.endResetModel()
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
554
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
555 def findParentItemByName(self, type_, name, dontSplit=False):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
556 """
2763
e4794166ad70 Fixed a serious typo.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2613
diff changeset
557 Public method to find an item given its name.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
558
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
559 <b>Note</b>: This method creates all necessary parent items, if they
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
560 don't exist.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
561
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
562 @param type_ type of the item
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
563 @type str
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
564 @param name name of the item
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
565 @type str
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
566 @param dontSplit flag indicating the name should not be split
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
567 @type bool
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
568 @return reference to the item found and the new display name
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
569 @rtype str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
570 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
571 if dontSplit:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
572 pathlist = []
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
573 pathlist.append(name)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
574 pathlist.append("ignore_me")
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
575 else:
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
576 pathlist = re.split(r"/|\\", name)
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
577
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
578 if len(pathlist) > 1:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
579 olditem = self.rootItem
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
580 path = self.project.ppath
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
581 for p in pathlist[:-1]:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
582 itm = self.findChildItem(p, 0, olditem)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
583 path = os.path.join(path, p)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
584 if itm is None:
10610
bb0149571d94 Finished adapting the project functions to support an 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10605
diff changeset
585 itm = ProjectBrowserSimpleDirectoryItem(
bb0149571d94 Finished adapting the project functions to support an 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10605
diff changeset
586 olditem, type_, p, path, self.__remotefsInterface
bb0149571d94 Finished adapting the project functions to support an 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10605
diff changeset
587 )
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
588 self.__addVCSStatus(itm, path)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
589 if self.inRefresh:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
590 self._addItem(itm, olditem)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
591 else:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
592 if olditem == self.rootItem:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
593 oldindex = QModelIndex()
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
594 else:
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
595 oldindex = self.createIndex(olditem.row(), 0, olditem)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
596 self.addItem(itm, oldindex)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
597 else:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
598 if type_ and type_ not in itm.getProjectTypes():
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
599 itm.addProjectType(type_)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
600 olditem = itm
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
601 return (itm, pathlist[-1])
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
602 else:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
603 return (self.rootItem, name)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
604
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
605 def findChildItem(self, text, column, parentItem=None):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
606 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
607 Public method to find a child item given some text.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
608
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
609 @param text text to search for
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
610 @type str
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
611 @param column column to search in
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
612 @type int
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
613 @param parentItem reference to parent item
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
614 @type BrowserItem
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
615 @return reference to the item found
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
616 @rtype BrowserItem
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
617 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
618 if parentItem is None:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
619 parentItem = self.rootItem
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
620
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
621 for itm in parentItem.children():
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
622 if itm.data(column) == text:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
623 return itm
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
624
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
625 return None
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
626
10845
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
627 def addNewItem(self, typeString, name, additionalTypeStrings=None, simple=False):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
628 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
629 Public method to add a new item to the model.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
630
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
631 @param typeString string denoting the type of the new item
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
632 @type str
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
633 @param name name of the new item
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
634 @type str
10845
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
635 @param additionalTypeStrings names of additional types (defaults to None)
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
636 @type list of str (optional)
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
637 @param simple flag indicating to create a simple directory item and/or not
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
638 highlight the entry (defaults to False)
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
639 @type bool (optional)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
640 """
2995
63d874899b8b Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2769
diff changeset
641 # Show the entry in bold in the others browser to make it more
63d874899b8b Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2769
diff changeset
642 # distinguishable
10845
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
643 bold = typeString == "OTHERS" and not simple
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
644
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
645 fname = os.path.join(self.project.ppath, name)
10692
9becf9ca115c Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10679
diff changeset
646 parentItem, _dt = self.findParentItemByName(
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
647 self.__projectBrowser.getProjectBrowserFilter(typeString), name
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
648 )
8259
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8243
diff changeset
649 parentIndex = (
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8243
diff changeset
650 QModelIndex()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
651 if parentItem == self.rootItem
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
652 else self.createIndex(parentItem.row(), 0, parentItem)
8259
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8243
diff changeset
653 )
10841
f06e4123cb1c Fixed some issues related to the handling of project files or directories of type 'OTHERS'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10832
diff changeset
654
f06e4123cb1c Fixed some issues related to the handling of project files or directories of type 'OTHERS'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10832
diff changeset
655 if typeString == "OTHERS":
f06e4123cb1c Fixed some issues related to the handling of project files or directories of type 'OTHERS'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10832
diff changeset
656 childItem = self.findChildItem(os.path.basename(name), 0, parentItem)
f06e4123cb1c Fixed some issues related to the handling of project files or directories of type 'OTHERS'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10832
diff changeset
657 if childItem is not None:
f06e4123cb1c Fixed some issues related to the handling of project files or directories of type 'OTHERS'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10832
diff changeset
658 if childItem.bold:
f06e4123cb1c Fixed some issues related to the handling of project files or directories of type 'OTHERS'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10832
diff changeset
659 # the entry was already added
f06e4123cb1c Fixed some issues related to the handling of project files or directories of type 'OTHERS'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10832
diff changeset
660 return
f06e4123cb1c Fixed some issues related to the handling of project files or directories of type 'OTHERS'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10832
diff changeset
661 else:
f06e4123cb1c Fixed some issues related to the handling of project files or directories of type 'OTHERS'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10832
diff changeset
662 self.removeItem(name)
f06e4123cb1c Fixed some issues related to the handling of project files or directories of type 'OTHERS'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10832
diff changeset
663
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
664 if os.path.isdir(fname):
10845
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
665 itm = (
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
666 ProjectBrowserSimpleDirectoryItem(
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
667 parentItem,
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
668 self.__projectBrowser.getProjectBrowserFilter(typeString),
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
669 os.path.basename(name),
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
670 fname,
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
671 fsInterface=self.__remotefsInterface,
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
672 )
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
673 if simple
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
674 else ProjectBrowserDirectoryItem(
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
675 parentItem,
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
676 fname,
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
677 self.__projectBrowser.getProjectBrowserFilter(typeString),
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
678 False,
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
679 bold,
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
680 fsInterface=self.__remotefsInterface,
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
681 )
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
682 )
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
683 else:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
684 if typeString == "SOURCES":
5100
2c193da9b94f Finished cleaning up some code related to the Project class and data structures.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4631
diff changeset
685 sourceLanguage = self.project.getProjectLanguage()
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
686 else:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
687 sourceLanguage = ""
3030
4a0a82ddd9d2 Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2995
diff changeset
688 itm = ProjectBrowserFileItem(
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
689 parentItem,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
690 fname,
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
691 self.__projectBrowser.getProjectBrowserFilter(typeString),
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
692 False,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
693 bold,
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
694 sourceLanguage=sourceLanguage,
10605
b6f5e27daeb5 Adapted the project 'Add Files' and 'Add Directory' functions to work with remote projects.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10597
diff changeset
695 fsInterface=self.__remotefsInterface,
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
696 )
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
697 self.__addVCSStatus(itm, fname)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
698 if additionalTypeStrings:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
699 for additionalTypeString in additionalTypeStrings:
9527
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
700 browserType = self.__projectBrowser.getProjectBrowserFilter(
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
701 additionalTypeString
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
702 )
8601253e7633 Continued refactoring of the project browser related code in order to extract some as plugins later on.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9524
diff changeset
703 itm.addProjectType(browserType)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
704 self.addItem(itm, parentIndex)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
705
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
706 def renameItem(self, name, newFilename):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
707 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
708 Public method to rename an item.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
709
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
710 @param name the old display name
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
711 @type str
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
712 @param newFilename new filename of the item
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
713 @type str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
714 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
715 itm = self.findItem(name)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
716 if itm is None:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
717 return
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
718
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
719 index = self.createIndex(itm.row(), 0, itm)
7518
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
720 itm.setName(newFilename, full=False)
2126
3744863a534e Reverted the dataChanged signal change due to corrections in PyQt4.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2081
diff changeset
721 self.dataChanged.emit(index, index)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
722 self.repopulateItem(newFilename)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
723
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
724 def findItem(self, name):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
725 """
2763
e4794166ad70 Fixed a serious typo.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2613
diff changeset
726 Public method to find an item given its name.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
727
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
728 @param name name of the item
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
729 @type str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
730 @return reference to the item found
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
731 @rtype BrowserItem
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
732 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
733 if QDir.isAbsolutePath(name):
248
f4561c24989a Changed code to better deal with project relative paths on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 237
diff changeset
734 name = self.project.getRelativePath(name)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
735 pathlist = re.split(r"/|\\", name)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
736 if len(pathlist) > 0:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
737 olditem = self.rootItem
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
738 for p in pathlist:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
739 itm = self.findChildItem(p, 0, olditem)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
740 if itm is None:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
741 return None
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
742 olditem = itm
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
743 return itm
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
744 else:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
745 return None
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
746
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
747 def itemIndexByName(self, name):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
748 """
2763
e4794166ad70 Fixed a serious typo.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2613
diff changeset
749 Public method to find an item's index given its name.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
750
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
751 @param name name of the item
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
752 @type str
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
753 @return index of the item found
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
754 @rtype QModelIndex
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
755 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
756 itm = self.findItem(name)
8235
78e6d29eb773 Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator) (batch 3).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8222
diff changeset
757 index = self.createIndex(itm.row(), 0, itm) if itm else QModelIndex()
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
758 return index
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
759
2769
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
760 def itemIndexByNameAndLine(self, name, lineno):
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
761 """
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
762 Public method to find an item's index given its name.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
763
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
764 @param name name of the item
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
765 @type str
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
766 @param lineno one based line number of the item
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
767 @type int
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
768 @return index of the item found
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
769 @rtype QModelIndex
2769
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
770 """
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
771 index = QModelIndex()
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
772 itm = self.findItem(name)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
773 if itm is not None and isinstance(itm, ProjectBrowserFileItem):
2769
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
774 olditem = itm
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
775 autoPopulate = Preferences.getProject("AutoPopulateItems")
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
776 while itm is not None:
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
777 if not itm.isPopulated():
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
778 if itm.isLazyPopulated() and autoPopulate:
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
779 self.populateItem(itm)
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
780 else:
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
781 break
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
782 for child in itm.children():
8243
cc717c2ae956 Applied some more code simplifications suggested by the new Simplify checker (Y105: use contextlib.suppress) (batch 2).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8235
diff changeset
783 with contextlib.suppress(AttributeError):
2769
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
784 start, end = child.boundaries()
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
785 if end == -1:
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
786 end = 1000000 # assume end of file
2769
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
787 if start <= lineno <= end:
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
788 itm = child
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
789 break
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
790 else:
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
791 itm = None
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
792 if itm:
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
793 olditem = itm
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
794 index = self.createIndex(olditem.row(), 0, olditem)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
795
2769
8cbebde7a984 Added support to highlight the current class/method name of the current editor to the project sources viewer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2763
diff changeset
796 return index
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
797
7518
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
798 def startFileSystemMonitoring(self):
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
799 """
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
800 Public method to (re)start monitoring the project file system.
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
801 """
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
802 self.__watcherActive = True
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
803
7518
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
804 def stopFileSystemMonitoring(self):
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
805 """
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
806 Public method to stop monitoring the project file system.
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
807 """
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
808 self.__watcherActive = False
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
809
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
810 def entryCreated(self, path, isDir=False):
234
caed45a134f8 Added code to update the Others tab of the project browser (mostly) automatically.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 216
diff changeset
811 """
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
812 Public method to handle the creation of a file or directory.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
813
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
814 @param path path of the created file or directory
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
815 @type str
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
816 @param isDir flag indicating a created directory (defaults to False)
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
817 @type bool (optional)
234
caed45a134f8 Added code to update the Others tab of the project browser (mostly) automatically.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 216
diff changeset
818 """
7518
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
819 if not self.__watcherActive:
6dea4abd3097 Project: fixed some issue renaming files and directories via the active VCS.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7360
diff changeset
820 return
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
821
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
822 parentPath = os.path.dirname(path)
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
823 if parentPath not in self.watchedDirItems:
234
caed45a134f8 Added code to update the Others tab of the project browser (mostly) automatically.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 216
diff changeset
824 # just ignore the situation we don't have a reference to the item
caed45a134f8 Added code to update the Others tab of the project browser (mostly) automatically.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 216
diff changeset
825 return
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
826
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
827 if not Preferences.getProject("BrowsersListHiddenFiles") and os.path.basename(
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
828 path
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
829 ).startswith("."):
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
830 return
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
831
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
832 for itm in self.watchedDirItems[parentPath]:
10845
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
833 name = os.path.basename(path)
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
834 child = self.findChildItem(name, 0, parentItem=itm)
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
835 if child is None:
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
836 cnt = itm.childCount()
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
837 self.beginInsertRows(self.createIndex(itm.row(), 0, itm), cnt, cnt)
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
838 node = (
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
839 ProjectBrowserDirectoryItem(
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
840 itm,
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
841 FileSystemUtilities.toNativeSeparators(path),
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
842 itm.getProjectTypes()[0],
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
843 False,
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
844 fsInterface=self.__remotefsInterface,
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
845 )
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
846 if isDir
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
847 else ProjectBrowserFileItem(
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
848 itm,
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
849 FileSystemUtilities.toNativeSeparators(path),
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
850 itm.getProjectTypes()[0],
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
851 fsInterface=self.__remotefsInterface,
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
852 )
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
853 )
10845
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
854 self._addItem(node, itm)
bbcad422aea7 Project Viewer
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10842
diff changeset
855 self.endInsertRows()
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
856
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
857 def entryDeleted(self, path, isDir=False):
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
858 """
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
859 Public method to handle the deletion of a file or directory.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
860
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
861 @param path path of the deleted file or directory
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
862 @type str
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
863 @param isDir flag indicating a deleted directory (defaults to False)
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
864 @type bool (optional)
10842
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
865 @return flag indicating a deletion
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
866 @rtype bool
10679
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
867 """
4d3e0ce54322 General
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10677
diff changeset
868 if not self.__watcherActive:
10842
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
869 return False
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
870
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
871 return super().entryDeleted(path, isDir=isDir)
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
872
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
873 def entryMoved(self, srcPath, tgtPath):
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
874 """
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
875 Public slot handling the renaming of a non-managed file.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
876
10842
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
877 @param srcPath original name
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
878 @type str
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
879 @param tgtPath new name
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
880 @type str
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
881 """
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
882 if self.entryDeleted(srcPath, isDir=False):
d7fe0566dfa8 Corrected an issue related to the external creation of non-managed files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10841
diff changeset
883 self.entryCreated(tgtPath, isDir=False)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
884
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
885 def __addVCSStatus(self, item, name):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
886 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
887 Private method used to set the vcs status of a node.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
888
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
889 @param item item to work on
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
890 @type BrowserItem
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
891 @param name filename belonging to this item
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
892 @type str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
893 """
10110
009526532fa5 Implemented some modifications to (hopefully) prevent some spurious exceptions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10069
diff changeset
894 vcs = self.project.vcs
009526532fa5 Implemented some modifications to (hopefully) prevent some spurious exceptions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10069
diff changeset
895 if vcs is not None:
009526532fa5 Implemented some modifications to (hopefully) prevent some spurious exceptions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10069
diff changeset
896 state = vcs.vcsRegisteredState(name)
10491
acabc60b19a2 Version Control
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10470
diff changeset
897 if state == VersionControlState.Controlled:
10110
009526532fa5 Implemented some modifications to (hopefully) prevent some spurious exceptions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10069
diff changeset
898 item.addVcsStatus(vcs.vcsName())
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
899 else:
3190
a9a94491c4fd Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3160
diff changeset
900 item.addVcsStatus(self.tr("local"))
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
901 else:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
902 item.addVcsStatus("")
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
903
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
904 def __updateVCSStatus(self, item, name, recursive=True):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
905 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
906 Private method used to update the vcs status of a node.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
907
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
908 @param item item to work on
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
909 @type BrowserItem
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
910 @param name filename belonging to this item
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
911 @type str
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
912 @param recursive flag indicating a recursive update
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
913 @type bool
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
914 """
10110
009526532fa5 Implemented some modifications to (hopefully) prevent some spurious exceptions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10069
diff changeset
915 vcs = self.project.vcs
009526532fa5 Implemented some modifications to (hopefully) prevent some spurious exceptions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10069
diff changeset
916 if vcs is not None:
009526532fa5 Implemented some modifications to (hopefully) prevent some spurious exceptions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10069
diff changeset
917 vcs.clearStatusCache()
009526532fa5 Implemented some modifications to (hopefully) prevent some spurious exceptions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10069
diff changeset
918 state = vcs.vcsRegisteredState(name)
10491
acabc60b19a2 Version Control
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10470
diff changeset
919 if state == VersionControlState.Controlled:
10110
009526532fa5 Implemented some modifications to (hopefully) prevent some spurious exceptions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10069
diff changeset
920 item.setVcsStatus(vcs.vcsName())
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
921 else:
3190
a9a94491c4fd Changed the code to use QObject.tr() instead of QObject.trUtf8().
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3160
diff changeset
922 item.setVcsStatus(self.tr("local"))
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
923 if recursive:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
924 name = os.path.dirname(name)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
925 parentItem = item.parent()
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
926 if name and parentItem is not self.rootItem:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
927 self.__updateVCSStatus(parentItem, name, recursive)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
928 else:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
929 item.setVcsStatus("")
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
930
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
931 index = self.createIndex(item.row(), 0, item)
2126
3744863a534e Reverted the dataChanged signal change due to corrections in PyQt4.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2081
diff changeset
932 self.dataChanged.emit(index, index)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
933
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
934 def updateVCSStatus(self, name, recursive=True):
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
935 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
936 Public method used to update the vcs status of a node.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
937
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
938 @param name filename belonging to this item
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
939 @type str
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
940 @param recursive flag indicating a recursive update
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
941 @type bool
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
942 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
943 item = self.findItem(name)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
944 if item:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
945 self.__updateVCSStatus(item, name, recursive)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
946
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
947 def removeItem(self, name):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
948 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
949 Public method to remove a named item.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
950
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
951 @param name file or directory name of the item
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
952 @type str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
953 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
954 fname = os.path.basename(name)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
955 parentItem = self.findParentItemByName(0, name)[0]
8259
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8243
diff changeset
956 parentIndex = (
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8243
diff changeset
957 QModelIndex()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
958 if parentItem == self.rootItem
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
959 else self.createIndex(parentItem.row(), 0, parentItem)
8259
2bbec88047dd Applied some more code simplifications suggested by the new Simplify checker (Y108: use ternary operator).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8243
diff changeset
960 )
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
961 childItem = self.findChildItem(fname, 0, parentItem)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
962 if childItem is not None:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
963 self.beginRemoveRows(parentIndex, childItem.row(), childItem.row())
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
964 parentItem.removeChild(childItem)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
965 self.endRemoveRows()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
966
10915
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10845
diff changeset
967 if (
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10845
diff changeset
968 isinstance(parentItem, ProjectBrowserSimpleDirectoryItem)
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10845
diff changeset
969 and parentItem.childCount() == 0
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10845
diff changeset
970 ):
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10845
diff changeset
971 # unmanaged directory is empty; remove it
10841
f06e4123cb1c Fixed some issues related to the handling of project files or directories of type 'OTHERS'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10832
diff changeset
972 self.removeItem(os.path.dirname(name))
f06e4123cb1c Fixed some issues related to the handling of project files or directories of type 'OTHERS'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10832
diff changeset
973
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
974 def repopulateItem(self, name):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
975 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
976 Public method to repopulate an item.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
977
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
978 @param name name of the file relative to the project root
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
979 @type str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
980 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
981 itm = self.findItem(name)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
982 if itm is None:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
983 return
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
984
169
a03768260179 Fixed a serious bug in the subversion plug-ins and in the project browser model and corrected some source docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 103
diff changeset
985 if itm.isLazyPopulated():
a03768260179 Fixed a serious bug in the subversion plug-ins and in the project browser model and corrected some source docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 103
diff changeset
986 if not itm.isPopulated():
a03768260179 Fixed a serious bug in the subversion plug-ins and in the project browser model and corrected some source docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 103
diff changeset
987 # item is not populated yet, nothing to do
a03768260179 Fixed a serious bug in the subversion plug-ins and in the project browser model and corrected some source docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 103
diff changeset
988 return
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
989
169
a03768260179 Fixed a serious bug in the subversion plug-ins and in the project browser model and corrected some source docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 103
diff changeset
990 if itm.childCount():
a03768260179 Fixed a serious bug in the subversion plug-ins and in the project browser model and corrected some source docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 103
diff changeset
991 index = self.createIndex(itm.row(), 0, itm)
a03768260179 Fixed a serious bug in the subversion plug-ins and in the project browser model and corrected some source docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 103
diff changeset
992 self.beginRemoveRows(index, 0, itm.childCount() - 1)
a03768260179 Fixed a serious bug in the subversion plug-ins and in the project browser model and corrected some source docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 103
diff changeset
993 itm.removeChildren()
a03768260179 Fixed a serious bug in the subversion plug-ins and in the project browser model and corrected some source docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 103
diff changeset
994 self.endRemoveRows()
10677
6ee2e475490c Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
995
6ee2e475490c Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10517
diff changeset
996 # reset the module parser cache
9413
80c06d472826 Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9221
diff changeset
997 ModuleParser.resetParsedModule(os.path.join(self.project.ppath, name))
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
998
3440
ddcce63ab5cc Fixed a refreshing issue in the browser model.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3190
diff changeset
999 self.populateItem(itm, True)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1000
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1001 def projectPropertiesChanged(self):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1002 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1003 Public method to react on a change of the project properties.
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1004 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1005 # nothing to do for now
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1006 return
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1007
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1008 def changeVCSStates(self, statesList):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1009 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1010 Public slot to record the (non normal) VCS states.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1011
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
1012 @param statesList list of VCS state entries giving the states in the
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
1013 first column and the path relative to the project directory starting
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
1014 with the third column. The allowed status flags are:
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1015 <ul>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1016 <li>"A" path was added but not yet comitted</li>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1017 <li>"M" path has local changes</li>
216
6f9713e8d570 Added actions to identify the repo, to forget about files and added an additional status to be reported by the status monitor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 194
diff changeset
1018 <li>"O" path was removed</li>
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1019 <li>"R" path was deleted and then re-added</li>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1020 <li>"U" path needs an update</li>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1021 <li>"Z" path contains a conflict</li>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1022 <li>" " path is back at normal</li>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1023 </ul>
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
1024 @type list of str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1025 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1026 statesList.sort()
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1027 lastHead = ""
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1028 itemCache = {}
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1029 if len(statesList) == 1 and statesList[0] == "--RESET--":
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1030 statesList = []
10373
093dcebe5ecb Corrected some uses of dict.keys(), dict.values() and dict.items().
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10110
diff changeset
1031 for name in self.__vcsStatus:
427
6af5d12cfecb Did some more string format conversions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 405
diff changeset
1032 statesList.append(" {0}".format(name))
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1033
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1034 for name in statesList:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1035 state = name[0]
8787
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1036 if state in "AMORUZ ":
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1037 name = name[1:].strip()
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1038 if state == " ":
8787
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1039 if name in self.__vcsStatus:
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1040 del self.__vcsStatus[name]
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1041 else:
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1042 self.__vcsStatus[name] = state
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1043
8787
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1044 try:
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1045 itm = itemCache[name]
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1046 except KeyError:
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1047 itm = self.findItem(name)
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1048 if itm:
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1049 itemCache[name] = itm
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1050 if itm:
8787
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1051 itm.setVcsState(state)
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1052 itm.setVcsStatus(self.project.vcs.vcsName())
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1053 index1 = self.createIndex(itm.row(), 0, itm)
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1054 index2 = self.createIndex(
10378
cbbcecf9b25e Changed code to cope with a changed behavior of Qt 6.1.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10373
diff changeset
1055 itm.row(), self.rootItem.columnCount() - 1, itm
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1056 )
8787
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1057 self.dataChanged.emit(index1, index2)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1058
10692
9becf9ca115c Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10679
diff changeset
1059 head, _tail = os.path.split(name)
8787
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1060 if head != lastHead:
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1061 if lastHead:
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1062 self.__changeParentsVCSState(lastHead, itemCache)
779054e59d8e Fixed a bug causing some false VCS status being shown in the project browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8522
diff changeset
1063 lastHead = head
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1064 if lastHead:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1065 self.__changeParentsVCSState(lastHead, itemCache)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1066 try:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1067 globalVcsStatus = sorted(self.__vcsStatus.values())[-1]
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1068 except IndexError:
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1069 globalVcsStatus = " "
500
c3abc7895a01 Continued porting signal/slot usage to the new API.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 427
diff changeset
1070 self.vcsStateChanged.emit(globalVcsStatus)
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1071
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1072 def __changeParentsVCSState(self, path, itemCache):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1073 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1074 Private method to recursively change the parents VCS state.
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1075
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
1076 @param path pathname of parent item
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
1077 @type str
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1078 @param itemCache reference to the item cache used to store
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1079 references to named items
10430
e440aaf179ce Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10398
diff changeset
1080 @type dict
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1081 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1082 while path:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1083 try:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1084 itm = itemCache[path]
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1085 except KeyError:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1086 itm = self.findItem(path)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1087 if itm:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1088 itemCache[path] = itm
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1089 if itm:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1090 state = " "
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1091 for id_ in itm.children():
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1092 if state < id_.vcsState:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1093 state = id_.vcsState
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1094 if state != itm.vcsState:
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1095 itm.setVcsState(state)
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1096 index1 = self.createIndex(itm.row(), 0, itm)
3030
4a0a82ddd9d2 Fixed a bunch of visible indentation issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2995
diff changeset
1097 index2 = self.createIndex(
10378
cbbcecf9b25e Changed code to cope with a changed behavior of Qt 6.1.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10373
diff changeset
1098 itm.row(), self.rootItem.columnCount() - 1, itm
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1099 )
2126
3744863a534e Reverted the dataChanged signal change due to corrections in PyQt4.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2081
diff changeset
1100 self.dataChanged.emit(index1, index2)
10692
9becf9ca115c Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10679
diff changeset
1101 path, _tail = os.path.split(path)
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1102
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1103 def preferencesChanged(self):
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1104 """
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1105 Public method used to handle a change in preferences.
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1106 """
10373
093dcebe5ecb Corrected some uses of dict.keys(), dict.values() and dict.items().
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10110
diff changeset
1107 for code in self.colorNames:
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1108 color = Preferences.getProjectBrowserColour(self.colorNames[code])
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1109 if color.name() == self.itemBackgroundColors[code].name():
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1110 continue
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1111
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1112 self.itemBackgroundColors[code] = color
9221
bf71ee032bb4 Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
1113
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1114 color = Preferences.getProjectBrowserColour("Highlighted")
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1115 if self.highLightColor.name() != color.name():
945
8cd4d08fa9f6 Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 791
diff changeset
1116 self.highLightColor = color

eric ide

mercurial