diff options
author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
tree | c51112223ceb9121cd595a60335eb2795215590f /js/data | |
parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/data')
-rwxr-xr-x[-rw-r--r--] | js/data/appdata.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | js/data/menu-data.js | 76 | ||||
-rwxr-xr-x[-rw-r--r--] | js/data/pi/pi-data.js | 22 | ||||
-rwxr-xr-x[-rw-r--r--] | js/data/settings.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | js/data/tools-data.js | 30 |
5 files changed, 79 insertions, 49 deletions
diff --git a/js/data/appdata.js b/js/data/appdata.js index 0a6c4976..0a6c4976 100644..100755 --- a/js/data/appdata.js +++ b/js/data/appdata.js | |||
diff --git a/js/data/menu-data.js b/js/data/menu-data.js index e9e47dc0..7c3ca5d4 100644..100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js | |||
@@ -10,12 +10,12 @@ exports.MenuData = Montage.create( Montage, { | |||
10 | topLevelMenu: { | 10 | topLevelMenu: { |
11 | value: [ | 11 | value: [ |
12 | { | 12 | { |
13 | "header": "FILE", | 13 | "header": "File", |
14 | "entries": [ | 14 | "entries": [ |
15 | { | 15 | { |
16 | "displayText" : "New Project", | 16 | "displayText" : "New Project", |
17 | "hasSubMenu" : false, | 17 | "hasSubMenu" : false, |
18 | "enabled": true, | 18 | "enabled": false, |
19 | "action": "executeNewProject" | 19 | "action": "executeNewProject" |
20 | }, | 20 | }, |
21 | { | 21 | { |
@@ -25,7 +25,7 @@ exports.MenuData = Montage.create( Montage, { | |||
25 | "action": "executeNewFile" | 25 | "action": "executeNewFile" |
26 | }, | 26 | }, |
27 | { | 27 | { |
28 | "displayText" : "Open...", | 28 | "displayText" : "Open File", |
29 | "hasSubMenu" : false, | 29 | "hasSubMenu" : false, |
30 | "enabled": true, | 30 | "enabled": true, |
31 | "action": "executeFileOpen" | 31 | "action": "executeFileOpen" |
@@ -37,17 +37,20 @@ exports.MenuData = Montage.create( Montage, { | |||
37 | { | 37 | { |
38 | "displayText" : "Save", | 38 | "displayText" : "Save", |
39 | "hasSubMenu" : false, | 39 | "hasSubMenu" : false, |
40 | "enabled": false | 40 | "enabled": true, |
41 | "action": "executeSave" | ||
41 | }, | 42 | }, |
42 | { | 43 | { |
43 | "displayText" : "Save As", | 44 | "displayText" : "Save As", |
44 | "hasSubMenu" : false, | 45 | "hasSubMenu" : false, |
45 | "enabled": false | 46 | "enabled": true, |
47 | "action":"saveAs" | ||
46 | }, | 48 | }, |
47 | { | 49 | { |
48 | "displayText" : "Save All", | 50 | "displayText" : "Save All", |
49 | "hasSubMenu" : false, | 51 | "hasSubMenu" : false, |
50 | "enabled": false | 52 | "enabled": true, |
53 | "action": "executeSaveAll" | ||
51 | }, | 54 | }, |
52 | { | 55 | { |
53 | "displayText" : "", | 56 | "displayText" : "", |
@@ -56,12 +59,12 @@ exports.MenuData = Montage.create( Montage, { | |||
56 | { | 59 | { |
57 | "displayText" : "Open Project", | 60 | "displayText" : "Open Project", |
58 | "hasSubMenu" : false, | 61 | "hasSubMenu" : false, |
59 | "enabled": true | 62 | "enabled": false |
60 | }, | 63 | }, |
61 | { | 64 | { |
62 | "displayText" : "Open Recent", | 65 | "displayText" : "Open Recent", |
63 | "hasSubMenu" : false, | 66 | "hasSubMenu" : false, |
64 | "enabled": true | 67 | "enabled": false |
65 | }, | 68 | }, |
66 | { | 69 | { |
67 | "displayText" : "Close Project", | 70 | "displayText" : "Close Project", |
@@ -71,7 +74,7 @@ exports.MenuData = Montage.create( Montage, { | |||
71 | ] | 74 | ] |
72 | }, | 75 | }, |
73 | { | 76 | { |
74 | "header": "EDIT", | 77 | "header": "Edit", |
75 | "entries": [ | 78 | "entries": [ |
76 | { | 79 | { |
77 | "displayText" : "Undo", | 80 | "displayText" : "Undo", |
@@ -111,7 +114,7 @@ exports.MenuData = Montage.create( Montage, { | |||
111 | ] | 114 | ] |
112 | }, | 115 | }, |
113 | { | 116 | { |
114 | "header": "VIEW", | 117 | "header": "View", |
115 | "entries": [ | 118 | "entries": [ |
116 | { | 119 | { |
117 | "displayText" : "Zoom In", | 120 | "displayText" : "Zoom In", |
@@ -137,6 +140,15 @@ exports.MenuData = Montage.create( Montage, { | |||
137 | } | 140 | } |
138 | }, | 141 | }, |
139 | { | 142 | { |
143 | "displayText" : "Chrome Preview", | ||
144 | "hasSubMenu" : false, | ||
145 | "enabled": true, | ||
146 | "checked": { | ||
147 | "value": false, | ||
148 | "boundProperty": "chromePreview" | ||
149 | } | ||
150 | }, | ||
151 | { | ||
140 | "displayText" : "Layout View", | 152 | "displayText" : "Layout View", |
141 | "hasSubMenu" : false, | 153 | "hasSubMenu" : false, |
142 | "enabled": true, | 154 | "enabled": true, |
@@ -282,7 +294,7 @@ exports.MenuData = Montage.create( Montage, { | |||
282 | ] | 294 | ] |
283 | }, | 295 | }, |
284 | { | 296 | { |
285 | "header": "WINDOW", | 297 | "header": "Window", |
286 | "entries": [ | 298 | "entries": [ |
287 | { | 299 | { |
288 | "displayText" : "Tools", | 300 | "displayText" : "Tools", |
@@ -349,6 +361,15 @@ exports.MenuData = Montage.create( Montage, { | |||
349 | } | 361 | } |
350 | }, | 362 | }, |
351 | { | 363 | { |
364 | "displayText" : "Presets", | ||
365 | "hasSubMenu" : false, | ||
366 | "enabled": true, | ||
367 | "checked": { | ||
368 | "value": true, | ||
369 | "boundProperty": "PresetsPanel" | ||
370 | } | ||
371 | }, | ||
372 | { | ||
352 | "displayText" : "Code", | 373 | "displayText" : "Code", |
353 | "hasSubMenu" : false, | 374 | "hasSubMenu" : false, |
354 | "enabled": true | 375 | "enabled": true |
@@ -356,41 +377,34 @@ exports.MenuData = Montage.create( Montage, { | |||
356 | ] | 377 | ] |
357 | }, | 378 | }, |
358 | { | 379 | { |
359 | "header": "HELP", | 380 | "header": "Help", |
360 | "entries": [ | 381 | "entries": [ |
361 | { | 382 | { |
362 | "displayText" : "About", | 383 | "displayText" : "Ninja FAQ", |
363 | "hasSubMenu" : false, | 384 | "hasSubMenu" : false, |
364 | "enabled": true | 385 | "enabled": true, |
386 | "action": "executeHelpFAQ" | ||
365 | }, | 387 | }, |
366 | { | 388 | { |
367 | "displayText" : "FAQ", | 389 | "displayText" : "Ninja Forums", |
368 | "hasSubMenu" : false, | 390 | "hasSubMenu" : false, |
369 | "enabled": true | 391 | "enabled": true, |
392 | "action": "executeHelpForums" | ||
370 | }, | 393 | }, |
371 | { | 394 | { |
372 | "displayText" : "Forums", | 395 | "displayText" : "Help Topics", |
373 | "hasSubMenu" : false, | 396 | "hasSubMenu" : false, |
374 | "enabled": true | 397 | "enabled": true, |
375 | } | 398 | "action": "executeHelpTopics" |
376 | ] | ||
377 | }, | ||
378 | { | ||
379 | "header": "TEST", | ||
380 | "entries": [ | ||
381 | { | ||
382 | "displayText" : "Open CSS View", | ||
383 | "hasSubMenu" : false, | ||
384 | "enabled": true | ||
385 | }, | 399 | }, |
386 | { | 400 | { |
387 | "displayText" : "Open JS View", | 401 | "displayText" : "About Ninja...", |
388 | "hasSubMenu" : false, | 402 | "hasSubMenu" : false, |
389 | "enabled": true | 403 | "enabled": true, |
404 | "action": "executeHelpAbout" | ||
390 | } | 405 | } |
391 | ] | 406 | ] |
392 | } | 407 | } |
393 | |||
394 | ] | 408 | ] |
395 | } | 409 | } |
396 | }); | 410 | }); |
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 10b33a0e..ba03c347 100644..100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -10,7 +10,21 @@ var Montage = require("montage/core/core").Montage, | |||
10 | exports.PiData = Montage.create( Montage, { | 10 | exports.PiData = Montage.create( Montage, { |
11 | 11 | ||
12 | stagePi: { | 12 | stagePi: { |
13 | value: [] | 13 | value: [ |
14 | { | ||
15 | label: "Style", | ||
16 | |||
17 | Section: [ | ||
18 | [ | ||
19 | { | ||
20 | type : "chip", | ||
21 | id : "background", | ||
22 | prop: "background" | ||
23 | } | ||
24 | ] | ||
25 | ] | ||
26 | } | ||
27 | ] | ||
14 | }, |