Skip to content
This repository was archived by the owner on Feb 11, 2020. It is now read-only.

Commit 4b47699

Browse files
committed
Update to use latest LPKit
1 parent 7777b30 commit 4b47699

File tree

61 files changed

+124
-162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+124
-162
lines changed

AppController.j

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
@import <Foundation/CPObject.j>
99
@import <LPKit/LPKit.j>
10-
1110
@import "ControlsAndViewsView.j"
1211
@import "ChartsView.j"
1312

@@ -74,14 +73,14 @@ var repositoryURL = @"http://github.com/luddep/LPKit";
7473
var box = [[CPBox alloc] initWithFrame:CGRectMake(100, 120, CGRectGetWidth(bounds) - 200, CGRectGetHeight(bounds) - 240)];
7574
[box setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
7675
[[box contentView] setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
76+
[box setCornerRadius:2.0];
7777
[box setBorderType:CPLineBorder];
7878
[box setBorderColor:[CPColor colorWithWhite:0 alpha:0.2]];
7979
[box setBackgroundColor:[CPColor whiteColor]];
8080
[contentView addSubview:box];
8181

8282
// Navigation controller
83-
navigation = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0,0, 180, 28)];
84-
[navigation setCenter:CGPointMake(CGRectGetMidX(bounds), CGRectGetMinY([box frame]))];
83+
navigation = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0,0, 0, 28)];
8584
[navigation setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin];
8685
[navigation setSegmentCount:2];
8786

@@ -95,11 +94,14 @@ var repositoryURL = @"http://github.com/luddep/LPKit";
9594

9695
[navigation setTarget:self];
9796
[navigation setAction:@selector(didClickNavigation:)];
97+
[navigation setCenter:CGPointMake(CGRectGetMidX(bounds), CGRectGetMinY([box frame]))];
9898
[contentView addSubview:navigation];
9999

100100
var boxBounds = [[box contentView] bounds];
101101

102102
slideView = [[LPSlideView alloc] initWithFrame:boxBounds];
103+
[slideView setAnimationCurve:CPAnimationEaseInOut];
104+
[slideView setAnimationDuration:0.5];
103105
[slideView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
104106
[[box contentView] addSubview:slideView];
105107

ControlsAndViewsView.j

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
[redView setBackgroundColor:[CPColor colorWithHexString:@"e89090"]];
4545
[slideView addSubview:redView];
4646

47-
var segmentedControl = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(CGRectGetMinX([slideView frame]), CGRectGetMaxY([slideView frame]) + 5, 124, 24)];
47+
var segmentedControl = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(CGRectGetMinX([slideView frame]), CGRectGetMaxY([slideView frame]) + 5, 5, 24)];
4848
[segmentedControl setSegmentCount:3];
4949
[segmentedControl setLabel:@"First" forSegment:0];
5050
[segmentedControl setTag:0 forSegment:0];
@@ -68,7 +68,7 @@
6868
[slideViewLabel setFrameOrigin:CGPointMake(400, 70)];
6969
[self addSubview:slideViewLabel];
7070

71-
var calendarView = [[LPCalendarView alloc] initWithFrame:CGRectMake(400, 100, 180, 160)];
71+
var calendarView = [[LPCalendarView alloc] initWithFrame:CGRectMake(400, 100, 189, 166)];
7272
[calendarView setTheme:LPAristo];
7373
[calendarView setMonth:[CPDate date]];
7474
[calendarView setDelegate:self];

