diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 5d0582637..a1aea7efa 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,7 @@ 2006-05-12 Don Allingham + * src/DataViews/_PersonView.py: add non-functioning (for now) clear + button + * src/Config/_GrampsGconfKeys.py: get_default fix * src/GrampsCfg.py: add revert option for colors * src/Config/_GrampsGconfKeys.py: added get_default * src/Config/_GrampsIniKeys.py: added get_default diff --git a/gramps2/src/Config/_GrampsGconfKeys.py b/gramps2/src/Config/_GrampsGconfKeys.py index a38294952..871532919 100644 --- a/gramps2/src/Config/_GrampsGconfKeys.py +++ b/gramps2/src/Config/_GrampsGconfKeys.py @@ -152,4 +152,4 @@ def sync(): def get_default(key): token = "/apps/gramps/%s/%s" % (key[0],key[1]) - return client.get_default_from_schema(token) + return client.get_default_from_schema(token).get_string() diff --git a/gramps2/src/DataViews/_PersonView.py b/gramps2/src/DataViews/_PersonView.py index f79d65315..667fa7779 100644 --- a/gramps2/src/DataViews/_PersonView.py +++ b/gramps2/src/DataViews/_PersonView.py @@ -243,6 +243,9 @@ class PersonView(PageView.PersonNavView): self.apply_btn = gtk.Button(stock=gtk.STOCK_FIND) self.apply_btn.connect('clicked', self.filter_clicked) + self.clear_btn = gtk.Button(stock=gtk.STOCK_CLEAR) + self.clear_btn.connect('clicked', self.clear_clicked) + table.set_col_spacing(0,6) table.set_col_spacing(1,6) @@ -292,11 +295,19 @@ class PersonView(PageView.PersonNavView): table.attach(self.filter_regex, 2, 3, 8, 9, xoptions=gtk.FILL, yoptions=0) - table.attach(self.apply_btn, 2, 3, 9, 10, xoptions=0, + + hbox = gtk.HBox() + hbox.add(self.apply_btn) + hbox.add(self.clear_btn) + hbox.show() + table.attach(hbox, 2, 3, 9, 10, xoptions=gtk.FILL, yoptions=0) return table + def clear_clicked(self,obj): + print "clear" + def filter_clicked(self, obj): name = self.filter_name.get_text().strip() gid = self.filter_id.get_text().strip()