Philipp Hörist pushed to branch master at gajim / gajim
Commits:
d127e301 by lovetox at 2020-08-26T06:39:44+02:00
Settings: Ignore obsolete soundevents when migrating
Fixes #10241
- - - - -
1 changed file:
- gajim/common/settings.py
Changes:
=====================================
gajim/common/settings.py
=====================================
@@ -272,6 +272,10 @@ class _Settings:
def _migrate_soundevent_settings(self) -> None:
soundevent_settings = app.config.get_all_per('soundevents')
for soundevent, settings in list(soundevent_settings.items()):
+ if soundevent not in DEFAULT_SOUNDEVENT_SETTINGS:
+ del soundevent_settings[soundevent]
+ continue
+
for setting, value in list(settings.items()):
if DEFAULT_SOUNDEVENT_SETTINGS[soundevent][setting] == value:
del soundevent_settings[soundevent][setting]
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d127e30122f0376f381dfdd05f71d4ad…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d127e30122f0376f381dfdd05f71d4ad…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
d4b25c23 by Daniel Brötzmann at 2020-08-25T20:49:28+02:00
Use GTK emoji chooser on Linux
- - - - -
3 changed files:
- gajim/chat_control_base.py
- gajim/gtk/emoji_chooser.py
- gajim/gui_interface.py
Changes:
=====================================
gajim/chat_control_base.py
=====================================
@@ -24,6 +24,7 @@
# along with Gajim. If not, see <http://www.gnu.org/licenses/>.
import os
+import sys
import time
import uuid
import tempfile
@@ -504,7 +505,10 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper):
return Gdk.EVENT_STOP
if action == 'show-emoji-chooser':
- self.xml.emoticons_button.get_popover().show()
+ if sys.platform in ('win32', 'darwin'):
+ self.xml.emoticons_button.get_popover().show()
+ return Gdk.EVENT_STOP
+ self.msg_textview.emit('insert-emoji')
return Gdk.EVENT_STOP
if action == 'copy-text':
@@ -1207,8 +1211,20 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper):
if not self.parent_win:
return
- emoji_chooser.text_widget = self.msg_textview
- self.xml.emoticons_button.set_popover(emoji_chooser)
+ if sys.platform in ('win32', 'darwin'):
+ emoji_chooser.text_widget = self.msg_textview
+ self.xml.emoticons_button.set_popover(emoji_chooser)
+ return
+
+ self.xml.emoticons_button.set_sensitive(True)
+ self.xml.emoticons_button.connect('clicked',
+ self._on_emoticon_button_clicked)
+
+ def _on_emoticon_button_clicked(self, _widget):
+ self.msg_textview.remove_placeholder()
+ # Present GTK emoji chooser (not cross platform compatible)
+ self.msg_textview.emit('insert-emoji')
+ self.xml.emoticons_button.set_property('active', False)
def on_color_menuitem_activate(self, _widget):
color_dialog = Gtk.ColorChooserDialog(None, self.parent_win.window)
=====================================
gajim/gtk/emoji_chooser.py
=====================================
@@ -12,7 +12,6 @@
# You should have received a copy of the GNU General Public License
# along with Gajim. If not, see <http://www.gnu.org/licenses/>.
-import sys
import logging
import weakref
from pathlib import Path
@@ -304,13 +303,8 @@ class EmojiChooser(Gtk.Popover):
theme = app.settings.get('emoticons_theme')
themes = helpers.get_available_emoticon_themes()
if theme not in themes:
- if sys.platform not in ('win32', 'darwin'):
- app.settings.set('emoticons_theme', 'font')
- theme = 'font'
- else:
- # Win/Mac fallback to noto
- app.settings.set('emoticons_theme', 'noto')
- theme = 'noto'
+ app.settings.set('emoticons_theme', 'noto')
+ theme = 'noto'
return theme
@staticmethod
=====================================
gajim/gui_interface.py
=====================================
@@ -2088,9 +2088,10 @@ class Interface:
from gajim.gtk import statusicon
self.systray = statusicon.StatusIcon()
- # Init emoji_chooser
- from gajim.gtk.emoji_chooser import emoji_chooser
- emoji_chooser.load()
+ if sys.platform in ('win32', 'darwin'):
+ from gajim.gtk.emoji_chooser import emoji_chooser
+ emoji_chooser.load()
+
self.make_regexps()
# get transports type from DB
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d4b25c230f6b6c3b0146b5415708ae08…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d4b25c230f6b6c3b0146b5415708ae08…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch settings at gajim / gajim
Commits:
1a207b66 by lovetox at 2020-08-24T11:57:57+02:00
Migrate app.config.get_per('accounts')
- - - - -
ee41b6ef by lovetox at 2020-08-24T11:58:09+02:00
Migrate app.config.get_per('proxies')
- - - - -
0706d03f by lovetox at 2020-08-24T11:58:09+02:00
Migrate app.config.get per('statusmsg')
- - - - -
7d2519b4 by lovetox at 2020-08-24T11:58:09+02:00
PluginManager: Use new settings API
- - - - -
61bd7d28 by lovetox at 2020-08-24T11:58:09+02:00
AdvancedConfig: Port to new settings API
- - - - -
30 changed files:
- gajim/app_actions.py
- gajim/application.py
- gajim/chat_control.py
- gajim/chat_control_base.py
- gajim/command_system/implementation/standard.py
- gajim/common/app.py
- gajim/common/client.py
- gajim/common/contacts.py
- gajim/common/dbus/location.py
- gajim/common/helpers.py
- gajim/common/jingle_transport.py
- gajim/common/logger.py
- gajim/common/modules/bytestream.py
- gajim/common/modules/entity_time.py
- gajim/common/modules/http_auth.py
- gajim/common/modules/last_activity.py
- gajim/common/modules/mam.py
- gajim/common/modules/message.py
- gajim/common/modules/presence.py
- gajim/common/modules/receipts.py
- gajim/common/modules/roster.py
- gajim/common/modules/software_version.py
- gajim/common/modules/user_avatar.py
- gajim/common/modules/user_nickname.py
- gajim/common/modules/user_tune.py
- gajim/common/modules/vcard_avatars.py
- gajim/common/modules/vcard_temp.py
- gajim/common/passwords.py
- gajim/common/zeroconf/connection_zeroconf.py
- gajim/data/gui/advanced_configuration.ui
The diff was not included because it is too large.
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b9e535ee3359daca10e96cbdcd5469c…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b9e535ee3359daca10e96cbdcd5469c…
You're receiving this email because of your account on dev.gajim.org.