Skip to content

Commit 11373fe

Browse files
Improve Plasma 5 integration
Use more icon from breeze icon theme and restore create_default_actions to True
1 parent f8e206a commit 11373fe

File tree

2 files changed

+33
-21
lines changed

2 files changed

+33
-21
lines changed

pyqode/python/backend/workers.py

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,16 @@ def run_pyflakes(request_data):
228228
return ret_val
229229

230230

231+
ICON_CLASS = ('code-class', ':/pyqode_python_icons/rc/class.png')
232+
ICON_FUNC = ('code-function', ':/pyqode_python_icons/rc/func.png')
233+
ICON_FUNC_PRIVATE = ('code-function', ':/pyqode_python_icons/rc/func_priv.png')
234+
ICON_FUNC_PROTECTED = ('code-function',
235+
':/pyqode_python_icons/rc/func_prot.png')
236+
ICON_NAMESPACE = ('code-context', ':/pyqode_python_icons/rc/namespace.png')
237+
ICON_VAR = ('code-variable', ':/pyqode_python_icons/rc/var.png')
238+
ICON_KEYWORD = ('quickopen', ':/pyqode_python_icons/rc/keyword.png')
239+
240+
231241
def icon_from_typename(name, icon_type):
232242
"""
233243
Returns the icon resource filename that corresponds to the given typename.
@@ -238,25 +248,27 @@ def icon_from_typename(name, icon_type):
238248
239249
:returns: The associate icon resource filename or None.
240250
"""
241-
ICONS = {'CLASS': ':/pyqode_python_icons/rc/class.png',
242-
'IMPORT': ':/pyqode_python_icons/rc/namespace.png',
243-
'STATEMENT': ':/pyqode_python_icons/rc/var.png',
244-
'FORFLOW': ':/pyqode_python_icons/rc/var.png',
245-
'FORSTMT': ':/pyqode_python_icons/rc/var.png',
246-
'WITHSTMT': ':/pyqode_python_icons/rc/var.png',
247-
'GLOBALSTMT': ':/pyqode_python_icons/rc/var.png',
248-
'MODULE': ':/pyqode_python_icons/rc/namespace.png',
249-
'KEYWORD': ':/pyqode_python_icons/rc/keyword.png',
250-
'PARAM': ':/pyqode_python_icons/rc/var.png',
251-
'ARRAY': ':/pyqode_python_icons/rc/var.png',
252-
'INSTANCEELEMENT': ':/pyqode_python_icons/rc/var.png',
253-
'INSTANCE': ':/pyqode_python_icons/rc/var.png',
254-
'PARAM-PRIV': ':/pyqode_python_icons/rc/var.png',
255-
'PARAM-PROT': ':/pyqode_python_icons/rc/var.png',
256-
'FUNCTION': ':/pyqode_python_icons/rc/func.png',
257-
'DEF': ':/pyqode_python_icons/rc/func.png',
258-
'FUNCTION-PRIV': ':/pyqode_python_icons/rc/func_priv.png',
259-
'FUNCTION-PROT': ':/pyqode_python_icons/rc/func_prot.png'}
251+
ICONS = {
252+
'CLASS': ICON_CLASS,
253+
'IMPORT': ICON_NAMESPACE,
254+
'STATEMENT': ICON_VAR,
255+
'FORFLOW': ICON_VAR,
256+
'FORSTMT': ICON_VAR,
257+
'WITHSTMT': ICON_VAR,
258+
'GLOBALSTMT': ICON_VAR,
259+
'MODULE': ICON_NAMESPACE,
260+
'KEYWORD': ICON_KEYWORD,
261+
'PARAM': ICON_VAR,
262+
'ARRAY': ICON_VAR,
263+
'INSTANCEELEMENT': ICON_VAR,
264+
'INSTANCE': ICON_VAR,
265+
'PARAM-PRIV': ICON_VAR,
266+
'PARAM-PROT': ICON_VAR,
267+
'FUNCTION': ICON_FUNC,
268+
'DEF': ICON_FUNC,
269+
'FUNCTION-PRIV': ICON_FUNC_PRIVATE,
270+
'FUNCTION-PROT': ICON_FUNC_PROTECTED
271+
}
260272
ret_val = None
261273
icon_type = icon_type.upper()
262274
# jedi 0.8 introduced NamedPart class, which have a string instead of being

pyqode/python/widgets/code_edit.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class PyCodeEditBase(api.CodeEdit):
2727
encoding.
2828
"""
2929

30-
def __init__(self, parent=None, create_default_actions=False):
30+
def __init__(self, parent=None, create_default_actions=True):
3131
super(PyCodeEditBase, self).__init__(parent, create_default_actions)
3232
self.file = pymanagers.PyFileManager(self)
3333

@@ -56,7 +56,7 @@ class PyCodeEdit(PyCodeEditBase):
5656

5757
def __init__(self, parent=None, server_script=server.__file__,
5858
interpreter=sys.executable, args=None,
59-
create_default_actions=False, color_scheme='qt',
59+
create_default_actions=True, color_scheme='qt',
6060
reuse_backend=False):
6161
super(PyCodeEdit, self).__init__(
6262
parent=parent, create_default_actions=create_default_actions)

0 commit comments

Comments
 (0)