anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

Set up cardsets advanced search to only show options that are registered.

Browse source
This commit is contained in:
Joe R 2023-09-05 17:26:40 -04:00
parent b30334410b
commit df95421d91
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pysollib/tile/selectcardset.py
View file

@ -220,7 +220,7 @@ class SelectCardsetDialogWithPreview(MfxDialog):
self.manager = manager self.manager = manager
self.key = key self.key = key
self.app = app self.app = app
self.criteria = SearchCriteria() self.criteria = SearchCriteria(manager)
self.cardset_values = None self.cardset_values = None
# padx, pady = kw.padx, kw.pady # padx, pady = kw.padx, kw.pady
padx, pady = 4, 4 padx, pady = 4, 4
@ -527,7 +527,7 @@ class SelectCardsetDialogWithPreview(MfxDialog):
def advancedSearch(self): def advancedSearch(self):
d = SelectCardsetAdvancedSearch(self.top, _("Advanced search"), d = SelectCardsetAdvancedSearch(self.top, _("Advanced search"),
self.criteria) self.criteria, self.manager)
if d.status == 0 and d.button == 0: if d.status == 0 and d.button == 0:
self.criteria.name = d.name.get() self.criteria.name = d.name.get()
@ -712,7 +712,7 @@ class CardsetInfoDialog(MfxDialog):
class SearchCriteria: class SearchCriteria:
def __init__(self): def __init__(self, manager):
self.name = "" self.name = ""
self.size = "" self.size = ""
self.type = "" self.type = ""
@ -729,25 +729,32 @@ class SearchCriteria:
"Hi-Res cardsets": CSI.SIZE_HIRES} "Hi-Res cardsets": CSI.SIZE_HIRES}
typeOptions = {-1: ""} typeOptions = {-1: ""}
typeOptions.update(CSI.TYPE_NAME) for key, name in CSI.TYPE_NAME.items():
del typeOptions[7] # Navagraha Ganjifa is unused. if manager.registered_types.get(key):
typeOptions[key] = name
self.typeOptions = dict((v, k) for k, v in typeOptions.items()) self.typeOptions = dict((v, k) for k, v in typeOptions.items())
styleOptions = {-1: ""} styleOptions = {-1: ""}
styleOptions.update(CSI.STYLE) for key, name in CSI.STYLE.items():
if manager.registered_styles.get(key):
styleOptions[key] = name
self.styleOptions = dict((v, k) for k, v in styleOptions.items()) self.styleOptions = dict((v, k) for k, v in styleOptions.items())
dateOptions = {-1: ""} dateOptions = {-1: ""}
dateOptions.update(CSI.DATE) for key, name in CSI.DATE.items():
if manager.registered_dates.get(key):
dateOptions[key] = name
self.dateOptions = dict((v, k) for k, v in dateOptions.items()) self.dateOptions = dict((v, k) for k, v in dateOptions.items())
natOptions = {-1: ""} natOptions = {-1: ""}
natOptions.update(CSI.NATIONALITY) for key, name in CSI.NATIONALITY.items():
if manager.registered_nationalities.get(key):
natOptions[key] = name
self.natOptions = dict((v, k) for k, v in natOptions.items()) self.natOptions = dict((v, k) for k, v in natOptions.items())
class SelectCardsetAdvancedSearch(MfxDialog): class SelectCardsetAdvancedSearch(MfxDialog):
def __init__(self, parent, title, criteria, **kw): def __init__(self, parent, title, criteria, manager, **kw):
kw = self.initKw(kw) kw = self.initKw(kw)
MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) MfxDialog.__init__(self, parent, title, kw.resizable, kw.default)
top_frame, bottom_frame = self.createFrames(kw) top_frame, bottom_frame = self.createFrames(kw)