Commits April 2020

commits@gajim.org

1 participants
117 discussions

[Git][gajim/gajim][master] CSS: Add show colors to default-dark.css
by Philipp Hörist 29 Apr '20

29 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9255aa0a by lovetox at 2020-04-29T06:46:14+02:00 CSS: Add show colors to default-dark.css - - - - - 1 changed file: - gajim/data/style/default-dark.css Changes: ===================================== gajim/data/style/default-dark.css ===================================== @@ -50,3 +50,15 @@ .gajim-search-highlight { color: rgb(30, 80, 80) } +.gajim-status-online { + color: rgb(102, 191, 16); +} +.gajim-status-away { + color: rgb(255, 133, 51); +} +.gajim-status-dnd { + color: rgb(230, 46, 0); +} +.gajim-status-offline { + color: rgb(154, 154, 154); +} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9255aa0ab9b46a9a1e7bcf6a06e0cf68… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9255aa0ab9b46a9a1e7bcf6a06e0cf68… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework chat tabs
by Philipp Hörist 28 Apr '20

28 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1b4a1f08 by lovetox at 2020-04-28T21:40:03+02:00 Rework chat tabs - Always show new avatars with status - Remove tabs advanced config options - Increase tabs width - - - - - 9 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/config.py - gajim/data/gui/message_window.ui - gajim/data/gui/preferences_window.ui - gajim/groupchat_control.py - gajim/gtk/preferences.py - gajim/message_window.py - gajim/privatechat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -60,7 +60,6 @@ from gajim import dialogs from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.add_contact import AddNewContactWindow -from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_cursor from gajim.gtk.util import format_mood from gajim.gtk.util import format_activity @@ -1025,7 +1024,7 @@ class ChatControl(ChatControlBase): jid = self.contact.jid num_unread = len(app.events.get_events( self.account, jid, ['printed_%s' % self._type, str(self._type)])) - if num_unread == 1 and not app.config.get('show_unread_tab_icon'): + if num_unread == 1: unread = '*' elif num_unread > 1: unread = '[' + str(num_unread) + ']' @@ -1038,42 +1037,13 @@ class ChatControl(ChatControlBase): label_str = '<b>' + unread + label_str + '</b>' return label_str - def get_tab_image(self, count_unread=True): - if self.resource: - jid = self.contact.get_full_jid() - else: - jid = self.contact.jid - - if app.config.get('show_avatar_in_tabs'): - scale = self.parent_win.window.get_scale_factor() - surface = app.contacts.get_avatar( - self.account, jid, AvatarSize.TAB, scale) - if surface is not None: - return surface - - if count_unread: - num_unread = len(app.events.get_events( - self.account, - jid, - ['printed_%s' % self._type, str(self._type)])) - else: - num_unread = 0 - - transport = None - if app.jid_is_transport(jid): - transport = app.get_transport_name_from_jid(jid) - - if num_unread and app.config.get('show_unread_tab_icon'): - icon_name = get_icon_name('event', transport=transport) - else: - contact = app.contacts.get_contact_with_highest_priority( - self.account, self.contact.jid) - if not contact or self.resource: - # For transient contacts - contact = self.contact - icon_name = get_icon_name(contact.show, transport=transport) - - return icon_name + def get_tab_image(self): + scale = self.parent_win.window.get_scale_factor() + return app.contacts.get_avatar(self.account, + self.contact.jid, + AvatarSize.ROSTER, + scale, + self.contact.show) def prepare_context_menu(self, hide_buttonbar_items=False): """ ===================================== gajim/chat_control_base.py ===================================== @@ -401,9 +401,8 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): # Return a markup'd label and optional Gtk.Color in a tuple like: # return (label_str, None) - def get_tab_image(self, count_unread=True): + def get_tab_image(self): # Return a suitable tab image for display. - # None clears any current label. return None def prepare_context_menu(self, hide_buttonbar_items=False): ===================================== gajim/common/config.py ===================================== @@ -180,7 +180,6 @@ class Config: 'muc_highlight_words': [opt_str, '', _('A list of words (semicolon separated) that will be highlighted in group chats.')], 'quit_on_roster_x_button': [opt_bool, False, _('If enabled, Gajim quits when clicking the X button of your Window Manager. This setting is taken into account only if the notification area icon is used.')], 'hide_on_roster_x_button': [opt_bool, False, _('If enabled, Gajim hides the contact list window when pressing the X button instead of minimizing into the notification area.')], - 'show_unread_tab_icon': [opt_bool, False, _('If enabled, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated.')], 'show_status_msgs_in_roster': [opt_bool, True, _('If enabled, Gajim will display the status message (if not empty) underneath the contact name in the contact list window.'), True], 'show_avatars_in_roster': [opt_bool, True, '', True], 'show_mood_in_roster': [opt_bool, True, '', True], @@ -232,7 +231,6 @@ class Config: 'ignore_incoming_attention': [opt_bool, False, _('If enabled, Gajim will ignore incoming attention requests (\'wizz\').')], 'remember_opened_chat_controls': [opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')], 'positive_184_ack': [opt_bool, False, _('If enabled, Gajim will display an icon to show that sent messages have been received by your contact.')], - 'show_avatar_in_tabs': [opt_bool, False, _('Show a mini avatar in chat window tabs and as the window\'s icon.')], 'use_keyring': [opt_bool, True, _('If enabled, Gajim will use the System\'s Keyring to store account passwords.')], 'remote_commands': [opt_bool, False, _('If enabled, Gajim will execute XEP-0146 Commands.')], 'dark_theme': [opt_int, 2, _('2: System, 1: Enabled, 0: Disabled')], ===================================== gajim/data/gui/message_window.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkEventBox" id="chat_tab_ebox"> @@ -8,6 +8,7 @@ <property name="visible_window">False</property> <child> <object class="GtkBox" id="tab_hbox"> + <property name="width_request">170</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">4</property> @@ -15,6 +16,7 @@ <object class="GtkImage" id="tab_image"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="stock">gtk-missing-image</property> </object> <packing> @@ -25,9 +27,11 @@ </child> <child> <object class="GtkLabel" id="tab_label"> - <property name="width_request">70</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="margin_left">3</property> + <property name="hexpand">True</property> <property name="use_markup">True</property> <property name="ellipsize">end</property> <property name="single_line_mode">True</property> @@ -37,8 +41,8 @@ </style> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -48,6 +52,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="halign">end</property> <property name="relief">none</property> <child> <object class="GtkImage" id="image1329"> @@ -73,6 +78,9 @@ <property name="default_width">480</property> <property name="default_height">440</property> <property name="show_menubar">False</property> + <child type="titlebar"> + <placeholder/> + </child> <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> @@ -80,8 +88,5 @@ <property name="scrollable">True</property> </object> </child> - <child type="titlebar"> - <placeholder/> - </child> </object> </interface> ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -306,23 +306,6 @@ <property name="top_attach">1</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="show_avatar_in_tabs_checkbutton"> - <property name="label" translatable="yes">Show _avatar in chat tabs</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, the contact's avatar will be shown in chat tabs</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_avatar_in_tabs_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> <child> <object class="GtkComboBox" id="tabs_placement"> <property name="visible">True</property> ===================================== gajim/groupchat_control.py ===================================== @@ -74,7 +74,6 @@ from gajim.gtk.groupchat_info import GroupChatInfoScrolled from gajim.gtk.groupchat_invite import GroupChatInvite from gajim.gtk.groupchat_roster import GroupchatRoster from gajim.gtk.util import NickCompletionGenerator -from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_app_window from gajim.gtk.const import ControlType @@ -786,13 +785,12 @@ class GroupchatControl(ChatControlBase): label_str = unread + label_str return (label_str, color) - def get_tab_image(self, count_unread=True): - tab_image = None - if self.is_connected: - tab_image = get_icon_name('muc-active') - else: - tab_image = get_icon_name('muc-inactive') - return tab_image + def get_tab_image(self): + return app.interface.avatar_storage.get_muc_surface( + self.account, + self.contact.jid, + AvatarSize.ROSTER, + self.scale_factor) def _update_banner_state_image(self): surface = app.interface.avatar_storage.get_muc_surface( ===================================== gajim/gtk/preferences.py ===================================== @@ -99,10 +99,6 @@ class Preferences(Gtk.ApplicationWindow): else: # right self._ui.tabs_placement.set_active(3) - # Show avatar in tabs - st = app.config.get('show_avatar_in_tabs') - self._ui.show_avatar_in_tabs_checkbutton.set_active(st) - ## Contact List Appearance # Display avatars in roster st = app.config.get('show_avatars_in_roster') @@ -594,9 +590,6 @@ class Preferences(Gtk.ApplicationWindow): else: # right app.config.set('tabs_position', 'right') - def on_show_avatar_in_tabs_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'show_avatar_in_tabs') - def on_show_avatars_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_avatars_in_roster') app.interface.roster.setup_and_draw_roster() ===================================== gajim/message_window.py ===================================== @@ -647,7 +647,6 @@ class MessageWindow(EventHelper): close_button.hide() # Update nick - nick_label.set_max_width_chars(10) if isinstance(ctrl, ChatControl): tab_label_str = ctrl.get_tab_label() # Set Label Color ===================================== gajim/privatechat_control.py ===================================== @@ -35,7 +35,6 @@ from gajim.chat_control import ChatControl from gajim.command_system.implementation.hosts import PrivateChatCommands from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.util import get_icon_name from gajim.gtk.const import ControlType @@ -225,38 +224,15 @@ class PrivateChatControl(ChatControl): self.xml.avatar_image.set_from_surface(surface) - def get_tab_image(self, count_unread=True): - jid = self.gc_contact.get_full_jid() - if app.config.get('show_avatar_in_tabs'): - scale = self.parent_win.window.get_scale_factor() - surface = app.contacts.get_avatar( - self.account, jid, AvatarSize.TAB, scale) - if surface is not None: - return surface - - if count_unread: - num_unread = len(app.events.get_events( - self.account, - jid, - ['printed_%s' % self._type, str(self._type)])) - else: - num_unread = 0 - - transport = None - if app.jid_is_transport(jid): - transport = app.get_transport_name_from_jid(jid) - + def get_tab_image(self): if self.gc_contact.presence.is_unavailable: show = 'offline' else: show = self.gc_contact.show.value - - if num_unread and app.config.get('show_unread_tab_icon'): - icon_name = get_icon_name('event', transport=transport) - else: - icon_name = get_icon_name(show, transport=transport) - - return icon_name + scale = self.parent_win.window.get_scale_factor() + return self.gc_contact.get_avatar(AvatarSize.ROSTER, + scale, + show) def update_contact(self): self.contact = self.gc_contact.as_contact() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1b4a1f089f2bb90b1b0501acd10936fd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1b4a1f089f2bb90b1b0501acd10936fd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GroupchatControl: Add invite button
by Philipp Hörist 28 Apr '20

