Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim] Pushed new tag gajim-1.1.0-beta1
by Yann Leboulanger 20 Aug '18

20 Aug '18

Yann Leboulanger pushed new tag gajim-1.1.0-beta1 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/gajim-1.1.0-beta1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HistoryManager: Convert RGB to hex
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2a4e5965 by Philipp Hörist at 2018-08-19T21:48:44Z HistoryManager: Convert RGB to hex - - - - - 1 changed file: - gajim/history_manager.py Changes: ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -89,6 +89,7 @@ from gajim.gtk import YesNoDialog from gajim.gtk import ErrorDialog from gajim.gtk import ConfirmationDialog from gajim.gtk.filechoosers import FileSaveDialog +from gajim.gtk.util import convert_rgb_to_hex from gajim import gtkgui_helpers @@ -393,16 +394,18 @@ class HistoryManager: else: color = None if kind in (KindConstant.SINGLE_MSG_RECV, - KindConstant.CHAT_MSG_RECV, KindConstant.GC_MSG): - # it is the other side - color = app.css_config.get_value('.gajim-incoming-nickname', StyleAttr.COLOR) # so incoming color + KindConstant.CHAT_MSG_RECV, + KindConstant.GC_MSG): + color = app.css_config.get_value( + '.gajim-incoming-nickname', StyleAttr.COLOR) elif kind in (KindConstant.SINGLE_MSG_SENT, - KindConstant.CHAT_MSG_SENT): # it is us - color = app.css_config.get_value('.gajim-outgoing-nickname', StyleAttr.COLOR) # so outgoing color + KindConstant.CHAT_MSG_SENT): + color = app.css_config.get_value( + '.gajim-outgoing-nickname', StyleAttr.COLOR) elif kind in (KindConstant.STATUS, - KindConstant.GCSTATUS): # is is statuses - # so status color - color = app.css_config.get_value('.gajim-status-message', StyleAttr.COLOR) + KindConstant.GCSTATUS): + color = app.css_config.get_value( + '.gajim-status-message', StyleAttr.COLOR) # include status into (status) message if message is None: message = '' @@ -413,10 +416,11 @@ class HistoryManager: message_ = '<span' if color: - message_ += ' foreground="%s"' % color + message_ += ' foreground="%s"' % convert_rgb_to_hex(color) message_ += '>%s</span>' % GLib.markup_escape_text(message) - self.logs_liststore.append((str(log_line_id), str(jid_id), - time_, message_, subject, nickname)) + self.logs_liststore.append( + (str(log_line_id), str(jid_id), + time_, message_, subject, nickname)) def _fill_search_results_listview(self, text): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2a4e59654f62ba63fba2cf9d32036a6404… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2a4e59654f62ba63fba2cf9d32036a6404… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] HistoryManager: Convert RGB to hex
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: e8526bb0 by Philipp Hörist at 2018-08-19T21:48:07Z HistoryManager: Convert RGB to hex - - - - - 1 changed file: - gajim/history_manager.py Changes: ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -89,6 +89,7 @@ from gajim.gtk import YesNoDialog from gajim.gtk import ErrorDialog from gajim.gtk import ConfirmationDialog from gajim.gtk.filechoosers import FileSaveDialog +from gajim.gtk.util import convert_rgb_to_hex from gajim import gtkgui_helpers @@ -393,16 +394,18 @@ class HistoryManager: else: color = None if kind in (KindConstant.SINGLE_MSG_RECV, - KindConstant.CHAT_MSG_RECV, KindConstant.GC_MSG): - # it is the other side - color = app.css_config.get_value('.gajim-incoming-nickname', StyleAttr.COLOR) # so incoming color + KindConstant.CHAT_MSG_RECV, + KindConstant.GC_MSG): + color = app.css_config.get_value( + '.gajim-incoming-nickname', StyleAttr.COLOR) elif kind in (KindConstant.SINGLE_MSG_SENT, - KindConstant.CHAT_MSG_SENT): # it is us - color = app.css_config.get_value('.gajim-outgoing-nickname', StyleAttr.COLOR) # so outgoing color + KindConstant.CHAT_MSG_SENT): + color = app.css_config.get_value( + '.gajim-outgoing-nickname', StyleAttr.COLOR) elif kind in (KindConstant.STATUS, - KindConstant.GCSTATUS): # is is statuses - # so status color - color = app.css_config.get_value('.gajim-status-message', StyleAttr.COLOR) + KindConstant.GCSTATUS): + color = app.css_config.get_value( + '.gajim-status-message', StyleAttr.COLOR) # include status into (status) message if message is None: message = '' @@ -413,10 +416,11 @@ class HistoryManager: message_ = '<span' if color: - message_ += ' foreground="%s"' % color + message_ += ' foreground="%s"' % convert_rgb_to_hex(color) message_ += '>%s</span>' % GLib.markup_escape_text(message) - self.logs_liststore.append((str(log_line_id), str(jid_id), - time_, message_, subject, nickname)) + self.logs_liststore.append( + (str(log_line_id), str(jid_id), + time_, message_, subject, nickname)) def _fill_search_results_listview(self, text): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e8526bb063a9d58c1de94c1d89c05fbe44… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e8526bb063a9d58c1de94c1d89c05fbe44… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Time: use classes from standard library
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5d853e90 by André Apitzsch at 2018-08-19T21:29:05Z Time: use classes from standard library - - - - - 1 changed file: - gajim/common/modules/entity_time.py Changes: ===================================== gajim/common/modules/entity_time.py ===================================== --- a/gajim/common/modules/entity_time.py +++ b/gajim/common/modules/entity_time.py @@ -25,8 +25,6 @@ from gajim.common.nec import NetworkIncomingEvent log = logging.getLogger('gajim.c.m.entity_time') -ZERO = datetime.timedelta(0) - class EntityTime: def __init__(self, con): @@ -79,7 +77,7 @@ class EntityTime: tzo = '0:0' try: tzoh, tzom = tzo.split(':') - except Exception as e: + except Exception: log.warning('Wrong tzo node: %s', stanza) return utc_time = time_.getTag('utc').getData() @@ -106,8 +104,11 @@ class EntityTime: e, stanza.getFrom()) return - t = t.replace(tzinfo=UTC()) - return t.astimezone(contact_tz(tzoh, tzom)).strftime('%c') + utc = datetime.timezone(datetime.timedelta(0)) + t = t.replace(tzinfo=utc) + utc_offset = datetime.timedelta(hours=int(tzoh), minutes=int(tzom)) + contact_tz = datetime.timezone(utc_offset, "remote timezone") + return t.astimezone(contact_tz).strftime('%c') def _answer_request(self, con, stanza): log.info('%s asked for the time', stanza.getFrom()) @@ -138,33 +139,5 @@ class TimeResultReceivedEvent(NetworkIncomingEvent): return True -class UTC(datetime.tzinfo): - def utcoffset(self, dt): - return ZERO - - def tzname(self, dt): - return "UTC" - - def dst(self, dt): - return ZERO - - -class contact_tz(datetime.tzinfo): - - def __init__(self, tzoh, tzom): - self._tzoh = tzoh - self._tzom = tzom - - def utcoffset(self, dt): - return datetime.timedelta(hours=int(self._tzoh), - minutes=int(self._tzom)) - - def tzname(self, dt): - return "remote timezone" - - def dst(self, dt): - return ZERO - - def get_instance(*args, **kwargs): return EntityTime(*args, **kwargs), 'EntityTime' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5d853e902a0506f88393b1e8a4ab16a971… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5d853e902a0506f88393b1e8a4ab16a971… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Appveyor: build correct branch
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: b0aa555a by Philipp Hörist at 2018-08-19T20:30:34Z Appveyor: build correct branch - - - - - 1 changed file: - appveyor.yml Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ environment: branches: only: - - master + - gajim_1.1 clone_depth: 1 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b0aa555ac85e83e76ddfadc1ba2e8dcc45… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b0aa555ac85e83e76ddfadc1ba2e8dcc45… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix emoji theme fallback
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e128a3f6 by Philipp Hörist at 2018-08-19T19:38:11Z Fix emoji theme fallback - - - - - 1 changed file: - gajim/gtk/emoji_chooser.py Changes: ===================================== gajim/gtk/emoji_chooser.py ===================================== --- a/gajim/gtk/emoji_chooser.py +++ b/gajim/gtk/emoji_chooser.py @@ -276,10 +276,6 @@ class EmojiChooser(Gtk.Popover): def _get_current_theme(self): theme = app.config.get('emoticons_theme') - if not theme: - log.warning('No emoji theme set') - return - themes = helpers.get_available_emoticon_themes() if theme not in themes: if sys.platform not in ('win32', 'darwin'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e128a3f6760e41ccd0bbcf3679c359d31c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e128a3f6760e41ccd0bbcf3679c359d31c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Fix emoji theme fallback
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 8564edd5 by Philipp Hörist at 2018-08-19T19:37:34Z Fix emoji theme fallback - - - - - 1 changed file: - gajim/gtk/emoji_chooser.py Changes: ===================================== gajim/gtk/emoji_chooser.py ===================================== --- a/gajim/gtk/emoji_chooser.py +++ b/gajim/gtk/emoji_chooser.py @@ -276,10 +276,6 @@ class EmojiChooser(Gtk.Popover): def _get_current_theme(self): theme = app.config.get('emoticons_theme') - if not theme: - log.warning('No emoji theme set') - return - themes = helpers.get_available_emoticon_themes() if theme not in themes: if sys.platform not in ('win32', 'darwin'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8564edd5f3265bf80e899cd857c66a5cd5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8564edd5f3265bf80e899cd857c66a5cd5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Update Gajim version to 1.0.99
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 6a33163d by Philipp Hörist at 2018-08-19T16:09:08Z Update Gajim version to 1.0.99 - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.0.3" +__version__ = "1.0.99" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6a33163d429982e6accb84d00d08a7aa03… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6a33163d429982e6accb84d00d08a7aa03… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update Gajim version to 1.0.99
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8ab60762 by Philipp Hörist at 2018-08-19T16:08:00Z Update Gajim version to 1.0.99 - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,7 +1,7 @@ import os import subprocess -__version__ = "1.0.3" +__version__ = "1.0.99" IS_FLATPAK = False if os.path.exists('/app/share/run-as-flatpak'): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8ab607629b6ced1b47bebadc75776a24ea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8ab607629b6ced1b47bebadc75776a24ea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move filechoosers into gtk module
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1c69b92d by Philipp Hörist at 2018-08-19T15:47:17Z Move filechoosers into gtk module - - - - - 8 changed files: - gajim/filetransfers_window.py - gajim/groupchat_control.py - gajim/filechoosers.py → gajim/gtk/filechoosers.py - gajim/gtk/profile.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/history_manager.py - gajim/plugins/gui.py Changes: ===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -48,7 +48,7 @@ from gajim.common import helpers from gajim.common.file_props import FilesProp from gajim.common.protocol.bytestream import (is_transfer_active, is_transfer_paused, is_transfer_stopped) -from gajim.filechoosers import FileSaveDialog, FileChooserDialog +from gajim.gtk.filechoosers import FileSaveDialog, FileChooserDialog from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 import logging log = logging.getLogger('gajim.filetransfer_window') ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -63,7 +63,7 @@ from gajim.common.const import StyleAttr from gajim.chat_control import ChatControl from gajim.chat_control_base import ChatControlBase -from gajim.filechoosers import AvatarChooserDialog +from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk import ErrorDialog from gajim.gtk import InputTextDialog from gajim.gtk import ConfirmationDialogCheck ===================================== gajim/filechoosers.py → gajim/gtk/filechoosers.py ===================================== --- a/gajim/filechoosers.py +++ b/gajim/gtk/filechoosers.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# # Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> # # This file is part of Gajim. ===================================== gajim/gtk/profile.py ===================================== --- a/gajim/gtk/profile.py +++ b/gajim/gtk/profile.py @@ -29,7 +29,7 @@ from gajim import gtkgui_helpers from gajim.gtk import ErrorDialog from gajim.gtk import InformationDialog from gajim.gtk.util import get_builder -from gajim.filechoosers import AvatarChooserDialog +from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.common.const import AvatarSize from gajim.common import app from gajim.common import ged ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -52,7 +52,6 @@ from gajim.common import i18n from gajim.common import app from gajim.common import configpaths from gajim.common.const import PEPEventType, ACTIVITIES, MOODS -from gajim.filechoosers import AvatarSaveDialog gtk_icon_theme = Gtk.IconTheme.get_default() gtk_icon_theme.append_search_path(configpaths.get('ICONS')) @@ -464,6 +463,7 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): from gajim.gtk import ErrorDialog from gajim.gtk import ConfirmationDialog from gajim.gtk import FTOverwriteConfirmationDialog + from gajim.gtk.filechoosers import AvatarSaveDialog def on_continue(response, file_path): if response < 0: return ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -70,7 +70,7 @@ from gajim import message_control from gajim.dialog_messages import get_dialog from gajim.dialogs import ProgressWindow -from gajim.filechoosers import FileChooserDialog +from gajim.gtk.filechoosers import FileChooserDialog from gajim.chat_control_base import ChatControlBase from gajim.chat_control import ChatControl ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -88,7 +88,7 @@ from gajim.common import helpers from gajim.gtk import YesNoDialog from gajim.gtk import ErrorDialog from gajim.gtk import ConfirmationDialog -from gajim.filechoosers import FileSaveDialog +from gajim.gtk.filechoosers import FileSaveDialog from gajim import gtkgui_helpers ===================================== gajim/plugins/gui.py ===================================== --- a/gajim/plugins/gui.py +++ b/gajim/plugins/gui.py @@ -36,7 +36,7 @@ from enum import IntEnum, unique from gajim import gtkgui_helpers from gajim.gtk import WarningDialog from gajim.gtk import YesNoDialog -from gajim.filechoosers import ArchiveChooserDialog +from gajim.gtk.filechoosers import ArchiveChooserDialog from gajim.common import app from gajim.common import configpaths from gajim.plugins.helpers import log_calls View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1c69b92d8517e672e1b307f69954bb138c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1c69b92d8517e672e1b307f69954bb138c… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits