Changeset 8990 for branches/gajim_0.11.2/src/dataforms_widget.py

Timestamp:

11/16/07 20:49:07 (13 months ago)

Author:

asterix

Message:

fix jid-multi problems (only one row with a given jid is allowed)

Files:

• branches/gajim_0.11.2/src/dataforms_widget.py (modified) (5 diffs)

branches/gajim_0.11.2/src/dataforms_widget.py

@@ -21 +21 @@
 
 import gtk
+import gobject
 
 import gtkgui_helpers
+import dialogs
 
 import common.dataforms as dataforms
+from common import helpers
 
 import itertools
@@ -357 +360 @@
                                 commonwidget = False
 
-                                xml = gtkgui_helpers.get_glade('data_form_window.glade', 'item_list_table')
+                                xml = gtkgui_helpers.get_glade('data_form_window.glade',
+                                        'item_list_table')
                                 widget = xml.get_widget('item_list_table')
                                 treeview = xml.get_widget('item_treeview')
@@ -371 +375 @@
                                 renderer.set_property('editable', True)
                                 renderer.connect('edited',
-                                        self.on_jid_multi_cellrenderertext_edited, listmodel, field)
+                                        self.on_jid_multi_cellrenderertext_edited, treeview, listmodel,
+                                        field)
 
                                 treeview.append_column(gtk.TreeViewColumn(None, renderer,
@@ -492 +497 @@
                         widget.get_end_iter())
 
-        def on_jid_multi_cellrenderertext_edited(self, cell, path, newtext, model, field):
-                old=model[path][0]
+        def on_jid_multi_cellrenderertext_edited(self, cell, path, newtext, treeview,
+        model, field):
+                old = model[path][0]
+                if old == newtext:
+                        return
+                try:
+                        newtext = helpers.parse_jid(newtext)
+                except helpers.InvalidFormat, s:
+                        dialogs.ErrorDialog(_('Invalid Jabber ID'), str(s))
+                        return
+                if newtext in field.values:
+                        dialogs.ErrorDialog(
+                                _('Jabber ID already in list'),
+                                _('The Jabber ID you entered is already in the list. Choose another one.'))
+                        gobject.idle_add(treeview.set_cursor, path)
+                        return
                 model[path][0]=newtext
 
@@ -501 +520 @@
 
         def on_jid_multi_add_button_clicked(self, widget, treeview, model, field):
-                iter = model.insert(999999, ("new@jabber.id",))
+                jid = 'new@jabber.id'
+                if jid in field.values:
+                        i = 1
+                        while 'new%d@jabber.id' % i in field.values:
+                                i += 1
+                        jid = 'new%d@jabber.id' % i
+                iter = model.insert(999999, (jid,))
                 treeview.set_cursor(model.get_path(iter), treeview.get_column(0), True)
-                field.values = field.values + ["new@jabber.id"]
+                field.values = field.values + [jid]
 
         def on_jid_multi_edit_button_clicked(self, widget, treeview):