Jakefile

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
/*
2+
* Jakefile
3+
* foo
4+
*
5+
* Created by You on June 25, 2010.
6+
* Copyright 2010, Your Company All rights reserved.
7+
*/
8+
9+
var ENV = require("system").env,
10+
FILE = require("file"),
11+
JAKE = require("jake"),
12+
task = JAKE.task,
13+
FileList = JAKE.FileList,
14+
app = require("cappuccino/jake").app,
15+
configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
16+
OS = require("os");
17+
18+
app ("LPKit-Examples", function(task)
19+
{
20+
task.setBuildIntermediatesPath(FILE.join("Build", "foo.build", configuration));
21+
task.setBuildPath(FILE.join("Build", configuration));
22+
23+
task.setProductName("LPKit-Examples");
24+
task.setIdentifier("com.yourcompany.foo");
25+
task.setVersion("1.0");
26+
task.setAuthor("Your Company");
27+
task.setEmail("feedback @nospam@ yourcompany.com");
28+
task.setSummary("LPKit-Examples");
29+
task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
30+
task.setResources(new FileList("Resources/**"));
31+
task.setIndexFilePath("index.html");
32+
task.setInfoPlistPath("Info.plist");
33+
34+
if (configuration === "Debug")
35+
task.setCompilerFlags("-DDEBUG -g");
36+
else
37+
task.setCompilerFlags("-O");
38+
});
39+
40+
task ("LPAristo", function()
41+
{
42+
JAKE.subjake(["LPAristo"], "build", ENV);
43+
});
44+
45+
task ("default", ["LPAristo", "LPKit-Examples"], function()
46+
{
47+
printResults(configuration);
48+
});
49+
50+
task ("build", ["default"]);
51+
52+
task ("debug", function()
53+
{
54+
ENV["CONFIGURATION"] = "Debug";
55+
JAKE.subjake(["."], "build", ENV);
56+
});
57+
58+
task ("release", function()
59+
{
60+
ENV["CONFIGURATION"] = "Release";
61+
JAKE.subjake(["."], "build", ENV);
62+
});
63+
64+
task ("run", ["debug"], function()
65+
{
66+
OS.system(["open", FILE.join("Build", "Debug", "LPKit-Examples", "index.html")]);
67+
});
68+
69+
task ("run-release", ["release"], function()
70+
{
71+
OS.system(["open", FILE.join("Build", "Release", "LPKit-Examples", "index.html")]);
72+
});
73+
74+
task ("deploy", ["release"], function()
75+
{
76+
FILE.mkdirs(FILE.join("Build", "Deployment", "LPKit-Examples"));
77+
OS.system(["press", "-f", FILE.join("Build", "Release", "LPKit-Examples"), FILE.join("Build", "Deployment", "LPKit-Examples")]);
78+
printResults("Deployment")
79+
});
80+
81+
task ("desktop", ["release"], function()
82+
{
83+
FILE.mkdirs(FILE.join("Build", "Desktop", "LPKit-Examples"));
84+
require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "LPKit-Examples"), FILE.join("Build", "Desktop", "LPKit-Examples", "foo.app"));
85+
printResults("Desktop")
86+
});
87+
88+
task ("run-desktop", ["desktop"], function()
89+
{
90+
OS.system([FILE.join("Build", "Desktop", "LPKit-Examples", "foo.app", "Contents", "MacOS", "NativeHost"), "-i"]);
91+
});
92+
93+
function printResults(configuration)
94+
{
95+
print("----------------------------");
96+
print(configuration+" app built at path: "+FILE.join("Build", configuration, "LPKit-Examples"));
97+
print("----------------------------");
98+
}

LPAristo/Build/Debug/LPAristo.blend/CommonJS.environment/LPAristo.blend.sj

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

LPAristo/Build/Debug/LPAristo.blend/IE7.environment/LPAristo.blend.sj

Lines changed: 0 additions & 79 deletions
This file was deleted.

LPAristo/Build/Debug/LPAristo.blend/IE8.environment/LPAristo.blend.sj

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version = "1.0"><dict><key>CPApplicationDelegateClass</key><string>BKShowcaseController</string><key>CPBundleName</key><string>LPAristo.blend</string><key>CPPrincipalClass</key><string>CPApplication</string><key>CPBundleInfoDictionaryVersion</key><integer>6</integer><key>CPBundleIdentifier</key><string>com.280n.com.yourcompany.LPAristo</string><key>CPBundleVersion</key><real>0.1</real><key>CPBundlePackageType</key><string>BLND</string><key>CPBundleEnvironments</key><array><string>W3C</string><string>IE7</string><string>IE8</string><string>CommonJS</string></array><key>CPBundleExecutable</key><string>LPAristo.blend.sj</string><key>CPBundleReplacedFiles</key><dict></dict><key>CPKeyedThemes</key><array><string>LPAristo.keyedtheme</string></array></dict></plist>
1+
280NPLIST;1.0;D;K;26;CPApplicationDelegateClassS;20;BKShowcaseControllerK;12;CPBundleNameS;14;LPAristo.blendK;16;CPPrincipalClassS;13;CPApplicationK;29;CPBundleInfoDictionaryVersiond;1;6K;18;CPBundleIdentifierS;33;com.280n.com.yourcompany.LPAristoK;15;CPBundleVersionf;3;0.1K;19;CPBundlePackageTypeS;4;BLNDK;20;CPBundleEnvironmentsA;S;7;BrowserS;8;CommonJSE;K;18;CPBundleExecutableS;17;LPAristo.blend.sjK;36;CPBundleEnvironmentsWithImageSpritesA;S;7;BrowserE;K;13;CPKeyedThemesA;S;19;LPAristo.keyedthemeE;E;
Loading

LPAristo/Build/Debug/LPAristo.blend/W3C.environment/LPAristo.blend.sj

Lines changed: 0 additions & 1 deletion
This file was deleted.

LPAristo/Build/LPAristo.build/Debug/CommonJS.environment/Resources/LPAristo.keyedtheme

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)