copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use FakeDataform widget in search window. fixes #1922

This commit is contained in:
Yann Leboulanger 2007-06-22 17:27:22 +00:00
parent f77ca8543f
commit ebf074e5c1
1 changed files with 24 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/search_window.py
View File

@ -19,6 +19,7 @@ from common import xmpp, gajim, dataforms
import gtkgui_helpers import gtkgui_helpers
import dialogs import dialogs
import config
import dataforms_widget import dataforms_widget
class SearchWindow: class SearchWindow:
@ -35,9 +36,6 @@ class SearchWindow:
for name in ('label', 'progressbar', 'search_vbox', 'search_button'): for name in ('label', 'progressbar', 'search_vbox', 'search_button'):
self.__dict__[name] = self.xml.get_widget(name) self.__dict__[name] = self.xml.get_widget(name)
self.data_form_widget = dataforms_widget.DataFormWidget()
self.table = None
# displaying the window # displaying the window
self.xml.signal_autoconnect(self) self.xml.signal_autoconnect(self)
self.window.show_all() self.window.show_all()
@ -45,10 +43,6 @@ class SearchWindow:
self.pulse_id = gobject.timeout_add(80, self.pulse_callback) self.pulse_id = gobject.timeout_add(80, self.pulse_callback)
self.is_form = None self.is_form = None
# for non-dataform forms
self.entries = {}
self.info = {}
def request_form(self): def request_form(self):
gajim.connections[self.account].request_search_fields(self.jid) gajim.connections[self.account].request_search_fields(self.jid)
@ -74,15 +68,14 @@ class SearchWindow:
self.data_form_widget.data_form.type = 'submit' self.data_form_widget.data_form.type = 'submit'
gajim.connections[self.account].send_search_form(self.jid, gajim.connections[self.account].send_search_form(self.jid,
self.data_form_widget.data_form, True) self.data_form_widget.data_form, True)
self.search_vbox.remove(self.data_form_widget)
else: else:
for name in self.entries.keys(): infos = self.data_form_widget.get_infos()
self.infos[name] = self.entries[name].get_text().decode('utf-8') if infos.has_key('instructions'):
if self.infos.has_key('instructions'): del infos['instructions']
del self.infos['instructions'] gajim.connections[self.account].send_search_form(self.jid, infos,
gajim.connections[self.account].send_search_form(self.jid, self.infos,
False) False)
self.search_vbox.remove(self.table)
self.search_vbox.remove(self.data_form_widget)
self.progressbar.show() self.progressbar.show()
self.label.set_text(_('Waiting for results')) self.label.set_text(_('Waiting for results'))
@ -96,52 +89,26 @@ class SearchWindow:
self.progressbar.hide() self.progressbar.hide()
self.label.hide() self.label.hide()
if not is_form: if is_form:
self.is_form = False self.is_form = True
self.infos = form self.data_form_widget = dataforms_widget.DataFormWidget()
nbrow = 0 self.dataform = dataforms.ExtendForm(node = form)
if self.infos.has_key('instructions'): self.data_form_widget.set_sensitive(True)
self.label.set_text(self.infos['instructions']) try:
self.data_form_widget.data_form = self.dataform
except dataforms.Error:
self.label.set_text(_('Error in received dataform'))
self.label.show() self.label.show()
self.table = gtk.Table() return
for name in self.infos.keys(): if self.data_form_widget.title:
if not name: self.window.set_title('%s - Search - Gajim' % \
continue self.data_form_widget.title)
if name == 'instructions': else:
continue self.is_form = False
self.data_form_widget = config.FakeDataForm(form)
nbrow = nbrow + 1
self.table.resize(rows = nbrow, columns = 2)
label = gtk.Label(name.capitalize() + ':')
self.table.attach(label, 0, 1, nbrow - 1, nbrow, 0, 0, 0, 0)
entry = gtk.Entry()
entry.set_activates_default(True)
if self.infos[name]:
entry.set_text(self.infos[name])
if name == 'password':
entry.set_visibility(False)
self.table.attach(entry, 1, 2, nbrow - 1, nbrow, 0, 0, 0, 0)
self.entries[name] = entry
self.table.show_all()
self.search_vbox.pack_start(self.table)
return
self.dataform = dataforms.ExtendForm(node = form)
self.data_form_widget.set_sensitive(True)
try:
self.data_form_widget.data_form = self.dataform
except dataforms.Error:
self.label.set_text(_('Error in received dataform'))
self.label.show()
return
self.is_form = True
self.data_form_widget.show_all()
self.search_vbox.pack_start(self.data_form_widget) self.search_vbox.pack_start(self.data_form_widget)
self.data_form_widget.show()
if self.data_form_widget.title:
self.window.set_title('%s - Search - Gajim' % \
self.data_form_widget.title)
def on_result_arrived(self, form, is_form): def on_result_arrived(self, form, is_form):
if self.pulse_id: if self.pulse_id: