Commit 4901c1e1 authored by Daniel Brötzmann's avatar Daniel Brötzmann Committed by Philipp Hörist

[preview] Fix on_save_as_menuitem handler name

parent 06363073
...@@ -484,7 +484,7 @@ class Base(object): ...@@ -484,7 +484,7 @@ class Base(object):
buffer_.get_iter_at_mark(repl_end)) buffer_.get_iter_at_mark(repl_end))
image.connect( image.connect(
'button-press-event', self.on_button_press_event, 'button-press-event', self._on_button_press_event,
filepath, filename, url, encrypted) filepath, filename, url, encrypted)
image.get_window().set_cursor(get_cursor('HAND2')) image.get_window().set_cursor(get_cursor('HAND2'))
...@@ -604,14 +604,13 @@ class Base(object): ...@@ -604,14 +604,13 @@ class Base(object):
open_menuitem = xml.get_object('open_menuitem') open_menuitem = xml.get_object('open_menuitem')
save_as_menuitem = xml.get_object('save_as_menuitem') save_as_menuitem = xml.get_object('save_as_menuitem')
open_folder_menuitem = xml.get_object('open_folder_menuitem') open_folder_menuitem = xml.get_object('open_folder_menuitem')
copy_link_location_menuitem = \ copy_link_location_menuitem = xml.get_object(
xml.get_object('copy_link_location_menuitem') 'copy_link_location_menuitem')
open_link_in_browser_menuitem = \ open_link_in_browser_menuitem = xml.get_object(
xml.get_object('open_link_in_browser_menuitem') 'open_link_in_browser_menuitem')
open_file_in_browser_menuitem = \ open_file_in_browser_menuitem = xml.get_object(
xml.get_object('open_file_in_browser_menuitem') 'open_file_in_browser_menuitem')
extras_separator = \ extras_separator = xml.get_object('extras_separator')
xml.get_object('extras_separator')
if data["encrypted"]: if data["encrypted"]:
open_link_in_browser_menuitem.hide() open_link_in_browser_menuitem.hide()
...@@ -621,27 +620,27 @@ class Base(object): ...@@ -621,27 +620,27 @@ class Base(object):
open_file_in_browser_menuitem.hide() open_file_in_browser_menuitem.hide()
id_ = open_menuitem.connect( id_ = open_menuitem.connect(
'activate', self.on_open_menuitem_activate, data) 'activate', self._on_open_menuitem_activate, data)
self.handlers[id_] = open_menuitem self.handlers[id_] = open_menuitem
id_ = save_as_menuitem.connect( id_ = save_as_menuitem.connect(
'activate', self.on_save_as_menuitem_activate_new, data) 'activate', self._on_save_as_menuitem_activate, data)
self.handlers[id_] = save_as_menuitem self.handlers[id_] = save_as_menuitem
id_ = open_folder_menuitem.connect( id_ = open_folder_menuitem.connect(
'activate', self._on_open_folder_menuitem_activate, data) 'activate', self._on_open_folder_menuitem_activate, data)
self.handlers[id_] = save_as_menuitem self.handlers[id_] = save_as_menuitem
id_ = copy_link_location_menuitem.connect( id_ = copy_link_location_menuitem.connect(
'activate', self.on_copy_link_location_menuitem_activate, data) 'activate', self._on_copy_link_location_menuitem_activate, data)
self.handlers[id_] = copy_link_location_menuitem self.handlers[id_] = copy_link_location_menuitem
id_ = open_link_in_browser_menuitem.connect( id_ = open_link_in_browser_menuitem.connect(
'activate', self.on_open_link_in_browser_menuitem_activate, data) 'activate', self._on_open_link_in_browser_menuitem_activate, data)
self.handlers[id_] = open_link_in_browser_menuitem self.handlers[id_] = open_link_in_browser_menuitem
id_ = open_file_in_browser_menuitem.connect( id_ = open_file_in_browser_menuitem.connect(
'activate', self.on_open_file_in_browser_menuitem_activate, data) 'activate', self._on_open_file_in_browser_menuitem_activate, data)
self.handlers[id_] = open_file_in_browser_menuitem self.handlers[id_] = open_file_in_browser_menuitem
return menu return menu
def on_open_menuitem_activate(self, menu, data): def _on_open_menuitem_activate(self, menu, data):
filepath = data["filepath"] filepath = data["filepath"]
original_filename = data["original_filename"] original_filename = data["original_filename"]
url = data["url"] url = data["url"]
...@@ -650,7 +649,7 @@ class Base(object): ...@@ -650,7 +649,7 @@ class Base(object):
return return
helpers.launch_file_manager(filepath) helpers.launch_file_manager(filepath)
def on_save_as_menuitem_activate_new(self, menu, data): def _on_save_as_menuitem_activate(self, menu, data):
filepath = data["filepath"] filepath = data["filepath"]
original_filename = data["original_filename"] original_filename = data["original_filename"]
...@@ -672,13 +671,13 @@ class Base(object): ...@@ -672,13 +671,13 @@ class Base(object):
def _on_open_folder_menuitem_activate(self, menu, data): def _on_open_folder_menuitem_activate(self, menu, data):
helpers.launch_file_manager(self.directory) helpers.launch_file_manager(self.directory)
def on_copy_link_location_menuitem_activate(self, menu, data): def _on_copy_link_location_menuitem_activate(self, menu, data):
url = data["url"] url = data["url"]
clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD)
clipboard.set_text(url, -1) clipboard.set_text(url, -1)
clipboard.store() clipboard.store()
def on_open_link_in_browser_menuitem_activate(self, menu, data): def _on_open_link_in_browser_menuitem_activate(self, menu, data):
url = data["url"] url = data["url"]
if data["encrypted"]: if data["encrypted"]:
dialogs.ErrorDialog( dialogs.ErrorDialog(
...@@ -690,7 +689,7 @@ class Base(object): ...@@ -690,7 +689,7 @@ class Base(object):
else: else:
helpers.open_uri(url) helpers.open_uri(url)
def on_open_file_in_browser_menuitem_activate(self, menu, data): def _on_open_file_in_browser_menuitem_activate(self, menu, data):
if os.name == "nt": if os.name == "nt":
filepath = "file://" + os.path.abspath(data["filepath"]) filepath = "file://" + os.path.abspath(data["filepath"])
else: else:
...@@ -710,15 +709,15 @@ class Base(object): ...@@ -710,15 +709,15 @@ class Base(object):
except Exception: except Exception:
pass pass
def on_button_press_event(self, eb, event, filepath, def _on_button_press_event(self, eb, event, filepath, original_filename,
original_filename, url, encrypted): url, encrypted):
data = {"filepath": filepath, data = {"filepath": filepath,
"original_filename": original_filename, "original_filename": original_filename,
"url": url, "url": url,
"encrypted": encrypted} "encrypted": encrypted}
# left click # left click
if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 1: if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 1:
method = getattr(self, "on_" method = getattr(self, "_on_"
+ self.plugin.config['LEFTCLICK_ACTION'] + self.plugin.config['LEFTCLICK_ACTION']
+ "_activate") + "_activate")
method(event, data) method(event, data)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment