Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 5 commits: Add CSS Provider and convert config values to css
by Philipp Hörist 03 Mar '17

03 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 516a18eb by Philipp Hörist at 2017-03-02T23:57:05+01:00 Add CSS Provider and convert config values to css - - - - - e00341e8 by Philipp Hörist at 2017-03-02T23:58:21+01:00 Dont use depracted override_background_color() - - - - - 9ecabd56 by Philipp Hörist at 2017-03-03T00:00:22+01:00 Dont use depracted override_color() - - - - - 0abb26ae by Philipp Hörist at 2017-03-03T00:11:23+01:00 Dont use depracted override_font() - - - - - a44be8e6 by Philipp Hörist at 2017-03-04T00:24:48+01:00 Merge branch 'master' into 'master' CSS Styling See merge request !62 - - - - - 15 changed files: - data/gui/chat_control.ui - data/gui/service_discovery_window.ui - + data/style/gajim.css - src/chat_control.py - src/chat_control_base.py - src/common/config.py - src/config.py - src/conversation_textview.py - src/dialogs.py - src/disco.py - src/gajim.py - src/groupchat_control.py - src/gtkgui_helpers.py - src/message_window.py - src/roster_window.py Changes: ===================================== data/gui/chat_control.ui ===================================== --- a/data/gui/chat_control.ui +++ b/data/gui/chat_control.ui @@ -382,6 +382,7 @@ <property name="spacing">5</property> <child> <object class="GtkEventBox" id="banner_eventbox"> + <property name="name">ChatControl-BannerEventBox</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -411,6 +412,7 @@ <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="banner_name_label"> + <property name="name">ChatControl-BannerNameLabel</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label"><span weight="heavy" size="large">Contact name</span></property> @@ -425,6 +427,7 @@ </child> <child> <object class="GtkLabel" id="banner_label"> + <property name="name">ChatControl-BannerLabel</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label">label</property> ===================================== data/gui/service_discovery_window.ui ===================================== --- a/data/gui/service_discovery_window.ui +++ b/data/gui/service_discovery_window.ui @@ -24,6 +24,7 @@ <property name="spacing">6</property> <child> <object class="GtkEventBox" id="banner_agent_eventbox"> + <property name="name">Discovery-BannerEventBox</property> <property name="visible">True</property> <property name="can_focus">False</property> <child> @@ -33,6 +34,7 @@ <property name="spacing">6</property> <child> <object class="GtkLabel" id="banner_agent_label"> + <property name="name">Discovery-BannerLabel</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="ypad">6</property> ===================================== data/style/gajim.css ===================================== --- /dev/null +++ b/data/style/gajim.css ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -1024,8 +1024,8 @@ class ChatControl(ChatControlBase): displaymarking = None if self.correcting: self.correcting = False - self.msg_textview.override_background_color( - Gtk.StateType.NORMAL, self.old_message_tv_color) + gtkgui_helpers.remove_css_class( + self.msg_textview, 'msgcorrectingcolor') self.print_conversation(message, self.contact.jid, encrypted=encrypted, xep0184_id=xep0184_id, xhtml=xhtml, @@ -1226,7 +1226,7 @@ class ChatControl(ChatControlBase): else: self.old_msg_kind = kind - def get_tab_label(self, chatstate): + def get_tab_label(self): unread = '' if self.resource: jid = self.contact.get_full_jid() @@ -1239,48 +1239,13 @@ class ChatControl(ChatControlBase): elif num_unread > 1: unread = '[' + str(num_unread) + ']' - # Draw tab label using chatstate - theme = gajim.config.get('roster_theme') - color_s = None - if not chatstate: - chatstate = self.contact.chatstate - if chatstate is not None: - if chatstate == 'composing': - color_s = gajim.config.get_per('themes', theme, - 'state_composing_color') - elif chatstate == 'inactive': - color_s = gajim.config.get_per('themes', theme, - 'state_inactive_color') - elif chatstate == 'gone': - color_s = gajim.config.get_per('themes', theme, - 'state_gone_color') - elif chatstate == 'paused': - color_s = gajim.config.get_per('themes', theme, - 'state_paused_color') - - context = self.parent_win.notebook.get_style_context() - if color_s: - # We set the color for when it's the current tab or not - color = Gdk.RGBA() - ok = Gdk.RGBA.parse(color, color_s) - if not ok: - del color - color = context.get_color(Gtk.StateFlags.ACTIVE) - # In inactive tab color to be lighter against the darker inactive - # background - if chatstate in ('inactive', 'gone') and\ - self.parent_win.get_active_control() != self: - color = self.lighten_color(color) - else: # active or not chatstate, get color from gtk - color = context.get_color(Gtk.StateFlags.ACTIVE) - name = self.contact.get_shown_name() if self.resource: name += '/' + self.resource label_str = GLib.markup_escape_text(name) if num_unread: # if unread, text in the label becomes bold label_str = '<b>' + unread + label_str + '</b>' - return (label_str, color) + return label_str def get_tab_image(self, count_unread=True): if self.resource: ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -158,7 +158,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): """ Derived types MAY implement this """ - self._paint_banner() self.draw_banner() def _update_banner_state_image(self): @@ -344,8 +343,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.msg_textview.drag_dest_set(Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT, self.dnd_list, Gdk.DragAction.COPY) - self.update_font() - # Hook up send button widget = self.xml.get_object('send_button') id_ = widget.connect('clicked', self._on_send_button_clicked) @@ -371,7 +368,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if gajim.config.get('use_speller') and HAS_GTK_SPELL: self.set_speller() self.conv_textview.tv.show() - self._paint_banner() # For XEP-0172 self.user_nick = None @@ -503,76 +499,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # send the message self.send_message(message, xhtml=xhtml) - def _paint_banner(self): - """ - Repaint banner with theme color - """ - theme = gajim.config.get('roster_theme') - bgcolor = gajim.config.get_per('themes', theme, 'bannerbgcolor') - textcolor = gajim.config.get_per('themes', theme, 'bannertextcolor') - # the backgrounds are colored by using an eventbox by - # setting the bg color of the eventbox and the fg of the name_label - banner_eventbox = self.xml.get_object('banner_eventbox') - banner_name_label = self.xml.get_object('banner_name_label') - self.disconnect_style_event(banner_name_label) - self.disconnect_style_event(self.banner_status_label) - if bgcolor: - color = Gdk.RGBA() - Gdk.RGBA.parse(color, bgcolor) - banner_eventbox.override_background_color(Gtk.StateType.NORMAL, - color) - default_bg = False - else: - default_bg = True - if textcolor: - color = Gdk.RGBA() - Gdk.RGBA.parse(color, textcolor) - banner_name_label.override_color(Gtk.StateType.NORMAL, - color) - self.banner_status_label.override_color( - Gtk.StateType.NORMAL, color) - default_fg = False - else: - default_fg = True - if default_bg or default_fg: - self._on_style_set_event(banner_name_label, None, default_fg, - default_bg) - if self.banner_status_label.get_realized(): - # Widget is realized - self._on_style_set_event(self.banner_status_label, None, default_fg, - default_bg) - - def disconnect_style_event(self, widget): - # Try to find the event_id - for id_ in self.handlers.keys(): - if self.handlers[id_] == widget: - widget.disconnect(id_) - del self.handlers[id_] - break - - def connect_style_event(self, widget, set_fg=False, set_bg=False): - self.disconnect_style_event(widget) - id_ = widget.connect('style-set', self._on_style_set_event, set_fg, - set_bg) - self.handlers[id_] = widget - - def _on_style_set_event(self, widget, style, *opts): - """ - Set style of widget from style class *.Frame.Eventbox - opts[0] == True -> set fg color - opts[1] == True -> set bg color - """ - banner_eventbox = self.xml.get_object('banner_eventbox') - self.disconnect_style_event(widget) - context = widget.get_style_context() - if opts[1]: - bg_color = context.get_background_color(Gtk.StateFlags.SELECTED) - banner_eventbox.override_background_color(Gtk.StateType.NORMAL, bg_color) - if opts[0]: - fg_color = context.get_color(Gtk.StateFlags.SELECTED) - widget.override_color(Gtk.StateType.NORMAL, fg_color) - self.connect_style_event(widget, opts[0], opts[1]) - def _conv_textview_key_press_event(self, widget, event): # translate any layout to latin_layout valid, entries = self.keymap.get_entries_for_keyval(event.keyval) @@ -968,11 +894,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): gtkgui_helpers.popup_emoticons_under_button(menu, widget, self.parent_win) - def update_font(self): - font = Pango.FontDescription(gajim.config.get('conversation_font')) - self.conv_textview.tv.override_font(font) - self.msg_textview.override_font(font) - def update_tags(self): self.conv_textview.update_tags() @@ -1226,20 +1147,15 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): msg_type == 'sent' and not self.correcting and (not \ history[pos - 1].startswith('/') or history[pos - 1].startswith('/me')): self.correcting = True - context = self.msg_textview.get_style_context() - state = Gtk.StateFlags.NORMAL - self.old_message_tv_color = context.get_background_color(state) - color = Gdk.RGBA() - Gdk.RGBA.parse(color, 'PaleGoldenrod') - self.msg_textview.override_background_color(Gtk.StateType.NORMAL, - color) + gtkgui_helpers.add_css_class( + self.msg_textview, 'msgcorrectingcolor') message = history[pos - 1] msg_buf.set_text(message) return if self.correcting: # We were previously correcting - self.msg_textview.override_background_color(Gtk.StateType.NORMAL, - self.old_message_tv_color) + gtkgui_helpers.remove_css_class( + self.msg_textview, 'msgcorrectingcolor') self.correcting = False pos += -1 if direction == 'up' else +1 if pos == -1: @@ -1258,14 +1174,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): message = '> %s\n' % message.replace('\n', '\n> ') msg_buf.set_text(message) - def lighten_color(self, color): - p = 0.4 - mask = 0 - color.red = int((color.red * p) + (mask * (1 - p))) - color.green = int((color.green * p) + (mask * (1 - p))) - color.blue = int((color.blue * p) + (mask * (1 - p))) - return color - def widget_set_visible(self, widget, state): """ Show or hide a widget ===================================== src/common/config.py ===================================== --- a/src/common/config.py +++ b/src/common/config.py @@ -468,6 +468,7 @@ class Config: 'bannerbgcolor': [ opt_color, '', '', True ], 'bannerfont': [ opt_str, '', '', True ], 'bannerfontattrs': [ opt_str, 'B', '', True ], + 'msgcorrectingcolor': [opt_color, '#eee8aa'], # http://www.pitt.edu/~nisg/cis/web/cgi/rgb.html 'state_inactive_color': [ opt_color, 'grey62' ], ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -750,6 +750,7 @@ class PreferencesWindow: # begin repainting themed widgets throughout gajim.interface.roster.repaint_themed_widgets() gajim.interface.roster.change_roster_style(None) + gtkgui_helpers.load_css() def update_theme_list(self): theme_combobox = self.xml.get_object('theme_combobox') @@ -880,14 +881,7 @@ class PreferencesWindow: else: font = '' gajim.config.set(text, font) - self.update_text_font() - - def update_text_font(self): - """ - Update text font in opened chat windows - """ - for ctrl in self._get_all_controls(): - ctrl.update_font() + gtkgui_helpers.load_css() def on_incoming_nick_colorbutton_color_set(self, widget): self.on_preference_widget_color_set(widget, 'inmsgcolor') ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -238,8 +238,8 @@ class ConversationTextview(GObject.GObject): self.change_cursor = False self.last_time_printout = 0 - font = Pango.FontDescription(gajim.config.get('conversation_font')) - self.tv.override_font(font) + style = self.tv.get_style_context() + style.add_class('font_custom') buffer_ = self.tv.get_buffer() end_iter = buffer_.get_end_iter() buffer_.create_mark('end', end_iter, False) ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -3379,10 +3379,6 @@ class XMLConsoleWindow: self.enabled = True self.xml.get_object('enable_checkbutton').set_active(True) - col = Gdk.RGBA() - Gdk.RGBA.parse(col, color) - self.input_textview.override_color(Gtk.StateType.NORMAL, col) - if len(gajim.connections) > 1: title = _('XML Console for %s') % self.account else: ===================================== src/disco.py ===================================== --- a/src/disco.py +++ b/src/disco.py @@ -561,7 +561,6 @@ _('Without a connection, you can not browse available services')) self.banner_eventbox = self.xml.get_object('banner_agent_eventbox') self.style_event_id = 0 self.banner.realize() - self.paint_banner() self.action_buttonbox = self.xml.get_object('action_buttonbox') # Address combobox @@ -660,63 +659,6 @@ _('Without a connection, you can not browse available services')) (markup, font.to_string(), text_after) self.banner.set_markup(markup) - def paint_banner(self): - """ - Repaint the banner with theme color - """ - theme = gajim.config.get('roster_theme') - bgcolor = gajim.config.get_per('themes', theme, 'bannerbgcolor') - textcolor = gajim.config.get_per('themes', theme, 'bannertextcolor') - self.disconnect_style_event() - if bgcolor: - color = Gdk.RGBA() - Gdk.RGBA.parse(color, bgcolor) - self.banner_eventbox.override_background_color(Gtk.StateType.NORMAL, - color) - default_bg = False - else: - default_bg = True - - if textcolor: - color = Gdk.RGBA() - Gdk.RGBA.parse(color, textcolor) - self.banner.override_color(Gtk.StateType.NORMAL, color) - default_fg = False - else: - default_fg = True - if default_fg or default_bg: - self._on_style_set_event(self.banner, None, default_fg, default_bg) - if self.browser: - self.browser.update_theme() - - def disconnect_style_event(self): - if self.style_event_id: - self.banner.disconnect(self.style_event_id) - self.style_event_id = 0 - - def connect_style_event(self, set_fg = False, set_bg = False): - self.disconnect_style_event() - self.style_event_id = self.banner.connect('style-set', - self._on_style_set_event, set_fg, set_bg) - - def _on_style_set_event(self, widget, style, *opts): - """ - Set style of widget from style class *.Frame.Eventbox - opts[0] == True -> set fg color - opts[1] == True -> set bg color - """ - self.disconnect_style_event() - context = widget.get_style_context() - if opts[1]: - bg_color = context.get_background_color(Gtk.StateFlags.SELECTED) - self.banner_eventbox.override_background_color(Gtk.StateType.NORMAL, - bg_color) - if opts[0]: - fg_color = context.get_color(Gtk.StateFlags.SELECTED) - self.banner.override_color(Gtk.StateType.NORMAL, fg_color) - self.banner.ensure_style() - self.connect_style_event(opts[0], opts[1]) - def destroy(self, chain = False): """ Close the browser. This can optionally close its children and propagate ===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -245,7 +245,9 @@ class GajimApplication(Gtk.Application): def do_activate(self): Gtk.Application.do_activate(self) from gui_interface import Interface + import gtkgui_helpers self.interface = Interface() + gtkgui_helpers.load_css() self.interface.run(self) self.add_actions() import gui_menu_builder ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -709,29 +709,17 @@ class GroupchatControl(ChatControlBase): has_focus = self.parent_win.window.get_property('has-toplevel-focus') current_tab = self.parent_win.get_active_control() == self - color_name = None color = None - theme = gajim.config.get('roster_theme') - context = self.parent_win.notebook.get_style_context() if chatstate == 'attention' and (not has_focus or not current_tab): self.attention_flag = True - color_name = gajim.config.get_per('themes', theme, - 'state_muc_directed_msg_color') - elif chatstate: - if chatstate == 'active' or (current_tab and has_focus): - self.attention_flag = False - # get active color from gtk - color = context.get_color(Gtk.StateFlags.ACTIVE) - elif chatstate == 'newmsg' and (not has_focus or not current_tab) \ - and not self.attention_flag: - color_name = gajim.config.get_per('themes', theme, - 'state_muc_msg_color') - if color_name: - color = Gdk.RGBA() - ok = Gdk.RGBA.parse(color, color_name) - if not ok: - del color - color = context.get_color(Gtk.StateFlags.ACTIVE) + color = 'state_muc_directed_msg_color' + elif chatstate == 'active' or (current_tab and has_focus): + self.attention_flag = False + # get active color from gtk + color = 'active' + elif chatstate == 'newmsg' and (not has_focus or not current_tab) \ + and not self.attention_flag: + color = 'state_muc_msg_color' if self.is_continued: # if this is a continued conversation @@ -1996,8 +1984,8 @@ class GroupchatControl(ChatControlBase): self.last_sent_msg = msg if self.correcting: self.correcting = False - self.msg_textview.override_background_color( - Gtk.StateType.NORMAL, self.old_message_tv_color) + gtkgui_helpers.remove_css_class( + self.msg_textview, 'msgcorrectingcolor') if self.correcting and self.last_sent_msg: correction_msg = self.last_sent_msg ===================================== src/gtkgui_helpers.py ===================================== --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -48,6 +48,7 @@ log = logging.getLogger('gajim.gtkgui_helpers') from common import i18n from common import gajim from common import pep +from common import configpaths gtk_icon_theme = Gtk.IconTheme.get_default() gtk_icon_theme.append_search_path(gajim.ICONS_DIR) @@ -1088,3 +1089,91 @@ def __label_size_allocate(widget, allocation): def get_action(action): return gajim.app.lookup_action(action) + +def load_css(): + path = os.path.join(configpaths.get('DATA'), 'style', 'gajim.css') + try: + with open(path, "r") as f: + css = f.read() + except Exception as exc: + print('Error loading css: %s', exc) + return + + provider = Gtk.CssProvider() + css = "\n".join((css, convert_config_to_css())) + provider.load_from_data(bytes(css.encode())) + Gtk.StyleContext.add_provider_for_screen( + Gdk.Screen.get_default(), + provider, + Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) + +def convert_config_to_css(): + css = '' + themed_widgets = { + 'ChatControl-BannerEventBox': ('bannerbgcolor', 'background'), + 'ChatControl-BannerNameLabel': ('bannertextcolor', 'color'), + 'ChatControl-BannerLabel': ('bannertextcolor', 'color'), + 'Discovery-BannerEventBox': ('bannerbgcolor', 'background'), + 'Discovery-BannerLabel': ('bannertextcolor', 'color')} + + classes = {'state_composing_color': ('', 'color'), + 'state_inactive_color': ('', 'color'), + 'state_gone_color': ('', 'color'), + 'state_paused_color': ('', 'color'), + 'msgcorrectingcolor': ('text', 'background'), + 'state_muc_directed_msg_color': ('', 'color'), + 'state_muc_msg_color': ('', 'color')} + + + theme = gajim.config.get('roster_theme') + for key, values in themed_widgets.items(): + config, attr = values + css += '#{} {{'.format(key) + value = gajim.config.get_per('themes', theme, config) + if value: + css += '{attr}: {color};\n'.format(attr=attr, color=value) + css += '}\n' + + for key, values in classes.items(): + node, attr = values + value = gajim.config.get_per('themes', theme, key) + if value: + css += '.theme_{cls} {node} {{ {attr}: {color}; }}\n'.format( + cls=key, node=node, attr=attr, color=value) + + css += add_css_font() + + return css + +def add_css_class(widget, class_name): + style = widget.get_style_context() + for css_cls in style.list_classes(): + if css_cls.startswith('theme_'): + style.remove_class(css_cls) + if class_name: + style.add_class('theme_' + class_name) + +def remove_css_class(widget, class_name): + style = widget.get_style_context() + style.remove_class('theme_' + class_name) + +def add_css_font(): + conversation_font = gajim.config.get('conversation_font') + if not conversation_font: + return '' + font = Pango.FontDescription(conversation_font) + unit = "pt" if Gtk.check_version(3, 22, 0) is None else "px" + css = """ + .font_custom {{ + font-family: {family}; + font-size: {size}{unit}; + font-weight: {weight}; + }}""".format( + family=font.get_family(), + size=int(round(font.get_size() / Pango.SCALE)), + unit=unit, + weight=int(font.get_weight())) + css = css.replace("font-size: 0{unit};".format(unit=unit), "") + css = css.replace("font-weight: 0;", "") + css = "\n".join(filter(lambda x: x.strip(), css.splitlines())) + return css ===================================== src/message_window.py ===================================== --- a/src/message_window.py +++ b/src/message_window.py @@ -39,6 +39,7 @@ import gtkgui_helpers import message_control import dialogs from chat_control_base import ChatControlBase +from chat_control import ChatControl from common import gajim from gtkgui_helpers import get_action @@ -636,7 +637,7 @@ class MessageWindow(object): window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER self.notebook.set_show_tabs(show_tabs_if_one_tab) - def redraw_tab(self, ctrl, chatstate = None): + def redraw_tab(self, ctrl, chatstate=None): tab = self.notebook.get_tab_label(ctrl.widget) if not tab: return @@ -653,11 +654,20 @@ class MessageWindow(object): # Update nick nick_label.set_max_width_chars(10) - (tab_label_str, tab_label_color) = ctrl.get_tab_label(chatstate) + if isinstance(ctrl, ChatControl): + tab_label_str = ctrl.get_tab_label() + # Set Label Color + class_name = 'state_{}_color'.format(chatstate) + gtkgui_helpers.add_css_class(nick_label, class_name) + else: + tab_label_str, color = ctrl.get_tab_label(chatstate) + # Set Label Color + if color == 'active': + gtkgui_helpers.add_css_class(nick_label, None) + elif color is not None: + gtkgui_helpers.add_css_class(nick_label, color) + nick_label.set_markup(tab_label_str) - if tab_label_color: - nick_label.override_color(Gtk.StateFlags.NORMAL, tab_label_color) - nick_label.override_color(Gtk.StateFlags.ACTIVE, tab_label_color) tab_img = ctrl.get_tab_image() if tab_img: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -4800,8 +4800,6 @@ class RosterWindow: for win in gajim.interface.msg_win_mgr.windows(): win.repaint_themed_widgets() for account in gajim.connections: - for addr in gajim.interface.instances[account]['disco']: - gajim.interface.instances[account]['disco'][addr].paint_banner() for ctrl in list(gajim.interface.minimized_controls[account].values()): ctrl.repaint_themed_widgets() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/840cb365e857bd36afe93042f664486d8…

1 0

[Git][gajim/gajim][master] 2 commits: Add commandline option to show warnings
by Philipp Hörist 03 Mar '17

03 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b5c98864 by Philipp Hörist at 2017-03-04T00:19:04+01:00 Add commandline option to show warnings - - - - - 840cb365 by Philipp Hörist at 2017-03-04T00:19:35+01:00 Use unicode path for plugins non-unicode path is marked as deprecated - - - - - 2 changed files: - src/gajim.py - src/plugins/gajimplugin.py Changes: ===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -94,6 +94,9 @@ class GajimApplication(Gtk.Application): self.add_main_option('loglevel', ord('l'), GLib.OptionFlags.NONE, GLib.OptionArg.STRING, _('Configure logging system'), 'LEVEL') + self.add_main_option('warnings', ord('w'), GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Show all warnings')) self.profile = '' self.config_path = None @@ -286,6 +289,8 @@ class GajimApplication(Gtk.Application): if options.contains('loglevel'): loglevel = options.lookup_value('loglevel').get_string() logging_helpers.set_loglevels(loglevel) + if options.contains('warnings'): + self.show_warnings() return -1 def do_command_line(self, command_line: Gio.ApplicationCommandLine) -> int: @@ -294,6 +299,19 @@ class GajimApplication(Gtk.Application): self.activate() return 0 + def show_warnings(self): + import traceback + import warnings + + def warn_with_traceback(message, category, filename, lineno, + file=None, line=None): + traceback.print_stack(file=sys.stderr) + sys.stderr.write(warnings.formatwarning(message, category, + filename, lineno, line)) + + warnings.showwarning = warn_with_traceback + warnings.filterwarnings(action="always") + def frozen_logging(self, path): import warnings if not os.path.exists(path): ===================================== src/plugins/gajimplugin.py ===================================== --- a/src/plugins/gajimplugin.py +++ b/src/plugins/gajimplugin.py @@ -202,8 +202,8 @@ class GajimPluginConfig(): @log_calls('GajimPluginConfig') def __init__(self, plugin): self.plugin = plugin - self.FILE_PATH = os.path.join(gajim.PLUGINS_CONFIG_DIR, - self.plugin.short_name).encode(locale.getpreferredencoding()) + self.FILE_PATH = os.path.join( + gajim.PLUGINS_CONFIG_DIR, self.plugin.short_name) self.data = {} @log_calls('GajimPluginConfig') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1b975172d60e734d9c390ef75795ef8e7…

1 0

[Git][gajim/gajim][master] 7 commits: Simplify appending new line in history window
by Philipp Hörist 03 Mar '17

03 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2e026335 by Markus Böhme at 2017-02-22T12:56:31+01:00 Simplify appending new line in history window ConversationTextview provides an abstraction for adding text with tags. Use it instead of directly accessing its backing text buffer. - - - - - d9a22515 by Markus Böhme at 2017-02-22T12:56:31+01:00 Highlight all paragraphs of a search result in the history window A single message may span multiple paragraphs. Highlight all paragraphs of a search result because a keyword could be in any of them. Every message already has the 'eol' tag on its newline character. Highlight from the start of a search match up to the next 'eol' tag. - - - - - 65c6a1e7 by Markus Böhme at 2017-02-22T12:56:31+01:00 Remove unnecessary code in message highlighting in the history window The message to be highlighted is searched via an already formatted timestamp, and the match contains the whole timestamp with any preceding characters (like "["). Therefore, calling backward_char on the start iterator of the match just goes back to the previous line and is not needed. - - - - - 66589886 by Markus Böhme at 2017-02-22T14:55:44+01:00 Remove dead code in logger.py method get_search_results_for_query The method get_search_results_for_query provides a means to search via a passed in SQL query. This feature has been unused and dead since its initial commit back in 2005 (commit e542fff69f56), so just remove it. - - - - - d75ebd95 by Markus Böhme at 2017-03-02T23:55:18+01:00 Rework message highlighting in the history window to not use timestamps Search results in the history window to are scrolled to and highlighted once the user clicks on one of them. Messages are searched by text in the log database, but then looked up in the history text buffer via a visible or invisible timestamp obtained from the database record. Timestamps in the history text buffer, depending on user configuration, may only have a coarse granularity. Philipp Hörist discovered that this may lead to the highlighting of the wrong line in the history text view and proposed an alternative solution that is implemented in this patch. Timestamps are abolished as a means of searching messages. Instead, add a mark with the unique message id (log line id) at the start of every message in the history text buffer when the conversation is loaded. After fetching the search results from the database this id can be used to unambiguously find the corresponding message in the history text buffer. - - - - - deebe384 by Markus Böhme at 2017-03-03T17:29:05+01:00 Prevent unnecessary reloading of conversations in the history window Do not reload the conversation in the history window when the user selects another search result from the same day. Just clearing the previous highlighting is enough. This prevents flickering and provides a much more pleasant user experience. - - - - - 1b975172 by Philipp Hörist at 2017-03-03T23:45:06+01:00 Merge branch 'history-highlighting' into 'master' Highlight all paragraphs of a message in the history window See merge request !46 - - - - - 3 changed files: - src/common/logger.py - src/history_window.py - src/htmltextview.py Changes: ===================================== src/common/logger.py ===================================== --- a/src/common/logger.py +++ b/src/common/logger.py @@ -628,7 +628,7 @@ class Logger: def get_conversation_for_date(self, jid, year, month, day, account): """ - Return contact_name, time, kind, show, message, subject + Return contact_name, time, kind, show, message, subject, additional_data, log_line_id For each row in a list of tupples, returns list with empty tupple if we found nothing to meet our demands @@ -645,7 +645,9 @@ class Logger: last_second_of_day = start_of_day + seconds_in_a_day - 1 self.cur.execute(''' - SELECT contact_name, time, kind, show, message, subject, additional_data FROM logs + SELECT contact_name, time, kind, show, message, subject, + additional_data, log_line_id + FROM logs WHERE (%s) AND time BETWEEN %d AND %d ORDER BY time @@ -660,7 +662,7 @@ class Logger: def get_search_results_for_query(self, jid, query, account, year=False, month=False, day=False): """ - Returns contact_name, time, kind, show, message + Returns contact_name, time, kind, show, message, subject, log_line_id For each row in a list of tupples, returns list with empty tupple if we found nothing to meet our demands @@ -671,33 +673,25 @@ class Logger: # Error trying to create a new jid_id. This means there is no log return [] - if False: # query.startswith('SELECT '): # it's SQL query (FIXME) - try: - self.cur.execute(query) - except sqlite.OperationalError as e: - results = [('', '', '', '', str(e))] - return results - - else: # user just typed something, we search in message column - where_sql, jid_tuple = self._build_contact_where(account, jid) - like_sql = '%' + query.replace("'", "''") + '%' - if year: - start_of_day = self.get_unix_time_from_date(year, month, day) - seconds_in_a_day = 86400 # 60 * 60 * 24 - last_second_of_day = start_of_day + seconds_in_a_day - 1 - self.cur.execute(''' - SELECT contact_name, time, kind, show, message, subject FROM logs - WHERE (%s) AND message LIKE '%s' - AND time BETWEEN %d AND %d - ORDER BY time - ''' % (where_sql, like_sql, start_of_day, last_second_of_day), - jid_tuple) - else: - self.cur.execute(''' - SELECT contact_name, time, kind, show, message, subject FROM logs - WHERE (%s) AND message LIKE '%s' - ORDER BY time - ''' % (where_sql, like_sql), jid_tuple) + where_sql, jid_tuple = self._build_contact_where(account, jid) + like_sql = '%' + query.replace("'", "''") + '%' + if year: + start_of_day = self.get_unix_time_from_date(year, month, day) + seconds_in_a_day = 86400 # 60 * 60 * 24 + last_second_of_day = start_of_day + seconds_in_a_day - 1 + self.cur.execute(''' + SELECT contact_name, time, kind, show, message, subject, log_line_id FROM logs + WHERE (%s) AND message LIKE '%s' + AND time BETWEEN %d AND %d + ORDER BY time + ''' % (where_sql, like_sql, start_of_day, last_second_of_day), + jid_tuple) + else: + self.cur.execute(''' + SELECT contact_name, time, kind, show, message, subject, log_line_id FROM logs + WHERE (%s) AND message LIKE '%s' + ORDER BY time + ''' % (where_sql, like_sql), jid_tuple) results = self.cur.fetchall() return results ===================================== src/history_window.py ===================================== --- a/src/history_window.py +++ b/src/history_window.py @@ -56,6 +56,7 @@ class Column(IntEnum): UNIXTIME = 2 MESSAGE = 3 TIME = 4 + LOG_LINE_ID = 5 class HistoryWindow: """ @@ -85,8 +86,8 @@ class HistoryWindow: self.results_window = xml.get_object('results_scrolledwindow') self.search_in_date = xml.get_object('search_in_date') - # contact_name, date, message, time - model = Gtk.ListStore(str, str, str, str, str) + # jid, contact_name, date, message, time, log_line_id + model = Gtk.ListStore(str, str, str, str, str, int) self.results_treeview.set_model(model) col = Gtk.TreeViewColumn(_('Name')) self.results_treeview.append_column(col) @@ -393,28 +394,31 @@ class HistoryWindow: show_status = self.show_status_checkbutton.get_active() lines = gajim.logger.get_conversation_for_date(self.jid, year, month, day, self.account) - # lines holds list with tupples that have: - # contact_name, time, kind, show, message for line in lines: # line[0] is contact_name, line[1] is time of message # line[2] is kind, line[3] is show, line[4] is message, line[5] is subject - # line[6] is additional_data + # line[6] is additional_data, line[7] is log_line_id if not show_status and line[2] in (KindConstant.GCSTATUS, KindConstant.STATUS): continue self._add_new_line(line[0], line[1], line[2], line[3], line[4], - line[5], line[6]) + line[5], line[6], line[7]) - def _add_new_line(self, contact_name, tim, kind, show, message, subject, additional_data): + def _add_new_line(self, contact_name, tim, kind, show, message, subject, + additional_data, log_line_id): """ Add a new line in textbuffer """ if not message and kind not in (KindConstant.STATUS, KindConstant.GCSTATUS): return + buf = self.history_buffer end_iter = buf.get_end_iter() + # Make the beginning of every message searchable by its log_line_id + buf.create_mark(str(log_line_id), end_iter, left_gravity=True) + if gajim.config.get('print_time') == 'always': timestamp_str = gajim.config.get('time_stamp') timestamp_str = helpers.from_one_line(timestamp_str) @@ -429,12 +433,6 @@ class HistoryWindow: tim = time.strftime('%X ', time.localtime(float(tim))) buf.insert_with_tags_by_name(end_iter, tim + '\n', 'time_sometimes') - else: # don't print time. So we print it as invisible to be able to - # search for it - timestamp_str = gajim.config.get('time_stamp') - timestamp_str = helpers.from_one_line(timestamp_str) - tim = time.strftime(timestamp_str, time.localtime(float(tim))) - buf.insert_with_tags_by_name(end_iter, tim, 'invisible') tag_name = '' tag_msg = '' @@ -512,9 +510,7 @@ class HistoryWindow: else: self.history_textview.print_real_text(message, name=contact_name, xhtml=xhtml, additional_data=additional_data) - buffer_ = self.history_textview.tv.get_buffer() - eob = buffer_.get_end_iter() - buffer_.insert_with_tags_by_name(eob, '\n', 'eol') + self.history_textview.print_real_text('\n', text_tags=['eol']) def on_search_entry_activate(self, widget): text = self.search_entry.get_text() @@ -563,12 +559,13 @@ class HistoryWindow: contact_name = self.completion_dict[jid][InfoColumn.NAME] tim = row[1] message = row[4] + log_line_id = row[6] local_time = time.localtime(tim) date = time.strftime('%Y-%m-%d', local_time) # jid (to which log is assigned to), name, date, message, # time (full unix time) - model.append((jid, contact_name, date, message, str(tim))) + model.append((jid, contact_name, date, message, str(tim), log_line_id)) def on_results_treeview_row_activated(self, widget, path, column): """ @@ -576,7 +573,7 @@ class HistoryWindow: which results to showing conversation logs for that date """ # get currently selected date - cur_year, cur_month = self.calendar.get_date()[0:2] + cur_year, cur_month, cur_day = self.calendar.get_date() cur_month = gtkgui_helpers.make_gtk_month_python_month(cur_month) model = widget.get_model() # make it a tupple (Y, M, D, 0, 0, 0...) @@ -595,33 +592,41 @@ class HistoryWindow: if year != cur_year or gtk_month != cur_month: self.calendar.select_month(month, year) - self.calendar.select_day(day) - unix_time = model[path][Column.TIME] - self._scroll_to_result(unix_time) - #FIXME: one day do not search just for unix_time but the whole and user - # specific format of the textbuffer line [time] nick: message - # and highlight all that + if year != cur_year or gtk_month != cur_month or day != cur_day: + self.calendar.select_day(day) + + self._scroll_to_message_and_highlight(model[path][Column.LOG_LINE_ID]) - def _scroll_to_result(self, unix_time): + def _scroll_to_message_and_highlight(self, log_line_id): """ - Scroll to the result using unix_time and highlight line + Scroll to a message and highlight it """ - start_iter = self.history_buffer.get_start_iter() - local_time = time.localtime(float(unix_time)) - timestamp_str = gajim.config.get('time_stamp') - timestamp_str = helpers.from_one_line(timestamp_str) - tim = time.strftime(timestamp_str, local_time) - result = start_iter.forward_search(tim, Gtk.TextSearchFlags.TEXT_ONLY, - None) - if result is not None: - match_start_iter, match_end_iter = result - match_start_iter.backward_char() # include '[' or other character before time - match_end_iter.forward_line() # highlight all message not just time - self.history_buffer.apply_tag_by_name('highlight', match_start_iter, - match_end_iter) - mark = self.history_buffer.create_mark('match', match_start_iter, True) - GLib.idle_add(self.history_textview.tv.scroll_to_mark, mark, - 0, True, 0.0, 0.5) + + def iterator_has_mark(iterator, mark_name): + for mark in iterator.get_marks(): + if mark.get_name() == mark_name: + return True + return False + + # Clear previous search result by removing the highlighting. The scroll + # mark is automatically removed when the new one is set. + start = self.history_buffer.get_start_iter() + end = self.history_buffer.get_end_iter() + self.history_buffer.remove_tag_by_name('highlight', start, end) + + log_line_id = str(log_line_id) + line = start + while not iterator_has_mark(line, log_line_id): + if not line.forward_line(): + return + + match_start = line + match_end = match_start.copy() + match_end.forward_to_tag_toggle(self.history_buffer.eol_tag) + + self.history_buffer.apply_tag_by_name('highlight', match_start, match_end) + mark = self.history_buffer.create_mark('match', match_start, True) + GLib.idle_add(self.history_textview.tv.scroll_to_mark, mark, 0, True, 0.0, 0.5) def on_log_history_checkbutton_toggled(self, widget): # log conversation history? ===================================== src/htmltextview.py ===================================== --- a/src/htmltextview.py +++ b/src/htmltextview.py @@ -850,7 +850,7 @@ class HtmlTextView(Gtk.TextView): self.connect('copy-clipboard', self.on_html_text_view_copy_clipboard) self.id_ = self.connect('button-release-event', self.on_left_mouse_button_release) - self.get_buffer().create_tag('eol') + self.get_buffer().eol_tag = self.get_buffer().create_tag('eol') self.tooltip = tooltips.BaseTooltip() self.config = gajim.config self.interface = gajim.interface View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8157cb38eca26ed48aa1a157c148eb115…

1 0

[Git][gajim/gajim][gajim_0.16] Close IBB stream with correct SID. See #8555
by Yann Leboulanger 01 Mar '17

01 Mar '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 85f8e91b by Yann Leboulanger at 2017-03-01T22:10:30+01:00 Close IBB stream with correct SID. See #8555 - - - - - 1 changed file: - src/common/protocol/bytestream.py Changes: ===================================== src/common/protocol/bytestream.py ===================================== --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -819,7 +819,7 @@ class ConnectionIBBytestream(ConnectionBytestream): self.connection.send(nbxmpp.Protocol('iq', file_props.direction[1:], 'set', payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', - {'sid':file_props.sid})])) + {'sid':file_props.transport_sid})])) if file_props.session_type == 'jingle': peerjid = \ file_props.receiver if file_props.type_ == 's' else file_props.sender View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/85f8e91bf7de86044708b49b4977dfd556…

1 0

[Git][gajim/gajim][master] Fix verbose logging
by Philipp Hörist 01 Mar '17

01 Mar '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8157cb38 by Philipp Hörist at 2017-03-01T16:33:09+01:00 Fix verbose logging - - - - - 1 changed file: - src/gajim.py Changes: ===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -280,9 +280,9 @@ class GajimApplication(Gtk.Application): print(version) return 0 if options.contains('quiet'): - logging_helpers.set_quiet(True) + logging_helpers.set_quiet() if options.contains('verbose'): - logging_helpers.set_verbose(True) + logging_helpers.set_verbose() if options.contains('loglevel'): loglevel = options.lookup_value('loglevel').get_string() logging_helpers.set_loglevels(loglevel) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8157cb38eca26ed48aa1a157c148eb115e…

1 0

[Git][gajim/gajim][gajim_0.16] check for errors when adding a transport contact. Fixes #8196
by Yann Leboulanger 28 Feb '17

28 Feb '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: d2782622 by Yann Leboulanger at 2017-02-28T22:28:49+01:00 check for errors when adding a transport contact. Fixes #8196 - - - - - 1 changed file: - src/dialogs.py Changes: ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -1249,6 +1249,11 @@ class AddNewContactWindow: def _nec_gateway_prompt_received(self, obj): if self.adding_jid: jid, transport, type_ = self.adding_jid + if obj.stanza.getError(): + ErrorDialog(_('Error while adding transport contact'), + _('This error occured while adding a contact for transport ' + '%s:\n\n%s') % (transport, obj.stanza.getErrorMsg())) + return if obj.prompt_jid: self._add_jid(obj.prompt_jid, type_) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d2782622952a3cc45dbc87d0e948507316…

1 0

[Git][gajim/gajim][master] Lookup action in correct window Fixes #8560
by Philipp Hörist 28 Feb '17

28 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 54502446 by Philipp Hörist at 2017-02-28T16:49:01+01:00 Lookup action in correct window Fixes #8560 - - - - - 1 changed file: - src/message_window.py Changes: ===================================== src/message_window.py ===================================== --- a/src/message_window.py +++ b/src/message_window.py @@ -98,7 +98,7 @@ class MessageWindow(object): else: self.parent_paned.add(self.notebook) self.parent_paned.pack2(self.notebook, resize=True, shrink=True) - get_action('show-roster').set_enabled(True) + self.window.lookup_action('show-roster').set_enabled(True) orig_window.destroy() del orig_window @@ -626,7 +626,7 @@ class MessageWindow(object): # Don't close parent window, just remove the child child = self.parent_paned.get_child2() self.parent_paned.remove(child) - get_action('show-roster').set_enabled(False) + self.window.lookup_action('show-roster').set_enabled(False) else: self.window.destroy() return # don't show_title, we are dead @@ -1272,7 +1272,7 @@ class MessageWindowMgr(GObject.GObject): # Don't close parent window, just remove the child child = w.parent_paned.get_child2() w.parent_paned.remove(child) - get_action('show-roster').set_enabled(False) + self.parent_win.lookup_action('show-roster').set_enabled(False) gtkgui_helpers.resize_window(w.window, gajim.config.get('roster_width'), gajim.config.get('roster_height')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/54502446a31bfc09d9e09094f4a7b2670f…

