hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[set_location] Adapt to Gajim changes

Browse Source
This commit is contained in:
lovetox
2020-05-02 10:10:18 +02:00
parent 2f250b2cd2
commit c46ef69b61
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
set_location/set_location.py
View File

@@ -2,9 +2,11 @@ import os
import time import time
import logging import logging
from datetime import datetime from datetime import datetime
from pathlib import Path
import gi import gi
from gi.repository import Gtk from gi.repository import Gtk
from nbxmpp.structs import LocationData
from gajim.plugins.gui import GajimPluginConfigDialog from gajim.plugins.gui import GajimPluginConfigDialog
from gajim.plugins import GajimPlugin from gajim.plugins import GajimPlugin
@@ -15,7 +17,6 @@ from gajim.common import ged
from gajim.common import helpers from gajim.common import helpers
from gajim.common import configpaths from gajim.common import configpaths
from gajim import gtkgui_helpers
from gajim.gtk.dialogs import InputDialog, WarningDialog from gajim.gtk.dialogs import InputDialog, WarningDialog
@@ -73,7 +74,7 @@ class SetLocationPlugin(GajimPlugin):
def deactivate(self): def deactivate(self):
self._data = {} self._data = {}
for acct in app.connections: for acct in app.connections:
app.connections[acct].get_module('UserLocation').send(self._data) app.connections[acct].get_module('UserLocation').set_location(None)
app.ged.remove_event_handler('signed-in', ged.POSTGUI, app.ged.remove_event_handler('signed-in', ged.POSTGUI,
self.on_signed_in) self.on_signed_in)
@@ -87,16 +88,19 @@ class SetLocationPlugin(GajimPlugin):
timestamp = timestamp.strftime('%Y-%m-%dT%H:%M:%SZ') timestamp = timestamp.strftime('%Y-%m-%dT%H:%M:%SZ')
self._data['timestamp'] = timestamp self._data['timestamp'] = timestamp
for name in self.config_default_values: for name in self.config_default_values:
if name == 'presets':
continue
self._data[name] = self.config[name] self._data[name] = self.config[name]
if not acct: if not acct:
# Set geo for all accounts # Set geo for all accounts
for acct in app.connections: for acct in app.connections:
if app.config.get_per('accounts', acct, 'publish_location'): if app.config.get_per('accounts', acct, 'publish_location'):
app.connections[acct].get_module('UserLocation').send( app.connections[acct].get_module('UserLocation').set_location(
self._data) LocationData(**self._data))
elif app.config.get_per('accounts', acct, 'publish_location'): elif app.config.get_per('accounts', acct, 'publish_location'):
app.connections[acct].get_module('UserLocation').send(self._data) app.connections[acct].get_module('UserLocation').set_location(
LocationData(**self._data))
class SetLocationPluginConfigDialog(GajimPluginConfigDialog): class SetLocationPluginConfigDialog(GajimPluginConfigDialog):
@@ -167,15 +171,17 @@ class SetLocationPluginConfigDialog(GajimPluginConfigDialog):
self.xml.get_object('lon').set_text('0.0') self.xml.get_object('lon').set_text('0.0')
self.view.center_on(self.lat, self.lon) self.view.center_on(self.lat, self.lon)
self.path_to_image = os.path.abspath(gtkgui_helpers.get_icon_path( icon = 'org.gajim.Gajim.svg'
'org.gajim.Gajim', 16)) icons_dir = Path(configpaths.get('ICONS')) / 'hicolor/scalable/apps'
self.path_to_image = icons_dir / icon
map_box.pack_start(embed, expand=True, fill=True, padding=0) map_box.pack_start(embed, expand=True, fill=True, padding=0)
self.is_active = True self.is_active = True
self.layer = Champlain.MarkerLayer() self.layer = Champlain.MarkerLayer()
texture = Clutter.Texture() texture = Clutter.Texture()
texture.set_from_file(self.path_to_image) texture.set_from_file(str(self.path_to_image))
texture.set_size(32,32) texture.set_size(32, 32)
self.marker = Champlain.Label.new_with_image(texture) self.marker = Champlain.Label.new_with_image(texture)
self.marker.set_location(self.lat, self.lon) self.marker.set_location(self.lat, self.lon)
self.marker.set_text(_('Your location')) self.marker.set_text(_('Your location'))