28 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0482ae87 by Daniel Brötzmann at 2020-04-28T17:43:40+02:00 GroupchatControl: Add invite button - - - - - 01365d05 by Daniel Brötzmann at 2020-04-28T17:43:41+02:00 GroupchatControl: Remove invite menu entry - - - - - 3 changed files: - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -272,6 +272,31 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkButton" id="quick_invite_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Invite Contacts…</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">list-add-symbolic</property> + </object> + </child> + <style> + <class name="chatcontrol-actionbar-button"/> + <class name="flat"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> <child> <object class="GtkButton" id="authentication_button"> <property name="can_focus">True</property> @@ -297,7 +322,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -318,7 +343,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack_type">end</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -343,7 +368,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -367,7 +392,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -396,7 +421,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -411,7 +436,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> </object> ===================================== gajim/groupchat_control.py ===================================== @@ -176,6 +176,9 @@ class GroupchatControl(ChatControlBase): self.xml.info_grid.attach(self._muc_info_box, 0, 0, 1, 1) # Groupchat invite + self.xml.quick_invite_button.set_action_name( + 'win.invite-%s' % self.control_id) + self._invite_box = GroupChatInvite(self.room_jid) self.xml.invite_grid.attach(self._invite_box, 0, 0, 1, 1) self._invite_box.connect('listbox-changed', self._on_invite_ready) ===================================== gajim/gui_menu_builder.py ===================================== @@ -571,7 +571,6 @@ def get_singlechat_menu(control_id, account, jid): def get_groupchat_menu(control_id, account, jid): groupchat_menu = [ ('win.information-', _('Information')), - ('win.invite-', _('Invite Contact')), (_('Manage Group Chat'), [ ('win.rename-groupchat-', _('Rename…')), ('win.change-subject-', _('Change Subject…')), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/575d60d21645f1919be087c509abd2a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/575d60d21645f1919be087c509abd2a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: GCTooltip: Remove affiliation coloring
by Philipp Hörist 28 Apr '20