1 0

[Git][gajim/gajim][master] Add certifi to windows dependencys
by Philipp Hörist 27 Feb '17

27 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 86faba26 by Philipp Hörist at 2017-02-27T23:14:37+01:00 Add certifi to windows dependencys - - - - - 2 changed files: - requirements.txt - setup_win32.py Changes: ===================================== requirements.txt ===================================== --- a/requirements.txt +++ b/requirements.txt @@ -12,3 +12,4 @@ pillow pycurl docutils qrcode +certifi ===================================== setup_win32.py ===================================== --- a/setup_win32.py +++ b/setup_win32.py @@ -118,7 +118,7 @@ OPTIONS = { 'includes': ['gi', 'numbers', 'win32com.client', 'win32com.server'], 'packages': ['gi', 'cffi', 'cryptography', 'google', 'axolotl', 'pkg_resources', 'Crypto', 'pycparser', 'keyring', - 'PIL', 'idna', 'qrcode'], + 'PIL', 'idna', 'qrcode', 'certifi'], 'include_files': INCLUDE_FILES, } } View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/86faba2649dd92d2217a65778a308ad087…

1 0

[Git][gajim/gajim][master] Add extension point in plugins window
by Philipp Hörist 25 Feb '17

25 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8a1a326b by Philipp Hörist at 2017-02-25T19:21:21+01:00 Add extension point in plugins window - - - - - 1 changed file: - src/plugins/gui.py Changes: ===================================== src/plugins/gui.py ===================================== --- a/src/plugins/gui.py +++ b/src/plugins/gui.py @@ -114,10 +114,8 @@ class PluginsWindow(object): self.plugins_notebook.set_current_page(0) self.xml.get_object('close_button').grab_focus() - for plugin in gajim.plugin_manager.active_plugins: - if type(plugin).__name__ == 'PluginInstaller': - plugin.on_activate(self) - break + # Adding GUI extension point for Plugins that want to hook the Plugin Window + gajim.plugin_manager.gui_extension_point('plugin_window', self) self.window.show_all() gtkgui_helpers.possibly_move_window_in_current_desktop(self.window) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8a1a326bae3f04d6824f4915f4ba85b3f5…

