Commits September 2016

commits@gajim.org

1 participants
78 discussions

gajim: Add transients for some MUC dialogs
by Gajim 21 Sep '16

21 Sep '16

changeset a10e0df42f31 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a10e0df42f31 description: Add transients for some MUC dialogs diffstat: src/dialogs.py | 30 ++++++++++++++++++------------ src/groupchat_control.py | 4 ++-- src/gui_interface.py | 9 ++++++--- 3 files changed, 26 insertions(+), 17 deletions(-) diffs (138 lines): diff -r 9db52e975b8a -r a10e0df42f31 src/dialogs.py --- a/src/dialogs.py Sun Sep 18 15:46:39 2016 +0200 +++ b/src/dialogs.py Wed Sep 21 20:07:37 2016 +0200 @@ -2008,7 +2008,7 @@ """ def __init__(self, title, label_str, is_modal, ok_handler, cancel_handler, - transient_for=None): + transient_for=None): self.dialog = self.xml.get_object('input_dialog') label = self.xml.get_object('label') self.dialog.set_title(title) @@ -2053,10 +2053,11 @@ """ def __init__(self, title, label_str, input_str=None, is_modal=True, - ok_handler=None, cancel_handler=None, transient_for=None): + ok_handler=None, cancel_handler=None, transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('input_dialog.ui') - CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, - cancel_handler, transient_for=transient_for) + CommonInputDialog.__init__(self, title, label_str, is_modal, + ok_handler, cancel_handler, + transient_for=transient_for) self.input_entry = self.xml.get_object('input_entry') if input_str: self.set_entry(input_str) @@ -2080,11 +2081,13 @@ """ def __init__(self, title, label_str, checktext='', input_str=None, - is_modal=True, ok_handler=None, cancel_handler=None): + is_modal=True, ok_handler=None, cancel_handler=None, + transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('input_dialog.ui') InputDialog.__init__(self, title, label_str, input_str=input_str, - is_modal=is_modal, ok_handler=ok_handler, - cancel_handler=cancel_handler) + is_modal=is_modal, ok_handler=ok_handler, + cancel_handler=cancel_handler, + transient_for=transient_for) self.input_entry = self.xml.get_object('input_entry') if input_str: self.input_entry.set_text(input_str) @@ -2125,13 +2128,15 @@ """ def __init__(self, account, room_jid, title, prompt, check_text=None, - change_nick=False): + change_nick=False, transient_for=None): """ change_nick must be set to True when we are already occupant of the room and we are changing our nick """ InputDialogCheck.__init__(self, title, '', checktext=check_text, - input_str='', is_modal=True, ok_handler=None, cancel_handler=None) + input_str='', is_modal=True, ok_handler=None, + cancel_handler=None, + transient_for=transient_for) self.room_queue = [(account, room_jid, prompt, change_nick)] self.check_next() @@ -2216,10 +2221,11 @@ """ def __init__(self, title, label_str, input_str=None, is_modal=True, - ok_handler=None, cancel_handler=None): + ok_handler=None, cancel_handler=None, transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('input_text_dialog.ui') - CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, - cancel_handler) + CommonInputDialog.__init__(self, title, label_str, is_modal, + ok_handler, cancel_handler, + transient_for=transient_for) self.input_buffer = self.xml.get_object('input_textview').get_buffer() if input_str: self.input_buffer.set_text(input_str) diff -r 9db52e975b8a -r a10e0df42f31 src/groupchat_control.py --- a/src/groupchat_control.py Sun Sep 18 15:46:39 2016 +0200 +++ b/src/groupchat_control.py Wed Sep 21 20:07:37 2016 +0200 @@ -2225,7 +2225,7 @@ dialogs.InputTextDialog(_('Changing Subject'), _('Please specify the new subject:'), input_str=self.subject, - ok_handler=on_ok) + ok_handler=on_ok, transient_for=self.parent_win.window) def _on_disconnect_menuitem_activate(self, widget): self.force_non_minimizable = True @@ -2240,7 +2240,7 @@ prompt = _('Please specify the new nickname you want to use:') gajim.interface.instances['change_nick_dialog'] = \ dialogs.ChangeNickDialog(self.account, self.room_jid, title, - prompt, change_nick=True) + prompt, change_nick=True, transient_for=self.parent_win.window) def _on_configure_room_menuitem_activate(self, widget): c = gajim.contacts.get_gc_contact(self.account, self.room_jid, diff -r 9db52e975b8a -r a10e0df42f31 src/gui_interface.py --- a/src/gui_interface.py Sun Sep 18 15:46:39 2016 +0200 +++ b/src/gui_interface.py Wed Sep 21 20:07:37 2016 +0200 @@ -133,7 +133,7 @@ cls(obj.pri_txt, GLib.markup_escape_text(obj.sec_txt)) - def handle_ask_new_nick(self, account, room_jid): + def handle_ask_new_nick(self, account, room_jid, parent_win): title = _('Unable to join group chat') prompt = _('Your desired nickname in group chat %s is in use or ' 'registered by another occupant.\nPlease specify another nickname ' @@ -144,7 +144,7 @@ prompt) else: self.instances['change_nick_dialog'] = dialogs.ChangeNickDialog( - account, room_jid, title, prompt) + account, room_jid, title, prompt, transient_for=parent_win) def handle_event_http_auth(self, obj): #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) @@ -294,6 +294,9 @@ def handle_event_gc_presence(self, obj): gc_control = obj.gc_control + parent_win = None + if gc_control.parent_win: + parent_win = gc_control.parent_win.window if obj.ptype == 'error': if obj.errcode == '503': # maximum user number reached @@ -328,7 +331,7 @@ _('You are not in the members list in groupchat %s.') % \ obj.room_jid) elif (obj.errcode == '409') or (obj.errcon == 'conflict'): - self.handle_ask_new_nick(obj.conn.name, obj.room_jid) + self.handle_ask_new_nick(obj.conn.name, obj.room_jid, parent_win) elif gc_control: gc_control.print_conversation('Error %s: %s' % (obj.errcode, obj.errmsg))

1 0

python-nbxmpp: Fix SSLError not shown in some cases - Fixes #37
by Python-nbxmpp 20 Sep '16

20 Sep '16

changeset 4dec26e5cd71 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=4dec26e5cd71 description: Fix SSLError not shown in some cases - Fixes #37 diffstat: nbxmpp/tls_nb.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 9a098ef74494 -r 4dec26e5cd71 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sun Sep 04 13:54:09 2016 +0200 +++ b/nbxmpp/tls_nb.py Thu Jul 28 07:44:57 2016 +0200 @@ -493,10 +493,10 @@ def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: + if not ok: + self._owner.ssl_errnum = errnum if depth == 0: self._owner.ssl_certificate = cert - if not ok: - self._owner.ssl_errnum = errnum return True except: log.error("Exception caught in _ssl_info_callback:", exc_info=True)

1 0

gajim-plugins: Add missing import, remove unused imports - Fixes...
by Gajim Plugins 20 Sep '16

20 Sep '16

changeset c77d2e02ad88 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=c77d2e02ad88 description: Add missing import, remove unused imports - Fixes #143 diffstat: url_image_preview/http_functions.py | 1 + url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 6 +----- 3 files changed, 3 insertions(+), 6 deletions(-) diffs (53 lines): diff -r 52c341cd2ac4 -r c77d2e02ad88 url_image_preview/http_functions.py --- a/url_image_preview/http_functions.py Wed Sep 14 19:05:41 2016 +0200 +++ b/url_image_preview/http_functions.py Tue Sep 20 16:41:39 2016 +0200 @@ -17,6 +17,7 @@ import urllib2 import socket +import re from common import helpers from common import gajim diff -r 52c341cd2ac4 -r c77d2e02ad88 url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Wed Sep 14 19:05:41 2016 +0200 +++ b/url_image_preview/manifest.ini Tue Sep 20 16:41:39 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.9.6 +version: 0.9.7 description: Displays a preview of links to images authors = Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> diff -r 52c341cd2ac4 -r c77d2e02ad88 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Wed Sep 14 19:05:41 2016 +0200 +++ b/url_image_preview/url_image_preview.py Tue Sep 20 16:41:39 2016 +0200 @@ -17,25 +17,21 @@ import gtk import gobject -import re import os -import sys import hashlib from urlparse import urlparse from io import BytesIO import shutil -import webbrowser import logging import nbxmpp -import gtkgui_helpers from common import gajim from common import ged from common import helpers from common import configpaths import dialogs from plugins import GajimPlugin -from plugins.helpers import log_calls, log +from plugins.helpers import log_calls from plugins.gui import GajimPluginConfigDialog from conversation_textview import TextViewImage from .http_functions import get_http_head, get_http_file

1 0

gajim: [gdr_gdr] Improve error message when a groupchat is in ro...
by Gajim 18 Sep '16

18 Sep '16

changeset 9db52e975b8a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9db52e975b8a description: [gdr_gdr] Improve error message when a groupchat is in roster as a contact. Fixes #8380 diffstat: src/dialogs.py | 4 +++- src/gui_interface.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diffs (28 lines): diff -r 73696744a9c0 -r 9db52e975b8a src/dialogs.py --- a/src/dialogs.py Tue Sep 06 23:08:09 2016 +0200 +++ b/src/dialogs.py Sun Sep 18 15:46:39 2016 +0200 @@ -2664,7 +2664,9 @@ if gajim.contacts.get_contact(self.account, room_jid) and \ not gajim.contacts.get_contact(self.account, room_jid).is_groupchat(): ErrorDialog(_('This is not a group chat'), - _('%s is not the name of a group chat.') % room_jid) + _('%s is already in your roster. Please check if %s is a ' + 'correct group chat name. If it is, delete it from your roster ' + 'and try joining the group chat again.') % (room_jid, room_jid)) return full_jid = room_jid + '/' + nickname diff -r 73696744a9c0 -r 9db52e975b8a src/gui_interface.py --- a/src/gui_interface.py Tue Sep 06 23:08:09 2016 +0200 +++ b/src/gui_interface.py Sun Sep 18 15:46:39 2016 +0200 @@ -2117,7 +2117,9 @@ if gajim.contacts.get_contact(account, room_jid) and \ not gajim.contacts.get_contact(account, room_jid).is_groupchat(): dialogs.ErrorDialog(_('This is not a group chat'), - _('%s is not the name of a group chat.') % room_jid) + _('%s is already in your roster. Please check if %s is a ' + 'correct group chat name. If it is, delete it from your roster ' + 'and try joining the group chat again.') % (room_jid, room_jid)) return if not nick:

1 0

gajim: default connection is now only done with TLS. No more leg...
by Gajim 18 Sep '16

18 Sep '16

changeset 849a745fc6c1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=849a745fc6c1 description: default connection is now only done with TLS. No more legacy SSL or plain connection. Fixes #8390 diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2cb44c8b1d79 -r 849a745fc6c1 src/common/config.py --- a/src/common/config.py Sun Sep 18 15:15:10 2016 +0200 +++ b/src/common/config.py Sun Sep 18 15:18:30 2016 +0200 @@ -345,7 +345,7 @@ 'keyname': [ opt_str, '', '', True ], 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.'), True], 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], - 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], + 'connection_types': [ opt_str, 'tls', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], 'tls_version': [ opt_str, '1.0', '' ], 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], 'authentication_mechanisms': [ opt_str, '', _('List (space separated) of authentication mechanisms to try. Can contain ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, PLAIN, X-MESSENGER-OAUTH2 or XEP-0078') ],

1 0

gajim: Limit time to reconnect to 5 minutes. Fixes #8393
by Gajim 18 Sep '16

18 Sep '16

changeset 2cb44c8b1d79 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=2cb44c8b1d79 description: Limit time to reconnect to 5 minutes. Fixes #8393 diffstat: src/common/connection.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diffs (20 lines): diff -r 1990a807b6b4 -r 2cb44c8b1d79 src/common/connection.py --- a/src/common/connection.py Wed Sep 07 05:47:23 2016 +0200 +++ b/src/common/connection.py Sun Sep 18 15:15:10 2016 +0200 @@ -949,13 +949,12 @@ gajim.status_before_autoaway[self.name] = '' self.old_show = 'online' # this check has moved from _reconnect method - # do exponential backoff until 15 minutes, - # then small linear increase + # do exponential backoff until less than 5 minutes if self.retrycount < 2 or self.last_time_to_reconnect is None: self.last_time_to_reconnect = 5 - if self.last_time_to_reconnect < 800: + self.last_time_to_reconnect += randomsource.randint(0, 5) + if self.last_time_to_reconnect < 200: self.last_time_to_reconnect *= 1.5 - self.last_time_to_reconnect += randomsource.randint(0, 5) self.time_to_reconnect = int(self.last_time_to_reconnect) log.info("Reconnect to %s in %ss", self.name, self.time_to_reconnect) gajim.idlequeue.set_alarm(self._reconnect_alarm,

1 0

gajim-plugins: Assign backend only if decryption is enabled - Fi...
by Gajim Plugins 14 Sep '16

14 Sep '16

changeset 52c341cd2ac4 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=52c341cd2ac4 description: Assign backend only if decryption is enabled - Fixes #141 diffstat: url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diffs (61 lines): diff -r ca88aaace650 -r 52c341cd2ac4 url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Sun Sep 11 19:28:32 2016 +0200 +++ b/url_image_preview/manifest.ini Wed Sep 14 19:05:41 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.9.5 +version: 0.9.6 description: Displays a preview of links to images authors = Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> diff -r ca88aaace650 -r 52c341cd2ac4 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Sun Sep 11 19:28:32 2016 +0200 +++ b/url_image_preview/url_image_preview.py Wed Sep 14 19:05:41 2016 +0200 @@ -136,10 +136,6 @@ self.chat_control = chat_control self.textview = self.chat_control.conv_textview self.handlers = {} - if os.name == 'nt': - self.backend = backend - else: - self.backend = default_backend() self.directory = os.path.join(configpaths.gajimpaths['MY_DATA'], 'downloads') @@ -179,7 +175,7 @@ # Don't print the URL in the message window (in the calling function) self.textview.plugin_modified = True - + buffer_ = self.textview.tv.get_buffer() if not iter_: iter_ = buffer_.get_end_iter() @@ -247,7 +243,6 @@ self._check_mime_size, [special_text, repl_start, repl_end, filepaths, key, iv, encrypted]) - def _save_thumbnail(self, thumbpath, (mem, alt)): size = self.plugin.config['PREVIEW_SIZE'] use_gtk = False @@ -436,12 +431,16 @@ def _aes_decrypt_fast(self, key, iv, payload): # Use AES128 GCM with the given key and iv to decrypt the payload. + if os.name == 'nt': + be = backend + else: + be = default_backend() data = payload[:-16] tag = payload[-16:] decryptor = Cipher( algorithms.AES(key), GCM(iv, tag=tag), - backend=self.backend).decryptor() + backend=be).decryptor() return decryptor.update(data) + decryptor.finalize() def _get_pixbuf_of_size(self, pixbuf, size):

1 0

gajim-plugins: Added ability to configure left click action
by Gajim Plugins 11 Sep '16

11 Sep '16

changeset a482e3eb7586 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=a482e3eb7586 description: Added ability to configure left click action diffstat: url_image_preview/config_dialog.ui | 64 ++++++++++++++++++++++- url_image_preview/context_menu.ui | 22 ++++++++ url_image_preview/url_image_preview.py | 93 +++++++++++++++++++++++++++------ 3 files changed, 159 insertions(+), 20 deletions(-) diffs (truncated from 328 to 300 lines): diff -r 0f55bb188e18 -r a482e3eb7586 url_image_preview/config_dialog.ui --- a/url_image_preview/config_dialog.ui Thu Sep 08 14:54:12 2016 +0200 +++ b/url_image_preview/config_dialog.ui Thu Sep 08 18:10:59 2016 +0200 @@ -25,6 +25,29 @@ </row> </data> </object> + <object class="GtkListStore" id="liststore2"> + <columns> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Open</col> + </row> + <row> + <col id="0" translatable="yes">Save as</col> + </row> + <row> + <col id="0" translatable="yes">Copy Link Location</col> + </row> + <row> + <col id="0" translatable="yes">Open Link in Browser</col> + </row> + <row> + <col id="0" translatable="yes">Open Downloaded File in Browser</col> + </row> + </data> + </object> <object class="GtkWindow" id="window1"> <property name="can_focus">False</property> <child> @@ -42,7 +65,7 @@ <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">2</property> + <property name="n_rows">3</property> <property name="n_columns">2</property> <child> <object class="GtkSpinButton" id="preview_size"> @@ -86,6 +109,27 @@ </packing> </child> <child> + <object class="GtkComboBox" id="leftclick_action_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">liststore2</property> + <signal name="changed" handler="leftclick_action_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options">GTK_EXPAND</property> + </packing> + </child> + <child> <object class="GtkLabel" id="max_size_label"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -113,6 +157,22 @@ <property name="y_options">GTK_EXPAND</property> </packing> </child> + <child> + <object class="GtkLabel" id="leftclick_action_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="xpad">12</property> + <property name="label" translatable="yes">Left click action</property> + <property name="track_visited_links">False</property> + </object> + <packing> + <property name="y_options">GTK_EXPAND</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options">GTK_EXPAND</property> + </packing> + </child> </object> </child> </object> @@ -126,4 +186,4 @@ </object> </child> </object> -</interface> +</interface> \ No newline at end of file diff -r 0f55bb188e18 -r a482e3eb7586 url_image_preview/context_menu.ui --- a/url_image_preview/context_menu.ui Thu Sep 08 14:54:12 2016 +0200 +++ b/url_image_preview/context_menu.ui Thu Sep 08 18:10:59 2016 +0200 @@ -22,6 +22,11 @@ <property name="can_focus">False</property> <property name="stock">gtk-jump-to</property> </object> + <object class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-jump-to</property> + </object> <object class="GtkMenu" id="context_menu"> <property name="can_focus">False</property> <child> @@ -74,5 +79,22 @@ <property name="always_show_image">True</property> </object> </child> + <child> + <object class="GtkSeparatorMenuItem" id="extras_separator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="open_file_in_browser_menuitem"> + <property name="label" translatable="yes">Open _Downloaded File in Browser</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_underline">True</property> + <property name="image">image5</property> + <property name="use_stock">False</property> + <property name="always_show_image">True</property> + </object> + </child> </object> </interface> diff -r 0f55bb188e18 -r a482e3eb7586 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Thu Sep 08 14:54:12 2016 +0200 +++ b/url_image_preview/url_image_preview.py Thu Sep 08 18:10:59 2016 +0200 @@ -9,6 +9,7 @@ from urlparse import urlparse from io import BytesIO import shutil +import webbrowser import logging import nbxmpp @@ -70,7 +71,8 @@ 'print_special_text': (self.print_special_text, None), } self.config_default_values = { 'PREVIEW_SIZE': (150, 'Preview size(10-512)'), - 'MAX_FILE_SIZE': (524288, 'Max file size for image preview')} + 'MAX_FILE_SIZE': (524288, 'Max file size for image preview'), + 'LEFTCLICK_ACTION': ('open_menuitem', 'Open')} self.controls = {} # remove oob tag if oob url == message text @@ -445,8 +447,7 @@ gtk.gdk.INTERP_BILINEAR) return (crop_pixbuf, image_width, image_height) - def make_rightclick_menu(self, event, filepath, original_filename, - url, encrypted): + def make_rightclick_menu(self, event, data): xml = gtk.Builder() xml.set_translation_domain('gajim_plugins') xml.add_from_file(self.plugin.local_file_path('context_menu.ui')) @@ -458,30 +459,37 @@ xml.get_object('copy_link_location_menuitem') open_link_in_browser_menuitem = \ xml.get_object('open_link_in_browser_menuitem') + open_file_in_browser_menuitem = \ + xml.get_object('open_file_in_browser_menuitem') - if encrypted: + if data["encrypted"]: open_link_in_browser_menuitem.hide() id_ = open_menuitem.connect( - 'activate', self.on_open_menuitem_activate, filepath) + 'activate', self.on_open_menuitem_activate, data) self.handlers[id_] = open_menuitem id_ = save_as_menuitem.connect( - 'activate', self.on_save_as_menuitem_activate, - filepath, original_filename) + 'activate', self.on_save_as_menuitem_activate, data) self.handlers[id_] = save_as_menuitem id_ = copy_link_location_menuitem.connect( - 'activate', self.on_copy_link_location_menuitem_activate, url) + 'activate', self.on_copy_link_location_menuitem_activate, data) self.handlers[id_] = copy_link_location_menuitem id_ = open_link_in_browser_menuitem.connect( - 'activate', self.on_open_link_in_browser_menuitem_activate, url) + 'activate', self.on_open_link_in_browser_menuitem_activate, data) self.handlers[id_] = open_link_in_browser_menuitem + id_ = open_file_in_browser_menuitem.connect( + 'activate', self.on_open_file_in_browser_menuitem_activate, data) + self.handlers[id_] = open_file_in_browser_menuitem return menu - def on_open_menuitem_activate(self, menu, filepath): + def on_open_menuitem_activate(self, menu, data): + filepath = data["filepath"] helpers.launch_file_manager(filepath) - def on_save_as_menuitem_activate(self, menu, filepath, original_filename): + def on_save_as_menuitem_activate(self, menu, data): + filepath = data["filepath"] + original_filename = data["original_filename"] def on_continue(response, target_path): if response < 0: return @@ -533,12 +541,37 @@ dialog.connect('delete-event', lambda widget, event: on_cancel(widget)) - def on_copy_link_location_menuitem_activate(self, menu, url): + def on_copy_link_location_menuitem_activate(self, menu, data): + url = data["url"] clipboard = gtk.Clipboard() clipboard.set_text(url) - def on_open_link_in_browser_menuitem_activate(self, menu, url): - helpers.launch_browser_mailer('url', url) + def on_open_link_in_browser_menuitem_activate(self, menu, data): + url = data["url"] + if data["encrypted"]: + dialogs.ErrorDialog( + _('Encrypted file'), + _('You cannot open encrypted files in your ' + 'browser directly. Try "Open Downloaded File ' + 'in Browser" instead.'), + transient_for=self.chat_control.parent_win.window) + else: + helpers.launch_browser_mailer('url', url) + + def on_open_file_in_browser_menuitem_activate(self, menu, data): + filepath = "file://" + data["filepath"] + if not gajim.config.get('autodetect_browser_mailer'): + command = gajim.config.get('custombrowser') + if command == '': # if no app is configured + return + command = helpers.build_command(command, filepath) + try: + helpers.exec_command(command) + except Exception: + pass + else: + log.error(filepath) + webbrowser.open(filepath) # Change mouse pointer to HAND2 when # mouse enter the eventbox with the image @@ -553,13 +586,18 @@ def on_button_press_event(self, eb, event, filepath, original_filename, url, encrypted): + data = {"filepath": filepath, + "original_filename": original_filename, + "url": url, + "encrypted": encrypted} # left click if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1: - helpers.launch_file_manager(filepath) + method = getattr(self, "on_" + self.plugin.config['LEFTCLICK_ACTION'] + + "_activate") + method(event, data) # right klick elif event.type == gtk.gdk.BUTTON_PRESS and event.button == 3: - menu = self.make_rightclick_menu(event, filepath, - original_filename, url, encrypted) + menu = self.make_rightclick_menu(event, data) # menu.attach_to_widget(self.tv, None) menu.popup(None, None, None, event.button, event.time) @@ -569,6 +607,8 @@ class UrlImagePreviewPluginConfigDialog(GajimPluginConfigDialog): max_file_size = [262144, 524288, 1048576, 5242880, 10485760] + leftclick_action = ['open_menuitem', 'save_as_menuitem', 'copy_link_location_menuitem', + 'open_link_in_browser_menuitem', 'open_file_in_browser_menuitem'] def init(self): self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path( @@ -576,11 +616,12 @@ self.xml = gtk.Builder() self.xml.set_translation_domain('gajim_plugins') self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, [ - 'vbox1', 'liststore1']) + 'vbox1', 'liststore1', 'liststore2']) self.preview_size_spinbutton = self.xml.get_object('preview_size') self.preview_size_spinbutton.get_adjustment().set_all(20, 10, 512, 1, 10, 0) self.max_size_combobox = self.xml.get_object('max_size_combobox') + self.leftclick_action_combobox = self.xml.get_object('leftclick_action_combobox') vbox = self.xml.get_object('vbox1') self.child.pack_start(vbox)

1 0

gajim-plugins: Correctly open downloaded file in browser, if sel...
by Gajim Plugins 11 Sep '16

11 Sep '16

changeset ffe0206cd7ab in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=ffe0206cd7ab description: Correctly open downloaded file in browser, if selected. Fixes #137 diffstat: url_image_preview/url_image_preview.py | 39 ++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 15 deletions(-) diffs (65 lines): diff -r a482e3eb7586 -r ffe0206cd7ab url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Thu Sep 08 18:10:59 2016 +0200 +++ b/url_image_preview/url_image_preview.py Thu Sep 08 21:34:35 2016 +0200 @@ -461,9 +461,15 @@ xml.get_object('open_link_in_browser_menuitem') open_file_in_browser_menuitem = \ xml.get_object('open_file_in_browser_menuitem') - + extras_separator = \ + xml.get_object('extras_separator') + if data["encrypted"]: open_link_in_browser_menuitem.hide() + if gajim.config.get('autodetect_browser_mailer') \ + or gajim.config.get('custombrowser') == '': + extras_separator.hide() + open_file_in_browser_menuitem.hide() id_ = open_menuitem.connect( 'activate', self.on_open_menuitem_activate, data) @@ -560,18 +566,20 @@ def on_open_file_in_browser_menuitem_activate(self, menu, data): filepath = "file://" + data["filepath"] - if not gajim.config.get('autodetect_browser_mailer'): - command = gajim.config.get('custombrowser') - if command == '': # if no app is configured - return - command = helpers.build_command(command, filepath) - try: - helpers.exec_command(command) - except Exception: - pass - else: - log.error(filepath) - webbrowser.open(filepath) + if gajim.config.get('autodetect_browser_mailer') \ + or gajim.config.get('custombrowser') == '': + dialogs.ErrorDialog( + _('Cannot open downloaded file in browser'), + _('You have to set a custom browser executable ' + 'in your gajim settings for this to work.'), + transient_for=self.chat_control.parent_win.window) + return + command = gajim.config.get('custombrowser') + command = helpers.build_command(command, filepath) + try: + helpers.exec_command(command) + except Exception: + pass # Change mouse pointer to HAND2 when # mouse enter the eventbox with the image @@ -592,8 +600,9 @@ "encrypted": encrypted} # left click if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1: - method = getattr(self, "on_" + self.plugin.config['LEFTCLICK_ACTION'] - + "_activate") + method = getattr(self, "on_" + + self.plugin.config['LEFTCLICK_ACTION'] + + "_activate") method(event, data) # right klick elif event.type == gtk.gdk.BUTTON_PRESS and event.button == 3:

1 0

gajim-plugins: Also honor changed preview size setting for alrea...
by Gajim Plugins 11 Sep '16

11 Sep '16

changeset 1e5be57f67d4 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=1e5be57f67d4 description: Also honor changed preview size setting for already downloaded files. diffstat: url_image_preview/url_image_preview.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r ffe0206cd7ab -r 1e5be57f67d4 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Thu Sep 08 21:34:35 2016 +0200 +++ b/url_image_preview/url_image_preview.py Thu Sep 08 21:40:58 2016 +0200 @@ -178,7 +178,8 @@ name = os.path.splitext(filename)[0] namehash = hashlib.sha1(special_text).hexdigest() newfilename = name + '_' + namehash + ext - thumbfilename = name + '_' + namehash + '_thumb' + ext + thumbfilename = name + '_' + namehash + '_thumb_' \ + + str(self.plugin.config['PREVIEW_SIZE']) + ext filepath = os.path.join(self.directory, newfilename) thumbpath = os.path.join(self.thumbpath, thumbfilename)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2016