implement table column order and width autosaving

AppKit/CPTableView.j

@@ -97,7 +97,6 @@ CPTableViewReverseSequentialColumnAutoresizingStyle = 3;
 CPTableViewLastColumnOnlyAutoresizingStyle = 4;
 CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 
-
 #define NUMBER_OF_COLUMNS() (_tableColumns.length)
 #define UPDATE_COLUMN_RANGES_IF_NECESSARY() if (_dirtyTableColumnRangeIndex !== CPNotFound) [self _recalculateTableColumnRanges];
 
@@ -181,6 +180,9 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     unsigned    _numberOfRows;
     CPIndexSet  _groupRows;
 
+    // Persistence
+    CPString                _autosaveName;
+    BOOL                    _autosaveTableColumns;
 
     CPTableHeaderView _headerView;
     _CPCornerView     _cornerView;
@@ -768,12 +770,11 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     [self reloadDataForRowIndexes:_exposedRows columnIndexes:[CPIndexSet indexSetWithIndex:[_tableColumns indexOfObject:aColumn]]];
 }
 
-/*!
-    Moves the column and heading at a given index to a new given index.
-    @param columnIndex The current index of the column to move.
-    @param newIndex The new index for the moved column.
+/*
+    @ignore
+    Same as moveColumn:toColumn: but doesn't trigger an autosave
 */
-- (void)moveColumn:(unsigned)fromIndex toColumn:(unsigned)toIndex
+- (void)_moveColumn:(unsigned)fromIndex toColumn:(unsigned)toIndex
 {
     fromIndex = +fromIndex;
     toIndex = +toIndex;
@@ -800,6 +801,17 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     [self reloadDataForRowIndexes:rowIndexes columnIndexes:columnIndexes];
 }
 
+/*!
+    Moves the column and heading at a given index to a new given index.
+    @param theColumnIndex The current index of the column to move.
+    @param theToIndex The new index for the moved column.
+*/
+- (void)moveColumn:(int)theColumnIndex toColumn:(int)theToIndex
+{
+    [self _moveColumn:theColumnIndex toColumn:theToIndex];
+    [self _autosave];
+}
+
 /*!
     @ignore
 */
@@ -1689,13 +1701,94 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     /*FIX ME: tableview header isn't rendered until you click the horizontal scroller (or scroll)*/
 }
 
-//Persistence
-/*
-    * - autosaveName
-    * - autosaveTableColumns
-    * - setAutosaveName:
-    * - setAutosaveTableColumns:
+- (void)setAutosaveName:(CPString)theAutosaveName
+{
+    if (_autosaveName === theAutosaveName)
+        return;
+
+    _autosaveName = theAutosaveName;
+
+    [self setAutosaveTableColumns:!!theAutosaveName];
+    [self _restoreFromAutosave];
+}
+
+- (CPString)autosaveName
+{
+    return _autosaveName;
+}
+
+- (void)setAutosaveTableColumns:(BOOL)shouldAutosave
+{
+    _autosaveTableColumns = shouldAutosave;
+}
+
+- (BOOL)autosaveTableColumns
+{
+    return _autosaveTableColumns;
+}
+
+- (CPString)_columnsKeyForAutosaveName:(CPString)theAutosaveName
+{
+    return @"CPTableView Columns " + theAutosaveName;
+}
+
+- (BOOL)_autosaveEnabled
+{
+    return [self autosaveName] && [self autosaveTableColumns];
+}
+
+/*!
+    @ignore
+    Stores the tablecolumn setup in user defaults.
+    I believe Apple stores the entire encoded table column,
+    in our case that seems overkill since we need to store everything in a cookie.
 */
+- (void)_autosave
+{
+    if (![self _autosaveEnabled])
+        return;
+
+    var userDefaults = [CPUserDefaults standardUserDefaults],
+        autosaveName = [self autosaveName];
+
+    var columns = [self tableColumns],
+        columnsSetup = [];
+
+    for (var i = 0; i < [columns count]; i++)
+    {
+        var column = [columns objectAtIndex:i];
+
+        var metaData = [CPDictionary dictionaryWithJSObject:{
+            @"identifier": [column identifier],
+            @"width": [column width]
+        }]
+
+        [columnsSetup addObject:metaData];
+    }
+
+    [userDefaults setObject:columnsSetup forKey:[self _columnsKeyForAutosaveName:autosaveName]];
+}
+
+- (void)_restoreFromAutosave
+{
+    if (![self _autosaveEnabled])
+        return;
+
+    var userDefaults = [CPUserDefaults standardUserDefaults],
+        autosaveName = [self autosaveName],
+        tableColumns = [userDefaults objectForKey:[self _columnsKeyForAutosaveName:autosaveName]];
+
+    for (var i = 0; i < [tableColumns count]; i++)
+    {
+        var metaData = [tableColumns objectAtIndex:i],
+            columnIdentifier = [metaData objectForKey:@"identifier"],
+            column = [self columnWithIdentifier:columnIdentifier],
+            tableColumn = [self tableColumnWithIdentifier:columnIdentifier];
+
+        [self _moveColumn:column toColumn:i];
+        [tableColumn setWidth:[metaData objectForKey:@"width"]];
+    }
+}
 
 //Setting the Delegate:(id)aDelegate
 

Tests/Manual/CPUserDefaults/AppController.j

