colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-30 23:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

TableView Example: fix row selection after drop

Browse Source 
make editable textfield bordered

Finished CPOutlineView view-based. With example
This commit is contained in:
cacaodev
2012-04-13 09:19:36 +02:00
parent b11294d9cf
commit a41ff7f2d0
14 changed files with 1482 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPOutlineView.j
+37 -27
View File
@@ -33,20 +33,21 @@ CPOutlineViewItemWillExpandNotification = @"CPOutlineViewItemWillExpandN
CPOutlineViewSelectionDidChangeNotification = @"CPOutlineViewSelectionDidChangeNotification";
CPOutlineViewSelectionIsChangingNotification = @"CPOutlineViewSelectionIsChangingNotification";
var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_ = 1 << 1,
CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_ = 1 << 2,
var CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_ = 1 << 1,
CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_ = 1 << 2,
CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_ = 1 << 3,
CPOutlineViewDataSource_outlineView_acceptDrop_item_childIndex_ = 1 << 3,
CPOutlineViewDataSource_outlineView_validateDrop_proposedItem_proposedChildIndex_ = 1 << 4,
CPOutlineViewDataSource_outlineView_validateDrop_proposedRow_proposedDropOperation_ = 1 << 5,
CPOutlineViewDataSource_outlineView_namesOfPromisedFilesDroppedAtDestination_forDraggedItems_ = 1 << 6,
CPOutlineViewDataSource_outlineView_acceptDrop_item_childIndex_ = 1 << 4,
CPOutlineViewDataSource_outlineView_validateDrop_proposedItem_proposedChildIndex_ = 1 << 5,
CPOutlineViewDataSource_outlineView_validateDrop_proposedRow_proposedDropOperation_ = 1 << 6,
CPOutlineViewDataSource_outlineView_namesOfPromisedFilesDroppedAtDestination_forDraggedItems_ = 1 << 7,
CPOutlineViewDataSource_outlineView_itemForPersistentObject_ = 1 << 7,
CPOutlineViewDataSource_outlineView_persistentObjectForItem_ = 1 << 8,
CPOutlineViewDataSource_outlineView_itemForPersistentObject_ = 1 << 8,
CPOutlineViewDataSource_outlineView_persistentObjectForItem_ = 1 << 9,
CPOutlineViewDataSource_outlineView_writeItems_toPasteboard_ = 1 << 9,
CPOutlineViewDataSource_outlineView_writeItems_toPasteboard_ = 1 << 10,
CPOutlineViewDataSource_outlineView_sortDescriptorsDidChange_ = 1 << 10;
CPOutlineViewDataSource_outlineView_sortDescriptorsDidChange_ = 1 << 11;
var CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_ = 1 << 1,
CPOutlineViewDelegate_outlineView_didClickTableColumn_ = 1 << 2,
@@ -227,13 +228,16 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff = 0,
if (![aDataSource respondsToSelector:@selector(outlineView:numberOfChildrenOfItem:)])
[CPException raise:CPInternalInconsistencyException reason:"Data source must implement 'outlineView:numberOfChildrenOfItem:'"];
/*
if (![aDataSource respondsToSelector:@selector(outlineView:objectValueForTableColumn:byItem:)])
[CPException raise:CPInternalInconsistencyException reason:"Data source must implement 'outlineView:objectValueForTableColumn:byItem:'"];
*/
_outlineViewDataSource = aDataSource;
_implementedOutlineViewDataSourceMethods = 0;
if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:objectValue:forTableColumn:byItem:)])
_implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_;
if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:setObjectValue:forTableColumn:byItem:)])
_implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_;
@@ -1531,6 +1535,16 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff = 0,
[super keyDown:anEvent];
}
- (BOOL)_dataSourceRespondsToObjectValueForTableColumn
{
return _implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_;
}
- (BOOL)_delegateRespondsToDataViewForTableColumn
{
return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_;
}
@end
// FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever...
@@ -1807,21 +1821,6 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
}
}
- (CPView)_dataViewForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
{
var view = nil;
if (_implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_)
{
view = [_delegate outlineView:_outlineView
dataViewForTableColumn:aTableColumn
item:[self itemAtRow:theRow]];
if (view == nil)
[CPException raise:CPInternalInconsistencyException reason:"The view returned by -outlineView:dataViewForTableColumn:item: should not be nil"];
}
return view;
}
@end
@implementation _CPOutlineViewTableViewDelegate : CPObject
@@ -1893,6 +1892,17 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
return nil;
}
- (CPView)tableView:(CPTableView)aTableView dataViewForTableColumn:(CPTableColumn)aTableColumn row:(int)aRow
{
if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_))
{
var item = [_outlineView itemAtRow:aRow];
return [_outlineView._outlineViewDelegate outlineView:_outlineView dataViewForTableColumn:aTableColumn item:item]
}
return nil;
}
@end
@implementation CPDisclosureButton : CPButton
AppKit/CPTableView.j
+16 -6
View File
@@ -3130,6 +3130,16 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
return _sortDescriptors;
}
- (BOOL)_dataSourceRespondsToObjectValueForTableColumn
{
return _implementedDataSourceMethods & CPTableViewDataSource_tableView_objectValueForTableColumn_row_;
}
- (BOOL)_delegateRespondsToDataViewForTableColumn
{
return _implementedDelegateMethods & CPTableViewDelegate_tableView_dataViewForTableColumn_row_;
}
/*!
@ignore
*/
@@ -3149,12 +3159,12 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
// tableView:objectValueForTableColumn:row: is optional if content bindings are in place.
if (objectValue === undefined)
{
if (_implementedDataSourceMethods & CPTableViewDataSource_tableView_objectValueForTableColumn_row_)
if ([self _dataSourceRespondsToObjectValueForTableColumn])
{
objectValue = [_dataSource tableView:self objectValueForTableColumn:aTableColumn row:aRowIndex];
tableColumnObjectValues[aRowIndex] = objectValue;
}
else if (!(_implementedDataSourceMethods & CPTableViewDelegate_tableView_dataViewForTableColumn_row_) && ![self infoForBinding:@"content"])
else if (![self _delegateRespondsToDataViewForTableColumn] && ![self infoForBinding:@"content"])
{
CPLogConsole(@"no content binding established and data source " + [_dataSource description] + " does not implement tableView:objectValueForTableColumn:row: or tableView:dataViewForTableColumn:row:");
}
@@ -3538,7 +3548,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
- (CPView)_dataViewForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
{
var view = nil;
if (_implementedDelegateMethods & CPTableViewDelegate_tableView_dataViewForTableColumn_row_)
if ([self _delegateRespondsToDataViewForTableColumn])
{
view = [_delegate tableView:self dataViewForTableColumn:aTableColumn row:aRow];
if (view == nil)
@@ -3614,14 +3624,14 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
if (!cib)
return nil;
var objects = [];
var load = [cib instantiateCibWithOwner:anOwner topLevelObjects:objects];
var objects = [],
load = [cib instantiateCibWithOwner:anOwner topLevelObjects:objects];
if (!load)
return nil;
var count = objects.length;
while(count--)
while (count--)
{
var o = objects[count];
if ([o isKindOfClass:[CPView class]])
Tests/Manual/CPOutlineViewViewBasedCibTest/AppController.j
+58
View File
@@ -0,0 +1,58 @@
/*
* AppController.j
* CPOutlineViewViewBasedCibTest
*
* Created by You on April 11, 2012.
* Copyright 2012, Your Company All rights reserved.
*/
@import <Foundation/CPObject.j>
@implementation AppController : CPObject
{
@outlet CPWindow theWindow;
@outlet CPOutlineView outlineView;
}
- (void)awakeFromCib
{
[theWindow setFullPlatformWindow:YES];
}
- (int)outlineView:(id)oview numberOfChildrenOfItem:(id)item
{
return 3;
}
- (id)outlineView:(id)oview child:(int)childnum ofItem:(id)item
{
return [CPObject new];
}
- (BOOL)outlineView:(id)oview isItemExpandable:(id)item
{
return YES;
}
-(id)outlineView:(id)oview dataViewForTableColumn:(id)tableColumn item:(id)item
{
var identifier = [tableColumn identifier];
if (identifier == @"first" && [oview parentForItem:item] == nil)
identifier = @"firstRoot";
var view = [oview makeViewWithIdentifier:identifier owner:self];
[[view textField] setStringValue:@"Item <" + [item UID] + ">"];
return view;
}
- (IBAction)expand:(id)sender
{
var row = [outlineView rowForView:sender],
item = [outlineView itemAtRow:row];
[outlineView expandItem:item];
}
@end
Tests/Manual/CPOutlineViewViewBasedCibTest/Info.plist
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Main cib file base name</key>
<string>MainMenu.cib</string>
<key>CPBundleName</key>
<string>CPOutlineViewViewBasedCibTest</string>
</dict>
</plist>
Tests/Manual/CPOutlineViewViewBasedCibTest/Jakefile
+94
View File
@@ -0,0 +1,94 @@
/*
* Jakefile
* CPOutlineViewViewBasedCibTest
*
* Created by You on April 11, 2012.
* Copyright 2012, Your Company All rights reserved.
*/
var ENV = require("system").env,
FILE = require("file"),
JAKE = require("jake"),
task = JAKE.task,
FileList = JAKE.FileList,
app = require("cappuccino/jake").app,
configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
OS = require("os");
app ("CPOutlineViewViewBasedCibTest", function(task)
{
task.setBuildIntermediatesPath(FILE.join("Build", "CPOutlineViewViewBasedCibTest.build", configuration));
task.setBuildPath(FILE.join("Build", configuration));
task.setProductName("CPOutlineViewViewBasedCibTest");
task.setIdentifier("com.yourcompany.CPOutlineViewViewBasedCibTest");
task.setVersion("1.0");
task.setAuthor("Your Company");
task.setEmail("feedback @nospam@ yourcompany.com");
task.setSummary("CPOutlineViewViewBasedCibTest");
task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
task.setResources(new FileList("Resources/**"));
task.setIndexFilePath("index.html");
task.setInfoPlistPath("Info.plist");
task.setNib2CibFlags("-R Resources/");
if (configuration === "Debug")
task.setCompilerFlags("-DDEBUG -g");
else
task.setCompilerFlags("-O");
});
task ("default", ["CPOutlineViewViewBasedCibTest"], function()
{
printResults(configuration);
});
task ("build", ["default"]);
task ("debug", function()
{
ENV["CONFIGURATION"] = "Debug";
JAKE.subjake(["."], "build", ENV);
});
task ("release", function()
{
ENV["CONFIGURATION"] = "Release";
JAKE.subjake(["."], "build", ENV);
});
task ("run", ["debug"], function()
{
OS.system(["open", FILE.join("Build", "Debug", "CPOutlineViewViewBasedCibTest", "index.html")]);
});
task ("run-release", ["release"], function()
{
OS.system(["open", FILE.join("Build", "Release", "CPOutlineViewViewBasedCibTest", "index.html")]);
});
task ("deploy", ["release"], function()
{
FILE.mkdirs(FILE.join("Build", "Deployment", "CPOutlineViewViewBasedCibTest"));
OS.system(["press", "-f", FILE.join("Build", "Release", "CPOutlineViewViewBasedCibTest"), FILE.join("Build", "Deployment", "CPOutlineViewViewBasedCibTest")]);
printResults("Deployment")
});
task ("desktop", ["release"], function()
{
FILE.mkdirs(FILE.join("Build", "Desktop", "CPOutlineViewViewBasedCibTest"));
require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "CPOutlineViewViewBasedCibTest"), FILE.join("Build", "Desktop", "CPOutlineViewViewBasedCibTest", "CPOutlineViewViewBasedCibTest.app"));
printResults("Desktop")
});
task ("run-desktop", ["desktop"], function()
{
OS.system([FILE.join("Build", "Desktop", "CPOutlineViewViewBasedCibTest", "CPOutlineViewViewBasedCibTest.app", "Contents", "MacOS", "NativeHost"), "-i"]);
});
function printResults(configuration)
{
print("----------------------------");
print(configuration+" app built at path: "+FILE.join("Build", configuration, "CPOutlineViewViewBasedCibTest"));
print("----------------------------");
}
Tests/Manual/CPOutlineViewViewBasedCibTest/Resources/MainMenu.cib
+1
View File
File diff suppressed because one or more lines are too long
Tests/Manual/CPOutlineViewViewBasedCibTest/Resources/MainMenu.xib
+1028
View File
File diff suppressed because it is too large Load Diff
Tests/Manual/CPOutlineViewViewBasedCibTest/Resources/spinner.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

Tests/Manual/CPOutlineViewViewBasedCibTest/index-debug.html
+107
View File
@@ -0,0 +1,107 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<!--
index-debug.html
CPOutlineViewViewBasedCibTest
Created by You on April 11, 2012.
Copyright 2012, Your Company All rights reserved.
-->
<head>
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="apple-touch-icon" href="Resources/icon.png" />
<link rel="apple-touch-startup-image" href="Resources/default.png" />
<title>CPOutlineViewViewBasedCibTest</title>
<script type="text/javascript">
OBJJ_MAIN_FILE = "main.j";
OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
</script>
<script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
<script type="text/javascript">
objj_msgSend_reset();
// DEBUG OPTIONS:
// Uncomment to enable printing of backtraces on exceptions:
//objj_msgSend_decorate(objj_backtrace_decorator);
// Uncomment to supress exceptions that take place inside a message
//objj_msgSend_decorate(objj_supress_exceptions_decorator)
// Uncomment to enable runtime type checking:
//objj_msgSend_decorate(objj_typecheck_decorator);
// Uncomment (along with both above) to print backtraces on type check errors:
//objj_typecheck_prints_backtrace = true;
// Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
//CPLogUnregister(CPLogDefault);
// Uncomment to enable a specific logger:
//CPLogRegister(CPLogConsole);
//CPLogRegister(CPLogPopup);
// Tag view DOM elements with a "data-cappuccino-view" attribute that contains
// the class name of the view that created them. Comment this or set to false to disable.
appkit_tag_dom_elements = true;
</script>
<style type="text/css">
body{margin:0; padding:0;}
#container {position: absolute; top:50%; left:50%;}
#content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
#content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
#loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
</style>
<!--[if lt IE 7]>
<STYLE type="text/css">
#container { position: relative; top: 50%; }
#content { position: relative;}
</STYLE>
<![endif]-->
</head>
<body style="">
<div id="cappuccino-body">
<div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
<script type="text/javascript">
document.write("<div id='container'><p id='content'>" +
"<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
"Loading CPOutlineViewViewBasedCibTest...</p></div>");
</script>
<noscript>
<div id="container">
<div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
<p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
<p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
<p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
<ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
<li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
<li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
<li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
<li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
<li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
</ul>
</div>
</div>
</noscript>
</div>
</div>
</body>
</html>
Tests/Manual/CPOutlineViewViewBasedCibTest/index.html
+77
View File
@@ -0,0 +1,77 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<!--
index.html
CPOutlineViewViewBasedCibTest
Created by You on April 11, 2012.
Copyright 2012, Your Company All rights reserved.
-->
<head>
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="apple-touch-icon" href="Resources/icon.png" />
<link rel="apple-touch-startup-image" href="Resources/default.png" />
<title>CPOutlineViewViewBasedCibTest</title>
<script type="text/javascript">
OBJJ_MAIN_FILE = "main.j";
</script>
<script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
<style type="text/css">
body{margin:0; padding:0;}
#container {position: absolute; top:50%; left:50%;}
#content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
#content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
#loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
</style>
<!--[if lt IE 7]>
<STYLE type="text/css">
#container { position: relative; top: 50%; }
#content { position: relative;}
</STYLE>
<![endif]-->
</head>
<body style="">
<div id="cappuccino-body">
<div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
<script type="text/javascript">
document.write("<div id='container'><p id='content'>" +
"<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
"Loading CPOutlineViewViewBasedCibTest...</p></div>");
</script>
<noscript>
<div id="container">
<div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
<p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
<p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
<p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
<ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
<li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
<li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
<li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
<li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
<li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
</ul>
</div>
</div>
</noscript>
</div>
</div>
</body>
</html>
Tests/Manual/CPOutlineViewViewBasedCibTest/main.j
+18
View File
@@ -0,0 +1,18 @@
/*
* AppController.j
* CPOutlineViewViewBasedCibTest
*
* Created by You on April 11, 2012.
* Copyright 2012, Your Company All rights reserved.
*/
@import <Foundation/Foundation.j>
@import <AppKit/AppKit.j>
@import "AppController.j"
function main(args, namedArgs)
{
CPApplicationMain(args, namedArgs);
}
Tests/Manual/TableTest/CPTableViewLionCibTest/AppController.j
+10 -5
View File
@@ -18,6 +18,7 @@ var TABLE_DRAG_TYPE = @"TABLE_DRAG_TYPE",
CPWindow theWindow; //this "outlet" is connected automatically by the Cib
@outlet CPTableView tableView;
@outlet CPTextField textField;
@outlet CPArrayController contentController;
CPArray content @accessors;
}
@@ -93,12 +94,16 @@ var TABLE_DRAG_TYPE = @"TABLE_DRAG_TYPE",
- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id)info row:(int)row dropOperation:(CPTableViewDropOperation)operation
{
var pboard = [info draggingPasteboard],
sourceIndexes = [pboard dataForType:TABLE_DRAG_TYPE];
[content moveIndexes:sourceIndexes toIndex:row];
[aTableView reloadData];
sourceIndexes = [pboard dataForType:TABLE_DRAG_TYPE],
firstObject = [content objectAtIndex:[sourceIndexes firstIndex]];
var selectIndexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(row , 1)];
[content moveIndexes:sourceIndexes toIndex:row];
[contentController rearrangeObjects];
// Select the rows we just moved.
var destinationRange = CPMakeRange([content indexOfObject:firstObject], [sourceIndexes count]);
var selectIndexes = [CPIndexSet indexSetWithIndexesInRange:destinationRange];
[aTableView selectRowIndexes:selectIndexes byExtendingSelection:NO];
return YES;
Tests/Manual/TableTest/CPTableViewLionCibTest/Resources/MainMenu.cib
+1 -1
View File
File diff suppressed because one or more lines are too long
Tests/Manual/TableTest/CPTableViewLionCibTest/Resources/MainMenu.xib
+25 -6
View File
@@ -430,6 +430,14 @@
</object>
<int key="connectionID">606</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">contentController</string>
<reference key="source" ref="635946545"/>
<reference key="destination" ref="911121263"/>
</object>
<int key="connectionID">607</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
@@ -734,15 +742,15 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="63016519">
<reference key="NSNextResponder" ref="628715400"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{13, 23}, {457, 56}}</string>
<int key="NSvFlags">258</int>
<string key="NSFrame">{{12, 21}, {457, 36}}</string>
<reference key="NSSuperview" ref="628715400"/>
<reference key="NSNextKeyView" ref="68315013"/>
<string key="NSReuseIdentifierKey">_NS:20</string>
<string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="469161236">
<int key="NSCellFlags">337641473</int>
<int key="NSCellFlags">341835777</int>
<int key="NSCellFlags2">272629760</int>
<string key="NSContents">Table View Cell</string>
<object class="NSFont" key="NSSupport">
@@ -752,12 +760,16 @@
</object>
<string key="NSCellIdentifier">_NS:20</string>
<reference key="NSControlView" ref="63016519"/>
<reference key="NSBackgroundColor" ref="614187381"/>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC45NTQ3MDAxMDA4AA</bytes>
</object>
<reference key="NSTextColor" ref="537790828"/>
</object>
</object>
</object>
<string key="NSFrame">{{238, 1}, {482, 89}}</string>
<string key="NSFrame">{{238, 1}, {482, 78}}</string>
<reference key="NSNextKeyView" ref="63016519"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
</object>
@@ -1384,7 +1396,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">606</int>
<int key="maxID">607</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1428,11 +1440,13 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>contentController</string>
<string>tableView</string>
<string>textField</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSArrayController</string>
<string>NSTableView</string>
<string>NSTextField</string>
</object>
@@ -1441,11 +1455,16 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>contentController</string>
<string>tableView</string>
<string>textField</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">contentController</string>
<string key="candidateClassName">NSArrayController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">tableView</string>
<string key="candidateClassName">NSTableView</string>