Merge branch 'master' of git@github.com:280north/cappuccino

.gitignore

@@ -1,3 +1,6 @@
 .DS_Store
 Frameworks
 Build
+Demos
+Aristo
+WebSite

AppKit/AppKit.j

@@ -50,6 +50,7 @@
 @import "CPImageView.j"
 @import "CPMenu.j"
 @import "CPMenuItem.j"
+@import "CPOpenPanel.j"
 @import "CPPanel.j"
 @import "CPPasteboard.j"
 @import "CPPopUpButton.j"

AppKit/CPApplication.j

@@ -476,6 +476,11 @@ CPRunContinuesResponse  = -1002;
     _mainMenu = aMenu;
 }
 
+- (void)orderFrontColorPanel:(id)aSender
+{
+    [[CPColorPanel sharedColorPanel] orderFront:self];
+}
+
 - (void)orderFrontStandardAboutPanel:(id)aSender
 {
     [self orderFrontStandardAboutPanelWithOptions:nil];
@@ -841,7 +846,7 @@ var _CPAppBootstrapperActions = nil;
 
     if (mainCibFile)
     {
-        [CPBundle loadCibFile:[mainBundle pathForResource:mainCibFile]
+        [mainBundle loadCibFile:mainCibFile
             externalNameTable:[CPDictionary dictionaryWithObject:CPApp forKey:CPCibOwner]
                  loadDelegate:self];
 

AppKit/CPButton.j

@@ -368,7 +368,7 @@ CPButtonStateMixed  = CPThemeState("mixed");
 
 - (void)setButtonType:(CPButtonType)aButtonType
 {
-    switch (buttonType)
+    switch (aButtonType)
     {
         case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeBackgroundCellMask];
                                         [self setShowsStateBy:CPNoCellMask];
@@ -390,7 +390,7 @@ CPButtonStateMixed  = CPThemeState("mixed");
                                         [self setShowsStateBy:CPChangeBackgroundCellMask];
                                         break;
 
-        case CPToggleButton:            [self setHighlightsBy:CPPushInCellMask | NSContentsCellMask];
+        case CPToggleButton:            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
                                         [self setShowsStateBy:CPContentsCellMask];
                                         break;
 

AppKit/CPColor.j

@@ -623,6 +623,15 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 @end
 
+@implementation CPColor (Debugging)
+
++ (CPColor)randomColor
+{
+    return [CPColor colorWithRed:RAND() green:RAND() blue:RAND() alpha:1.0];
+}
+
+@end
+
 var CPColorComponentsKey    = @"CPColorComponentsKey",
     CPColorPatternImageKey  = @"CPColorPatternImageKey";
 

AppKit/CPCompatibility.j

@@ -119,22 +119,19 @@ else if (USER_AGENT.indexOf("KHTML") != -1) // Must follow WebKit check.
 }
 
 // Gecko
-else if (USER_AGENT.indexOf("Gecko") != -1) // Must follow KHTML check.
+else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
 {
     PLATFORM_ENGINE = CPGeckoBrowserEngine;
 
     PLATFORM_FEATURES |= CPJavaScriptCanvasDrawFeature;
 
     var index = USER_AGENT.indexOf("Firefox"),
-        version = (index == -1) ? 2.0 : parseFloat(USER_AGENT.substring(index + "Firefox".length + 1));
+        version = (index === -1) ? 2.0 : parseFloat(USER_AGENT.substring(index + "Firefox".length + 1));
 
     if (version >= 3.0)
         PLATFORM_FEATURES |= CPCSSRGBAFeature;
 
-    var geckoIndex = USER_AGENT.indexOf("Gecko"),
-        geckoVersion = (geckoIndex === -1) ? 0.0 : parseFloat(USER_AGENT.substring(geckoIndex + "Gecko".length + 1, USER_AGENT.indexOf(' ', geckoIndex)));
-
-    if (version < 20061028)
+    if (version < 3.0)
         PLATFORM_FEATURES |= CPJavaScriptMouseWheelValues_8_15;
 }
 

AppKit/CPOpenPanel.j

@@ -0,0 +1,63 @@
+
+@import <AppKit/CPPanel.j>
+#include "Platform/Platform.h"
+
+var SharedOpenPanel = nil;
+
+@implementation CPOpenPanel : CPPanel
+{
+    CPArray _files;
+    BOOL    _canChooseFiles @accessors(property=canChooseFiles);
+    BOOL    _canChooseDirectories @accessors(property=canChooseDirectories);
+    BOOL    _allowsMultipleSelection @accessors(property=allowsMultipleSelection);
+}
+
++ (id)openPanel
+{
+    if (!SharedOpenPanel)
+        SharedOpenPanel = [[CPOpenPanel alloc] init];
+
+    return SharedOpenPanel;
+}
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        _files = [];
+        _canChooseFiles = YES;
+    }
+
+    return self;
+}
+
+- (void)filenames
+{
+    return _files;
+}
+
+- (unsigned)runModalForDirectory:(CPString)absoluteDirectoryPath file:(CPString)filename types:(CPArray)fileTypes
+{
+#if PLATFORM(DOM)
+    console.log("0 "+Titanium);
+    console.log("1 "+window.Titanium);
+    if (window.Titanium)
+    {
+        _files = Titanium.Desktop.openFiles({
+            path:absoluteDirectoryPath,
+            types:fileTypes,
+            multiple:_allowsMultipleSelection,
+            filename:filename,
+            directories:_canChooseDirectories,
+            files:_canChooseFiles
+        });
+    }
+#endif
+}
+
+- (unsigned)runModalForTypes:(CPArray)fileTypes 
+{alert("HERE");
+    [self runModalForDirectory:"/" file:nil types:fileTypes];
+}
+
+@end

AppKit/CPPopUpButton.j

@@ -502,7 +502,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 {
     if ([self title] === aTitle)
         return;
-    
+
     if ([self pullsDown])
     {
         var items = [_menu itemArray];

AppKit/CPTextField.j

@@ -717,7 +717,20 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }
 
 /*!
-    Adjusts the text field's size in the application.
+    Size to fit has two behavior, depending on if the receiver is an editable text field or not.
+    
+    For non-editable text fields (typically, a label), sizeToFit will change the frame of the 
+    receiver to perfectly fit the current text in stringValue in the current font, and respecting
+    the current theme values for content-inset, min-size, and max-size.
+    
+    For editable text fields, sizeToFit will ONLY change the HEIGHT of the text field. It will not 
+    change the width of the text field. You can use setFrameSize: with the current height to set the 
+    width, and you can get the size of a string with [CPString sizeWithFont:]. 
+    
+    The logic behind this decision is that most of the time you do not know what content will be placed
+    in an editable text field, so you want to just choose a fixed width and leave it at that size. 
+    However, since you don't know how tall it needs to be if you change the font, sizeToFit will still be
+    useful for making the textfield an appropriate height.
 */
 
 - (void)sizeToFit

AppKit/CPView.j

@@ -2107,6 +2107,9 @@ setBoundsOrigin:
     for (var attributeName in _themeAttributes)
         if (_themeAttributes.hasOwnProperty(attributeName))
             [_themeAttributes[attributeName] setParentAttribute:[theme _attributeWithName:attributeName forClass:themeClass]];
+
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
 }
 
 - (CPDictionary)_themeAttributeDictionary

AppKit/Platform/DOM/CPDOMWindowBridge.j

@@ -847,7 +847,7 @@ var CTRL_KEY_CODE   = 17;
         {
             var windows = [layers objectForKey:levels[levelCount]]._windows,
                 windowCount = windows.length;
-    
+
             while (windowCount--)
                 [windows[windowCount] resizeWithOldBridgeSize:oldSize];
         }

AppKit/Platform/DOM/CPDOMWindowLayer.j

@@ -115,7 +115,7 @@
         aWindow._isVisible = YES;
 
         if ([aWindow isFullBridge])
-            [aWindow setFrame:[aWindow._bridge contentBounds]];
+            [aWindow setFrame:[aWindow._bridge visibleFrame]];
     }
 }
 

AppKit/Themes/Aristo/Info.plist

@@ -5,7 +5,11 @@
 	<key>CPApplicationDelegateClass</key>
 	<string>BKShowcaseController</string>
 	<key>CPBundleName</key>
-	<string>A</string>
+	<string>Aristo</string>
+	<key>BKLearnMoreURL</key>
+	<string>http://cappuccino.org/aristo</string>
+	<key>BKLearnMoreButtonTitle</key>
+	<string>Aristo Home Page</string>
 	<key>CPPrincipalClass</key>
 	<string>CPApplication</string>
 </dict>