diff -r 74e000797a93 -r f1e9eebd5469 Debugger/Config.py
--- a/Debugger/Config.py Wed Sep 14 20:08:16 2016 +0200
+++ b/Debugger/Config.py Fri Sep 16 19:28:39 2016 +0200
@@ -9,51 +9,80 @@
from __future__ import unicode_literals
-try:
- from PyQt5.QtCore import QT_TRANSLATE_NOOP
-
- # Variables type definition
- ConfigVarTypeDispStrings = [
- QT_TRANSLATE_NOOP('Variable Types', 'Hidden Attributes'),
- QT_TRANSLATE_NOOP('Variable Types', 'None'),
- QT_TRANSLATE_NOOP('Variable Types', 'Type'),
- QT_TRANSLATE_NOOP('Variable Types', 'Boolean'),
- QT_TRANSLATE_NOOP('Variable Types', 'Integer'),
- QT_TRANSLATE_NOOP('Variable Types', 'Long Integer'),
- QT_TRANSLATE_NOOP('Variable Types', 'Float'),
- QT_TRANSLATE_NOOP('Variable Types', 'Complex'),
- QT_TRANSLATE_NOOP('Variable Types', 'String'),
- QT_TRANSLATE_NOOP('Variable Types', 'Unicode String'),
- QT_TRANSLATE_NOOP('Variable Types', 'Tuple'),
- QT_TRANSLATE_NOOP('Variable Types', 'List/Array'),
- QT_TRANSLATE_NOOP('Variable Types', 'Dictionary/Hash/Map'),
- QT_TRANSLATE_NOOP('Variable Types', 'Dictionary Proxy'),
- QT_TRANSLATE_NOOP('Variable Types', 'Set'),
- QT_TRANSLATE_NOOP('Variable Types', 'File'),
- QT_TRANSLATE_NOOP('Variable Types', 'X Range'),
- QT_TRANSLATE_NOOP('Variable Types', 'Slice'),
- QT_TRANSLATE_NOOP('Variable Types', 'Buffer'),
- QT_TRANSLATE_NOOP('Variable Types', 'Class'),
- QT_TRANSLATE_NOOP('Variable Types', 'Class Instance'),
- QT_TRANSLATE_NOOP('Variable Types', 'Class Method'),
- QT_TRANSLATE_NOOP('Variable Types', 'Class Property'),
- QT_TRANSLATE_NOOP('Variable Types', 'Generator'),
- QT_TRANSLATE_NOOP('Variable Types', 'Function'),
+# TODO: change these to dictionaries with keys according to DebugConfig.py
+from PyQt5.QtCore import QT_TRANSLATE_NOOP
+
+# Variables type definition
+ConfigVarTypeDispStrings = {
+ '__': QT_TRANSLATE_NOOP('Variable Types', 'Hidden Attributes'),
+ 'NoneType': QT_TRANSLATE_NOOP('Variable Types', 'None'),
+ 'type': QT_TRANSLATE_NOOP('Variable Types', 'Type'),
+ 'bool': QT_TRANSLATE_NOOP('Variable Types', 'Boolean'),
+ 'int': QT_TRANSLATE_NOOP('Variable Types', 'Integer'),
+ 'long': QT_TRANSLATE_NOOP('Variable Types', 'Long Integer'),
+ 'float': QT_TRANSLATE_NOOP('Variable Types', 'Float'),
+ 'complex': QT_TRANSLATE_NOOP('Variable Types', 'Complex'),
+ 'str': QT_TRANSLATE_NOOP('Variable Types', 'String'),
+ 'unicode': QT_TRANSLATE_NOOP('Variable Types', 'Unicode String'),
+ 'tuple': QT_TRANSLATE_NOOP('Variable Types', 'Tuple'),
+ 'list': QT_TRANSLATE_NOOP('Variable Types', 'List/Array'),
+ 'dict': QT_TRANSLATE_NOOP('Variable Types', 'Dictionary/Hash/Map'),
+ 'dict-proxy': QT_TRANSLATE_NOOP('Variable Types', 'Dictionary Proxy'),
+ 'set': QT_TRANSLATE_NOOP('Variable Types', 'Set'),
+ 'frozenset': QT_TRANSLATE_NOOP('Variable Types', 'Frozen Set'),
+ 'file': QT_TRANSLATE_NOOP('Variable Types', 'File'),
+ 'xrange': QT_TRANSLATE_NOOP('Variable Types', 'X Range'),
+ 'slice': QT_TRANSLATE_NOOP('Variable Types', 'Slice'),
+ 'buffer': QT_TRANSLATE_NOOP('Variable Types', 'Buffer'),
+ 'class': QT_TRANSLATE_NOOP('Variable Types', 'Class'),
+ 'instance': QT_TRANSLATE_NOOP('Variable Types', 'Class Instance'),
+ 'method': QT_TRANSLATE_NOOP('Variable Types', 'Class Method'),
+ 'property': QT_TRANSLATE_NOOP('Variable Types', 'Class Property'),
+ 'generator': QT_TRANSLATE_NOOP('Variable Types', 'Generator'),
+ 'function': QT_TRANSLATE_NOOP('Variable Types', 'Function'),
+ 'builtin_function_or_method':
QT_TRANSLATE_NOOP('Variable Types', 'Builtin Function'),
- QT_TRANSLATE_NOOP('Variable Types', 'Code'),
- QT_TRANSLATE_NOOP('Variable Types', 'Module'),
- QT_TRANSLATE_NOOP('Variable Types', 'Ellipsis'),
- QT_TRANSLATE_NOOP('Variable Types', 'Traceback'),
- QT_TRANSLATE_NOOP('Variable Types', 'Frame'),
- QT_TRANSLATE_NOOP('Variable Types', 'Other')
- ]
-except ImportError:
- # Variables type definition (for non-Qt only)
- ConfigVarTypeDispStrings = [
- 'Hidden Attributes', 'None', 'Type', 'Boolean', 'Integer',
- 'Long Integer', 'Float', 'Complex', 'String', 'Unicode String',
- 'Tuple', 'List/Array', 'Dictionary/Hash/Map', 'Dictionary Proxy',
- 'Set', 'File', 'X Range', 'Slice', 'Buffer', 'Class',
- 'Class Instance', 'Class Method', 'Class Property', 'Generator',
- 'Function', 'Builtin Function', 'Code', 'Module', 'Ellipsis',
- 'Traceback', 'Frame', 'Other']
+ 'code': QT_TRANSLATE_NOOP('Variable Types', 'Code'),
+ 'module': QT_TRANSLATE_NOOP('Variable Types', 'Module'),
+ 'ellipsis': QT_TRANSLATE_NOOP('Variable Types', 'Ellipsis'),
+ 'traceback': QT_TRANSLATE_NOOP('Variable Types', 'Traceback'),
+ 'frame': QT_TRANSLATE_NOOP('Variable Types', 'Frame'),
+ 'other': QT_TRANSLATE_NOOP('Variable Types', 'Other'),
+}
+
+
+ConfigVarTypeFilters = {
+ '__': 0,
+ 'NoneType': 1,
+ 'type': 2,
+ 'bool': 3,
+ 'int': 4,
+ 'long': 5,
+ 'float': 6,
+ 'complex': 7,
+ 'str': 8,
+ 'unicode': 9,
+ 'tuple': 10,
+ 'list': 11,
+ 'dict': 12,
+ 'dict-proxy': 13,
+ 'set': 14,
+ 'file': 15,
+ 'xrange': 16,
+ 'slice': 17,
+ 'buffer': 18,
+ 'class': 19,
+ 'instance': 20,
+ 'method': 21,
+ 'property': 22,
+ 'generator': 23,
+ 'function': 24,
+ 'builtin_function_or_method': 25,
+ 'code': 26,
+ 'module': 27,
+ 'ellipsis': 28,
+ 'traceback': 29,
+ 'frame': 30,
+ 'other': 31,
+ 'frozenset': 32,
+}
