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>
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
jinwooim.bae [Tue, 27 May 2014 08:32:41 +0000 (17:32 +0900)]
ANIMATOR : Changed Animator Timeline UI/UX
New UI is applied Animator's Timeline.
Change-Id: I9768b56e80dfca10b0e515aed986adaa2e2ebcb7
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
Changyeon Lee [Tue, 27 May 2014 08:21:54 +0000 (01:21 -0700)]
Merge "UIB : add webinspector" into develop
Changyeon Lee [Tue, 27 May 2014 08:21:45 +0000 (01:21 -0700)]
Merge "ANIMATOR : Implements method that get Previous KeyframeUnit by time When mergeKeyframe unit get Previous Keyframe unit by current time. not index of list" into develop
gyeongmin.ju [Tue, 27 May 2014 08:21:24 +0000 (17:21 +0900)]
UIB : add webinspector
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I2eb632392e1a17ff0a686d040fa97053b496b1d4
parary [Tue, 27 May 2014 08:17:21 +0000 (17:17 +0900)]
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.
Change-Id: I2aa8b0e8dcb93806b1a0dc5f1050a2f176ab61e8
Signed-off-by: parary <kyunghan80.park@samsung.com>
seongwon.shim [Tue, 27 May 2014 08:01:33 +0000 (17:01 +0900)]
ANIMATOR : Implements method that get Previous KeyframeUnit by time
When mergeKeyframe unit get Previous Keyframe unit by current time. not index of list
Change-Id: I179dd6a8b4425bb3e10dd365262be00f6f2b0e33
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
yonghwan82.jeon [Tue, 27 May 2014 04:15:29 +0000 (13:15 +0900)]
Merge remote-tracking branch 'origin/mw' into develop
* origin/mw:
Merge remote-tracking branch 'origin/develop' into 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/mw' into tizen
Merge remote-tracking branch 'origin/tizen' into mw
Merge remote-tracking branch 'origin/develop' into tizen
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: I65af026c56285de592b1a035700417087b24803d
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
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>
Changyeon Lee [Tue, 27 May 2014 02:53:06 +0000 (19:53 -0700)]
Merge "UIB : Fix initializing index.html. Remove managed.css when index.html loading time." into develop
nakyoung2.choi [Tue, 27 May 2014 02:52:46 +0000 (11:52 +0900)]
UIB : Fix initializing index.html.
Remove managed.css when index.html loading time.
Change-Id: I211062583031fbb3f3d137ac9c51c30e9030bfdf
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
Changyeon Lee [Tue, 27 May 2014 02:48:49 +0000 (19:48 -0700)]
Merge "PROP : Advanced border style layout." into develop
Changyeon Lee [Tue, 27 May 2014 02:48:23 +0000 (19:48 -0700)]
Merge "DATABIND : update listdivider widget descriptor a. add text binding for the listdivider widget" into develop
nakyoung2.choi [Tue, 27 May 2014 02:41:07 +0000 (11:41 +0900)]
PROP : Advanced border style layout.
Change-Id: I2a76d246b025a06c8691f84417afb4b8b385426d
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
Heekyoung, Oh [Tue, 27 May 2014 02:31:51 +0000 (11:31 +0900)]
DATABIND : update listdivider widget descriptor
a. add text binding for the listdivider widget
Change-Id: Ie7a4b12277f6be7151852c48754dbd2d180d1e46
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>
jooyoul_lee [Tue, 27 May 2014 01:16:19 +0000 (10:16 +0900)]
NSCREEN : remove move action
1. nscreen item : remove move action
Change-Id: I47f7e96249ac3500b540db62e082c26d8bc3cad7
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
Changyeon Lee [Mon, 26 May 2014 13:31:21 +0000 (06:31 -0700)]
Merge "PROP : Advanced size style." into develop
Changyeon Lee [Mon, 26 May 2014 13:31:11 +0000 (06:31 -0700)]
Merge "UIB: apply n-screen to preview" into develop
nakyoung2.choi [Mon, 26 May 2014 13:01:05 +0000 (22:01 +0900)]
PROP : Advanced size style.
Change-Id: I8b403907579bd06c522d9a3a2aeeb1676a4da85c
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
gyeongmin.ju [Mon, 26 May 2014 12:51:07 +0000 (21:51 +0900)]
UIB: apply n-screen to preview
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I8ba407070a9212c03deba84ff11273ca00ad2b8a
yonghwan82.jeon [Mon, 26 May 2014 12:43:11 +0000 (21:43 +0900)]
NSCREEN : Modify list of screen feature.
Integrated list of screen feature for profile.
Change-Id: I5fff54ea22b27bc1a99ffa8eb834fe5a6522e988
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Mon, 26 May 2014 10:51:41 +0000 (03:51 -0700)]
Merge "NSCREEN : remove duplicate data in index.meta.xml. if page had css file for nscreen, write nscreen in index.meta.xml." into develop
Changyeon Lee [Mon, 26 May 2014 10:51:31 +0000 (03:51 -0700)]
Merge "UIB: fixed classpath error remove absolute path. and transformerfactory bug fixed." into develop
Changyeon Lee [Mon, 26 May 2014 10:51:13 +0000 (03:51 -0700)]
Merge "ANIMATOR : Change lock, visible widget flow Event flow is changed for lock and visible widget." into develop
yonghwan82.jeon [Mon, 26 May 2014 08:06:48 +0000 (17:06 +0900)]
NSCREEN : remove duplicate data in index.meta.xml.
if page had css file for nscreen, write nscreen in index.meta.xml.
Change-Id: I4de71cf635da4f86f8485717846c9ea1ad4f76eb
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Changyeon Lee [Mon, 26 May 2014 09:28:01 +0000 (02:28 -0700)]
Merge "DATABIND: Modify the icons" into develop
jinwooim.bae [Mon, 26 May 2014 09:11:57 +0000 (18:11 +0900)]
ANIMATOR : Change lock, visible widget flow
Event flow is changed for lock and visible widget.
Change-Id: I4670b7bac7106a3e8e88e014cd695188eceecd70
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
youngduk.hwang [Mon, 26 May 2014 06:34:39 +0000 (15:34 +0900)]
UIB: fixed classpath error
remove absolute path. and transformerfactory bug fixed.
Change-Id: Ic19105a13810567241326095a32f8edbd62df3fd
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
nakyoung2.choi [Mon, 26 May 2014 08:03:05 +0000 (17:03 +0900)]
PROP : Add z-index/visible/overflow style. Advanced style tab layout.
Change-Id: I52f730c33520bf823c65ab94edf83d4b403c49c2
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
jaeyeol lee [Mon, 26 May 2014 07:05:20 +0000 (16:05 +0900)]
DATABIND: Modify the icons
Change-Id: I5a8053019aa9ee36737881f23e873973ef403dc7
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>
Changyeon Lee [Mon, 26 May 2014 07:06:29 +0000 (00:06 -0700)]
Merge "ANIMATOR : Bug fix about fireEvent Change fireEvent time when predefined animation is added" into develop
Changyeon Lee [Mon, 26 May 2014 06:40:45 +0000 (23:40 -0700)]
Merge "UIB: fixed classpath error remove absolute path." into develop
youngduk.hwang [Mon, 26 May 2014 06:34:39 +0000 (15:34 +0900)]
UIB: fixed classpath error
remove absolute path.
Change-Id: I5740e981afa08540ed6ba811671fc6789e25d1ee
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
seongwon.shim [Mon, 26 May 2014 06:16:50 +0000 (15:16 +0900)]
ANIMATOR : Bug fix about fireEvent
Change fireEvent time when predefined animation is added
Change-Id: Iccffbfda1c41d8fecd42d0befe865dbd9c0af921
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
jinwooim.bae [Mon, 26 May 2014 05:30:05 +0000 (14:30 +0900)]
ANIMATOR : Add KeyFrameControl
KeyFrameControl is the ability to expand the KeyFrames.
Change-Id: I9c358ade2071235b648f3c70ba22d7563262771e
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>
Changyeon Lee [Mon, 26 May 2014 05:22:35 +0000 (22:22 -0700)]
Merge "UIB: fixed the problem META tag is added when we save on source tab. Added xalan library. HtmlWriter use it." into develop
Changyeon Lee [Mon, 26 May 2014 05:22:26 +0000 (22:22 -0700)]
Merge "UIB: undo, redo will be possible about editing between source and design. Modified ReloadCommand. It process about HTML loading." into develop
Changyeon Lee [Mon, 26 May 2014 05:22:16 +0000 (22:22 -0700)]
Merge "NSCREEN : modify initialization part of nscreen model. Modify initialization part of nscreen model." into develop
Changyeon Lee [Mon, 26 May 2014 03:51:37 +0000 (20:51 -0700)]
Merge "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." into develop
Changyeon Lee [Mon, 26 May 2014 03:51:27 +0000 (20:51 -0700)]
Merge "DATABIND : Modify Set Source Dialog. add data validation. modify data add condition. static source editor 'DEL' key binding. data tree refresh interval 600ms." into develop
youngduk.hwang [Mon, 26 May 2014 02:05:54 +0000 (11:05 +0900)]
UIB: fixed the problem META tag is added when we save on source tab.
Added xalan library. HtmlWriter use it.
Change-Id: I3b6bd7509f9a8cf5395c66ff4fb823f54cd15fb6
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
youngduk.hwang [Mon, 26 May 2014 01:49:40 +0000 (10:49 +0900)]
UIB: undo, redo will be possible about editing between source and design.
Modified ReloadCommand. It process about HTML loading.
Change-Id: I358ceee2eb13d6f931b2cd0c3159b7a923626405
Signed-off-by: youngduk.hwang <youngduk.hwang@samsung.com>
yonghwan82.jeon [Mon, 26 May 2014 01:48:17 +0000 (10:48 +0900)]
NSCREEN : modify initialization part of nscreen model.
Modify initialization part of nscreen model.
Change-Id: Ie96b0c105739630e3b5008c3d63357edf5ab4073
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
jooyoul_lee [Fri, 23 May 2014 08:05:11 +0000 (17:05 +0900)]
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.
Change-Id: Ib79ddd9b874ac5ea74aee839fc636e3841690e5b
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>
parary [Fri, 23 May 2014 07:30:50 +0000 (16:30 +0900)]
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: I6e6a90f583eead82c52f1a71a1b0cf6a9473833d
Signed-off-by: parary <kyunghan80.park@samsung.com>
nakyoung2.choi [Fri, 23 May 2014 06:45:23 +0000 (15:45 +0900)]
PROP : Add icons for StyleTab.
Change-Id: Iaf0d99374e76d7d2af58cf91ba8fc08c553d6aa8
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>
Changyeon Lee [Fri, 23 May 2014 06:39:14 +0000 (23:39 -0700)]
Merge "PROP : Re-implementation remove selector. Advanced Create/Remove/Change CssSelectorCommand." into develop
Changyeon Lee [Fri, 23 May 2014 06:38:58 +0000 (23:38 -0700)]
Merge "UIB : fixed : do not save the text to edit it" into develop
Changyeon Lee [Fri, 23 May 2014 06:38:38 +0000 (23:38 -0700)]
Merge "ANIMATOR : Bug fix for merge/split keyframe Resolve null pointer exception when undo/redo Reuse for Keyframe Unit when undo/redo" into develop
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>
gyeongmin.ju [Thu, 22 May 2014 09:25:26 +0000 (18:25 +0900)]
UIB : fixed : do not save the text to edit it
Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: Ibcb0339535cee46896f4927266ab8c8b5500ed4c
seongwon.shim [Thu, 22 May 2014 09:18:31 +0000 (18:18 +0900)]
ANIMATOR : Bug fix for merge/split keyframe
Resolve null pointer exception when undo/redo
Reuse for Keyframe Unit when undo/redo
Change-Id: I5d9450eb6995c0e50837a87d15ee59730fce93a9
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>
nakyoung2.choi [Thu, 22 May 2014 09:05:56 +0000 (18:05 +0900)]
PROP : Re-implementation remove selector.
Advanced Create/Remove/Change CssSelectorCommand.
Change-Id: Ifd14f7b8fefa2b2c20ca8c28c058d5ec5d860bf4
Signed-off-by: nakyoung2.choi <nakyoung2.choi@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
projects / sdk / ide / web-ui-builder-eplugin.git / log