summaryrefslogtreecommitdiff
path: root/plugins/externaltools/tools/manager.py
diff options
context:
space:
mode:
authorPatrick Monnerat <[email protected]>2019-05-23 20:42:23 +0200
committerraveit65 <[email protected]>2019-06-06 11:17:28 +0200
commit92faa11ef9e8af801713f12f8c205bd4fcf280b1 (patch)
tree9e358fe33e4b9ace989f62506a55f1df6631acd7 /plugins/externaltools/tools/manager.py
parentfd4405cc794d6fd3d560f06cfbaecca08e16a51e (diff)
downloadpluma-92faa11ef9e8af801713f12f8c205bd4fcf280b1.tar.bz2
pluma-92faa11ef9e8af801713f12f8c205bd4fcf280b1.tar.xz
externaltools plugin: change code for Python 2 & 3 compatibility.
Diffstat (limited to 'plugins/externaltools/tools/manager.py')
-rwxr-xr-xplugins/externaltools/tools/manager.py209
1 files changed, 39 insertions, 170 deletions
diff --git a/plugins/externaltools/tools/manager.py b/plugins/externaltools/tools/manager.py
index 4da0deb9..b8e143b0 100755
--- a/plugins/externaltools/tools/manager.py
+++ b/plugins/externaltools/tools/manager.py
@@ -19,71 +19,41 @@
__all__ = ('Manager', )
import os.path
-from library import *
-from functions import *
+import re
+from .library import *
+from .functions import *
import hashlib
from xml.sax import saxutils
from gi.repository import GObject, Gio, Gdk, Gtk, GtkSource, Pluma
-class LanguagesPopup(Gtk.Window):
- __gtype_name__ = "LanguagePopup"
+class LanguagesPopup(Gtk.Popover):
+ __gtype_name__ = "LanguagesPopup"
COLUMN_NAME = 0
COLUMN_ID = 1
COLUMN_ENABLED = 2
- def __init__(self, languages):
- Gtk.Window.__init__(self, type=Gtk.WindowType.POPUP)
+ def __init__(self, widget, languages):
+ Gtk.Popover.__init__(self, relative_to=widget)
- self.set_default_size(200, 200)
self.props.can_focus = True
self.build()
self.init_languages(languages)
- self.show()
-
- self.grab_add()
-
- self.keyboard = None
- device_manager = Gdk.Display.get_device_manager(self.get_window().get_display())
- for device in device_manager.list_devices(Gdk.DeviceType.MASTER):
- if device.get_source() == Gdk.InputSource.KEYBOARD:
- self.keyboard = device
- break
-
- self.pointer = device_manager.get_client_pointer()
-
- if self.keyboard is not None:
- self.keyboard.grab(self.get_window(),
- Gdk.GrabOwnership.WINDOW, False,
- Gdk.EventMask.KEY_PRESS_MASK |
- Gdk.EventMask.KEY_RELEASE_MASK,
- None, Gdk.CURRENT_TIME)
- self.pointer.grab(self.get_window(),
- Gdk.GrabOwnership.WINDOW, False,
- Gdk.EventMask.BUTTON_PRESS_MASK |
- Gdk.EventMask.BUTTON_RELEASE_MASK |
- Gdk.EventMask.POINTER_MOTION_MASK |
- Gdk.EventMask.ENTER_NOTIFY_MASK |
- Gdk.EventMask.LEAVE_NOTIFY_MASK |
- Gdk.EventMask.PROXIMITY_IN_MASK |
- Gdk.EventMask.PROXIMITY_OUT_MASK |
- Gdk.EventMask.SCROLL_MASK,
- None, Gdk.CURRENT_TIME)
-
self.view.get_selection().select_path((0,))
def build(self):
self.model = Gtk.ListStore(str, str, bool)
self.sw = Gtk.ScrolledWindow()
+ self.sw.set_size_request(-1, 200)
self.sw.show()
- self.sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+ self.sw.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
self.sw.set_shadow_type(Gtk.ShadowType.ETCHED_IN)
- self.view = Gtk.TreeView(self.model)
+ self.view = Gtk.TreeView(model=self.model)
self.view.show()
self.view.set_headers_visible(False)
@@ -92,16 +62,16 @@ class LanguagesPopup(Gtk.Window):
renderer = Gtk.CellRendererToggle()
column.pack_start(renderer, False)
- column.set_attributes(renderer, active=self.COLUMN_ENABLED)
+ column.add_attribute(renderer, 'active', self.COLUMN_ENABLED)
renderer.connect('toggled', self.on_language_toggled)
renderer = Gtk.CellRendererText()
column.pack_start(renderer, True)
- column.set_attributes(renderer, text=self.COLUMN_NAME)
+ column.add_attribute(renderer, 'text', self.COLUMN_NAME)
self.view.append_column(column)
- self.view.set_row_separator_func(self.on_separator)
+ self.view.set_row_separator_func(self.on_separator, None)
self.sw.add(self.view)
@@ -124,7 +94,7 @@ class LanguagesPopup(Gtk.Window):
self.model.foreach(self.enabled_languages, ret)
return ret
- def on_separator(self, model, piter):
+ def on_separator(self, model, piter, user_data=None):
val = model.get_value(piter, self.COLUMN_NAME)
return val == '-'
@@ -142,7 +112,7 @@ class LanguagesPopup(Gtk.Window):
self.model.append([lang.get_name(), lang.get_id(), lang.get_id() in languages])
def correct_all(self, model, path, piter, enabled):
- if path == (0,):
+ if path.get_indices()[0] == 0:
return False
model.set_value(piter, self.COLUMN_ENABLED, enabled)
@@ -158,113 +128,6 @@ class LanguagesPopup(Gtk.Window):
else:
self.model.set_value(self.model.get_iter_first(), self.COLUMN_ENABLED, False)
- def do_key_press_event(self, event):
- if event.keyval == Gdk.KEY_Escape:
- self.destroy()
- return True
- else:
- event.window = self.view.get_bin_window()
- return self.view.event(event)
-
- def do_key_release_event(self, event):
- event.window = self.view.get_bin_window()
- return self.view.event(event)
-
- def in_window(self, event, window=None):
- if not window:
- window = self.get_window()
-
- geometry = window.get_geometry()
- origin = window.get_origin()
-
- return event.x_root >= origin[1] and \
- event.x_root <= origin[1] + geometry[2] and \
- event.y_root >= origin[2] and \
- event.y_root <= origin[2] + geometry[3]
-
- def do_destroy(self):
- if self.keyboard:
- self.keyboard.ungrab(Gdk.CURRENT_TIME)
- self.pointer.ungrab(Gdk.CURRENT_TIME)
-
- return Gtk.Window.do_destroy(self)
-
- def setup_event(self, event, window):
- fr = event.window.get_origin()
- to = window.get_origin()
-
- event.window = window
- event.x += fr[1] - to[1]
- event.y += fr[2] - to[2]
-
- def resolve_widgets(self, root):
- res = [root]
-
- if isinstance(root, Gtk.Container):
- root.forall(lambda x, y: res.extend(self.resolve_widgets(x)), None)
-
- return res
-
- def resolve_windows(self, window):
- if not window:
- return []
-
- res = [window]
- res.extend(window.get_children())
-
- return res
-
- def propagate_mouse_event(self, event, reverse=True):
- allwidgets = self.resolve_widgets(self.get_child())
-
- if reverse:
- allwidgets.reverse()
-
- for widget in allwidgets:
- windows = self.resolve_windows(widget.get_window())
- windows.reverse()
-
- for window in windows:
- if not (window.get_events() & event.type):
- continue
-
- if self.in_window(event, window):
- self.setup_event(event, window)
-
- if widget.event(event):
- return True
-
- return False
-
- def do_button_press_event(self, event):
- if not self.in_window(event):
- self.destroy()
- else:
- return self.propagate_mouse_event(event)
-
- def do_button_release_event(self, event):
- if not self.in_window(event):
- self.destroy()
- else:
- return self.propagate_mouse_event(event)
-
- def do_scroll_event(self, event):
- return self.propagate_mouse_event(event, False)
-
- def do_motion_notify_event(self, event):
- return self.propagate_mouse_event(event)
-
- def do_enter_notify_event(self, event):
- return self.propagate_mouse_event(event)
-
- def do_leave_notify_event(self, event):
- return self.propagate_mouse_event(event)
-
- def do_proximity_in_event(self, event):
- return self.propagate_mouse_event(event)
-
- def do_proximity_out_event(self, event):
- return self.propagate_mouse_event(event)
class Manager(GObject.Object):
TOOL_COLUMN = 0 # For Tree
@@ -450,7 +313,9 @@ class Manager(GObject.Object):
n1 = t1.name
n2 = t2.name
- return cmp(n1.lower(), n2.lower())
+ n1 = n1.lower()
+ n2 = n2.lower()
+ return (n1 > n2) - (n1 < n2)
def __init_tools_view(self):
# Tools column
@@ -499,8 +364,8 @@ class Manager(GObject.Object):
else:
return None, None
- def compute_hash(self, string):
- return hashlib.md5(string).hexdigest()
+ def compute_hash(self, stringofbytes):
+ return hashlib.md5(stringofbytes).hexdigest()
def save_current_tool(self):
if self.current_node is None:
@@ -521,7 +386,10 @@ class Manager(GObject.Object):
buf = self['commands'].get_buffer()
(start, end) = buf.get_bounds()
script = buf.get_text(start, end, False)
- h = self.compute_hash(script)
+ scriptbytes = script
+ if not isinstance(scriptbytes, bytes):
+ scriptbytes = scriptbytes.encode('utf-8')
+ h = self.compute_hash(scriptbytes)
if h != self.script_hash:
# script has changed -> save it
self.current_node.save_with_script([line + "\n" for line in script.splitlines()])
@@ -573,6 +441,9 @@ class Manager(GObject.Object):
buf.set_text(script)
buf.end_not_undoable_action()
+ if not isinstance(script, bytes):
+ script = script.encode('utf-8')
+
self.script_hash = self.compute_hash(script)
contenttype, uncertain = Gio.content_type_guess(None, script)
lmanager = GtkSource.LanguageManager.get_default()
@@ -703,7 +574,7 @@ class Manager(GObject.Object):
if language in node.languages:
node.languages.remove(language)
- self._tool_rows[node] = filter(lambda x: x.valid(), self._tool_rows[node])
+ self._tool_rows[node] = [x for x in self._tool_rows[node] if x.valid()]
if not self._tool_rows[node]:
del self._tool_rows[node]
@@ -714,7 +585,9 @@ class Manager(GObject.Object):
self.script_hash = None
if self.model.iter_is_valid(piter):
- self.view.set_cursor(self.model.get_path(piter), self.view.get_column(self.TOOL_COLUMN), False)
+ self.view.set_cursor(self.model.get_path(piter),
+ self.view.get_column(self.TOOL_COLUMN),
+ False)
self.view.grab_focus()
@@ -799,19 +672,19 @@ class Manager(GObject.Object):
def on_accelerator_key_press(self, entry, event):
mask = event.state & Gtk.accelerator_get_default_mod_mask()
+ keyname = Gdk.keyval_name(event.keyval)
- if event.keyval == Gdk.KEY_Escape:
+ if keyname == 'Escape':
entry.set_text(default(self.current_node.shortcut, ''))
self['commands'].grab_focus()
return True
- elif event.keyval == Gdk.KEY_Delete \
- or event.keyval == Gdk.KEY_BackSpace:
+ elif keyname == 'Delete' or keyname == 'BackSpace':
entry.set_text('')
self.remove_accelerator(self.current_node)
self.current_node.shortcut = None
self['commands'].grab_focus()
return True
- elif event.keyval in range(Gdk.KEY_F1, Gdk.KEY_F12 + 1):
+ elif re.match('^F(:1[012]?|[2-9])$', keyname):
# New accelerator
if self.set_accelerator(event.keyval, mask):
entry.set_text(default(self.current_node.shortcut, ''))
@@ -911,7 +784,7 @@ class Manager(GObject.Object):
ret = None
if node:
- ref = Gtk.TreeRowReference(self.model, self.model.get_path(piter))
+ ref = Gtk.TreeRowReference.new(self.model, self.model.get_path(piter))
# Update languages, make sure to inhibit selection change stuff
self.view.get_selection().handler_block(self.selection_changed_id)
@@ -966,12 +839,8 @@ class Manager(GObject.Object):
self.view.get_selection().handler_unblock(self.selection_changed_id)
def on_languages_button_clicked(self, button):
- popup = LanguagesPopup(self.current_node.languages)
- popup.set_transient_for(self.dialog)
-
- origin = button.get_window().get_origin()
- popup.move(origin[1], origin[2] - popup.get_allocation().height)
-
- popup.connect('destroy', self.update_languages)
+ popup = LanguagesPopup(button, self.current_node.languages)
+ popup.show()
+ popup.connect('closed', self.update_languages)
# ex:et:ts=4:
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-07 09:08:53 +0000