Commits December 2007

commits@gajim.org

6 participants
149 discussions

[commit-gajim] r9169 - branches/one_window/src
by nicfit＠gajim.org 18 Dec '07

18 Dec '07

Author: nicfit Date: 2007-12-18 04:41:11 +0100 (Tue, 18 Dec 2007) New Revision: 9169 Modified: branches/one_window/src/message_window.py branches/one_window/src/roster_window.py Log: Bunch of saved size bugs fixed Modified: branches/one_window/src/message_window.py =================================================================== --- branches/one_window/src/message_window.py 2007-12-18 02:07:49 UTC (rev 9168) +++ branches/one_window/src/message_window.py 2007-12-18 03:41:11 UTC (rev 9169) @@ -922,14 +922,14 @@ for c in w.controls(): yield c - def shutdown(self): + def shutdown(self, width_adjust=0): for w in self.windows(): - self.save_state(w) + self.save_state(w, width_adjust) w.window.hide() w.window.destroy() gajim.interface.save_config() - def save_state(self, msg_win): + def save_state(self, msg_win, width_adjust=0): if not gajim.config.get('saveposition'): return @@ -972,6 +972,7 @@ gajim.config.set_per('accounts', acct, pos_y_key, y) else: + width += width_adjust gajim.config.set(size_width_key, width) gajim.config.set(size_height_key, height) Modified: branches/one_window/src/roster_window.py =================================================================== --- branches/one_window/src/roster_window.py 2007-12-18 02:07:49 UTC (rev 9168) +++ branches/one_window/src/roster_window.py 2007-12-18 03:41:11 UTC (rev 9169) @@ -4252,6 +4252,7 @@ def quit_gtkgui_interface(self): '''When we quit the gtk interface : tell that to the core and exit gtk''' + msgwin_width_adjust = 0 if gajim.config.get('saveposition'): # in case show_roster_on_start is False and roster is never shown # window.window is None @@ -4265,10 +4266,16 @@ width = self.xml.get_widget('roster_vbox2').allocation.width gajim.config.set('roster_width', width) gajim.config.set('roster_height', height) + if not self.xml.get_widget('roster_vbox2').get_property('visible'): + # The roster vbox is hidden, so the message window is larger + # then we want to save (i.e. the window will grow every startup) + # so adjust. + msgwin_width_adjust = -1 * width + gajim.config.set('show_roster_on_startup', self.window.get_property('visible')) - gajim.interface.msg_win_mgr.shutdown() + gajim.interface.msg_win_mgr.shutdown(msgwin_width_adjust) gajim.config.set('collapsed_rows', '\t'.join(self.collapsed_rows)) gajim.interface.save_config() @@ -4672,8 +4679,7 @@ def on_view_menu_activate(self, widget): # Hide the show roster menu if we are not in the right windowing mode. - if (gajim.config.get('one_message_window') == 'always_with_roster' and - gajim.interface.msg_win_mgr.one_window_opened()): + if self.hpaned.get_child2() is not None: self.xml.get_widget('show_roster_menuitem').show() else: self.xml.get_widget('show_roster_menuitem').hide() @@ -4681,11 +4687,10 @@ def on_show_roster_menuitem_toggled(self, widget): # when num controls is 0 this menuitem is hidden, but still need to # disable keybinding - if (gajim.config.get('one_message_window') == 'always_with_roster' and - gajim.interface.msg_win_mgr.one_window_opened()): - self.show_roster(widget.get_active()) + if self.hpaned.get_child2() is not None: + self.show_roster_vbox(widget.get_active()) - def show_roster(self, active): + def show_roster_vbox(self, active): if active: self.xml.get_widget('roster_vbox2').show() else: @@ -5357,7 +5362,7 @@ def _on_message_window_delete(self, win_mgr, msg_win): if gajim.config.get('one_message_window') == 'always_with_roster': - self.show_roster(True) + self.show_roster_vbox(True) gtkgui_helpers.resize_window(self.window, gajim.config.get('roster_width'), gajim.config.get('roster_height')) @@ -5593,3 +5598,4 @@ if sys.platform == 'darwin': self.setup_for_osx() +

1 0

[commit-gajim] r9168 - branches/one_window/src
by nicfit＠gajim.org 18 Dec '07

18 Dec '07

