Commits July 2006

commits@gajim.org

5 participants
109 discussions

[commit-gajim] r6549 - trunk/src
by jim++＠gajim.org 13 Jul '06

13 Jul '06

Author: jim++ Date: 2006-07-13 15:07:31 +0200 (Thu, 13 Jul 2006) New Revision: 6549 Modified: trunk/src/chat_control.py Log: [nk] Deleted var not needed anymore Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2006-07-12 15:14:00 UTC (rev 6548) +++ trunk/src/chat_control.py 2006-07-13 13:07:31 UTC (rev 6549) @@ -514,12 +514,10 @@ def on_actions_button_clicked(self, widget): '''popup action menu''' - #FIXME: BUG http://bugs.gnome.org/show_bug.cgi?id=316786 - self.button_clicked = widget - menu = self.prepare_context_menu() menu.show_all() - gtkgui_helpers.popup_emoticons_under_button(menu, widget, self.parent_win) + gtkgui_helpers.popup_emoticons_under_button(menu, widget, + self.parent_win) def update_font(self): font = pango.FontDescription(gajim.config.get('conversation_font'))

1 0

[commit-gajim] r6548 - branches/ad_hoc/src
by liori＠gajim.org 12 Jul '06

12 Jul '06

Author: liori Date: 2006-07-12 17:14:00 +0200 (Wed, 12 Jul 2006) New Revision: 6548 Modified: branches/ad_hoc/src/dataforms.py Log: jid-multi now works, thanks to #pygtk channel Modified: branches/ad_hoc/src/dataforms.py =================================================================== --- branches/ad_hoc/src/dataforms.py 2006-07-12 14:19:58 UTC (rev 6547) +++ branches/ad_hoc/src/dataforms.py 2006-07-12 15:14:00 UTC (rev 6548) @@ -193,28 +193,27 @@ widget = xml.get_widget('item_list_table') treeview = xml.get_widget('item_treeview') - listmodel = gtk.ListStore(str, bool) + listmodel = gtk.ListStore(str) for value in field.iter_values(): # nobody will create several megabytes long stanza - listmodel.insert(999999, (value,False)) + listmodel.insert(999999, (value,)) treeview.set_model(listmodel) renderer = gtk.CellRendererText() - renderer.set_property('ellipsize', pango.ELLIPSIZE_START) renderer.set_property('editable', True) renderer.connect('edited', self.on_jid_multi_cellrenderertext_edited, listmodel, field) treeview.append_column(gtk.TreeViewColumn(None, renderer, - text=0, editable=1)) + text=0)) xml.get_widget('add_button').connect('clicked', - self.on_jid_multi_add_button_clicked, listmodel, field) + self.on_jid_multi_add_button_clicked, treeview, listmodel, field) xml.get_widget('edit_button').connect('clicked', self.on_jid_multi_edit_button_clicked, treeview) xml.get_widget('remove_button').connect('clicked', - self.on_jid_multi_remove_button_clicked, treeview) + self.on_jid_multi_remove_button_clicked, treeview, field) xml.get_widget('clear_button').connect('clicked', self.on_jid_multi_clean_button_clicked, listmodel, field) @@ -310,23 +309,36 @@ old=model[path][0] model[path][0]=newtext - values = field.values + values = field.value + print values values[values.index(old)]=newtext - field.values = values + field.value = values + print values + print field.value - def on_jid_multi_add_button_clicked(self, widget, model, field): - iter = model.insert(999999, ("new@jid",)) - field.value += ["new@jid"] + def on_jid_multi_add_button_clicked(self, widget, treeview, model, field): + iter = model.insert(999999, ("new(a)jabber.id",)) + treeview.set_cursor(model.get_path(iter), treeview.get_column(0), True) + field.value = field.value + ["new(a)jabber.id"] def on_jid_multi_edit_button_clicked(self, widget, treeview): model, iter = treeview.get_selection().get_selected() assert iter is not None - model[iter][1]=True + treeview.set_cursor(model.get_path(iter), treeview.get_column(0), True) - def on_jid_multi_remove_button_clicked(self, widget, model, field): - pass + def on_jid_multi_remove_button_clicked(self, widget, treeview, field): + selection = treeview.get_selection() + model = treeview.get_model() + deleted = [] + def remove(model, path, iter, deleted): + deleted+=model[iter] + model.remove(iter) + + selection.selected_foreach(remove, deleted) + field.value = (v for v in field.value if v not in deleted) # python2.4 iterator + def on_jid_multi_clean_button_clicked(self, widget, model, field): model.clear() del field.value

1 0

[commit-gajim] r6547 - in branches/ad_hoc: data/glade src src/common
by liori＠gajim.org 12 Jul '06

12 Jul '06

