Commits October 2021

commits@gajim.org

1 participants
72 discussions

[Git][gajim/gajim][gajim_1.3] 2 commits: Remove unused variable
by Philipp Hörist (＠lovetox) 09 Oct '21

09 Oct '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 128b2eff by lovetox at 2021-10-09T14:42:36+02:00 Remove unused variable - - - - - 4920b828 by lovetox at 2021-10-09T14:43:02+02:00 Appveyor: Build with python 3.9 - - - - - 2 changed files: - win/_base.sh - win/misc/create-launcher.py Changes: ===================================== win/_base.sh ===================================== @@ -12,7 +12,7 @@ cd "${DIR}" # CONFIG START MAJOR_PY_VERSION="3" -MINOR_PY_VERSION="8" +MINOR_PY_VERSION="9" PYTHON_VERSION="${MAJOR_PY_VERSION}.${MINOR_PY_VERSION}" BUILD_VERSION="0" ===================================== win/misc/create-launcher.py ===================================== @@ -72,7 +72,6 @@ def get_launcher_code(debug): int result; LPWSTR *szArglist; int nArgs; - int i; szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs); if( NULL == szArglist ) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/47908d9bb93e1f65bc60c10cbe41568… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/47908d9bb93e1f65bc60c10cbe41568… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Appveyor: Build with python 3.9
by Philipp Hörist (＠lovetox) 09 Oct '21

09 Oct '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 66bda2ad by lovetox at 2021-10-09T13:31:09+02:00 Appveyor: Build with python 3.9 - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -12,7 +12,7 @@ cd "${DIR}" # CONFIG START MAJOR_PY_VERSION="3" -MINOR_PY_VERSION="8" +MINOR_PY_VERSION="9" PYTHON_VERSION="${MAJOR_PY_VERSION}.${MINOR_PY_VERSION}" BUILD_VERSION="0" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/66bda2ad6367924b4587ce2faee624ad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/66bda2ad6367924b4587ce2faee624ad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused variable
by Philipp Hörist (＠lovetox) 09 Oct '21

09 Oct '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0c4ff1c3 by lovetox at 2021-10-09T13:00:54+02:00 Remove unused variable - - - - - 1 changed file: - win/misc/create-launcher.py Changes: ===================================== win/misc/create-launcher.py ===================================== @@ -72,7 +72,6 @@ def get_launcher_code(debug): int result; LPWSTR *szArglist; int nArgs; - int i; szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs); if( NULL == szArglist ) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0c4ff1c35344a8ec7215e5d34d02dc6d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0c4ff1c35344a8ec7215e5d34d02dc6d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Settings: Remove avatar_position_in_roster
by Daniel Brötzmann (＠wurstsalat) 03 Oct '21

