Skip to content

Commit

Permalink
Support for arena decks
Browse files Browse the repository at this point in the history
  • Loading branch information
bmichotte committed Mar 18, 2015
1 parent 12c204d commit e7cf7ee
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 8 deletions.
29 changes: 21 additions & 8 deletions app/controllers/deck_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -234,20 +234,20 @@ def validateToolbarItem(item)
case item.itemIdentifier
when 'save', 'delete', 'close', 'play', 'export'
@in_edition
when 'new', 'import'
when 'new', 'import', 'arena'
!@in_edition
else
true
end
end

def toolbarAllowedItemIdentifiers(toolbar)
['new', 'import', 'save', 'search', 'close', 'delete', 'play', 'export',
['new', 'arena', 'import', 'save', 'search', 'close', 'delete', 'play', 'export',
NSToolbarFlexibleSpaceItemIdentifier, NSToolbarSpaceItemIdentifier, NSToolbarSeparatorItemIdentifier]
end

def toolbarDefaultItemIdentifiers(toolbar)
['new', 'import', NSToolbarSeparatorItemIdentifier,
['new', 'arena', 'import', NSToolbarSeparatorItemIdentifier,
'save', 'delete', 'close', 'play', 'export',
NSToolbarFlexibleSpaceItemIdentifier, 'search']
end
Expand All @@ -264,16 +264,19 @@ def toolbar(toolbar, itemForItemIdentifier: identifier, willBeInsertedIntoToolba
item.target = self
item.action = 'import_deck:'

when 'new'
item.label = 'New'._
when 'new', 'arena'
label = (identifier == 'new') ? 'New'._ : 'Arena Deck'._
action = (identifier == 'new') ? 'add_deck:' : 'add_area_deck:'

menu = NSMenu.alloc.initWithTitle 'new'
menu_item = NSMenuItem.alloc.initWithTitle('New'._, action: nil, keyEquivalent: '')
item.label = label

menu = NSMenu.alloc.initWithTitle identifier
menu_item = NSMenuItem.alloc.initWithTitle(label, action: nil, keyEquivalent: '')
menu.addItem menu_item

classes = %w(Shaman Hunter Warlock Druid Warrior Mage Paladin Priest Rogue)
classes.each do |clazz|
menu_item = NSMenuItem.alloc.initWithTitle(clazz._, action: 'add_deck:', keyEquivalent: '')
menu_item = NSMenuItem.alloc.initWithTitle(clazz._, action: action, keyEquivalent: '')
menu_item.identifier = clazz
menu.addItem menu_item
end
Expand Down Expand Up @@ -419,7 +422,17 @@ def show_deck(deck, clazz=nil, name=nil)
@table_view.reloadData
end

def add_area_deck(sender)
@current_deck_mode = :arena
start_new_deck(sender)
end

def add_deck(sender)
@current_deck_mode = :constructed
start_new_deck(sender)
end

def start_new_deck(sender)
clazz = sender.identifier

@in_edition = true
Expand Down
1 change: 1 addition & 0 deletions resources/de.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"Play" = "Play";
"Export" = "Export";
"Export Deck" = "Export Deck";
"Arena Deck" = "Arena Deck";
"You are currently in a deck edition and you changes have not been saved." = "Sie sind momentan in der Deckerstellung und Änderungen wurden noch nicht gesichert.";
"Deck name" = "Deckname";
"Are you sure you want to delete this deck ?" = "Sind Sie sicher, dass Sie dieses Deck löschen möchten?";
Expand Down
1 change: 1 addition & 0 deletions resources/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"Play" = "Play";
"Export" = "Export";
"Export Deck" = "Export Deck";
"Arena Deck" = "Arena Deck";
"You are currently in a deck edition and you changes have not been saved." = "You are currently in a deck edition and you changes have not been saved.";
"Deck name" = "Deck name";
"Are you sure you want to delete this deck ?" = "Are you sure you want to delete this deck ?";
Expand Down
1 change: 1 addition & 0 deletions resources/fr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"Play" = "Jouer";
"Export" = "Exporter";
"Export Deck" = "Exporter Deck";
"Arena Deck" = "Deck Arène";
"You are currently in a deck edition and you changes have not been saved." = "Vous êtes en mode édition de deck et vos modifications n'ont pas été sauvegardées.";
"Deck name" = "Nom du deck";
"Are you sure you want to delete this deck ?" = "Êtes-vous sur de vouloir supprimer ce deck ?";
Expand Down

0 comments on commit e7cf7ee

Please sign in to comment.