gyeongmin.ju [Sat, 31 May 2014 06:24:18 +0000 (15:24 +0900)]
UIB: add protection code for non-descriptor project
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ie1f406c9723f24496c4a970c866ec6c9ed6f9a4f
Changyeon Lee [Sat, 31 May 2014 06:11:17 +0000 (23:11 -0700)]
Merge "ANIMATOR : Add protection code for generate js and css string Add check code that there are any animation in page part so it is not, just pass after logic Set pageData in HoverBrowserView when current page edit part changed" into develop
seongwon.shim [Sat, 31 May 2014 06:03:02 +0000 (15:03 +0900)]
ANIMATOR : Add protection code for generate js and css string
Add check code that there are any animation in page part so it is not, just pass after logic
Set pageData in HoverBrowserView when current page edit part changed
Change-Id: I74f2b05f008251585e921aec1eb5c58c60153c51
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
yonghwan82.jeon [Sat, 31 May 2014 05:13:41 +0000 (14:13 +0900)]
UIB : remove help content of widget in Pagedeisnger.
remove help content of widget.
Change-Id: Ic44224c683bf9488b8360ffa02c8d48a71137596
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jinwooim.bae [Fri, 30 May 2014 11:03:54 +0000 (20:03 +0900)]
ANIMATOR : Init toolbar, scroll, treeviewer
Timeline will be updated when Animationgroup is created
Change-Id: I680e4a5e55305129de792704f38ebd691929f73d
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
seongwon.shim [Fri, 30 May 2014 10:21:39 +0000 (19:21 +0900)]
ANIMATOR : Rename class
Rename class name AnimatorFrame -> AnimatorKeyframe and AnimatorKeyframe -> AnimatorKeyframeUnit
Change-Id: I1374b1514957ffa38b9277c8fd28e3d5dea956af
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Fri, 30 May 2014 10:23:24 +0000 (03:23 -0700)]
Merge "PROP: check used properties in the goto page action" into develop
Changyeon Lee [Fri, 30 May 2014 10:22:37 +0000 (03:22 -0700)]
Merge "ANIMATOR : Bug fix for fire event Bug fix for fire event when Keyframe added to timeline view" into develop
Changyeon Lee [Fri, 30 May 2014 10:22:22 +0000 (03:22 -0700)]
Merge "ANIMATOR : Modified Filter in Linux Platform Refresh TimelineView in linux platform." into develop
jaeyeol lee [Fri, 30 May 2014 10:13:32 +0000 (19:13 +0900)]
PROP: check used properties in the goto page action
Change-Id: I6a05aafdaadafe17df8e495547767671108402d3
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
yonghwan82.jeon [Fri, 30 May 2014 04:59:33 +0000 (13:59 +0900)]
Merge remote-tracking branch 'origin/mw' into develop2
* origin/mw:
Merge remote-tracking branch 'origin/develop' into mw
Merge remote-tracking branch 'origin/develop' into mw
UIB : update version. update version.
Change-Id: I5ab911d344c33b7013bceba2c5debd2bc2ecc80a
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
seongwon.shim [Fri, 30 May 2014 04:33:06 +0000 (13:33 +0900)]
ANIMATOR : Bug fix for fire event
Bug fix for fire event when Keyframe added to timeline view
Change-Id: I058eb8e2ca2879962d32333bfdf8ab37099d152e
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
jinwooim.bae [Thu, 29 May 2014 16:26:16 +0000 (01:26 +0900)]
ANIMATOR : Modified Filter in Linux Platform
Refresh TimelineView in linux platform.
Change-Id: I0db42bd32d7f477082be6771c0cefe00abb83fd1
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
jinwooim.bae [Thu, 29 May 2014 14:14:43 +0000 (23:14 +0900)]
ANIMATOR : Modify FileWrite
Modified FileWrite after using the animator trigger action.
Change-Id: Iee9d4f80741bbd752a0dd010d67b6dab611bfc7c
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
Changyeon Lee [Thu, 29 May 2014 13:15:30 +0000 (06:15 -0700)]
Merge "NSCREEN : remove orientation button, etc. 1. fix default device of mobile 2. fix default device of common feature 3. hide orientation button" into develop
Changyeon Lee [Thu, 29 May 2014 13:15:13 +0000 (06:15 -0700)]
Merge "PAGETEMP: Changed from 'Name' to 'ID' in New Page Template wizard" into develop
jooyoul_lee [Thu, 29 May 2014 13:12:29 +0000 (22:12 +0900)]
NSCREEN : remove orientation button, etc.
1. fix default device of mobile
2. fix default device of common feature
3. hide orientation button
Change-Id: I1e572a354e4ea025bd9072146e22f1790dbc53c2
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
youngd [Thu, 29 May 2014 13:09:11 +0000 (22:09 +0900)]
PAGETEMP: Changed from 'Name' to 'ID' in New Page Template wizard
Change-Id: I4ec5280d03b1d99b675513139dabc922e0f41ab5
Signed-off-by: youngd <youngduk.hwang@samsung.com>
yonghwan82.jeon [Thu, 29 May 2014 12:58:55 +0000 (21:58 +0900)]
NSCREEN: modify device list and screen feature list.
Change-Id: I5cb0e5d2cb486b760b258ad8dcc74fae108a21e1
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Thu, 29 May 2014 12:20:02 +0000 (05:20 -0700)]
Merge "UIB: Added Wizard Title about Snippet and Page Template." into develop
youngd [Thu, 29 May 2014 12:20:08 +0000 (21:20 +0900)]
UIB: Added Wizard Title about Snippet and Page Template.
Change-Id: Ia80c6c617a2210cccb8266db2fb9107b3756ed99
Signed-off-by: youngd <youngduk.hwang@samsung.com>
Changyeon Lee [Thu, 29 May 2014 12:19:53 +0000 (05:19 -0700)]
Merge "ANIMATOR : Modify Animation Delete Dialog Changed Animation Delete Dialog." into develop
Changyeon Lee [Thu, 29 May 2014 12:18:51 +0000 (05:18 -0700)]
Merge "DATABIND: add empty type in the data source" into develop
jinwooim.bae [Thu, 29 May 2014 12:17:57 +0000 (21:17 +0900)]
ANIMATOR : Modify Animation Delete Dialog
Changed Animation Delete Dialog.
Change-Id: Ie8640cbf38bdb54b21dc2b02b112254c65bd5bb8
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
jaeyeol lee [Thu, 29 May 2014 12:13:06 +0000 (21:13 +0900)]
DATABIND: add empty type in the data source
Change-Id: If2977807e7f929a724dd2825a2bed9ec7e89ed3e
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
seongwon.shim [Thu, 29 May 2014 12:08:03 +0000 (21:08 +0900)]
ANIMATOR : Bug fix for merge/split keyframe
Bug fix for merge/split keyframe. Use mergeOrSplit method in AnimationCreateAndChangeFrameCommand
Change-Id: I2968fb7034ab35475030f63423c6ccb7fe04428e
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Thu, 29 May 2014 12:07:01 +0000 (05:07 -0700)]
Merge "SNIPPET: fixed browse button border" into develop
youngd [Thu, 29 May 2014 12:04:46 +0000 (21:04 +0900)]
SNIPPET: fixed browse button border
Change-Id: If97f804d2395abd882e751e62e34845d8efa1225
Signed-off-by: youngd <youngduk.hwang@samsung.com>
Changyeon Lee [Thu, 29 May 2014 12:01:40 +0000 (05:01 -0700)]
Merge "ANIMATOR : Change Dialog Layout Dialog Layout change for multiplatform." into develop
Changyeon Lee [Thu, 29 May 2014 12:01:32 +0000 (05:01 -0700)]
Merge "UIB: fixed the problem that widgets cannot add in the page after a page added." into develop
Changyeon Lee [Thu, 29 May 2014 12:01:24 +0000 (05:01 -0700)]
Merge changes Id7f8a4ef,Ib78d4824 into develop
* changes:
DATABIND: modify the view model icons
DATABIND: fixed wrong binding value in the listitem
Changyeon Lee [Thu, 29 May 2014 12:00:36 +0000 (05:00 -0700)]
Merge "PROP : Remove type property on DateTimePicker" into develop
Changyeon Lee [Thu, 29 May 2014 12:00:24 +0000 (05:00 -0700)]
Merge "NSCREEN : modify desriptor and event handler modify descriptor." into develop
gyeongmin.ju [Thu, 29 May 2014 11:53:21 +0000 (20:53 +0900)]
DESIGNER: add web inspector shortcut
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ieb0d9e0e35d65482c203698065e706eaa79502be
jinwooim.bae [Thu, 29 May 2014 11:53:17 +0000 (20:53 +0900)]
ANIMATOR : Change Dialog Layout
Dialog Layout change for multiplatform.
Change-Id: Ifdf0bf29786630a4690d38a0a66c87653cdca612
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
yonghwan82.jeon [Thu, 29 May 2014 11:26:55 +0000 (20:26 +0900)]
NSCREEN : modify desriptor and event handler
modify descriptor.
Change-Id: If4ac7c23fcba6365384eef7d675464e5b6b1f427
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jaeyeol lee [Thu, 29 May 2014 11:49:33 +0000 (20:49 +0900)]
DATABIND: modify the view model icons
Change-Id: Id7f8a4eff4ac0f54230b9ed5e1c16cb547e88a78
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
nakyoung2.choi [Thu, 29 May 2014 11:46:35 +0000 (20:46 +0900)]
PROP : Remove type property on DateTimePicker
Change-Id: I31319dd0109b47635b04961dac0671e7907dc4ea
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
youngd [Thu, 29 May 2014 11:46:19 +0000 (20:46 +0900)]
UIB: fixed the problem that widgets cannot add in the page after a page added.
Change-Id: Iea3f93c50b88a21e5ef384ba78938ab823b936f1
Signed-off-by: youngd <youngduk.hwang@samsung.com>
jaeyeol lee [Thu, 29 May 2014 11:33:19 +0000 (20:33 +0900)]
DATABIND: fixed wrong binding value in the listitem
Change-Id: Ib78d482433a8bab188c194b21676e94991db747a
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
jaeyeol lee [Thu, 29 May 2014 11:09:56 +0000 (20:09 +0900)]
DATABIND: change icons
Change-Id: I704ea70dcc2ee13f15e11d66c84add2c33b0eec0
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
nakyoung2.choi [Thu, 29 May 2014 10:55:57 +0000 (19:55 +0900)]
PROP : Remove 'reset css selector'
Change-Id: Icc83139133496db5f4c0e8e9039ca0c18801ec40
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
Changyeon Lee [Thu, 29 May 2014 10:48:21 +0000 (03:48 -0700)]
Merge "DATABIND : Set Source Dialog Modify. add button icons. remove undefined data type." into develop
Changyeon Lee [Thu, 29 May 2014 10:12:20 +0000 (03:12 -0700)]
Merge "ANIMATOR : Bug fix for change page Create AnimatorEditPart when page added" into develop
Changyeon Lee [Thu, 29 May 2014 10:12:11 +0000 (03:12 -0700)]
Merge "ANIMATOR : Change Text to Label TimeTextBox is SWT Label." into develop
Changyeon Lee [Thu, 29 May 2014 10:12:03 +0000 (03:12 -0700)]
Merge "UIB : boiler plate added. 1. boiler plate added 2. nscreen defaultDevice changed (360x640 -> 720x1280)" into develop
parary [Thu, 29 May 2014 10:09:51 +0000 (19:09 +0900)]
DATABIND : Set Source Dialog Modify.
add button icons.
remove undefined data type.
Change-Id: I13d18f681a22cc02d7a04601f3d2375ec7239e61
Signed-off-by: parary <kyunghan80.park@samsung.com>
jinwooim.bae [Thu, 29 May 2014 09:45:17 +0000 (18:45 +0900)]
ANIMATOR : Change Text to Label
TimeTextBox is SWT Label.
Change-Id: I537943934369228f8ed1194576c6dc7185507e8f
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
Changyeon Lee [Thu, 29 May 2014 09:49:17 +0000 (02:49 -0700)]
Merge "DATABIND: modify the code gen for databinging" into develop
Changyeon Lee [Thu, 29 May 2014 09:48:38 +0000 (02:48 -0700)]
Merge "PROP : Remove Custom CSS" into develop
Changyeon Lee [Thu, 29 May 2014 09:48:27 +0000 (02:48 -0700)]
Merge "UIB : Fix NPE." into develop
jooyoul_lee [Thu, 29 May 2014 09:46:51 +0000 (18:46 +0900)]
UIB : boiler plate added.
1. boiler plate added
2. nscreen defaultDevice changed (360x640 -> 720x1280)
Change-Id: I1b0b57cd4337d9507b64556e39f373ed68f4dd34
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
seongwon.shim [Thu, 29 May 2014 09:45:31 +0000 (18:45 +0900)]
ANIMATOR : Bug fix for change page
Create AnimatorEditPart when page added
Change-Id: I71424e315edbd7392d3fe513964de294daefd9b6
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
nakyoung2.choi [Thu, 29 May 2014 09:44:58 +0000 (18:44 +0900)]
PROP : Remove Custom CSS
Change-Id: Icddb155ecb5ff8b3316929b09b8242cc3c3fbb36
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
parary [Thu, 29 May 2014 09:42:20 +0000 (18:42 +0900)]
DATABIND : Set Source Dialog Modify.
add button icons.
Change-Id: I938fb05e4f71da7cec0d40feb0c9644c4a29eefc
Signed-off-by: parary <kyunghan80.park@samsung.com>
nakyoung2.choi [Thu, 29 May 2014 08:33:11 +0000 (17:33 +0900)]
UIB : Fix NPE.
Change-Id: I2ea37756537f342b686a83c27ee2699252efac76
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jaeyeol lee [Thu, 29 May 2014 08:30:11 +0000 (17:30 +0900)]
DATABIND: modify the code gen for databinging
Change-Id: Ife7c266b8926753e209c3a929314c12d7bb4d86a
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
Changyeon Lee [Thu, 29 May 2014 08:28:01 +0000 (01:28 -0700)]
Merge "DATABIND: add the boilerplate change the class name" into develop
Changyeon Lee [Thu, 29 May 2014 08:27:50 +0000 (01:27 -0700)]
Merge "ANIMATOR : Refresh TimeText TimeText is refreshing when move playheader." into develop
Changyeon Lee [Thu, 29 May 2014 08:27:38 +0000 (01:27 -0700)]
Merge "UIB : merge mw" into develop
Changyeon Lee [Thu, 29 May 2014 08:27:25 +0000 (01:27 -0700)]
Merge "ANIMATOR : Add boilerplate Add bolierplate. Bug fix for splitKeyframe" into develop
jaeyeol lee [Thu, 29 May 2014 08:05:44 +0000 (17:05 +0900)]
DATABIND: add the boilerplate
change the class name
Change-Id: Icd8717c8e9d7c6b2950cbd1e47628a528bfaceb5
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
jinwooim.bae [Thu, 29 May 2014 07:56:29 +0000 (16:56 +0900)]
ANIMATOR : Refresh TimeText
TimeText is refreshing when move playheader.
Change-Id: Ie1397dac866b8a13602eb3ddf413f755db69c44d
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
yonghwan82.jeon [Thu, 29 May 2014 07:05:48 +0000 (16:05 +0900)]
UIB : merge mw
Change-Id: If41b78df9487161201eedeee988f733a1a5ea3ac
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
seongwon.shim [Thu, 29 May 2014 06:50:17 +0000 (15:50 +0900)]
ANIMATOR : Add boilerplate
Add bolierplate.
Bug fix for splitKeyframe
Change-Id: I3246b47225c75447cd0b3fca8acb7fef41593a0b
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
nakyoung2.choi [Thu, 29 May 2014 06:37:38 +0000 (15:37 +0900)]
PROP : Add boilerplate.
Change-Id: I6b2e701e18d484d9c30c2ecb18108349cbad96a0
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jinwooim.bae [Thu, 29 May 2014 06:36:55 +0000 (15:36 +0900)]
ANIMATOR : Bug fix
This is build bug.
Change-Id: I36fb38efc2315fe35348ad6ca34f0ae249b24388
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
yonghwan82.jeon [Thu, 29 May 2014 06:24:58 +0000 (15:24 +0900)]
UIB : update version.
update version.
Change-Id: Idc803aeeac87fc9a16a020657d071599d6ac9f19
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Thu, 29 May 2014 05:45:30 +0000 (22:45 -0700)]
Merge "PAGES: fixed the problem that the page name is not changed on the thunmnail page when a page ID is changed." into develop
jeonghwan kim [Thu, 29 May 2014 05:36:43 +0000 (14:36 +0900)]
UIB : Modify NOTICE file
Change-Id: I13a272df8db9f8501d1df53c2444fb4cb94d29eb
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
youngduk.hwang [Thu, 29 May 2014 05:36:14 +0000 (14:36 +0900)]
PAGES: fixed the problem that the page name is not changed on the
thunmnail page when a page ID is changed.
Change-Id: I62e4965f4d9a9e599c9c0213fe9bc2e9d37bd545
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
Changyeon Lee [Thu, 29 May 2014 05:15:23 +0000 (22:15 -0700)]
Merge "PAGES: fixed the problem that Editor is not changed when an empty page is added. IPageDataSetListener is added at PageDesigner." into develop
Changyeon Lee [Thu, 29 May 2014 05:14:56 +0000 (22:14 -0700)]
Merge "UIB : Add W3C, MPL2.0 License" into develop
Changyeon Lee [Thu, 29 May 2014 05:14:28 +0000 (22:14 -0700)]
Merge "ANIMATOR : Bug fix for merge/split keyframe Condition added for predefined and previous/next Keyframe unit getter metod" into develop
youngduk.hwang [Thu, 29 May 2014 04:56:24 +0000 (13:56 +0900)]
PAGES: fixed the problem that Editor is not changed when an empty page is
added.
IPageDataSetListener is added at PageDesigner.
Change-Id: Ied294a0d56cade645c63594914d30df376852eff
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
jeonghwan kim [Thu, 29 May 2014 03:32:19 +0000 (12:32 +0900)]
UIB : Add W3C, MPL2.0 License
Change-Id: I6601e876f03a880f93f42b55d56fce008c827f16
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
Changyeon Lee [Thu, 29 May 2014 02:23:51 +0000 (19:23 -0700)]
Merge "DATABIND : Set Source Dialog Modify and Bug Fix. modify - xmlToJson converter ( attribute prefix, text prefix ). bug fix - File select dialog double click error. bug fix - xml data include line feed error. bug fix - tree item height lower than combo in tree." into develop
jinwooim.bae [Wed, 28 May 2014 08:57:37 +0000 (17:57 +0900)]
ANIMATOR : Synchronize Animation stop time
When the animation stops during operation time synchronization.
Change-Id: I08e5f39550c7d5cc5a70c8cb60a39742ae269706
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
parary [Thu, 29 May 2014 01:51:07 +0000 (10:51 +0900)]
DATABIND : Set Source Dialog Modify and Bug Fix.
modify - xmlToJson converter ( attribute prefix, text prefix ).
bug fix - File select dialog double click error.
bug fix - xml data include line feed error.
bug fix - tree item height lower than combo in tree.
Change-Id: Iec53e4091a26ac8e7cd91ee1d115c2d0990f0638
Signed-off-by: parary <kyunghan80.park@samsung.com>
seongwon.shim [Wed, 28 May 2014 11:11:54 +0000 (20:11 +0900)]
ANIMATOR : Bug fix for merge/split keyframe
Condition added for predefined and previous/next Keyframe unit getter metod
Change-Id: Iaef27bbbe8e04e5b8b5e02770c979625678c4cc4
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
youngduk.hwang [Wed, 28 May 2014 08:22:01 +0000 (17:22 +0900)]
UIB: merge mw
Change-Id: I70fd3505a51d968fa0b4cbb09dc3cbf3c4fa5a86
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
youngduk.hwang [Wed, 28 May 2014 07:24:08 +0000 (16:24 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop: (40 commits)
DATABIND : support the file system (code gen)
ANIMATOR : Refresh Scroll Zoom In/out Scroll is refreshed when zoom in/out flow.
UIB: modify the JNI code
UIB: changed managed.css to index.managed.css
UIB: add data-uib attirbute to script, link tag
DATABIND : bug fix - combo lazy rendering in Set source Dialog.
ANIMATOR : Move PlayHeader During a play time of a page beyond the mask, move the other page.
UIB: added "getNewIdProperty" method in Part Now we can know a part's IdProperty before the part is added. Then unnecessary PropertyChanged event won't be fired.
PAGETEMP: fixed context menu text. from "Delete Page" to "Delete Template"
ANIMATOR : Change TimeTextBox State TextBox's color will be changed If some number is inserted.
UIB: add showInspector func
ANIMATOR : Changed Animator Timeline UI/UX New UI is applied Animator's Timeline.
UIB : add webinspector
DATABIND : Modify Set Source Dialog. change source type name Upper case to lower case( Static, Remote, File System Data source). static data source text update when combo in tree select . data model use compact data string.
ANIMATOR : Implements method that get Previous KeyframeUnit by time When mergeKeyframe unit get Previous Keyframe unit by current time. not index of list
Merge remote-tracking branch 'origin/mw' into develop
UIB : Fix initializing index.html. Remove managed.css when index.html loading time.
PROP : Advanced border style layout.
DATABIND : update listdivider widget descriptor a. add text binding for the listdivider widget
NSCREEN : remove move action 1. nscreen item : remove move action
...
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorFrame.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorKeyframe.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineContentContainer.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/common/TimelineConstants.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/tool/TimelineToolbar.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/tree/TimelineOutlineElement.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/widget/KeyFrameUnit.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForHTML.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/SetSourcePage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/StaticSubPage.java
Change-Id: Ic539c314c421edb068a159059ded07e87164e22e
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
Changyeon Lee [Wed, 28 May 2014 06:33:38 +0000 (23:33 -0700)]
Merge "DATABIND : support the file system (code gen)" into develop
Changyeon Lee [Wed, 28 May 2014 06:33:29 +0000 (23:33 -0700)]
Merge "ANIMATOR : Refresh Scroll Zoom In/out Scroll is refreshed when zoom in/out flow." into develop
jaeyeol lee [Wed, 28 May 2014 06:13:14 +0000 (15:13 +0900)]
DATABIND : support the file system (code gen)
Change-Id: I0acb442ac0a6c74d50d8856dbbf757167b821130
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
jinwooim.bae [Wed, 28 May 2014 06:03:52 +0000 (15:03 +0900)]
ANIMATOR : Refresh Scroll Zoom In/out
Scroll is refreshed when zoom in/out flow.
Change-Id: I114ba67b79dd6ba8dde3851374bba9b89cb9c5aa
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
jaeyeol lee [Wed, 28 May 2014 06:04:19 +0000 (15:04 +0900)]
UIB: modify the JNI code
Change-Id: I137485bd1fc168faff4521a47cd90a224e74b8cc
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
gyeongmin.ju [Wed, 28 May 2014 05:44:00 +0000 (14:44 +0900)]
UIB: changed managed.css to index.managed.css
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Id8923bda8ac94ea61d34e5e697c1621714734fb7
Changyeon Lee [Wed, 28 May 2014 05:36:15 +0000 (22:36 -0700)]
Merge "ANIMATOR : Move PlayHeader During a play time of a page beyond the mask, move the other page." into develop
gyeongmin.ju [Wed, 28 May 2014 05:10:52 +0000 (14:10 +0900)]
UIB: add data-uib attirbute to script, link tag
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: If06c63fa505d08144b38ba563b1c44740ee8796b
Changyeon Lee [Wed, 28 May 2014 03:25:23 +0000 (20:25 -0700)]
Merge " DATABIND : bug fix - combo lazy rendering in Set source Dialog." into develop
Changyeon Lee [Wed, 28 May 2014 03:24:19 +0000 (20:24 -0700)]
Merge "UIB: added "getNewIdProperty" method in Part Now we can know a part's IdProperty before the part is added. Then unnecessary PropertyChanged event won't be fired." into develop
Changyeon Lee [Wed, 28 May 2014 03:23:41 +0000 (20:23 -0700)]
Merge "PAGETEMP: fixed context menu text. from "Delete Page" to "Delete Template"" into develop
parary [Wed, 28 May 2014 02:16:14 +0000 (11:16 +0900)]
DATABIND : bug fix - combo lazy rendering in Set source Dialog.
Change-Id: I515af0d7dff32952a8d2dad362cdda7870180444
Signed-off-by: parary <kyunghan80.park@samsung.com>
jinwooim.bae [Wed, 28 May 2014 02:09:59 +0000 (11:09 +0900)]
ANIMATOR : Move PlayHeader
During a play time of a page beyond the mask, move the other page.
Change-Id: Id3310939139aa5d6cf8a79978b758f04dff76e4b
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
youngduk.hwang [Tue, 27 May 2014 14:24:25 +0000 (23:24 +0900)]
UIB: added "getNewIdProperty" method in Part
Now we can know a part's IdProperty before the part is added. Then
unnecessary PropertyChanged event won't be fired.
Change-Id: I26846cfef82da43864d96fad0176bd82a01d6204
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
youngduk.hwang [Tue, 27 May 2014 14:20:29 +0000 (23:20 +0900)]
PAGETEMP: fixed context menu text.
from "Delete Page" to "Delete Template"
Change-Id: I192cb513c40600b1f453be172955032894a50eb8
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
jinwooim.bae [Tue, 27 May 2014 12:05:15 +0000 (21:05 +0900)]
ANIMATOR : Change TimeTextBox State
TextBox's color will be changed If some number is inserted.
Change-Id: I58c236261c6f99d6d2beb83deb7e81d820bc0239
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
Changyeon Lee [Tue, 27 May 2014 10:43:37 +0000 (03:43 -0700)]
Merge "UIB: add showInspector func" into develop
gyeongmin.ju [Tue, 27 May 2014 10:44:08 +0000 (19:44 +0900)]
UIB: add showInspector func
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I0b35b5abeb2b7554cdd0a457136e00500adeb129