Fix grouped search terms being committed even if Cancel was clicked.

This commit is contained in:
Charles Haley 2012-06-10 11:54:43 +02:00
parent 3bbc1f1342
commit 495b8993e6

View File

@ -57,7 +57,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
"can be useful to check for duplicates, to find which column contains " "can be useful to check for duplicates, to find which column contains "
"a particular item, or to have hierarchical categories (categories " "a particular item, or to have hierarchical categories (categories "
"that contain categories).")) "that contain categories)."))
self.gst = db.prefs.get('grouped_search_terms', {}) self.gst = db.prefs.get('grouped_search_terms', {}).copy()
self.orig_gst_keys = self.gst.keys() self.orig_gst_keys = self.gst.keys()
fl = [] fl = []
@ -100,12 +100,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.muc_box_changed) self.muc_box_changed)
def set_similar_fields(self, initial=False): def set_similar_fields(self, initial=False):
self.set_similar('similar_authors_search_key', first_item='author', initial=initial) self.set_similar('similar_authors_search_key', initial=initial)
self.set_similar('similar_tags_search_key', first_item='tags', initial=initial) self.set_similar('similar_tags_search_key', initial=initial)
self.set_similar('similar_series_search_key', first_item='series', initial=initial) self.set_similar('similar_series_search_key', initial=initial)
self.set_similar('similar_publisher_search_key', first_item='publisher', initial=initial) self.set_similar('similar_publisher_search_key', initial=initial)
def set_similar(self, name, first_item, initial=False): def set_similar(self, name, initial=False):
field = getattr(self, name) field = getattr(self, name)
if not initial: if not initial:
val = field.currentText() val = field.currentText()