Commits

commits@gajim.org

17632 discussions

gajim: Fix font size in xhtml
by Denis Fomin 09 Jan '13

09 Jan '13

changeset 5a76b123af99 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5a76b123af99 description: Fix font size in xhtml diffstat: src/htmltextview.py | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diffs (34 lines): diff -r 784fa2ff7629 -r 5a76b123af99 src/htmltextview.py --- a/src/htmltextview.py Thu Jan 10 00:13:41 2013 +0400 +++ b/src/htmltextview.py Thu Jan 10 00:43:20 2013 +0400 @@ -337,14 +337,23 @@ def _parse_style_font_size(self, tag, value): try: + # see http://developer.gnome.org/pango/stable/pango-Text-Attributes.html#PANGO-SC… + # http://consciouslyusing.blogspot.ru/2012/01/heads-up-missing-pango-text-sca… scale = { - 'xx-small': Pango.SCALE_XX_SMALL, - 'x-small': Pango.SCALE_X_SMALL, - 'small': Pango.SCALE_SMALL, - 'medium': Pango.SCALE_MEDIUM, - 'large': Pango.SCALE_LARGE, - 'x-large': Pango.SCALE_X_LARGE, - 'xx-large': Pango.SCALE_XX_LARGE, + #'xx-small': Pango.SCALE_XX_SMALL, + #'x-small': Pango.SCALE_X_SMALL, + #'small': Pango.SCALE_SMALL, + #'medium': Pango.SCALE_MEDIUM, + #'large': Pango.SCALE_LARGE, + #'x-large': Pango.SCALE_X_LARGE, + #'xx-large': Pango.SCALE_XX_LARGE, + 'xx-small': 0.5787037037037, + 'x-small': 0.6444444444444, + 'small': 0.8333333333333, + 'medium': 1.0, + 'large': 1.2, + 'x-large': 1.4399999999999, + 'xx-large': 1.728, } [value] except KeyError: pass

1 0

gajim: fix FontChooserDialog in xhtml popup menu.(fonts in html ...
by Denis Fomin 09 Jan '13

09 Jan '13

changeset 784fa2ff7629 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=784fa2ff7629 description: fix FontChooserDialog in xhtml popup menu.(fonts in html broken now) diffstat: src/chat_control.py | 5 ++--- src/message_textview.py | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diffs (38 lines): diff -r 5879c89f2497 -r 784fa2ff7629 src/chat_control.py --- a/src/chat_control.py Wed Jan 09 22:58:51 2013 +0400 +++ b/src/chat_control.py Thu Jan 10 00:13:41 2013 +0400 @@ -1103,9 +1103,8 @@ color_dialog.show_all() def on_font_menuitem_activale(self, widget): - font_dialog = Gtk.FontSelectionDialog('Select a font') - font_dialog.connect('response', self.msg_textview.font_set, - font_dialog.fontsel) + font_dialog = Gtk.FontChooserDialog(None, self.parent_win.window) + font_dialog.connect('response', self.msg_textview.font_set) font_dialog.show_all() def on_actions_button_clicked(self, widget): diff -r 5879c89f2497 -r 784fa2ff7629 src/message_textview.py --- a/src/message_textview.py Wed Jan 09 22:58:51 2013 +0400 +++ b/src/message_textview.py Thu Jan 10 00:13:41 2013 +0400 @@ -174,15 +174,15 @@ _buffer.apply_tag_by_name(tag_name, start, finish) - def font_set(self, widget, response, font): - if response == -6: + def font_set(self, widget, response): + if response == -6 or response == -4: widget.destroy() return _buffer = self.get_buffer() - font = font.get_font_name() - font_desc = Pango.FontDescription(font) + font = widget.get_font() + font_desc = widget.get_font_desc() family = font_desc.get_family() size = font_desc.get_size() size = size / Pango.SCALE

1 0

gajim: fix ColorSelectionDialog in xhtml popup menu
by Denis Fomin 09 Jan '13

09 Jan '13

changeset 5879c89f2497 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5879c89f2497 description: fix ColorSelectionDialog in xhtml popup menu diffstat: src/chat_control.py | 6 +++--- src/message_textview.py | 17 +++++++++++------ 2 files changed, 14 insertions(+), 9 deletions(-) diffs (50 lines): diff -r 00cd06fc3b78 -r 5879c89f2497 src/chat_control.py --- a/src/chat_control.py Tue Jan 08 21:56:36 2013 +0100 +++ b/src/chat_control.py Wed Jan 09 22:58:51 2013 +0400 @@ -1097,9 +1097,9 @@ self.parent_win) def on_color_menuitem_activale(self, widget): - color_dialog = Gtk.ColorSelectionDialog('Select a color') - color_dialog.connect('response', self.msg_textview.color_set, - color_dialog.colorsel) + color_dialog = Gtk.ColorChooserDialog(None, self.parent_win.window) + color_dialog.set_use_alpha(False) + color_dialog.connect('response', self.msg_textview.color_set) color_dialog.show_all() def on_font_menuitem_activale(self, widget): diff -r 00cd06fc3b78 -r 5879c89f2497 src/message_textview.py --- a/src/message_textview.py Tue Jan 08 21:56:36 2013 +0100 +++ b/src/message_textview.py Wed Jan 09 22:58:51 2013 +0400 @@ -146,19 +146,24 @@ start, finish = self.get_active_iters() _buffer.remove_all_tags(start, finish) - def color_set(self, widget, response, color): - if response == -6: + def color_set(self, widget, response): + print (response) + if response == -6 or response == -4: widget.destroy() return + + color = widget.get_property('rgba') + widget.destroy() _buffer = self.get_buffer() - color = color.get_current_color() - widget.destroy() - color_string = gtkgui_helpers.make_color_string(color) + # Create #aabbcc color string from rgba color + color_string = '#%02X%02X%02X' % (round(color.red*255), + round(color.green*255), round(color.blue*255)) + tag_name = 'color' + color_string if not tag_name in self.color_tags: tagColor = _buffer.create_tag(tag_name) tagColor.set_property('foreground', color_string) - self.begin_tags[tag_name] = '<span style="color: ' + color_string + ';">' + self.begin_tags[tag_name] = '<span style="color: %s;">' % color_string self.end_tags[tag_name] = '</span>' self.color_tags.append(tag_name)

