Changeset 8643

Timestamp:

08/30/07 23:05:00 (15 months ago)

Author:

roidelapluie

Message:

0.11.2: add multiple data form support (XEP-0004)

Location:

branches/gajim_0.11.1/src

Files:

• common/dataforms.py (modified) (4 diffs)
• dataforms_widget.py (modified) (8 diffs)

branches/gajim_0.11.1/src/common/dataforms.py

@@ -64 +64 @@
                 'list-single': ListSingleField,
                 'text-multi': TextMultiField,
-        }[typ](extend=node)
-        return f
+        }
+        if typ not in f:
+                typ = 'text-single'
+        return f[typ](extend=node)
 
 def ExtendForm(node):
         ''' Helper function to extend a node to form of appropriate type. '''
-        if node.getTag('recorded') is not None:
+        if node.getTag('reported') is not None:
                 return MultipleDataForm(extend=node)
         else:
@@ -386 +388 @@
 
 class MultipleDataForm(DataForm):
-        def __init__(self):
+        def __init__(self, type=None, title=None, instructions=None, items=None, extend=None):
+                DataForm.__init__(self, type=type, title=title, instructions=instructions, extend=extend)
                 # all records, recorded into DataRecords
-                pass
+                if extend is None:
+                        # we have to build this object from scratch
+                        xmpp.Node.__init__(self)
+
+                        if items is not None: self.items = items
+                else:
+                        # we already have xmpp.Node inside - try to convert all
+                        # fields into DataField objects
+                        if items is None:
+                                self.items = list(self.iterTags('item'))
+                        else:
+                                for item in self.getTags('item'):
+                                        self.delChild(item)
+                                self.items = items
+                reported_tag = self.getTag('reported')
+                self.reported = DataRecord(extend = reported_tag)
 
         @nested_property
@@ -402 +420 @@
                                 self.addChild(node=record)
                 def fdel(self):
-                        for record in self.getTags('record'):
+                        for record in self.getTags('item'):
                                 self.delChild(record)
                 return locals()
@@ -410 +428 @@
                         yield record
 
-        @nested_property
-        def recorded():
-                ''' DataRecord that contains descriptions of fields in records.'''
-                def fget(self):
-                        return self.getTag('recorded')
-                def fset(self, record):
-                        try:
-                                self.delChild('recorded')
-                        except:
-                                pass
-
-                        record.setName('recorded')
-                        self.addChild(node=record)
-                return locals()
-
+#       @nested_property
+#       def reported():
+#               ''' DataRecord that contains descriptions of fields in records.'''
+#               def fget(self):
+#                       return self.getTag('reported')
+#               def fset(self, record):
+#                       try:
+#                               self.delChild('reported')
+#                       except:
+#                               pass
+#
+#                       record.setName('reported')
+#                       self.addChild(node=record)
+#               return locals()
+

branches/gajim_0.11.1/src/dataforms_widget.py

@@ -17 +17 @@
 """ This module contains widget that can display data form (JEP-0004).
 Words single and multiple refers here to types of data forms:
-single means these with one record of data (without <recorded/> element),
-multiple - these which may contain more data (with <recorded/> element)."""
+single means these with one record of data (without <reported/> element),
+multiple - these which may contain more data (with <reported/> element)."""
 
 import gtk
@@ -42 +42 @@
                                 'single_form_viewport', 'data_form_types_notebook',
                                 'single_form_scrolledwindow', 'multiple_form_hbox',
-                                'records_treeview', 'add_button', 'remove_button',
+                                'records_treeview', 'buttons_vbox', 'add_button', 'remove_button',
                                 'edit_button', 'up_button', 'down_button', 'clear_button'):
                         self.__dict__[name] = self.xml.get_widget(name)
@@ -142 +142 @@
                 # creating model for form...
                 fieldtypes = []
-                for field in self._data_form.recorded.iter_fields():
+                for field in self._data_form.reported.iter_fields():
                         # note: we store also text-private and hidden fields,
                         # we just do not display them.
@@ -158 +158 @@
 
                 # constructing columns...
-                for field, counter in zip(self._data_form.iter_fields(), itertools.count()):
-                        print repr(field), repr(counter)
+                for field, counter in zip(self._data_form.reported.iter_fields(), itertools.count()):
                         self.records_treeview.append_column(
                                 gtk.TreeViewColumn(field.label, gtk.CellRendererText(),
@@ -173 +172 @@
                 self.clean_data_form = self.clean_multiple_data_form
 
-                # refresh list look
-                self.refresh_multiple_buttons()
+                readwrite = self._data_form.type != 'result'
+                if not readwrite:
+                        self.buttons_vbox.set_no_show_all(True)
+                        self.buttons_vbox.hide()
+                else:
+                        self.buttons_vbox.set_no_show_all(False)
+                        # refresh list look
+                        self.refresh_multiple_buttons()
 
         def clean_multiple_data_form(self):
@@ -187 +192 @@
                 model = self.records_treeview.get_model()
                 count = selection.count_selected_rows()
-                if count==0:
+                if count == 0:
                         self.remove_button.set_sensitive(False)
                         self.edit_button.set_sensitive(False)
                         self.up_button.set_sensitive(False)
                         self.down_button.set_sensitive(False)
-                elif count==1:
+                elif count == 1:
                         self.remove_button.set_sensitive(True)
                         self.edit_button.set_sensitive(True)
@@ -200 +205 @@
                                 self.up_button.set_sensitive(True)
                                 self.down_button.set_sensitive(False)
-                        elif path==(0,):
+                        elif path == (0, ):
                                 self.up_button.set_sensitive(False)
                                 self.down_button.set_sensitive(True)
@@ -212 +217 @@
                         self.down_button.set_sensitive(False)
 
-                if len(model)==0:
+                if len(model) == 0:
                         self.clear_button.set_sensitive(False)
                 else: