Merge branch 'pl_2939' into Aristo3

AppKit/CPApplication.j

@@ -1260,7 +1260,7 @@ var CPApplicationDelegate_applicationShouldTerminate_           = 1 << 0,
 
 + (CPString)defaultThemeName
 {
-    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo2");
+    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo3");
 }
 
 @end
@@ -1375,7 +1375,7 @@ var _CPAppBootstrapperActions = nil;
     var defaultThemeName = [CPApplication defaultThemeName],
         themeURL = nil;
 
-    if (defaultThemeName === @"Aristo" || defaultThemeName === @"Aristo2")
+    if (defaultThemeName === @"Aristo" || defaultThemeName === @"Aristo2" || defaultThemeName === @"Aristo3")
         themeURL = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:defaultThemeName + @".blend"];
     else
         themeURL = [[CPBundle mainBundle] pathForResource:defaultThemeName + @".blend"];

AppKit/CPView.j

@@ -333,8 +333,9 @@ var CPViewHighDPIDrawingEnabled = YES;
 {
     return @{
              @"css-based": NO,
-             @"dynamic-set": [CPNull null],
-             @"nib2cib-adjustment-frame": CGRectMakeZero()
+             @"nib2cib-adjustment-frame": [CPNull null],
+             @"direct-nib2cib-adjustment": NO,
+             @"dynamic-set": [CPNull null]
              };
 }
 

AppKit/Jakefile

@@ -59,8 +59,11 @@ task ("Theme", [$BUILD_CJS_CAPPUCCINO_APPKIT], function()
     utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo.blend'), path.join($BUILD_PATH, 'Resources', 'Aristo.blend'));
     utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo.blend'), path.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo.blend"));
 
-    utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), path.join($BUILD_PATH, 'Resources', 'Aristo2.blend'));
-    utilsFile.cp_r(path.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), path.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo2.blend"));
+    cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), FILE.join($BUILD_PATH, 'Resources', 'Aristo2.blend'));
+    cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo2.blend'), FILE.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo2.blend"));
+
+    cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo3.blend'), FILE.join($BUILD_PATH, 'Resources', 'Aristo3.blend'));
+    cp_r(FILE.join($BUILD_DIR, $CONFIGURATION, 'Aristo3.blend'), FILE.join($BUILD_CJS_CAPPUCCINO_APPKIT, "Resources", "Aristo3.blend"));
 });
 
 task ("build", ["AppKit", $BUILD_CJS_CAPPUCCINO_APPKIT, "Theme"]);

AppKit/Themes/Aristo3/Aristo3Colors.j

