Alexandre Wilhelm
02bd640aab
Merge branch 'Aristo2' of github.mv.usa.alcatel.com:amercada/Cappuccino into Aristo2
2013-01-08 17:59:29 -08:00
Alexandre Wilhelm
06b1060a45
Fixed bug in scrollview
2013-01-08 17:59:19 -08:00
Antoine Mercadal
0f0dcb9eae
Remove old static theme for CPSplitView
2013-01-08 17:22:19 -08:00
Antoine Mercadal
5ec6d571eb
Improve theme for CPSplitView
2013-01-08 17:22:10 -08:00
Antoine Mercadal
347de2cb8b
CPSplitView is now fully themable
2013-01-08 17:21:32 -08:00
Antoine Mercadal
f6a923ad56
remove old non themable CPProgressIndicator art files
2013-01-08 17:09:38 -08:00
Antoine Mercadal
43455ee661
Remove old CPLevelIndicator ressources
2013-01-08 17:06:13 -08:00
Antoine Mercadal
911df72aeb
Add theme for CPLevelIndicator
2013-01-08 17:05:58 -08:00
Antoine Mercadal
b82225e279
Make CPLevelIndicator themable
2013-01-08 17:05:33 -08:00
Antoine Mercadal
bb3cc58ad0
Merge branch 'Aristo2' of 172.21.51.218:amercada/Cappuccino into Aristo2
2013-01-08 16:30:24 -08:00
Antoine Mercadal
804a345fec
Merge branch 'master' into Aristo2
2013-01-08 16:29:52 -08:00
Antoine Mercadal
7816510fdf
Merge branch 'master' of https://github.com/cappuccino/cappuccino
2013-01-08 16:29:33 -08:00
Antoine Mercadal
50031dbc89
Remove wrong import string
2013-01-08 16:29:06 -08:00
Alexandre Wilhelm
7f05164a7f
Merge branch 'Aristo2' of github.mv.usa.alcatel.com:amercada/Cappuccino into Aristo2
2013-01-08 16:24:24 -08:00
Alexandre Wilhelm
52a6806022
Update Aristo2
2013-01-08 16:23:51 -08:00
Alexandre Wilhelm
1a9d47c554
Fixed bug about scroller-width attribute theme
2013-01-08 16:22:49 -08:00
Antoine Mercadal
2c3b3be3ee
Adjust menubar height
2013-01-08 15:51:53 -08:00
Antoine Mercadal
cdaed50939
Readd Aristo1 build process
...
Cappuccino will now continue to support Aristo1
By default Aristo2 will be used, unless you add in your Info.plist
<key>CPDefaultTheme</key>
<string>Aristo</string>
In that case Aristo2 will be use.
If you put
<key>CPDefaultTheme</key>
<string>MyCustomTheme</string>
It will use your custom theme as usual from your app's Resource folder
2013-01-08 15:03:14 -08:00
Antoine Mercadal
5a155020e6
Merge branch 'master' into Aristo2
2013-01-08 15:02:50 -08:00
Martin Carlberg
957b34d169
Added the option trackSpaces to attach spacesBefore and spacesAfter properties to AST nodes.
2013-01-08 22:23:34 +01:00
Martin Carlberg
79d2ac0566
Fixed some comments and removed unwanted spaces
2013-01-08 22:19:55 +01:00
Martin Carlberg
547f9ff61f
Merge with latest from Acorn master
2013-01-08 22:18:19 +01:00
Martin Carlberg
9f0da2ec41
Fixed spelling error
2013-01-08 22:13:36 +01:00
Alexander Ljungberg
32eafb7708
Fix import.
2013-01-08 18:21:29 +00:00
Alexander Ljungberg
c81b8fb3c3
Formatting.
2013-01-08 18:07:15 +00:00
Antoine Mercadal
a9be167146
Add missing import
2013-01-08 10:05:25 -08:00
Martin Carlberg
c755dc3ed9
Added some more detailed error messages in parser
2013-01-08 17:00:54 +01:00
Martin Carlberg
d20fb2039a
Missed some lines in manual merge
2013-01-08 14:34:29 +01:00
Martin Carlberg
1c3411f808
Merge remote-tracking branch 'upstream/master' into objj_compiler2
...
Conflicts:
AppKit/CPWindow/CPWindow.j
2013-01-08 09:25:54 +01:00
Antoine Mercadal
7357be3c35
Finish Aristo HUD
2013-01-07 20:03:20 -08:00
Antoine Mercadal
5dd1bed913
Add the HUD version of Aristo2
2013-01-07 18:40:34 -08:00
Antoine Mercadal
18eda8aade
Add the HUD version of Aristo2
2013-01-07 17:34:43 -08:00
Antoine Mercadal
8e16e6266e
Fix a bug where CPURL was not encoding self._baseURL and self._string
2013-01-07 16:04:08 -08:00
Martin Carlberg
8100cdb17f
Fixed "Can't find variable: ObjJCompiler" error
2013-01-07 23:13:54 +01:00
Antoine Mercadal
7fa01fa4f3
Merge branch 'master' into Aristo2
...
Conflicts:
Tests/Manual/CPPopover/Resources/MainMenu.cib
2013-01-07 13:23:05 -08:00
Martin Carlberg
d49e78c43e
Removal of old compiler
2013-01-07 20:29:56 +01:00
Martin Carlberg
cf46768ac7
Removal of logs
2013-01-07 20:29:45 +01:00
Martin Carlberg
cfe718f4ef
Handle preprocessor lines like "#pragma"
2013-01-07 20:29:35 +01:00
Martin Carlberg
bf32b90702
Allow signed, unsigned, char, short, int and long to be an identifier
2013-01-07 20:29:13 +01:00
Martin Carlberg
9cb14d6db3
Added new faster compiler based on acorn parser
2013-01-07 09:59:10 +01:00
Martin Carlberg
140cf0debe
Code cleanup
2013-01-07 09:55:12 +01:00
Aparajita Fishman
45ad5375a2
Full platform windows and popovers can become main
2013-01-07 07:07:27 +08:00
Alexander Ljungberg
259adda77d
Merge pull request #1713 from milestinsley/CPBrowserStyleProperty-fix
...
Improved support for converting CSS properties to their JS equivalent in CPBrowserStyleProperty
2013-01-06 17:31:08 +00:00
Miles Tinsley
964f3fe06d
Improved the reliability of CPBrowserCSSProperty by checking for the browser prefix *before* hyphenating the camel-cased string.
...
This has the added benefit of ignoring unknown/unsupported prefixes, providing the property itself is camel-cased.
For example:
"LinearBackground" -> "linear-background"
"Linear-Background" -> "linear-background"
"linear-background" -> "linear-background"
"fooLinearBackground" -> "linear-background"
and
"WebkitLinearBackground" -> "-webkit-linear-background"
"MozLinearBackground" -> "-moz-linear-background"
etc..
2013-01-06 17:20:37 +00:00
Miles Tinsley
002c49b32f
Updated CPBrowserCSSProperty to support camel cased style property names and convert them into valid browser-aware CSS properties.
2013-01-06 16:57:31 +00:00
Alexander Ljungberg
d4313be406
Merge pull request #1713 from milestinsley/CPBrowserStyleProperty-fix
...
Improved support for converting CSS properties to their JS equivalent in CPBrowserStyleProperty
2013-01-06 15:48:49 +00:00
Miles Tinsley
76a4ded128
Improved support for converting CSS properties to their JS equivalent in CPBrowserStyleProperty
...
For example, the following CSS property names all resolve to the same correct JS equivalent for the current browser:
* CPBrowserStyleProperty('TransformOrigin') -> 'WebkitTransformOrigin'
* CPBrowserStyleProperty('transform-origin') -> 'WebkitTransformOrigin'
2013-01-06 13:26:01 +00:00
Aparajita Fishman
8d68e805f4
Fix CPWindow -canBecomeKeyWindow and -canBecomeMainWindow to match Cocoa behavior (and misleading documentation)
...
Minor code formatting cleanup as well
2013-01-06 16:21:10 +08:00
Aparajita Fishman
f1a171a94c
Window resize fixes
...
- Track mouse exit from window resize rect instead of unconditionally setting arrow cursor.
- Don't show the resize cursors for full platform windows.
- Show the resize down cursor if the top of a window is being resized and it has reached the bottom of the menubar.
- Make windows in CPToolbarTest resizable to test resizing behavior with toolbars.
- Added a full platform window and menubar to the test app.
2013-01-05 11:13:53 +08:00
Antoine Mercadal
7e9b12b475
Update and improve CPBoxTest manual test
2013-01-04 18:46:16 -08:00