Author: nicfit Date: 2007-12-18 03:07:49 +0100 (Tue, 18 Dec 2007) New Revision: 9168 Modified: branches/one_window/src/message_window.py branches/one_window/src/roster_window.py Log: Disable hiding roster when there are no message controls open Modified: branches/one_window/src/message_window.py =================================================================== --- branches/one_window/src/message_window.py 2007-12-18 01:40:59 UTC (rev 9167) +++ branches/one_window/src/message_window.py 2007-12-18 02:07:49 UTC (rev 9168) @@ -772,7 +772,7 @@ def has_window(self, jid, acct): return self.get_window(jid, acct) != None - def one_window_opened(self, contact, acct, type): + def one_window_opened(self, contact=None, acct=None, type=None): try: return self._windows[self._mode_to_key(contact, acct, type)] != None except KeyError: Modified: branches/one_window/src/roster_window.py =================================================================== --- branches/one_window/src/roster_window.py 2007-12-18 01:40:59 UTC (rev 9167) +++ branches/one_window/src/roster_window.py 2007-12-18 02:07:49 UTC (rev 9168) @@ -4673,13 +4673,17 @@ def on_view_menu_activate(self, widget): # Hide the show roster menu if we are not in the right windowing mode. if (gajim.config.get('one_message_window') == 'always_with_roster' and - gajim.interface.msg_win_mgr.one_window_opened(None, None, None)): + gajim.interface.msg_win_mgr.one_window_opened()): self.xml.get_widget('show_roster_menuitem').show() else: self.xml.get_widget('show_roster_menuitem').hide() def on_show_roster_menuitem_toggled(self, widget): - self.show_roster(widget.get_active()) + # when num controls is 0 this menuitem is hidden, but still need to + # disable keybinding + if (gajim.config.get('one_message_window') == 'always_with_roster' and + gajim.interface.msg_win_mgr.one_window_opened()): + self.show_roster(widget.get_active()) def show_roster(self, active): if active: @@ -5234,7 +5238,7 @@ if gajim.config.get('one_message_window') == 'always_with_roster': # always_with_roster mode defers to the MessageWindow - if not gajim.interface.msg_win_mgr.one_window_opened(None, None, None): + if not gajim.interface.msg_win_mgr.one_window_opened(): # No MessageWindow to defer to self.window.set_title('Gajim') return

1 0

[commit-gajim] r9167 - branches/one_window/src
by nicfit＠gajim.org 18 Dec '07

18 Dec '07

Author: nicfit Date: 2007-12-18 02:40:59 +0100 (Tue, 18 Dec 2007) New Revision: 9167 Modified: branches/one_window/src/roster_window.py Log: When roster is hidden, show it when the number of MessageWindow controls == 0 Modified: branches/one_window/src/roster_window.py =================================================================== --- branches/one_window/src/roster_window.py 2007-12-17 21:54:18 UTC (rev 9166) +++ branches/one_window/src/roster_window.py 2007-12-18 01:40:59 UTC (rev 9167) @@ -4679,7 +4679,9 @@ self.xml.get_widget('show_roster_menuitem').hide() def on_show_roster_menuitem_toggled(self, widget): - active = widget.get_active() + self.show_roster(widget.get_active()) + + def show_roster(self, active): if active: self.xml.get_widget('roster_vbox2').show() else: @@ -5351,6 +5353,7 @@ def _on_message_window_delete(self, win_mgr, msg_win): if gajim.config.get('one_message_window') == 'always_with_roster': + self.show_roster(True) gtkgui_helpers.resize_window(self.window, gajim.config.get('roster_width'), gajim.config.get('roster_height'))

1 0

[commit-gajim] r9166 - trunk/src
by jim++＠gajim.org 17 Dec '07

17 Dec '07

Author: jim++ Date: 2007-12-17 22:54:18 +0100 (Mon, 17 Dec 2007) New Revision: 9166 Modified: trunk/src/groupchat_control.py Log: Highlight on (nick/muc_highlight_words) that contains a space too. Fixes #3624. Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-12-17 20:15:06 UTC (rev 9165) +++ trunk/src/groupchat_control.py 2007-12-17 21:54:18 UTC (rev 9166) @@ -813,6 +813,13 @@ return False else: # Special word == word, no char after in word return True + for special_word in special_words: + if special_word.find(' ') > -1: + # There is a space in this special word, do a global search + # without splitting by words as previously + # We don't search this in all cases so we don't loose time + if text.find(special_word) > -1: + return True return False def set_subject(self, subject):

1 0

[commit-gajim] r9165 - trunk/src/common
by asterix＠gajim.org 17 Dec '07

17 Dec '07

Author: asterix Date: 2007-12-17 21:15:06 +0100 (Mon, 17 Dec 2007) New Revision: 9165 Modified: trunk/src/common/gajim.py Log: remove 'dh' from version name. Was from pep branch Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2007-12-17 20:05:31 UTC (rev 9164) +++ trunk/src/common/gajim.py 2007-12-17 20:15:06 UTC (rev 9165) @@ -56,7 +56,7 @@ interface = None # The actual interface (the gtk one for the moment) config = config.Config() -version = config.get('version') + 'dh' +version = config.get('version') connections = {} # 'account name': 'account (connection.Connection) instance' verbose = False

1 0

[commit-gajim] r9164 - www-website/locale/fr_FR/LC_MESSAGES
by asterix＠gajim.org 17 Dec '07

17 Dec '07

