Commits April 2011

commits@gajim.org

3 participants
31 discussions

gajim: add basic roster filtering
by Julien Pivotto 18 Apr '11

18 Apr '11

changeset 9cd45772dafb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9cd45772dafb description: add basic roster filtering diffstat: src/roster_window.py | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diffs (51 lines): diff -r 62cfc918be16 -r 9cd45772dafb src/roster_window.py --- a/src/roster_window.py Mon Apr 18 10:29:32 2011 +0200 +++ b/src/roster_window.py Mon Apr 18 11:19:44 2011 +0200 @@ -1589,6 +1589,8 @@ grp = delimiter.join(grp.split(delimiter)[:-1]) return False if type_ == 'contact': + if self.search_enabled: + return self.search_string in model[titer][C_NAME].lower() if gajim.config.get('showoffline'): return True bb_jid = None @@ -4165,14 +4167,22 @@ if self.hpaned.get_child2() is not None: self.show_roster_vbox(widget.get_active()) - def on_roster_filter_entry_insert_changed(self, widget): + def on_roster_filter_entry_changed(self, widget): """ When we update the content of the filter """ - pass + self.search_string = widget.get_text().lower() + if self.search_string == '': + self.search_enabled = False + else: + self.search_enabled = True + self.refilter_shown_roster_items() def on_show_roster_filter_menuitem_toggled(self, widget): """ Show the roster filter entry """ - self.xml.get_object('roster_filter_entry').set_visible(widget.get_active()) - self.xml.get_object('roster_filter_entry').set_editable(widget.get_active()) + self.search_enabled = widget.get_active() + self.xml.get_object('roster_filter_entry').set_visible(self.search_enabled) + self.xml.get_object('roster_filter_entry').set_editable(self.search_enabled) + if self.search_enabled: + self.xml.get_object('roster_filter_entry').grab_focus() def on_roster_hpaned_notify(self, pane, gparamspec): """ @@ -6354,6 +6364,11 @@ new_chat_menuitem.add_accelerator('activate', accel_group, gtk.keysyms.n, gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) + # Setting the search stuff + self.xml.get_object('roster_filter_entry').set_visible(False) + self.search_string = '' + self.search_enabled = False + gajim.ged.register_event_handler('presence-received', ged.GUI1, self._nec_presence_received) # presence has to be fully handled so that contact is added to occupant

1 0

gajim: use changed signal instead of insert_at_cursor
by Julien Pivotto 18 Apr '11

18 Apr '11

changeset 62cfc918be16 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=62cfc918be16 description: use changed signal instead of insert_at_cursor diffstat: data/gui/roster_window.ui | 2 +- src/roster_window.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r c3875002d461 -r 62cfc918be16 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Mon Apr 18 10:25:32 2011 +0200 +++ b/data/gui/roster_window.ui Mon Apr 18 10:29:32 2011 +0200 @@ -347,7 +347,7 @@ <property name="visible">False</property> <property name="editable">False</property> <property name="can_focus">True</property> - <signal name="insert_at_cursor" handler="on_roster_filter_entry_insert_at_cursor" /> + <signal name="changed" handler="on_roster_filter_entry_changed" /> </object> <packing> <property name="expand">False</property> diff -r c3875002d461 -r 62cfc918be16 src/roster_window.py --- a/src/roster_window.py Mon Apr 18 10:25:32 2011 +0200 +++ b/src/roster_window.py Mon Apr 18 10:29:32 2011 +0200 @@ -4165,7 +4165,7 @@ if self.hpaned.get_child2() is not None: self.show_roster_vbox(widget.get_active()) - def on_roster_filter_entry_insert_at_cursor(self, widget): + def on_roster_filter_entry_insert_changed(self, widget): """ When we update the content of the filter """ pass

1 0

gajim: dynamic visibility of the filter
by Julien Pivotto 18 Apr '11

18 Apr '11

changeset c3875002d461 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c3875002d461 description: dynamic visibility of the filter diffstat: data/gui/roster_window.ui | 3 ++- src/roster_window.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diffs (26 lines): diff -r 75310bfc17a8 -r c3875002d461 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Mon Apr 18 10:01:36 2011 +0200 +++ b/data/gui/roster_window.ui Mon Apr 18 10:25:32 2011 +0200 @@ -344,7 +344,8 @@ <property name="orientation">vertical</property> <child> <object class="GtkEntry" id="roster_filter_entry"> - <property name="visible">True</property> + <property name="visible">False</property> + <property name="editable">False</property> <property name="can_focus">True</property> <signal name="insert_at_cursor" handler="on_roster_filter_entry_insert_at_cursor" /> </object> diff -r 75310bfc17a8 -r c3875002d461 src/roster_window.py --- a/src/roster_window.py Mon Apr 18 10:01:36 2011 +0200 +++ b/src/roster_window.py Mon Apr 18 10:25:32 2011 +0200 @@ -4171,7 +4171,8 @@ def on_show_roster_filter_menuitem_toggled(self, widget): """ Show the roster filter entry """ - pass + self.xml.get_object('roster_filter_entry').set_visible(widget.get_active()) + self.xml.get_object('roster_filter_entry').set_editable(widget.get_active()) def on_roster_hpaned_notify(self, pane, gparamspec): """