03 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b4f78b3e by wurstsalat at 2021-10-03T18:17:58+02:00 Settings: Remove avatar_position_in_roster - - - - - 6f15260a by wurstsalat at 2021-10-03T18:20:00+02:00 Settings: Remove roster_on_the_right - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -55,7 +55,6 @@ class _ACCOUNT_DEFAULT: 'quit_on_main_window_x_button': False, 'hide_on_main_window_x_button': False, 'main_window_skip_taskbar': False, - 'roster_on_the_right': False, 'latest_disco_addresses': '', 'time_stamp': '%x | %X ', 'change_roster_title': True, @@ -85,7 +84,6 @@ class _ACCOUNT_DEFAULT: 'muc_highlight_words': '', 'muc_prefer_direct_msg': True, 'show_status_msgs_in_roster': True, - 'avatar_position_in_roster': 'right', 'print_status_in_chats': False, 'log_contact_status_changes': False, 'use_urgency_hint': True, @@ -352,7 +350,6 @@ class _ACCOUNT_DEFAULT: 'show_ascii_formatting_chars': _('If enabled, do not remove */_ . So *abc* will be bold but with * * not removed.'), 'gc_refer_to_nick_char': _('Character to add after nickname when using nickname completion (tab) in group chat.'), 'save_main_window_position': _('If enabled, Gajim will save the main window position when hiding it, and restore it when showing the window again.'), - 'roster_on_the_right': _('Place the contact list on the right in single window mode'), 'time_stamp': _('This option lets you customize the timestamp that is printed in conversation. For example \'[%H:%M] \' will show \'[hour:minute] \'. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).'), 'chat_timestamp_format': 'https://docs.python.org/3/library/time.html#time.strftime', 'change_roster_title': _('If enabled, Gajim will add * and [n] in contact list window title.'), @@ -376,7 +373,6 @@ class _ACCOUNT_DEFAULT: 'muc_highlight_words': _('A list of words (semicolon separated) that will be highlighted in group chats.'), 'hide_on_main_window_x_button': _('If enabled, Gajim hides the main window when pressing the X button instead of minimizing into the notification area.'), 'main_window_skip_taskbar': _('Don’t show main window in the system taskbar.'), - 'avatar_position_in_roster': _('Define the position of avatars in the contact list. Can be \'left\' or \'right\'.'), 'use_urgency_hint': _('If enabled, Gajim makes the window flash (the default behaviour in most Window Managers) when holding pending events.'), 'notification_timeout': '', 'escape_key_closes': _('If enabled, pressing Esc closes a tab/window.'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/181c53ea42cf4fb01b2b7c8ef40da58… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/181c53ea42cf4fb01b2b7c8ef40da58… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Preferences: Remove iconset setting
by Daniel Brötzmann (＠wurstsalat) 03 Oct '21

03 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6cb6c5d2 by wurstsalat at 2021-10-03T18:15:29+02:00 Preferences: Remove iconset setting - - - - - 181c53ea by wurstsalat at 2021-10-03T18:15:34+02:00 Settings: Remove show_avatars_in_roster - - - - - 3 changed files: - gajim/common/setting_values.py - gajim/data/gui/preferences.ui - gajim/gtk/preferences.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -85,7 +85,6 @@ class _ACCOUNT_DEFAULT: 'muc_highlight_words': '', 'muc_prefer_direct_msg': True, 'show_status_msgs_in_roster': True, - 'show_avatars_in_roster': True, 'avatar_position_in_roster': 'right', 'print_status_in_chats': False, 'log_contact_status_changes': False, ===================================== gajim/data/gui/preferences.ui ===================================== @@ -55,34 +55,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkGrid" id="contact_list"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="row_spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Contact List Appearance</property> - <property name="xalign">0</property> - <style> - <class name="bold"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> <child> <placeholder/> </child> @@ -462,34 +434,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkGrid" id="status_icon"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="row_spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Status Icon</property> - <property name="xalign">0</property> - <style> - <class name="bold"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> </object> </child> </object> ===================================== gajim/gtk/preferences.py ===================================== @@ -37,7 +37,6 @@ from .settings import SettingsDialog from .sidebar_switcher import SideBarSwitcher from .video_preview import VideoPreview -from .util import get_available_iconsets from .util import open_window from .util import get_app_window from .util import get_builder @@ -74,7 +73,6 @@ def __init__(self): prefs = [ ('window_behaviour', WindowBehaviour), - ('contact_list', ContactList), ('chats', Chats), ('group_chats', GroupChats), ('file_preview', FilePreview), @@ -84,7 +82,6 @@ def __init__(self): ('automatic_status', AutomaticStatus), ('themes', Themes), ('emoji', Emoji), - ('status_icon', StatusIcon), ('server', Server), ('audio', Audio), ('video', Video), @@ -189,28 +186,6 @@ def __init__(self, *args): PreferenceBox.__init__(self, settings) -class ContactList(PreferenceBox): - def __init__(self, *args): - - # TODO: Evaluate settings (and connect them) - - settings = [ - Setting(SettingKind.SWITCH, - _('Show Avatars'), - SettingType.CONFIG, - 'show_avatars_in_roster', - callback=self._on_show_avatar_in_roster_changed), - ] - - PreferenceBox.__init__(self, settings) - - @staticmethod - def _on_show_avatar_in_roster_changed(*args): - # TODO - # app.interface.roster.setup_and_draw_roster() - pass - - class Chats(PreferenceBox): def __init__(self, *args): @@ -714,33 +689,6 @@ def _toggle_emoticons(): ctrl.toggle_emoticons() -class StatusIcon(PreferenceBox): - def __init__(self, *args): - - # TODO: Remove this section completely? - - iconset_items = [] - for _index, iconset_name in enumerate(get_available_iconsets()): - iconset_items.append(iconset_name) - - settings = [ - Setting(SettingKind.POPOVER, - _('Status Icon Set'), - SettingType.CONFIG, - 'iconset', - props={'entries': iconset_items}, - callback=self._on_iconset_changed), - ] - - PreferenceBox.__init__(self, settings) - - @staticmethod - def _on_iconset_changed(*args): - # TODO: - # app.interface.roster.update_icons() - pass - - class Server(PreferenceBox): def __init__(self, *args): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f32d4388115c82b141cf4cc031b505e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f32d4388115c82b141cf4cc031b505e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 4 commits: Dialogs: Remove obsolete TimeoutWindow
by Daniel Brötzmann (＠wurstsalat) 03 Oct '21

03 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 092071e2 by wurstsalat at 2021-10-03T12:53:26+02:00 Dialogs: Remove obsolete TimeoutWindow - - - - - 7e3cf8c6 by wurstsalat at 2021-10-03T12:56:01+02:00 gtk_gui_helpers: Remove duplicate scale_with_ratio - - - - - 32e02416 by wurstsalat at 2021-10-03T13:10:23+02:00 gtk_gui_helpers: Move pixbuf helpers to util - - - - - f32d4388 by wurstsalat at 2021-10-03T13:29:46+02:00 Remove gtk_gui_helpers Functions were either obsolete, or have been moved to common/helpers or gtk/util - - - - - 8 changed files: - gajim/common/helpers.py - gajim/gtk/dataform.py - gajim/gtk/dialogs.py - gajim/gtk/filetransfer.py - gajim/gtk/notification.py - gajim/gtk/settings.py - gajim/gtk/util.py - − gajim/gtkgui_helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -86,6 +86,15 @@ from gajim.common.regex import STH_AT_STH_DOT_STH_REGEX from gajim.common.structs import URI +HAS_PYWIN32 = False +if os.name == 'nt': + try: + import win32file + import win32con + import pywintypes + HAS_PYWIN32 = True + except ImportError: + pass log = logging.getLogger('gajim.c.helpers') @@ -1050,6 +1059,37 @@ def open_file(path): Gio.AppInfo.launch_default_for_uri(path) +def file_is_locked(path_to_file): + """ + Return True if file is locked + NOTE: Windows only. + """ + if os.name != 'nt': + return False + + if not HAS_PYWIN32: + return False + + secur_att = pywintypes.SECURITY_ATTRIBUTES() + secur_att.Initialize() + + try: + # try create a handle for READING the file + hfile = win32file.CreateFile( + path_to_file, + win32con.GENERIC_READ, # open for reading + 0, # do not share with other proc + secur_att, + win32con.OPEN_EXISTING, # existing file only + win32con.FILE_ATTRIBUTE_NORMAL, # normal file + 0) # no attr. template + except pywintypes.error: + return True + else: # in case all went ok, close file handle + hfile.Close() + return False + + def geo_provider_from_location(lat, lon): return ('https://www.openstreetmap.org/?' 'mlat=%s&mlon=%s&zoom=16') % (lat, lon) ===================================== gajim/gtk/dataform.py ===================================== @@ -19,8 +19,6 @@ from nbxmpp.modules.dataforms import extend_form -from gajim.gtkgui_helpers import scale_pixbuf_from_data - from gajim.common import app from gajim.common.i18n import _ from gajim.common.helpers import open_uri @@ -28,6 +26,7 @@ from .util import MultiLineLabel from .util import MaxWidthComboBoxText from .util import make_href_markup +from .util import scale_pixbuf_from_data # Options ===================================== gajim/gtk/dialogs.py ===================================== @@ -502,45 +502,6 @@ def _on_response(self, _dialog, response): super()._on_response(_dialog, response) -class TimeoutWindow: - """ - Class designed to be derivated by other windows - Derived windows close automatically after reaching the timeout - """ - def __init__(self, timeout): - self.title_text = '' - self._countdown_left = timeout - self._timeout_source_id = None - - def start_timeout(self): - if self._countdown_left > 0: - self.countdown() - self._timeout_source_id = GLib.timeout_add_seconds( - 1, self.countdown) - - def stop_timeout(self, *args, **kwargs): - if self._timeout_source_id is not None: - GLib.source_remove(self._timeout_source_id) - self._timeout_source_id = None - self.set_title(self.title_text) - - def on_timeout(self): - """ - To be implemented by derivated classes - """ - - def countdown(self): - if self._countdown_left <= 0: - self._timeout_source_id = None - self.on_timeout() - return False - - self.set_title('%s [%s]' % ( - self.title_text, str(self._countdown_left))) - self._countdown_left -= 1 - return True - - class ShortcutsWindow: def __init__(self): transient = app.app.get_active_window() ===================================== gajim/gtk/filetransfer.py ===================================== @@ -31,13 +31,12 @@ from nbxmpp import JID -from gajim import gtkgui_helpers - from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ from gajim.common.file_props import FilesProp from gajim.common.helpers import open_file +from gajim.common.helpers import file_is_locked from gajim.common.modules.bytestream import (is_transfer_active, is_transfer_paused, is_transfer_stopped) @@ -348,7 +347,7 @@ def send_file(self, account, contact, resource_jid, file_path, """ Start the real transfer(upload) of the file """ - if gtkgui_helpers.file_is_locked(file_path): + if file_is_locked(file_path): pritext = _('Gajim can not read this file') sextext = _('Another process is using this file.') ErrorDialog(pritext, sextext) @@ -930,7 +929,11 @@ def _show_context_menu(self, event, iter_): path = self.model.get_path(iter_) self._set_buttons_sensitive(path, True) - event_button = gtkgui_helpers.get_possible_button_event(event) + if event.type == Gdk.EventType.KEY_PRESS: + event_button = 0 + else: + event_button = event.button + self._ui.file_transfers_menu.show_all() self._ui.file_transfers_menu.popup( None, ===================================== gajim/gtk/notification.py ===================================== @@ -32,7 +32,6 @@ from gi.repository import Gdk from gi.repository import Gtk -from gajim import gtkgui_helpers from gajim.common import app from gajim.common import helpers from gajim.common import ged @@ -40,6 +39,7 @@ from gajim.common.i18n import _ from gajim.common.nec import EventHelper +from .util import add_css_to_widget from .util import get_builder from .util import get_icon_name from .util import get_monitor_scale_factor @@ -299,7 +299,7 @@ def __init__(self, event_type, jid, account, msg_type='', .popup-bar { background-color: %s }''' % bg_color - gtkgui_helpers.add_css_to_widget(self._ui.color_bar, bar_class) + add_css_to_widget(self._ui.color_bar, bar_class) self._ui.color_bar.get_style_context().add_class('popup-bar') if title is None: ===================================== gajim/gtk/settings.py ===================================== @@ -24,8 +24,6 @@ from gajim.common.i18n import _ from gajim.common.i18n import Q_ -from gajim import gtkgui_helpers - from .util import get_image_button from .util import MaxWidthComboBoxText from .util import open_window @@ -572,7 +570,7 @@ class ActionSetting(GenericSetting): def __init__(self, *args, account): GenericSetting.__init__(self, *args) action_name = '%s%s' % (account, self.value) - self.action = gtkgui_helpers.get_action(action_name) + self.action = app.app.lookup_action(action_name) self.variant = GLib.Variant.new_string(account) self.on_enable() ===================================== gajim/gtk/util.py ===================================== @@ -25,6 +25,7 @@ import math import textwrap import functools +from io import BytesIO from importlib import import_module import xml.etree.ElementTree as ET from functools import wraps @@ -112,7 +113,6 @@ def contact_renamed(self, contact_old: str, contact_new: str) -> None: if contact == contact_old: lst[idx] = contact_new - def generate_suggestions(self, nicks: List[str], beginning: str) -> List[str]: """ @@ -188,7 +188,6 @@ def _load_string_from_filename(filename, gettext_): encoding='unicode', method='xml') - file = Gio.File.new_for_path(file_path) content = file.load_contents(None) return content[1].decode() @@ -705,6 +704,44 @@ def get_css_show_class(show): return '.gajim-status-offline' +def add_css_to_widget(widget, css): + provider = Gtk.CssProvider() + provider.load_from_data(bytes(css.encode())) + context = widget.get_style_context() + context.add_provider(provider, + Gtk.STYLE_PROVIDER_PRIORITY_USER) + + +def get_pixbuf_from_data(file_data): + # TODO: This already exists in preview_helpery pixbuf_from_data + """ + Get image data and returns GdkPixbuf.Pixbuf + """ + pixbufloader = GdkPixbuf.PixbufLoader() + try: + pixbufloader.write(file_data) + pixbufloader.close() + pixbuf = pixbufloader.get_pixbuf() + except GLib.GError: + pixbufloader.close() + + log.warning('loading avatar using pixbufloader failed, trying to ' + 'convert avatar image using pillow') + try: + avatar = Image.open(BytesIO(file_data)).convert("RGBA") + array = GLib.Bytes.new(avatar.tobytes()) + width, height = avatar.size + pixbuf = GdkPixbuf.Pixbuf.new_from_bytes( + array, GdkPixbuf.Colorspace.RGB, + True, 8, width, height, width * 4) + except Exception: + log.warning('Could not use pillow to convert avatar image, ' + 'image cannot be displayed', exc_info=True) + return + + return pixbuf + + def scale_with_ratio(size, width, height): if height == width: return size, size @@ -716,6 +753,19 @@ def scale_with_ratio(size, width, height): return size, int(size / ratio) +def scale_pixbuf(pixbuf, size): + width, height = scale_with_ratio(size, + pixbuf.get_width(), + pixbuf.get_height()) + return pixbuf.scale_simple(width, height, + GdkPixbuf.InterpType.BILINEAR) + + +def scale_pixbuf_from_data(data, size): + pixbuf = get_pixbuf_from_data(data) + return scale_pixbuf(pixbuf, size) + + def load_pixbuf(path, size=None): try: if size is None: ===================================== gajim/gtkgui_helpers.py deleted ===================================== @@ -1,187 +0,0 @@ -# Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> -# Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2006 Travis Shirk <travis AT pobox.com> -# Copyright (C) 2006-2007 Junglecow J <junglecow AT gmail.com> -# Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -# Copyright (C) 2007 James Newton <redshodan AT gmail.com> -# Julien Pivotto <roidelapluie AT gmail.com> -# Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> -# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -# -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -import os -import math -import logging -from io import BytesIO - -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GdkPixbuf -from gi.repository import GLib -from gi.repository import Pango - -try: - from PIL import Image -except Exception: - pass - -from gajim.common import app - -HAS_PYWIN32 = True -if os.name == 'nt': - try: - import win32file - import win32con - import pywintypes - except ImportError: - HAS_PYWIN32 = False - -log = logging.getLogger('gajim.gtkgui_helpers') - - -def get_pixbuf_from_data(file_data): - """ - Get image data and returns GdkPixbuf.Pixbuf - """ - pixbufloader = GdkPixbuf.PixbufLoader() - try: - pixbufloader.write(file_data) - pixbufloader.close() - pixbuf = pixbufloader.get_pixbuf() - except GLib.GError: - pixbufloader.close() - - log.warning('loading avatar using pixbufloader failed, trying to ' - 'convert avatar image using pillow') - try: - avatar = Image.open(BytesIO(file_data)).convert("RGBA") - array = GLib.Bytes.new(avatar.tobytes()) - width, height = avatar.size - pixbuf = GdkPixbuf.Pixbuf.new_from_bytes( - array, GdkPixbuf.Colorspace.RGB, - True, 8, width, height, width * 4) - except Exception: - log.warning('Could not use pillow to convert avatar image, ' - 'image cannot be displayed', exc_info=True) - return - - return pixbuf - -def file_is_locked(path_to_file): - """ - Return True if file is locked - - NOTE: Windows only. - """ - if os.name != 'nt': # just in case - return - - if not HAS_PYWIN32: - return - - secur_att = pywintypes.SECURITY_ATTRIBUTES() - secur_att.Initialize() - - try: - # try make a handle for READING the file - hfile = win32file.CreateFile( - path_to_file, # path to file - win32con.GENERIC_READ, # open for reading - 0, # do not share with other proc - secur_att, - win32con.OPEN_EXISTING, # existing file only - win32con.FILE_ATTRIBUTE_NORMAL, # normal file - 0 # no attr. template - ) - except pywintypes.error: - return True - else: # in case all went ok, close file handle (go to hell WinAPI) - hfile.Close() - return False - -def get_possible_button_event(event): - """ - Mouse or keyboard caused the event? - """ - if event.type == Gdk.EventType.KEY_PRESS: - return 0 # no event.button so pass 0 - # BUTTON_PRESS event, so pass event.button - return event.button - - -def scale_with_ratio(size, width, height): - if height == width: - return size, size - if height > width: - ratio = height / float(width) - return int(size / ratio), size - - ratio = width / float(height) - return size, int(size / ratio) - -def scale_pixbuf(pixbuf, size): - width, height = scale_with_ratio(size, - pixbuf.get_width(), - pixbuf.get_height()) - return pixbuf.scale_simple(width, height, - GdkPixbuf.InterpType.BILINEAR) - -def scale_pixbuf_from_data(data, size): - pixbuf = get_pixbuf_from_data(data) - return scale_pixbuf(pixbuf, size) - -def label_set_autowrap(widget): - """ - Make labels automatically re-wrap if their containers are resized. - Accepts label or container widgets - """ - if isinstance(widget, Gtk.Container): - children = widget.get_children() - for i in list(range(len(children))): - label_set_autowrap(children[i]) - elif isinstance(widget, Gtk.Label): - widget.set_line_wrap(True) - widget.connect_after('size-allocate', __label_size_allocate) - -def __label_size_allocate(widget, allocation): - """ - Callback which re-allocates the size of a label - """ - layout = widget.get_layout() - - lw_old, lh_old = layout.get_size() - # fixed width labels - if lw_old/Pango.SCALE == allocation.width: - return - - # set wrap width to the Pango.Layout of the labels ### - widget.set_alignment(0.0, 0.0) - layout.set_width(allocation.width * Pango.SCALE) - lh = layout.get_size()[1] - - if lh_old != lh: - widget.set_size_request(-1, lh / Pango.SCALE) - -def get_action(action): - return app.app.lookup_action(action) - -def add_css_to_widget(widget, css): - provider = Gtk.CssProvider() - provider.load_from_data(bytes(css.encode())) - context = widget.get_style_context() - context.add_provider(provider, - Gtk.STYLE_PROVIDER_PRIORITY_USER) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/519d9a34cc6ccbbd66893da4ac3c212… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/519d9a34cc6ccbbd66893da4ac3c212… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 6 commits: App: Remove get_name_from_jid
by Daniel Brötzmann (＠wurstsalat) 03 Oct '21

03 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 229e6c1a by wurstsalat at 2021-10-03T11:46:43+02:00 App: Remove get_name_from_jid - - - - - d986ef2d by wurstsalat at 2021-10-03T11:54:11+02:00 App: Remove get_our_jids - - - - - 384e2f98 by wurstsalat at 2021-10-03T11:58:13+02:00 App: Remove get_resource_from_jid - - - - - c5ad71dd by wurstsalat at 2021-10-03T12:01:02+02:00 App: Remove get_name_and_server_from_jid - - - - - aaf293f4 by wurstsalat at 2021-10-03T12:10:20+02:00 App: Remove get_nick_from_jid - - - - - 519d9a34 by wurstsalat at 2021-10-03T12:13:20+02:00 App: Remove get_an_id - - - - - 6 changed files: - gajim/common/app.py - gajim/common/connection_handlers_events.py - gajim/common/jingle_transport.py - gajim/gtk/controls/groupchat.py - gajim/gtk/groupchat_invite.py - gajim/gtk/notification.py Changes: ===================================== gajim/common/app.py ===================================== @@ -34,7 +34,6 @@ import os import sys import logging -import uuid import weakref from collections import namedtuple from collections import defaultdict @@ -327,21 +326,11 @@ def detect_desktop_env(): desktop_env = detect_desktop_env() -def get_an_id(): - return str(uuid.uuid4()) - -def get_nick_from_jid(jid): - pos = jid.find('@') - return jid[:pos] def get_server_from_jid(jid): pos = jid.find('@') + 1 # after @ return jid[pos:] -def get_name_and_server_from_jid(jid): - name = get_nick_from_jid(jid) - server = get_server_from_jid(jid) - return name, server def get_room_and_nick_from_fjid(jid): # fake jid is the jid for a contact in a room @@ -355,11 +344,6 @@ def get_room_and_nick_from_fjid(jid): def get_jid_without_resource(jid): return jid.split('/')[0] -def get_resource_from_jid(jid): - jids = jid.split('/', 1) - if len(jids) > 1: - return jids[1] # abc(a)doremi.org/res/res-continued - return '' def get_number_of_accounts(): """ @@ -521,14 +505,6 @@ def get_account_from_jid(jid): if jid == get_jid_from_account(account): return account -def get_our_jids(): - """ - Returns a list of the jids we use in our accounts - """ - our_jids = list() - for account in contacts.get_accounts(): - our_jids.append(get_jid_from_account(account)) - return our_jids def get_hostname_from_account(account_name, use_srv=False): """ @@ -551,17 +527,6 @@ def get_notification_image_prefix(jid): prefix = 'jabber' return prefix -def get_name_from_jid(account, jid): - """ - Return from JID's shown name and if no contact returns jids - """ - contact = contacts.get_first_contact_from_jid(account, jid) - if contact: - actor = contact.get_shown_name() - else: - actor = jid - return actor - def get_recent_groupchats(account): recent_groupchats = settings.get_account_setting( ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -233,6 +233,7 @@ def handle_incoming_pres_event(self, pres_obj): if app.jid_is_transport(pres_obj.jid): return True account = pres_obj.conn.name + client = app.get_client(account) self.jid = pres_obj.jid resource = pres_obj.resource or '' # It isn't an agent @@ -294,7 +295,8 @@ def handle_incoming_pres_event(self, pres_obj): self.popup_timeout = app.settings.get('notification_timeout') - nick = i18n.direction_mark + app.get_name_from_jid(account, self.jid) + contact = client.get_module('Contacts').get_contact(self.jid) + nick = i18n.direction_mark + contact.name if event == 'status_change': self.popup_title = _('%(nick)s Changed Status') % \ {'nick': nick} ===================================== gajim/common/jingle_transport.py ===================================== @@ -21,6 +21,7 @@ import logging import socket +import uuid from enum import IntEnum, unique import nbxmpp @@ -436,7 +437,7 @@ def make_candidate(self, candidate): 'network': '0', 'port': candidate.port, 'priority': int(candidate.priority), # hack - 'id': app.get_an_id() + 'id': str(uuid.uuid4()) } if candidate.type in types: attrs['type'] = types[candidate.type] ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -570,9 +570,9 @@ def _on_kick(self, _action, param): def _on_ban(self, _action, param): jid = param.get_string() + contact = self._client.get_module('Contacts').get_contact(jid) self._ban_jid = jid - nick = app.get_nick_from_jid(jid) - self.xml.ban_label.set_text(_('Ban %s') % nick) + self.xml.ban_label.set_text(_('Ban %s') % contact.name) self.xml.ban_reason_entry.grab_focus() self.xml.ban_participant_button.grab_default() self._show_page('ban') ===================================== gajim/gtk/groupchat_invite.py ===================================== @@ -76,7 +76,6 @@ def _add_accounts(self): def _add_contacts(self): show_account = len(self._accounts) > 1 - our_jids = app.get_our_jids() for account, _label in self._accounts: self.new_contact_rows[account] = None client = app.get_client(account) @@ -85,8 +84,8 @@ def _add_contacts(self): # Exclude group chats if contact.is_groupchat: continue - # Exclude our own jids - if contact.jid in our_jids: + # Exclude our own jid + if contact.jid == client.get_own_jid().bare: continue row = ContactRow(account, contact, contact.jid, ===================================== gajim/gtk/notification.py ===================================== @@ -268,6 +268,8 @@ def __init__(self, event_type, jid, account, msg_type='', self._ui = get_builder('popup_notification_window.ui') self.add(self._ui.eventbox) + client = app.get_client(account) + if event_type in (_('New Message'), _('New Private Message'), _('New E-mail')): @@ -300,12 +302,13 @@ def __init__(self, event_type, jid, account, msg_type='', gtkgui_helpers.add_css_to_widget(self._ui.color_bar, bar_class) self._ui.color_bar.get_style_context().add_class('popup-bar') - if not title: + if title is None: title = '' self._ui.event_type_label.set_markup(title) - if not text: - text = app.get_name_from_jid(account, jid) # default value of text + if text is None: + contact = client.get_module('Contacts').get_contact(jid) + text = contact.name # default value of text escaped_text = GLib.markup_escape_text(text) self._ui.event_description_label.set_markup(escaped_text) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b86af609b7064fa3c41e83d6e79de33… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b86af609b7064fa3c41e83d6e79de33… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Settings: Remove show_{mood,tune,location,activity}_in_roster
by Daniel Brötzmann (＠wurstsalat) 03 Oct '21

03 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b86af609 by wurstsalat at 2021-10-03T11:27:49+02:00 Settings: Remove show_{mood,tune,location,activity}_in_roster They are still shown in the chat control banner - - - - - 2 changed files: - gajim/common/setting_values.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -86,10 +86,6 @@ class _ACCOUNT_DEFAULT: 'muc_prefer_direct_msg': True, 'show_status_msgs_in_roster': True, 'show_avatars_in_roster': True, - 'show_mood_in_roster': True, - 'show_activity_in_roster': True, - 'show_tunes_in_roster': True, - 'show_location_in_roster': True, 'avatar_position_in_roster': 'right', 'print_status_in_chats': False, 'log_contact_status_changes': False, @@ -381,10 +377,6 @@ class _ACCOUNT_DEFAULT: 'muc_highlight_words': _('A list of words (semicolon separated) that will be highlighted in group chats.'), 'hide_on_main_window_x_button': _('If enabled, Gajim hides the main window when pressing the X button instead of minimizing into the notification area.'), 'main_window_skip_taskbar': _('Don’t show main window in the system taskbar.'), - 'show_mood_in_roster': '', - 'show_activity_in_roster': '', - 'show_tunes_in_roster': '', - 'show_location_in_roster': '', 'avatar_position_in_roster': _('Define the position of avatars in the contact list. Can be \'left\' or \'right\'.'), 'use_urgency_hint': _('If enabled, Gajim makes the window flash (the default behaviour in most Window Managers) when holding pending events.'), 'notification_timeout': '', ===================================== gajim/gtk/preferences.py ===================================== @@ -200,26 +200,6 @@ def __init__(self, *args): SettingType.CONFIG, 'show_avatars_in_roster', callback=self._on_show_avatar_in_roster_changed), - - Setting(SettingKind.SWITCH, - _('Show Mood'), - SettingType.CONFIG, - 'show_mood_in_roster'), - - Setting(SettingKind.SWITCH, - _('Show Activity'), - SettingType.CONFIG, - 'show_activity_in_roster'), - - Setting(SettingKind.SWITCH, - _('Show Tune'), - SettingType.CONFIG, - 'show_tunes_in_roster'), - - Setting(SettingKind.SWITCH, - _('Show Location'), - SettingType.CONFIG, - 'show_location_in_roster'), ] PreferenceBox.__init__(self, settings) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b86af609b7064fa3c41e83d6e79de337… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b86af609b7064fa3c41e83d6e79de337… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Preferences: Move 'sort by show' to roster menu
by Daniel Brötzmann (＠wurstsalat) 03 Oct '21