Author: liori Date: 2006-07-12 16:19:58 +0200 (Wed, 12 Jul 2006) New Revision: 6547 Modified: branches/ad_hoc/data/glade/adhoc_commands_window.glade branches/ad_hoc/data/glade/data_form_window.glade branches/ad_hoc/src/adhoc_commands.py branches/ad_hoc/src/common/dataforms.py branches/ad_hoc/src/dataforms.py Log: Jid-multi almost works. Modified: branches/ad_hoc/data/glade/adhoc_commands_window.glade =================================================================== --- branches/ad_hoc/data/glade/adhoc_commands_window.glade 2006-07-11 18:17:25 UTC (rev 6546) +++ branches/ad_hoc/data/glade/adhoc_commands_window.glade 2006-07-12 14:19:58 UTC (rev 6547) @@ -286,11 +286,11 @@ <property name="spacing">0</property> <child> - <widget class="GtkLabel" id="instructions_label"> + <widget class="GtkLabel" id="notes_label"> <property name="visible">True</property> - <property name="label" translatable="yes">Fill in the form</property> + <property name="label" translatable="yes">Please wait while the command is sending...</property> <property name="use_underline">False</property> - <property name="use_markup">True</property> + <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> @@ -651,27 +651,40 @@ <property name="spacing">0</property> <child> - <widget class="GtkButton" id="cancel_button"> + <widget class="GtkHBox" id="hbox2958"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Thu, 22 Jun 2006 19:56:06 GMT"/> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkButton" id="cancel_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:32 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <placeholder/> + </child> </widget> <packing> <property name="padding">3</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> <child> - <placeholder/> - </child> - - <child> <widget class="GtkButton" id="back_button"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -679,10 +692,10 @@ <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_back_button_clicked" last_modification_time="Thu, 22 Jun 2006 19:56:13 GMT"/> + <signal name="clicked" handler="on_back_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:50 GMT"/> </widget> <packing> - <property name="padding">3</property> + <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> </packing> @@ -696,7 +709,7 @@ <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_forward_button_clicked" last_modification_time="Thu, 22 Jun 2006 19:56:18 GMT"/> + <signal name="clicked" handler="on_forward_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:47 GMT"/> </widget> <packing> <property name="padding">3</property> @@ -713,7 +726,7 @@ <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_execute_button_clicked" last_modification_time="Thu, 22 Jun 2006 19:56:23 GMT"/> + <signal name="clicked" handler="on_execute_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:42 GMT"/> </widget> <packing> <property name="padding">3</property> @@ -721,6 +734,22 @@ <property name="fill">False</property> </packing> </child> + + <child> + <widget class="GtkButton" id="close_button"> + <property name="can_focus">True</property> + <property name="label">gtk-close</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:38 GMT"/> + </widget> + <packing> + <property name="padding">3</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> Modified: branches/ad_hoc/data/glade/data_form_window.glade =================================================================== --- branches/ad_hoc/data/glade/data_form_window.glade 2006-07-11 18:17:25 UTC (rev 6546) +++ branches/ad_hoc/data/glade/data_form_window.glade 2006-07-12 14:19:58 UTC (rev 6547) @@ -199,61 +199,214 @@ <property name="focus_on_map">True</property> <child> - <widget class="GtkScrolledWindow" id="data_form_scrolledwindow"> + <widget class="GtkVBox" id="vbox111"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + <property name="homogeneous">False</property> + <property name="spacing">10</property> <child> - <widget class="GtkVBox" id="container_vbox"> - <property name="border_width">5</property> + <widget class="GtkScrolledWindow" id="data_form_scrolledwindow"> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkViewport" id="viewport2"> + <property name="visible">True</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + + <child> + <widget class="GtkVBox" id="container_vbox"> + <property name="border_width">5</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">5</property> + + <child> + <widget class="GtkLabel" id="form_instructions_label"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">5</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHSeparator" id="form_instructions_hseparator"> + <property name="visible">True</property> + </widget> + <packing> + <property name="padding">5</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <placeholder/> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkTable" id="item_list_table"> + <property name="visible">True</property> + <property name="n_rows">1</property> + <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="spacing">5</property> + <property name="row_spacing">0</property> + <property name="column_spacing">0</property> <child> - <widget class="GtkLabel" id="form_instructions_label"> + <widget class="GtkScrolledWindow" id="scrolledwindow36"> <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property> + <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTreeView" id="item_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">False</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> + </widget> + </child> </widget> <packing> - <property name="padding">5</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> </packing> </child> <child> - <widget class="GtkHSeparator" id="hseparator16"> + <widget class="GtkVBox" id="vbox112"> <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkButton" id="clear_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-clear</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="remove_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-remove</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="add_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-add</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="edit_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-edit</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <placeholder/> + </child> </widget> <packing> - <property name="padding">5</property> - <property name="expand">False</property> - <property name="fill">True</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> </packing> </child> - - <child> - <placeholder/> - </child> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> </child> </widget> </child> Modified: branches/ad_hoc/src/adhoc_commands.py =================================================================== --- branches/ad_hoc/src/adhoc_commands.py 2006-07-11 18:17:25 UTC (rev 6546) +++ branches/ad_hoc/src/adhoc_commands.py 2006-07-12 14:19:58 UTC (rev 6547) @@ -61,11 +61,11 @@ self.xml = gtkgui_helpers.get_glade('adhoc_commands_window.glade') self.window = self.xml.get_widget('adhoc_commands_window') for name in ('cancel_button', 'back_button', 'forward_button', - 'execute_button','stages_notebook', + 'execute_button','close_button','stages_notebook', 'retrieving_commands_stage_vbox', 'command_list_stage_vbox','command_list_vbox', 'sending_form_stage_vbox','sending_form_progressbar', - 'no_commands_stage_vbox','error_stage_vbox', + 'notes_label','no_commands_stage_vbox','error_stage_vbox', 'error_description_label'): self.__dict__[name] = self.xml.get_widget(name) @@ -75,6 +75,7 @@ self.sending_form_stage_vbox.pack_start(self.data_form_widget) # setting initial stage + self.close_button.set_no_show_all(True) self.stage1() # displaying the window @@ -87,6 +88,7 @@ def stage_back_button_clicked(self, *anything): assert False def stage_forward_button_clicked(self, *anything): assert False def stage_execute_button_clicked(self, *anything): assert False + def stage_close_button_clicked(self, *anything): assert False def stage_adhoc_commands_window_delete_event(self, *anything): assert False def do_nothing(self, *anything): return False @@ -103,8 +105,11 @@ def on_execute_button_clicked(self, *anything): return self.stage_execute_button_clicked(*anything) + def on_close_button_clicked(self, *anything): + return self.stage_close_button_clicked(*anything) + def on_adhoc_commands_window_destroy(self, *anything): - # do all actions that are needed to remove this object from memory... + # TODO: do all actions that are needed to remove this object from memory... self.remove_pulsing() def on_adhoc_commands_window_delete_event(self, *anything): @@ -215,6 +220,8 @@ assert isinstance(self.commandnode, unicode) + self.form_status = None + self.stages_notebook.set_current_page( self.stages_notebook.page_num( self.sending_form_stage_vbox)) @@ -231,6 +238,7 @@ self.stage_back_button_clicked = self.stage3_back_button_clicked self.stage_forward_button_clicked = self.stage3_forward_button_clicked self.stage_execute_button_clicked = self.stage3_execute_button_clicked + self.stage_close_button_clicked = self.stage3_close_button_clicked self.stage_adhoc_commands_window_delete_event = self.stage3_cancel_button_clicked def stage3_finish(self): @@ -255,6 +263,14 @@ return False return True + def stage3_close_button_clicked(self, widget): + # this works also as a handler for window_delete_event, so we have to return appropriate + # values + if widget==self.window: + return False + else: + self.window.destroy() + def stage3_back_button_clicked(self, widget): self.stage3_submit_form('prev') @@ -287,23 +303,24 @@ if self.sessionid is None: self.sessionid = command.getAttr('sessionid') - self.dataform = dataforms.DataForm(node=command.getTag('x')) + self.form_status = command.getAttr('status') - self.data_form_widget.set_sensitive(True) - try: - self.data_form_widget.data_form=self.dataform - except dataforms.BadDataFormNode: - # TODO: translate - self.stage5('Service sent malformed data', senderror=True) - self.data_form_widget.show() + if command.getTag('x') is not None: + self.dataform = dataforms.DataForm(node=command.getTag('x')) + self.data_form_widget.set_sensitive(True) + try: + self.data_form_widget.data_form=self.dataform + except dataforms.BadDataFormNode: + # TODO: translate + self.stage5('Service sent malformed data', senderror=True) + self.data_form_widget.show() + else: + self.data_form_widget.hide() + action = command.getTag('action') if action is None: - # no action tag? check if that's last stage... - if command.getAttr('status')=='completed': - self.cancel_button.set_sensitive(False) - else: - self.cancel_button.set_sensitive(True) + self.cancel_button.set_sensitive(True) self.back_button.set_sensitive(False) self.forward_button.set_sensitive(False) self.execute_button.set_sensitive(True) @@ -314,6 +331,25 @@ self.forward_button.set_sensitive(action.getTag('next') is not None) self.execute_button.set_sensitive(True) + if self.form_status == 'completed': + self.cancel_button.set_sensitive(False) + self.back_button.set_sensitive(False) + self.forward_button.set_sensitive(False) + self.execute_button.set_no_show_all(True) + self.execute_button.hide() + self.close_button.set_no_show_all(False) + self.close_button.show() + self.stage_adhoc_commands_window_delete_event = self.stage3_close_button_clicked + + note = command.getTag('note') + if note is not None: + self.notes_label.set_text(note.getData().decode('utf-8')) + self.notes_label.set_no_show_all(False) + self.notes_label.show() + else: + self.notes_label.set_no_show_all(True) + self.notes_label.hide() + # stage 4: no commands are exposed def stage4(self): '''Display the message. Wait for user to close the window''' Modified: branches/ad_hoc/src/common/dataforms.py =================================================================== --- branches/ad_hoc/src/common/dataforms.py 2006-07-11 18:17:25 UTC (rev 6546) +++ branches/ad_hoc/src/common/dataforms.py 2006-07-12 14:19:58 UTC (rev 6547) @@ -249,7 +249,7 @@ self.delChild('recorded') except ValueError: pass - self.addChild('recorded', None, fields) + self.addChild('recorded', {}, fields) def del_fields(self): if self.mode is DATAFORM_SINGLE: @@ -335,7 +335,10 @@ self.setAttr('var', var) def del_var(self): - self.delAttr('var') + try: + self.delAttr('var') + except KeyError: + pass var = property(get_var, set_var, del_var, """ Field name. """) @@ -347,7 +350,10 @@ self.setAttr('label', label) def del_label(self): - self.delAttr('label') + try: + self.delAttr('label') + except KeyError: + pass label = property(get_label, set_label, del_label, """ Human-readable name for field. """) @@ -384,6 +390,14 @@ required = property(get_required, set_required, None, """ If this is set to True, the field is required for form to be valid. """) + def iter_values(self): + assert self.type in ('list-single', 'list-multi', 'jid-multi') + + for element in self.getChildren(): + if not isinstance(element, xmpp.Node): continue + if not element.getName()=='value': continue + yield element.getData().decode('utf-8') + def get_value(self): if self.type in ('boolean',): if self.getTagData('value') in (1, 'true'): @@ -430,8 +444,10 @@ for element in self.getChildren(): if not isinstance(element, xmpp.Node): continue if not element.getName()=='option': continue - if element.getTag('value') is None: raise BadDataFormNode - yield element.getAttr('label'), element.getTag('value').getData() + try: + yield element.getAttr('label'), element.getTag('value').getData() + except TypeError: + raise BadDataFormNode def get_options(self): """ Returns a list of tuples: (label, value). """ Modified: branches/ad_hoc/src/dataforms.py =================================================================== --- branches/ad_hoc/src/dataforms.py 2006-07-11 18:17:25 UTC (rev 6546) +++ branches/ad_hoc/src/dataforms.py 2006-07-12 14:19:58 UTC (rev 6547) @@ -17,6 +17,8 @@ """ This module contains widget that can display data form (JEP-0004). """ import gtk +import pango + import gtkgui_helpers import common.xmpp as xmpp @@ -27,12 +29,13 @@ """ Data Form widget. Use like any other widget. """ def __init__(self, dataformnode=None): """ Create a widget. """ - gtk.Alignment.__init__(self) + gtk.Alignment.__init__(self, xscale=1.0, yscale=1.0) self._data_form = None self.xml=gtkgui_helpers.get_glade('data_form_window.glade', 'data_form_scrolledwindow') self.instructions = self.xml.get_widget('form_instructions_label') + self.separator = self.xml.get_widget('form_instructions_hseparator') self.container = self.xml.get_widget('container_vbox') self.add(self.xml.get_widget('data_form_scrolledwindow')) @@ -54,6 +57,18 @@ self.form.show() self.container.pack_end(self.form, expand=True, fill=True) + if dataform.instructions is None: + self.instructions.set_no_show_all(True) + self.instructions.hide() + self.separator.set_no_show_all(True) + self.separator.hide() + else: + self.instructions.set_text(dataform.instructions) + self.instructions.set_no_show_all(False) + self.instructions.show() + self.separator.set_no_show_all(False) + self.separator.show() + def get_data_form(self): """ Data form displayed in the widget or None if no form. """ return self._data_form @@ -81,39 +96,6 @@ """ Treat 'us' as one widget. """ self.show_all() -#? def filled_data_form(self): -#? """ Generates form that contains values filled by user. """ -#? assert isinstance(self._data_form, dataforms.DataForm) -#? -#? form = xmpp.Node('x', {'xmlns':xmpp.NS_DATA, 'type':'submit'}) -#? -#? -#? for field in self._data_form.kids: -#? if not isinstance(field, xmpp.DataField): continue -#? -#? ftype = field.getType() -#? if ftype not in ('boolean', 'fixed', 'hidden', 'jid-multi', -#? 'jid-single', 'list-multi', 'list-single', -#? 'text-multi', 'text-private', 'text-single'): -#? ftype = 'text-single' -#? -#? if ftype in ('fixed',): -#? continue -#? -#? newfield = xmpp.Node('field', {'var': field.getVar()}) -#? -#? if ftype in ('jid-multi', 'list-multi', 'text-multi'): -#? for value in field.getValues(): -#? newvalue = xmpp.Node('value', {}, [value]) -#? newfield.addChild(node=newvalue) -#? else: -#? newvalue = xmpp.Node('value', {}, [field.getValue()]) -#? newfield.addChild(node=newvalue) -#? -#? form.addChild(node=newfield) -#? -#? return form - # "private" methods # we have actually two different kinds of data forms: one is a simple form to fill, @@ -129,6 +111,8 @@ assert dataform.mode==dataforms.DATAFORM_SINGLE gtk.Table.__init__(self) + self.set_col_spacings(6) + self.set_row_spacings(6) self._data_form = dataform @@ -162,11 +146,9 @@ commonwidget=False widget = gtk.Label(field.value) widget.set_line_wrap(True) - self.attach(widget, leftattach, rightattach, linecounter, linecounter+1) + self.attach(widget, leftattach, rightattach, linecounter, linecounter+1, + xoptions=gtk.FILL, yoptions=gtk.FILL) - elif field.type in ('jid-multi'): - widget = gtk.Label(field.type) - elif field.type == 'list-single': # TODO: When more than few choices, make a list # TODO: Think of moving that to another function (it could be used @@ -204,6 +186,42 @@ field.value = u'' widget.set_text(field.value) + elif field.type == 'jid-multi': + commonwidget = False + + 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') + + listmodel = gtk.ListStore(str, bool) + for value in field.iter_values(): + # nobody will create several megabytes long stanza + listmodel.insert(999999, (value,False)) + + treeview.set_model(listmodel) + + renderer = gtk.CellRendererText() + renderer.set_property('ellipsize', pango.ELLIPSIZE_START) + renderer.set_property('editable', True) + renderer.connect('edited', + self.on_jid_multi_cellrenderertext_edited, listmodel, field) + + treeview.append_column(gtk.TreeViewColumn(None, renderer, + text=0, editable=1)) + + xml.get_widget('add_button').connect('clicked', + self.on_jid_multi_add_button_clicked, listmodel, field) + xml.get_widget('edit_button').connect('clicked', + self.on_jid_multi_edit_button_clicked, treeview) + xml.get_widget('remove_button').connect('clicked', + self.on_jid_multi_remove_button_clicked, treeview) + xml.get_widget('clear_button').connect('clicked', + self.on_jid_multi_clean_button_clicked, listmodel, field) + + self.attach(widget, 1, 2, linecounter, linecounter+1) + + del xml + elif field.type == 'text-private': widget = gtk.Entry() widget.connect('changed', self.on_text_single_entry_changed, field) @@ -214,14 +232,21 @@ elif field.type == 'text-multi': # TODO: bigger text view - widget = gtk.TextView() - widget.set_wrap_mode(gtk.WRAP_WORD) - widget.get_buffer().connect('changed', self.on_text_multi_textbuffer_changed, + commonwidget = False + + textwidget = gtk.TextView() + textwidget.set_wrap_mode(gtk.WRAP_WORD) + textwidget.get_buffer().connect('changed', self.on_text_multi_textbuffer_changed, field) if field.value is None: field.value = u'' - widget.get_buffer().set_text(field.value) + textwidget.get_buffer().set_text(field.value) + + widget = gtk.ScrolledWindow() + widget.add(textwidget) + self.attach(widget, 1, 2, linecounter, linecounter+1) + else:# field.type == 'text-single' or field.type is nonstandard: # JEP says that if we don't understand some type, we # should handle it as text-single @@ -234,11 +259,13 @@ if commonlabel and field.label is not None: label = gtk.Label(field.label) label.set_alignment(1.0, 0.5) - self.attach(label, 0, 1, linecounter, linecounter+1) + self.attach(label, 0, 1, linecounter, linecounter+1, + xoptions=gtk.FILL, yoptions=gtk.FILL) if commonwidget: assert widget is not None - self.attach(widget, 1, 2, linecounter, linecounter+1) + self.attach(widget, 1, 2, linecounter, linecounter+1, + yoptions=gtk.FILL) widget.show_all() if commondesc and field.description is not None: @@ -247,7 +274,8 @@ gtkgui_helpers.escape_for_pango_markup(field.description)+\ '') label.set_line_wrap(True) - self.attach(label, 2, 3, linecounter, linecounter+1) + self.attach(label, 2, 3, linecounter, linecounter+1, + xoptions=gtk.FILL|gtk.SHRINK, yoptions=gtk.FILL|gtk.SHRINK) linecounter+=1 if self.get_property('visible'): @@ -264,10 +292,11 @@ field.value = value def on_list_multi_checkbutton_toggled(self, widget, field, value): + # TODO: make some methods like add_value and remove_value if widget.get_active() and value not in field.value: - field.value.append(value) + field.value += [value] elif not widget.get_active() and value in field.value: - field.value.remove(value) + field.value = [v for v in field.value if v!=value] def on_text_single_entry_changed(self, widget, field): field.value = widget.get_text() @@ -277,6 +306,31 @@ widget.get_start_iter(), widget.get_end_iter()) + def on_jid_multi_cellrenderertext_edited(self, cell, path, newtext, model, field): + old=model[path][0] + model[path][0]=newtext + + values = field.values + values[values.index(old)]=newtext + field.values = values + + def on_jid_multi_add_button_clicked(self, widget, model, field): + iter = model.insert(999999, ("new@jid",)) + field.value += ["new@jid"] + + def on_jid_multi_edit_button_clicked(self, widget, treeview): + model, iter = treeview.get_selection().get_selected() + assert iter is not None + + model[iter][1]=True + + def on_jid_multi_remove_button_clicked(self, widget, model, field): + pass + + def on_jid_multi_clean_button_clicked(self, widget, model, field): + model.clear() + del field.value + class MultipleForm(gtk.Alignment, object): def __init__(self, dataform): assert dataform.mode==dataforms.DATAFORM_MULTIPLE

1 0

[commit-gajim] r6546 - branches/zeroconf_network/src/common/zeroconf
by dkirov＠gajim.org 11 Jul '06

11 Jul '06

Author: dkirov Date: 2006-07-11 20:17:25 +0200 (Tue, 11 Jul 2006) New Revision: 6546 Modified: branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py Log: prepare useless methos for removal Modified: branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py =================================================================== --- branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py 2006-07-11 18:03:50 UTC (rev 6545) +++ branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py 2006-07-11 18:17:25 UTC (rev 6546) @@ -205,7 +205,7 @@ # refresh all contacts data all 10 seconds self.call_resolve_timeout = True - gobject.timeout_add(10000, self._on_resolve_timeout) + gobject.timeout_add(1000, self._on_resolve_timeout) def connect_and_init(self, show, msg, signed): self.continue_connect_info = [show, msg, signed] @@ -348,109 +348,26 @@ pass def ack_subscribed(self, jid): - if not self.connection: - return - pass + gajim.debug.log('This should not happen (ack_subscribed)') - ''' - gajim.log.debug('ack\'ing subscription complete for %s' % jid) - p = common.xmpp.Presence(jid, 'subscribe') - self.connection.send(p) - ''' - def ack_unsubscribed(self, jid): - if not self.connection: - return - pass - - ''' - gajim.log.debug('ack\'ing unsubscription complete for %s' % jid) - p = common.xmpp.Presence(jid, 'unsubscribe') - self.connection.send(p) - ''' + gajim.debug.log('This should not happen (ack_unsubscribed)') def request_subscription(self, jid, msg = '', name = '', groups = [], auto_auth = False): - if not self.connection: - return - pass - - ''' - gajim.log.debug('subscription request for %s' % jid) - if auto_auth: - self.jids_for_auto_auth.append(jid) - # RFC 3921 section 8.2 - infos = {'jid': jid} - if name: - infos['name'] = name - iq = common.xmpp.Iq('set', common.xmpp.NS_ROSTER) - q = iq.getTag('query') - item = q.addChild('item', attrs = infos) - for g in groups: - item.addChild('group').setData(g) - self.connection.send(iq) + gajim.debug.log('This should not happen (request_subscription)') - p = common.xmpp.Presence(jid, 'subscribe') - p = self.add_sha(p) - if not msg: - msg = _('I would like to add you to my roster.') - p.setStatus(msg) - self.connection.send(p) - ''' - def send_authorization(self, jid): - if not self.connection: - return - pass - - ''' - p = common.xmpp.Presence(jid, 'subscribed') - p = self.add_sha(p) - self.connection.send(p) - ''' + gajim.debug.log('This should not happen (send_authorization)') def refuse_authorization(self, jid): - if not self.connection: - return - pass - - ''' - p = common.xmpp.Presence(jid, 'unsubscribed') - p = self.add_sha(p) - self.connection.send(p) - ''' + gajim.debug.log('This should not happen (refuse_authorization)') def unsubscribe(self, jid, remove_auth = True): - if not self.connection: - return - pass - - ''' - if remove_auth: - self.connection.getRoster().delItem(jid) - jid_list = gajim.config.get_per('contacts') - for j in jid_list: - if j.startswith(jid): - gajim.config.del_per('contacts', j) - else: - self.connection.getRoster().Unsubscribe(jid) - self.update_contact(jid, '', []) - ''' + gajim.debug.log('This should not happen (unsubscribe)') def unsubscribe_agent(self, agent): - if not self.connection: - return - pass - - ''' - iq = common.xmpp.Iq('set', common.xmpp.NS_REGISTER, to = agent) - iq.getTag('query').setTag('remove') - id = self.connection.getAnID() - iq.setID(id) - self.awaiting_answers[id] = (AGENT_REMOVED, agent) - self.connection.send(iq) - self.connection.getRoster().delItem(agent) - ''' + gajim.debug.log('This should not happen (unsubscribe_agent)') def update_contact(self, jid, name, groups): if self.connection: @@ -458,44 +375,16 @@ groups = groups) def new_account(self, name, config, sync = False): - ''' - # If a connection already exist we cannot create a new account - if self.connection : - return - self._hostname = config['hostname'] - self.new_account_info = config - self.name = name - self.on_connect_success = self._on_new_account - self.on_connect_failure = self._on_new_account - self.connect(config) - ''' + gajim.debug.log('This should not happen (new_account)') def _on_new_account(self, con = None, con_type = None): - ''' - if not con_type: - self.dispatch('ACC_NOT_OK', - (_('Could not connect to "%s"') % self._hostname)) - return - self.on_connect_failure = None - self.connection = con - common.xmpp.features_nb.getRegInfo(con, self._hostname) - ''' + gajim.debug.log('This should not happen (_on_new_account)') def account_changed(self, new_name): self.name = new_name def request_last_status_time(self, jid, resource): - ''' - if not self.connection: - return - to_whom_jid = jid - if resource: - to_whom_jid += '/' + resource - iq = common.xmpp.Iq(to = to_whom_jid, typ = 'get', queryNS =\ - common.xmpp.NS_LAST) - self.connection.send(iq) - ''' - pass + gajim.debug.log('This should not happen (request_last_status_time)') def request_os_info(self, jid, resource): ''' @@ -511,249 +400,52 @@ pass def get_settings(self): - ''' - # Get Gajim settings as described in JEP 0049 - if not self.connection: - return - iq = common.xmpp.Iq(typ='get') - iq2 = iq.addChild(name='query', namespace='jabber:iq:private') - iq3 = iq2.addChild(name='gajim', namespace='gajim:prefs') - self.connection.send(iq) - ''' - pass + gajim.debug.log('This should not happen (get_settings)') def get_bookmarks(self): - ''' - # Get Bookmarks from storage as described in JEP 0048 - self.bookmarks = [] #avoid multiple bookmarks when re-connecting - if not self.connection: - return - iq = common.xmpp.Iq(typ='get') - iq2 = iq.addChild(name='query', namespace='jabber:iq:private') - iq2.addChild(name='storage', namespace='storage:bookmarks') - self.connection.send(iq) - ''' - pass + gajim.debug.log('This should not happen (get_bookmarks)') def store_bookmarks(self): - ''' - # Send bookmarks to the storage namespace - if not self.connection: - return - iq = common.xmpp.Iq(typ='set') - iq2 = iq.addChild(name='query', namespace='jabber:iq:private') - iq3 = iq2.addChild(name='storage', namespace='storage:bookmarks') - for bm in self.bookmarks: - iq4 = iq3.addChild(name = "conference") - iq4.setAttr('jid', bm['jid']) - iq4.setAttr('autojoin', bm['autojoin']) - iq4.setAttr('name', bm['name']) - # Only add optional elements if not empty - # Note: need to handle both None and '' as empty - # thus shouldn't use "is not None" - if bm['nick']: - iq5 = iq4.setTagData('nick', bm['nick']) - if bm['password']: - iq5 = iq4.setTagData('password', bm['password']) - if bm['print_status']: - iq5 = iq4.setTagData('print_status', bm['print_status']) - self.connection.send(iq) - ''' - pass - + gajim.debug.log('This should not happen (store_bookmarks)') + def get_metacontacts(self): - ''' - # Get metacontacts list from storage as described in JEP 0049 - if not self.connection: - return - iq = common.xmpp.Iq(typ='get') - iq2 = iq.addChild(name='query', namespace='jabber:iq:private') - iq2.addChild(name='storage', namespace='storage:metacontacts') - self.connection.send(iq) - ''' - pass - - ''' - def store_metacontacts(self, tags_list): - # Send meta contacts to the storage namespace - if not self.connection: - return - iq = common.xmpp.Iq(typ='set') - iq2 = iq.addChild(name='query', namespace='jabber:iq:private') - iq3 = iq2.addChild(name='storage', namespace='storage:metacontacts') - for tag in tags_list: - for data in tags_list[tag]: - jid = data['jid'] - dict_ = {'jid': jid, 'tag': tag} - if data.has_key('order'): - dict_['order'] = data['order'] - iq3.addChild(name = 'meta', attrs = dict_) - self.connection.send(iq) - ''' - + gajim.debug.log('This should not happen (get_metacontacts)') + def send_agent_status(self, agent, ptype): - ''' - if not self.connection: - return - p = common.xmpp.Presence(to = agent, typ = ptype) - p = self.add_sha(p, ptype != 'unavailable') - self.connection.send(p) - ''' - pass + gajim.debug.log('This should not happen (send_agent_status)') - def join_gc(self, nick, room, server, password): - ''' - if not self.connection: - return - show = helpers.get_xmpp_show(STATUS_LIST[self.connected]) - if show == 'invisible': - # Never join a room when invisible - return - p = common.xmpp.Presence(to = '%s@%s/%s' % (room, server, nick), - show = show, status = self.status) - if gajim.config.get('send_sha_in_gc_presence'): - p = self.add_sha(p) - t = p.setTag(common.xmpp.NS_MUC + ' x') - if password: - t.setTagData('password', password) - self.connection.send(p) - #last date/time in history to avoid duplicate - # FIXME: This JID needs to be normalized; see #1364 - jid='%s@%s' % (room, server) - last_log = gajim.logger.get_last_date_that_has_logs(jid, is_room = True) - if last_log is None: - last_log = 0 - self.last_history_line[jid]= last_log - ''' - pass + gajim.debug.log('This should not happen (join_gc)') def send_gc_message(self, jid, msg): - ''' - if not self.connection: - return - msg_iq = common.xmpp.Message(jid, msg, typ = 'groupchat') - self.connection.send(msg_iq) - self.dispatch('MSGSENT', (jid, msg)) - ''' - pass + gajim.debug.log('This should not happen (send_gc_message)') def send_gc_subject(self, jid, subject): - ''' - if not self.connection: - return - msg_iq = common.xmpp.Message(jid,typ = 'groupchat', subject = subject) - self.connection.send(msg_iq) - ''' - pass + gajim.debug.log('This should not happen (send_gc_subject)') def request_gc_config(self, room_jid): - ''' - iq = common.xmpp.Iq(typ = 'get', queryNS = common.xmpp.NS_MUC_OWNER, - to = room_jid) - self.connection.send(iq) - ''' - pass - + gajim.debug.log('This should not happen (request_gc_config)') + def change_gc_nick(self, room_jid, nick): - ''' - if not self.connection: - return - p = common.xmpp.Presence(to = '%s/%s' % (room_jid, nick)) - p = self.add_sha(p) - self.connection.send(p) - ''' - pass + gajim.debug.log('This should not happen (change_gc_nick)') def send_gc_status(self, nick, jid, show, status): - ''' - if not self.connection: - return - if show == 'invisible': - show = 'offline' - ptype = None - if show == 'offline': - ptype = 'unavailable' - show = helpers.get_xmpp_show(show) - p = common.xmpp.Presence(to = '%s/%s' % (jid, nick), typ = ptype, - show = show, status = status) - if gajim.config.get('send_sha_in_gc_presence'): - p = self.add_sha(p, ptype != 'unavailable') - # send instantly so when we go offline, status is sent to gc before we - # disconnect from jabber server - self.connection.send(p) - ''' - pass + gajim.debug.log('This should not happen (send_gc_status)') def gc_set_role(self, room_jid, nick, role, reason = ''): - ''' - # role is for all the life of the room so it's based on nick - if not self.connection: - return - iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\ - common.xmpp.NS_MUC_ADMIN) - item = iq.getTag('query').setTag('item') - item.setAttr('nick', nick) - item.setAttr('role', role) - if reason: - item.addChild(name = 'reason', payload = reason) - self.connection.send(iq) - ''' - pass + gajim.debug.log('This should not happen (gc_set_role)') def gc_set_affiliation(self, room_jid, jid, affiliation, reason = ''): - ''' - # affiliation is for all the life of the room so it's based on jid - if not self.connection: - return - iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\ - common.xmpp.NS_MUC_ADMIN) - item = iq.getTag('query').setTag('item') - item.setAttr('jid', jid) - item.setAttr('affiliation', affiliation) - if reason: - item.addChild(name = 'reason', payload = reason) - self.connection.send(iq) - ''' - pass + gajim.debug.log('This should not happen (gc_set_affiliation)') def send_gc_affiliation_list(self, room_jid, list): - ''' - if not self.connection: - return - iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS = \ - common.xmpp.NS_MUC_ADMIN) - item = iq.getTag('query') - for jid in list: - item_tag = item.addChild('item', {'jid': jid, - 'affiliation': list[jid]['affiliation']}) - if list[jid].has_key('reason') and list[jid]['reason']: - item_tag.setTagData('reason', list[jid]['reason']) - self.connection.send(iq) - ''' - pass + gajim.debug.log('This should not happen (send_gc_affiliation_list)') def get_affiliation_list(self, room_jid, affiliation): - ''' - if not self.connection: - return - iq = common.xmpp.Iq(typ = 'get', to = room_jid, queryNS = \ - common.xmpp.NS_MUC_ADMIN) - item = iq.getTag('query').setTag('item') - item.setAttr('affiliation', affiliation) - self.connection.send(iq) - ''' - pass + gajim.debug.log('This should not happen (get_affiliation_list)') def send_gc_config(self, room_jid, config): - ''' - iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\ - common.xmpp.NS_MUC_OWNER) - query = iq.getTag('query') - self.build_data_from_dict(query, config) - self.connection.send(iq) - ''' - pass + gajim.debug.log('This should not happen (send_gc_config)') def gpg_passphrase(self, passphrase): if USE_GPG: @@ -790,38 +482,10 @@ pass def unregister_account(self, on_remove_success): - ''' - # no need to write this as a class method and keep the value of on_remove_success - # as a class property as pass it as an argument - def _on_unregister_account_connect(con): - self.on_connect_auth = None - if self.connected > 1: - hostname = gajim.config.get_per('accounts', self.name, 'hostname') - iq = common.xmpp.Iq(typ = 'set', to = hostname) - q = iq.setTag(common.xmpp.NS_REGISTER + ' query').setTag('remove') - con.send(iq) - on_remove_success(True) - return - on_remove_success(False) - if self.connected == 0: - self.on_connect_auth = _on_unregister_account_connect - self.connect_and_auth() - else: - _on_unregister_account_connect(self.connection) - ''' - pass + gajim.debug.log('This should not happen (unregister_account)') def send_invite(self, room, to, reason=''): - ''' - # sends invitation - message=common.xmpp.Message(to = room) - c = message.addChild(name = 'x', namespace = common.xmpp.NS_MUC_USER) - c = c.addChild(name = 'invite', attrs={'to' : to}) - if reason != '': - c.setTagData('reason', reason) - self.connection.send(message) - ''' - pass + gajim.debug.log('This should not happen (send_invite)') def send_keepalive(self): # nothing received for the last foo seconds (60 secs by default)

