Commits September 2016

commits@gajim.org

1 participants
78 discussions

gajim-plugins: Increased version number in manifest file
by Gajim Plugins 11 Sep '16

11 Sep '16

changeset e65f662864ef in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=e65f662864ef description: Increased version number in manifest file diffstat: url_image_preview/manifest.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1e5be57f67d4 -r e65f662864ef url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Thu Sep 08 21:40:58 2016 +0200 +++ b/url_image_preview/manifest.ini Thu Sep 08 21:47:10 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.9.4 +version: 0.9.5 description: Displays a preview of links to images authors = Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org>

1 0

gajim-plugins: Small bugfix for windows users and fixed some dem...
by Gajim Plugins 11 Sep '16

11 Sep '16

changeset ca88aaace650 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=ca88aaace650 description: Small bugfix for windows users and fixed some demandimport errors. Added correct license informations to the source files, too. diffstat: url_image_preview/__init__.py | 1 + url_image_preview/http_functions.py | 17 +++++++++++++++++ url_image_preview/url_image_preview.py | 27 +++++++++++++++++++++++---- 3 files changed, 41 insertions(+), 4 deletions(-) diffs (93 lines): diff -r e65f662864ef -r ca88aaace650 url_image_preview/__init__.py --- a/url_image_preview/__init__.py Thu Sep 08 21:47:10 2016 +0200 +++ b/url_image_preview/__init__.py Sun Sep 11 19:28:32 2016 +0200 @@ -1,1 +1,2 @@ +# simple redirect from url_image_preview import UrlImagePreviewPlugin diff -r e65f662864ef -r ca88aaace650 url_image_preview/http_functions.py --- a/url_image_preview/http_functions.py Thu Sep 08 21:47:10 2016 +0200 +++ b/url_image_preview/http_functions.py Sun Sep 11 19:28:32 2016 +0200 @@ -1,3 +1,20 @@ +# -*- coding: utf-8 -*- +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + import urllib2 import socket diff -r e65f662864ef -r ca88aaace650 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Thu Sep 08 21:47:10 2016 +0200 +++ b/url_image_preview/url_image_preview.py Sun Sep 11 19:28:32 2016 +0200 @@ -1,4 +1,19 @@ # -*- coding: utf-8 -*- +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## import gtk import gobject @@ -27,7 +42,7 @@ from common import demandimport demandimport.enable() -demandimport.ignore += ['_imp'] +demandimport.ignore += ['_imp', 'PIL'] log = logging.getLogger('gajim.plugin_system.url_image_preview') @@ -162,6 +177,9 @@ log.info("Not accepting URL for image preview: %s" % special_text) return + # 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() @@ -229,8 +247,6 @@ self._check_mime_size, [special_text, repl_start, repl_end, filepaths, key, iv, encrypted]) - # Don't print the URL in the message window (in the calling function) - self.textview.plugin_modified = True def _save_thumbnail(self, thumbpath, (mem, alt)): size = self.plugin.config['PREVIEW_SIZE'] @@ -566,7 +582,10 @@ helpers.launch_browser_mailer('url', url) def on_open_file_in_browser_menuitem_activate(self, menu, data): - filepath = "file://" + data["filepath"] + if os.name == "nt": + filepath = "file://" + os.path.abspath(data["filepath"]) + else: + filepath = "file://" + data["filepath"] if gajim.config.get('autodetect_browser_mailer') \ or gajim.config.get('custombrowser') == '': dialogs.ErrorDialog(

1 0

gajim-plugins: Add preview of map coordinates
by Gajim Plugins 08 Sep '16

08 Sep '16