1 0

gajim: fix emitting key_press_event
by Yann Leboulanger 08 Jan '13

08 Jan '13

changeset 00cd06fc3b78 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=00cd06fc3b78 description: fix emitting key_press_event diffstat: src/chat_control.py | 4 ++-- src/message_window.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diffs (63 lines): diff -r c72803cc6203 -r 00cd06fc3b78 src/chat_control.py --- a/src/chat_control.py Tue Jan 08 21:52:53 2013 +0100 +++ b/src/chat_control.py Tue Jan 08 21:56:36 2013 +0100 @@ -701,7 +701,7 @@ event.get_state() & Gdk.ModifierType.SHIFT_MASK and \ event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up)): return False - self.parent_win.notebook.emit('key_press_event', event) + self.parent_win.notebook.event(event) return True def show_emoticons_menu(self): @@ -766,7 +766,7 @@ # SHIFT + PAGE_[UP|DOWN]: send to conv_textview elif event.keyval == Gdk.KEY_Page_Down or \ event.keyval == Gdk.KEY_Page_Up: - self.conv_textview.tv.emit('key_press_event', event) + self.conv_textview.tv.event(event) return True elif event.get_state() & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_Tab: # CTRL + TAB diff -r c72803cc6203 -r 00cd06fc3b78 src/message_window.py --- a/src/message_window.py Tue Jan 08 21:52:53 2013 +0100 +++ b/src/message_window.py Tue Jan 08 21:56:36 2013 +0100 @@ -337,9 +337,9 @@ elif event.keyval == Gdk.KEY_ISO_Left_Tab: # CTRL + SHIFT + TAB self.move_to_next_unread_tab(False) elif event.keyval == Gdk.KEY_Page_Down: # CTRL + PAGE DOWN - self.notebook.emit('key_press_event', event) + self.notebook.event(event) elif event.keyval == Gdk.KEY_Page_Up: # CTRL + PAGE UP - self.notebook.emit('key_press_event', event) + self.notebook.event(event) def accel_group_func(self, accel_group, acceleratable, keyval, modifier): st = '1234567890' # alt+1 means the first tab (tab 0) @@ -400,7 +400,7 @@ event.time = int(time.time()) event.state = Gdk.ModifierType.CONTROL_MASK event.keyval = int(keyval) - self.notebook.emit('key_press_event', event) + self.notebook.event(event) return True if modifier & Gdk.ModifierType.SHIFT_MASK: @@ -823,7 +823,7 @@ return True # SHIFT + PAGE_[UP|DOWN]: send to conv_textview elif event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): - control.conv_textview.tv.emit('key_press_event', event) + control.conv_textview.tv.event(event) return True elif event.get_state() & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_Tab: # CTRL + TAB @@ -845,7 +845,7 @@ if isinstance(control, ChatControlBase): # we forwarded it to message textview - control.msg_textview.emit('key_press_event', event) + control.msg_textview.event(event) control.msg_textview.grab_focus() def get_tab_at_xy(self, x, y):

