From 0ae961c76fffa34053cb12bd9fa11b4bef7ffb91 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Wed, 27 Apr 2005 13:49:42 +0000 Subject: [PATCH] [revert 1258] only half of the diff is correct (the window opening). lots of lines looks like nk's experimentations and obviously do not cleanup anything nor make the thing works: * print 'show', name * self.filterstr = 'account' * print 'refilter starts' * print self.filterstr * self.modelfilter.refilter() #FIXME: does not work! --- src/advanced.py | 60 ++++++++++++++++++++---------------------------- src/config.py | 6 +---- src/gtkgui.glade | 29 ++++++++++++----------- 3 files changed, 41 insertions(+), 54 deletions(-) diff --git a/src/advanced.py b/src/advanced.py index 21532c2ae..1d297b104 100644 --- a/src/advanced.py +++ b/src/advanced.py @@ -3,7 +3,6 @@ ## Gajim Team: ## - Yann Le Boulanger ## - Vincent Hanquez -## - Nikos Kouremenos ## ## Copyright (C) 2003-2005 Gajim Team ## @@ -35,11 +34,18 @@ class Advanced_window: return modelrow[1] = text - def on_advanced_window_destroy(self, widget): - del self.plugin.windows['advanced_config'] + def on_close(self): + window = self.xml.get_widget('advanced_window') + window.destroy() + + def on_advanced_window_delete_event(self, widget, data = None): + self.on_close() - def on_advanced_close_button_clicked(self, widget): - self.window.destroy() + def on_advanced_window_destroy_event(self, widget, data = None): + self.on_close() + + def on_advanced_close_button_clicked(self, widget, data = None): + self.on_close() def find_iter(self, parent_iter, name): if not parent_iter: @@ -61,32 +67,25 @@ class Advanced_window: iter = iter2 if not val: - self.model.append(iter, [name, '', '']) + self.model.append(iter, [name, "", ""]) return self.model.append(iter, [name, val[OPT_VAL], val[OPT_TYPE][0]]) def visible_func(self, model, iter, str): - if str is None or str == '': - return True #show all name = model.get_value(iter, 0) - if name.find(str) != -1: #was found - print 'show', name - return True - return False + if str == None or str == "": + return 1 + if name.find(str) == -1: + return 1 + return 0 - def on_advanced_entry_changed(self, widget): - print 'refilter starts' - #FIXME: maybe some gobject timeout is better - text = widget.get_text() - self.filterstr = text - print self.filterstr - self.modelfilter.refilter() #FIXME: does not work! - - def __init__(self, plugin): - self.plugin = plugin + def filter(self, filterstr): + modelfilter = self.model.filter_new() + modelfilter.set_visible_func(self.visible_func, filterstr) + modelfilter.refilter() + def __init__(self): self.xml = gtk.glade.XML(GTKGUI_GLADE, 'advanced_window', None) - self.window = self.xml.get_widget('advanced_window') self.xml.signal_autoconnect(self) treeview = self.xml.get_widget('advanced_treeview') @@ -94,6 +93,7 @@ class Advanced_window: gobject.TYPE_STRING, gobject.TYPE_STRING) self.model.set_sort_column_id(0, gtk.SORT_ASCENDING) + treeview.set_model(self.model) renderer_text = gtk.CellRendererText() treeview.insert_column_with_attributes(-1, 'Preference Name', @@ -102,11 +102,8 @@ class Advanced_window: renderer_text = gtk.CellRendererText() renderer_text.set_property('editable', 1) renderer_text.connect('edited', self.on_config_edited) - col = treeview.insert_column_with_attributes(-1, 'Value', + treeview.insert_column_with_attributes(-1, 'Value', renderer_text, text = 1) - - #col.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) - col.set_max_width(250) renderer_text = gtk.CellRendererText() treeview.insert_column_with_attributes(-1, 'Type', @@ -114,11 +111,4 @@ class Advanced_window: # add data to model gajim.config.foreach(self.fill, None) - - self.modelfilter = self.model.filter_new() - self.filterstr = 'account' - self.modelfilter.set_visible_func(self.visible_func, self.filterstr) - treeview.set_model(self.modelfilter) - - self.plugin.windows['advanced_config'] = self - self.window.show_all() + diff --git a/src/config.py b/src/config.py index 2d554989f..77522754a 100644 --- a/src/config.py +++ b/src/config.py @@ -512,11 +512,7 @@ class Preferences_window: model.set_value(iter, 1, 1) def on_open_advanced_editor_button_clicked(self, widget, data = None): - if self.plugin.windows.has_key('advanced_config'): - self.plugin.windows['advanced_config'].window.present() - else: - self.plugin.windows['advanced_config'] = dialogs.Advanced_window( - self.plugin) + dialogs.Advanced_window() def __init__(self, plugin): '''Initialize Preferences window''' diff --git a/src/gtkgui.glade b/src/gtkgui.glade index 42d6b5327..77959b870 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -809,7 +809,7 @@ True * - True + False 1 @@ -900,7 +900,7 @@ True * - True + False 1 @@ -2714,7 +2714,7 @@ 4 470 - 420 + 415 Preferences GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -5518,7 +5518,7 @@ Custom 0 False - False + True @@ -5612,8 +5612,8 @@ Custom 0 - False - False + True + True @@ -5629,18 +5629,18 @@ Custom True 0.5 0.5 - 1 + 0.230000004172 0 0 0 12 - 335 + 0 True True - Open... + Open True GTK_RELIEF_NORMAL True @@ -5671,8 +5671,8 @@ Custom 0 - False - False + True + True @@ -10497,6 +10497,7 @@ send a chat message to 4 600 480 + True Advanced Configuration Editor GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE @@ -10508,7 +10509,8 @@ send a chat message to False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST - + + @@ -10561,7 +10563,6 @@ send a chat message to True * False - 1 @@ -10586,7 +10587,7 @@ send a chat message to True True True - True + False False True