changeset 0f55bb188e18 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=0f55bb188e18 description: Add preview of map coordinates Text messages that include geo coordinates in the format ex: geo:48.2057365,16.3435941 are converted to a preview of the location on Google Maps diffstat: set_location/manifest.ini | 3 +- set_location/set_location.py | 213 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 197 insertions(+), 19 deletions(-) diffs (truncated from 348 to 300 lines): diff -r 19bcffb26247 -r 0f55bb188e18 set_location/manifest.ini --- a/set_location/manifest.ini Thu Sep 08 00:09:16 2016 +0200 +++ b/set_location/manifest.ini Thu Sep 08 14:54:12 2016 +0200 @@ -1,9 +1,10 @@ [info] name: Set Location short_name: set_location -version: 0.7.2 +version: 0.8.0 description: Set information about the current geographical or physical location. To be able to specify a location on the built-in card, you must install python-osmgpsmap > 0.5 authors: Denis Fomin <fominde(a)gmail.com> + Philipp HÃ¶rist <philipp(a)hoerist.com> homepage: http://trac-plugins.gajim.org/wiki/SetLocalitionPlugin max_gajim_version: 0.16.9 diff -r 19bcffb26247 -r 0f55bb188e18 set_location/set_location.py --- a/set_location/set_location.py Thu Sep 08 00:09:16 2016 +0200 +++ b/set_location/set_location.py Thu Sep 08 14:54:12 2016 +0200 @@ -5,20 +5,31 @@ import time import gtk import os +import gobject +import urllib2 +import logging from plugins.gui import GajimPluginConfigDialog from plugins import GajimPlugin from plugins.helpers import log, log_calls from common import gajim from common import ged +from common import helpers +from common import configpaths +from conversation_textview import TextViewImage import gtkgui_helpers from dialogs import InputDialog, WarningDialog +log = logging.getLogger('gajim.plugin_system.set_location') + + class SetLocationPlugin(GajimPlugin): @log_calls('SetLocationPlugin') def init(self): self.config_dialog = SetLocationPluginConfigDialog(self) + self.gui_extension_points = { + 'print_special_text': (self.print_special_text, None)} self.config_default_values = { 'alt': (1609, ''), 'area': ('Central Park', ''), @@ -38,10 +49,14 @@ 'uri': ('http://beta.plazes.com/plazes/1940:jabber_inc', ''), 'presets': ({'default': {}}, ''), } + self.thumbpath = os.path.join(configpaths.gajimpaths['MY_CACHE'], + 'downloads.thumb') + self.create_path(self.thumbpath) + @log_calls('SetLocationPlugin') def activate(self): gajim.ged.register_event_handler('signed-in', ged.POSTGUI, - self.on_signed_in) + self.on_signed_in) self.send_locations() @log_calls('SetLocationPlugin') @@ -50,11 +65,153 @@ for acct in gajim.connections: gajim.connections[acct].send_location(self._data) gajim.ged.remove_event_handler('signed-in', ged.POSTGUI, - self.on_signed_in) + self.on_signed_in) def on_signed_in(self, network_event): self.send_locations(network_event.conn.name) + def print_special_text(self, tv, special_text, other_tags, graphics=True, + iter_=None): + conv_textview = tv + textview = tv.tv + # geo:48.2057365,16.3435941 + if not special_text.startswith('geo:'): + return + + buffer_ = textview.get_buffer() + if not iter_: + iter_ = buffer_.get_end_iter() + + # Show URL, until image is loaded (if ever) + ttt = buffer_.get_tag_table() + repl_start = buffer_.create_mark(None, iter_, True) + buffer_.insert_with_tags(iter_, special_text, + *[(ttt.lookup(t) if isinstance(t, str) else t) for t in ["url"]]) + repl_end = buffer_.create_mark(None, iter_, True) + + zoom = 17 + size = 200 + color = 'blue' + + coordinates = special_text.split(':')[1] + + lat = coordinates.split(',')[0] + lon = coordinates.split(',')[1] + + if not (len(lat) == 10 and len(lon) == 10): + return + + filename = coordinates.replace(',', '_').replace('.', '-') + filepath = os.path.join(self.thumbpath, filename) + + url = 'https://maps.googleapis.com/maps/api/staticmap?center={}' \ + '&zoom={}&size={}x{}&markers=color:{}' \ + '|label:S|{}'.format(coordinates, zoom, size, size, + color, coordinates) + + weburl = 'https://www.google.at/maps/place/{}'.format(coordinates) + + log.debug(url) + + if os.path.exists(filepath): + gajim.thread_interface( + self.load_thumbnail, [filepath], + self.updatechat, [weburl, repl_start, repl_end, textview]) + else: + gajim.thread_interface( + self.download, [url, filepath], + self.updatechat, [weburl, repl_start, repl_end, textview]) + + # Don't print the URL in the message window (in the calling function) + conv_textview.plugin_modified = True + + def updatechat(self, data, weburl, repl_start, repl_end, textview): + if data: + try: + log.debug(weburl) + eb = gtk.EventBox() + eb.connect('button-press-event', self.on_button_press_event, + weburl) + eb.connect('enter-notify-event', self.on_enter_event, + textview) + eb.connect('leave-notify-event', self.on_leave_event, + textview) + + # this is threadsafe + # (gtk textview is NOT threadsafe by itself!!) + def add_to_textview(): + try: # textview closed in the meantime etc. + buffer_ = repl_start.get_buffer() + iter_ = buffer_.get_iter_at_mark(repl_start) + buffer_.insert(iter_, "\n") + anchor = buffer_.create_child_anchor(iter_) + # Use weburl as tooltip for image + img = TextViewImage(anchor, weburl) + + loader = gtk.gdk.PixbufLoader() + loader.write(data) + loader.close() + pixbuf = loader.get_pixbuf() + img.set_from_pixbuf(pixbuf) + + eb.add(img) + eb.show_all() + textview.add_child_at_anchor(eb, anchor) + buffer_.delete(iter_, + buffer_.get_iter_at_mark(repl_end)) + except: + pass + return False + # add to mainloop --> make call threadsafe + gobject.idle_add(add_to_textview) + except Exception: + # URL is already displayed + log.error('Could not display image for URL: %s' + % weburl) + raise + else: + # If image could not be downloaded, URL is already displayed + log.error('Could not download image for URL: %s -- %s' + % weburl) + + def download(self, url, filepath): + """ + Download a file. This function should + be launched in a separated thread. + """ + log.debug('Getting map thumbnail ..') + try: + req = urllib2.Request(url) + req.add_header('User-Agent', 'Gajim') + f = urllib2.urlopen(req) + except Exception as ex: + log.debug('Error loading file %s ' + % str(ex)) + else: + try: + temp = f.read() + with open(filepath, "wb") as local_file: + local_file.write(temp) + local_file.closed + log.debug('Saved map thumbnail ..') + except Exception as ex: + log.exception('Error: ') + if temp: + return temp + + def load_thumbnail(self, filepath): + with open(filepath, 'rb') as f: + data = f.read() + f.closed + log.debug('Load map thumbnail') + return data + + def create_path(self, folder): + if os.path.exists(folder): + return + log.debug("creating folder '%s'" % folder) + os.mkdir(folder, 0o700) + def send_locations(self, acct=False): self._data = {} timestamp = time.time() @@ -65,22 +222,38 @@ self._data[name] = self.config[name] if not acct: - #set geo for all accounts + # set geo for all accounts for acct in gajim.connections: if gajim.config.get_per('accounts', acct, 'publish_location'): gajim.connections[acct].send_location(self._data) elif gajim.config.get_per('accounts', acct, 'publish_location'): gajim.connections[acct].send_location(self._data) + # Change mouse pointer to HAND2 when + # mouse enter the eventbox with the image + def on_enter_event(self, eb, event, tv): + tv.get_window( + gtk.TEXT_WINDOW_TEXT).set_cursor(gtk.gdk.Cursor(gtk.gdk.HAND2)) + + # Change mouse pointer to default when mouse leaves the eventbox + def on_leave_event(self, eb, event, tv): + tv.get_window( + gtk.TEXT_WINDOW_TEXT).set_cursor(gtk.gdk.Cursor(gtk.gdk.XTERM)) + + def on_button_press_event(self, eb, event, url): + # left click + if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1: + helpers.launch_browser_mailer('url', url) + class SetLocationPluginConfigDialog(GajimPluginConfigDialog): def init(self): self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path( - 'config_dialog.ui') + 'config_dialog.ui') self.xml = gtk.Builder() self.xml.set_translation_domain('gajim_plugins') self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, - ['hbox1', 'image1', 'image2']) + ['hbox1', 'image1', 'image2']) hbox = self.xml.get_object('hbox1') self.child.pack_start(hbox) self.xml.connect_signals(self) @@ -93,7 +266,7 @@ cellrenderer = gtk.CellRendererText() self.preset_combo.pack_start(cellrenderer, True) self.preset_combo.add_attribute(cellrenderer, 'text', 0) - #self.plugin.config['presets'] = {'default': {}} + # self.plugin.config['presets'] = {'default': {}} @log_calls('SetLocationPlugin.SetLocationPluginConfigDialog') def on_run(self): @@ -127,7 +300,7 @@ self.osm = osmgpsmap.GpsMap() self.osm.layer_add(osmgpsmap.GpsMapOsd(show_dpad=True, - show_zoom=True)) + show_zoom=True)) self.osm.layer_add(DummyLayer()) lat = self.plugin.config['lat'] lon = self.plugin.config['lon'] @@ -142,9 +315,10 @@ self.path_to_image, 16, 16) self.osm.connect('button_release_event', self.map_clicked) vbox.pack_start(self.osm, expand=True, fill=True, padding=6) - label = gtk.Label(_( - 'Click the right mouse button to specify the location, \n'\ - 'middle mouse button to show / hide the contacts on the map')) + label = gtk.Label( + _('Click the right mouse button to specify the location, \n' + 'middle mouse button to show / ' + 'hide the contacts on the map')) vbox.pack_start(label, expand=False, fill=False, padding=6) self.is_active = True self.images = [] @@ -185,7 +359,7 @@ try: self.lat = float(lat) self.lon = float(lon) - except ValueError, e:

1 0

gajim-plugins: Add encrypted file upload for windows
by Gajim Plugins 07 Sep '16

07 Sep '16

changeset 876860d118c4 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: gtk3 details:gajim-plugins?cmd=changeset;node=876860d118c4 description: Add encrypted file upload for windows diffstat: httpupload/httpupload.py | 32 ++++++++++++++++++++------------ httpupload/manifest.ini | 2 +- 2 files changed, 21 insertions(+), 13 deletions(-) diffs (73 lines): diff -r fb518dfcbc82 -r 876860d118c4 httpupload/httpupload.py --- a/httpupload/httpupload.py Sun Sep 04 23:56:22 2016 +0200 +++ b/httpupload/httpupload.py Thu Sep 08 00:55:30 2016 +0200 @@ -38,19 +38,21 @@ log = logging.getLogger('gajim.plugin_system.httpupload') -if os.name != 'nt': - try: +try: + if os.name == 'nt': + from cryptography.hazmat.backends.openssl import backend + else: from cryptography.hazmat.backends import default_backend - from cryptography.hazmat.primitives.ciphers import Cipher - from cryptography.hazmat.primitives.ciphers import algorithms - from cryptography.hazmat.primitives.ciphers.modes import GCM - encryption_available = True - except Exception as e: - log.debug(e) - encryption_available = False -else: + from cryptography.hazmat.primitives.ciphers import Cipher + from cryptography.hazmat.primitives.ciphers import algorithms + from cryptography.hazmat.primitives.ciphers.modes import GCM + encryption_available = True +except Exception as e: + DEP_MSG = 'For encryption of files, ' \ + 'please install python-cryptography!' + log.debug('Cryptography Import Error: ' + str(e)) + log.info('Decryption/Encryption disabled due to errors') encryption_available = False - log.info('Cryptography not available on Windows for now') # XEP-0363 (http://xmpp.org/extensions/xep-0363.html) NS_HTTPUPLOAD = 'urn:xmpp:http:upload' @@ -65,6 +67,8 @@ @log_calls('HttpuploadPlugin') def init(self): + if not encryption_available: + self.available_text = DEP_MSG self.config_dialog = None # HttpuploadPluginConfigDialog(self) self.controls = [] self.events_handlers = {} @@ -466,10 +470,14 @@ self.encrypted_upload = encrypted_upload self.backing.seek(0, os.SEEK_END) if self.encrypted_upload: + if os.name == 'nt': + self.backend = backend + else: + self.backend = default_backend() self.encryptor = Cipher( algorithms.AES(key), GCM(iv), - backend=default_backend()).encryptor() + backend=self.backend).encryptor() self._total = self.backing.tell() + TAGSIZE else: self._total = self.backing.tell() diff -r fb518dfcbc82 -r 876860d118c4 httpupload/manifest.ini --- a/httpupload/manifest.ini Sun Sep 04 23:56:22 2016 +0200 +++ b/httpupload/manifest.ini Thu Sep 08 00:55:30 2016 +0200 @@ -1,7 +1,7 @@ [info] name: HttpUpload short_name: httpupload -version: 0.5.1 +version: 0.5.2 description: This plugin is designed to send a file to a contact or muc by using httpupload. Your server must support <a href="http://xmpp.org/extensions/xep-0363.html">XEP-0363: HTTP Upload</a>. Conversations supported this.