@@ -0,0 +1,163 @@
+/*
+ * Aristo3Colors.j
+ * AppKit
+ *
+ * Created by Didier Korthoudt
+ * Copyright 2018 <didier.korthoudt@uliege.be>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+A3CPColorActiveText                 = [CPColor colorWithRed:0 green:0 blue:0 alpha:0.85];
+A3CPColorActiveTextHighlighted      = [CPColor colorWithRed:255 green:255 blue:255 alpha:0.90];
+A3CPColorInactiveText               = [CPColor colorWithRed:0 green:0 blue:0 alpha:0.30];
+A3CPColorInactiveWhiteText          = [CPColor colorWithRed: 255 green:255 blue:255 alpha:0.6];
+A3CPColorDefaultText                = [CPColor colorWithHexString:@"FFFFFF"];
+A3CPColorActiveText65               = [CPColor colorWithRed:0 green:0 blue:0 alpha:0.65];
+
+A3CPColorBlack50                    = [CPColor colorWithRed:0 green:0 blue:0 alpha:0.50];
+A3CPColorBlack85                    = [CPColor colorWithRed:0 green:0 blue:0 alpha:0.85];
+A3CPColorBlack25                    = [CPColor colorWithRed:0 green:0 blue:0 alpha:0.25];
+
+A3CPColorActiveBorder               = [CPColor colorWithRed:0 green:0 blue:0 alpha:0.20];
+A3ColorActiveBorder                 = @"rgba(0,0,0,0.20)";
+A3CPColorInactiveBorder             = [CPColor colorWithRed:0 green:0 blue:0 alpha:0.10];
+A3ColorInactiveBorder               = @"rgba(0,0,0,0.10)";
+A3ColorInactiveDarkBorder           = @"rgba(0,0,0,0.25)";
+A3ColorNotKeyDarkBorder             = @"rgba(0,0,0,0.85)";
+A3ColorTransparent                  = @"rgba(0,0,0,0)";
+A3ColorLightBackground              = @"rgba(255,255,255,0.5)";
+
+A3ColorBorderLight                  = @"rgb(230,230,230)";
+A3ColorBorderMedium                 = @"rgb(213,213,213)";
+A3ColorBorderDark                   = @"rgb(205,205,205)";
+A3ColorBorderBlue                   = @"rgb(23,128,251)";
+A3CPColorBorderBlue                 = [CPColor colorWithHexString:@"1780FB"];
+A3CPColorBorderBlueInactive         = [CPColor colorWithHexString:@"DCDCDC"];
+A3ColorBorderBlueLight              = @"rgb(150,200,250)";
+A3ColorBorderBlueHighlighted        = @"rgb(0,103,216)";
+A3ColorBackground                   = @"rgb(236,236,236)";
+A3ColorBackgroundInactive           = @"rgb(240,240,240)";
+A3ColorBackgroundHighlighted        = @"rgb(231,231,231)";
+A3ColorBackgroundWhite              = @"rgb(255,255,255)";
+A3ColorBackgroundDark               = @"rgb(159,159,159)";
+A3ColorBackgroundDarkened           = @"rgba(0,0,0,0.15)";
+A3ColorBackgroundLightlyDarkened    = @"rgba(0,0,0,0.05)";
+A3ColorButtonBackgroundHighlighted  = @"rgb(191,191,191)";
+A3ColorBackground90                 = @"rgba(236,236,236,0.90)";
+A3ColorBackground50                 = @"rgba(236,236,236,0.50)";
+A3ColorButtonBackgroundHighlighted80= @"rgba(191,191,191,0.80)";
+A3ColorButtonBackgroundHighlighted50= @"rgba(191,191,191,0.50)";
+A3ColorBackgroundDark35             = @"rgba(159,159,159,0.35)";
+A3ColorBackgroundBlack50            = @"rgba(0,0,0,0.50)";
+A3ColorBackgroundBlack35            = @"rgba(0,0,0,0.35)";
+A3ColorBackgroundBlack20            = @"rgba(0,0,0,0.20)";
+A3ColorBackgroundBlack14            = @"rgba(0,0,0,0.14)";
+
+A3ColorBorderRed                    = @"rgb(192,26,25)";
+A3ColorBorderRedLight               = @"rgb(239,102,103)";
+A3ColorBorderRedHighlighted         = @"rgb(144,19,19)";
+
+// Windows
+
+A3ColorWindowHeadActive             = @"rgb(216,216,216)";
+A3ColorWindowHeadInactive           = @"rgb(246,246,246)";
+A3ColorWindowButtonClose            = @"rgb(252,96,92)";
+A3ColorWindowButtonCloseDark        = @"rgb(223,72,69)";
+A3ColorWindowButtonCloseLight       = @"rgb(254,176,174)";
+A3ColorWindowButtonMin              = @"rgb(253,188,64)";
+A3ColorWindowButtonMinDark          = @"rgb(222,160,52)";
+A3ColorWindowButtonMinLight         = @"rgb(254,222,160)";
+A3ColorWindowButtonZoom             = @"rgb(52,200,74)";
+A3ColorWindowButtonZoomDark         = @"rgb(40,171,53)";
+A3ColorWindowButtonZoomLight        = @"rgb(154,227,164)";
+A3ColorWindowButtonUnsaved          = @"rgba(50,50,50,0.65)";
+A3ColorWindowButtonUnsavedLight     = @"rgb(100,100,100)";
+A3ColorWindowButtonBackground       = @"rgb(128,128,128)";
+A3ColorWindowButtonBackgroundLight  = @"rgb(192,192,192)";
+A3ColorWindowButtonBackgroundDark   = @"rgb(96,96,96)";
+A3ColorWindowBorder                 = @"rgb(189,189,189)";
+
+// Menus
+
+A3ColorMenuLightBackground          = @"rgb(246,246,246)";
+A3ColorMenuBackground               = @"rgb(206,206,206)";
+A3ColorMenuCheckmark                = @"rgba(0,0,0,0.85)";
+A3ColorMenuBorder                   = @"rgba(0,0,0,0.20)";
+
+// Textfields
+
+A3ColorTextfieldActiveBorder        = @"rgba(0,0,0,0.25)";
+A3ColorTextfieldInactiveBorder      = @"rgba(0,0,0,0.20)";
+
+// Tables
+
+A3CPColorTableRow                   = [CPColor whiteColor];
+A3CPColorTableAlternateRow          = [CPColor colorWithRed:245.0/255.0 green:245.0/255.0 blue:245.0/255.0 alpha:1.0];
+A3CPColorTableDivider               = [CPColor colorWithRed:214.0/255.0 green:214.0/255.0 blue:214.0/255.0 alpha:1.0];
+A3ColorTableDivider                 = @"rgb(214,214,214)";
+A3ColorTableHeaderSeparator         = @"rgb(229,229,229)";
+A3CPColorTableHeaderText            = [CPColor colorWithRed:0 green:0 blue:0 alpha:0.40];
+A3CPColorSelectedTableHeaderText    = [CPColor colorWithRed:0 green:0 blue:0 alpha:0.70];
+A3ColorTableColumnHeaderPressed     = @"rgba(0,0,0,0.10)";
+
+// Scrollers
+
+A3ColorScrollerDark                 = @"rgba(0,0,0,0.50)";
+A3ColorScrollerLight                = @"rgba(255,255,255,0.5)";
+A3ColorScrollerLegacy               = @"rgba(0,0,0,0.20)";
+A3ColorScrollerBackground           = @"rgb(250,250,250)";
+A3ColorScrollerBorder               = @"rgb(232,232,232)";
+
+// Sliders
+
+A3ColorCircularSliderKnob           = @"rgba(0,0,0,0.5)";
+A3ColorSliderDisabledKnob           = @"rgb(251,251,251)";
+A3ColorSliderDisabledTrack          = @"rgb(140,140,140)";
+
+// Steppers
+
+A3ColorStepperArrow                 = @"rgba(0,0,0,0.65)";
+A3ColorHighlightedStepperArrow      = @"rgba(255,255,255,1)";
+
+// Split views
+
+A3ColorSplitPaneDividerBackground   = @"rgb(253,253,253)";
+A3ColorSplitPaneDividerBorder       = @"rgb(213,213,213)";
+
+// Calendar
+
+A3ColorCalendarButtons              = @"rgb(50,50,50)";
+A3ColorCalendarHighlightedButtons   = @"rgb(165,165,165)";
+A3CPColorCalendarDark               = [CPColor colorWithRed:0 green:0 blue:0 alpha:0.35];
+A3ColorCalendarDark                 = @"rgba(0,0,0,0.35)";
+A3ColorCalendarActive               = A3ColorBorderBlue;
+A3ColorCalendarActiveNotKey         = @"rgba(0,0,0,0.15)";
+A3CPColorCalendarTitle              = [CPColor colorWithRed:65/255 green:65/255  blue:65/255  alpha:1];
+A3CPColorCalendarTile               = A3CPColorActiveText; // [CPColor colorWithRed:40/255 green:40/255  blue:40/255  alpha:1];
+A3CPColorCalendarCurrentDayTile     = A3CPColorBorderBlue;
+A3CPColorCalendarOutOfRangeTile     = A3CPColorInactiveText;
+A3CPColorCalendarSelectedTile       = [CPColor whiteColor];
+A3ColorCalendarBackground           = @"rgb(255,255,255)";
+
+// Disclosure triangle
+
+A3ColorDisclosure                   = @"rgb(140,140,140)";
+A3ColorDisclosureDisabled           = @"rgb(191,191,191)";
+A3ColorDisclosurePushed             = @"rgb(115,115,115)";
+
+// Square buttons
+
+A3ColorSquareButtonBackground       = @"rgb(248,248,248)";

AppKit/Themes/Aristo3/Info.plist

@@ -0,0 +1,22 @@
+<?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>CPSystemFontFace</key>
+	<string>SFNSText, Helvetica Neue</string>
+	<key>CPApplicationDelegateClass</key>
+	<string>BKShowcaseController</string>
+	<key>CPBundleName</key>
+	<string>Aristo3</string>
+	<key>BKLearnMoreURL</key>
+	<string>http://cappuccino.org/aristo</string>
+	<key>BKLearnMoreButtonTitle</key>
+	<string>Aristo Home Page</string>
+	<key>CPPrincipalClass</key>
+	<string>CPApplication</string>
+	<key>CPDefaultTheme</key>
+	<string>Aristo3</string>
+	<key>CPSystemFontSize</key>
+	<string>13</string>
+</dict>
+</plist>

AppKit/Themes/Aristo3/Jakefile

@@ -0,0 +1,16 @@
+
+require("../../../common.jake");
+
+var blend = require("cappuccino/jake").blend;
+
+blend ("Aristo3.blend", function(aristo3Task)
+{
+    aristo3Task.setBuildIntermediatesPath(FILE.join($BUILD_DIR, "Aristo3.build", $CONFIGURATION))
+    aristo3Task.setBuildPath(FILE.join($BUILD_DIR, $CONFIGURATION));
+
+    aristo3Task.setThemeDescriptors(new FileList("ThemeDescriptors.j"));
+    aristo3Task.setIdentifier("com.280n.blend.Aristo3");
+    aristo3Task.setResources(new FileList("Resources/*"));
+});
+
+task ("build", ["Aristo3.blend"]);

AppKit/Themes/Aristo3/LICENSE

@@ -0,0 +1,28 @@
+Copyright (c) 2015, Alcatel-Lucent Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of monolithe nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.