1 0

[Git][gajim/gajim][master] Parse log arguments earlier
by Philipp Hörist 25 Feb '17

25 Feb '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: ddf60b01 by Philipp Hörist at 2017-02-25T17:21:03+01:00 Parse log arguments earlier - - - - - 2 changed files: - src/common/logging_helpers.py - src/gajim.py Changes: ===================================== src/common/logging_helpers.py ===================================== --- a/src/common/logging_helpers.py +++ b/src/common/logging_helpers.py @@ -19,6 +19,8 @@ ## import logging +import os +import sys def parseLogLevel(arg): """ @@ -132,10 +134,14 @@ class FancyFormatter(logging.Formatter): return logging.Formatter.format(self, record) -def init(use_color=False): +def init(): """ Iinitialize the logging system """ + use_color = False + if os.name != 'nt': + use_color = sys.stderr.isatty() + consoleloghandler = logging.StreamHandler() consoleloghandler.setFormatter( FancyFormatter( @@ -171,7 +177,7 @@ def set_quiet(): # tests if __name__ == '__main__': - init(use_color=True) + init() set_loglevels('gajim.c=DEBUG,INFO') ===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -60,9 +60,6 @@ except ImportError: print('PyOpenSSL not available, impossible to generate entropy', file=sys.stderr) PYOPENSSL_PRNG_PRESENT = False -logging_helpers.init(sys.stderr.isatty()) -log = logging.getLogger('gajim.gajim') - MIN_NBXMPP_VER = "0.5.3" @@ -264,6 +261,9 @@ class GajimApplication(Gtk.Application): self.interface.roster.prepare_quit() def do_handle_local_options(self, options: GLib.VariantDict) -> int: + + logging_helpers.init() + if options.contains('profile'): # Incorporate profile name into application id # to have a single app instance for each profile. @@ -279,18 +279,17 @@ class GajimApplication(Gtk.Application): from common.defs import version print(version) return 0 + if options.contains('quiet'): + logging_helpers.set_quiet(True) + if options.contains('verbose'): + logging_helpers.set_verbose(True) + if options.contains('loglevel'): + loglevel = options.lookup_value('loglevel').get_string() + logging_helpers.set_loglevels(loglevel) return -1 def do_command_line(self, command_line: Gio.ApplicationCommandLine) -> int: Gtk.Application.do_command_line(self, command_line) - options = command_line.get_options_dict() - if options.contains('quiet'): - logging_helpers.set_quiet() - if options.contains('verbose'): - logging_helpers.set_verbose() - if options.contains('loglevel'): - string = options.lookup_value('loglevel').get_string() - logging_helpers.set_loglevels(string) if not command_line.get_is_remote(): self.activate() return 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ddf60b01b37e407de668c5240759897b2d…

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