1 0

gajim-plugins: Add encrypted file upload for windows
by Gajim Plugins 07 Sep '16

07 Sep '16

changeset 19bcffb26247 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=19bcffb26247 description: Add encrypted file upload for windows diffstat: httpupload/httpupload.py | 35 +++++++++++++++++++++-------------- httpupload/manifest.ini | 2 +- 2 files changed, 22 insertions(+), 15 deletions(-) diffs (84 lines): diff -r cfcbd0a94db0 -r 19bcffb26247 httpupload/httpupload.py --- a/httpupload/httpupload.py Wed Sep 07 23:21:17 2016 +0200 +++ b/httpupload/httpupload.py Thu Sep 08 00:09:16 2016 +0200 @@ -35,9 +35,8 @@ except: pil_available = False from io import BytesIO -import base64 + import binascii - from common import gajim from common import ged import chat_control @@ -49,19 +48,21 @@ log = logging.getLogger('gajim.plugin_system.httpupload') -if os.name != 'nt': - try: +try: + if os.name == 'nt': + from cryptography.hazmat.backends.openssl import backend + else: from cryptography.hazmat.backends import default_backend - from cryptography.hazmat.primitives.ciphers import Cipher - from cryptography.hazmat.primitives.ciphers import algorithms - from cryptography.hazmat.primitives.ciphers.modes import GCM - encryption_available = True - except Exception as e: - log.debug(e) - encryption_available = False -else: + from cryptography.hazmat.primitives.ciphers import Cipher + from cryptography.hazmat.primitives.ciphers import algorithms + from cryptography.hazmat.primitives.ciphers.modes import GCM + encryption_available = True +except Exception as e: + DEP_MSG = 'For encryption of files, ' \ + 'please install python-cryptography!' + log.debug('Cryptography Import Error: ' + str(e)) + log.info('Decryption/Encryption disabled due to errors') encryption_available = False - log.info('Cryptography not available on Windows for now') # XEP-0363 (http://xmpp.org/extensions/xep-0363.html) NS_HTTPUPLOAD = 'urn:xmpp:http:upload' @@ -78,6 +79,8 @@ @log_calls('HttpuploadPlugin') def init(self): + if not encryption_available: + self.available_text = DEP_MSG self.config_dialog = None # HttpuploadPluginConfigDialog(self) self.controls = [] self.events_handlers = {} @@ -571,10 +574,14 @@ self.encrypted_upload = encrypted_upload self.seek(0, os.SEEK_END) if self.encrypted_upload: + if os.name == 'nt': + self.backend = backend + else: + self.backend = default_backend() self.encryptor = Cipher( algorithms.AES(key), GCM(iv), - backend=default_backend()).encryptor() + backend=self.backend).encryptor() self._total = self.tell() + TAGSIZE else: self._total = self.tell() diff -r cfcbd0a94db0 -r 19bcffb26247 httpupload/manifest.ini --- a/httpupload/manifest.ini Wed Sep 07 23:21:17 2016 +0200 +++ b/httpupload/manifest.ini Thu Sep 08 00:09:16 2016 +0200 @@ -1,7 +1,7 @@ [info] name: HttpUpload short_name: httpupload -version: 0.4.0 +version: 0.4.1 description: This plugin is designed to send a file to a contact or muc by using httpupload. Your server must support <a href="http://xmpp.org/extensions/xep-0363.html">XEP-0363: HTTP Upload</a>. Conversations supported this.

