Alexandre Wilhelm
146d641f97
Updated Aristo2
2013-01-10 16:13:48 -08:00
Antoine Mercadal
0f94ba3d39
Merge branch 'Aristo2' of 172.21.51.218:amercada/Cappuccino into Aristo2
2013-01-10 14:12:15 -08:00
Antoine Mercadal
2e157dd969
Starting to backport new themeable stuff from Aristo2. Missing art will follow
2013-01-10 14:12:09 -08:00
Antoine Mercadal
f945845a77
Style fix
2013-01-10 14:11:35 -08:00
Alexandre Wilhelm
457cf98089
Merge branch 'Aristo2' of github.mv.usa.alcatel.com:amercada/Cappuccino into Aristo2
2013-01-10 13:58:20 -08:00
Alexandre Wilhelm
ab65b53201
Updated Aristo2
2013-01-10 13:58:12 -08:00
Antoine Mercadal
cdf29b6c56
Add missing theme descriptors for CPTableView
2013-01-10 11:57:39 -08:00
Antoine Mercadal
bd8431504d
Merge branch 'Aristo2' of 172.21.51.218:amercada/Cappuccino into Aristo2
2013-01-10 11:49:01 -08:00
Antoine Mercadal
b3259e4b49
Add theme for CPButtonBar plus, minus and action button
2013-01-10 11:42:38 -08:00
Alexandre Wilhelm
9451a6a1ec
Merge branch 'Aristo2' of github.mv.usa.alcatel.com:amercada/Cappuccino into Aristo2
2013-01-10 11:42:07 -08:00
Alexandre Wilhelm
5d3321839d
Updated Aristo2
2013-01-10 11:41:59 -08:00
Antoine Mercadal
42824713e3
Add application's menu default icon in theme
2013-01-10 11:29:24 -08:00
Antoine Mercadal
d7af63877e
Add system cursors in theme
2013-01-10 11:15:19 -08:00
Antoine Mercadal
1448791fcd
Declare default row height
2013-01-09 20:25:02 -08:00
Antoine Mercadal
0d460dd6b1
Add missing art for toolbar item separator
2013-01-09 19:42:31 -08:00
Antoine Mercadal
4333e3da67
Add theme for CPToolbarItemSeparator
2013-01-09 19:41:56 -08:00
Antoine Mercadal
2ac57642a4
Remove PSD from ressource folder
2013-01-09 19:01:32 -08:00
Antoine Mercadal
e23c519fac
Merge branch 'Aristo2' of 172.21.51.218:amercada/Cappuccino into Aristo2
2013-01-09 18:58:05 -08:00
Antoine Mercadal
cbcc988625
Add theme for CPBrowser
2013-01-09 18:57:45 -08:00
Alexandre Wilhelm
f4e243255a
Merge branch 'Aristo2' of github.mv.usa.alcatel.com:amercada/Cappuccino into Aristo2
2013-01-09 18:53:37 -08:00
Alexandre Wilhelm
8df8479716
Updated Aristo2
2013-01-09 18:53:23 -08:00
Antoine Mercadal
66ca5c0d34
Merge branch 'Aristo2' of 172.21.51.218:amercada/Cappuccino into Aristo2
2013-01-09 18:26:50 -08:00
Antoine Mercadal
c5a4b2605c
Add missing theme attributes for CPSearchField
2013-01-09 18:25:11 -08:00
Alexandre Wilhelm
7ba759b08a
Updated Aristo2 for toolBar
2013-01-09 18:24:32 -08:00
Alexandre Wilhelm
d4bf45a8b8
Moved psd to Artwork
2013-01-09 17:54:07 -08:00
Alexandre Wilhelm
d30425b2bd
Merge branch 'Aristo2' of github.mv.usa.alcatel.com:amercada/Cappuccino into Aristo2
2013-01-09 17:51:22 -08:00
Antoine Mercadal
5dee254fca
Add theme for CPShadowView
2013-01-09 17:49:22 -08:00
Alexandre Wilhelm
b4a58b47b3
Updated Aristo2
2013-01-09 17:35:59 -08:00
Alexandre Wilhelm
f809919561
Update Aristo2
2013-01-09 16:02:37 -08:00
Alexandre Wilhelm
51d6ba98d7
Updated aristo2
2013-01-09 14:21:53 -08:00
Alexandre Wilhelm
5100f6cb72
Updated psd with slices
2013-01-09 13:14:15 -08:00
Alexandre Wilhelm
73e56d820b
Merge branch 'Aristo2' of github.mv.usa.alcatel.com:amercada/Cappuccino into Aristo2
2013-01-09 13:10:15 -08:00
Alexandre Wilhelm
803cbae1dc
Updated Aristo2
2013-01-09 13:09:59 -08:00
Antoine Mercadal
97a766517b
Set content-margin size to zero for CPBox
2013-01-09 10:54:51 -08:00
Alexandre Wilhelm
4fd4b145d7
Updated Aristo2
2013-01-09 10:34:44 -08:00
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
5ec6d571eb
Improve theme for CPSplitView
2013-01-08 17:22:10 -08:00
Antoine Mercadal
911df72aeb
Add theme for CPLevelIndicator
2013-01-08 17:05:58 -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
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
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
18eda8aade
Add the HUD version of Aristo2
2013-01-07 17:34:43 -08:00
Antoine Mercadal
c95421f307
Add theme for CPBox (and it's an improved look)
2013-01-04 18:45:28 -08:00
Alexandre Wilhelm
aa1559b159
Added missing images
2013-01-04 11:57:12 -08:00
Alexandre Wilhelm
88dd2f1495
Fixed bug with tokenfield
2013-01-04 11:52:36 -08:00
Alexandre Wilhelm
eb2cd75370
Fixed bug in BKShowcasController with popUpButtons size
2013-01-04 10:32:35 -08:00
Alexandre Wilhelm
a1f166942c
Added new modal window
2013-01-03 18:14:13 -08:00