projects
/
enjoyable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
692a4d6
)
Use represented objects rather than index hackery. Remove the mapping name from the...
author
Joe Wreschnig
<joe.wreschnig@gmail.com>
Mon, 4 Mar 2013 13:47:56 +0000
(14:47 +0100)
committer
Joe Wreschnig
<joe.wreschnig@gmail.com>
Mon, 4 Mar 2013 13:47:56 +0000
(14:47 +0100)
NJOutputController.m
patch
|
blob
|
history
diff --git
a/NJOutputController.m
b/NJOutputController.m
index
8f942c6
..
25d04b1
100644
(file)
--- a/
NJOutputController.m
+++ b/
NJOutputController.m
@@
-172,7
+172,7
@@
for (id <NJInputPathElement> cur = input.base; cur; cur = cur.base) {
inpFullName = [[NSString alloc] initWithFormat:@"%@ > %@", cur.name, inpFullName];
}
for (id <NJInputPathElement> cur = input.base; cur; cur = cur.base) {
inpFullName = [[NSString alloc] initWithFormat:@"%@ > %@", cur.name, inpFullName];
}
- title.stringValue =
[[NSString alloc] initWithFormat:@"%@ > %@", mappingsController.currentMapping.name, inpFullName]
;
+ title.stringValue =
inpFullName
;
}
if ([output isKindOfClass:NJOutputKeyPress.class]) {
}
if ([output isKindOfClass:NJOutputKeyPress.class]) {
@@
-180,8
+180,7
@@
keyInput.keyCode = [(NJOutputKeyPress*)output vk];
} else if ([output isKindOfClass:NJOutputMapping.class]) {
[radioButtons selectCellAtRow:2 column:0];
keyInput.keyCode = [(NJOutputKeyPress*)output vk];
} else if ([output isKindOfClass:NJOutputMapping.class]) {
[radioButtons selectCellAtRow:2 column:0];
- NSUInteger idx = [mappingsController.mappings
- indexOfObject:[(NJOutputMapping *)output mapping]];
+ NSUInteger idx = [mappingPopup indexOfItemWithRepresentedObject:[(NJOutputMapping *)output mapping]];
if (idx == NSNotFound) {
[radioButtons selectCellAtRow:self.enabled ? 0 : -1 column:0];
[mappingPopup selectItemAtIndex:-1];
if (idx == NSNotFound) {
[radioButtons selectCellAtRow:self.enabled ? 0 : -1 column:0];
[mappingPopup selectItemAtIndex:-1];
@@
-220,16
+219,17
@@
}
- (void)refreshMappings {
}
- (void)refreshMappings {
- N
SInteger initialIndex = mappingPopup.indexOfSelectedItem
;
+ N
JMapping *current = mappingPopup.selectedItem.representedObject
;
[mappingPopup.menu removeAllItems];
for (NJMapping *mapping in mappingsController) {
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:mapping.name
action:@selector(mappingChosen:)
keyEquivalent:@""];
item.target = self;
[mappingPopup.menu removeAllItems];
for (NJMapping *mapping in mappingsController) {
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:mapping.name
action:@selector(mappingChosen:)
keyEquivalent:@""];
item.target = self;
+ item.representedObject = mapping;
[mappingPopup.menu addItem:item];
}
[mappingPopup.menu addItem:item];
}
- [mappingPopup selectItemAtIndex:
initialIndex
];
+ [mappingPopup selectItemAtIndex:
[mappingPopup indexOfItemWithRepresentedObject:current]
];
}
@end
}
@end