adium 4787:a8839ba0ae0a: Two preference panes with the same iden...
commits at adium.im
commits at adium.im
Fri Apr 27 05:23:36 UTC 2012
details: http://hg.adium.im/adium/rev/a8839ba0ae0a
revision: 4787:a8839ba0ae0a
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Fri Apr 27 00:45:36 2012 -0400
Two preference panes with the same identifier isn't good.
Subject: adium 4788:6d3dce05d526: Upgrade some deprecated table view functions.
details: http://hg.adium.im/adium/rev/6d3dce05d526
revision: 4788:6d3dce05d526
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Fri Apr 27 01:13:10 2012 -0400
Upgrade some deprecated table view functions.
Subject: adium 4789:3f1e5d253f08: NSMenu in 10.6 has a better -removeAllItems, remove ours and fix a warning.
details: http://hg.adium.im/adium/rev/3f1e5d253f08
revision: 4789:3f1e5d253f08
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Fri Apr 27 01:13:46 2012 -0400
NSMenu in 10.6 has a better -removeAllItems, remove ours and fix a warning.
diffs (192 lines):
diff -r 0e51b391797e -r 3f1e5d253f08 Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h Thu Apr 26 20:45:08 2012 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h Fri Apr 27 01:13:46 2012 -0400
@@ -19,7 +19,6 @@
- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode;
- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode tag:(NSInteger)tag;
- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode representedObject:(id)object;
-- (void)removeAllItems;
- (void)removeAllItemsButFirst;
- (void)removeAllItemsAfterIndex:(NSInteger)idx;
diff -r 0e51b391797e -r 3f1e5d253f08 Frameworks/AIUtilities Framework/Source/AIMenuAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.m Thu Apr 26 20:45:08 2012 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.m Fri Apr 27 01:13:46 2012 -0400
@@ -50,15 +50,6 @@
return [theMenuItem autorelease];
}
-
-- (void)removeAllItems
-{
- NSInteger count = [self numberOfItems];
- while (count--) {
- [self removeItemAtIndex:0];
- }
-}
-
- (void)removeAllItemsButFirst
{
NSInteger count = [self numberOfItems];
diff -r 0e51b391797e -r 3f1e5d253f08 Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.m
--- a/Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.m Thu Apr 26 20:45:08 2012 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.m Fri Apr 27 01:13:46 2012 -0400
@@ -390,6 +390,7 @@
}
+//Our default drag image will be cropped incorrectly, so we need a custom one here
- (NSImage *)dragImageForRowsWithIndexes:(NSIndexSet *)dragRows tableColumns:(NSArray *)tableColumns event:(NSEvent*)dragEvent offset:(NSPointPointer)dragImageOffset
{
NSImage *image;
@@ -406,24 +407,6 @@
return image;
}
-//Our default drag image will be cropped incorrectly, so we need a custom one here
-- (NSImage *)dragImageForRows:(NSArray *)dragRows event:(NSEvent *)dragEvent dragImageOffset:(NSPointPointer)dragImageOffset
-{
- NSImage *image;
- NSUInteger i, bufSize = [dragRows count];
- NSUInteger *buf = malloc(bufSize * sizeof(NSUInteger));
-
- for (i = 0; i < bufSize; i++) {
- buf[i] = [[dragRows objectAtIndex:0] unsignedIntValue];
- }
-
- image = [self dragImageForRows:buf count:bufSize tableColumns:nil event:dragEvent offset:dragImageOffset];
-
- free(buf);
-
- return image;
-}
-
- (NSInteger)totalHeight
{
if (totalHeight == -1) {
diff -r 0e51b391797e -r 3f1e5d253f08 Frameworks/Adium Framework/Source/ESPresetManagementController.m
--- a/Frameworks/Adium Framework/Source/ESPresetManagementController.m Thu Apr 26 20:45:08 2012 -0400
+++ b/Frameworks/Adium Framework/Source/ESPresetManagementController.m Fri Apr 27 01:13:46 2012 -0400
@@ -330,11 +330,11 @@
*
* Only allow the drag to start if the delegate responds to @selector(movePreset:toIndex:inPresets:)
*/
-- (BOOL)tableView:(NSTableView *)tv writeRows:(NSArray*)rows toPasteboard:(NSPasteboard*)pboard
+- (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard
{
if ([delegate respondsToSelector:@selector(movePreset:toIndex:inPresets:presetAfterMove:)]) {
[tempDragPreset release];
- tempDragPreset = [[presets objectAtIndex:[[rows objectAtIndex:0] integerValue]] retain];
+ tempDragPreset = [[presets objectAtIndex:[rowIndexes firstIndex]] retain];
[pboard declareTypes:[NSArray arrayWithObject:PRESET_DRAG_TYPE] owner:self];
[pboard setString:@"Preset" forType:PRESET_DRAG_TYPE]; //Arbitrary state
diff -r 0e51b391797e -r 3f1e5d253f08 Plugins/Emoticons/AIEmoticonPackPreviewTableView.m
--- a/Plugins/Emoticons/AIEmoticonPackPreviewTableView.m Thu Apr 26 20:45:08 2012 -0400
+++ b/Plugins/Emoticons/AIEmoticonPackPreviewTableView.m Fri Apr 27 01:13:46 2012 -0400
@@ -92,6 +92,7 @@
return [image imageByFadingToFraction:DRAG_IMAGE_FRACTION];
}
+//Our default drag image will be cropped incorrectly, so we need a custom one here
- (NSImage *)dragImageForRowsWithIndexes:(NSIndexSet *)dragRows tableColumns:(NSArray *)tableColumns event:(NSEvent*)dragEvent offset:(NSPointPointer)dragImageOffset
{
NSImage *image;
@@ -108,22 +109,4 @@
return image;
}
-//Our default drag image will be cropped incorrectly, so we need a custom one here
-- (NSImage *)dragImageForRows:(NSArray *)dragRows event:(NSEvent *)dragEvent dragImageOffset:(NSPointPointer)dragImageOffset
-{
- NSImage *image;
- NSUInteger i, bufSize = [dragRows count];
- NSUInteger *buf = malloc(bufSize * sizeof(NSUInteger));
-
- for (i = 0; i < bufSize; i++) {
- buf[i] = [[dragRows objectAtIndex:0] unsignedIntegerValue];
- }
-
- image = [self dragImageForRows:buf count:bufSize tableColumns:nil event:dragEvent offset:dragImageOffset];
-
- free(buf);
-
- return image;
-}
-
@end
diff -r 0e51b391797e -r 3f1e5d253f08 Plugins/Emoticons/AIEmoticonPreferences.h
--- a/Plugins/Emoticons/AIEmoticonPreferences.h Thu Apr 26 20:45:08 2012 -0400
+++ b/Plugins/Emoticons/AIEmoticonPreferences.h Fri Apr 27 01:13:46 2012 -0400
@@ -33,7 +33,7 @@
AIEmoticonPack *selectedEmoticonPack;
NSMutableDictionary *emoticonImageCache;
- NSArray *dragRows;
+ NSIndexSet *dragRows;
BOOL viewIsOpen;
}
diff -r 0e51b391797e -r 3f1e5d253f08 Plugins/Emoticons/AIEmoticonPreferences.m
--- a/Plugins/Emoticons/AIEmoticonPreferences.m Thu Apr 26 20:45:08 2012 -0400
+++ b/Plugins/Emoticons/AIEmoticonPreferences.m Fri Apr 27 01:13:46 2012 -0400
@@ -334,12 +334,12 @@
#pragma mark Drag and Drop
-- (BOOL)tableView:(NSTableView *)tableView writeRows:(NSArray*)rows toPasteboard:(NSPasteboard*)pboard
+- (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard
{
if (tableView != table_emoticonPacks)
return NO;
- dragRows = rows;
+ dragRows = rowIndexes;
[pboard declareTypes:[NSArray arrayWithObject:EMOTICON_PACK_DRAG_TYPE] owner:self];
[pboard setString:@"dragPack" forType:EMOTICON_PACK_DRAG_TYPE];
@@ -366,9 +366,9 @@
//Move
NSMutableArray *movedPacks = [NSMutableArray array]; //Keep track of the packs we've moved
- for (NSNumber *dragRow in dragRows) {
- [movedPacks addObject:[[emoticonPackPreviewControllers objectAtIndex:[dragRow integerValue]] emoticonPack]];
- }
+ [dragRows enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
+ [movedPacks addObject:[[emoticonPackPreviewControllers objectAtIndex:idx] emoticonPack]];
+ }];
[adium.emoticonController moveEmoticonPacks:movedPacks toIndex:row];
[self configurePreviewControllers];
diff -r 0e51b391797e -r 3f1e5d253f08 Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m
--- a/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m Thu Apr 26 20:45:08 2012 -0400
+++ b/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m Fri Apr 27 01:13:46 2012 -0400
@@ -77,7 +77,7 @@
}
- (NSString *)paneIdentifier
{
- return @"Messages";
+ return @"Message View";
}
- (NSString *)paneName{
return AILocalizedString(@"Message View", "Title of the messages preferences");
diff -r 0e51b391797e -r 3f1e5d253f08 Source/ESStatusSort.m
--- a/Source/ESStatusSort.m Thu Apr 26 20:45:08 2012 -0400
+++ b/Source/ESStatusSort.m Fri Apr 27 01:13:46 2012 -0400
@@ -473,14 +473,14 @@
/*!
* @brief Table view write rows
*/
-- (BOOL)tableView:(NSTableView *)tableView writeRows:(NSArray *)rows toPasteboard:(NSPasteboard *)pboard
+- (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard
{
[pboard declareTypes:[NSArray arrayWithObject:STATUS_DRAG_TYPE] owner:self];
//Build a list of all the highlighted aways
NSString *dragItem = [self tableView:tableView
objectValueForTableColumn:nil
- row:[[rows objectAtIndex:0] integerValue]];
+ row:[rowIndexes firstIndex]];
//put it on the pasteboard
[pboard setString:dragItem forType:STATUS_DRAG_TYPE];
More information about the commits
mailing list