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

varius fixes; cleanup, remove a fixme, add a fixme

This commit is contained in:
Nikos Kouremenos 2005-11-10 13:29:58 +00:00
parent 0d3be44948
commit de36e719f3
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/advanced.py
View File

@ -65,8 +65,7 @@ class AdvancedConfigurationWindow:
renderer_text, text = 1) renderer_text, text = 1)
col.set_cell_data_func(renderer_text, self.cb_value_column_data) col.set_cell_data_func(renderer_text, self.cb_value_column_data)
#col.set_resizable(True) DO NOT REMOVE col.set_resizable(True)
# GTK+ bug http://bugzilla.gnome.org/show_bug.cgi?id=304139
col.set_max_width(250) col.set_max_width(250)
renderer_text = gtk.CellRendererText() renderer_text = gtk.CellRendererText()
@ -89,11 +88,10 @@ class AdvancedConfigurationWindow:
def cb_value_column_data(self, col, cell, model, iter): def cb_value_column_data(self, col, cell, model, iter):
optname = model[iter][C_PREFNAME] optname = model[iter][C_PREFNAME]
opttype = model[iter][C_TYPE] opttype = model[iter][C_TYPE]
if opttype == 'boolean' or optname.find('password') != -1 or\ if opttype == 'boolean' or optname in ('password', 'gpgpassword'):
optname.find('passphrase') != -1: cell.set_property('editable', False)
cell.set_property('editable', 0)
else: else:
cell.set_property('editable', 1) cell.set_property('editable', True)
def on_advanced_treeview_selection_changed(self, treeselection): def on_advanced_treeview_selection_changed(self, treeselection):
iter = treeselection.get_selected() iter = treeselection.get_selected()
@ -103,8 +101,10 @@ class AdvancedConfigurationWindow:
opt = iter[0][iter[1]][0] opt = iter[0][iter[1]][0]
desc = gajim.config.get_desc(opt) desc = gajim.config.get_desc(opt)
if desc: if desc:
# FIXME: DESC IS ALREADY _() why again _()?
self.desc_label.set_text(_(desc)) self.desc_label.set_text(_(desc))
else: else:
#we talk about option description in advanced configuration editor
self.desc_label.set_text(_('(None)')) self.desc_label.set_text(_('(None)'))
def on_advanced_treeview_row_activated(self, treeview, path, column): def on_advanced_treeview_row_activated(self, treeview, path, column):
@ -174,7 +174,7 @@ class AdvancedConfigurationWindow:
type = '' type = ''
if val[OPT_TYPE]: if val[OPT_TYPE]:
type = val[OPT_TYPE][0] type = val[OPT_TYPE][0]
if name.find('password') != -1 or name.find('passphrase') != -1: if name in ('password', 'gpgpassword'):
pass # FIXME: do not save Hidden as our pass! pass # FIXME: do not save Hidden as our pass!
# just opening once the advanced editor and then closing # just opening once the advanced editor and then closing
# f$$cks it all up # f$$cks it all up
@ -183,7 +183,7 @@ class AdvancedConfigurationWindow:
def visible_func(self, model, iter): def visible_func(self, model, iter):
str = self.entry.get_text().decode('utf-8') str = self.entry.get_text().decode('utf-8')
if str is None or str == '': if str in (None, ''):
return True # show all return True # show all
name = model[iter][C_PREFNAME].decode('utf-8') name = model[iter][C_PREFNAME].decode('utf-8')
# If a child of the iter matches, we return True # If a child of the iter matches, we return True
@ -206,5 +206,4 @@ class AdvancedConfigurationWindow:
return False return False
def on_advanced_entry_changed(self, widget): def on_advanced_entry_changed(self, widget):
text = widget.get_text().decode('utf-8')
self.modelfilter.refilter() self.modelfilter.refilter()