diff options
Diffstat (limited to 'plugins/snippets/snippets/Manager.py')
| -rwxr-xr-x | plugins/snippets/snippets/Manager.py | 246 |
1 files changed, 118 insertions, 128 deletions
diff --git a/plugins/snippets/snippets/Manager.py b/plugins/snippets/snippets/Manager.py index 4c58a3b3..e94cd283 100755 --- a/plugins/snippets/snippets/Manager.py +++ b/plugins/snippets/snippets/Manager.py @@ -19,13 +19,7 @@ import os import tempfile import shutil -import gobject -import gtk -from gtk import gdk -import gtksourceview2 as gsv -import pango -import pluma -import gio +from gi.repository import GObject, Gio, Gdk, Gtk, GtkSource, Pluma from Snippet import Snippet from Helper import * @@ -38,14 +32,15 @@ from LanguageManager import get_language_manager class Manager: NAME_COLUMN = 0 SORT_COLUMN = 1 - OBJ_COLUMN = 2 + LANG_COLUMN = 2 + SNIPPET_COLUMN = 3 TARGET_URI = 105 model = None drag_icons = ('mate-mime-application-x-tarz', 'mate-package', 'package') default_export_name = _('Snippets archive') + '.tar.gz' dragging = False - dnd_target_list = [('text/uri-list', 0, TARGET_URI)] + dnd_target_list = [Gtk.TargetEntry.new('text/uri-list', 0, TARGET_URI)] def __init__(self, datadir): self.datadir = datadir @@ -69,7 +64,7 @@ class Manager: def add_new_snippet_node(self, parent): return self.model.append(parent, ('<i>' + _('Add a new snippet...') + \ - '</i>', '', None)) + '</i>', '', None, None)) def fill_language(self, piter, expand=True): # Remove all children @@ -95,7 +90,7 @@ class Manager: self.tree_view.expand_row(path, False) def build_model(self, force_reload = False): - window = pluma.app_get_default().get_active_window() + window = Pluma.App.get_default().get_active_window() if window: view = window.get_active_view() @@ -113,14 +108,15 @@ class Manager: expand = None if not self.model or force_reload: - self.model = gtk.TreeStore(str, str, object) - self.model.set_sort_column_id(self.SORT_COLUMN, gtk.SORT_ASCENDING) + self.model = Gtk.TreeStore(str, str, GObject.Object, object) + self.model.set_sort_column_id(self.SORT_COLUMN, Gtk.SortType.ASCENDING) manager = get_language_manager() - langs = pluma.language_manager_list_languages_sorted(manager, True) + langs = [manager.get_language(x) for x in manager.get_language_ids()] + langs.sort(key=lambda x: x.get_name()) - piter = self.model.append(None, (_('Global'), '', None)) + piter = self.model.append(None, (_('Global'), '', None, None)) # Add dummy node - self.model.append(piter, ('', '', None)) + self.model.append(piter, ('', '', None, None)) nm = None @@ -129,10 +125,10 @@ class Manager: for lang in langs: name = lang.get_name() - parent = self.model.append(None, (name, name, lang)) + parent = self.model.append(None, (name, name, lang, None)) # Add dummy node - self.model.append(parent, ('', '', None)) + self.model.append(parent, ('', '', None, None)) if (nm == name): expand = parent @@ -154,33 +150,29 @@ class Manager: tree_view.set_model(self.model) if not expand: - expand = self.model.get_iter_root() + expand = self.model.get_iter_first() tree_view.expand_row(self.model.get_path(expand), False) self.select_iter(expand) - def get_cell_data_pixbuf_cb(self, column, cell, model, iter): - s = model.get_value(iter, self.OBJ_COLUMN) + def get_cell_data_pixbuf_cb(self, column, cell, model, iter, data): + snippet = model.get_value(iter, self.SNIPPET_COLUMN) - snippet = isinstance(s, SnippetData) - - if snippet and not s.valid: - cell.set_property('stock-id', gtk.STOCK_DIALOG_ERROR) + if snippet and not snippet.valid: + cell.set_property('stock-id', Gtk.STOCK_DIALOG_ERROR) else: cell.set_property('stock-id', None) cell.set_property('xalign', 1.0) - def get_cell_data_cb(self, column, cell, model, iter): - s = model.get_value(iter, self.OBJ_COLUMN) - - snippet = isinstance(s, SnippetData) + def get_cell_data_cb(self, column, cell, model, iter, data): + snippet = model.get_value(iter, self.SNIPPET_COLUMN) - cell.set_property('editable', snippet) + cell.set_property('editable', snippet != None) cell.set_property('markup', model.get_value(iter, self.NAME_COLUMN)) def on_tree_view_drag_data_get(self, widget, context, selection_data, info, time): - gfile = gio.File(self._temp_export) + gfile = Gio.file_new_for_path(self._temp_export) selection_data.set_uris([gfile.get_uri()]) def on_tree_view_drag_begin(self, widget, context): @@ -191,7 +183,7 @@ class Manager: self._temp_export = None if self.dnd_name: - context.set_icon_name(self.dnd_name, 0, 0) + Gtk.drag_set_icon_name(context, self.dnd_name, 0, 0) dirname = tempfile.mkdtemp() filename = os.path.join(dirname, self.default_export_name) @@ -214,21 +206,21 @@ class Manager: return False # Check uri target - if not gtk.targets_include_uri(context.targets): + if not Gtk.targets_include_uri(context.targets): return False # Check action action = None - if context.suggested_action == gdk.ACTION_COPY: - action = gdk.ACTION_COPY + if context.suggested_action == Gdk.DragAction.COPY: + action = Gdk.DragAction.COPY else: for act in context.actions: - if act == gdk.ACTION_COPY: - action = gdk.ACTION_COPY + if act == Gdk.DragAction.COPY: + action = Gdk.DragAction.COPY break - if action == gdk.ACTION_COPY: - context.drag_status(gdk.ACTION_COPY, timestamp) + if action == Gdk.DragAction.COPY: + context.drag_status(Gdk.DragAction.COPY, timestamp) return True else: return False @@ -237,11 +229,11 @@ class Manager: tv = self.tree_view # Set it as a drag source for exporting snippets - tv.drag_source_set(gdk.BUTTON1_MASK, self.dnd_target_list, gdk.ACTION_DEFAULT | gdk.ACTION_COPY) + tv.drag_source_set(Gdk.ModifierType.BUTTON1_MASK, self.dnd_target_list, Gdk.DragAction.DEFAULT | Gdk.DragAction.COPY) # Set it as a drag destination for importing snippets - tv.drag_dest_set(gtk.DEST_DEFAULT_HIGHLIGHT | gtk.DEST_DEFAULT_DROP, - self.dnd_target_list, gdk.ACTION_DEFAULT | gdk.ACTION_COPY) + tv.drag_dest_set(Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, + self.dnd_target_list, Gdk.DragAction.DEFAULT | Gdk.DragAction.COPY) tv.connect('drag_data_get', self.on_tree_view_drag_data_get) tv.connect('drag_begin', self.on_tree_view_drag_begin) @@ -249,11 +241,11 @@ class Manager: tv.connect('drag_data_received', self.on_tree_view_drag_data_received) tv.connect('drag_motion', self.on_tree_view_drag_motion) - theme = gtk.icon_theme_get_for_screen(tv.get_screen()) + theme = Gtk.IconTheme.get_for_screen(tv.get_screen()) self.dnd_name = None for name in self.drag_icons: - icon = theme.lookup_icon(name, gtk.ICON_SIZE_DND, 0) + icon = theme.lookup_icon(name, Gtk.IconSize.DND, 0) if icon: self.dnd_name = name @@ -262,15 +254,15 @@ class Manager: def build_tree_view(self): self.tree_view = self['tree_view_snippets'] - self.column = gtk.TreeViewColumn(None) + self.column = Gtk.TreeViewColumn(None) - self.renderer = gtk.CellRendererText() + self.renderer = Gtk.CellRendererText() self.column.pack_start(self.renderer, False) - self.column.set_cell_data_func(self.renderer, self.get_cell_data_cb) + self.column.set_cell_data_func(self.renderer, self.get_cell_data_cb, None) - renderer = gtk.CellRendererPixbuf() + renderer = Gtk.CellRendererPixbuf() self.column.pack_start(renderer, True) - self.column.set_cell_data_func(renderer, self.get_cell_data_pixbuf_cb) + self.column.set_cell_data_func(renderer, self.get_cell_data_pixbuf_cb, None) self.tree_view.append_column(self.column) @@ -278,13 +270,13 @@ class Manager: self.renderer.connect('editing-started', self.on_cell_editing_started) selection = self.tree_view.get_selection() - selection.set_mode(gtk.SELECTION_MULTIPLE) + selection.set_mode(Gtk.SelectionMode.MULTIPLE) selection.connect('changed', self.on_tree_view_selection_changed) self.build_dnd() def build(self): - self.builder = gtk.Builder() + self.builder = Gtk.Builder() self.builder.add_from_file(os.path.join(self.datadir, 'ui', 'snippets.ui')) handlers_dic = { @@ -309,7 +301,7 @@ class Manager: self.build_model() image = self['image_remove'] - image.set_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_SMALL_TOOLBAR) + image.set_from_stock(Gtk.STOCK_REMOVE, Gtk.IconSize.SMALL_TOOLBAR) source_view = self['source_view_snippet'] manager = get_language_manager() @@ -321,15 +313,13 @@ class Manager: self.snippets_doc = Document(None, source_view) combo = self['combo_drop_targets'] - combo.set_text_column(0) - entry = combo.child + entry = combo.get_child() entry.connect('focus-out-event', self.on_entry_drop_targets_focus_out) entry.connect('drag-data-received', self.on_entry_drop_targets_drag_data_received) lst = entry.drag_dest_get_target_list() - lst = gtk.target_list_add_uri_targets(entry.drag_dest_get_target_list(), self.TARGET_URI) - entry.drag_dest_set_target_list(lst) + lst.add_uri_targets(self.TARGET_URI) self.dlg = self['dialog_snippets'] @@ -345,9 +335,10 @@ class Manager: child = self.model.iter_children(piter) nm = self.model.get_value(child, self.NAME_COLUMN) - obj = self.model.get_value(child, self.OBJ_COLUMN) + lang = self.model.get_value(child, self.LANG_COLUMN) + snippet = self.model.get_value(child, self.SNIPPET_COLUMN) - return (obj or nm) + return (lang or snippet or nm) def fill_if_needed(self, piter, expand=True): if not self.is_filled(piter): @@ -358,7 +349,7 @@ class Manager: piter = self.model.iter_children(parent) while (piter): - node = self.model.get_value(piter, self.OBJ_COLUMN) + node = self.model.get_value(piter, self.SNIPPET_COLUMN) if node == snippet.data: return piter @@ -400,22 +391,22 @@ class Manager: if not (override ^ remove) or system: button_remove.set_sensitive(False) - image_remove.set_from_stock(gtk.STOCK_DELETE, gtk.ICON_SIZE_BUTTON) + image_remove.set_from_stock(Gtk.STOCK_DELETE, Gtk.IconSize.BUTTON) else: button_remove.set_sensitive(True) if override: - image_remove.set_from_stock(gtk.STOCK_UNDO, gtk.ICON_SIZE_BUTTON) + image_remove.set_from_stock(Gtk.STOCK_UNDO, Gtk.IconSize.BUTTON) tooltip = _('Revert selected snippet') else: - image_remove.set_from_stock(gtk.STOCK_DELETE, gtk.ICON_SIZE_BUTTON) + image_remove.set_from_stock(Gtk.STOCK_DELETE, Gtk.IconSize.BUTTON) tooltip = _('Delete selected snippet') button_remove.set_tooltip_text(tooltip) def snippet_changed(self, piter = None): if piter: - node = self.model.get_value(piter, self.OBJ_COLUMN) + node = self.model.get_value(piter, self.SNIPPET_COLUMN) s = Snippet(node) else: s = self.snippet @@ -424,14 +415,15 @@ class Manager: if piter: nm = s.display() - self.model.set(piter, self.NAME_COLUMN, nm, self.SORT_COLUMN, nm) + self.model.set_value(piter, self.NAME_COLUMN, nm) + self.model.set_value(piter, self.SORT_COLUMN, nm) self.update_buttons() self.entry_tab_trigger_update_valid() return piter def add_snippet(self, parent, snippet): - piter = self.model.append(parent, ('', '', snippet)) + piter = self.model.append(parent, ('', '', None, snippet)) return self.snippet_changed(piter) @@ -443,12 +435,11 @@ class Manager: self.build_model() self.dlg.present() - def snippet_from_iter(self, model, piter): parent = model.iter_parent(piter) if parent: - return model.get_value(piter, self.OBJ_COLUMN) + return model.get_value(piter, self.SNIPPET_COLUMN) else: return None @@ -524,7 +515,7 @@ class Manager: buf.begin_not_undoable_action() buf.set_text('') buf.end_not_undoable_action() - self['combo_drop_targets'].child.set_text('') + self['combo_drop_targets'].get_child().set_text('') else: sens = True @@ -532,7 +523,7 @@ class Manager: self['entry_tab_trigger'].set_text(self.snippet['tag']) self['entry_accelerator'].set_text( \ self.snippet.accelerator_display()) - self['combo_drop_targets'].child.set_text(', '.join(self.snippet['drop-targets'])) + self['combo_drop_targets'].get_child().set_text(', '.join(self.snippet['drop-targets'])) buf = self['source_view_snippet'].get_buffer() buf.begin_not_undoable_action() @@ -560,11 +551,11 @@ class Manager: True, 0.5, 0.5) def get_language(self, path): - if path[0] == 0: + if path.get_indices()[0] == 0: return None else: - return self.model.get_value(self.model.get_iter( \ - (path[0],)), self.OBJ_COLUMN).get_id() + return self.model.get_value(self.model.get_iter(path), \ + self.LANG_COLUMN).get_id() def new_snippet(self, properties=None): if not self.language_path: @@ -580,7 +571,7 @@ class Manager: dummy = self.model.iter_children(parent) - if not self.model.get_value(dummy, self.OBJ_COLUMN): + if not self.model.get_value(dummy, self.SNIPPET_COLUMN): return dummy return None @@ -608,7 +599,8 @@ class Manager: if self.snippets_doc: self.snippets_doc.stop() - self.default_size = [dlg.allocation.width, dlg.allocation.height] + alloc = dlg.get_allocation() + self.default_size = [alloc.width, alloc.height] self.manager = None self.unref_languages() @@ -617,8 +609,8 @@ class Manager: self.dlg = None def on_dialog_snippets_response(self, dlg, resp): - if resp == gtk.RESPONSE_HELP: - pluma.help_display(self.dlg, 'pluma', 'pluma-snippets-plugin') + if resp == Gtk.ResponseType.HELP: + Pluma.help_display(self, 'pluma', 'pluma-snippets-plugin') return self.dlg.destroy() @@ -629,7 +621,7 @@ class Manager: if not self.model.iter_parent(piter): renderer.stop_editing(True) editable.remove_widget() - elif isinstance(editable, gtk.Entry): + elif isinstance(editable, Gtk.Entry): if self.snippet: editable.set_text(self.snippet['description']) else: @@ -641,7 +633,7 @@ class Manager: def on_cell_edited(self, cell, path, new_text): if new_text != '': piter = self.model.get_iter(path) - node = self.model.get_value(piter, self.OBJ_COLUMN) + node = self.model.get_value(piter, self.SNIPPET_COLUMN) if node: if node == self.snippet.data: @@ -658,7 +650,7 @@ class Manager: snippet = self.new_snippet({'description': new_text}) if snippet: - self.model.set(piter, self.OBJ_COLUMN, snippet.data) + self.model.set_value(piter, self.SNIPPET_COLUMN, snippet.data) self.snippet_changed(piter) self.snippet = snippet self.selection_changed() @@ -675,7 +667,7 @@ class Manager: if text and not Library().valid_tab_trigger(text): img = self['image_tab_trigger'] - img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_BUTTON) + img.set_from_stock(Gtk.STOCK_DIALOG_ERROR, Gtk.IconSize.BUTTON) img.show() #self['hbox_tab_trigger'].set_spacing(3) @@ -719,7 +711,7 @@ class Manager: buf = source_view.get_buffer() text = buf.get_text(buf.get_start_iter(), \ - buf.get_end_iter()) + buf.get_end_iter(), False) self.snippet['text'] = text self.snippet_changed() @@ -753,7 +745,7 @@ class Manager: self.tree_view.set_cursor(path, self.column, True) def file_filter(self, name, pattern): - fil = gtk.FileFilter() + fil = Gtk.FileFilter() fil.set_name(name) for p in pattern: @@ -765,11 +757,11 @@ class Manager: success = True for filename in filenames: - if not pluma.utils.uri_has_file_scheme(filename): + if not Pluma.utils_uri_has_file_scheme(filename): continue # Remove file:// - gfile = gio.File(filename) + gfile = Gio.file_new_for_uri(filename) filename = gfile.get_path() importer = Importer(filename) @@ -778,16 +770,16 @@ class Manager: if error: message = _('The following error occurred while importing: %s') % error success = False - message_dialog(self.dlg, gtk.MESSAGE_ERROR, message) + message_dialog(self.dlg, Gtk.MessageType.ERROR, message) self.build_model(True) if success: message = _('Import successfully completed') - message_dialog(self.dlg, gtk.MESSAGE_INFO, message) + message_dialog(self.dlg, Gtk.MessageType.INFO, message) def on_import_response(self, dialog, response): - if response == gtk.RESPONSE_CANCEL or response == gtk.RESPONSE_CLOSE: + if response == Gtk.ResponseType.CANCEL or response == Gtk.ResponseType.CLOSE: dialog.destroy() return @@ -797,10 +789,10 @@ class Manager: self.import_snippets(f) def on_button_import_snippets_clicked(self, button): - dlg = gtk.FileChooserDialog(parent=self.dlg, title=_("Import snippets"), - action=gtk.FILE_CHOOSER_ACTION_OPEN, - buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, - gtk.STOCK_OPEN, gtk.RESPONSE_OK)) + dlg = Gtk.FileChooserDialog(parent=self.dlg, title=_("Import snippets"), + action=Gtk.FileChooserAction.OPEN, + buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, + Gtk.STOCK_OPEN, Gtk.ResponseType.OK)) dlg.add_filter(self.file_filter(_('All supported archives'), ('*.gz','*.bz2','*.tar', '*.xml'))) dlg.add_filter(self.file_filter(_('Gzip compressed archive'), ('*.tar.gz',))) @@ -819,11 +811,11 @@ class Manager: if error: message = _('The following error occurred while exporting: %s') % error - msgtype = gtk.MESSAGE_ERROR + msgtype = Gtk.MessageType.ERROR retval = False else: message = _('Export successfully completed') - msgtype = gtk.MESSAGE_INFO + msgtype = Gtk.MessageType.INFO retval = True if show_dialogs: @@ -837,7 +829,7 @@ class Manager: dialog.destroy() - if response != gtk.RESPONSE_OK: + if response != Gtk.ResponseType.OK: return self.export_snippets_real(filename, snippets); @@ -863,29 +855,29 @@ class Manager: if len(systemsnippets) != 0 and show_dialogs: # Ask if system snippets should also be exported message = _('Do you want to include selected <b>system</b> snippets in your export?') - mes = gtk.MessageDialog(flags=gtk.DIALOG_MODAL, - type=gtk.MESSAGE_QUESTION, - buttons=gtk.BUTTONS_YES_NO, + mes = Gtk.MessageDialog(flags=Gtk.DialogFlags.MODAL, + type=Gtk.MessageType.QUESTION, + buttons=Gtk.ButtonsType.YES_NO, message_format=message) mes.set_property('use-markup', True) resp = mes.run() mes.destroy() - if resp == gtk.RESPONSE_NO: + if resp == Gtk.ResponseType.NO: export_snippets = usersnippets - elif resp != gtk.RESPONSE_YES: + elif resp != Gtk.ResponseType.YES: return False if len(export_snippets) == 0 and show_dialogs: message = _('There are no snippets selected to be exported') - message_dialog(self.dlg, gtk.MESSAGE_INFO, message) + message_dialog(self.dlg, Gtk.MessageType.INFO, message) return False if not filename: - dlg = gtk.FileChooserDialog(parent=self.dlg, title=_('Export snippets'), - action=gtk.FILE_CHOOSER_ACTION_SAVE, - buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, - gtk.STOCK_SAVE, gtk.RESPONSE_OK)) + dlg = Gtk.FileChooserDialog(parent=self.dlg, title=_('Export snippets'), + action=Gtk.FileChooserAction.SAVE, + buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, + Gtk.STOCK_SAVE, Gtk.ResponseType.OK)) dlg._export_snippets = export_snippets dlg.add_filter(self.file_filter(_('All supported archives'), ('*.gz','*.bz2','*.tar'))) @@ -920,27 +912,27 @@ class Manager: else: systemsnippets.append(snippet) - dlg = gtk.FileChooserDialog(parent=self.dlg, title=_('Export snippets'), - action=gtk.FILE_CHOOSER_ACTION_SAVE, - buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, - gtk.STOCK_SAVE, gtk.RESPONSE_OK)) + dlg = Gtk.FileChooserDialog(parent=self.dlg, title=_('Export snippets'), + action=Gtk.FileChooserAction.SAVE, + buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, + Gtk.STOCK_SAVE, Gtk.ResponseType.OK)) dlg._export_snippets = snippets if len(systemsnippets) != 0: # Ask if system snippets should also be exported message = _('Do you want to include selected <b>system</b> snippets in your export?') - mes = gtk.MessageDialog(flags=gtk.DIALOG_MODAL, - type=gtk.MESSAGE_QUESTION, - buttons=gtk.BUTTONS_YES_NO, + mes = Gtk.MessageDialog(flags=Gtk.DialogFlags.MODAL, + type=Gtk.MessageType.QUESTION, + buttons=Gtk.ButtonsType.YES_NO, message_format=message) mes.set_property('use-markup', True) resp = mes.run() mes.destroy() - if resp == gtk.RESPONSE_NO: + if resp == Gtk.ResponseType.NO: dlg._export_snippets = usersnippets - elif resp != gtk.RESPONSE_YES: + elif resp != Gtk.ResponseType.YES: dlg.destroy() return @@ -948,7 +940,7 @@ class Manager: dlg.destroy() message = _('There are no snippets selected to be exported') - message_dialog(self.dlg, gtk.MESSAGE_INFO, message) + message_dialog(self.dlg, Gtk.MessageType.INFO, message) return dlg.add_filter(self.file_filter(_('All supported archives'), ('*.gz','*.bz2','*.tar'))) @@ -975,11 +967,12 @@ class Manager: parent = self.model.iter_parent(piter) Library().remove_snippet(node) + idx = path.get_indices() if self.model.remove(piter): return piter - elif path[-1] != 0: - self.select_iter(self.model.get_iter((path[0], path[1] - 1))) + elif idx[-1] != 0: + self.select_iter(self.model.get_iter((idx[0], idx[1] - 1))) else: dummy = self.add_new_snippet_node(parent) self.tree_view.expand_row(self.model.get_path(parent), False) @@ -1004,7 +997,7 @@ class Manager: # Create tree row references references = [] for path in paths: - references.append(gtk.TreeRowReference(self.model, path)) + references.append(Gtk.TreeRowReference(self.model, path)) # Remove/revert snippets select = None @@ -1023,7 +1016,7 @@ class Manager: self.selection_changed() def set_accelerator(self, keyval, mod): - accelerator = gtk.accelerator_name(keyval, mod) + accelerator = Gtk.accelerator_name(keyval, mod) self.snippet['accelerator'] = accelerator return True @@ -1031,14 +1024,14 @@ class Manager: def on_entry_accelerator_key_press(self, entry, event): source_view = self['source_view_snippet'] - if event.keyval == gdk.keyval_from_name('Escape'): + if event.keyval == Gdk.keyval_from_name('Escape'): # Reset entry.set_text(self.snippet.accelerator_display()) self.tree_view.grab_focus() return True - elif event.keyval == gdk.keyval_from_name('Delete') or \ - event.keyval == gdk.keyval_from_name('BackSpace'): + elif event.keyval == Gdk.keyval_from_name('Delete') or \ + event.keyval == Gdk.keyval_from_name('BackSpace'): # Remove the accelerator entry.set_text('') self.snippet['accelerator'] = '' @@ -1049,7 +1042,7 @@ class Manager: elif Library().valid_accelerator(event.keyval, event.state): # New accelerator self.set_accelerator(event.keyval, \ - event.state & gtk.accelerator_get_default_mod_mask()) + event.state & Gtk.accelerator_get_default_mod_mask()) entry.set_text(self.snippet.accelerator_display()) self.snippet_changed() self.tree_view.grab_focus() @@ -1092,7 +1085,7 @@ class Manager: None) self.on_source_view_snippet_focus_out(self['source_view_snippet'], None) - self.on_entry_drop_targets_focus_out(self['combo_drop_targets'].child, + self.on_entry_drop_targets_focus_out(self['combo_drop_targets'].get_child(), None) self.update_language_path() @@ -1117,7 +1110,7 @@ class Manager: return False def on_tree_view_snippets_key_press(self, treeview, event): - if event.keyval == gdk.keyval_from_name('Delete'): + if event.keyval == Gdk.keyval_from_name('Delete'): self.on_button_remove_snippet_clicked(None) return True @@ -1127,9 +1120,6 @@ class Manager: self.select_iter(piter) def on_entry_drop_targets_drag_data_received(self, entry, context, x, y, selection_data, info, timestamp): - if not gtk.targets_include_uri(context.targets): - return - uris = drop_get_uris(selection_data) if not uris: @@ -1142,7 +1132,7 @@ class Manager: for uri in uris: try: - mime = gio.content_type_guess(uri) + mime = Gio.content_type_guess(uri) except: mime = None |