colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-20 17:30:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.7b' of git@github.com:280north/cappuccino into 0.7b

Browse Source
This commit is contained in:
Francisco Tolmasky
2009-05-17 18:47:23 -07:00
parent 28da8ccacf 00b1d893e2
commit c3d698bcac
13 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPSlider.j
+1 -1
View File
@@ -178,7 +178,7 @@ CPCircularSlider = 1;
if ([self hasThemeState:CPThemeStateCircular])
{
var angle = 3*PI_2 - (1.0 - [self doubleValue] - _minValue) / (_maxValue - _minValue) * PI2,
radius = CGRectGetWidth(trackRect) / 2.0 - 6.0;
radius = CGRectGetWidth(trackRect) / 2.0 - 8.0;
knobRect.origin.x = radius * COS(angle) + CGRectGetMidX(trackRect) - 3.0;
knobRect.origin.y = radius * SIN(angle) + CGRectGetMidY(trackRect) - 2.0;
AppKit/CPWindow/_CPStandardWindowView.j
+1 -1
View File
@@ -117,7 +117,7 @@ var STANDARD_GRADIENT_HEIGHT = 41.0;
+ (CPColor)bodyBackgroundColor
{
if (!_CPStandardWindowViewBodyBackgroundColor)
_CPStandardWindowViewBodyBackgroundColor = [CPColor whiteColor];//
_CPStandardWindowViewBodyBackgroundColor = [CPColor colorWithWhite:0.96 alpha:1.0];
return _CPStandardWindowViewBodyBackgroundColor;
}
AppKit/Themes/Aristo/Resources/CircularSliderBezel.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

AppKit/Themes/Aristo/ThemeDescriptors.j
+2 -2
View File
@@ -467,8 +467,8 @@
+ (CPSlider)themedCircularSlider
{
var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 32.0, 32.0)],
trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"circularSliderBezel.png" size:CGSizeMake(32.0, 32.0)]);
var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 34.0, 34.0)],
trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"circularSliderBezel.png" size:CGSizeMake(34.0, 34.0)]);
[slider setSliderType:CPCircularSlider];
[slider setValue:trackColor forThemeAttribute:@"track-color" inState:CPThemeStateCircular];
External/Rakefile
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ end
task :update_submodules do
if executable_exists? "git"
system %{cd .. && git submodule update --init}
system %{cd .. && git submodule init && git submodule update}
else
puts "Git not installed"
rake abort
Rakefile
+1 -1
View File
@@ -102,7 +102,7 @@ end
task :submodules do
if executable_exists? "git"
system %{cd .. && git submodule update --init}
system %{git submodule init && git submodule update}
else
puts "Git not installed"
rake abort
Tools/capp/Templates/Application/index-debug.html
+2
View File
@@ -14,6 +14,8 @@
-->
<head>
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
<title>Hello World</title>
<script type = "text/javascript">
Tools/capp/Templates/Application/index.html
+2
View File
@@ -14,6 +14,8 @@
-->
<head>
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
<title>Hello World</title>
<script type = "text/javascript">
Tools/capp/Templates/NibApplication/index-debug.html
+2
View File
@@ -14,6 +14,8 @@
-->
<head>
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
<title>Hello World</title>
<script type = "text/javascript">
Tools/capp/Templates/NibApplication/index.html
+2
View File
@@ -14,6 +14,8 @@
-->
<head>
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
<title>Hello World</title>
<script type = "text/javascript">
Tools/capp/Templates/ThemeDescriptor/index-debug.html
+2
View File
@@ -14,6 +14,8 @@
-->
<head>
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
<title>Hello World</title>
<script type = "text/javascript">
Tools/capp/Templates/ThemeDescriptor/index.html
+2
View File
@@ -14,6 +14,8 @@
-->
<head>
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
<title>Hello World</title>
<script type = "text/javascript">
Tools/press/main.j
+22 -2
View File
@@ -9,6 +9,7 @@ var usageMessage =
"Usage: press root_directory output_directory [options]\n\
--main path The relative path (from root_directory) to the main file (default: 'main.j')\n\
--frameworks path The relative path (from root_directory) to the frameworks directory (default: 'Frameworks')\n\
--platforms Platform names, colon separated (default: 'browser:objj')\n\
--png Run pngcrush on all PNGs (pngcrush must be installed!)\n\
--flatten Flatten all code into a single Application.js file and attempt add script tag to index.html (useful for Adobe AIR and CDN deployment)\n\
--nostrip Don't strip any files\n\
@@ -20,6 +21,7 @@ function main()
outputDirectory = null,
mainFilename = null,
frameworksDirectory = null,
platforms = ['browser', 'objj'],
optimizePNG = false,
flatten = false,
noStrip = false,
@@ -43,6 +45,12 @@ function main()
else
usageError = true;
break;
case "--platforms":
if (system.args.length)
platforms = system.args.shift().split(":");
else
usageError = true;
break;
case "--png":
optimizePNG = true;
break;
@@ -70,7 +78,7 @@ function main()
else
CPLogRegisterRange(CPLogPrint, "fatal", "info");
if (usageError || rootDirectory == null || outputDirectory == null)
if (usageError || rootDirectory == null || outputDirectory == null || !platforms.length)
{
print(usageMessage);
return;
@@ -93,6 +101,7 @@ function main()
// set OBJJ_INCLUDE_PATHS to include the frameworks path
scope.OBJJ_INCLUDE_PATHS = [frameworksPath];
scope.OBJJ_PLATFORMS = platforms;
// flattening bookkeeping. keep track of the bundles and evaled code (in the correct order!)
var bundleArchives = [],
@@ -298,7 +307,18 @@ function main()
replacedFiles = [dict objectForKey:"CPBundleReplacedFiles"];
if (replacedFiles && [replacedFiles containsObject:filename])
{
var staticPath = bundleDirectory + "/" + [dict objectForKey:"CPBundleExecutable"];
// compute the platform used for this bundle
var platform = "",
bundlePlatforms = [dict objectForKey:"CPBundlePlatforms"];
if (bundlePlatforms)
{
platform = [bundlePlatforms firstObjectCommonWithArray:scope.OBJJ_PLATFORMS];
if (platform)
platform = platform + ".platform/";
}
var staticPath = bundleDirectory + "/" + platform + [dict objectForKey:"CPBundleExecutable"];
if (!outputFiles[staticPath])
{
outputFiles[staticPath] = [];