Skip to content

Commit

Permalink
Merge pull request #100 from BenVlodgi/dev
Browse files Browse the repository at this point in the history
Pre-Release 9
  • Loading branch information
TeamSpen210 committed Aug 29, 2015
2 parents 2df1c23 + 88971e0 commit 11a1224
Show file tree
Hide file tree
Showing 12 changed files with 1,200 additions and 394 deletions.
11 changes: 5 additions & 6 deletions src/UI.py
Original file line number Diff line number Diff line change
Expand Up @@ -1053,14 +1053,14 @@ def update_filters():
# deselected
(show_wip or not item.item.is_wip)
# Visible if any of the author and tag checkboxes are checked
and any(
and (any(
FilterVars['author'][auth.casefold()].get()
for auth in item.item.authors
)
and any(
) or not item.item.authors) # Show if no authors
and (any(
FilterVars['tags'][tag.casefold()].get()
for tag in item.item.tags
)
) or not item.item.tags) # Show if no tags
# The package is selected
and FilterVars['package'][item.item.pak_id].get()
# Items like the elevator that need the unlocked stylevar
Expand Down Expand Up @@ -1439,7 +1439,6 @@ def filter_all_callback(col):
command=update_filters,
variable=FilterVars[cat][filt_id],
)
FilterBoxes[cat][filt_id]['variable'] = FilterVars[cat][filt_id]
FilterBoxes[cat][filt_id].grid(
row=ind+2,
column=0,
Expand Down Expand Up @@ -1808,7 +1807,7 @@ def init_windows():
init_drag_icon()
loader.step('UI')

optionWindow.reset_all_win = reposition_panes
optionWindow.reset_all_win = reset_panes

TK_ROOT.deiconify() # show it once we've loaded everything

Expand Down
Loading

0 comments on commit 11a1224

Please sign in to comment.