1 0

gajim: fix key_press_event in roster
by Yann Leboulanger 08 Jan '13

08 Jan '13

changeset c72803cc6203 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c72803cc6203 description: fix key_press_event in roster diffstat: src/roster_window.py | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diffs (41 lines): diff -r f403f80b4b4c -r c72803cc6203 src/roster_window.py --- a/src/roster_window.py Tue Jan 08 22:11:51 2013 +0400 +++ b/src/roster_window.py Tue Jan 08 21:52:53 2013 +0100 @@ -3515,14 +3515,17 @@ self.on_remove_agent(widget, list_) elif not (event.get_state() & (Gdk.ModifierType.CONTROL_MASK | \ - Gdk.ModifierType.MOD1_MASK)) and Gdk.keyval_to_unicode(event.keyval): - # if we got unicode symbol without ctrl / alt + Gdk.ModifierType.MOD1_MASK)): num = Gdk.keyval_to_unicode(event.keyval) - self.enable_rfilter(chr(num)) - - elif event.get_state() & Gdk.ModifierType.CONTROL_MASK and event.get_state() & Gdk.ModifierType.SHIFT_MASK and event.keyval == Gdk.KEY_U: + if num and num > 31: + # if we got unicode symbol without ctrl / alt + self.enable_rfilter(chr(num)) + + elif event.get_state() & Gdk.ModifierType.CONTROL_MASK and \ + event.get_state() & Gdk.ModifierType.SHIFT_MASK and \ + event.keyval == Gdk.KEY_U: self.enable_rfilter('') - self.rfilter_entry.emit('key_press_event', event) + self.rfilter_entry.event(event) elif event.keyval == Gdk.KEY_Left: treeselection = self.tree.get_selection() @@ -4452,11 +4455,11 @@ self.disable_rfilter() elif event.keyval == Gdk.KEY_Return: self.tree.grab_focus() - self.tree.emit('key_press_event', event) + self.tree.event(event) self.disable_rfilter() elif event.keyval in (Gdk.KEY_Up, Gdk.KEY_Down): self.tree.grab_focus() - self.tree.emit('key_press_event', event) + self.tree.event(event) elif event.keyval == Gdk.KEY_BackSpace: if widget.get_text() == '': self.disable_rfilter()

1 0

gajim: fix traceback in pm
by Denis Fomin 08 Jan '13

08 Jan '13

changeset f403f80b4b4c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f403f80b4b4c description: fix traceback in pm diffstat: src/groupchat_control.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 4c02e2a54663 -r f403f80b4b4c src/groupchat_control.py --- a/src/groupchat_control.py Tue Jan 08 19:58:06 2013 +0400 +++ b/src/groupchat_control.py Tue Jan 08 22:11:51 2013 +0400 @@ -1038,7 +1038,9 @@ else: self._start_private_message(nick) # Scroll to line - self.list_treeview.expand_row(path[0:1], False) + path_ = path + path_.up() + self.list_treeview.expand_row(path_, False) self.list_treeview.scroll_to_cell(path) self.list_treeview.set_cursor(path) contact = gajim.contacts.get_contact_with_highest_priority(

1 0

gajim: prevent tracebacks in history window
by Denis Fomin 08 Jan '13

08 Jan '13

changeset 4c02e2a54663 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4c02e2a54663 description: prevent tracebacks in history window diffstat: src/history_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r f5c10eb0ea7a -r 4c02e2a54663 src/history_window.py --- a/src/history_window.py Tue Jan 08 19:46:12 2013 +0400 +++ b/src/history_window.py Tue Jan 08 19:58:06 2013 +0400 @@ -431,7 +431,7 @@ else: # we don't have roster, we don't know our own nick, use first # account one (urk!) - account = gajim.contacts.get_accounts()[0] + account = list(gajim.contacts.get_accounts())[0] contact_name = gajim.nicks[account] tag_name = 'outgoing' tag_msg = 'outgoingtxt' @@ -511,7 +511,7 @@ # or if we browse a groupchat history. The account is not needed, a dummy can # be set. # This may leed to wrong self nick in the displayed history (Uggh!) - account = gajim.contacts.get_accounts()[0] + account = list(gajim.contacts.get_accounts())[0] year, month, day = False, False, False if self.search_in_date.get_active():

1 0

gajim: prevent tracebacks
by Denis Fomin 08 Jan '13

08 Jan '13

changeset f5c10eb0ea7a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f5c10eb0ea7a description: prevent tracebacks diffstat: src/groupchat_control.py | 2 +- src/roster_window.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r d5a7c8480396 -r f5c10eb0ea7a src/groupchat_control.py --- a/src/groupchat_control.py Tue Jan 08 19:41:51 2013 +0400 +++ b/src/groupchat_control.py Tue Jan 08 19:46:12 2013 +0400 @@ -2518,7 +2518,7 @@ elif event.button == 2: # middle click widget.get_selection().select_path(path) iter_ = self.model.get_iter(path) - if len(path) == 2: + if path.get_depth() == 2: nick = self.model[iter_][C_NICK] self._start_private_message(nick) return True diff -r d5a7c8480396 -r f5c10eb0ea7a src/roster_window.py --- a/src/roster_window.py Tue Jan 08 19:41:51 2013 +0400 +++ b/src/roster_window.py Tue Jan 08 19:46:12 2013 +0400 @@ -4503,7 +4503,7 @@ return path = list_of_paths[0] data = '' - if len(path) >= 2: + if path.get_depth() >= 2: data = model[path][C_JID] selection.set(selection.target, 8, data)

1 0

gajim: fix dubblick on grop in groupchat treeview
by Denis Fomin 08 Jan '13

08 Jan '13

changeset d5a7c8480396 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d5a7c8480396 description: fix dubblick on grop in groupchat treeview diffstat: src/groupchat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3d444201f2e2 -r d5a7c8480396 src/groupchat_control.py --- a/src/groupchat_control.py Tue Jan 08 15:54:20 2013 +0400 +++ b/src/groupchat_control.py Tue Jan 08 19:41:51 2013 +0400 @@ -2480,7 +2480,7 @@ When an iter is activated (dubblick or single click if gnome is set this way """ - if len(path) == 1: # It's a group + if path.get_depth() == 1: # It's a group if (widget.row_expanded(path)): widget.collapse_row(path) else:

1 0

gajim: fix setting option in ACE
by Denis Fomin 08 Jan '13

08 Jan '13

changeset 3d444201f2e2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3d444201f2e2 description: fix setting option in ACE diffstat: src/advanced_configuration_window.py | 3 ++- src/statusicon.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r f8b738a8c636 -r 3d444201f2e2 src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Tue Jan 08 15:03:50 2013 +0400 +++ b/src/advanced_configuration_window.py Tue Jan 08 15:54:20 2013 +0400 @@ -202,7 +202,8 @@ if len(modelpath.get_indices()) > 1: optnamerow = self.model[modelpath.get_indices()[0]] optname = optnamerow[0] - keyrow = self.model[modelpath.get_indices()[:2]] + modelpath.up() + keyrow = self.model[modelpath] key = keyrow[0] self.remember_option(option + '\n' + key + '\n' + optname, modelrow[1], newval) diff -r f8b738a8c636 -r 3d444201f2e2 src/statusicon.py --- a/src/statusicon.py Tue Jan 08 15:03:50 2013 +0400 +++ b/src/statusicon.py Tue Jan 08 15:54:20 2013 +0400 @@ -338,7 +338,7 @@ newitem = Gtk.SeparatorMenuItem.new() # separator gc_sub_menu.append(newitem) - newitem = Gtk.ImageMenuItem(_('_Manage Bookmarks...')) + newitem = Gtk.ImageMenuItem.new_with_mnemonic(_('_Manage Bookmarks...')) img = Gtk.Image.new_from_stock(Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU) newitem.set_image(img) newitem.connect('activate',

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