Changyeon Lee [Mon, 16 Jun 2014 02:36:14 +0000 (19:36 -0700)]
Merge "UIB: Css File layer feature add, etc. 1. Css File Layer feature added 2. Designer toolbar refactoring => Toolbar and ResolutionManager 3. move nscreen files -> move nscreen to nscreen/widgets 4. Css style info dialog added (renamming later...)" into develop
jooyoul_lee [Fri, 13 Jun 2014 02:21:29 +0000 (11:21 +0900)]
UIB: Css File layer feature add, etc.
1. Css File Layer feature added
2. Designer toolbar refactoring => Toolbar and ResolutionManager
3. move nscreen files -> move nscreen to nscreen/widgets
4. Css style info dialog added (renamming later...)
Change-Id: I22a8109bd4e288a50b5bd76a1fd09f2d8ca35c42
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
Changyeon Lee [Fri, 13 Jun 2014 02:15:11 +0000 (19:15 -0700)]
Merge "DATABIND: change the icon files" into develop
Changyeon Lee [Fri, 13 Jun 2014 02:11:45 +0000 (19:11 -0700)]
Merge "ANIMATOR : Change time related data type Change data type(double -> int) for time related variable" into develop
jaeyeol lee [Fri, 13 Jun 2014 02:01:14 +0000 (11:01 +0900)]
DATABIND: change the icon files
Change-Id: Iba45f8addd7e24fa8ef32ec2ad539bf18dba5759
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
seongwon.shim [Wed, 11 Jun 2014 07:14:52 +0000 (16:14 +0900)]
ANIMATOR : Change time related data type
Change data type(double -> int) for time related variable
Change-Id: Ie6b96a7a1a4e232dde75ede90ebdbe04edfe96e6
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
yonghwan82.jeon [Wed, 11 Jun 2014 01:30:51 +0000 (10:30 +0900)]
NSCREEN : modify text of toolbar.
Modify text of toolbar.
Change-Id: I407a5719b921cce782a8d37b0cf6fe549e815dfd
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Wed, 11 Jun 2014 01:20:16 +0000 (18:20 -0700)]
Merge "NSCREEN : bugfix null of nscreen descriptor. if nscreen descriptor was null, common is exsit. if meta file was read, do not read descriptor." into develop
Changyeon Lee [Wed, 11 Jun 2014 01:20:02 +0000 (18:20 -0700)]
Merge "ANIMATOR : Command refactoring Define AnimatorCommandInfo that could be passed to Animator Model from command" into develop
yonghwan82.jeon [Tue, 10 Jun 2014 04:08:47 +0000 (13:08 +0900)]
NSCREEN : bugfix null of nscreen descriptor.
if nscreen descriptor was null, common is exsit.
if meta file was read, do not read descriptor.
Change-Id: I2ed59658b39752323c47cc86fa4c45e3baaf201f
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Tue, 10 Jun 2014 05:38:33 +0000 (22:38 -0700)]
Merge changes I22474c1d,I7ae07f79 into develop
* changes:
PAGES: A page can be moved in pages view. Added MovePageCommand.
PAGES: A page can be added after selected page in pages view.
Changyeon Lee [Tue, 10 Jun 2014 05:37:36 +0000 (22:37 -0700)]
Merge "ANIMATOR : Modify TimeTextBox This TimeTextBox's text is modified by user keyControl." into develop
seongwon.shim [Tue, 10 Jun 2014 01:49:40 +0000 (10:49 +0900)]
ANIMATOR : Command refactoring
Define AnimatorCommandInfo that could be passed to Animator Model from command
Change-Id: I8735538b85acee27c966305d255c5db2a7304800
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
jaeyeol lee [Tue, 10 Jun 2014 01:52:14 +0000 (10:52 +0900)]
DATABIND: open the databinding view
Change-Id: I145e0e63ce7a82c638a9bb151913e2571ffdd4a7
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
youngd [Mon, 9 Jun 2014 20:27:08 +0000 (05:27 +0900)]
PAGES: A page can be moved in pages view.
Added MovePageCommand.
Change-Id: I22474c1dcc69b52b9b4d02cf3760dbd727df4bbf
Signed-off-by: youngd <youngduk.hwang@samsung.com>
youngd [Mon, 9 Jun 2014 13:21:16 +0000 (22:21 +0900)]
PAGES: A page can be added after selected page in pages view.
Change-Id: I7ae07f79928cbf1f4ee52db07e472681836e750d
Signed-off-by: youngd <youngduk.hwang@samsung.com>
jinwooim.bae [Mon, 9 Jun 2014 11:19:19 +0000 (20:19 +0900)]
ANIMATOR : Modify TimeTextBox
This TimeTextBox's text is modified by user keyControl.
Change-Id: Ic0dd894565478b36df0be501af704fb21cc0ef4d
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
nakyoung2.choi [Mon, 9 Jun 2014 04:38:05 +0000 (13:38 +0900)]
UIB : Notify multiple styles when set position and set size.
Change-Id: Ib187a3eaaacdf48c60c3f9cf43818b7e968ffdad
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
Changyeon Lee [Mon, 9 Jun 2014 03:54:24 +0000 (20:54 -0700)]
Merge "NSCREEN : prevent null of nscreen descriptor. if ScreenFeatures.xml was not exist, descriptor is null. prevent null of descriptor." into develop
yonghwan82.jeon [Mon, 9 Jun 2014 01:53:05 +0000 (10:53 +0900)]
NSCREEN : prevent null of nscreen descriptor.
if ScreenFeatures.xml was not exist, descriptor is null.
prevent null of descriptor.
Change-Id: I48017d72da65126783b2020326e33159df30c231
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Mon, 9 Jun 2014 01:36:15 +0000 (18:36 -0700)]
Merge "ANIMATOR : Bug fix for playing animation 1. when apply animation to just added widget, widet info has not been constructed in model, So AnimationFw could not realize existing about widget which just added init animationFW after model construct and remove updateModel method in AnimatorBrowserView 2. Change object usage in command(On going)" into develop
dongjo hwang [Mon, 9 Jun 2014 01:21:07 +0000 (18:21 -0700)]
Merge "SNIPPET: Snippet UX improvement Added images filter when a snippet is created. The state is retained in the palette after a snippet is added. And The snippets folder is spread." into develop
youngd [Tue, 3 Jun 2014 14:04:25 +0000 (23:04 +0900)]
SNIPPET: Snippet UX improvement
Added images filter when a snippet is created.
The state is retained in the palette after a snippet is added. And
The snippets folder is spread.
Change-Id: I81d3eaf821b90413a0c09f7a0cc423b1f25ea7f9
Signed-off-by: youngd <youngduk.hwang@samsung.com>
yonghwan82.jeon [Tue, 27 May 2014 11:58:43 +0000 (20:58 +0900)]
NSCREEN : add nscreen descritor and xml file.
Added xml file for nscreen descriptor.
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenUtil.java
Change-Id: Id265d356601df11f74c565efc043f509b9fd01c5
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
seongwon.shim [Tue, 3 Jun 2014 08:53:52 +0000 (17:53 +0900)]
ANIMATOR : Bug fix for playing animation
1. when apply animation to just added widget, widet info has not been constructed in model, So AnimationFw could not realize existing about widget which just added init animationFW after model construct and remove updateModel method in AnimatorBrowserView
2. Change object usage in command(On going)
Change-Id: I7b673f44d68bb24af51dc6b599bdb904a23b52ea
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Tue, 3 Jun 2014 09:04:54 +0000 (02:04 -0700)]
Merge "UIB : Add Boilerplate" into develop
Changyeon Lee [Tue, 3 Jun 2014 09:04:38 +0000 (02:04 -0700)]
Merge "ANIMATOR : Delete Parent Widget Child widgets will delete If parent widget is deleted." into develop
jeonghwan kim [Tue, 3 Jun 2014 08:48:51 +0000 (17:48 +0900)]
UIB : Add Boilerplate
Change-Id: I4d01932761daa48768d4203cea1acec54005c042
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
jinwooim.bae [Tue, 3 Jun 2014 05:36:57 +0000 (14:36 +0900)]
ANIMATOR : Delete Parent Widget
Child widgets will delete If parent widget is deleted.
Change-Id: I7b24b0d4c3e6c524ec61ba5bd4bfd2223bbd8366
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
seongwon.shim [Tue, 3 Jun 2014 05:15:07 +0000 (14:15 +0900)]
ANIMATOR : Bug fix for delete widgets
Bug fix for delete widgets and undo logic
Change-Id: I326405a357132cfb15454341a543093a17fa5c06
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Tue, 3 Jun 2014 04:08:23 +0000 (21:08 -0700)]
Merge "ANIMATOR : Bug fix for merge/split keyframeUnit Implements additional logic for keyframe that has not any property" into develop
seongwon.shim [Tue, 3 Jun 2014 01:25:09 +0000 (10:25 +0900)]
ANIMATOR : Bug fix for merge/split keyframeUnit
Implements additional logic for keyframe that has not any property
Change-Id: Ic91fc46ea6376fef55e668acff36973526fdeff4
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
yonghwan82.jeon [Mon, 2 Jun 2014 13:07:27 +0000 (22:07 +0900)]
Merge remote-tracking branch 'origin/mw' into develop
* origin/mw:
UIB : modify packageinfo.
Merge remote-tracking branch 'origin/develop' into mw
UIB :update version. update version.
Merge remote-tracking branch 'origin/develop' into mw
Merge remote-tracking branch 'origin/develop' into mw
Merge remote-tracking branch 'origin/develop' into mw
Merge remote-tracking branch 'origin/develop' into mw
Merge remote-tracking branch 'origin/develop' into mw
UIB : update version. update version.
Change-Id: I687eed39a5ff8a5b6b7ff36fa499c1ea256fa0d7
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Mon, 2 Jun 2014 12:22:59 +0000 (05:22 -0700)]
Merge "ANIMATOR : Enable/Disable Predefined KeyFrame Button Predefined keyframe Button is enable If widget or selector are selected." into develop
yonghwan82.jeon [Mon, 2 Jun 2014 12:19:48 +0000 (21:19 +0900)]
UIB : Add license in ani-bridge.js.
Add license in ani-bridge.js
Change-Id: Ia37a7e474db015a5872bc35b469a2a28d1b86205
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jinwooim.bae [Mon, 2 Jun 2014 12:17:51 +0000 (21:17 +0900)]
ANIMATOR : Enable/Disable Predefined KeyFrame Button
Predefined keyframe Button is enable If widget or selector are selected.
Change-Id: I4aa80a15038a5117cae6e3f721b145b42f77c2a7
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
Changyeon Lee [Mon, 2 Jun 2014 11:32:19 +0000 (04:32 -0700)]
Merge "DESINGER: add protection code when widget deleted" into develop
Changyeon Lee [Mon, 2 Jun 2014 11:31:58 +0000 (04:31 -0700)]
Merge "UIB : Add license information for ground.js" into develop
Changyeon Lee [Mon, 2 Jun 2014 11:31:46 +0000 (04:31 -0700)]
Merge "PROP : Removes carriage return." into develop
Changyeon Lee [Mon, 2 Jun 2014 11:31:32 +0000 (04:31 -0700)]
Merge changes I6385a657,I650e726b into develop
* changes:
UIB: Modified HTML Dom loading process. Changed from using document to using body element in html loading process. And importing is performed before making part when a new paged is added.
UIB: added bolierplates
Changyeon Lee [Mon, 2 Jun 2014 11:31:20 +0000 (04:31 -0700)]
Merge "DATABIND: add a boilerplate" into develop
gyeongmin.ju [Mon, 2 Jun 2014 11:28:05 +0000 (20:28 +0900)]
DESINGER: add protection code when widget deleted
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Id4ee4813cb12754c7782d9f1ccd03d90ddd78b0c
nakyoung2.choi [Mon, 2 Jun 2014 09:31:33 +0000 (18:31 +0900)]
UIB : Add license information for ground.js
Change-Id: Id55390b1958c83690621e9ed3500274bb341adbe
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
youngd [Mon, 2 Jun 2014 07:48:08 +0000 (16:48 +0900)]
UIB: Modified HTML Dom loading process.
Changed from using document to using body element in html loading process.
And importing is performed before making part when a new paged is added.
Change-Id: I6385a65791ca6944b209c4ed18b0dc46e099859f
Signed-off-by: youngd <youngduk.hwang@samsung.com>
seongwon.shim [Mon, 2 Jun 2014 06:43:04 +0000 (15:43 +0900)]
ANIMATOR : Bug fix for animation playing
Remove return logic when animation does not exist in getOneAnimationGroupModelString and getAnimationCSSString because at leaste widget hierarhcy have to pass to animatorFW when initFw is called
Change-Id: I11f296e6f26b7e072d855c24a1df64d1f079cd91
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
seongwon.shim [Mon, 2 Jun 2014 05:38:56 +0000 (14:38 +0900)]
ANIMATOR : Convert CRLF to LF
Convert CRLF to LF in several files in animator
Change-Id: I733db83b5507c77f9c9d77a9ca340eee9b623261
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
nakyoung2.choi [Mon, 2 Jun 2014 05:01:33 +0000 (14:01 +0900)]
PROP : Removes carriage return.
Change-Id: I0b0e7d84fe3eba0f9210553e0e5e77eb458510da
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jaeyeol lee [Mon, 2 Jun 2014 04:47:55 +0000 (13:47 +0900)]
DATABIND: add a boilerplate
Change-Id: I665caf746043b317323a4a138eac065c35a403c2
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
youngd [Mon, 2 Jun 2014 04:47:10 +0000 (13:47 +0900)]
UIB: added bolierplates
Change-Id: I650e726b491c6c7f4cde271e03b8ca79fdb9f9e0
Signed-off-by: youngd <youngduk.hwang@samsung.com>
jaeyeol lee [Sat, 31 May 2014 11:58:56 +0000 (20:58 +0900)]
PROP: modify the remove javascript function in the action tab
Change-Id: Iaa23290a4d4d00e1df590e1fd7a37784baf6fd40
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
nakyoung2.choi [Sat, 31 May 2014 09:46:20 +0000 (18:46 +0900)]
PROP : Removes data-bind property on AttributesTab.
Change-Id: I601bfabbe410b15fd595f6d434b6da8401d3e122
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jaeyeol lee [Sat, 31 May 2014 09:08:33 +0000 (18:08 +0900)]
UIB: Hide the Databinding view
Change-Id: I41d36309f87285a1856036c9db64c9d01dd52c7f
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
nakyoung2.choi [Sat, 31 May 2014 08:45:26 +0000 (17:45 +0900)]
PROP : Disable id property of Page.
Change-Id: I95163db027f2d49ed5f440ff8287d5cff388c760
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
Changyeon Lee [Sat, 31 May 2014 08:37:25 +0000 (01:37 -0700)]
Merge "UIB: added viewer refresh when ReloadCommand is executed." into develop
Changyeon Lee [Sat, 31 May 2014 08:37:11 +0000 (01:37 -0700)]
Merge "ANIMATOR : Applied Filter flow Animator timeline show applied filter list If user add widget on designer." into develop
Changyeon Lee [Sat, 31 May 2014 08:36:58 +0000 (01:36 -0700)]
Merge "NSCREEN : if page id changed, nscreen chanage pageid in enablepages. if page id changed, nscreen change pageid in enablepages." into develop
jinwooim.bae [Sat, 31 May 2014 08:19:46 +0000 (17:19 +0900)]
ANIMATOR : Applied Filter flow
Animator timeline show applied filter list If user add widget on
designer.
Change-Id: I1a4fbe6346d23bdec8e0de7d19921ead4c97f8fd
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
yonghwan82.jeon [Sat, 31 May 2014 08:21:29 +0000 (17:21 +0900)]
NSCREEN : if page id changed, nscreen chanage pageid in enablepages.
if page id changed, nscreen change pageid in enablepages.
Change-Id: I4eeb35b0d30827a61213be00beaacad33a73f4cd
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
youngd [Sat, 31 May 2014 08:22:26 +0000 (17:22 +0900)]
UIB: added viewer refresh when ReloadCommand is executed.
Change-Id: Ia3704f662b02723d365280ce022d22419c79c054
Signed-off-by: youngd <youngduk.hwang@samsung.com>
jaeyeol lee [Sat, 31 May 2014 08:04:49 +0000 (17:04 +0900)]
PROP: bug fixed
can not show the custom actions
can not change the actions
- buttons not work in custom actions
Change-Id: Ia6b0e5af2629f497da1c70612057cb2ba1a40e21
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
Nakyoung Choi [Sat, 31 May 2014 07:41:17 +0000 (16:41 +0900)]
PROP : Shows icons on ActionTab for MAC.
Change-Id: Ie8dae32e9ad45e8818ae102926bba5cae56cd411
Signed-off-by: Nakyoung Choi <nakyoung2.choi@samsung.com>
Changyeon Lee [Sat, 31 May 2014 07:15:08 +0000 (00:15 -0700)]
Merge "UIB : Add Resource change Listener in Builder Plugin." into develop
parary [Sat, 31 May 2014 07:00:36 +0000 (16:00 +0900)]
UIB : Add Resource change Listener in Builder Plugin.
Change-Id: I39440f4022bbd5728b9837b12a400daa817c1b84
Signed-off-by: parary <kyunghan80.park@samsung.com>
Changyeon Lee [Sat, 31 May 2014 06:51:17 +0000 (23:51 -0700)]
Merge "ANIMATOR : Add/Delete Widget AnimatorBrowser is refreshed when add or delete widget on DesignerBrowser." into develop
Changyeon Lee [Sat, 31 May 2014 06:51:05 +0000 (23:51 -0700)]
Merge "ANIMATOR : Bug fix for paste keyframeUnit when paste keyframeUnit that is predefined animation it is pasted original keyframes even if it was edited before so just use same logict whether predfined animation or not" into develop
Changyeon Lee [Sat, 31 May 2014 06:50:52 +0000 (23:50 -0700)]
Merge "UIB : revmoe unused perspective. remove animator perspective." into develop
jinwooim.bae [Sat, 31 May 2014 06:21:05 +0000 (15:21 +0900)]
ANIMATOR : Add/Delete Widget
AnimatorBrowser is refreshed when add or delete widget on DesignerBrowser.
Change-Id: I9f5f2ce5cf4d56ab4f51d050bcf75a350ee024bc
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
seongwon.shim [Sat, 31 May 2014 06:29:13 +0000 (15:29 +0900)]
ANIMATOR : Bug fix for paste keyframeUnit
when paste keyframeUnit that is predefined animation it is pasted original keyframes even if it was edited before so just use same logict whether predfined animation or not
Change-Id: Iacae1972ff1c2e6e44062aad557c0254ebbdab69
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
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
yonghwan82.jeon [Sat, 31 May 2014 06:12:15 +0000 (15:12 +0900)]
UIB : revmoe unused perspective.
remove animator perspective.
Change-Id: I5e563fa329afd558c622281828d58cee1bb384be
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
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