1 0

gajim-plugins: Update manifest.ini
by Gajim Plugins 07 Sep '16

07 Sep '16

changeset cfcbd0a94db0 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=cfcbd0a94db0 description: Update manifest.ini diffstat: url_image_preview/manifest.ini | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 841632a6873a -r cfcbd0a94db0 url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Wed Sep 07 23:18:46 2016 +0200 +++ b/url_image_preview/manifest.ini Wed Sep 07 23:21:17 2016 +0200 @@ -2,8 +2,7 @@ name: Url image preview short_name: url_image_preview version: 0.9.4 -description: Url image preview in chatbox. - Displays a preview of links to images +description: Displays a preview of links to images authors = Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> Anders Sandblad <runeson(a)gmail.com>

1 0

gajim-plugins: Dont open webbrowser with xdg-open
by Gajim Plugins 07 Sep '16

07 Sep '16

changeset 3c5b28ee4b67 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=3c5b28ee4b67 description: Dont open webbrowser with xdg-open diffstat: url_image_preview/url_image_preview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r bb9d8ff387ef -r 3c5b28ee4b67 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Wed Sep 07 22:08:14 2016 +0200 +++ b/url_image_preview/url_image_preview.py Wed Sep 07 22:09:11 2016 +0200 @@ -510,7 +510,7 @@ clipboard.set_text(url) def on_open_link_in_browser_menuitem_activate(self, menu, url): - helpers.launch_file_manager(url) + helpers.launch_browser_mailer('url', url) # Change mouse pointer to HAND2 when # mouse enter the eventbox with the image

