Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
662817c8 by wurstsalat at 2021-02-17T09:36:27+01:00
ChatControlBase: Fix pipeline
- - - - -
1 changed file:
- gajim/chat_control_base.py
Changes:
=====================================
gajim/chat_control_base.py
=====================================
@@ -183,7 +183,7 @@ def __init__(self, parent_win, widget_name, contact, acct,
# inserted before the line break. This triggers the hscrollbar to show,
# see: https://gitlab.gnome.org/GNOME/gtk/-/issues/2384
# Using set_hscroll_policy(Gtk.Scrollable.Policy.NEVER) would cause bad
- # performance during resize, and prevent the window from being shrinked
+ # performance during resize, and prevent the window from being shrunk
# horizontally under certain conditions (applies to GroupchatControl)
hscrollbar = self.xml.conversation_scrolledwindow.get_hscrollbar()
hscrollbar.hide()
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/662817c893650a7775c27e51011c4cde…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/662817c893650a7775c27e51011c4cde…
You're receiving this email because of your account on dev.gajim.org.
Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
8031e049 by wurstsalat at 2021-02-16T23:58:00+01:00
ChatControlBase: Add workaround for hscrollbar
As soon as a line break occurs in Gtk.TextView with word-char wrapping enabled,
a hyphen character is automatically inserted before the line break. This triggers
the hscrollbar to show, see: https://gitlab.gnome.org/GNOME/gtk/-/issues/2384
- - - - -
3 changed files:
- gajim/chat_control_base.py
- gajim/data/gui/chat_control.ui
- gajim/data/gui/groupchat_control.ui
Changes:
=====================================
gajim/chat_control_base.py
=====================================
@@ -178,6 +178,16 @@ def __init__(self, parent_win, widget_name, contact, acct,
self.conv_textview.tv.connect('key-press-event',
self._on_conv_textview_key_press_event)
+ # This is a workaround: as soon as a line break occurs in Gtk.TextView
+ # with word-char wrapping enabled, a hyphen character is automatically
+ # inserted before the line break. This triggers the hscrollbar to show,
+ # see: https://gitlab.gnome.org/GNOME/gtk/-/issues/2384
+ # Using set_hscroll_policy(Gtk.Scrollable.Policy.NEVER) would cause bad
+ # performance during resize, and prevent the window from being shrinked
+ # horizontally under certain conditions (applies to GroupchatControl)
+ hscrollbar = self.xml.conversation_scrolledwindow.get_hscrollbar()
+ hscrollbar.hide()
+
self.xml.conversation_scrolledwindow.add(self.conv_textview.tv)
widget = self.xml.conversation_scrolledwindow.get_vadjustment()
widget.connect('changed', self.on_conversation_vadjustment_changed)
=====================================
gajim/data/gui/chat_control.ui
=====================================
@@ -621,7 +621,6 @@
<object class="GtkScrolledWindow" id="conversation_scrolledwindow">
<property name="height_request">60</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<property name="overlay_scrolling">False</property>
<signal name="edge-reached" handler="_on_edge_reached" swapped="no"/>
=====================================
gajim/data/gui/groupchat_control.ui
=====================================
@@ -261,7 +261,6 @@
<property name="height_request">60</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<property name="overlay_scrolling">False</property>
<signal name="edge-reached" handler="_on_edge_reached" swapped="no"/>
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8031e049a943219a69b7db906046a9c9…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8031e049a943219a69b7db906046a9c9…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
02b2e66c by lovetox at 2021-02-15T16:39:34+01:00
Remove unused imports
- - - - -
1 changed file:
- gajim/common/modules/vcard_temp.py
Changes:
=====================================
gajim/common/modules/vcard_temp.py
=====================================
@@ -16,8 +16,6 @@
from nbxmpp.namespaces import Namespace
-from gajim.common import app
-from gajim.common.nec import NetworkEvent
from gajim.common.modules.base import BaseModule
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02b2e66ce4c58819e180584b1a45594c…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02b2e66ce4c58819e180584b1a45594c…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
944600eb by lovetox at 2021-02-15T16:14:49+01:00
Profile: Check for PubSub instead of vcard-temp
- - - - -
1 changed file:
- gajim/application.py
Changes:
=====================================
gajim/application.py
=====================================
@@ -554,7 +554,7 @@ def _set_shortcuts(self):
self.set_accels_for_action(action, accels)
def _on_feature_discovered(self, event):
- if event.feature == Namespace.VCARD:
+ if event.feature == Namespace.PUBSUB:
action = '%s-profile' % event.account
self.lookup_action(action).set_enabled(True)
elif event.feature == Namespace.MAM_2:
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/944600ebee34e71ca80e224f7ef40619…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/944600ebee34e71ca80e224f7ef40619…
You're receiving this email because of your account on dev.gajim.org.
Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
a8111619 by wurstsalat at 2021-02-14T21:39:15+01:00
Stop early when handling connection-failed in handle_event
Fixes: #10436
- - - - -
1 changed file:
- gajim/gui_interface.py
Changes:
=====================================
gajim/gui_interface.py
=====================================
@@ -1185,16 +1185,16 @@ def add_event(self, account, jid, event):
self.roster.select_contact(bb_jid, bb_account)
def handle_event(self, account, fjid, type_):
+ if type_ in ('connection-lost', 'connection-failed'):
+ app.interface.roster.window.present()
+ return
+
w = None
ctrl = None
resource = app.get_resource_from_jid(fjid)
jid = app.get_jid_without_resource(fjid)
- if type_ == 'connection-lost':
- app.interface.roster.window.present()
- return
-
if type_ in ('printed_gc_msg', 'printed_marked_gc_msg', 'gc_msg'):
w = self.msg_win_mgr.get_window(jid, account)
if jid in self.minimized_controls[account]:
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8111619c2b0d1674ebf3b8bcb21193d…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8111619c2b0d1674ebf3b8bcb21193d…
You're receiving this email because of your account on dev.gajim.org.