microtherion/AVRSack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix name conflict on setTheme

Browse Source
This commit is contained in:
Matthias Neeracher 2014-11-17 05:53:33 +01:00 committed by Matthias Neeracher
parent cccc33c847
commit 263a7c5051
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AVRsack/ASApplication.swift
View File

@ -16,7 +16,7 @@ class ASApplication: NSObject, NSApplicationDelegate {
func applicationDidFinishLaunching(aNotification: NSNotification) { func applicationDidFinishLaunching(aNotification: NSNotification) {
themeMenu.removeAllItems() themeMenu.removeAllItems()
for (index, theme) in enumerate(ACEThemeNames.humanThemeNames() as [NSString]) { for (index, theme) in enumerate(ACEThemeNames.humanThemeNames() as [NSString]) {
let menuItem = themeMenu.addItemWithTitle(theme, action: "setTheme:", keyEquivalent: "") let menuItem = themeMenu.addItemWithTitle(theme, action: "changeTheme:", keyEquivalent: "")
menuItem!.tag = index menuItem!.tag = index
} }
keyboardMenu.removeAllItems() keyboardMenu.removeAllItems()

4
AVRsack/ASProjDoc.swift
View File

@ -186,7 +186,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate {
// MARK: Editor configuration // MARK: Editor configuration
@IBAction func setTheme(item: NSMenuItem) { @IBAction func changeTheme(item: NSMenuItem) {
currentTheme = UInt(item.tag) currentTheme = UInt(item.tag)
editor.setTheme(currentTheme) editor.setTheme(currentTheme)
NSUserDefaults.standardUserDefaults().setObject( NSUserDefaults.standardUserDefaults().setObject(
@ -202,7 +202,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate {
override func validateUserInterfaceItem(anItem: NSValidatedUserInterfaceItem) -> Bool { override func validateUserInterfaceItem(anItem: NSValidatedUserInterfaceItem) -> Bool {
if let menuItem = anItem as? NSMenuItem { if let menuItem = anItem as? NSMenuItem {
if menuItem.action == "setTheme:" { if menuItem.action == "changeTheme:" {
menuItem.state = (menuItem.tag == Int(currentTheme) ? NSOnState : NSOffState) menuItem.state = (menuItem.tag == Int(currentTheme) ? NSOnState : NSOffState)
return true return true
} else if menuItem.action == "changeKeyboardHandler:" { } else if menuItem.action == "changeKeyboardHandler:" {