Francisco Ryan Tolmasky I
80097ea2a2
Merge branch 'master' into @each
2010-11-03 21:28:10 -07:00
Ross Boucher
b85e9d83b8
Fix for the fix for extensionless IB resource names.
2010-11-03 11:18:37 -07:00
Francisco Ryan Tolmasky I
2e9684e9a7
Fix for bottom corner view of CPScrollView being broken in CPCoding circumstances (normal coding, nib2cibing, Atlas, etc.).
...
Reviewed by me.
AB-19
2010-11-03 10:37:51 -07:00
Klaas Pieter Annema
a80a0d0a13
Complete the style fix started in previous commit
2010-11-03 14:13:55 +01:00
Francisco Ryan Tolmasky I
885eff1f9b
Style fix.
...
Reviewed by me.
2010-11-03 01:34:54 -07:00
Francisco Ryan Tolmasky I
706e80362d
Slight change to last commit, change == to ===.
...
Reviewed by me.
2010-11-03 01:25:08 -07:00
Brian Donovan and Francisco Ryan Tolmasky I
7bf2297125
-[CPArrayController setContent:] would interpret nil as [nil].
...
When initializing a CPArrayController with a value that is not an array setContent: would make it an array by replacing value with [value]. This is consistent with how Cocoa does it, but it should first check to make sure that the content is not nil. If it is, the sensible thing to do (and what Cocoa does) is to replace it with an empty array.
This commit also includes a missing import to make CPArrayControllerTest run without error.
2010-11-03 01:24:38 -07:00
Francisco Ryan Tolmasky I
99c1d18d95
Fix for targets and actions not working in nib2cibed toolbars.
...
Reviewed by me.
2010-11-03 00:36:30 -07:00
Ross Boucher
a45668e7cb
Updates to make nib2cib work better with CPToolbar (and with image resources in IB in general).
2010-11-02 20:31:43 -07:00
Francisco Ryan Tolmasky I
f46bbf83a8
Slight fix for correctness with --include.
...
Reviewed by me.
2010-11-01 11:26:59 -07:00
Francisco Ryan Tolmasky I
52f7844aee
Made it so .h files are automatically included in AppKit (avoiding needing to manually include Platform.h, etc.).
...
Also changed a bunch of <AppKit/*> imports to "*" imports.
Reviewed by me.
2010-11-01 11:10:01 -07:00
Klaas Pieter Annema
64aeea0f08
Merge branch 'runtime-theming'
2010-11-01 14:04:22 +01:00
Alexander Ljungberg
06db60d7df
Merge branch 'fix-cptabview-not-resizable' of http://github.com/primalmotion/cappuccino into primalmotion-fix-cptabview-not-resizable
2010-10-29 16:13:47 -03:00
Alexander Ljungberg
eb39e2e81a
Optimise token field redraws when adding or deleting tokens by recycling token fields. This eliminates the flicker of all previous tokens whenever a new token was added.
2010-10-29 14:40:46 -03:00
Alexander Ljungberg
0867ccdc73
Reduced token height by 1 pixel to put some more whitespace underneath it in a standard height token field.
2010-10-29 14:23:36 -03:00
Antoine Mercadal
8ead5f63da
fix CPtabViewTest
2010-10-28 11:01:38 +02:00
Alexander Ljungberg
a80732f13a
Whitespace and style cleanup.
2010-10-27 20:44:55 -03:00
Alexander Ljungberg
923d7c63b5
Fixed an accidental global.
2010-10-27 20:24:05 -03:00
Alexander Ljungberg
7626af00e7
Apply Cappuccino code style.
2010-10-27 20:16:14 -03:00
Alexander Ljungberg
1d647fab10
Merge branch 'CPPredicate-parsing' of http://github.com/cacaodev/cappuccino into cacaodev-CPPredicate-parsing
2010-10-27 19:34:44 -03:00
Alexander Ljungberg
c9fcbe0e93
Merge branch 'eventualbuddha-sprintf-format-parameter-indexes'
2010-10-27 19:26:51 -03:00
Alexander Ljungberg
6d9d443d0a
Merge branch 'sprintf-format-parameter-indexes' of http://github.com/eventualbuddha/cappuccino into eventualbuddha-sprintf-format-parameter-indexes
2010-10-27 19:16:50 -03:00
cacaodev
2a95523577
CPPredicate & CPExpression changes:
...
Parsing: fixed typos in built-in function names, fixed support for [FIRST], [LAST], [INDEX]
Fixed aggregates {exp1,exp2}
Fixed -expressionForFunction:selectorName:arguments:
built-in functions are now class methods
Cleaned a lot of code in built-in functions
EvaluatedObjectExpression is now a singleton
Merged inserset/minus/union Set into one file
Deleted unused expression subclasses : expression_operator and expression_assignement
Added CPCoding methods and changed key names to match Cocoa
Made KeyPathExpresion a subclass of FunctionExpression like in Cocoa
Tests
2010-10-27 00:57:31 +02:00
Klaas Pieter Annema
0fa149b74f
encode and decode themeClass
...
This makes it possible to theme any themeClass without having to subclass a CPView and return something different from defaultThemeClass. Theme a custom theme class by assigning to a control within the theme descriptor ([control setThemeClass:"your-theme-class"]).
2010-10-26 20:41:56 +02:00
Klaas Pieter Annema
c7fdad883a
add deprecation warning for class that have themeClass implemented
2010-10-25 16:14:33 +02:00
Klaas Pieter Annema
6e9f82212b
rename CPView +themeClass to +defaultThemeClass
2010-10-25 14:15:22 +02:00
Klaas Pieter Annema
22e2bdcd25
make theme class runtime configurable
2010-10-25 13:54:39 +02:00
Klaas Pieter Annema
85c9ca518f
lint cleanup in CPView
2010-10-25 13:54:19 +02:00
Alexander Ljungberg
29a93b20f4
Merge branch 'flllow-tokenfield-improvements'
2010-10-23 20:53:34 -03:00
Alexander Ljungberg
b95bdca2a3
Lint cleanup.
2010-10-23 20:47:11 -03:00
Alexander Ljungberg
6fd5f66a15
Support forward delete in token fields.
2010-10-23 20:42:01 -03:00
Alexander Ljungberg
9e235f7236
Fixed: clicking tokens in a token field could disable its keyboard handling due to the input field losing focus.
2010-10-23 20:21:02 -03:00
Alexander Ljungberg
90d12ef77e
Place the cursor correctly when arrow keys are used with one or more tokens selected. Fixed: the layout would not update to remove the gap for the editor if between tokens when resigning first responders.
2010-10-23 19:31:08 -03:00
Alexander Ljungberg
0c2301766a
Place the cursor after the last inserted token when editing.
2010-10-23 17:09:46 -03:00
Alexander Ljungberg
8a7b6054ef
If the text editing part of the token field is the last in the line, make it take up the remaining field width so that it captures clicks there.
2010-10-23 16:58:02 -03:00
Alexander Ljungberg
7037151bfc
Fixed: clicking a token would cause the token field to resign first responder status, only to reclaim it on mouse up.
...
This was caused by the framework's stop DOM event code blurring the field. Now simply refuse to resign first responder status between mouse down and mouse up. Note that this fixes the bug the previous commit did too, but that commit improves other scrolling behaviour so it gets to stay.
2010-10-23 16:00:45 -03:00
Alexander Ljungberg
ba26b19567
Fixed: if the token field was scrolled up and a token was clicked, the scroll position would jump back down.
2010-10-23 15:41:41 -03:00
Alexander Ljungberg
6587014014
Improve token field scrolling behaviour and performance: only resize the document view frame when necessary to prevent the loss of scroll position and display jumps. Fixed: if a token on a new line was clicked, the view would scroll up to the first line.
2010-10-23 14:36:42 -03:00
Alexander Ljungberg
80b16ae9ab
Bluer selected tokens in token field.
2010-10-23 14:07:46 -03:00
Alexander Ljungberg
07330a0ca8
Select tokens by clicking on them. Select multiple tokens by holding down shift. Also fixed a bug when deleting multiple tokens at a time.
2010-10-23 13:49:36 -03:00
cacaodev
c735399ca5
CPPredicate: Fix for fail when parsing empty quotes. With Tests.
2010-10-23 09:26:12 +02:00
Alexander Ljungberg
d68f4359ac
Reduce token shifting when a token is selected. Ideally there shouldn't be any shifting at all, but placing a tiny editor at the right spot simplifies scroll handling.
2010-10-23 00:22:40 -03:00
Alexander Ljungberg
d4cfa4b24f
Minor optimisations and cleanup.
2010-10-23 00:00:00 -03:00
Alexander Ljungberg
2912acb4f5
Simplify: remove _selectedTokenIndexes since we now have _selectedRange. Hide the editor when tokens are selected. Preserve cursor position when tokens are deleted.
2010-10-22 23:45:48 -03:00
Alexander Ljungberg
85683d8f18
Navigate among tokens with the arrow keys. Insert and delete tokens relative to the cursor.
2010-10-22 20:43:40 -03:00
Brian Donovan
8ca2a1bf5b
IE uses an empty string as the value of an empty capture group.
2010-10-22 14:41:31 -07:00
Brian Donovan
8427697a4b
Fix accidental globals.
2010-10-22 14:15:22 -07:00
cacaodev
275f89a340
CPPredicate: parsing 'BETWEEN' or 'CONTAINS' keywords now generates predicates with their corresponding operators. Some code style.
...
CPComparisonPredicate: fixed typo in 'between' operator evaluation, simplified 'contains' and 'in' evaluation.
Added tests in CPPredicateTest for theses fixes.
2010-10-22 22:13:57 +02:00
Klaas Pieter Annema
49c8a02b5f
cleanup in CPSplitView and the Aristo ThemeDescriptors
2010-10-22 13:55:37 +02:00
Klaas Pieter Annema
1165e569d2
make splitview pane divider color theme-able
2010-10-22 13:54:39 +02:00