1 0

gajim-plugins: Satisfy pylint
by Gajim Plugins 07 Sep '16

07 Sep '16

changeset ab8d38d623ad in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=ab8d38d623ad description: Satisfy pylint diffstat: url_image_preview/url_image_preview.py | 116 ++++++++++++++++++++------------ 1 files changed, 71 insertions(+), 45 deletions(-) diffs (246 lines): diff -r 3c5b28ee4b67 -r ab8d38d623ad url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Wed Sep 07 22:09:11 2016 +0200 +++ b/url_image_preview/url_image_preview.py Wed Sep 07 22:31:02 2016 +0200 @@ -199,14 +199,15 @@ gajim.thread_interface( self._save_thumbnail, [thumbpath, (mem, '')], self._update_img, [special_text, repl_start, - repl_end, filepath, encrypted]) + repl_end, filepath, encrypted]) - # display thumbnail if already downloaded (but only if file also exists) + # display thumbnail if already downloadeded + # (but only if file also exists) elif os.path.exists(filepath) and os.path.exists(thumbpath): gajim.thread_interface( self._load_thumbnail, [thumbpath], self._update_img, [special_text, repl_start, - repl_end, filepath, encrypted]) + repl_end, filepath, encrypted]) # or download file, calculate thumbnail and finally display it else: @@ -237,12 +238,14 @@ except Exception as e: if output: output.close() - log.info("Failed to load image using pillow, falling back to gdk pixbuf.") + log.info("Failed to load image using pillow, " + "falling back to gdk pixbuf.") log.debug(e) use_gtk = True if use_gtk: - log.info("Pillow not available or file corrupt, trying to load using gdk pixbuf.") + log.info("Pillow not available or file corrupt, " + "trying to load using gdk pixbuf.") try: output = BytesIO() loader = gtk.gdk.PixbufLoader() @@ -250,14 +253,17 @@ loader.close() pixbuf = loader.get_pixbuf() pixbuf, w, h = self._get_pixbuf_of_size(pixbuf, size) + def cb(buf, data=None): output.write(buf) return True + pixbuf.save_to_callback(cb, "jpeg", {"quality": "100"}) except Exception as e: if output: output.close() - log.info("Failed to load image using gdk pixbuf, ignoring image.") + log.info("Failed to load image using gdk pixbuf, " + "ignoring image.") log.debug(e) return ('', '') @@ -267,10 +273,12 @@ self._create_path(os.path.dirname(thumbpath)) self._write_file(thumbpath, mem) except Exception as e: - dialogs.ErrorDialog(_('Could not save file'), - _('Exception raised while saving thumbnail for image file' - ' (see error log for more information)'), - transient_for=self.chat_control.parent_win.window) + dialogs.ErrorDialog( + _('Could not save file'), + _('Exception raised while saving thumbnail ' + 'for image file (see error log for more ' + 'information)'), + transient_for=self.chat_control.parent_win.window) log.error(str(e)) return (mem, alt) @@ -290,7 +298,8 @@ log.error("Failed to write file '%s'!" % path) raise - def _update_img(self, (mem, alt), url, repl_start, repl_end, filepath, encrypted): + def _update_img(self, (mem, alt), url, repl_start, repl_end, + filepath, encrypted): if mem: try: urlparts = urlparse(url) @@ -321,7 +330,8 @@ eb.add(img) eb.show_all() self.textview.tv.add_child_at_anchor(eb, anchor) - buffer_.delete(iter_, buffer_.get_iter_at_mark(repl_end)) + buffer_.delete(iter_, + buffer_.get_iter_at_mark(repl_end)) except: pass return False @@ -367,7 +377,8 @@ gajim.thread_interface( self._download_image, [self.textview.account, attributes, encrypted], - self._update_img, [url, repl_start, repl_end, filepaths[0], encrypted]) + self._update_img, [url, repl_start, repl_end, + filepaths[0], encrypted]) def _download_image(self, account, attributes, encrypted): filepath = attributes['filepaths'][0] @@ -384,10 +395,11 @@ # Write file to harddisk self._write_file(filepath, mem) except Exception as e: - dialogs.ErrorDialog(_('Could not save file'), - _('Exception raised while saving image file' - ' (see error log for more information)'), - transient_for=self.chat_control.parent_win.window) + dialogs.ErrorDialog( + _('Could not save file'), + _('Exception raised while saving image file' + ' (see error log for more information)'), + transient_for=self.chat_control.parent_win.window) log.error(str(e)) # Create thumbnail, write it to harddisk and return it @@ -429,7 +441,8 @@ 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, filepath, original_filename, + url, encrypted): xml = gtk.Builder() xml.set_translation_domain('gajim_plugins') xml.add_from_file(self.plugin.local_file_path('context_menu.ui')) @@ -437,22 +450,26 @@ open_menuitem = xml.get_object('open_menuitem') save_as_menuitem = xml.get_object('save_as_menuitem') - copy_link_location_menuitem = xml.get_object('copy_link_location_menuitem') - open_link_in_browser_menuitem = xml.get_object('open_link_in_browser_menuitem') + copy_link_location_menuitem = \ + xml.get_object('copy_link_location_menuitem') + open_link_in_browser_menuitem = \ + xml.get_object('open_link_in_browser_menuitem') if encrypted: open_link_in_browser_menuitem.hide() - id_ = open_menuitem.connect('activate', self.on_open_menuitem_activate, filepath) + id_ = open_menuitem.connect( + 'activate', self.on_open_menuitem_activate, filepath) self.handlers[id_] = open_menuitem - id_ = save_as_menuitem.connect('activate', self.on_save_as_menuitem_activate, - filepath, original_filename) + id_ = save_as_menuitem.connect( + 'activate', self.on_save_as_menuitem_activate, + filepath, original_filename) self.handlers[id_] = save_as_menuitem - id_ = copy_link_location_menuitem.connect('activate', - self.on_copy_link_location_menuitem_activate, url) + id_ = copy_link_location_menuitem.connect( + 'activate', self.on_copy_link_location_menuitem_activate, url) self.handlers[id_] = copy_link_location_menuitem - id_ = open_link_in_browser_menuitem.connect('activate', - self.on_open_link_in_browser_menuitem_activate, url) + id_ = open_link_in_browser_menuitem.connect( + 'activate', self.on_open_link_in_browser_menuitem_activate, url) self.handlers[id_] = open_link_in_browser_menuitem return menu @@ -473,37 +490,44 @@ # check if we have write permissions if not os.access(target_path, os.W_OK): file_name = os.path.basename(target_path) - dialogs.ErrorDialog(_('Cannot overwrite existing file "%s"') % \ - file_name, _('A file with this name already exists and you ' - 'do not have permission to overwrite it.')) + dialogs.ErrorDialog( + _('Cannot overwrite existing file "%s"') % file_name, + _('A file with this name already exists and you do ' + 'not have permission to overwrite it.')) return dialog2 = dialogs.FTOverwriteConfirmationDialog( - _('This file already exists'), _('What do you want to do?'), - propose_resume=False, on_response=(on_continue, target_path), + _('This file already exists'), + _('What do you want to do?'), + propose_resume=False, + on_response=(on_continue, target_path), transient_for=dialog) dialog2.set_destroy_with_parent(True) else: dirname = os.path.dirname(target_path) if not os.access(dirname, os.W_OK): - dialogs.ErrorDialog(_('Directory "%s" is not writable') % \ - dirname, _('You do not have permission to create files in ' - 'this directory.')) + dialogs.ErrorDialog( + _('Directory "%s" is not writable') % dirname, + _('You do not have permission to ' + 'create files in this directory.')) return on_continue(0, target_path) def on_cancel(widget): dialog.destroy() - dialog = dialogs.FileChooserDialog(title_text=_('Save Image as...'), - action=gtk.FILE_CHOOSER_ACTION_SAVE, buttons=(gtk.STOCK_CANCEL, - gtk.RESPONSE_CANCEL, gtk.STOCK_SAVE, gtk.RESPONSE_OK), + dialog = dialogs.FileChooserDialog( + title_text=_('Save Image as...'), + action=gtk.FILE_CHOOSER_ACTION_SAVE, + buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_SAVE, gtk.RESPONSE_OK), default_response=gtk.RESPONSE_OK, - current_folder=gajim.config.get('last_save_dir'), on_response_ok=on_ok, + current_folder=gajim.config.get('last_save_dir'), + on_response_ok=on_ok, on_response_cancel=on_cancel) dialog.set_current_name(original_filename) dialog.connect('delete-event', lambda widget, event: - on_cancel(widget)) + on_cancel(widget)) def on_copy_link_location_menuitem_activate(self, menu, url): clipboard = gtk.Clipboard() @@ -524,13 +548,15 @@ gtk.TEXT_WINDOW_TEXT).set_cursor(gtk.gdk.Cursor(gtk.gdk.XTERM)) def on_button_press_event(self, eb, event, filepath, - original_filename, url, encrypted): - if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1: # left click + original_filename, url, encrypted): + # left click + if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1: helpers.launch_file_manager(filepath) - elif event.type == gtk.gdk.BUTTON_PRESS and event.button == 3: #right klick + # 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.attach_to_widget(self.tv, None) + original_filename, url, encrypted) + # menu.attach_to_widget(self.tv, None) menu.popup(None, None, None, event.button, event.time) def disconnect_from_chat_control(self):