28 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: ec233919 by Daniel Brötzmann at 2020-04-28T15:59:29+02:00 GCTooltip: Remove affiliation coloring - - - - - 62fd32e3 by Daniel Brötzmann at 2020-04-28T15:59:29+02:00 Remove obsolete css colors and helpers - - - - - 06563efc by Daniel Brötzmann at 2020-04-28T17:05:41+02:00 Tooltips: Use css colors - - - - - 3ba1b532 by Daniel Brötzmann at 2020-04-28T17:08:01+02:00 Avatars: Use css show colors - - - - - 0e864cf7 by Daniel Brötzmann at 2020-04-28T17:08:03+02:00 Tooltips: Remove tooltip_idle_color - - - - - ba4cddec by Daniel Brötzmann at 2020-04-28T17:08:03+02:00 Tooltips: Remove tooltip_account_name_color - - - - - 575d60d2 by Daniel Brötzmann at 2020-04-28T17:08:03+02:00 Themes: Make status colors configurable - - - - - 9 changed files: - gajim/common/config.py - gajim/common/helpers.py - gajim/data/style/default.css - gajim/data/style/gajim.css - gajim/gtk/avatar.py - gajim/gtk/const.py - gajim/gtk/themes.py - gajim/gtk/tooltips.py - gajim/gtk/util.py Changes: ===================================== gajim/common/config.py ===================================== @@ -174,18 +174,6 @@ class Config: 'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')], 'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')], 'tabs_close_button': [opt_bool, True, _('Show close button in tab?')], - 'tooltip_status_online_color': [opt_color, '#73D216'], - 'tooltip_status_free_for_chat_color': [opt_color, '#3465A4'], - 'tooltip_status_away_color': [opt_color, '#EDD400'], - 'tooltip_status_busy_color': [opt_color, '#F57900'], - 'tooltip_status_na_color': [opt_color, '#CC0000'], - 'tooltip_status_offline_color': [opt_color, '#555753'], - 'tooltip_affiliation_none_color': [opt_color, '#555753'], - 'tooltip_affiliation_member_color': [opt_color, '#73D216'], - 'tooltip_affiliation_administrator_color': [opt_color, '#F57900'], - 'tooltip_affiliation_owner_color': [opt_color, '#CC0000'], - 'tooltip_account_name_color': [opt_color, '#888A85'], - 'tooltip_idle_color': [opt_color, '#888A85'], 'notification_preview_message': [opt_bool, True, _('Preview new messages in notification popup?')], 'notification_position_x': [opt_int, -1], 'notification_position_y': [opt_int, -1], ===================================== gajim/common/helpers.py ===================================== @@ -223,15 +223,6 @@ def get_uf_show(show, use_mnemonic=False): uf_show = Q_('?contact has status:Has errors') return uf_show -def get_css_show_color(show): - if show in ('online', 'chat'): - return 'status-online' - if show in ('offline', 'not in roster', 'requested'): - return None - if show in ('xa', 'dnd'): - return 'status-dnd' - if show == 'away': - return 'status-away' def get_uf_sub(sub): if sub == 'none': ===================================== gajim/data/style/default.css ===================================== @@ -77,3 +77,15 @@ .gajim-notify-other { color: rgb(255, 255, 255); } +.gajim-status-online { + color: rgb(102, 191, 16); +} +.gajim-status-away { + color: rgb(255, 133, 51); +} +.gajim-status-dnd { + color: rgb(230, 46, 0); +} +.gajim-status-offline { + color: rgb(154, 154, 154); +} ===================================== gajim/data/style/gajim.css ===================================== @@ -217,9 +217,6 @@ list.settings > row > box { .bold16 { font-size: 16px; font-weight: bold; } .bold24 { font-size: 24px; font-weight: bold; } .large-header { font-size: 20px; font-weight: bold; } -.status-away { color: #ff8533;} -.status-dnd { color: #e62e00;} -.status-online { color: #66bf10;} .insensitive-fg-color {color: @insensitive_fg_color;} /* Padding/Margins */ ===================================== gajim/gtk/avatar.py ===================================== @@ -28,12 +28,13 @@ from gajim.common import configpaths from gajim.common.helpers import Singleton from gajim.common.helpers import get_groupchat_name from gajim.common.const import AvatarSize +from gajim.common.const import StyleAttr from gajim.gtk.util import load_pixbuf from gajim.gtk.util import text_to_color from gajim.gtk.util import scale_with_ratio -from gajim.gtk.const import SHOW_COLORS - +from gajim.gtk.util import get_css_show_class +from gajim.gtk.util import convert_rgb_string_to_float log = logging.getLogger('gajim.gtk.avatar') @@ -108,7 +109,9 @@ def add_status_to_avatar(surface, show): context.arc(width - clip_size, height - clip_size, clip_size, 0, 2 * pi) context.fill() - color = SHOW_COLORS[show] + css_color = get_css_show_class(show) + color = convert_rgb_string_to_float( + app.css_config.get_value(css_color, StyleAttr.COLOR)) show_size = width / 6.5 show_radius = show_size * 0.80 context.set_source_rgb(*color) ===================================== gajim/gtk/const.py ===================================== @@ -91,17 +91,6 @@ class ControlType(Enum): return self.value -SHOW_COLORS = { - 'online': (102/255, 191/255, 16/255), - 'offline': (154/255, 154/255, 154/255), - 'not in roster': (154/255, 154/255, 154/255), - 'chat': (102/255, 191/255, 16/255), - 'away': (255/255, 133/255, 51/255), - 'dnd': (230/255, 46/255, 0), - 'xa': (106/255, 0, 242/255) -} - - WINDOW_MODULES = { 'AccountsWindow': 'gajim.gtk.accounts', 'HistorySyncAssistant': 'gajim.gtk.history_sync', ===================================== gajim/gtk/themes.py ===================================== @@ -161,6 +161,18 @@ CSS_STYLE_OPTIONS = [ StyleOption(_('Contact Connected Background '), '.gajim-roster-connected', StyleAttr.BACKGROUND), + StyleOption(_('Status Online Color'), + '.gajim-status-online', + StyleAttr.COLOR), + StyleOption(_('Status Away Color'), + '.gajim-status-away', + StyleAttr.COLOR), + StyleOption(_('Status DND Color'), + '.gajim-status-dnd', + StyleAttr.COLOR), + StyleOption(_('Status Offline Color'), + '.gajim-status-offline', + StyleAttr.COLOR), ] ===================================== gajim/gtk/tooltips.py ===================================== @@ -39,6 +39,7 @@ from gajim.common.const import AvatarSize from gajim.common.const import PEPEventType from gajim.common.i18n import Q_ from gajim.common.i18n import _ +from gajim.gtkgui_helpers import add_css_class from gajim.gtk.util import get_builder from gajim.gtk.util import get_icon_name @@ -46,6 +47,7 @@ from gajim.gtk.util import format_mood from gajim.gtk.util import format_activity from gajim.gtk.util import format_tune from gajim.gtk.util import format_location +from gajim.gtk.util import get_css_show_class log = logging.getLogger('gajim.gtk.tooltips') @@ -206,7 +208,8 @@ class GCTooltip(): # Status show = helpers.get_uf_show(contact.show.value) - self._ui.user_show.set_markup(colorize_status(show)) + self._ui.user_show.set_text(show) + colorize_status(self._ui.user_show, contact.show) self._ui.user_show.show() # JID @@ -220,8 +223,7 @@ class GCTooltip(): uf_affiliation = \ _('%(owner_or_admin_or_member)s of this group chat') \ % {'owner_or_admin_or_member': uf_affiliation} - uf_affiliation = self.colorize_affiliation(uf_affiliation) - self._ui.affiliation.set_markup(uf_affiliation) + self._ui.affiliation.set_text(uf_affiliation) self._ui.affiliation.show() # Avatar @@ -238,29 +240,10 @@ class GCTooltip(): app.plugin_manager.gui_extension_point( 'gc_tooltip_populate', self, contact, self._ui.tooltip_grid) - @staticmethod - def colorize_affiliation(affiliation): - """ - Color the affiliation of a MUC participant inside the tooltip by - it's semantics. Color palette is the Tango. - """ - formatted = "<span foreground='%s'>%s</span>" - color = None - if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")): - color = app.config.get('tooltip_affiliation_none_color') - elif affiliation.startswith(_("Member")): - color = app.config.get('tooltip_affiliation_member_color') - elif affiliation.startswith(_("Administrator")): - color = app.config.get('tooltip_affiliation_administrator_color') - elif affiliation.startswith(_("Owner")): - color = app.config.get('tooltip_affiliation_owner_color') - if color: - affiliation = formatted % (color, affiliation) - return affiliation - def destroy(self): self._ui.tooltip_grid.destroy() + class RosterTooltip(StatusTable): def __init__(self): StatusTable.__init__(self) @@ -344,11 +327,8 @@ class RosterTooltip(StatusTable): name = GLib.markup_escape_text(self.prim_contact.get_shown_name()) if app.config.get('mergeaccounts'): - color = app.config.get('tooltip_account_name_color') - account_name = GLib.markup_escape_text( + name = GLib.markup_escape_text( self.prim_contact.account.name) - name += " <span foreground='{}'>({})</span>".format( - color, account_name) self._ui.name.set_markup(name) self._ui.name.show() @@ -482,7 +462,6 @@ class RosterTooltip(StatusTable): def _set_idle_time(self, contact): if contact.idle_time: - idle_color = app.config.get('tooltip_idle_color') idle_time = contact.idle_time idle_time = time.localtime(contact.idle_time) idle_time = datetime(*(idle_time[:6])) @@ -491,9 +470,7 @@ class RosterTooltip(StatusTable): formatted = idle_time.strftime('%X') else: formatted = idle_time.strftime('%c') - idle_markup = '<span foreground="{}">{}</span>'.format( - idle_color, formatted) - self._ui.idle_since.set_markup(idle_markup) + self._ui.idle_since.set_text(formatted) self._ui.idle_since.show() self._ui.idle_since_label.show() @@ -507,7 +484,8 @@ class RosterTooltip(StatusTable): else: show = _('Disconnected') - self._ui.user_show.set_markup(colorize_status(show)) + colorize_status(self._ui.user_show, contact.show) + self._ui.user_show.set_text(show) self._ui.user_show.show() @staticmethod @@ -625,25 +603,9 @@ class FileTransfersTooltip(): return Q_('?transfer status:Not started') -def colorize_status(status): +def colorize_status(widget, show): """ - Colorize the status message inside the tooltip by it's - semantics. Color palette is the Tango. + Colorize the status message inside the tooltip by it's semantics. """ - formatted = "<span foreground='%s'>%s</span>" - color = None - if status.startswith(Q_("?user status:Available")): - color = app.config.get('tooltip_status_online_color') - elif status.startswith(_("Free for Chat")): - color = app.config.get('tooltip_status_free_for_chat_color') - elif status.startswith(_("Away")): - color = app.config.get('tooltip_status_away_color') - elif status.startswith(_("Busy")): - color = app.config.get('tooltip_status_busy_color') - elif status.startswith(_("Not Available")): - color = app.config.get('tooltip_status_na_color') - elif status.startswith(_("Offline")): - color = app.config.get('tooltip_status_offline_color') - if color: - status = formatted % (color, status) - return status + css_class = get_css_show_class(show)[14:] + add_css_class(widget, css_class, prefix='gajim-status-') ===================================== gajim/gtk/util.py ===================================== @@ -28,6 +28,7 @@ from importlib import import_module import xml.etree.ElementTree as ET from pathlib import Path from functools import wraps +from functools import lru_cache try: from PIL import Image @@ -443,6 +444,13 @@ def convert_rgb_to_hex(rgb_string: str) -> str: return '#%02x%02x%02x' % (red, green, blue) +@lru_cache(maxsize=1024) +def convert_rgb_string_to_float(rgb_string: str) -> Tuple[float, float, float]: + rgba = Gdk.RGBA() + rgba.parse(rgb_string) + return (rgba.red, rgba.green, rgba.blue) + + def get_monitor_scale_factor() -> int: display = Gdk.Display.get_default() monitor = display.get_primary_monitor() @@ -652,6 +660,18 @@ def get_color_for_account(account: str) -> str: return rgba.to_string() +@lru_cache(maxsize=16) +def get_css_show_class(show): + if show in ('online', 'chat'): + return '.gajim-status-online' + if show in ('away', 'xa'): + return '.gajim-status-away' + if show == 'dnd': + return '.gajim-status-dnd' + # 'offline', 'not in roster', 'requested' + return '.gajim-status-offline' + + def scale_with_ratio(size, width, height): if height == width: return size, size View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4caf90bef944e451ba0032d38dfdfe3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4caf90bef944e451ba0032d38dfdfe3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make more consistent menu labels
by Philipp Hörist 28 Apr '20

28 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4caf90be by lovetox at 2020-04-28T15:44:58+02:00 Make more consistent menu labels - Use Header capitalization https://developer.gnome.org/hig/stable/writing-style.html.en#capitalization - Use ellipsis whenever an action needs more user input - - - - - 3 changed files: - gajim/data/gui/application_menu.ui - gajim/gui_menu_builder.py - launch-history-manager.py Changes: ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -5,12 +5,12 @@ <attribute name="label">Gajim</attribute> <section> <item> - <attribute name="label" translatable="yes">Start Chat</attribute> + <attribute name="label" translatable="yes">Start Chat…</attribute> <attribute name="action">app.start-chat</attribute> <attribute name="target"></attribute> </item> <item> - <attribute name="label" translatable="yes">Create Group Chat</attribute> + <attribute name="label" translatable="yes">Create Group Chat…</attribute> <attribute name="action">app.create-groupchat</attribute> <attribute name="target"></attribute> </item> ===================================== gajim/gui_menu_builder.py ===================================== @@ -514,13 +514,13 @@ def get_transport_menu(contact, account): def get_singlechat_menu(control_id, account, jid): singlechat_menu = [ - (_('Send File…'), [ + (_('Send File'), [ ('win.send-file-httpupload-', _('Upload File…')), ('win.send-file-jingle-', _('Send File Directly…')), ]), (_('Send Chatstate'), ['chatstate']), - ('win.invite-contacts-', _('Invite Contacts')), - ('win.add-to-roster-', _('Add to Contact List')), + ('win.invite-contacts-', _('Invite Contacts…')), + ('win.add-to-roster-', _('Add to Contact List…')), ('win.toggle-audio-', _('Voice Chat')), ('win.toggle-video-', _('Video Chat')), ('win.information-', _('Information')), @@ -531,8 +531,8 @@ def get_singlechat_menu(control_id, account, jid): menu = Gio.Menu() entries = [ (_('Disabled'), 'disabled'), - (_('Composing only'), 'composing_only'), - (_('All chat states'), 'all') + (_('Composing Only'), 'composing_only'), + (_('All Chat States'), 'all') ] for entry in entries: @@ -573,25 +573,25 @@ def get_groupchat_menu(control_id, account, jid): ('win.information-', _('Information')), ('win.invite-', _('Invite Contact')), (_('Manage Group Chat'), [ - ('win.rename-groupchat-', _('Rename Group Chat')), - ('win.change-subject-', _('Change Subject')), - ('win.configure-', _('Configure Group Chat')), + ('win.rename-groupchat-', _('Rename…')), + ('win.change-subject-', _('Change Subject…')), ('win.upload-avatar-', _('Upload Avatar…')), - ('win.destroy-', _('Destroy Group Chat')), + ('win.configure-', _('Configure…')), + ('win.destroy-', _('Destroy…')), ]), (_('Chat Settings'), [ - ('win.print-join-left-', _('Show join/leave')), - ('win.print-status-', _('Show status changes')), - ('win.notify-on-message-', _('Notify on all messages')), - ('win.minimize-on-close-', _('Minimize on close')), + ('win.print-join-left-', _('Show Join/Leave')), + ('win.print-status-', _('Show Status Changes')), + ('win.notify-on-message-', _('Notify on all Messages')), + ('win.minimize-on-close-', _('Minimize on Close')), ('win.minimize-on-autojoin-', - _('Minimize when joining automatically')), + _('Minimize When Joining Automatically')), (_('Send Chatstate'), ['chatstate']), ]), (_('Sync Threshold'), ['sync']), - ('win.change-nickname-', _('Change Nickname')), + ('win.change-nickname-', _('Change Nickname…')), ('win.request-voice-', _('Request Voice')), - ('win.execute-command-', _('Execute command')), + ('win.execute-command-', _('Execute Command…')), ('app.browse-history', _('History')), ('win.disconnect-', _('Leave')), ] @@ -672,14 +672,14 @@ def get_account_menu(account): ('-add-contact', _('Add Contact…')), ('-profile', _('Profile')), ('-start-single-chat', _('Send Single Message…')), - ('-services', _('Discover Services')), + ('-services', _('Discover Services…')), ('-server-info', _('Server Info')), (_('Advanced'), [ ('-archive', _('Archiving Preferences')), ('-blocking', _('Blocking List')), ('-bookmarks', _('Bookmarks')), ('-pep-config', _('PEP Configuration')), - ('-sync-history', _('Synchronise History')), + ('-sync-history', _('Synchronise History…')), ('-privacylists', _('Privacy Lists')), ]), (_('Admin'), [ @@ -845,7 +845,7 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item.set_detailed_action_name(action) menu.append(item) - item = Gtk.MenuItem(label=_('Add to Contact List')) + item = Gtk.MenuItem(label=_('Add to Contact List…')) action = 'app.{account}-add-contact(["{account}", "{jid}"])'.format( account=account, jid=contact.jid or '') if contact.jid is None: @@ -863,7 +863,7 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item.set_sensitive(False) menu.append(item) - item = Gtk.MenuItem(label=_('Execute command')) + item = Gtk.MenuItem(label=_('Execute Command…')) action = 'win.execute-command-%s::%s' % (control_id, contact.name) item.set_detailed_action_name(action) menu.append(item) ===================================== launch-history-manager.py ===================================== View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4caf90bef944e451ba0032d38dfdfe3d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4caf90bef944e451ba0032d38dfdfe3d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CSSConfig: Fetch accounts from config
by Philipp Hörist 28 Apr '20

28 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 48cbf732 by lovetox at 2020-04-28T14:33:47+02:00 CSSConfig: Fetch accounts from config - - - - - 1 changed file: - gajim/gtk/css_config.py Changes: ===================================== gajim/gtk/css_config.py ===================================== @@ -534,7 +534,7 @@ class CSSConfig(): def refresh(self): css = '' - accounts = app.get_accounts_sorted() + accounts = app.config.get_per('accounts') for index, account in enumerate(accounts): color = app.config.get_per('accounts', account, 'account_color') css_class = 'gajim_class_%s' % index View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/48cbf732c28e6a3d2f9065bce370a932… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/48cbf732c28e6a3d2f9065bce370a932… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor publishing Tunes
by Philipp Hörist 28 Apr '20

28 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7acf9179 by André at 2020-04-28T13:16:21+02:00 Refactor publishing Tunes - - - - - 5 changed files: - gajim/common/client.py - gajim/common/dbus/music_track.py - gajim/common/modules/user_tune.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/common/client.py ===================================== @@ -264,7 +264,6 @@ class Client(ConnectionHandlers): def _after_disconnect(self): self._disable_reconnect_timer() - app.interface.music_track_changed(None, None, self._account) self.get_module('VCardAvatars').avatar_advertised = False app.proxy65_manager.disconnect(self._client) @@ -418,7 +417,8 @@ class Client(ConnectionHandlers): self.get_module('Blocking').get_blocking_list() # Inform GUI we just signed in - app.nec.push_incoming_event(NetworkEvent('signed-in', conn=self)) + app.nec.push_incoming_event(NetworkEvent( + 'signed-in', account=self._account, conn=self)) modules.send_stored_publish(self._account) def send_stanza(self, stanza): ===================================== gajim/common/dbus/music_track.py ===================================== @@ -21,34 +21,19 @@ import logging -from gi.repository import GObject -from gi.repository import Gio, GLib +from gi.repository import Gio +from gi.repository import GLib +from nbxmpp.structs import TuneData + +from gajim.common import app +from gajim.common.nec import NetworkEvent log = logging.getLogger('gajim.c.dbus.music_track') MPRIS_PLAYER_PREFIX = 'org.mpris.MediaPlayer2.' -class MusicTrackInfo: - __slots__ = ['title', 'album', 'artist', 'duration', 'track_number', - 'paused'] - def __init__(self, meta_info, status): - self.title = meta_info.get('xesam:title') - self.album = meta_info.get('xesam:album') - # xesam:artist is always a list of strings if not None - self.artist = meta_info.get('xesam:artist') - if self.artist is not None: - self.artist = ', '.join(self.artist) - - self.duration = float(meta_info.get('mpris:length', 0)) - self.track_number = meta_info.get('xesam:trackNumber', 0) - self.paused = status == 'Paused' - - -class MusicTrackListener(GObject.GObject): - __gsignals__ = { - 'music-track-changed': (GObject.SignalFlags.RUN_LAST, None, (object,)), - } +class MusicTrackListener: _instance = None @@ -59,9 +44,18 @@ class MusicTrackListener(GObject.GObject): return cls._instance def __init__(self): - super().__init__() self.players = {} self.connection = None + self._current_tune = None + + def _emit(self, info): + self._current_tune = info + app.nec.push_incoming_event( + NetworkEvent('music-track-changed', info=info)) + + @property + def current_tune(self): + return self._current_tune def start(self): proxy = Gio.DBusProxy.new_for_bus_sync( @@ -100,6 +94,11 @@ class MusicTrackListener(GObject.GObject): if name.startswith(MPRIS_PLAYER_PREFIX): self._add_player(name) + for name in list(self.players): + info = self._get_playing_track(name) + if info is not None: + self._emit(info) + def stop(self): for name in list(self.players): if name.startswith(MPRIS_PLAYER_PREFIX): @@ -137,10 +136,6 @@ class MusicTrackListener(GObject.GObject): self._signal_received, name) - info = self.get_playing_track(name) - if info is not None: - self.emit('music-track-changed', info) - def _remove_player(self, name): log.info('%s vanished', name) if name in self.players: @@ -148,7 +143,7 @@ class MusicTrackListener(GObject.GObject): self.players[name]) self.players.pop(name) - self.emit('music-track-changed', None) + self._emit(None) def _signal_received(self, _connection, @@ -160,14 +155,11 @@ class MusicTrackListener(GObject.GObject): *user_data): '''Signal handler for PropertiesChanged event''' - if 'PlaybackStatus' not in parameters[1]: - return - log.info('Signal received: %s - %s', interface_name, parameters) - info = self.get_playing_track(user_data[0]) + info = self._get_playing_track(user_data[0]) - self.emit('music-track-changed', info) + self._emit(info) @staticmethod def _get_music_info(properties): @@ -176,10 +168,19 @@ class MusicTrackListener(GObject.GObject): return None status = properties.get('PlaybackStatus') - return MusicTrackInfo(meta, status) + if status is None or status == 'Paused': + return None - def get_playing_track(self, name): - '''Return a MusicTrackInfo for the currently playing + title = meta.get('xesam:title') + album = meta.get('xesam:album') + # xesam:artist is always a list of strings if not None + artist = meta.get('xesam:artist') + if artist is not None: + artist = ', '.join(artist) + return TuneData(artist=artist, title=title, source=album) + + def _get_playing_track(self, name): + '''Return a TuneData for the currently playing song, or None if no song is playing''' proxy = Gio.DBusProxy.new_for_bus_sync( Gio.BusType.SESSION, @@ -205,14 +206,7 @@ class MusicTrackListener(GObject.GObject): else: return self._get_music_info(result[0]) -# here we test :) -if __name__ == '__main__': - def music_track_change_cb(_listener, music_track_info): - if music_track_info is None or music_track_info.paused: - print('Stop!') - else: - print(music_track_info.title) + +def enable(): listener = MusicTrackListener.get() - listener.connect('music-track-changed', music_track_change_cb) listener.start() - GLib.MainLoop().run() ===================================== gajim/common/modules/user_tune.py ===================================== @@ -20,11 +20,14 @@ from typing import Tuple from nbxmpp.namespaces import Namespace from gajim.common import app +from gajim.common import ged from gajim.common.nec import NetworkEvent from gajim.common.modules.base import BaseModule from gajim.common.modules.util import event_node from gajim.common.modules.util import store_publish from gajim.common.const import PEPEventType +from gajim.common.dbus.music_track import MusicTrackListener +from gajim.common.helpers import event_filter class UserTune(BaseModule): @@ -37,6 +40,12 @@ class UserTune(BaseModule): def __init__(self, con): BaseModule.__init__(self, con) self._register_pubsub_handler(self._tune_received) + self._tune_data = None + + self.register_events([ + ('music-track-changed', ged.CORE, self._on_music_track_changed), + ('signed-in', ged.CORE, self._on_signed_in), + ]) @event_node(Namespace.TUNE) def _tune_received(self, _con, _stanza, properties): @@ -66,9 +75,44 @@ class UserTune(BaseModule): @store_publish def set_tune(self, tune): + if not self._con.get_module('PEP').supported: + return + + if not app.config.get_per('accounts', + self._account, + 'publish_tune'): + return self._log.info('Send %s', tune) self._nbxmpp('Tune').set_tune(tune) + def set_enabled(self, enable): + if enable: + app.config.set_per('accounts', + self._account, + 'publish_tune', + True) + self._publish_current_tune() + + else: + self.set_tune(None) + app.config.set_per('accounts', + self._account, + 'publish_tune', + False) + + def _publish_current_tune(self): + self.set_tune(MusicTrackListener.get().current_tune) + + @event_filter(['account']) + def _on_signed_in(self, _event): + self._publish_current_tune() + + def _on_music_track_changed(self, event): + if self._tune_data == event.info: + return + self._tune_data = event.info + self.set_tune(event.info) + def get_instance(*args: Any, **kwargs: Any) -> Tuple[UserTune, str]: return UserTune(*args, **kwargs), 'UserTune' ===================================== gajim/gui_interface.py ===================================== @@ -45,13 +45,12 @@ from gi.repository import GLib from gi.repository import Gio from nbxmpp import idlequeue from nbxmpp import Hashes2 -from nbxmpp.structs import TuneData from gajim.common import app from gajim.common import events from gajim.common.dbus import location -from gajim.common.dbus import music_track from gajim.common.dbus import logind +from gajim.common.dbus import music_track from gajim import gui_menu_builder from gajim import dialogs @@ -836,10 +835,6 @@ class Interface: if obj.conn.get_module('MAM').available: obj.conn.get_module('MAM').request_archive_on_signin() - # send currently played music - if (pep_supported and sys.platform not in ('win32', 'darwin') and - app.config.get_per('accounts', account, 'publish_tune')): - self.enable_music_listener() # enable location listener if (pep_supported and app.is_installed('GEOCLUE') and app.config.get_per('accounts', account, 'publish_location')): @@ -1539,46 +1534,6 @@ class Interface: ### Other Methods ################################################################################ - - def enable_music_listener(self): - listener = music_track.MusicTrackListener.get() - if not self.music_track_changed_signal: - self.music_track_changed_signal = listener.connect( - 'music-track-changed', self.music_track_changed) - listener.start() - - def disable_music_listener(self): - listener = music_track.MusicTrackListener.get() - listener.disconnect(self.music_track_changed_signal) - self.music_track_changed_signal = None - listener.stop() - - @staticmethod - def music_track_changed(unused_listener, music_track_info, account=None): - if not account: - accounts = app.connections.keys() - else: - accounts = [account] - - if music_track_info is None or music_track_info.paused: - artist = title = source = '' - else: - artist = music_track_info.artist - title = music_track_info.title - source = music_track_info.album - for acct in accounts: - if not app.account_is_available(acct): - continue - if not app.connections[acct].get_module('PEP').supported: - continue - if not app.config.get_per('accounts', acct, 'publish_tune'): - continue - if app.connections[acct].music_track_info == music_track_info: - continue - app.connections[acct].get_module('UserTune').set_tune( - TuneData(artist=artist, title=title, source=source)) - app.connections[acct].music_track_info = music_track_info - def read_sleepy(self): """ Check idle status and change that status if needed @@ -2158,6 +2113,7 @@ class Interface: if sys.platform not in ('win32', 'darwin'): logind.enable() + music_track.enable() self.show_vcard_when_connect = [] @@ -2180,8 +2136,6 @@ class Interface: self.last_ftwindow_update = 0 - self.music_track_changed_signal = None - self._network_monitor = Gio.NetworkMonitor.get_default() self._network_monitor.connect('notify::network-available', self._network_status_changed) ===================================== gajim/roster_window.py ===================================== @@ -2086,6 +2086,8 @@ class RosterWindow: else: connection.get_module('UserMood').set_mood(None) + connection.get_module('UserTune').set_tune(None) + def delete_pep(self, jid, account): if jid == app.get_jid_from_account(account): app.connections[account].pep = {} @@ -3431,19 +3433,7 @@ class RosterWindow: def on_publish_tune_toggled(self, widget, account): active = widget.get_active() - app.config.set_per('accounts', account, 'publish_tune', active) - if active: - app.interface.enable_music_listener() - else: - app.connections[account].get_module('UserTune').set_tune(None) - # disable music listener only if no other account uses it - for acc in app.connections: - if app.config.get_per('accounts', acc, 'publish_tune'): - break - else: - app.interface.disable_music_listener() - - app.connections[account].get_module('Caps').update_caps() + app.connections[account].get_module('UserTune').set_enabled(active) def on_publish_location_toggled(self, widget, account): active = widget.get_active() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7acf91798515a8672deab1510ba0b520… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7acf91798515a8672deab1510ba0b520… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix const SHOW_LIST access
by Philipp Hörist 28 Apr '20

28 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c6f72a2b by lovetox at 2020-04-28T12:52:06+02:00 Fix const SHOW_LIST access - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -663,7 +663,7 @@ def get_icon_name_to_show(contact, account=None): transport = app.get_transport_name_from_jid(contact.jid) if transport: return contact.show - if contact.show in app.SHOW_LIST: + if contact.show in SHOW_LIST: return contact.show return 'notinroster' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c6f72a2b4473a2a68eb9fb7a38d1cb78… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c6f72a2b4473a2a68eb9fb7a38d1cb78… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Dependency Check: Show better error message
by Philipp Hörist 28 Apr '20

28 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: f63225ae by lovetox at 2020-04-28T09:57:37+02:00 Dependency Check: Show better error message Fixes #10073 - - - - - b6a70eb6 by lovetox at 2020-04-28T10:09:51+02:00 Move SHOW_LIST into the const module - - - - - 4 changed files: - gajim/common/app.py - gajim/common/const.py - gajim/common/helpers.py - gajim/gajim.py Changes: ===================================== gajim/common/app.py ===================================== @@ -131,9 +131,6 @@ proxy65_manager = None cert_store = None -SHOW_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', - 'error'] - # zeroconf account name ZEROCONF_ACC_NAME = 'Local' ===================================== gajim/common/const.py ===================================== @@ -954,3 +954,15 @@ COMMON_FEATURES = [ Namespace.JINGLE_IBB, Namespace.AVATAR_METADATA + '+notify', ] + + +SHOW_LIST = [ + 'offline', + 'connecting', + 'online', + 'chat', + 'away', + 'xa', + 'dnd', + 'error' +] ===================================== gajim/common/helpers.py ===================================== @@ -84,6 +84,7 @@ from gajim.common.const import Display from gajim.common.const import URIType from gajim.common.const import URIAction from gajim.common.const import GIO_TLS_ERRORS +from gajim.common.const import SHOW_LIST from gajim.common.structs import URI if app.is_installed('PYCURL'): @@ -603,10 +604,10 @@ def get_global_show(): 'sync_with_global_status'): continue status = get_connection_status(account) - index = app.SHOW_LIST.index(status) + index = SHOW_LIST.index(status) if index > maxi: maxi = index - return app.SHOW_LIST[maxi] + return SHOW_LIST[maxi] def get_global_status_message(): maxi = 0 @@ -615,13 +616,12 @@ def get_global_status_message(): 'sync_with_global_status'): continue status = app.connections[account].status - index = app.SHOW_LIST.index(status) + index = SHOW_LIST.index(status) if index > maxi: maxi = index status_message = app.connections[account].status_message return status_message - def statuses_unified(): """ Test if all statuses are the same ===================================== gajim/gajim.py ===================================== @@ -39,17 +39,17 @@ def check_version(dep_name, current_ver, min_ver): def _check_required_deps(): - error_message = 'Gajim needs %s to run. Quitting…' + error_message = 'Gajim needs %s to run. Quitting… (Error: %s)' try: import nbxmpp - except ImportError: - sys.exit(error_message % 'python-nbxmpp') + except ImportError as error: + sys.exit(error_message % ('python-nbxmpp', error)) try: import gi - except ImportError: - sys.exit(error_message % 'pygobject') + except ImportError as error: + sys.exit(error_message % ('pygobject', error)) try: gi.require_versions({'GLib': '2.0', @@ -63,8 +63,8 @@ def _check_required_deps(): try: import cairo - except ImportError: - sys.exit(error_message % 'python-cairo') + except ImportError as error: + sys.exit(error_message % ('python-cairo', error)) from gi.repository import Gtk gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/86b76d00129c92cd0d8d0d921086c4f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/86b76d00129c92cd0d8d0d921086c4f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Roster: Don't fail when changing status message
by Philipp Hörist 28 Apr '20

28 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 86b76d00 by lovetox at 2020-04-28T09:23:52+02:00 Roster: Don't fail when changing status message Fixes #10080 - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -3375,11 +3375,9 @@ class RosterWindow: 'contacts.')) self.update_status_combobox() return + status = model[active][2] - # status "desync'ed" or not - statuses_unified = helpers.statuses_unified() - if (active == 7 and statuses_unified) or (active == 9 and \ - not statuses_unified): + if status == 'status': # 'Change status message' selected: # do not change show, just show change status dialog status = model[self.previous_status_combobox_active][2] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/86b76d00129c92cd0d8d0d921086c4f5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/86b76d00129c92cd0d8d0d921086c4f5… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2020