Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
704638e5 by wurstsalat at 2023-10-19T12:13:39+02:00
cq: Config: Add hint for legacy config
- - - - -
13f798c6 by wurstsalat at 2023-10-19T12:13:39+02:00
cfix: ChatBanner: Use correct tooltip for contact/group chat
- - - - -
3 changed files:
- gajim/common/config.py
- gajim/data/gui/chat_banner.ui
- gajim/gtk/chat_banner.py
Changes:
=====================================
gajim/common/config.py
=====================================
@@ -34,8 +34,6 @@
from enum import IntEnum
from enum import unique
-from gi.repository import GLib
-
import gajim
@@ -55,6 +53,10 @@ class Option(IntEnum):
opt_color = ['color',
r'(#[0-9a-fA-F]{6})|rgb\(\d+,\d+,\d+\)|rgba\(\d+,\d+,\d+,[01]\.?\d*\)']
+# NOTE: THIS FILE CONTAINS LEGACY CONFIG OPTIONS.
+# IT IS USED FOR MIGRATION PURPOSES ONLY.
+# TO CHANGE SETTINGS, settings_values.py MUST BE USED.
+
class Config:
DEFAULT_ICONSET = 'dcraven'
=====================================
gajim/data/gui/chat_banner.ui
=====================================
@@ -269,7 +269,6 @@
<property name="can-focus">True</property>
<property name="focus-on-click">False</property>
<property name="receives-default">True</property>
- <property name="tooltip-text" translatable="yes">Share
Contact…</property>
<property name="valign">center</property>
<property name="popover">share_popover</property>
<signal name="clicked" handler="_on_share_clicked" swapped="no"/>
=====================================
gajim/gtk/chat_banner.py
=====================================
@@ -356,6 +356,10 @@ def _update_account_badge(self) -> None:
def _update_share_box(self) -> None:
assert self._contact is not None
+ if self._contact.is_groupchat:
+ self._ui.share_menu_button.set_tooltip_text(_('Share Group Chat…'))
+ else:
+ self._ui.share_menu_button.set_tooltip_text(_('Share Contact…'))
self._ui.share_menu_button.set_sensitive(
not self._contact.is_pm_contact)
self._ui.jid_label.set_text(str(self._contact.jid))
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/88b35d8c00c2d488efd9874a86b0926fc6b1101f...13f798c66a3b03df05429b7cf2ff14a0b8b47881
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/88b35d8c00c2d488efd9874a86b0926fc6b1101f...13f798c66a3b03df05429b7cf2ff14a0b8b47881
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
