From accd29804cbd01249d146eec01e3eb560a42b099 Mon Sep 17 00:00:00 2001 From: Klaas Pieter Annema Date: Wed, 13 Oct 2010 14:49:41 +0200 Subject: [PATCH] implement table column order and width autosaving --- AppKit/CPTableView.j | 117 ++++++++++++++++-- Tests/Manual/CPUserDefaults/AppController.j | 49 ++++++++ Tests/Manual/CPUserDefaults/Info.plist | 12 ++ Tests/Manual/CPUserDefaults/Jakefile | 93 ++++++++++++++ .../CPUserDefaults/Resources/spinner.gif | Bin 0 -> 1849 bytes Tests/Manual/CPUserDefaults/index-debug.html | 104 ++++++++++++++++ Tests/Manual/CPUserDefaults/index.html | 79 ++++++++++++ Tests/Manual/CPUserDefaults/main.j | 18 +++ 8 files changed, 460 insertions(+), 12 deletions(-) create mode 100644 Tests/Manual/CPUserDefaults/AppController.j create mode 100644 Tests/Manual/CPUserDefaults/Info.plist create mode 100644 Tests/Manual/CPUserDefaults/Jakefile create mode 100644 Tests/Manual/CPUserDefaults/Resources/spinner.gif create mode 100644 Tests/Manual/CPUserDefaults/index-debug.html create mode 100644 Tests/Manual/CPUserDefaults/index.html create mode 100644 Tests/Manual/CPUserDefaults/main.j diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j index e4b343aaf..2d422eb71 100644 --- a/AppKit/CPTableView.j +++ b/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 diff --git a/Tests/Manual/CPUserDefaults/AppController.j b/Tests/Manual/CPUserDefaults/AppController.j new file mode 100644 index 000000000..6d3c67e77 --- /dev/null +++ b/Tests/Manual/CPUserDefaults/AppController.j @@ -0,0 +1,49 @@ + +@import + + +@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 diff --git a/Tests/Manual/CPUserDefaults/Info.plist b/Tests/Manual/CPUserDefaults/Info.plist new file mode 100644 index 000000000..1378ea966 --- /dev/null +++ b/Tests/Manual/CPUserDefaults/Info.plist @@ -0,0 +1,12 @@ + + + + + CPApplicationDelegateClass + AppController + CPBundleName + CPUserDefaults + CPPrincipalClass + CPApplication + + diff --git a/Tests/Manual/CPUserDefaults/Jakefile b/Tests/Manual/CPUserDefaults/Jakefile new file mode 100644 index 000000000..8d336e3ff --- /dev/null +++ b/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("----------------------------"); +} diff --git a/Tests/Manual/CPUserDefaults/Resources/spinner.gif b/Tests/Manual/CPUserDefaults/Resources/spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..06dbc2bc21dddcf0e09b566d5b211aee89570f52 GIT binary patch literal 1849 zcma*odr(tX9tZHtz31lM+(&Y`A`Ou`NeG&R#DrIfV%?hng21vs6v>ooRQQFbk7E_K!V( z{?5!fpZWgIZ%*d6t%i*j24bL}AZUJm9)h6R*;%L4IWse3G#VWaN1#$zSSXcBhlYlH zJ|D}n{r&w2f+Qp)SS*&n?*G4}{}!h?td_mjU6Kad-rW*QwWYCUk7d^e+sjpZAn6kT z5rM;`{~_}-wm+L@%+E;JphLm}C3WzQAQD0wBoY|rOTQX{(@pp-WAA8Iw0HKl|15j) zhGh(SFWu#5zUCw^T!}C~eC}~?{xG-r7ugQC>taC+|L^xr&a%{#cgUOZXIM&v?)k^2 z1i5%0!U00wq)r4vlAwXBA_m5J5WNeuBm-XJQ5pG4GD%vc|K){+TJ{AkHqN@SJKczX zU}QRd9n*_bf^h94)6Ctv{CUfz_;qs#RDuQ$DR%y1&5G-a6rhf*4Y zl+UOD1*GE{GQ7vv;c-tTIMkz0ovO>9j%b5hpa@a*CBJ#W!0@ndSwF|%hMkdFtXiU) z`BEp+yhkt8ZY>tg&uyH@%^%K4jDrbA;et&vnnzZ3z22@e6<27z2Vk13kb7OtISyxv z(XoO-LNQCZe3lfzc%*pNqU<9T+p~teThOEB+~e&U0mC|zS{Q)dJZ)!^1f7L(zg*L> z*vSW%?dR~@@0(}x6-V^A`~ImD;)NaBUnP8;RH=bS2@pk`wp>>8r&jGjmGPy%1BW}v zoPo}ca$~bze@efc3kapuEVW1!%teOZT3j2Tw5=hjiAf02d}7dL0oFC%@=RXp5Ow#% z@a>+AM|YWt$n&e`>sB-32gBcuTi>R>*|8@lp`y6thc7ydyqDsuUn~YzZf|{-R@-3y zL#wx{Ii}xxL_csiW*LBn0-A$>zp4WOmkf6=ilrjlW?-l9+bCd7|i?*b5NTmy<<6NZ0T8$SN@mwdC2f z6jqK=N@bS@!=YSj%>h0}*4p+%0HbTIrE$w7UMT6+AZZ&DAo*qZAAi(OtNbIfl#Dw^ zJWeiCp~zi#&t6x}m9)O^eR4HiLV3QA<<0>HZ8%$^lrSE94Wb}=+MM^!b>n#5&-JQR zkr-CEu9C;_F*7DqDisulV6Pmg$nFL0TPn%~*m^-`Z3^BgU(sNpnx%nW(!eV9A&FvI zHL3X3lw8Wji^6=8KbQDE-e%b?svdFxxdh$8r97@7$ojeI`6AL8Ob6QC$qh&>ZWVDX1F{0vJnT%%mE;GveKWR%C} zM&4d;Jf3s9|HAA)yVUPo`Aq;0do#)uHSXi5*QF*)x@MVVHr+cN)uMZ__F|&Ta#p8d z53TOKtce!PJUuie8UWol-S(`c2nH?UGqJP{!4RR4u$LCfn)q-hj0^f=h(VYy)T6eN zhRO!ja-aDBTcgeyP(8Ua4IdiOog^*CQa?R(cP#9AgL9`j>EX-6Yf1lzX(!~``M1XC zNmM<4<6d~wWZ$Xrk0K}UteTrq@LBBk#MsjkK;pbuVhe)NI7(7Pf(l?lxC7=1Z7Pzl zMbS;nV4NI5_N{1$P)&XC)huOGQ+h^zpYUZfb*1n6>!`#*b3y52LGmi+<4sY5jyD#- zw&$d}DTguLAfnRtjrM*JfqtHqUu6rQoU=g%1E9xk%;)TDm^2<8n-0IhTsQFaek)MY}>PK4;nBk=ow4pF>vzkO& gna%Org-kgQCf=+BeMi^RbuY;YE~rTjend;_cdi8t>i_@% literal 0 HcmV?d00001 diff --git a/Tests/Manual/CPUserDefaults/index-debug.html b/Tests/Manual/CPUserDefaults/index-debug.html new file mode 100644 index 000000000..696b51c4b --- /dev/null +++ b/Tests/Manual/CPUserDefaults/index-debug.html @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + CPUserDefaults + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + diff --git a/Tests/Manual/CPUserDefaults/index.html b/Tests/Manual/CPUserDefaults/index.html new file mode 100644 index 000000000..52e03d3a7 --- /dev/null +++ b/Tests/Manual/CPUserDefaults/index.html @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + CPUserDefaults + + + + + + + + + + + + +
+
+ + + +
+
+ + + + diff --git a/Tests/Manual/CPUserDefaults/main.j b/Tests/Manual/CPUserDefaults/main.j new file mode 100644 index 000000000..de8321048 --- /dev/null +++ b/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 +@import + +@import "AppController.j" + + +function main(args, namedArgs) +{ + CPApplicationMain(args, namedArgs); +}