Sat, 17 Jul 2021 15:15:03 +0200
Removed an obsolete TODO comment and updated the source code docu.
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 | |
7923
91e843545d9a
Updated copyright for 2021.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7907
diff
changeset
|
3 | # Copyright (c) 2006 - 2021 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 defining common data to be used by all modules. |
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 | |
4343
afe0da217745
Added the '--settings=' command line switch to store the settings files in a non-standard directory.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4241
diff
changeset
|
10 | # |
afe0da217745
Added the '--settings=' command line switch to store the settings files in a non-standard directory.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4241
diff
changeset
|
11 | # Note: Do not import any eric stuff in here!!!!!!! |
afe0da217745
Added the '--settings=' command line switch to store the settings files in a non-standard directory.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4241
diff
changeset
|
12 | # |
afe0da217745
Added the '--settings=' command line switch to store the settings files in a non-standard directory.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4241
diff
changeset
|
13 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | import sys |
1162
ab292b7f4f8a
Added code to search for a Python2 interpreter in some known places. If none is found, the user can configure it on the Debugger, Python config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
15 | import os |
5736
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
16 | import re |
6474
72c063cc730b
Globals.__init__: fixed an issue that caused startup issues on Windows if both _eric6 and .eric6 were existing.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6366
diff
changeset
|
17 | import shutil |
8240
93b8a353c4bf
Applied some more code simplifications suggested by the new Simplify checker (Y105: use contextlib.suppress) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8126
diff
changeset
|
18 | import contextlib |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | |
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:
8314
diff
changeset
|
20 | from PyQt6.QtCore import ( |
7742
38ad1351688c
Globals: removed some obsolete code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7741
diff
changeset
|
21 | QDir, QByteArray, QCoreApplication, QT_VERSION, QProcess, qVersion |
7253
50dbe65a1334
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
22 | ) |
2087
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
23 | |
8314
e3642a6a1e71
Finished renaming eric6 to eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
24 | from eric7config import getConfig |
7804
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
25 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | # names of the various settings objects |
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:
8314
diff
changeset
|
27 | settingsNameOrganization = "Eric7" |
8314
e3642a6a1e71
Finished renaming eric6 to eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
28 | settingsNameGlobal = "eric7" |
e3642a6a1e71
Finished renaming eric6 to eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
29 | settingsNameRecent = "eric7recent" |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | # key names of the various recent entries |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | recentNameMultiProject = "MultiProjects" |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | recentNameProject = "Projects" |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | recentNameFiles = "Files" |
4695
9dc08852de25
Added a 'Recent Files' menu to the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4686
diff
changeset
|
35 | recentNameHexFiles = "HexFiles" |
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:
8314
diff
changeset
|
36 | recentNameHosts = "Hosts" |
6034
4f88f70d2cd4
Added the capability to remember the most recently used file names and conditions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5859
diff
changeset
|
37 | recentNameBreakpointFiles = "BreakPointFiles" |
4f88f70d2cd4
Added the capability to remember the most recently used file names and conditions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5859
diff
changeset
|
38 | recentNameBreakpointConditions = "BreakPointConditions" |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | |
2087
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
40 | configDir = None |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
41 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
882
diff
changeset
|
42 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | def isWindowsPlatform(): |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | """ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | Function to check, if this is a Windows platform. |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
46 | |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
47 | @return flag indicating Windows platform |
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
48 | @rtype bool |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | """ |
6289
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
50 | return sys.platform.startswith(("win", "cygwin")) |
882
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
51 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
882
diff
changeset
|
52 | |
882
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
53 | def isMacPlatform(): |
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
54 | """ |
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
55 | Function to check, if this is a Mac platform. |
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
56 | |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
57 | @return flag indicating Mac platform |
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
58 | @rtype bool |
882
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
59 | """ |
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
60 | return sys.platform == "darwin" |
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
61 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
882
diff
changeset
|
62 | |
882
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
63 | def isLinuxPlatform(): |
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
64 | """ |
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
65 | Function to check, if this is a Linux platform. |
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
66 | |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
67 | @return flag indicating Linux platform |
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
68 | @rtype bool |
882
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
69 | """ |
34b86be88bf0
Redid the native file dialog code to be future proof.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
70 | return sys.platform.startswith("linux") |
1162
ab292b7f4f8a
Added code to search for a Python2 interpreter in some known places. If none is found, the user can configure it on the Debugger, Python config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
71 | |
ab292b7f4f8a
Added code to search for a Python2 interpreter in some known places. If none is found, the user can configure it on the Debugger, Python config page.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
72 | |
6289
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
73 | def desktopName(): |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
74 | """ |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
75 | Function to determine the name of the desktop environment used |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
76 | (Linux only). |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
77 | |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
78 | @return name of the desktop environment |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
79 | @rtype str |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
80 | """ |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
81 | if not isLinuxPlatform(): |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
82 | return "" |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
83 | |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
84 | currDesktop = os.environ.get("XDG_CURRENT_DESKTOP", "") |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
85 | if currDesktop: |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
86 | return currDesktop |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
87 | |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
88 | currDesktop = os.environ.get("XDG_SESSION_DESKTOP", "") |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
89 | if currDesktop: |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
90 | return currDesktop |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
91 | |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
92 | currDesktop = os.environ.get("GDMSESSION", "") |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
93 | if currDesktop: |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
94 | return currDesktop |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
95 | |
6914
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
96 | currDesktop = os.environ.get("GNOME_DESKTOP_SESSION_ID", "") |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
97 | if currDesktop: |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
98 | return currDesktop |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
99 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
100 | currDesktop = os.environ.get("KDE_FULL_SESSION", "") |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
101 | if currDesktop: |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
102 | return currDesktop |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
103 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
104 | currDesktop = os.environ.get("DESKTOP_SESSION", "") |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
105 | if currDesktop: |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
106 | return currDesktop |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
107 | |
6289
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
108 | return "" |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
109 | |
f481df37413c
Extended the error report to send the desktop environment in use (Linux only).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
110 | |
6914
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
111 | def isKdeDesktop(): |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
112 | """ |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
113 | Function to check, if the current session is a KDE desktop (Linux only). |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
114 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
115 | @return flag indicating a KDE desktop |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
116 | @rtype bool |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
117 | """ |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
118 | if not isLinuxPlatform(): |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
119 | return False |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
120 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
121 | isKDE = False |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
122 | |
7253
50dbe65a1334
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
123 | desktop = ( |
50dbe65a1334
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
124 | os.environ.get("XDG_CURRENT_DESKTOP", "").lower() or |
50dbe65a1334
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
125 | os.environ.get("XDG_SESSION_DESKTOP", "").lower() or |
6914
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
126 | os.environ.get("DESKTOP_SESSION", "").lower() |
7253
50dbe65a1334
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
127 | ) |
8257
28146736bbfc
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
|
128 | isKDE = ( |
28146736bbfc
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
|
129 | "kde" in desktop or "plasma" in desktop |
28146736bbfc
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
|
130 | if desktop else |
28146736bbfc
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
|
131 | bool(os.environ.get("KDE_FULL_SESSION", "")) |
28146736bbfc
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
|
132 | ) |
6914
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
133 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
134 | return isKDE |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
135 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
136 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
137 | def isGnomeDesktop(): |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
138 | """ |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
139 | Function to check, if the current session is a Gnome desktop (Linux only). |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
140 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
141 | @return flag indicating a Gnome desktop |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
142 | @rtype bool |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
143 | """ |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
144 | if not isLinuxPlatform(): |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
145 | return False |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
146 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
147 | isGnome = False |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
148 | |
7253
50dbe65a1334
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
149 | desktop = ( |
50dbe65a1334
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
150 | os.environ.get("XDG_CURRENT_DESKTOP", "").lower() or |
50dbe65a1334
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
151 | os.environ.get("XDG_SESSION_DESKTOP", "").lower() or |
6914
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
152 | os.environ.get("GDMSESSION", "").lower() |
7253
50dbe65a1334
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
153 | ) |
8257
28146736bbfc
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
|
154 | isGnome = ( |
28146736bbfc
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
|
155 | "gnome" in desktop |
28146736bbfc
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
|
156 | if desktop else |
28146736bbfc
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
|
157 | bool(os.environ.get("GNOME_DESKTOP_SESSION_ID", "")) |
28146736bbfc
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
|
158 | ) |
6914
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
159 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
160 | return isGnome |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
161 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
162 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
163 | def sessionType(): |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
164 | """ |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
165 | Function to determine the name of the running session (Linux only). |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
166 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
167 | @return name of the desktop environment |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
168 | @rtype str |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
169 | """ |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
170 | if not isLinuxPlatform(): |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
171 | return "" |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
172 | |
8126
e7278bf7168f
Globals: fixed an issue causing an exception when some environment variables are not defined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
173 | sessionType = os.environ.get("XDG_SESSION_TYPE", "").lower() |
6914
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
174 | if "x11" in sessionType: |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
175 | return "X11" |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
176 | elif "wayland" in sessionType: |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
177 | return "Wayland" |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
178 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
179 | sessionType = os.environ.get("WAYLAND_DISPLAY", "").lower() |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
180 | if "wayland" in sessionType: |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
181 | return "Wayland" |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
182 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
183 | return "" |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
184 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
185 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
186 | def isWaylandSession(): |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
187 | """ |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
188 | Function to check, if the current session is a wayland session. |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
189 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
190 | @return flag indicating a wayland session |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
191 | @rtype bool |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
192 | """ |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
193 | return sessionType() == "Wayland" |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
194 | |
5ae038f273c4
Snapshot: refactored the SnapWidget to prepare for implementing snapshot functionality for Wayland desktops.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6682
diff
changeset
|
195 | |
2087
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
196 | def getConfigDir(): |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
197 | """ |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
198 | Module function to get the name of the directory storing the config data. |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
199 | |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
200 | @return directory name of the config dir |
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
201 | @rtype str |
2087
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
202 | """ |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
203 | if configDir is not None and os.path.exists(configDir): |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
204 | hp = configDir |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
205 | else: |
8314
e3642a6a1e71
Finished renaming eric6 to eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
206 | cdn = ".eric7" |
2087
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
207 | if isWindowsPlatform(): |
6303
ec9ebaf206fb
Got rid of the Windows "DotNet"-Hack (i.e. using _ instead of . as first character of special directories).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6289
diff
changeset
|
208 | # migrate the old config directory (< v18.06) |
8314
e3642a6a1e71
Finished renaming eric6 to eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
209 | cdnOld = "_eric7" |
6303
ec9ebaf206fb
Got rid of the Windows "DotNet"-Hack (i.e. using _ instead of . as first character of special directories).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6289
diff
changeset
|
210 | hpOld = os.path.join(os.path.expanduser("~"), cdnOld) |
ec9ebaf206fb
Got rid of the Windows "DotNet"-Hack (i.e. using _ instead of . as first character of special directories).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6289
diff
changeset
|
211 | if os.path.exists(hpOld): |
ec9ebaf206fb
Got rid of the Windows "DotNet"-Hack (i.e. using _ instead of . as first character of special directories).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6289
diff
changeset
|
212 | hpNew = os.path.join(os.path.expanduser("~"), cdn) |
6474
72c063cc730b
Globals.__init__: fixed an issue that caused startup issues on Windows if both _eric6 and .eric6 were existing.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6366
diff
changeset
|
213 | if os.path.exists(hpNew): |
72c063cc730b
Globals.__init__: fixed an issue that caused startup issues on Windows if both _eric6 and .eric6 were existing.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6366
diff
changeset
|
214 | # simply delete the old config directory |
6530
25b9dcfd6fcc
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6474
diff
changeset
|
215 | shutil.rmtree(hpOld, True) |
6474
72c063cc730b
Globals.__init__: fixed an issue that caused startup issues on Windows if both _eric6 and .eric6 were existing.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6366
diff
changeset
|
216 | else: |
72c063cc730b
Globals.__init__: fixed an issue that caused startup issues on Windows if both _eric6 and .eric6 were existing.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6366
diff
changeset
|
217 | os.rename(hpOld, hpNew) |
6303
ec9ebaf206fb
Got rid of the Windows "DotNet"-Hack (i.e. using _ instead of . as first character of special directories).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6289
diff
changeset
|
218 | |
5823
70dfe6a4aa03
Fixed an issue getting the home directory during uninstallation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5736
diff
changeset
|
219 | hp = os.path.join(os.path.expanduser("~"), cdn) |
70dfe6a4aa03
Fixed an issue getting the home directory during uninstallation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5736
diff
changeset
|
220 | if not os.path.exists(hp): |
70dfe6a4aa03
Fixed an issue getting the home directory during uninstallation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5736
diff
changeset
|
221 | os.mkdir(hp) |
70dfe6a4aa03
Fixed an issue getting the home directory during uninstallation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5736
diff
changeset
|
222 | return hp |
2087
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
223 | |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
224 | |
7804
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
225 | def getInstallInfoFilePath(): |
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
226 | """ |
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
227 | Public method to get the path name of the install info file. |
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
228 | |
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
229 | @return file path of the install info file |
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
230 | @rtype str |
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
231 | """ |
8314
e3642a6a1e71
Finished renaming eric6 to eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
232 | filename = "eric7install.{0}.json".format( |
7804
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
233 | getConfig("ericDir") |
7805
3cad282e8409
Globals: fixed an issue calculating the install info file path on Windows systems.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7804
diff
changeset
|
234 | .replace(":", "_") |
7804
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
235 | .replace("\\", "_") |
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
236 | .replace("/", "_") |
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
237 | .replace(" ", "_") |
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
238 | .strip("_") |
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
239 | ) |
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
240 | return os.path.join(getConfigDir(), filename) |
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
241 | |
1cbc27e34ec6
Implementing code to record and/or guess some information about the installation process.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7780
diff
changeset
|
242 | |
2087
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
243 | def setConfigDir(d): |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
244 | """ |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
245 | Module function to set the name of the directory storing the config data. |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
246 | |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
247 | @param d name of an existing directory |
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
248 | @type str |
2087
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
249 | """ |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
250 | global configDir |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
251 | configDir = os.path.expanduser(d) |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
252 | |
795992a5c561
Made the sixth set of Qt5 compatibility changes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
253 | |
8306
2bfd53096b5f
Renamed Globals.getPythonModulesDirectory() to Globals.getPythonLibraryDirectory() because that name is clearer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8257
diff
changeset
|
254 | def getPythonLibraryDirectory(): |
2608
01118174a2f5
Changed code to be compatible with latest PyQt4 Windows installers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
255 | """ |
8306
2bfd53096b5f
Renamed Globals.getPythonModulesDirectory() to Globals.getPythonLibraryDirectory() because that name is clearer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8257
diff
changeset
|
256 | Function to determine the path to Python's library directory. |
2608
01118174a2f5
Changed code to be compatible with latest PyQt4 Windows installers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
257 | |
8306
2bfd53096b5f
Renamed Globals.getPythonModulesDirectory() to Globals.getPythonLibraryDirectory() because that name is clearer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8257
diff
changeset
|
258 | @return path to the Python library directory |
2bfd53096b5f
Renamed Globals.getPythonModulesDirectory() to Globals.getPythonLibraryDirectory() because that name is clearer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8257
diff
changeset
|
259 | @rtype str |
2608
01118174a2f5
Changed code to be compatible with latest PyQt4 Windows installers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
260 | """ |
01118174a2f5
Changed code to be compatible with latest PyQt4 Windows installers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
261 | import distutils.sysconfig |
01118174a2f5
Changed code to be compatible with latest PyQt4 Windows installers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
262 | return distutils.sysconfig.get_python_lib(True) |
2614
9c49b4419ea7
Changed the logic for detecting and using the PyQt4 module directory.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2608
diff
changeset
|
263 | |
9c49b4419ea7
Changed the logic for detecting and using the PyQt4 module directory.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2608
diff
changeset
|
264 | |
8459
0ae07748dbe8
Changed quite a few PyQt5 references to PyQt6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8346
diff
changeset
|
265 | def getPyQt6ModulesDirectory(): |
2614
9c49b4419ea7
Changed the logic for detecting and using the PyQt4 module directory.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2608
diff
changeset
|
266 | """ |
8459
0ae07748dbe8
Changed quite a few PyQt5 references to PyQt6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8346
diff
changeset
|
267 | Function to determine the path to PyQt6 modules directory. |
2614
9c49b4419ea7
Changed the logic for detecting and using the PyQt4 module directory.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2608
diff
changeset
|
268 | |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
269 | @return path to the PyQt6 modules directory |
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
270 | @rtype str |
2614
9c49b4419ea7
Changed the logic for detecting and using the PyQt4 module directory.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2608
diff
changeset
|
271 | """ |
9c49b4419ea7
Changed the logic for detecting and using the PyQt4 module directory.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2608
diff
changeset
|
272 | import distutils.sysconfig |
7198
684261ef2165
Removed the Qt4 runtime stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7196
diff
changeset
|
273 | |
8459
0ae07748dbe8
Changed quite a few PyQt5 references to PyQt6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8346
diff
changeset
|
274 | pyqtPath = os.path.join(distutils.sysconfig.get_python_lib(True), "PyQt6") |
7198
684261ef2165
Removed the Qt4 runtime stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7196
diff
changeset
|
275 | if os.path.exists(pyqtPath): |
684261ef2165
Removed the Qt4 runtime stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7196
diff
changeset
|
276 | return pyqtPath |
3807
91fc2089c401
Added some more PyQt4 compatibility code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3778
diff
changeset
|
277 | |
91fc2089c401
Added some more PyQt4 compatibility code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3778
diff
changeset
|
278 | return "" |
2608
01118174a2f5
Changed code to be compatible with latest PyQt4 Windows installers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
279 | |
01118174a2f5
Changed code to be compatible with latest PyQt4 Windows installers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
280 | |
5696
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
281 | def getPyQtToolsPath(version=5): |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
282 | """ |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
283 | Module function to get the path of the PyQt tools. |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
284 | |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
285 | @param version PyQt major version |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
286 | @type int |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
287 | @return path to the PyQt tools |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
288 | @rtype str |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
289 | """ |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
290 | import Preferences |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
291 | |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
292 | path = "" |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
293 | |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
294 | # step 1: check, if the user has configured a tools path |
7907
7991ea245c20
Added support for PyQt6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7861
diff
changeset
|
295 | if version == 5: |
7991ea245c20
Added support for PyQt6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7861
diff
changeset
|
296 | path = Preferences.getQt("PyQtToolsDir") |
7991ea245c20
Added support for PyQt6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7861
diff
changeset
|
297 | elif version == 6: |
7991ea245c20
Added support for PyQt6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7861
diff
changeset
|
298 | path = Preferences.getQt("PyQt6ToolsDir") |
5696
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
299 | |
7907
7991ea245c20
Added support for PyQt6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7861
diff
changeset
|
300 | # step 2: determine from used Python interpreter (pylupdate is test object) |
5696
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
301 | if not path: |
7907
7991ea245c20
Added support for PyQt6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7861
diff
changeset
|
302 | program = "pylupdate{0}".format(version) |
5696
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
303 | if isWindowsPlatform(): |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
304 | program += ".exe" |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
305 | dirName = os.path.dirname(sys.executable) |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
306 | if os.path.exists(os.path.join(dirName, program)): |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
307 | path = dirName |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
308 | elif os.path.exists(os.path.join(dirName, "Scripts", program)): |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
309 | path = os.path.join(dirName, "Scripts") |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
310 | else: |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
311 | dirName = os.path.dirname(sys.executable) |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
312 | if os.path.exists(os.path.join(dirName, program)): |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
313 | path = dirName |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
314 | |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
315 | return path |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
316 | |
68af0e9c57ad
Started implementing the capability to configure the path to the PyQt tools or determine it based on the current Python interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5401
diff
changeset
|
317 | |
2615
bdc9b4659826
Added a method to determine the Qt binaries path to the Globals package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2614
diff
changeset
|
318 | def getQtBinariesPath(): |
bdc9b4659826
Added a method to determine the Qt binaries path to the Globals package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2614
diff
changeset
|
319 | """ |
bdc9b4659826
Added a method to determine the Qt binaries path to the Globals package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2614
diff
changeset
|
320 | Module function to get the path of the Qt binaries. |
bdc9b4659826
Added a method to determine the Qt binaries path to the Globals package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2614
diff
changeset
|
321 | |
7741
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
322 | @return path of the Qt binaries |
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
323 | @rtype str |
2615
bdc9b4659826
Added a method to determine the Qt binaries path to the Globals package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2614
diff
changeset
|
324 | """ |
5070
4e4651e88674
Added capability to set the path to the Qt tools manually (because they are not included in the PyQt5 wheels).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
325 | import Preferences |
4e4651e88674
Added capability to set the path to the Qt tools manually (because they are not included in the PyQt5 wheels).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
326 | |
2615
bdc9b4659826
Added a method to determine the Qt binaries path to the Globals package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2614
diff
changeset
|
327 | path = "" |
5070
4e4651e88674
Added capability to set the path to the Qt tools manually (because they are not included in the PyQt5 wheels).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
328 | |
4e4651e88674
Added capability to set the path to the Qt tools manually (because they are not included in the PyQt5 wheels).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
329 | # step 1: check, if the user has configured a tools path |
4e4651e88674
Added capability to set the path to the Qt tools manually (because they are not included in the PyQt5 wheels).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
330 | path = Preferences.getQt("QtToolsDir") |
4e4651e88674
Added capability to set the path to the Qt tools manually (because they are not included in the PyQt5 wheels).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
331 | |
8327
666c2b81cbb7
Continued porting eric to PyQt6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8318
diff
changeset
|
332 | # step 2: try the qt6_applications package |
7835
0835ed67714b
Changed code slightly to work with the upcoming qt5-applications package done by Kyle Altendorf.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7805
diff
changeset
|
333 | if not path: |
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:
8240
diff
changeset
|
334 | with contextlib.suppress(ImportError): |
8327
666c2b81cbb7
Continued porting eric to PyQt6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8318
diff
changeset
|
335 | import qt6_applications |
666c2b81cbb7
Continued porting eric to PyQt6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8318
diff
changeset
|
336 | path = os.path.join(os.path.dirname(qt6_applications.__file__), |
7861
3d48094ba8e1
Globals: fixed a severe bug.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7835
diff
changeset
|
337 | "Qt", "bin") |
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:
8240
diff
changeset
|
338 | # if qt5-applications is not installed just go to the next step |
7835
0835ed67714b
Changed code slightly to work with the upcoming qt5-applications package done by Kyle Altendorf.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7805
diff
changeset
|
339 | |
0835ed67714b
Changed code slightly to work with the upcoming qt5-applications package done by Kyle Altendorf.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7805
diff
changeset
|
340 | # step 3: determine from used Python interpreter (designer is test object) |
2615
bdc9b4659826
Added a method to determine the Qt binaries path to the Globals package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2614
diff
changeset
|
341 | if not path: |
7741
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
342 | program = "designer" |
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
343 | if isWindowsPlatform(): |
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
344 | program += ".exe" |
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
345 | dirName = os.path.dirname(sys.executable) |
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
346 | if os.path.exists(os.path.join(dirName, program)): |
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
347 | path = dirName |
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
348 | elif os.path.exists(os.path.join(dirName, "Scripts", program)): |
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
349 | path = os.path.join(dirName, "Scripts") |
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
350 | else: |
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
351 | dirName = os.path.dirname(sys.executable) |
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
352 | if os.path.exists(os.path.join(dirName, program)): |
6ead5f865f72
Updated the way the path to Qt tools is determined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7673
diff
changeset
|
353 | path = dirName |
2615
bdc9b4659826
Added a method to determine the Qt binaries path to the Globals package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2614
diff
changeset
|
354 | |
bdc9b4659826
Added a method to determine the Qt binaries path to the Globals package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2614
diff
changeset
|
355 | return QDir.toNativeSeparators(path) |
bdc9b4659826
Added a method to determine the Qt binaries path to the Globals package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2614
diff
changeset
|
356 | |
bdc9b4659826
Added a method to determine the Qt binaries path to the Globals package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2614
diff
changeset
|
357 | |
2997
7f0ef975da9e
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2992
diff
changeset
|
358 | ############################################################################### |
5848
56388f41b1e6
Fixed an issue sending input to the mercurial and subversion processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5823
diff
changeset
|
359 | ## functions for version handling |
4686
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
360 | ############################################################################### |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
361 | |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
362 | |
7641
21ea4fd50b0a
PipPackagesWidget: made the cache actions dependent on pip version of selected environment.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7639
diff
changeset
|
363 | def versionToTuple(version, length=3): |
5736
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
364 | """ |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
365 | Module function to convert a version string into a tuple. |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
366 | |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
367 | Note: A version string consists of non-negative decimals separated by "." |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
368 | optionally followed by a suffix. Suffix is everything after the last |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
369 | decimal. |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
370 | |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
371 | @param version version string |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
372 | @type str |
7641
21ea4fd50b0a
PipPackagesWidget: made the cache actions dependent on pip version of selected environment.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7639
diff
changeset
|
373 | @param length desired length of the version tuple |
21ea4fd50b0a
PipPackagesWidget: made the cache actions dependent on pip version of selected environment.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7639
diff
changeset
|
374 | @type int |
5736
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
375 | @return version tuple without the suffix |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
376 | @rtype tuple of int |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
377 | """ |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
378 | versionParts = [] |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
379 | |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
380 | # step 1: extract suffix |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
381 | version = re.split(r"[^\d.]", version)[0] |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
382 | for part in version.split("."): |
8240
93b8a353c4bf
Applied some more code simplifications suggested by the new Simplify checker (Y105: use contextlib.suppress) (batch 1).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8126
diff
changeset
|
383 | with contextlib.suppress(ValueError): |
7673
f0309b9483b1
Globals: added some error checking to 'versionToTuple'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7641
diff
changeset
|
384 | versionParts.append(int(part.strip())) |
7641
21ea4fd50b0a
PipPackagesWidget: made the cache actions dependent on pip version of selected environment.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7639
diff
changeset
|
385 | versionParts.extend([0] * length) |
5736
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
386 | |
7641
21ea4fd50b0a
PipPackagesWidget: made the cache actions dependent on pip version of selected environment.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7639
diff
changeset
|
387 | return tuple(versionParts[:length]) |
5736
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
388 | |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
389 | |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
390 | def qVersionTuple(): |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
391 | """ |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
392 | Module function to get the Qt version as a tuple. |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
393 | |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
394 | @return Qt version as a tuple |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
395 | @rtype tuple of int |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
396 | """ |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
397 | return ( |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
398 | (QT_VERSION & 0xff0000) >> 16, |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
399 | (QT_VERSION & 0xff00) >> 8, |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
400 | QT_VERSION & 0xff, |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
401 | ) |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
402 | |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
403 | |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
404 | ############################################################################### |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
405 | ## functions for extended string handling |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
406 | ############################################################################### |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
407 | |
000ea446ff4b
Prepared the code for Qt > 5.9.99.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5735
diff
changeset
|
408 | |
4686
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
409 | def strGroup(txt, sep, groupLen=4): |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
410 | """ |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
411 | Module function to group a string into sub-strings separated by a |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
412 | separator. |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
413 | |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
414 | @param txt text to be grouped |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
415 | @type str |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
416 | @param sep separator string |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
417 | @type str |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
418 | @param groupLen length of each group |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
419 | @type int |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
420 | @return result string |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
421 | @rtype str |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
422 | """ |
4724
682f009d086d
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4695
diff
changeset
|
423 | groups = [] |
4686
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
424 | |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
425 | while len(txt) // groupLen != 0: |
4724
682f009d086d
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4695
diff
changeset
|
426 | groups.insert(0, txt[-groupLen:]) |
4686
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
427 | txt = txt[:-groupLen] |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
428 | if len(txt) > 0: |
4724
682f009d086d
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4695
diff
changeset
|
429 | groups.insert(0, txt) |
682f009d086d
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4695
diff
changeset
|
430 | return sep.join(groups) |
4686
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
431 | |
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
432 | |
5848
56388f41b1e6
Fixed an issue sending input to the mercurial and subversion processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5823
diff
changeset
|
433 | def strToQByteArray(txt): |
56388f41b1e6
Fixed an issue sending input to the mercurial and subversion processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5823
diff
changeset
|
434 | """ |
56388f41b1e6
Fixed an issue sending input to the mercurial and subversion processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5823
diff
changeset
|
435 | Module function to convert a Python string into a QByteArray. |
56388f41b1e6
Fixed an issue sending input to the mercurial and subversion processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5823
diff
changeset
|
436 | |
56388f41b1e6
Fixed an issue sending input to the mercurial and subversion processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5823
diff
changeset
|
437 | @param txt Python string to be converted |
7639
422fd05e9c91
Removed some more Python2 related code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
438 | @type str, bytes, bytearray |
5859
28282fa0df7b
Corrected some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5848
diff
changeset
|
439 | @return converted QByteArray |
28282fa0df7b
Corrected some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5848
diff
changeset
|
440 | @rtype QByteArray |
5848
56388f41b1e6
Fixed an issue sending input to the mercurial and subversion processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5823
diff
changeset
|
441 | """ |
7192
a22eee00b052
Started removing runtime support for Python2 and PyQt4.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7085
diff
changeset
|
442 | if isinstance(txt, str): |
a22eee00b052
Started removing runtime support for Python2 and PyQt4.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7085
diff
changeset
|
443 | txt = txt.encode("utf-8") |
5848
56388f41b1e6
Fixed an issue sending input to the mercurial and subversion processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5823
diff
changeset
|
444 | |
56388f41b1e6
Fixed an issue sending input to the mercurial and subversion processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5823
diff
changeset
|
445 | return QByteArray(txt) |
56388f41b1e6
Fixed an issue sending input to the mercurial and subversion processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5823
diff
changeset
|
446 | |
56388f41b1e6
Fixed an issue sending input to the mercurial and subversion processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5823
diff
changeset
|
447 | |
6682
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
448 | def dataString(size): |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
449 | """ |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
450 | Module function to generate a formatted size string. |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
451 | |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
452 | @param size size to be formatted |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
453 | @type int |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
454 | @return formatted data string |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
455 | @rtype str |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
456 | """ |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
457 | if size < 1024: |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
458 | return QCoreApplication.translate( |
7085
328f0f44aa95
Globals: changed format of the data size output and added branch for TiB.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
459 | "Globals", "{0:4.2f} Bytes").format(size) |
6682
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
460 | elif size < 1024 * 1024: |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
461 | size /= 1024 |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
462 | return QCoreApplication.translate( |
7085
328f0f44aa95
Globals: changed format of the data size output and added branch for TiB.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
463 | "Globals", "{0:4.2f} KiB").format(size) |
6682
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
464 | elif size < 1024 * 1024 * 1024: |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
465 | size /= 1024 * 1024 |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
466 | return QCoreApplication.translate( |
7085
328f0f44aa95
Globals: changed format of the data size output and added branch for TiB.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
467 | "Globals", "{0:4.2f} MiB").format(size) |
328f0f44aa95
Globals: changed format of the data size output and added branch for TiB.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
468 | elif size < 1024 * 1024 * 1024 * 1024: |
6682
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
469 | size /= 1024 * 1024 * 1024 |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
470 | return QCoreApplication.translate( |
7085
328f0f44aa95
Globals: changed format of the data size output and added branch for TiB.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
471 | "Globals", "{0:4.2f} GiB").format(size) |
328f0f44aa95
Globals: changed format of the data size output and added branch for TiB.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
472 | else: |
328f0f44aa95
Globals: changed format of the data size output and added branch for TiB.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
473 | size /= 1024 * 1024 * 1024 * 1024 |
328f0f44aa95
Globals: changed format of the data size output and added branch for TiB.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
474 | return QCoreApplication.translate( |
328f0f44aa95
Globals: changed format of the data size output and added branch for TiB.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
475 | "Globals", "{0:4.2f} TiB").format(size) |
6682
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
476 | |
4326e802ff56
Globals: added the dataString() function to format a size into a human readable string.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
477 | |
4686
5f8a5c568230
Improved the display of addresses and sizes in the hex editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
478 | ############################################################################### |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
479 | ## functions for converting QSetting return types to valid types |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
480 | ############################################################################### |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
481 | |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
482 | |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
483 | def toBool(value): |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
484 | """ |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
485 | Module function to convert a value to bool. |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
486 | |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
487 | @param value value to be converted |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
488 | @type str |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
489 | @return converted data |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
490 | @rtype bool |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
491 | """ |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
492 | if value in ["true", "1", "True"]: |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
493 | return True |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
494 | elif value in ["false", "0", "False"]: |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
495 | return False |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
496 | else: |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
497 | return bool(value) |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
498 | |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
499 | |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
500 | def toList(value): |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
501 | """ |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
502 | Module function to convert a value to a list. |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
503 | |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
504 | @param value value to be converted |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
505 | @type None, list or Any |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
506 | @return converted data |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
507 | @rtype list |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
508 | """ |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
509 | if value is None: |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
510 | return [] |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
511 | elif not isinstance(value, list): |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
512 | return [value] |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
513 | else: |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
514 | return value |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
515 | |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
516 | |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
517 | def toByteArray(value): |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
518 | """ |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
519 | Module function to convert a value to a byte array. |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
520 | |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
521 | @param value value to be converted |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
522 | @type QByteArray or None |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
523 | @return converted data |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
524 | @rtype QByteArray |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
525 | """ |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
526 | if value is None: |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
527 | return QByteArray() |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
528 | else: |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
529 | return value |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
530 | |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
531 | |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
532 | def toDict(value): |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
533 | """ |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
534 | Module function to convert a value to a dictionary. |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
535 | |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
536 | @param value value to be converted |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
537 | @type dict or None |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
538 | @return converted data |
8467
bccf0a3fa67c
Removed an obsolete TODO comment and updated the source code docu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8459
diff
changeset
|
539 | @rtype dict |
4241
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
540 | """ |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
541 | if value is None: |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
542 | return {} |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
543 | else: |
545629046c45
Fixed a bug in the message filter causing a traceback when no message filters are configured.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
544 | return value |
4566
a2e8f3c420ec
Dealt with the M801 code style checker messages.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4343
diff
changeset
|
545 | |
6630
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
546 | |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
547 | ############################################################################### |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
548 | ## functions for web browser variant detection |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
549 | ############################################################################### |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
550 | |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
551 | |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
552 | def getWebBrowserSupport(): |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
553 | """ |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
554 | Module function to determine the supported web browser variant. |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
555 | |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
556 | @return string indicating the supported web browser variant ("QtWebEngine", |
7196
ab0a91b82b37
Removed support for QtWebKit and the old web rowser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7192
diff
changeset
|
557 | or "None") |
6630
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
558 | @rtype str |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
559 | """ |
8314
e3642a6a1e71
Finished renaming eric6 to eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
560 | from eric7config import getConfig |
6630
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
561 | scriptPath = os.path.join(getConfig("ericDir"), "Tools", |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
562 | "webBrowserSupport.py") |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
563 | proc = QProcess() |
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
564 | proc.start(sys.executable, [scriptPath, qVersion()]) |
8257
28146736bbfc
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
|
565 | variant = ( |
28146736bbfc
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
|
566 | str(proc.readAllStandardOutput(), "utf-8", 'replace').strip() |
28146736bbfc
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
|
567 | if proc.waitForFinished(10000) else |
28146736bbfc
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
|
568 | "None" |
28146736bbfc
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
|
569 | ) |
6630
bddd12f27a4c
Web Browser (QtWebKit): applied the changes of the new Web Brwoser to the QtWebKit based variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6589
diff
changeset
|
570 | return variant |
4566
a2e8f3c420ec
Dealt with the M801 code style checker messages.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4343
diff
changeset
|
571 | # |
a2e8f3c420ec
Dealt with the M801 code style checker messages.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4343
diff
changeset
|
572 | # eflag: noqa = M801 |