1 0

gajim-plugins: Add icons to context menu
by Gajim Plugins 07 Sep '16

07 Sep '16

changeset 077431a5dbf5 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=077431a5dbf5 description: Add icons to context menu diffstat: url_image_preview/context_menu.ui | 52 ++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 11 deletions(-) diffs (92 lines): diff -r ab8d38d623ad -r 077431a5dbf5 url_image_preview/context_menu.ui --- a/url_image_preview/context_menu.ui Wed Sep 07 22:31:02 2016 +0200 +++ b/url_image_preview/context_menu.ui Wed Sep 07 23:01:26 2016 +0200 @@ -1,25 +1,49 @@ <?xml version="1.0" encoding="UTF-8"?> - <interface> <requires lib="gtk+" version="2.16"/> +  + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-open</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-save-as</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-copy</property> + </object> + <object class="GtkImage" id="image4"> + <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> <object class="GtkImageMenuItem" id="open_menuitem"> - <property name="use_stock">True</property> - <property name="always_show_image">True</property> + <property name="label" translatable="yes">_Open</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Open</property> <property name="use_underline">True</property> + <property name="image">image1</property> + <property name="use_stock">False</property> + <property name="always_show_image">True</property> </object> </child> <child> - <object class="GtkMenuItem" id="save_as_menuitem"> + <object class="GtkImageMenuItem" id="save_as_menuitem"> + <property name="label" translatable="yes">_Save as</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Save as</property> <property name="use_underline">True</property> + <property name="image">image2</property> + <property name="use_stock">False</property> + <property name="always_show_image">True</property> </object> </child> <child> @@ -29,20 +53,26 @@ </object> </child> <child> - <object class="GtkMenuItem" id="copy_link_location_menuitem"> + <object class="GtkImageMenuItem" id="copy_link_location_menuitem"> + <property name="label" translatable="yes">_Copy Link Location</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Copy Link Location</property> <property name="use_underline">True</property> + <property name="image">image3</property> + <property name="use_stock">False</property> + <property name="always_show_image">True</property> </object> </child> <child> - <object class="GtkMenuItem" id="open_link_in_browser_menuitem"> + <object class="GtkImageMenuItem" id="open_link_in_browser_menuitem"> + <property name="label" translatable="yes">Open Link in _Browser</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Open Link in _Browser</property> <property name="use_underline">True</property> + <property name="image">image4</property> + <property name="use_stock">False</property> + <property name="always_show_image">True</property> </object> </child> </object> -</interface> \ No newline at end of file +</interface>

1 0

gajim-plugins: Update manifest.ini
by Gajim Plugins 07 Sep '16

07 Sep '16

changeset 841632a6873a in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=841632a6873a description: Update manifest.ini diffstat: url_image_preview/manifest.ini | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 8738c57fba91 -r 841632a6873a url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Wed Sep 07 23:07:58 2016 +0200 +++ b/url_image_preview/manifest.ini Wed Sep 07 23:18:46 2016 +0200 @@ -1,9 +1,9 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.9.3 +version: 0.9.4 description: Url image preview in chatbox. - Based on patch in <a href="http://trac.gajim.org/attachment/ticket/5300">ticket #5300</a>. + Displays a preview of links to images authors = Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> Anders Sandblad <runeson(a)gmail.com>

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