Merge branch 'master' of https://github.com/cappuccino/cappuccino int…

…o objj_compiler2_experiment
cappuccino · Jan 17, 2013 · ff20822 · ff20822
2 parents e78f211 + eff0621
commit ff20822
Show file tree

Hide file tree

Showing 912 changed files with 5,537 additions and 1,391 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ WebSite
 xcuserdata/
 !*.xcodeproj/project.pbxproj
 *.xCodeSupport/
+*.XcodeSupport/
diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j
@@ -53,6 +53,8 @@ CPInformationalAlertStyle   = 1;
 */
 CPCriticalAlertStyle        = 2;
 
+var bottomHeight = 71;
+
 /*!
     @ingroup appkit
 
@@ -164,7 +166,7 @@ CPCriticalAlertStyle        = 2;
         _alertStyle         = CPWarningAlertStyle;
         _showHelp           = NO;
         _needsLayout        = YES;
-        _defaultWindowStyle = CPTitledWindowMask;
+        _defaultWindowStyle = _CPModalWindowMask;
         _themeView          = [_CPAlertThemeView new];
 
         _messageLabel       = [CPTextField labelWithTitle:@"Alert"];
@@ -450,6 +452,9 @@ CPCriticalAlertStyle        = 2;
         defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
         panelSize = [[_window contentView] frame].size,
         buttonsOriginY,
+        buttonMarginY,
+        buttonMarginX,
+        theme = [self theme],
         offsetX;
 
     [aRepresentativeButton setTheme:[self theme]];
@@ -460,8 +465,25 @@ CPCriticalAlertStyle        = 2;
         panelSize.height = minimumSize.height;
 
     buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height + buttonOffset;
+
+    if ([_window styleMask] & _CPModalWindowMask)
+        buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height / 2 + buttonOffset;
+
     offsetX = panelSize.width - inset.right;
 
+    switch([_window styleMask])
+    {
+        case _CPModalWindowMask:
+            buttonMarginY = [_themeView currentValueForThemeAttribute:@"modal-window-button-margin-y"];
+            buttonMarginX = [_themeView currentValueForThemeAttribute:@"modal-window-button-margin-x"];
+            break;
+
+        default:
+            buttonMarginY = [_themeView currentValueForThemeAttribute:@"standard-window-button-margin-y"];
+            buttonMarginX = [_themeView currentValueForThemeAttribute:@"standard-window-button-margin-x"];
+            break;
+    }
+
     for (var i = [_buttons count] - 1; i >= 0 ; i--)
     {
         var button = _buttons[i];
@@ -473,7 +495,7 @@ CPCriticalAlertStyle        = 2;
             height = CGRectGetHeight(buttonFrame);
 
         offsetX -= width;
-        [button setFrame:CGRectMake(offsetX, buttonsOriginY, width, height)];
+        [button setFrame:CGRectMake(offsetX + buttonMarginX, buttonsOriginY + buttonMarginY, width, height)];
         offsetX -= 10;
     }
 
@@ -546,6 +568,12 @@ CPCriticalAlertStyle        = 2;
     [_window setFrameSize:finalSize];
     [_window center];
 
+    if ([_window styleMask] & _CPModalWindowMask || [_window styleMask] & CPHUDBackgroundWindowMask)
+    {
+        [_window setMovable:YES];
+        [_window setMovableByWindowBackground:YES];
+    }
+
     _needsLayout = NO;
 }
 
@@ -689,63 +717,50 @@ CPCriticalAlertStyle        = 2;
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[
-                CGSizeMake(400.0, 110.0),
-                CGInsetMake(15, 15, 15, 50), 6, 10,
-                CPJustifiedTextAlignment,
-                [CPColor blackColor],
-                [CPFont boldSystemFontOfSize:13.0],
-                [CPNull null], CGSizeMakeZero(),
-                CPJustifiedTextAlignment,
-                [CPColor blackColor],
-                [CPFont systemFontOfSize:12.0],
-                [CPNull null], CGSizeMakeZero(),
-                CGPointMake(15, 12),
-                [CPNull null],
-                [CPNull null],
-                [CPNull null],
-                [CPNull null],
-                [CPNull null],
-                [CPNull null],
-                0.0,
-                0.0,
-                3.0,
-                [CPColor blackColor],
-                [CPFont systemFontOfSize:12.0],
-                [CPNull null],
-                0.0
-            ]
-            forKeys:[
-                @"size",
-                @"content-inset",
-                @"informative-offset",
-                @"button-offset",
-                @"message-text-alignment",
-                @"message-text-color",
-                @"message-text-font",
-                @"message-text-shadow-color",
-                @"message-text-shadow-offset",
-                @"informative-text-alignment",
-                @"informative-text-color",
-                @"informative-text-font",
-                @"informative-text-shadow-color",
-                @"informative-text-shadow-offset",
-                @"image-offset",
-                @"information-image",
-                @"warning-image",
-                @"error-image",
-                @"help-image",
-                @"help-image-left-offset",
-                @"help-image-pressed",
-                @"suppression-button-y-offset",
-                @"suppression-button-x-offset",
-                @"default-elements-margin",
-                @"suppression-button-text-color",
-                @"suppression-button-text-font",
-                @"suppression-button-text-shadow-color",
-                @"suppression-button-text-shadow-offset"
-            ]
-        ];
+    return [CPDictionary dictionaryWithObjects:[CGSizeMake(400.0, 110.0), CGInsetMake(15, 15, 15, 50), 6, 10,
+                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont boldSystemFontOfSize:13.0], [CPNull null], CGSizeMakeZero(),
+                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont systemFontOfSize:12.0], [CPNull null], CGSizeMakeZero(),
+                                                CGPointMake(15, 12),
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                0.0,
+                                                0.0,
+                                                3.0,
+                                                [CPColor blackColor],
+                                                [CPFont systemFontOfSize:12.0],
+                                                [CPNull null],
+                                                0.0,
+                                                0.0,
+                                                0.0,
+                                                0.0,
+                                                0.0,
+                                                ]
+                                       forKeys:[@"size", @"content-inset", @"informative-offset", @"button-offset",
+                                                @"message-text-alignment", @"message-text-color", @"message-text-font", @"message-text-shadow-color", @"message-text-shadow-offset",
+                                                @"informative-text-alignment", @"informative-text-color", @"informative-text-font", @"informative-text-shadow-color", @"informative-text-shadow-offset",
+                                                @"image-offset",
+                                                @"information-image",
+                                                @"warning-image",
+                                                @"error-image",
+                                                @"help-image",
+                                                @"help-image-left-offset",
+                                                @"help-image-pressed",
+                                                @"suppression-button-y-offset",
+                                                @"suppression-button-x-offset",
+                                                @"default-elements-margin",
+                                                @"suppression-button-text-color",
+                                                @"suppression-button-text-font",
+                                                @"suppression-button-text-shadow-color",
+                                                @"suppression-button-text-shadow-offset",
+                                                @"modal-window-button-margin-y",
+                                                @"modal-window-button-margin-x",
+                                                @"standard-window-button-margin-y",
+                                                @"standard-window-button-margin-x"
+                                                ]];
 }
 
 @end
diff --git a/AppKit/CPApplication.j b/AppKit/CPApplication.j
@@ -1199,7 +1199,7 @@ CPRunContinuesResponse  = -1002;
 
 + (CPString)defaultThemeName
 {
-    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo");
+    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo2");
 }
 
 @end
@@ -1313,7 +1313,7 @@ var _CPAppBootstrapperActions = nil;
     var defaultThemeName = [CPApplication defaultThemeName],
         themeURL = nil;
 
-    if (defaultThemeName === @"Aristo")
+    if (defaultThemeName === @"Aristo" || defaultThemeName === @"Aristo2")
         themeURL = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:defaultThemeName + @".blend"];
     else
         themeURL = [[CPBundle mainBundle] pathForResource:defaultThemeName + @".blend"];
@@ -1358,26 +1358,25 @@ var _CPAppBootstrapperActions = nil;
     // FIXME: We should implement autoenabling.
     [mainMenu setAutoenablesItems:NO];
 
-    var bundle = [CPBundle bundleForClass:[CPApplication class]],
-        newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
+    var newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
 
-    [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/New.png"] size:CGSizeMake(16.0, 16.0)]];
-    [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/NewHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [newMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" forClass:_CPMenuView]];
+    [newMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
 
     [mainMenu addItem:newMenuItem];
 
     var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"o"];
 
-    [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Open.png"] size:CGSizeMake(16.0, 16.0)]];
-    [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/OpenHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [openMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" forClass:_CPMenuView]];
+    [openMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
 
     [mainMenu addItem:openMenuItem];
 
     var saveMenu = [[CPMenu alloc] initWithTitle:@"Save"],
         saveMenuItem = [[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:nil];
 
-    [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Save.png"] size:CGSizeMake(16.0, 16.0)]];
-    [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/SaveHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [saveMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" forClass:_CPMenuView]];
+    [saveMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
 
     [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]];
     [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]];