finn/dominiontabs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup and Added starting alternating tabs on the left or the right.

Browse Source 
Added the option to start the alternating tabs with a left tab, or a
right tab.
Clean up of help text.  Fixed one case where overlapping options did not
make sense.
This commit is contained in:
Wendel Voigt 2015-10-17 09:25:08 -05:00
parent d7a6d547d7
commit 8c4c1395a2
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dominion_tabs.py
View File

@ -554,6 +554,7 @@ class DominionTabs:
elif self.options.tab_side == "left" or self.options.tab_side == "full": elif self.options.tab_side == "left" or self.options.tab_side == "full":
rightSide = not useExtra rightSide = not useExtra
else: else:
# alternate the cards
if not useExtra: if not useExtra:
rightSide = not self.odd rightSide = not self.odd
else: else:
@ -755,7 +756,14 @@ class DominionTabs:
def drawDividers(self, cards): def drawDividers(self, cards):
# split into pages # split into pages
cards = split(cards, self.numTabsVertical * self.numTabsHorizontal) cards = split(cards, self.numTabsVertical * self.numTabsHorizontal)
self.odd = True
# Starting with tabs on the left or the right?
if self.options.tab_side == "right-alternate" or self.options.tab_side == "right":
self.odd = True
else:
# left-alternate, left, full
self.odd = False
for pageNum, pageCards in enumerate(cards): for pageNum, pageCards in enumerate(cards):
# remember whether we start with odd or even divider for tab # remember whether we start with odd or even divider for tab
# location # location
@ -815,20 +823,22 @@ class DominionTabs:
help="'<%f>x<%f>' (size in cm), or 'A4', or 'LETTER'") help="'<%f>x<%f>' (size in cm), or 'A4', or 'LETTER'")
parser.add_option("--tab_name_align", type="choice", choices=["left", "right", "center", "centre", "edge"], parser.add_option("--tab_name_align", type="choice", choices=["left", "right", "center", "centre", "edge"],
dest="tab_name_align", default="left", dest="tab_name_align", default="left",
help="Alignment of text on the tab. choices: left, centre (or center), edge." help="Alignment of text on the tab. choices: left, right, centre (or center), edge."
" The edge option will align the card name to the outside edge of the" " The edge option will align the card name to the outside edge of the"
" tab, so that when using tabs on alternating sides," " tab, so that when using tabs on alternating sides,"
" the name is less likely to be hidden by the tab in front;" " the name is less likely to be hidden by the tab in front"
" (edge will revert to left when tab_side is full since there is no edge in that case);"
" default:left") " default:left")
parser.add_option("--tab_side", type="choice", choices=["left", "right", "alternate", "full"], parser.add_option("--tab_side", type="choice", choices=["left", "right", "left-alternate", "right-alternate", "full"],
dest="tab_side", default="alternate", dest="tab_side", default="right-alternate",
help="Alignment of tab. choices: left, right, alternate, full;" help="Alignment of tab. choices: left, right, left-alternate, right-alternate, full;"
" left/right forces all tabs to that side;" " left/right forces all tabs to left/right side;"
" alternate will toggle between left and right for the tabs;" " left-alternate will start on the left and then toggle between left and right for the tabs;"
" right-alternate will start on the right and then toggle between right and left for the tabs;"
" full will force all label tabs to be full width of the divider" " full will force all label tabs to be full width of the divider"
" default:alternate") " default:right-alternate")
parser.add_option("--tabwidth", type="float", default=4, parser.add_option("--tabwidth", type="float", default=4,
help="width in cm of stick-up tab (ignored if tabs-only used)") help="width in cm of stick-up tab (ignored if tab_side is full or tabs-only is used)")
parser.add_option("--cost", action="append", type="choice", parser.add_option("--cost", action="append", type="choice",
choices=cls.LOCATION_CHOICES, default=[], choices=cls.LOCATION_CHOICES, default=[],
help="where to display the card cost; may be set to" help="where to display the card cost; may be set to"
@ -967,6 +977,10 @@ class DominionTabs:
if self.options.tab_name_align == "center": if self.options.tab_name_align == "center":
self.options.tab_name_align = "centre" self.options.tab_name_align = "centre"
if self.options.tab_side == "full" and self.options.tab_name_align == "edge":
# This case does not make sense since there are two tab edges in this case. So picking left edge.
self.options.tab_name_align == "left"
fixedMargins = False fixedMargins = False
if self.options.tabs_only: if self.options.tabs_only:
# fixed for Avery 8867 for now # fixed for Avery 8867 for now