Author: asterix Date: 2007-12-17 21:05:31 +0100 (Mon, 17 Dec 2007) New Revision: 9164 Modified: www-website/locale/fr_FR/LC_MESSAGES/msg.po Log: fox typo in french translation of website Modified: www-website/locale/fr_FR/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/fr_FR/LC_MESSAGES/msg.po 2007-12-17 16:00:50 UTC (rev 9163) +++ www-website/locale/fr_FR/LC_MESSAGES/msg.po 2007-12-17 20:05:31 UTC (rev 9164) @@ -888,7 +888,7 @@ #: index.php:58 msgid "13 December 2007" -msgstr "13 Décembre 2009" +msgstr "13 Décembre 2007" #: index.php:59 msgid "06 December 2007"

1 0

[commit-gajim] r9163 - in branches/one_window: . data/glade
by nicfit＠gajim.org 17 Dec '07

17 Dec '07

Author: nicfit Date: 2007-12-17 17:00:50 +0100 (Mon, 17 Dec 2007) New Revision: 9163 Modified: branches/one_window/ branches/one_window/data/glade/message_window.glade Log: Merged revisions 9162 via svnmerge from svn://svn.gajim.org/gajim/trunk ........ r9162 | asterix | 2007-12-16 02:31:15 -0700 (Sun, 16 Dec 2007) | 2 lines don't select muc subject when we switch to a muc tab ........ Property changes on: branches/one_window ___________________________________________________________________ Name: svnmerge-integrated - /trunk:1-9155 + /trunk:1-9155,9162 Modified: branches/one_window/data/glade/message_window.glade =================================================================== --- branches/one_window/data/glade/message_window.glade 2007-12-16 09:31:15 UTC (rev 9162) +++ branches/one_window/data/glade/message_window.glade 2007-12-17 16:00:50 UTC (rev 9163) @@ -399,6 +399,7 @@ </child> <child> <widget class="GtkVBox" id="muc_child_vbox"> + <property name="can_focus">True</property> <property name="border_width">3</property> <child> <widget class="GtkAlignment" id="alignment103">

1 0

[commit-gajim] r9162 - trunk/data/glade
by asterix＠gajim.org 16 Dec '07

16 Dec '07

Author: asterix Date: 2007-12-16 10:31:15 +0100 (Sun, 16 Dec 2007) New Revision: 9162 Modified: trunk/data/glade/message_window.glade Log: don't select muc subject when we switch to a muc tab Modified: trunk/data/glade/message_window.glade =================================================================== --- trunk/data/glade/message_window.glade 2007-12-16 03:42:52 UTC (rev 9161) +++ trunk/data/glade/message_window.glade 2007-12-16 09:31:15 UTC (rev 9162) @@ -399,6 +399,7 @@ </child> <child> <widget class="GtkVBox" id="muc_child_vbox"> + <property name="can_focus">True</property> <property name="border_width">3</property> <child> <widget class="GtkAlignment" id="alignment103">

1 0

[commit-gajim] r9161 - www-website
by nicfit＠gajim.org 16 Dec '07

16 Dec '07

Author: nicfit Date: 2007-12-16 04:42:52 +0100 (Sun, 16 Dec 2007) New Revision: 9161 Modified: www-website/dev.php Log: I'm in AUTHORS and not THANKS in svn, so added to authors here. Modified: www-website/dev.php =================================================================== --- www-website/dev.php 2007-12-16 03:13:57 UTC (rev 9160) +++ www-website/dev.php 2007-12-16 03:42:52 UTC (rev 9161) @@ -87,6 +87,7 @@ print (" <ul>"); print (" <li>Yann Le Boulanger (Asterix)</li>"); print (" <li>Nikos Kouremenos (Nkour)</li>"); +print (" <li>Travis Shirk (nicfit)</li>"); print (" <li>Tomasz Melcer (Liorithiel)</li>"); print (" <li>Stefan Bethge (sb)</li>"); print (" <li>Julien Pivotto (roidelapluie)</li>");

1 0

[commit-gajim] r9160 - branches/one_window/src
by nicfit＠gajim.org 16 Dec '07

16 Dec '07

Author: nicfit Date: 2007-12-16 04:13:57 +0100 (Sun, 16 Dec 2007) New Revision: 9160 Modified: branches/one_window/src/message_window.py Log: Removed FIXME Modified: branches/one_window/src/message_window.py =================================================================== --- branches/one_window/src/message_window.py 2007-12-16 02:49:30 UTC (rev 9159) +++ branches/one_window/src/message_window.py 2007-12-16 03:13:57 UTC (rev 9160) @@ -192,6 +192,8 @@ for ctrl in self.controls(): ctrl.shutdown() self._controls.clear() + # Clean up handlers connected to the parent window, this is important since + # self.window may be the RosterWindow for i in self.handlers.keys(): if self.handlers[i].handler_is_connected(i): self.handlers[i].disconnect(i) @@ -750,7 +752,6 @@ parent_win = self.parent_win parent_paned = self.parent_paned win = MessageWindow(acct, type, parent_win, parent_paned) - # FIXME: how are these done for roster combo # we track the lifetime of this window win.window.connect('delete-event', self._on_window_delete) win.window.connect('destroy', self._on_window_destroy)

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
15
Older →

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 December 2007