1 0

[commit-gajim] r6545 - branches/zeroconf_network/src/common/zeroconf
by dkirov＠gajim.org 11 Jul '06

11 Jul '06

Author: dkirov Date: 2006-07-11 20:03:50 +0200 (Tue, 11 Jul 2006) New Revision: 6545 Modified: branches/zeroconf_network/src/common/zeroconf/zeroconf.py Log: better var names Modified: branches/zeroconf_network/src/common/zeroconf/zeroconf.py =================================================================== --- branches/zeroconf_network/src/common/zeroconf/zeroconf.py 2006-07-11 15:22:59 UTC (rev 6544) +++ branches/zeroconf_network/src/common/zeroconf/zeroconf.py 2006-07-11 18:03:50 UTC (rev 6545) @@ -71,6 +71,7 @@ def check_jid(self, jid): # TODO: at least miranda uses bad service names(only host name), so change them - probabaly not so nice... need to find a better solution + # [dkirov] maybe turn it into host+'@'+host, instead ? if jid.find('@') == -1: return 'bad-client@' + jid else: @@ -83,14 +84,15 @@ else: return jid - def txt_array_to_dict(self,t): - l = {} + def txt_array_to_dict(self,txt_array): + items = {} - for s in t: - str = avahi.byte_array_to_string(s) - poseq = str.find('=') - l[str[:poseq]] = str[poseq+1:] - return l + for byte_array in txt_array: + # 'str' is used for string type in python + value = avahi.byte_array_to_string(byte_array) + poseq = value.find('=') + items[value[:poseq]] = value[poseq+1:] + return items def service_resolved_callback(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): self.contacts[name] = (name, domain, interface, protocol, host, address, port, txt)

