yonghwan82.jeon [Tue, 27 May 2014 03:01:15 +0000 (12:01 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop: (24 commits)
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
PROP : Advanced size style.
UIB: apply n-screen to preview
NSCREEN : Modify list of screen feature. Integrated list of screen feature for profile.
NSCREEN : remove duplicate data in index.meta.xml. if page had css file for nscreen, write nscreen in index.meta.xml.
ANIMATOR : Change lock, visible widget flow Event flow is changed for lock and visible widget.
UIB: fixed classpath error remove absolute path. and transformerfactory bug fixed.
PROP : Add z-index/visible/overflow style. Advanced style tab layout.
DATABIND: Modify the icons
UIB: fixed classpath error remove absolute path.
ANIMATOR : Bug fix about fireEvent Change fireEvent time when predefined animation is added
ANIMATOR : Add KeyFrameControl KeyFrameControl is the ability to expand the KeyFrames.
UIB: fixed the problem META tag is added when we save on source tab. Added xalan library. HtmlWriter use it.
UIB: undo, redo will be possible about editing between source and design. Modified ReloadCommand. It process about HTML loading.
NSCREEN : modify initialization part of nscreen model. Modify initialization part of nscreen model.
CSSSELECTOR : fix SelectorDialog position. 1. Fixed - where the selector dialog opens. 2. fixed a bug that occurs because of the widget id does not exist.
DATABIND : Modify Set Source Dialog. add data validation. modify data add condition. static source editor 'DEL' key binding. data tree refresh interval 600ms.
...
Change-Id: Icaecff1b01b9541363f4af8497c15f8073e33d3f
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 22 May 2014 09:50:01 +0000 (18:50 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
PROJECTEMP : modify ProjectTemplateContributor. Modify ProjectTemplateContributor.
Merge remote-tracking branch 'origin/tizen' into develop
PAGETEMP: Add Empty Page button is added in pages view toolbar. Add Empty Page Button is added in pages view toolbar. And Template delete Context Menu is added in template wizard.
PAGETEMP: UI, UX complement Duplicate page name check, Default group name check, Default template check, Fixed wrong wizard link, Modified Browse button border, Fixed wrong wizard title and description, Applied page template indent.
Conflicts:
package/changelog
package/pkginfo.manifest
Change-Id: Ifd570f28e92ca9ba62b1d5d7d1e985e62254bb4b
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 22 May 2014 09:44:01 +0000 (18:44 +0900)]
PROJECTEMP : modify ProjectTemplateContributor.
Modify ProjectTemplateContributor.
Change-Id: I9fd5643cd41493c30afafafda64f80b8c1835ef7
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 22 May 2014 08:23:37 +0000 (17:23 +0900)]
Merge remote-tracking branch 'origin/tizen' into develop
* origin/tizen:
Merge remote-tracking branch 'origin/mw' into tizen
Merge remote-tracking branch 'origin/develop' into tizen
Merge remote-tracking branch 'origin/mw' into tizen
Merge remote-tracking branch 'origin/develop' into tizen
MISC: package version up(0.1.428)
CONFIGURATION: Changed configuration model package name
Change-Id: I9d8e258f6bbd7711f32a7bfb0114d1f4ca2ea437
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 22 May 2014 08:20:30 +0000 (17:20 +0900)]
Merge branch 'tizen' into mw
* tizen:
NSCREEN : remove System.out.print log. 1. print log - using Logger
DATABIND : Modify Set Source Dialog. ADD JSON - > XML Converter. ADD Tree DND.
ANIMATOR : Bug fix for loading animation Serailize & Deserailize boolean variable whether predefined or not for Keyframe
NSCREEN : nscreen debug log added, viewport fixed 1. add nscreen hidden log added 1-1. css layer and viewport log (on/off available) 2. viewport sync(between designer and source) added.
DATABIND: update the descriptors a. add attrhref type in the tizen.types.xml b. add ID_OF_DATABINDING_ATTR_HREF in TypeDescriptor.java and DescriptorManager.java c. add attrhref binding for the link widget
ANIMATOR : Convert milliseconds and position This is for compute milliseconds and convert time to position, position to time.
PROP : Fix setCssStyleCommand undo bug. And advanced refresh on HoverViewerEditPart.
DATABIND: bug fixed (databinding view)
Merge remote-tracking branch 'origin/mw' into develop
ANIMATOR : Bug fix for opacity property Modify opacity realted point proloem and change type to double when calculate interpolaved value
DESIGNER : code refactoring
DATABIND: Modify the width of the set target dialog
DATABIND : add the icon in the databinding view
DATABIND: modify the rename functions
Show MetricsMethod on Ubuntu.And fix set background color problem on MetricsMethod.
ANIMATOR : Get default property value from CSSProperties.xml
ANIMATOR : Change TreeItem Height Changing for treeItem height size and multiplatform.
PAGES: Add Delete Page action to delete pages on Pages view. Modified flow of adding pages and deleting pages while Delete Page action is added.
Merge remote-tracking branch 'origin/mw' into tizen
Merge remote-tracking branch 'origin/develop' into tizen
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorWidget.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/tree/TimeTreeElement.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/widget/KeyFrame.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
package/changelog
package/pkginfo.manifest
Change-Id: I513b8c617abb54559c5cccb04b78550525a392e4
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 22 May 2014 08:12:20 +0000 (17:12 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop: (33 commits)
NSCREEN : remove System.out.print log. 1. print log - using Logger
DATABIND : Modify Set Source Dialog. ADD JSON - > XML Converter. ADD Tree DND.
ANIMATOR : Bug fix for loading animation Serailize & Deserailize boolean variable whether predefined or not for Keyframe
NSCREEN : nscreen debug log added, viewport fixed 1. add nscreen hidden log added 1-1. css layer and viewport log (on/off available) 2. viewport sync(between designer and source) added.
DATABIND: update the descriptors a. add attrhref type in the tizen.types.xml b. add ID_OF_DATABINDING_ATTR_HREF in TypeDescriptor.java and DescriptorManager.java c. add attrhref binding for the link widget
ANIMATOR : Convert milliseconds and position This is for compute milliseconds and convert time to position, position to time.
PROP : Fix setCssStyleCommand undo bug. And advanced refresh on HoverViewerEditPart.
DATABIND: bug fixed (databinding view)
Merge remote-tracking branch 'origin/mw' into develop
ANIMATOR : Bug fix for opacity property Modify opacity realted point proloem and change type to double when calculate interpolaved value
DESIGNER : code refactoring
DATABIND: Modify the width of the set target dialog
DATABIND : add the icon in the databinding view
DATABIND: modify the rename functions
Show MetricsMethod on Ubuntu.And fix set background color problem on MetricsMethod.
ANIMATOR : Get default property value from CSSProperties.xml
ANIMATOR : Change TreeItem Height Changing for treeItem height size and multiplatform.
DESIGNER : move/resize unit to be changed 10 -> 3
DESIGNER : move/resize unit to be changed 10 -> 3
PROP : fix, when edit the CSS, NPE occurs intermittently
...
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
package/changelog
package/pkginfo.manifest
Change-Id: I1f1f77ac7ba092974d209e540f0f536a3df503d1
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
youngduk.hwang [Thu, 22 May 2014 05:30:16 +0000 (14:30 +0900)]
PAGETEMP: Add Empty Page button is added in pages view toolbar.
Add Empty Page Button is added in pages view toolbar. And Template delete
Context Menu is added in template wizard.
Change-Id: Iaa9c833fab61620aa02d8cf31c8269ff07046b52
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
youngduk.hwang [Thu, 22 May 2014 05:26:17 +0000 (14:26 +0900)]
PAGETEMP: UI, UX complement
Duplicate page name check, Default group name check, Default template
check, Fixed wrong wizard link, Modified Browse button border, Fixed wrong
wizard title and description, Applied page template indent.
Change-Id: I9d93f91c18e8fc5c015faa7768e92c2d1743fc99
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
Changyeon Lee [Thu, 22 May 2014 01:51:54 +0000 (18:51 -0700)]
Merge "NSCREEN : remove System.out.print log. 1. print log - using Logger" into develop
Changyeon Lee [Thu, 22 May 2014 01:51:40 +0000 (18:51 -0700)]
Merge "DATABIND : Modify Set Source Dialog. ADD JSON - > XML Converter. ADD Tree DND." into develop
jooyoul_lee [Wed, 21 May 2014 11:02:28 +0000 (20:02 +0900)]
NSCREEN : remove System.out.print log.
1. print log - using Logger
Change-Id: I14922f1d4d7627b58cac89e4cd3139ab344a0616
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
Changyeon Lee [Wed, 21 May 2014 10:33:39 +0000 (03:33 -0700)]
Merge "NSCREEN : nscreen debug log added, viewport fixed 1. add nscreen hidden log added 1-1. css layer and viewport log (on/off available) 2. viewport sync(between designer and source) added." into develop
parary [Wed, 21 May 2014 10:27:15 +0000 (19:27 +0900)]
DATABIND : Modify Set Source Dialog.
ADD JSON - > XML Converter.
ADD Tree DND.
Change-Id: Ib673e6adfc527f21cf3f61ceed402b4245d72b4a
Signed-off-by: parary <kyunghan80.park@samsung.com>
seongwon.shim [Wed, 21 May 2014 07:02:31 +0000 (16:02 +0900)]
ANIMATOR : Bug fix for loading animation
Serailize & Deserailize boolean variable whether predefined or not for Keyframe
Change-Id: I8a92ddc505105eb8f4caa5c64b050c906b5bc011
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Wed, 21 May 2014 02:16:29 +0000 (19:16 -0700)]
Merge "DATABIND: update the descriptors a. add attrhref type in the tizen.types.xml b. add ID_OF_DATABINDING_ATTR_HREF in TypeDescriptor.java and DescriptorManager.java c. add attrhref binding for the link widget" into develop
Changyeon Lee [Wed, 21 May 2014 02:16:16 +0000 (19:16 -0700)]
Merge "ANIMATOR : Convert milliseconds and position This is for compute milliseconds and convert time to position, position to time." into develop
jooyoul_lee [Wed, 21 May 2014 01:58:33 +0000 (10:58 +0900)]
NSCREEN : nscreen debug log added, viewport fixed
1. add nscreen hidden log added
1-1. css layer and viewport log (on/off available)
2. viewport sync(between designer and source) added.
Change-Id: I6d8b6365be514c3259290cb460fcaeac91e9ef87
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
Heekyoung, Oh [Tue, 20 May 2014 11:12:21 +0000 (20:12 +0900)]
DATABIND: update the descriptors
a. add attrhref type in the tizen.types.xml
b. add ID_OF_DATABINDING_ATTR_HREF in TypeDescriptor.java and DescriptorManager.java
c. add attrhref binding for the link widget
Change-Id: I34202d357f02fef4adaad6425bcaa57b31ac6f6a
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Changyeon Lee [Tue, 20 May 2014 06:17:21 +0000 (23:17 -0700)]
Merge "DATABIND: bug fixed (databinding view)" into develop
jinwooim.bae [Tue, 20 May 2014 05:33:45 +0000 (14:33 +0900)]
ANIMATOR : Convert milliseconds and position
This is for compute milliseconds and convert time to position, position
to time.
Change-Id: Ia9dcef8732878f6f9822eee0d9b3c7f879ddf8b1
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
nakyoung2.choi [Tue, 20 May 2014 04:37:15 +0000 (13:37 +0900)]
PROP : Fix setCssStyleCommand undo bug. And advanced refresh on HoverViewerEditPart.
Change-Id: Ic3910448da69b6500fbd9093878832e6405ab558
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jaeyeol lee [Tue, 20 May 2014 04:04:47 +0000 (13:04 +0900)]
DATABIND: bug fixed (databinding view)
rename the view model item name
Change-Id: I4df8316991c26ec68171661d2bed48044bd9dcfd
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
Changyeon Lee [Mon, 19 May 2014 10:37:16 +0000 (03:37 -0700)]
Merge "Merge remote-tracking branch 'origin/mw' into develop" into develop
yonghwan82.jeon [Mon, 19 May 2014 10:30:11 +0000 (19:30 +0900)]
Merge remote-tracking branch 'origin/mw' into develop
* origin/mw:
UIB : update version.
NSCREEN : change resolution. Change resolution by Profile type.
Merge remote-tracking branch 'origin/develop' into mw
UIB : It is re-add the missing page.
Merge remote-tracking branch 'origin/develop' into mw
UIB : Update version.
Merge remote-tracking branch 'origin/develop' into mw
Merge remote-tracking branch 'origin/tizen' into mw
Merge remote-tracking branch 'origin/mw' into tizen
Merge remote-tracking branch 'origin/tizen' into mw
Merge remote-tracking branch 'origin/develop' into tizen
MISC: package version up(0.1.428)
MISC: package version up(0.1.428)
CONFIGURATION: Changed configuration model package name
CONFIGURATION: Changed configuration model package name
UIBUILDER : Merge tizen branch. Merge tizen branch.
Change-Id: Id40a94a59a8bf6bbfb7684599e570790afcacb73
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
seongwon.shim [Mon, 19 May 2014 10:21:03 +0000 (19:21 +0900)]
ANIMATOR : Bug fix for opacity property
Modify opacity realted point proloem and change type to double when calculate interpolaved value
Change-Id: Id9d1fdeb375559fbeac3b6c71d1c068e2786ffad
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
yonghwan82.jeon [Mon, 19 May 2014 09:57:06 +0000 (18:57 +0900)]
UIB : update version.
Change-Id: I7b05bac934a19893b2e048366f94b97cdfeb0627
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Mon, 19 May 2014 09:54:42 +0000 (18:54 +0900)]
NSCREEN : change resolution.
Change resolution by Profile type.
Change-Id: I8c8e55c982a2f4f16b9b6fb4316b3a5b7eb9805b
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Mon, 19 May 2014 09:52:50 +0000 (18:52 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
DESIGNER : code refactoring
DATABIND: Modify the width of the set target dialog
DATABIND : add the icon in the databinding view
DATABIND: modify the rename functions
Show MetricsMethod on Ubuntu.And fix set background color problem on MetricsMethod.
ANIMATOR : Get default property value from CSSProperties.xml
ANIMATOR : Change TreeItem Height Changing for treeItem height size and multiplatform.
PAGES: Add Delete Page action to delete pages on Pages view. Modified flow of adding pages and deleting pages while Delete Page action is added.
Change-Id: Ifd9ce88c5ef62807d920df4cf55c8ec31d56bf52
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Mon, 19 May 2014 09:33:38 +0000 (02:33 -0700)]
Merge "ANIMATOR : Change TreeItem Height Changing for treeItem height size and multiplatform." into develop
Changyeon Lee [Mon, 19 May 2014 09:33:26 +0000 (02:33 -0700)]
Merge changes I813dc190,I68df98d4 into develop
* changes:
DATABIND: Modify the width of the set target dialog
DATABIND : add the icon in the databinding view
Changyeon Lee [Mon, 19 May 2014 09:33:16 +0000 (02:33 -0700)]
Merge "DATABIND: modify the rename functions" into develop
Changyeon Lee [Mon, 19 May 2014 09:32:54 +0000 (02:32 -0700)]
Merge "ANIMATOR : Get default property value from CSSProperties.xml" into develop
Changyeon Lee [Mon, 19 May 2014 09:32:43 +0000 (02:32 -0700)]
Merge "PAGES: Add Delete Page action to delete pages on Pages view. Modified flow of adding pages and deleting pages while Delete Page action is added." into develop
Changyeon Lee [Mon, 19 May 2014 08:33:47 +0000 (01:33 -0700)]
Merge "Show MetricsMethod on Ubuntu.And fix set background color problem on MetricsMethod." into develop
gyeongmin.ju [Mon, 19 May 2014 08:21:14 +0000 (17:21 +0900)]
DESIGNER : code refactoring
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ia3f8532d118da0d9b8126f8bc8831adeb0daa2bd
jaeyeol lee [Mon, 19 May 2014 07:40:02 +0000 (16:40 +0900)]
DATABIND: Modify the width of the set target dialog
Change-Id: I813dc19095921698296578dee08e30161e4846dc
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
jaeyeol lee [Mon, 19 May 2014 07:31:04 +0000 (16:31 +0900)]
DATABIND : add the icon in the databinding view
Change-Id: I68df98d4f4e03a8963acbd071f50842523eb9aa3
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
jaeyeol lee [Mon, 19 May 2014 06:21:19 +0000 (15:21 +0900)]
DATABIND: modify the rename functions
check duplicate names
Change-Id: Id01a1d6d71e68fedd58385ea2b53b6f71d57eb00
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
nakyoung2.choi [Mon, 19 May 2014 05:58:08 +0000 (14:58 +0900)]
Show MetricsMethod on Ubuntu.And fix set background color problem on MetricsMethod.
Change-Id: Ib3886e60455ca933966e36d5b90b51b64c52f46a
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
seongwon.shim [Mon, 19 May 2014 05:32:53 +0000 (14:32 +0900)]
ANIMATOR : Get default property value from CSSProperties.xml
Change to getting default property value from CSSProperties.xml from hard
coded value
Change-Id: Iee4e24f67e82e919f168e71cb275bd7c14a3b2cb
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
yonghwan82.jeon [Mon, 19 May 2014 03:40:08 +0000 (12:40 +0900)]
UIB : It is re-add the missing page.
Change-Id: Iffb1d45f8e34df9ca7ab71cea88fc51b389b7c37
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Mon, 19 May 2014 03:26:32 +0000 (12:26 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
DESIGNER : move/resize unit to be changed 10 -> 3
DESIGNER : move/resize unit to be changed 10 -> 3
PROP : fix, when edit the CSS, NPE occurs intermittently
UIB : Fix NPE.
UIB : Remove duplicate code. When Web IDE perspective create, pages view created two views.
UIB : Fix CssSelector managing on Part.
NSCREEN : file io changed create file -> using File to IFile
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/editparts/HoverViewerEditPart.java
Change-Id: Iaf7f5fe219ac3b50c26feabdda0adbc3c58365c4
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jinwooim.bae [Fri, 16 May 2014 11:53:27 +0000 (20:53 +0900)]
ANIMATOR : Change TreeItem Height
Changing for treeItem height size and multiplatform.
Change-Id: I3685fcf8d031e57a5491546c0ad33bd0bcc15432
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
gyeongmin.ju [Mon, 19 May 2014 01:32:13 +0000 (10:32 +0900)]
DESIGNER : move/resize unit to be changed 10 -> 3
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I21e66a30c6f00fb17a38506dbd884c747f222f37
gyeongmin.ju [Mon, 19 May 2014 01:21:04 +0000 (10:21 +0900)]
DESIGNER : move/resize unit to be changed 10 -> 3
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Iba80b7ef43f8ddbae87401acca629b3e74627f2b
Changyeon Lee [Sun, 18 May 2014 11:22:21 +0000 (04:22 -0700)]
Merge "UIB : Fix NPE." into develop
gyeongmin.ju [Sun, 18 May 2014 11:22:22 +0000 (20:22 +0900)]
PROP : fix, when edit the CSS, NPE occurs intermittently
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Idd9e1648814474a4a0c13ea4d40294e3655ddf5d
nakyoung2.choi [Sun, 18 May 2014 11:19:29 +0000 (20:19 +0900)]
UIB : Fix NPE.
Change-Id: I23ddb08e657599bcbe6e8e0f4714e4bb1d045610
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
youngduk.hwang [Fri, 16 May 2014 16:49:53 +0000 (01:49 +0900)]
PAGES: Add Delete Page action to delete pages on Pages view.
Modified flow of adding pages and deleting pages while Delete Page action is added.
Change-Id: If6ea07de35df4be96d24309b0c7b4360bcb25f29
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 16:18:04 +0000 (01:18 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
UIB : Remove duplicate code. When Web IDE perspective create, pages view created two views.
UIB : Fix CssSelector managing on Part.
NSCREEN : file io changed create file -> using File to IFile
Change-Id: I9eec8c0479e4edc988bbb7f23a0daf21fd58bb6b
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 16:06:03 +0000 (01:06 +0900)]
UIB : Remove duplicate code.
When Web IDE perspective create, pages view created two views.
Change-Id: I8c18cb6fb44341d4c81862185c4e54c3ae9e8e22
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
nakyoung2.choi [Fri, 16 May 2014 15:46:03 +0000 (00:46 +0900)]
UIB : Update version.
Change-Id: I4e64a0a21644770ab335b5f2cf09579f5cf98ed4
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Fri, 16 May 2014 15:39:41 +0000 (00:39 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
UIB : Fix CssSelector managing on Part.
NSCREEN : file io changed create file -> using File to IFile
Change-Id: Ib36cc975306ee8049ad5031b4add2473e9b72fe5
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
nakyoung2.choi [Fri, 16 May 2014 15:30:17 +0000 (00:30 +0900)]
UIB : Fix CssSelector managing on Part.
Change-Id: Id3d78f1f51a34375a238341f52152ab9dc447304
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jooyoul_lee [Fri, 16 May 2014 14:59:54 +0000 (23:59 +0900)]
NSCREEN : file io changed
create file -> using File to IFile
Change-Id: I19d0fabe0ee310b5dc5f12e9181583bb7a296fe0
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 11:40:13 +0000 (20:40 +0900)]
Merge remote-tracking branch 'origin/develop' into mw
* origin/develop:
UIB : Modify QT library path. Modify QT library path for MACOS.
DATABIND: Add a setTarget Dialog
UIB : Remove InjectorView dependency
Merge remote-tracking branch 'origin/tizen' into develop
NSCREEN : fix new project exception bug 1. fix new projet bug 2. fix chagall conventions 3. other profile device set default (mobile)
DATABIND : update the descriptors a. add slider type - tizen.types.xml, DescriptorManager.java, TypeDescriptor.java b. add text binding for the headingone, headingtwo, headingthree, headingfour, headingfive headingsix widgets c. add attr[src] binding for the image and thumbnail widget d. add slider binding for the slider widget
DATABIND : add value binding for the datetimepicker widget a. update the datetimepicker despriptor b. add value binding
ANIMATOR : Modify Z-order keyframe Show z-order MenuItem When you click timelineElement that has same time keyframeUnits
Conflicts:
package/changelog
package/pkginfo.manifest
Change-Id: Ifd0df1ad13804336a75f51e510155242bc6f80d2
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Fri, 16 May 2014 11:31:08 +0000 (04:31 -0700)]
Merge "UIB : Modify QT library path. Modify QT library path for MACOS." into develop
Changyeon Lee [Fri, 16 May 2014 11:30:59 +0000 (04:30 -0700)]
Merge "DATABIND: Add a setTarget Dialog" into develop
yonghwan82.jeon [Fri, 16 May 2014 11:24:18 +0000 (20:24 +0900)]
UIB : Modify QT library path.
Modify QT library path for MACOS.
Change-Id: Ia896f238cf71e5dea91a912910275c09660fa07b
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Fri, 16 May 2014 10:36:12 +0000 (03:36 -0700)]
Merge "ANIMATOR : Modify Z-order keyframe Show z-order MenuItem When you click timelineElement that has same time keyframeUnits" into develop
jaeyeol lee [Fri, 16 May 2014 08:25:49 +0000 (17:25 +0900)]
DATABIND: Add a setTarget Dialog
Change-Id: Ie88e701ac2a270c91af7b09e5a5037c6ed3e5947
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
Changyeon Lee [Fri, 16 May 2014 08:13:50 +0000 (01:13 -0700)]
Merge "DATABIND : update the descriptors a. add slider type - tizen.types.xml, DescriptorManager.java, TypeDescriptor.java b. add text binding for the headingone, headingtwo, headingthree, headingfour, headingfive headingsix widgets c. add attr[src] binding for the image and thumbnail widget d. add slider binding for the slider widget" into develop
Changyeon Lee [Fri, 16 May 2014 08:13:34 +0000 (01:13 -0700)]
Merge "DATABIND : add value binding for the datetimepicker widget a. update the datetimepicker despriptor b. add value binding" into develop
jeonghwan kim [Fri, 16 May 2014 08:10:09 +0000 (17:10 +0900)]
UIB : Remove InjectorView dependency
Change-Id: I956e82e7916c2b63fc185ac93a48eb55a6d83c7b
Signed-off-by: jeonghwan kim <jeonghwan0613.kim@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 07:10:38 +0000 (16:10 +0900)]
Merge remote-tracking branch 'origin/tizen' into develop
* origin/tizen:
Merge remote-tracking branch 'origin/mw' into tizen
Merge remote-tracking branch 'origin/develop' into tizen
Merge remote-tracking branch 'origin/mw' into tizen
Merge remote-tracking branch 'origin/develop' into tizen
MISC: package version up(0.1.428)
CONFIGURATION: Changed configuration model package name
Change-Id: I5d612644fcac4a1a7f59e1ae6c9ee48e8daa2db5
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 07:09:04 +0000 (16:09 +0900)]
Merge remote-tracking branch 'origin/mw' into tizen
* origin/mw:
Merge remote-tracking branch 'origin/tizen' into mw
Merge remote-tracking branch 'origin/tizen' into mw
MISC: package version up(0.1.428)
CONFIGURATION: Changed configuration model package name
UIBUILDER : Merge tizen branch. Merge tizen branch.
Change-Id: I5d49349c82c7de4b42efbc497e02bfd167866140
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 07:05:18 +0000 (16:05 +0900)]
Merge remote-tracking branch 'origin/tizen' into mw
* origin/tizen:
Merge remote-tracking branch 'origin/develop' into tizen
Change-Id: I0289843f99efff752a609ce39f453cfb4523bd58
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 07:03:49 +0000 (16:03 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
NSCREEN : fix new project exception bug 1. fix new projet bug 2. fix chagall conventions 3. other profile device set default (mobile)
Change-Id: I2d7b6f5790304a8416af389361046bb42efda5dc
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jooyoul_lee [Fri, 16 May 2014 06:56:57 +0000 (15:56 +0900)]
NSCREEN : fix new project exception bug
1. fix new projet bug
2. fix chagall conventions
3. other profile device set default (mobile)
Change-Id: Iefe64ea38e793fb2a6637ed6c07c51a6b414fa5b
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 06:52:37 +0000 (15:52 +0900)]
Merge remote-tracking branch 'origin/tizen' into mw
* origin/tizen:
NSCREEN: FIXED device info.
DESIGNER : fix scrollbar range
NSCREEN : Remove width&height in Device and Modify Nscreen Model. Remove width & Height in Device and Modify Nscreen Model.
NSCREEN : initial style apply bug fixed start time css style applied
NSCREEN : fixed bug(Recovery nscreenModel). When soucre mode edited, NscreenModel is not pefect recvering. It is fiexed.
DATABIND : add text binding for the submit button widget a. update the submit button descriptor b. add text binding
NSCREEN : start up view port bug fix view port size problem fixed
DESIGNER : add undo shortcut
Merge remote-tracking branch 'origin/tizen' into develop
Merge remote-tracking branch 'origin/mw' into tizen
PROP : Fix setValue of SizeMethod.
Merge remote-tracking branch 'origin/develop' into tizen
UIB : fix width/height func on JS
ANIMATOR : Refresh ContextMenu ContextMenu is refreshed when clicked filter.
ANIMATOR : Bug fix for merge/split keyframe If Predefined animation Keyframe put one upon another keyframe, That keyframe is not merge/split, Only customKeyframe will be merged or splited or keyframes are not put on upon another keyframe and have different properties
NSCREEN : default device changed profile default device added common feature history added
PROP : Fix display size text when value modified.
PROP : Add modify function in Transform. And add increment to SizeMethod.
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerToolbar.java
Change-Id: I5834cfe387ee693d5e1f6cad2e494bd5d0ff3294
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 06:50:21 +0000 (15:50 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
NSCREEN: FIXED device info.
DESIGNER : fix scrollbar range
NSCREEN : Remove width&height in Device and Modify Nscreen Model. Remove width & Height in Device and Modify Nscreen Model.
NSCREEN : initial style apply bug fixed start time css style applied
NSCREEN : fixed bug(Recovery nscreenModel). When soucre mode edited, NscreenModel is not pefect recvering. It is fiexed.
DATABIND : add text binding for the submit button widget a. update the submit button descriptor b. add text binding
NSCREEN : start up view port bug fix view port size problem fixed
DESIGNER : add undo shortcut
Merge remote-tracking branch 'origin/tizen' into develop
PROP : Fix setValue of SizeMethod.
UIB : fix width/height func on JS
ANIMATOR : Refresh ContextMenu ContextMenu is refreshed when clicked filter.
ANIMATOR : Bug fix for merge/split keyframe If Predefined animation Keyframe put one upon another keyframe, That keyframe is not merge/split, Only customKeyframe will be merged or splited or keyframes are not put on upon another keyframe and have different properties
NSCREEN : default device changed profile default device added common feature history added
PROP : Fix display size text when value modified.
PROP : Add modify function in Transform. And add increment to SizeMethod.
Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerToolbar.java
Change-Id: Ief54ac30f1d039110fb3dab0e5fbbae71da7f535
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Heekyoung, Oh [Fri, 16 May 2014 06:01:48 +0000 (15:01 +0900)]
DATABIND : update the descriptors
a. add slider type - tizen.types.xml, DescriptorManager.java, TypeDescriptor.java
b. add text binding for the headingone, headingtwo, headingthree, headingfour, headingfive headingsix widgets
c. add attr[src] binding for the image and thumbnail widget
d. add slider binding for the slider widget
Change-Id: Ibe90127afa8969db3659b52a6c0392c2c57460e5
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Heekyoung, Oh [Fri, 16 May 2014 02:56:14 +0000 (11:56 +0900)]
DATABIND : add value binding for the datetimepicker widget
a. update the datetimepicker despriptor
b. add value binding
Change-Id: Ie02eeb96c32be2c533e3a19a497d44e6ad29f735
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
yonghwan82.jeon [Fri, 16 May 2014 05:29:04 +0000 (14:29 +0900)]
NSCREEN: FIXED device info.
Change-Id: I559f04997fb5e2f97a480be7e57a6940516c8365
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Fri, 16 May 2014 05:16:22 +0000 (22:16 -0700)]
Merge "NSCREEN : initial style apply bug fixed start time css style applied" into develop
jinwooim.bae [Fri, 16 May 2014 04:52:02 +0000 (13:52 +0900)]
ANIMATOR : Modify Z-order keyframe
Show z-order MenuItem When you click timelineElement that has same time
keyframeUnits
Change-Id: Ib9a3218a191b66365e49a67313591bc7465ad04a
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
Changyeon Lee [Fri, 16 May 2014 04:47:46 +0000 (21:47 -0700)]
Merge "DESIGNER : fix scrollbar range" into develop
gyeongmin.ju [Fri, 16 May 2014 04:48:03 +0000 (13:48 +0900)]
DESIGNER : fix scrollbar range
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ib40c9768f487534e8ce0c383b6c71d752ddacc04
yonghwan82.jeon [Fri, 16 May 2014 04:42:43 +0000 (13:42 +0900)]
NSCREEN : Remove width&height in Device and Modify Nscreen Model.
Remove width & Height in Device and Modify Nscreen Model.
Change-Id: Ia265c2783121ac0f11b02e03a11f8801195c49d9
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jooyoul_lee [Fri, 16 May 2014 03:22:44 +0000 (12:22 +0900)]
NSCREEN : initial style apply bug fixed
start time css style applied
Change-Id: I1f962ec205918d5070a4bd8e665c3945fc457c5b
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
Changyeon Lee [Fri, 16 May 2014 02:29:01 +0000 (19:29 -0700)]
Merge "DATABIND : add text binding for the submit button widget a. update the submit button descriptor b. add text binding" into develop
yonghwan82.jeon [Fri, 16 May 2014 02:14:54 +0000 (11:14 +0900)]
NSCREEN : fixed bug(Recovery nscreenModel).
When soucre mode edited, NscreenModel is not pefect recvering.
It is fiexed.
Change-Id: Iecd8e6ad3a9b30fb92d975597596be82cacad81f
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Heekyoung, Oh [Fri, 16 May 2014 02:12:08 +0000 (11:12 +0900)]
DATABIND : add text binding for the submit button widget
a. update the submit button descriptor
b. add text binding
Change-Id: Ic429ddac1d837ef5225384f5ac7793b4553d073e
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
Changyeon Lee [Fri, 16 May 2014 01:53:54 +0000 (18:53 -0700)]
Merge "NSCREEN : start up view port bug fix view port size problem fixed" into develop
jooyoul_lee [Fri, 16 May 2014 01:52:18 +0000 (10:52 +0900)]
NSCREEN : start up view port bug fix
view port size problem fixed
Change-Id: Ie2399c7c04af8b554688a00a347242939a33ba72
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
gyeongmin.ju [Fri, 16 May 2014 01:52:07 +0000 (10:52 +0900)]
DESIGNER : add undo shortcut
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Iaf423215d2cd7fe89c71afcf4ae7d9ba784a0831
yonghwan82.jeon [Thu, 15 May 2014 10:54:23 +0000 (19:54 +0900)]
Merge remote-tracking branch 'origin/tizen' into develop
* origin/tizen:
Merge remote-tracking branch 'origin/mw' into tizen
Merge remote-tracking branch 'origin/develop' into tizen
MISC: package version up(0.1.428)
CONFIGURATION: Changed configuration model package name
Change-Id: I8fcaef0e1fcaa14c7de9166d62e1f5ccd6d22f76
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 10:51:14 +0000 (19:51 +0900)]
Merge remote-tracking branch 'origin/mw' into tizen
* origin/mw:
Merge remote-tracking branch 'origin/tizen' into mw
MISC: package version up(0.1.428)
CONFIGURATION: Changed configuration model package name
UIBUILDER : Merge tizen branch. Merge tizen branch.
Change-Id: Ie67c0d6a4d6ffac35693a0e8a762b38952a109c8
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 10:45:07 +0000 (19:45 +0900)]
Merge remote-tracking branch 'origin/tizen' into mw
* origin/tizen:
Merge remote-tracking branch 'origin/develop' into tizen
Change-Id: Ia460cd96298531cf992e6a9dbe0820dee4d120a0
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Thu, 15 May 2014 10:41:10 +0000 (03:41 -0700)]
Merge "ANIMATOR : Bug fix for merge/split keyframe If Predefined animation Keyframe put one upon another keyframe, That keyframe is not merge/split, Only customKeyframe will be merged or splited or keyframes are not put on upon another keyframe and have different properties" into develop
Changyeon Lee [Thu, 15 May 2014 10:41:00 +0000 (03:41 -0700)]
Merge "ANIMATOR : Refresh ContextMenu ContextMenu is refreshed when clicked filter." into develop
Changyeon Lee [Thu, 15 May 2014 10:40:50 +0000 (03:40 -0700)]
Merge "PROP : Fix setValue of SizeMethod." into develop
nakyoung2.choi [Thu, 15 May 2014 10:35:48 +0000 (19:35 +0900)]
PROP : Fix setValue of SizeMethod.
Change-Id: I73c86234e89d52243b77ce16ca81318f420c0463
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
yonghwan82.jeon [Thu, 15 May 2014 10:34:38 +0000 (19:34 +0900)]
Merge remote-tracking branch 'origin/develop' into tizen
* origin/develop:
NSCREEN : default device changed profile default device added common feature history added
PROP : Fix display size text when value modified.
PROP : Add modify function in Transform. And add increment to SizeMethod.
Change-Id: Icc95346952bc078e325edf38f72117d80aea3ba8
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
gyeongmin.ju [Thu, 15 May 2014 10:34:33 +0000 (19:34 +0900)]
UIB : fix width/height func on JS
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Id5c0fd8e99b15b109ad8e275ca2dbb1c9ca6ce72
jinwooim.bae [Thu, 15 May 2014 10:26:06 +0000 (19:26 +0900)]
ANIMATOR : Refresh ContextMenu
ContextMenu is refreshed when clicked filter.
Change-Id: If063a65e638f9fc37befce221ccb4043c18cf210
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
seongwon.shim [Thu, 15 May 2014 08:16:57 +0000 (17:16 +0900)]
ANIMATOR : Bug fix for merge/split keyframe
If Predefined animation Keyframe put one upon another keyframe, That keyframe is not merge/split,
Only customKeyframe will be merged or splited or keyframes are not put on
upon another keyframe and have different properties
Change-Id: I82d6e2f4db6270f334c5bf5bfff2eaa29841fbe5
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
Changyeon Lee [Thu, 15 May 2014 08:31:45 +0000 (01:31 -0700)]
Merge "NSCREEN : default device changed profile default device added common feature history added" into develop
jooyoul_lee [Thu, 15 May 2014 08:29:25 +0000 (17:29 +0900)]
NSCREEN : default device changed
profile default device added
common feature history added
Change-Id: I90db96df13bd4b5d9aa6b4f77e7bbd1cfae20657
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
nakyoung2.choi [Thu, 15 May 2014 07:50:22 +0000 (16:50 +0900)]
PROP : Fix display size text when value modified.
Change-Id: Ib834aec98c47c7d84479286f451fe966bcb9b4fc
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
projects / sdk / ide / web-ui-builder-eplugin.git / log