1 0

gajim: Add basic functions of roster filtering
by Julien Pivotto 18 Apr '11

18 Apr '11

changeset 75310bfc17a8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=75310bfc17a8 description: Add basic functions of roster filtering diffstat: src/roster_window.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diffs (19 lines): diff -r 7e4ea521bb87 -r 75310bfc17a8 src/roster_window.py --- a/src/roster_window.py Mon Apr 18 10:00:06 2011 +0200 +++ b/src/roster_window.py Mon Apr 18 10:01:36 2011 +0200 @@ -4165,8 +4165,13 @@ if self.hpaned.get_child2() is not None: self.show_roster_vbox(widget.get_active()) -# def on_show_roster_filter_menuitem_toggled(self, widget): -# """ Show the roster filter textentry """ + def on_roster_filter_entry_insert_at_cursor(self, widget): + """ When we update the content of the filter """ + pass + + def on_show_roster_filter_menuitem_toggled(self, widget): + """ Show the roster filter entry """ + pass def on_roster_hpaned_notify(self, pane, gparamspec): """

1 0

gajim: Inset roster filter textentry
by Julien Pivotto 18 Apr '11

18 Apr '11

changeset 7e4ea521bb87 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7e4ea521bb87 description: Inset roster filter textentry diffstat: data/gui/roster_window.ui | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diffs (39 lines): diff -r 63a9ed30342d -r 7e4ea521bb87 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Mon Apr 18 09:50:45 2011 +0200 +++ b/data/gui/roster_window.ui Mon Apr 18 10:00:06 2011 +0200 @@ -343,6 +343,17 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="orientation">vertical</property> <child> + <object class="GtkEntry" id="roster_filter_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="insert_at_cursor" handler="on_roster_filter_entry_insert_at_cursor" /> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkScrolledWindow" id="scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -367,7 +378,7 @@ </child> </object> <packing> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -377,7 +388,7 @@ </object> <packing> <property name="expand">False</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object>

1 0

gajim: GUI implementation of the menu item "Roster filtering"
by Julien Pivotto 18 Apr '11

18 Apr '11

changeset 63a9ed30342d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=63a9ed30342d description: GUI implementation of the menu item "Roster filtering" diffstat: data/gui/roster_window.ui | 11 +++++++++++ src/roster_window.py | 3 +++ 2 files changed, 14 insertions(+), 0 deletions(-) diffs (34 lines): diff -r e23fd1d26ee1 -r 63a9ed30342d data/gui/roster_window.ui --- a/data/gui/roster_window.ui Fri Apr 15 14:23:02 2011 +0200 +++ b/data/gui/roster_window.ui Mon Apr 18 09:50:45 2011 +0200 @@ -219,6 +219,17 @@ </object> </child> <child> + <object class="GtkCheckMenuItem" id="show_roster_filter_menuitem"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Show Roster F_ilter</property> + <property name="use_underline">True</property> + <property name="active">False</property> + <accelerator key="I" signal="activate" modifiers="GDK_CONTROL_MASK"/> + <signal name="toggled" handler="on_show_roster_filter_menuitem_toggled"/> + </object> + </child> + <child> <object class="GtkSeparatorMenuItem" id="separator3"> <property name="visible">True</property> </object> diff -r e23fd1d26ee1 -r 63a9ed30342d src/roster_window.py --- a/src/roster_window.py Fri Apr 15 14:23:02 2011 +0200 +++ b/src/roster_window.py Mon Apr 18 09:50:45 2011 +0200 @@ -4165,6 +4165,9 @@ if self.hpaned.get_child2() is not None: self.show_roster_vbox(widget.get_active()) +# def on_show_roster_filter_menuitem_toggled(self, widget): +# """ Show the roster filter textentry """ + def on_roster_hpaned_notify(self, pane, gparamspec): """ Keep changing the width of the roster