03 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: bf7096ec by wurstsalat at 2021-10-03T11:08:54+02:00 Preferences: Move 'sort by show' to roster menu - - - - - 3 changed files: - gajim/gtk/account_page.py - gajim/gtk/preferences.py - gajim/gtk/roster.py Changes: ===================================== gajim/gtk/account_page.py ===================================== @@ -30,6 +30,7 @@ ROSTER_MENU_DICT = { 'show-offline': _('Show Offline Contacts'), + 'sort-by-show': _('Sort by Status'), } ===================================== gajim/gtk/preferences.py ===================================== @@ -201,12 +201,6 @@ def __init__(self, *args): 'show_avatars_in_roster', callback=self._on_show_avatar_in_roster_changed), - Setting(SettingKind.SWITCH, - _('Sort Contacts by Status'), - SettingType.CONFIG, - 'sort_by_show_in_roster', - callback=self._on_sort_by_show_in_roster), - Setting(SettingKind.SWITCH, _('Show Mood'), SettingType.CONFIG, @@ -236,12 +230,6 @@ def _on_show_avatar_in_roster_changed(*args): # app.interface.roster.setup_and_draw_roster() pass - @staticmethod - def _on_sort_by_show_in_roster(*args): - # TODO - # app.interface.roster.setup_and_draw_roster() - pass - class Chats(PreferenceBox): def __init__(self, *args): ===================================== gajim/gtk/roster.py ===================================== @@ -134,6 +134,13 @@ def _add_actions(self): GLib.Variant.new_boolean(app.settings.get('showoffline'))) action.connect('change-state', self._on_show_offline) app.window.add_action(action) + action = Gio.SimpleAction.new_stateful( + f'sort-by-show-{self._account}', + None, + GLib.Variant.new_boolean( + app.settings.get('sort_by_show_in_roster'))) + action.connect('change-state', self._on_sort_by_show) + app.window.add_action(action) def update_actions(self): online = app.account_is_connected(self._account) @@ -264,6 +271,11 @@ def _on_show_offline(self, action, param): app.settings.set('showoffline', param.get_boolean()) self._refilter() + def _on_sort_by_show(self, action, param): + action.set_state(param) + app.settings.set('sort_by_show_in_roster', param.get_boolean()) + self._refilter() + def _on_contact_info(self, _action, param): app.window.contact_info(self._account, param.get_string()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf7096ec1276b9b352fe143734d427a1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf7096ec1276b9b352fe143734d427a1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Interface: Code linting
by Daniel Brötzmann (＠wurstsalat) 02 Oct '21

02 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 31d99f4e by wurstsalat at 2021-10-02T15:58:51+02:00 Interface: Code linting - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -53,7 +53,6 @@ from gajim.common import app from gajim.common import events -from gajim.common.dbus import location from gajim.common.dbus import logind from gajim.common.dbus import music_track @@ -207,7 +206,7 @@ def _create_core_handlers_list(self): 'zeroconf-name-conflict': [self.handle_event_zc_name_conflict], 'signed-in': [self.handle_event_signed_in], 'presence-received': [self.handle_event_presence], - 'our-show': [self.handle_event_status], + 'our-show': [self.handle_event_status], 'message-sent': [self.handle_event_msgsent], 'message-not-sent': [self.handle_event_msgnotsent], 'read-state-sync': [self.handle_event_read_state_sync], @@ -359,7 +358,7 @@ def raise_dialog(name, *args, **kwargs): def handle_event_iq_error(event): ctrl = app.window.get_control(event.account, event.properties.jid.bare) if ctrl and ctrl.is_groupchat: - ctrl.add_info_message('Error: %s' % event.properties.error) + ctrl.add_info_message(f'Error: {event.properties.error}') @staticmethod def handle_event_connection_lost(event): @@ -519,6 +518,7 @@ def handle_event_signed_in(event): app.window.show_account_page(account) def handle_event_presence(self, event): + # TODO: # 'NOTIFY' (account, (jid, status, status message, resource, # priority, timestamp)) # @@ -1456,7 +1456,7 @@ def _on_update_checked(self, _session, message): else: log.info('Gajim is up to date') - def run(self, application): + def run(self, _application): if app.settings.get('trayicon') != 'never': self.show_systray() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/31d99f4eefd22198a7607787720a46c4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/31d99f4eefd22198a7607787720a46c4… 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 October 2021