1 0

[commit-gajim] r6544 - in branches/zeroconf_network/src: . common common/zeroconf
by dkirov＠gajim.org 11 Jul '06

11 Jul '06

Author: dkirov Date: 2006-07-11 17:22:59 +0200 (Tue, 11 Jul 2006) New Revision: 6544 Modified: branches/zeroconf_network/src/common/config.py branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py branches/zeroconf_network/src/common/zeroconf/zeroconf.py branches/zeroconf_network/src/gajim.py branches/zeroconf_network/src/tooltips.py Log: config option 'zeroconf_enabled' indicates that zeroconf connection should be used. Create the neccessary config values if zeroconf account is not present Modified: branches/zeroconf_network/src/common/config.py =================================================================== --- branches/zeroconf_network/src/common/config.py 2006-07-11 10:44:52 UTC (rev 6543) +++ branches/zeroconf_network/src/common/config.py 2006-07-11 15:22:59 UTC (rev 6544) @@ -200,6 +200,7 @@ 'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the room occupants list in groupchat window')], 'chat_merge_consecutive_nickname': [opt_bool, False, _('Merge consecutive nickname in chat window')], 'chat_merge_consecutive_nickname_indent': [opt_str, ' ', _('Indentation when using merge consecutive nickame')], + 'zeroconf_enabled': [opt_bool, True, _('Enable zeroconf network')], } __options_per_key = { Modified: branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py =================================================================== --- branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py 2006-07-11 10:44:52 UTC (rev 6543) +++ branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py 2006-07-11 15:22:59 UTC (rev 6544) @@ -33,7 +33,7 @@ import signal if os.name != 'nt': signal.signal(signal.SIGPIPE, signal.SIG_DFL) - +import getpass import gobject from common import helpers @@ -54,7 +54,6 @@ def __init__(self, name): ConnectionHandlersZeroconf.__init__(self) self.name = name - self.zeroconf = zeroconf.Zeroconf(self._on_new_service, self._on_remove_service) self.connected = 0 # offline self.connection = None self.gpg = None @@ -74,7 +73,7 @@ #self.last_history_line = {} #we don't need a password, but must be non-empty - self.password = 'dummy' + self.password = 'zeroconf' self.privacy_rules_supported = False # Do we continue connection when we get roster (send presence,get vcard...) @@ -89,10 +88,30 @@ self.on_connect_failure = None self.retrycount = 0 self.jids_for_auto_auth = [] # list of jid to auto-authorize + self.get_config_values_or_default() - gajim.config.set_per('accounts', name, 'name', self.zeroconf.username) - gajim.config.set_per('accounts', name, 'hostname', self.zeroconf.host) - + def get_config_values_or_default(self): + ''' get name, host, port from config, or + create zeroconf account with default values''' + if not gajim.config.get_per('accounts', 'zeroconf', 'name'): + print 'Creating zeroconf account' + gajim.config.add_per('accounts', 'zeroconf') + gajim.config.set_per('accounts', 'zeroconf', 'autoconnect', True) + gajim.config.set_per('accounts', 'zeroconf', 'password', 'zeroconf') + gajim.config.set_per('accounts', 'zeroconf', 'sync_with_global_status', True) + username = unicode(getpass.getuser()) + gajim.config.set_per('accounts', 'zeroconf', 'name', username) + #XXX make sure host is US-ASCII + host = unicode(socket.gethostname()) + gajim.config.set_per('accounts', 'zeroconf', 'hostname', host) + port = 5298 + gajim.config.set_per('accounts', 'zeroconf', 'custom_port', 5298) + else: + username = gajim.config.get_per('accounts', 'zeroconf', 'name') + host = gajim.config.get_per('accounts', 'zeroconf', 'hostname') + port = gajim.config.get_per('accounts', 'zeroconf', 'custom_port') + self.zeroconf = zeroconf.Zeroconf(self._on_new_service, self._on_remove_service, username, host, port) + # END __init__ def put_event(self, ev): if gajim.handlers.has_key(ev[0]): Modified: branches/zeroconf_network/src/common/zeroconf/zeroconf.py =================================================================== --- branches/zeroconf_network/src/common/zeroconf/zeroconf.py 2006-07-11 10:44:52 UTC (rev 6543) +++ branches/zeroconf_network/src/common/zeroconf/zeroconf.py 2006-07-11 15:22:59 UTC (rev 6544) @@ -1,8 +1,7 @@ import os import sys -import getpass import socket - +from common import gajim try: import avahi, gobject, dbus except ImportError: @@ -14,12 +13,12 @@ pass class Zeroconf: - def __init__(self, new_serviceCB, remove_serviceCB): + def __init__(self, new_serviceCB, remove_serviceCB, name, host, port): self.domain = None # specific domain to browse self.stype = '_presence._tcp' - self.port = 5298 # listening port that gets announced - self.username = getpass.getuser() - self.host = socket.gethostname() + self.port = port # listening port that gets announced + self.username = name + self.host = host self.name = self.username+'@'+ self.host # service name self.txt = {} # service data @@ -37,7 +36,8 @@ print "Error:", str(err) def new_service_callback(self, interface, protocol, name, stype, domain, flags): - if name != self.name: + if True: + #XXX name != self.name # print "Found service '%s' in domain '%s' on %i.%i." % (name, domain, interface, protocol) #synchronous resolving @@ -183,9 +183,13 @@ self.bus = dbus.SystemBus() self.server = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, \ avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER) - - self.server.connect_to_signal('StateChanged', self.server_state_changed_callback) - + try: + self.server.connect_to_signal('StateChanged', self.server_state_changed_callback) + except dbus.dbus_bindings.DBusException, e: + # Avahi service is not present + gajim.log.debug(str(e)) + self.remove_announce() + return # start browsing if self.domain is None: # Explicitly browse .local Modified: branches/zeroconf_network/src/gajim.py =================================================================== --- branches/zeroconf_network/src/gajim.py 2006-07-11 10:44:52 UTC (rev 6543) +++ branches/zeroconf_network/src/gajim.py 2006-07-11 15:22:59 UTC (rev 6544) @@ -1739,10 +1739,10 @@ self.handle_event_file_progress) gajim.proxy65_manager = proxy65_manager.Proxy65Manager(gajim.idlequeue) self.register_handlers() + if gajim.config.get('zeroconf_enabled'): + gajim.connections['zeroconf'] = common.zeroconf.connection_zeroconf.ConnectionZeroconf('zeroconf') for account in gajim.config.get_per('accounts'): - if account == 'zeroconf': - gajim.connections[account] = common.zeroconf.connection_zeroconf.ConnectionZeroconf(account) - else: + if account != 'zeroconf': gajim.connections[account] = common.connection.Connection(account) Modified: branches/zeroconf_network/src/tooltips.py =================================================================== --- branches/zeroconf_network/src/tooltips.py 2006-07-11 10:44:52 UTC (rev 6543) +++ branches/zeroconf_network/src/tooltips.py 2006-07-11 15:22:59 UTC (rev 6544) @@ -508,7 +508,7 @@ vcard_table.set_homogeneous(False) vcard_current_row = 1 properties = [] - jid_markup = '' + unicode(prim_contact.jid) + '' + jid_markup = '' + prim_contact.jid + '' properties.append((jid_markup, None)) properties.append((_('Name: '), gtkgui_helpers.escape_for_pango_markup( prim_contact.get_shown_name())))

1 0

[commit-gajim] r6543 - branches/zeroconf_network/src
by dkirov＠gajim.org 11 Jul '06

11 Jul '06

Author: dkirov Date: 2006-07-11 12:44:52 +0200 (Tue, 11 Jul 2006) New Revision: 6543 Modified: branches/zeroconf_network/src/tooltips.py Log: make sure 'jid' is unicode Modified: branches/zeroconf_network/src/tooltips.py =================================================================== --- branches/zeroconf_network/src/tooltips.py 2006-07-09 17:55:56 UTC (rev 6542) +++ branches/zeroconf_network/src/tooltips.py 2006-07-11 10:44:52 UTC (rev 6543) @@ -508,7 +508,7 @@ vcard_table.set_homogeneous(False) vcard_current_row = 1 properties = [] - jid_markup = '' + prim_contact.jid + '' + jid_markup = '' + unicode(prim_contact.jid) + '' properties.append((jid_markup, None)) properties.append((_('Name: '), gtkgui_helpers.escape_for_pango_markup( prim_contact.get_shown_name())))

1 0

[commit-gajim] r6542 - in branches/ad_hoc: data/glade src src/common
by liori＠gajim.org 09 Jul '06

09 Jul '06

Author: liori Date: 2006-07-09 19:55:56 +0200 (Sun, 09 Jul 2006) New Revision: 6542 Modified: branches/ad_hoc/data/glade/adhoc_commands_window.glade branches/ad_hoc/src/adhoc_commands.py branches/ad_hoc/src/common/dataforms.py branches/ad_hoc/src/dataforms.py Log: Some fixes in common/dataforms, new field types... Now only jid-multi isn't handled. Modified: branches/ad_hoc/data/glade/adhoc_commands_window.glade =================================================================== --- branches/ad_hoc/data/glade/adhoc_commands_window.glade 2006-07-08 11:51:42 UTC (rev 6541) +++ branches/ad_hoc/data/glade/adhoc_commands_window.glade 2006-07-09 17:55:56 UTC (rev 6542) @@ -28,6 +28,8 @@ <child> <widget class="GtkNotebook" id="stages_notebook"> + <property name="width_request">400</property> + <property name="height_request">400</property> <property name="visible">True</property> <property name="show_tabs">False</property> <property name="show_border">False</property> @@ -92,10 +94,56 @@ </child> <child> + <widget class="GtkLabel" id="label264"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> <placeholder/> </child> <child> + <widget class="GtkLabel" id="label265"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> <widget class="GtkVBox" id="command_list_stage_vbox"> <property name="visible">True</property> <property name="homogeneous">False</property> @@ -104,16 +152,16 @@ <child> <widget class="GtkLabel" id="label253"> <property name="visible">True</property> - <property name="label" translatable="yes">Choose command to execute:</property> + <property name="label" translatable="yes">Choose command to execute:</property> <property name="use_underline">False</property> - <property name="use_markup">False</property> + <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">0.5</property> + <property name="xalign">0.20000000298</property> <property name="yalign">0.5</property> <property name="xpad">0</property> - <property name="ypad">0</property> + <property name="ypad">6</property> <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> <property name="width_chars">-1</property> <property name="single_line_mode">False</property> @@ -128,6 +176,7 @@ <child> <widget class="GtkVBox" id="command_list_vbox"> + <property name="border_width">12</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> @@ -169,7 +218,7 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> </packing> </child> @@ -181,10 +230,56 @@ </child> <child> + <widget class="GtkLabel" id="label266"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> <placeholder/> </child> <child> + <widget class="GtkLabel" id="label267"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> <widget class="GtkVBox" id="sending_form_stage_vbox"> <property name="visible">True</property> <property name="homogeneous">False</property> @@ -193,9 +288,9 @@ <child> <widget class="GtkLabel" id="instructions_label"> <property name="visible">True</property> - <property name="label" translatable="yes">Fill in the form</property> + <property name="label" translatable="yes">Fill in the form</property> <property name="use_underline">False</property> - <property name="use_markup">False</property> + <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> @@ -232,6 +327,7 @@ <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> + <property name="pack_type">GTK_PACK_END</property> </packing> </child> </widget> @@ -242,10 +338,56 @@ </child> <child> + <widget class="GtkLabel" id="label268"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> <placeholder/> </child> <child> + <widget class="GtkLabel" id="label269"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> <widget class="GtkVBox" id="no_commands_stage_vbox"> <property name="visible">True</property> <property name="homogeneous">False</property> @@ -310,8 +452,8 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> <property name="pack_type">GTK_PACK_END</property> </packing> </child> @@ -323,10 +465,56 @@ </child> <child> + <widget class="GtkLabel" id="label270"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> <placeholder/> </child> <child> + <widget class="GtkLabel" id="label271"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> <widget class="GtkVBox" id="error_stage_vbox"> <property name="visible">True</property> <property name="homogeneous">False</property> @@ -335,9 +523,9 @@ <child> <widget class="GtkLabel" id="label257"> <property name="visible">True</property> - <property name="label" translatable="yes">An error has occured:</property> + <property name="label" translatable="yes">An error has occured:</property> <property name="use_underline">False</property> - <property name="use_markup">False</property> + <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> @@ -389,8 +577,54 @@ </child> <child> + <widget class="GtkLabel" id="label272"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> <placeholder/> </child> + + <child> + <widget class="GtkLabel" id="label273"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> Modified: branches/ad_hoc/src/adhoc_commands.py =================================================================== --- branches/ad_hoc/src/adhoc_commands.py 2006-07-08 11:51:42 UTC (rev 6541) +++ branches/ad_hoc/src/adhoc_commands.py 2006-07-09 17:55:56 UTC (rev 6542) @@ -29,6 +29,7 @@ from common import xmpp, gajim, dataforms import gtkgui_helpers +import dialogs import dataforms as dataformwidget class CommandWindow: @@ -80,18 +81,12 @@ self.xml.signal_autoconnect(self) self.window.show_all() - def on_adhoc_commands_window_destroy(self, window): - ''' The window dissappeared somehow... clean the environment, - Stop pulsing.''' - self.remove_pulsing() - # these functions are set up by appropriate stageX methods def stage_finish(self, *anything): pass def stage_cancel_button_clicked(self, *anything): assert False def stage_back_button_clicked(self, *anything): assert False def stage_forward_button_clicked(self, *anything): assert False def stage_execute_button_clicked(self, *anything): assert False - def stage_adhoc_commands_window_destroy(self, *anything): assert False def stage_adhoc_commands_window_delete_event(self, *anything): assert False def do_nothing(self, *anything): return False @@ -109,11 +104,15 @@ return self.stage_execute_button_clicked(*anything) def on_adhoc_commands_window_destroy(self, *anything): - return self.stage_adhoc_commands_window_destroy(*anything) + # do all actions that are needed to remove this object from memory... + self.remove_pulsing() def on_adhoc_commands_window_delete_event(self, *anything): return self.stage_adhoc_commands_window_delete_event(self, *anything) + def __del__(self): + print "Object has been deleted." + # stage 1: waiting for command list def stage1(self): '''Prepare the first stage. Request command list, @@ -141,7 +140,6 @@ self.stage_finish = self.stage1_finish self.stage_cancel_button_clicked = self.stage1_cancel_button_clicked self.stage_adhoc_commands_window_delete_event = self.stage1_adhoc_commands_window_delete_event - self.stage_adhoc_commands_window_destroy = self.do_nothing def stage1_finish(self): self.remove_pulsing() @@ -183,13 +181,12 @@ if first_radio is None: first_radio = radio self.commandnode = commandnode - self.command_list_vbox.pack_end(radio, expand=False) + self.command_list_vbox.pack_start(radio, expand=False) self.command_list_vbox.show_all() self.stage_finish = self.stage2_finish self.stage_cancel_button_clicked = self.stage2_cancel_button_clicked self.stage_forward_button_clicked = self.stage2_forward_button_clicked - self.stage_adhoc_commands_window_destroy = self.do_nothing self.stage_adhoc_commands_window_delete_event = self.do_nothing def stage2_finish(self): @@ -234,14 +231,29 @@ self.stage_back_button_clicked = self.stage3_back_button_clicked self.stage_forward_button_clicked = self.stage3_forward_button_clicked self.stage_execute_button_clicked = self.stage3_execute_button_clicked - self.stage_adhoc_commands_window_destroy = self.do_nothing - self.stage_adhoc_commands_window_delete_event = self.do_nothing + self.stage_adhoc_commands_window_delete_event = self.stage3_cancel_button_clicked def stage3_finish(self): pass - def stage3_cancel_button_clicked(self, widget): - pass + def stage3_cancel_button_clicked(self, widget, *anything): + ''' We are in the middle of executing command. Ask user if he really want to cancel + the process, then... cancel it. ''' + # this works also as a handler for window_delete_event, so we have to return appropriate + # values + # TODO: translate it + dialog = dialogs.HigDialog(self.window, gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL, + gtk.BUTTONS_YES_NO, 'Cancel confirmation', + 'You are in process of executing command. Do you really want to cancel it?') + dialog.popup() + if dialog.get_response()==gtk.RESPONSE_YES: + self.send_cancel() + if widget==self.window: + return False + else: + self.window.destroy() + return False + return True def stage3_back_button_clicked(self, widget): self.stage3_submit_form('prev') @@ -256,6 +268,12 @@ self.data_form_widget.set_sensitive(False) if self.data_form_widget.get_data_form() is None: self.data_form_widget.hide() + + self.cancel_button.set_sensitive(True) + self.back_button.set_sensitive(False) + self.forward_button.set_sensitive(False) + self.execute_button.set_sensitive(False) + self.sending_form_progressbar.show() self.setup_pulsing(self.sending_form_progressbar) self.send_command(action) @@ -272,19 +290,26 @@ self.dataform = dataforms.DataForm(node=command.getTag('x')) self.data_form_widget.set_sensitive(True) - self.data_form_widget.set_data_form(self.dataform) + try: + self.data_form_widget.data_form=self.dataform + except dataforms.BadDataFormNode: + # TODO: translate + self.stage5('Service sent malformed data', senderror=True) self.data_form_widget.show() action = command.getTag('action') if action is None: - # no action tag? that's last stage... - self.cancel_button.set_sensitive(False) + # no action tag? check if that's last stage... + if command.getAttr('status')=='completed': + self.cancel_button.set_sensitive(False) + else: + self.cancel_button.set_sensitive(True) self.back_button.set_sensitive(False) self.forward_button.set_sensitive(False) self.execute_button.set_sensitive(True) else: # actions, actions, actions... - self.cancel_button.set_sensitive(False) + self.cancel_button.set_sensitive(True) self.back_button.set_sensitive(action.getTag('prev') is not None) self.forward_button.set_sensitive(action.getTag('next') is not None) self.execute_button.set_sensitive(True) @@ -306,7 +331,6 @@ self.stage_finish = self.do_nothing self.stage_cancel_button_clicked = self.stage4_cancel_button_clicked - self.stage_adhoc_commands_window_destroy = self.do_nothing self.stage_adhoc_commands_window_delete_event = self.do_nothing def stage4_cancel_button_clicked(self, widget): @@ -316,12 +340,13 @@ self.stage1() # stage 5: an error has occured - def stage5(self, error): + def stage5(self, error, senderror=False): '''Display the error message. Wait for user to close the window''' + # TODO: sending error to responder # close old stage self.stage_finish() - assert isinstance(error, unicode) + assert isinstance(error, basestring) self.stages_notebook.set_current_page( self.stages_notebook.page_num( @@ -336,7 +361,6 @@ self.stage_finish = self.do_nothing self.stage_cancel_button_clicked = self.stage5_cancel_button_clicked - self.stage_adhoc_commands_window_destroy = self.do_nothing self.stage_adhoc_commands_window_delete_event = self.do_nothing def stage5_cancel_button_clicked(self, widget): @@ -419,3 +443,18 @@ print stanza self.account.connection.SendAndCallForResponse(stanza, callback) + + def send_cancel(self): + '''Send the command with action='cancel'. ''' + assert self.commandnode is not None + assert self.sessionid is not None + + stanza = xmpp.Iq(typ='set', to=self.jid) + stanza.addChild('command', attrs={ + 'xmlns':xmpp.NS_COMMANDS, + 'node':self.commandnode, + 'sessionid':self.sessionid, + 'action':'cancel' + }) + + self.account.connection.send(stanza) Modified: branches/ad_hoc/src/common/dataforms.py =================================================================== --- branches/ad_hoc/src/common/dataforms.py 2006-07-08 11:51:42 UTC (rev 6541) +++ branches/ad_hoc/src/common/dataforms.py 2006-07-09 17:55:56 UTC (rev 6542) @@ -78,9 +78,14 @@ if tofill is not None: self._mode = tofill.mode - self.fields = tofill.fields + self.fields = (field for field in tofill.fields if field.type!='fixed') self.records = tofill.records self.type = 'submit' + for field in self.iter_fields(): + field.required=False + del field.label + del field.options + del field.description elif node is not None: # if there is <reported/> element, the form contains multiple records if self.getTag('reported') is not None: @@ -138,7 +143,7 @@ return self.getTagData('title') def set_title(self, title): - self.setTagData('title') + self.setTagData('title', title) def del_title(self): try: @@ -283,11 +288,16 @@ raise KeyError, "This form does not contain %r field." % var class DataField(xmpp.Node, object): - def __init__(self, typ='text-single', desc=None, required=None, value=None, options=None, node=None): + def __init__(self, typ=None,var=None, value=None, label=None, desc=None, + required=None, options=None, node=None): + assert typ in ('boolean', 'fixed', 'hidden', 'jid-multi', 'jid-single', 'list-multi', - 'list-single', 'text-multi', 'text-private', 'text-single', None) + 'list-single', 'text-multi', 'text-private', 'text-single',None) xmpp.Node.__init__(self, 'field', node=node) + if typ is not None: self.type = typ + if var is not None: self.var = var + if label is not None: self.label = label if desc is not None: self.description = desc if required is not None: self.required = required if value is not None: self.value = value @@ -309,7 +319,10 @@ if typ!='text-single': self.setAttr('type', typ) else: - self.delAttr('type') + try: + self.delAttr('type') + except KeyError: + pass type = property(get_type, set_type, None, """ Field type. One of: 'boolean', 'fixed', 'hidden', 'jid-multi', 'jid-single', @@ -383,8 +396,8 @@ elif self.type in ('jid-multi', 'list-multi'): return [value.getData() for value in self.getTags('value')] - - elif self.type in ('hidden', 'jid-single', 'list-single', 'text-single', 'text-private'): + + elif self.type in ('hidden', 'jid-single', 'list-single', 'text-single', 'text-private') or True: return self.getTagData('value') def set_value(self, value): @@ -399,8 +412,8 @@ elif self.type in ('jid-multi', 'list-multi'): del_multiple_tag_value(self, 'value') - for item in self.value: - self.addChild('value', None, (item,)) + for item in value: + self.addChild('value', {}, (item,)) elif self.type in ('hidden', 'jid-single', 'list-single', 'text-single', 'text-private'): self.setTagData('value', value) @@ -417,6 +430,7 @@ for element in self.getChildren(): if not isinstance(element, xmpp.Node): continue if not element.getName()=='option': continue + if element.getTag('value') is None: raise BadDataFormNode yield element.getAttr('label'), element.getTag('value').getData() def get_options(self): @@ -432,10 +446,10 @@ assert option[0] is None or isinstance(option[0], unicode) assert isinstance(option[1], unicode) if option[0] is None: - attr=None + attr={} else: attr={'label': option[0].encode('utf-8')} - self.addChild('option', attr, (option[1].encode('utf-8'),)) + self.addChild('option', attr, (xmpp.Node('value', {}, (option[1].encode('utf-8'),)),)) def del_options(self): del_multiple_tag_value(self, 'option') Modified: branches/ad_hoc/src/dataforms.py =================================================================== --- branches/ad_hoc/src/dataforms.py 2006-07-08 11:51:42 UTC (rev 6541) +++ branches/ad_hoc/src/dataforms.py 2006-07-09 17:55:56 UTC (rev 6542) @@ -52,7 +52,7 @@ else: self.form = self.__class__.MultipleForm(dataform) self.form.show() - self.container.pack_end(self.form) + self.container.pack_end(self.form, expand=True, fill=True) def get_data_form(self): """ Data form displayed in the widget or None if no form. """ @@ -81,39 +81,39 @@ """ Treat 'us' as one widget. """ self.show_all() - def filled_data_form(self): - """ Generates form that contains values filled by user. """ - assert isinstance(self._data_form, dataforms.DataForm) +#? def filled_data_form(self): +#? """ Generates form that contains values filled by user. """ +#? assert isinstance(self._data_form, dataforms.DataForm) +#? +#? form = xmpp.Node('x', {'xmlns':xmpp.NS_DATA, 'type':'submit'}) +#? +#? +#? for field in self._data_form.kids: +#? if not isinstance(field, xmpp.DataField): continue +#? +#? ftype = field.getType() +#? if ftype not in ('boolean', 'fixed', 'hidden', 'jid-multi', +#? 'jid-single', 'list-multi', 'list-single', +#? 'text-multi', 'text-private', 'text-single'): +#? ftype = 'text-single' +#? +#? if ftype in ('fixed',): +#? continue +#? +#? newfield = xmpp.Node('field', {'var': field.getVar()}) +#? +#? if ftype in ('jid-multi', 'list-multi', 'text-multi'): +#? for value in field.getValues(): +#? newvalue = xmpp.Node('value', {}, [value]) +#? newfield.addChild(node=newvalue) +#? else: +#? newvalue = xmpp.Node('value', {}, [field.getValue()]) +#? newfield.addChild(node=newvalue) +#? +#? form.addChild(node=newfield) +#? +#? return form - form = xmpp.Node('x', {'xmlns':xmpp.NS_DATA, 'type':'submit'}) - - - for field in self._data_form.kids: - if not isinstance(field, xmpp.DataField): continue - - ftype = field.getType() - if ftype not in ('boolean', 'fixed', 'hidden', 'jid-multi', - 'jid-single', 'list-multi', 'list-single', - 'text-multi', 'text-private', 'text-single'): - ftype = 'text-single' - - if ftype in ('fixed',): - continue - - newfield = xmpp.Node('field', {'var': field.getVar()}) - - if ftype in ('jid-multi', 'list-multi', 'text-multi'): - for value in field.getValues(): - newvalue = xmpp.Node('value', {}, [value]) - newfield.addChild(node=newvalue) - else: - newvalue = xmpp.Node('value', {}, [field.getValue()]) - newfield.addChild(node=newvalue) - - form.addChild(node=newfield) - - return form - # "private" methods # we have actually two different kinds of data forms: one is a simple form to fill, @@ -164,8 +164,7 @@ widget.set_line_wrap(True) self.attach(widget, leftattach, rightattach, linecounter, linecounter+1) - elif field.type in ('jid-multi', 'jid-single', 'list-multi', 'text-multi', - 'text-private'): + elif field.type in ('jid-multi'): widget = gtk.Label(field.type) elif field.type == 'list-single': @@ -176,7 +175,7 @@ # TODO: We cannot deactivate them all... widget = gtk.VBox() first_radio = None - for label, value in field.iter_options(): + for value, label in field.iter_options(): radio = gtk.RadioButton(first_radio, label=label) radio.connect('toggled', self.on_list_single_radiobutton_toggled, field, value) @@ -188,6 +187,41 @@ radio.set_active(True) widget.pack_start(radio, expand=False) + elif field.type == 'list-multi': + # TODO: When more than few choices, make a list + widget = gtk.VBox() + for value, label in field.iter_options(): + check = gtk.CheckButton(label, use_underline=False) + check.set_active(value in field.value) + check.connect('toggled', self.on_list_multi_checkbutton_toggled, + field, value) + widget.pack_start(check, expand=False) + + elif field.type == 'jid-single': + widget = gtk.Entry() + widget.connect('changed', self.on_text_single_entry_changed, field) + if field.value is None: + field.value = u'' + widget.set_text(field.value) + + elif field.type == 'text-private': + widget = gtk.Entry() + widget.connect('changed', self.on_text_single_entry_changed, field) + widget.set_visibility(False) + if field.value is None: + field.value = u'' + widget.set_text(field.value) + + elif field.type == 'text-multi': + # TODO: bigger text view + widget = gtk.TextView() + widget.set_wrap_mode(gtk.WRAP_WORD) + widget.get_buffer().connect('changed', self.on_text_multi_textbuffer_changed, + field) + if field.value is None: + field.value = u'' + widget.get_buffer().set_text(field.value) + else:# field.type == 'text-single' or field.type is nonstandard: # JEP says that if we don't understand some type, we # should handle it as text-single @@ -199,7 +233,7 @@ if commonlabel and field.label is not None: label = gtk.Label(field.label) - label.set_justify(gtk.JUSTIFY_RIGHT) + label.set_alignment(1.0, 0.5) self.attach(label, 0, 1, linecounter, linecounter+1) if commonwidget: @@ -208,8 +242,10 @@ widget.show_all() if commondesc and field.description is not None: - # TODO: with smaller font - label = gtk.Label(field.description) + label = gtk.Label() + label.set_markup(''+\ + gtkgui_helpers.escape_for_pango_markup(field.description)+\ + '') label.set_line_wrap(True) self.attach(label, 2, 3, linecounter, linecounter+1) @@ -227,9 +263,20 @@ def on_list_single_radiobutton_toggled(self, widget, field, value): field.value = value + def on_list_multi_checkbutton_toggled(self, widget, field, value): + if widget.get_active() and value not in field.value: + field.value.append(value) + elif not widget.get_active() and value in field.value: + field.value.remove(value) + def on_text_single_entry_changed(self, widget, field): field.value = widget.get_text() + def on_text_multi_textbuffer_changed(self, widget, field): + field.value = widget.get_text( + widget.get_start_iter(), + widget.get_end_iter()) + class MultipleForm(gtk.Alignment, object): def __init__(self, dataform): assert dataform.mode==dataforms.DATAFORM_MULTIPLE

1 0

[commit-gajim] r6541 - trunk/src
by jim++＠gajim.org 08 Jul '06

08 Jul '06

Author: jim++ Date: 2006-07-08 13:51:42 +0200 (Sat, 08 Jul 2006) New Revision: 6541 Modified: trunk/src/roster_window.py Log: Do not TB when calling really_remove_contact on a deleted account due to the timeout call (simpler than deleting timeout(s) itself). Fixes #2146. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-07-08 11:01:20 UTC (rev 6540) +++ trunk/src/roster_window.py 2006-07-08 11:51:42 UTC (rev 6541) @@ -332,6 +332,9 @@ gajim.interface.roster.add_contact_to_roster(transport, account) def really_remove_contact(self, contact, account): + if not gajim.interface.instances.has_key(account): + # Account has been deleted during the timeout that called us + return if contact.jid in gajim.newly_added[account]: return if contact.jid.find('@') < 1 and gajim.connections[account].connected > 1:

1 0

[commit-gajim] r6540 - trunk/src
by jim++＠gajim.org 08 Jul '06

08 Jul '06

Author: jim++ Date: 2006-07-08 13:01:20 +0200 (Sat, 08 Jul 2006) New Revision: 6540 Modified: trunk/src/config.py Log: Do not enable sound when selecting a sound event line. Fixes #2145. Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2006-07-07 15:49:44 UTC (rev 6539) +++ trunk/src/config.py 2006-07-08 11:01:20 UTC (rev 6540) @@ -972,7 +972,6 @@ path_to_snd_file = widget.get_text() model, iter = self.sound_tree.get_selection().get_selected() model[iter][2] = path_to_snd_file # set new path to sounds_model - model[iter][0] = True # set the sound to enabled def on_play_button_clicked(self, widget): model, iter = self.sound_tree.get_selection().get_selected()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2006