1 0

gajim: [herfik] improve pulsaudio support in jingle audio. Fixes...
by Yann Leboulanger 15 Apr '11

15 Apr '11

changeset e23fd1d26ee1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e23fd1d26ee1 description: [herfik] improve pulsaudio support in jingle audio. Fixes #6859 diffstat: src/common/multimedia_helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d33a952428bc -r e23fd1d26ee1 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Tue Apr 12 16:36:49 2011 +0200 +++ b/src/common/multimedia_helpers.py Fri Apr 15 14:23:02 2011 +0200 @@ -80,7 +80,7 @@ # Alsa sink self.detect_element('alsasink', _('ALSA: %s'), '%s sync=false') # Pulseaudio sink - self.detect_element('pulsesink', _('Pulse: %s'), '%s sync=false') + self.detect_element('pulsesink', _('Pulse: %s'), '%s sync=true') class VideoInputManager(DeviceManager):

1 0

gajim: [Zhihao Yuan] Fallback to OSS when no soundplayer found
by Yann Leboulanger 12 Apr '11

12 Apr '11

changeset d33a952428bc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d33a952428bc description: [Zhihao Yuan] Fallback to OSS when no soundplayer found diffstat: src/common/helpers.py | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diffs (28 lines): diff -r 0a2ee3507b4d -r d33a952428bc src/common/helpers.py --- a/src/common/helpers.py Tue Apr 12 16:34:34 2011 +0200 +++ b/src/common/helpers.py Tue Apr 12 16:36:49 2011 +0200 @@ -51,6 +51,8 @@ import winsound # windows-only built-in module for playing wav import win32api import win32con + import wave # posix-only fallback wav playback + import ossaudiodev as oss except Exception: pass @@ -785,6 +787,15 @@ pass elif os.name == 'posix': if gajim.config.get('soundplayer') == '': + def _oss_play(): + sndfile = wave.open(path_to_soundfile, 'rb') + (nc, sw, fr, nf, comptype, compname) = sndfile.getparams() + dev = oss.open('/dev/dsp', 'w') + dev.setparameters(sw * 8, nc, fr) + dev.write(sndfile.readframes(nf)) + sndfile.close() + dev.close() + gajim.thread_interface(_oss_play) return player = gajim.config.get('soundplayer') command = build_command(player, path_to_soundfile)

1 0

gajim: [Zhihao Yuan] ability to run a function in a thread witho...
by Yann Leboulanger 12 Apr '11

12 Apr '11

changeset 0a2ee3507b4d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0a2ee3507b4d description: [Zhihao Yuan] ability to run a function in a thread without calling a callback. diffstat: src/gui_interface.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (20 lines): diff -r 71421b4797e7 -r 0a2ee3507b4d src/gui_interface.py --- a/src/gui_interface.py Tue Apr 12 16:30:26 2011 +0200 +++ b/src/gui_interface.py Tue Apr 12 16:34:34 2011 +0200 @@ -2899,13 +2899,14 @@ class ThreadInterface: - def __init__(self, func, func_args, callback, callback_args): + def __init__(self, func, func_args=(), callback=None, callback_args=()): """ Call a function in a thread """ def thread_function(func, func_args, callback, callback_args): output = func(*func_args) - gobject.idle_add(callback, output, *callback_args) + if callback: + gobject.idle_add(callback, output, *callback_args) Thread(target=thread_function, args=(func, func_args, callback, callback_args)).start()

1 0

gajim: fix for showing URL in chat banner. Fixes #6856
by Yann Leboulanger 12 Apr '11

12 Apr '11

changeset 71421b4797e7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=71421b4797e7 description: fix for showing URL in chat banner. Fixes #6856 diffstat: src/chat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r db102f160008 -r 71421b4797e7 src/chat_control.py --- a/src/chat_control.py Wed Apr 06 21:56:42 2011 +0200 +++ b/src/chat_control.py Tue Apr 12 16:30:26 2011 +0200 @@ -2063,7 +2063,7 @@ if status_escaped: status_text = self.urlfinder.sub(self.make_href, status_escaped) - status_text = '<span %s>%s</span>' % (font_attrs_small, status_escaped) + status_text = '<span %s>%s</span>' % (font_attrs_small, status_text) self.banner_status_label.set_tooltip_text(status) self.banner_status_label.set_no_show_all(False) self.banner_status_label.show()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2011