Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#3238: Glade interface file for filter editor contains duplicate identifiers by Bob Ham

Browse Source 
svn: r13268
This commit is contained in:
Doug Blank 2009-09-28 12:58:58 +00:00
parent 44df4210ab
commit 93a5e3920e
5 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/FilterEditor/_EditFilter.py
View File

@ -80,7 +80,7 @@ class EditFilter(ManagedWindow.ManagedWindow):
self.set_window(
self.get_widget('define_filter'),
self.get_widget('title'),
self.get_widget('definition_title'),
_('Define filter'))
self.rlist = ListModel.ListModel(
@ -93,19 +93,19 @@ class EditFilter(ManagedWindow.ManagedWindow):
self.logical = self.get_widget('rule_apply')
self.logical_not = self.get_widget('logical_not')
self.comment = self.get_widget('comment')
self.ok_btn = self.get_widget('ok')
self.edit_btn = self.get_widget('edit')
self.del_btn = self.get_widget('delete')
self.add_btn = self.get_widget('add')
self.ok_btn = self.get_widget('definition_ok')
self.edit_btn = self.get_widget('definition_edit')
self.del_btn = self.get_widget('definition_delete')
self.add_btn = self.get_widget('definition_add')
self.ok_btn.connect('clicked', self.on_ok_clicked)
self.edit_btn.connect('clicked', self.on_edit_clicked)
self.del_btn.connect('clicked', self.on_delete_clicked)
self.add_btn.connect('clicked', self.on_add_clicked)
self.get_widget('help').connect('clicked',
self.get_widget('definition_help').connect('clicked',
self.on_help_clicked)
self.get_widget('cancel').connect('clicked',
self.get_widget('definition_cancel').connect('clicked',
self.close_window)
self.fname.connect('changed', self.filter_name_changed)

8
src/FilterEditor/_EditRule.py
View File

@ -392,7 +392,7 @@ class EditRule(ManagedWindow.ManagedWindow):
self.define_glade('rule_editor', const.RULE_GLADE)
self.set_window(self.get_widget('rule_editor'),
self.get_widget('title'),label)
self.get_widget('rule_editor_title'),label)
self.window.hide()
self.valuebox = self.get_widget('valuebox')
self.rname = self.get_widget('ruletree')
@ -559,9 +559,9 @@ class EditRule(ManagedWindow.ManagedWindow):
self.selection.connect('changed', self.on_node_selected)
self.rname.connect('button-press-event', self._button_press)
self.rname.connect('key-press-event', self._key_press)
self.get_widget('ok').connect('clicked', self.rule_ok)
self.get_widget('cancel').connect('clicked', self.close_window)
self.get_widget('help').connect('clicked', self.on_help_clicked)
self.get_widget('rule_editor_ok').connect('clicked', self.rule_ok)
self.get_widget('rule_editor_cancel').connect('clicked', self.close_window)
self.get_widget('rule_editor_help').connect('clicked', self.on_help_clicked)
self.show()

16
src/FilterEditor/_FilterEditor.py
View File

@ -83,10 +83,10 @@ class FilterEditor(ManagedWindow.ManagedWindow):
self.define_glade('filter_list', const.RULE_GLADE)
self.filter_list = self.get_widget('filters')
self.edit = self.get_widget('edit')
self.clone = self.get_widget('clone')
self.delete = self.get_widget('delete')
self.test = self.get_widget('test')
self.edit = self.get_widget('filter_list_edit')
self.clone = self.get_widget('filter_list_clone')
self.delete = self.get_widget('filter_list_delete')
self.test = self.get_widget('filter_list_test')
self.edit.set_sensitive(False)
self.clone.set_sensitive(False)
@ -94,7 +94,7 @@ class FilterEditor(ManagedWindow.ManagedWindow):
self.test.set_sensitive(False)
self.set_window(self.get_widget('filter_list'),
self.get_widget('title'),
self.get_widget('filter_list_title'),
_TITLES[self.namespace])
self.edit.connect('clicked', self.edit_filter)
@ -102,9 +102,9 @@ class FilterEditor(ManagedWindow.ManagedWindow):
self.test.connect('clicked', self.test_clicked)
self.delete.connect('clicked', self.delete_filter)
self.connect_button('help', self.help_clicked)
self.connect_button('close', self.close)
self.connect_button('add', self.add_new_filter)
self.connect_button('filter_list_help', self.help_clicked)
self.connect_button('filter_list_close', self.close)
self.connect_button('filter_list_add', self.add_new_filter)
self.uistate.connect('filter-name-changed', self.clean_after_rename)

4
src/FilterEditor/_ShowResults.py
View File

@ -74,7 +74,7 @@ class ShowResults(ManagedWindow.ManagedWindow):
self.define_glade('test', const.RULE_GLADE,)
self.set_window(
self.get_widget('test'),
self.get_widget('title'),
self.get_widget('test_title'),
_('Filter Test'))
render = gtk.CellRendererText()
@ -89,7 +89,7 @@ class ShowResults(ManagedWindow.ManagedWindow):
column_n = gtk.TreeViewColumn(_('ID'), render, text=1)
tree.append_column(column_n)
self.get_widget('close').connect('clicked', self.close)
self.get_widget('test_close').connect('clicked', self.close)
new_list = sorted(
(self.sort_val_from_handle(h) for h in handle_list),

60
src/glade/rule.glade
View File

@ -33,7 +33,7 @@
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<child>
<object class="GtkLabel" id="title">
<object class="GtkLabel" id="definition_title">
<property name="visible">True</property>
<property name="ypad">6</property>
<property name="justify">center</property>
@ -57,7 +57,7 @@
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="add">
<object class="GtkButton" id="definition_add">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -79,7 +79,7 @@
</packing>
</child>
<child>
<object class="GtkButton" id="edit">
<object class="GtkButton" id="definition_edit">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@ -102,7 +102,7 @@
</packing>
</child>
<child>
<object class="GtkButton" id="delete">
<object class="GtkButton" id="definition_delete">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@ -340,7 +340,7 @@
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancel">
<object class="GtkButton" id="definition_cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@ -356,7 +356,7 @@
</packing>
</child>
<child>
<object class="GtkButton" id="ok">
<object class="GtkButton" id="definition_ok">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
@ -373,7 +373,7 @@
</packing>
</child>
<child>
<object class="GtkButton" id="help">
<object class="GtkButton" id="definition_help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@ -398,9 +398,9 @@
</object>
</child>
<action-widgets>
<action-widget response="0">cancel</action-widget>
<action-widget response="0">ok</action-widget>
<action-widget response="-11">help</action-widget>
<action-widget response="0">definition_cancel</action-widget>
<action-widget response="0">definition_ok</action-widget>
<action-widget response="-11">definition_help</action-widget>
</action-widgets>
</object>
<object class="GtkDialog" id="filter_list">
@ -418,7 +418,7 @@
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<child>
<object class="GtkLabel" id="title">
<object class="GtkLabel" id="filter_list_title">
<property name="visible">True</property>
<property name="justify">center</property>
</object>
@ -457,7 +457,7 @@
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="add">
<object class="GtkButton" id="filter_list_add">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@ -479,7 +479,7 @@
</packing>
</child>
<child>
<object class="GtkButton" id="edit">
<object class="GtkButton" id="filter_list_edit">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@ -502,7 +502,7 @@
</packing>
</child>
<child>
<object class="GtkButton" id="clone">
<object class="GtkButton" id="filter_list_clone">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@ -525,7 +525,7 @@
</packing>
</child>
<child>
<object class="GtkButton" id="test">
<object class="GtkButton" id="filter_list_test">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@ -546,7 +546,7 @@
</packing>
</child>
<child>
<object class="GtkButton" id="delete">
<object class="GtkButton" id="filter_list_delete">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@ -606,7 +606,7 @@
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close">
<object class="GtkButton" id="filter_list_close">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@ -622,7 +622,7 @@
</packing>
</child>
<child>
<object class="GtkButton" id="help">
<object class="GtkButton" id="filter_list_help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@ -647,8 +647,8 @@
</object>
</child>
<action-widgets>
<action-widget response="-7">close</action-widget>
<action-widget response="-11">help</action-widget>
<action-widget response="-7">filter_list_close</action-widget>
<action-widget response="-11">filter_list_help</action-widget>
</action-widgets>
</object>
<object class="GtkDialog" id="test">
@ -663,7 +663,7 @@
<property name="visible">True</property>
<property name="spacing">8</property>
<child>
<object class="GtkLabel" id="title">
<object class="GtkLabel" id="test_title">
<property name="visible">True</property>
<property name="ypad">6</property>
</object>
@ -696,7 +696,7 @@
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close">
<object class="GtkButton" id="test_close">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@ -721,7 +721,7 @@
</object>
</child>
<action-widgets>
<action-widget response="0">close</action-widget>
<action-widget response="0">test_close</action-widget>
</action-widgets>
</object>
<object class="GtkDialog" id="rule_editor">
@ -738,7 +738,7 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<child>
<object class="GtkLabel" id="title">
<object class="GtkLabel" id="rule_editor_title">
<property name="visible">True</property>
<property name="use_markup">True</property>
</object>
@ -870,7 +870,7 @@
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancel">
<object class="GtkButton" id="rule_editor_cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@ -886,7 +886,7 @@
</packing>
</child>
<child>
<object class="GtkButton" id="ok">
<object class="GtkButton" id="rule_editor_ok">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@ -902,7 +902,7 @@
</packing>
</child>
<child>
<object class="GtkButton" id="help">
<object class="GtkButton" id="rule_editor_help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@ -927,9 +927,9 @@
</object>
</child>
<action-widgets>
<action-widget response="-6">cancel</action-widget>
<action-widget response="-5">ok</action-widget>
<action-widget response="-11">help</action-widget>
<action-widget response="-6">rule_editor_cancel</action-widget>
<action-widget response="-5">rule_editor_ok</action-widget>
<action-widget response="-11">rule_editor_help</action-widget>
</action-widgets>
</object>
</interface>