@@ -0,0 +1,49 @@
+
+@import <AppKit/CPTableView.j>
+
+
+@implementation AppController : CPObject
+{
+}
+
+- (void)applicationDidFinishLaunching:(CPNotification)aNotification
+{
+    var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(50.0, 100.0, 400.0, 300.0) styleMask:CPTitledWindowMask],
+        contentView = [theWindow contentView];
+
+    var scrollView = [[CPScrollView alloc] initWithFrame:CGRectMake(0.0, 0.0, 400.0, 300.0)],
+        tableView = [[CPTableView alloc] initWithFrame:CGRectMake(0.0, 0.0, 400.0, 300.0)];
+
+    [scrollView setDocumentView:tableView];
+    [scrollView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
+    var tableColumn1 = [[CPTableColumn alloc] initWithIdentifier:@"column1"];
+    [[tableColumn1 headerView] setStringValue:@"Column 1"];
+    [tableView addTableColumn:tableColumn1];
+
+    var tableColumn2 = [[CPTableColumn alloc] initWithIdentifier:@"column2"];
+    [[tableColumn2 headerView] setStringValue:@"Column 2"];
+    [tableView addTableColumn:tableColumn2];
+
+    var tableColumn3 = [[CPTableColumn alloc] initWithIdentifier:@"column3"];
+    [[tableColumn3 headerView] setStringValue:@"Column 3"];
+    [tableView addTableColumn:tableColumn3];
+
+    var tableColumn4 = [[CPTableColumn alloc] initWithIdentifier:@"column4"];
+    [[tableColumn4 headerView] setStringValue:@"Column 4"];
+    [tableView addTableColumn:tableColumn4];
+
+    var tableColumn5 = [[CPTableColumn alloc] initWithIdentifier:@"column5"];
+    [[tableColumn5 headerView] setStringValue:@"Column 5"];
+    [tableView addTableColumn:tableColumn5];
+
+    [scrollView setBackgroundColor:[CPColor blueColor]];
+    [contentView addSubview:scrollView];
+
+    [tableView setAutosaveTableColumns:YES];
+    [tableView setAutosaveName:@"myAutosaveName"];
+
+    [theWindow makeKeyAndOrderFront:self];
+}
+
+@end

Tests/Manual/CPUserDefaults/Info.plist

@@ -0,0 +1,12 @@
+<?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>CPApplicationDelegateClass</key>
+	<string>AppController</string>
+	<key>CPBundleName</key>
+	<string>CPUserDefaults</string>
+	<key>CPPrincipalClass</key>
+	<string>CPApplication</string>
+</dict>
+</plist>

Tests/Manual/CPUserDefaults/Jakefile

@@ -0,0 +1,93 @@
+/*
+ * Jakefile
+ * CPUserDefaults
+ *
+ * Created by You on October 13, 2010.
+ * Copyright 2010, 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 ("CPUserDefaults", function(task)
+{
+    task.setBuildIntermediatesPath(FILE.join("Build", "CPUserDefaults.build", configuration));
+    task.setBuildPath(FILE.join("Build", configuration));
+
+    task.setProductName("CPUserDefaults");
+    task.setIdentifier("com.yourcompany.CPUserDefaults");
+    task.setVersion("1.0");
+    task.setAuthor("Your Company");
+    task.setEmail("feedback @nospam@ yourcompany.com");
+    task.setSummary("CPUserDefaults");
+    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
+    task.setResources(new FileList("Resources/**"));
+    task.setIndexFilePath("index.html");
+    task.setInfoPlistPath("Info.plist");
+
+    if (configuration === "Debug")
+        task.setCompilerFlags("-DDEBUG -g");
+    else
+        task.setCompilerFlags("-O");
+});
+
+task ("default", ["CPUserDefaults"], 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", "CPUserDefaults", "index.html")]);
+});
+
+task ("run-release", ["release"], function()
+{
+    OS.system(["open", FILE.join("Build", "Release", "CPUserDefaults", "index.html")]);
+});
+
+task ("deploy", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Deployment", "CPUserDefaults"));
+    OS.system(["press", "-f", FILE.join("Build", "Release", "CPUserDefaults"), FILE.join("Build", "Deployment", "CPUserDefaults")]);
+    printResults("Deployment")
+});
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", "CPUserDefaults"));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "CPUserDefaults"), FILE.join("Build", "Desktop", "CPUserDefaults", "CPUserDefaults.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", "CPUserDefaults", "CPUserDefaults.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, "CPUserDefaults"));
+    print("----------------------------");
+}

Tests/Manual/CPUserDefaults/index-debug.html

@@ -0,0 +1,104 @@
+<!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
+ CPUserDefaults
+
+ Created by You on October 13, 2010.
+ Copyright 2010, Your Company All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="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>CPUserDefaults</title>
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
+        </script>
+        
+        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" 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);
+        </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 CPUserDefaults...</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/CPUserDefaults/index.html

@@ -0,0 +1,79 @@
+<!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
+ CPUserDefaults
+
+ Created by You on October 13, 2010.
+ Copyright 2010, Your Company All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+        <meta http-equiv="X-UA-Compatible" content="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>CPUserDefaults</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 CPUserDefaults...</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/CPUserDefaults/main.j

@@ -0,0 +1,18 @@
+/*
+ * AppController.j
+ * CPUserDefaults
+ *
+ * Created by You on October 13, 2010.
+ * Copyright 2010, Your Company All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@import "AppController.j"
+
+
+function main(args, namedArgs)
+{
+    CPApplicationMain(args, namedArgs);
+}