Merge remote-tracking branch 'origin/develop' into nscreen 95/21495/2 nscreen
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Thu, 22 May 2014 01:11:09 +0000 (10:11 +0900)
committeryonghwan jeon <yonghwan82.jeon@samsung.com>
Thu, 22 May 2014 01:13:19 +0000 (18:13 -0700)
commitd246c7760c5e13e212f5a1ab82852135a494dcbc
tree30791630ca25cf547b1f327ca84e69c857a4f1bc
parent2f3de53e40b77a25b8a4b2f0a12c2597d7d6aa82
Merge remote-tracking branch 'origin/develop' into nscreen

* origin/develop: (33 commits)
  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
  UIB : Fix NPE.
  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: Ic15ec4f8f3c7873074cab24af5923ce995acc6af
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
120 files changed:
org.tizen.webuibuilder/plugin.xml
org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingfive.widget.xml
org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingfour.widget.xml
org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingone.widget.xml
org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingsix.widget.xml
org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingthree.widget.xml
org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.headingtwo.widget.xml
org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.image.widget.xml
org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/html.link.widget.xml
org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/tizen.datetimepicker.widget.xml
org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/tizen.listitemthumbnail.widget.xml
org.tizen.webuibuilder/res/descriptors/Tizen-web-ui-fw/widget/tizen.slider.widget.xml
org.tizen.webuibuilder/res/icons/empty.png [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/BuilderConstants.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/gef/command/AnimationCreateAndChangeFrameCommand.java
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/model/AnimatorSelector.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorWidget.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/CSSProperty.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/deserializer/AnimatorFrameDeserializer.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/serializer/AnimatorFrameSerializer.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/TimelineContextMenu.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineMainContainer.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelinePage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/TimelineViewer.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/action/PasteKeyFrameAction.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/action/ZOrderKeyFrameAction.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/common/Formatter.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/common/TimelineMessages.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/common/TimelineMessages.properties
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/header/PlayHeader.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/header/TimeBar.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/header/TimeBarRenderer.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/TimeTreeElement.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/tree/TimelineWidgetElement.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/widget/KeyFrame.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/widget/KeyFrameUnit.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/widget/TimelineWidgetContextMenu.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/utils/AnimatorUtils.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/bridge/DesignerGoingBridge.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/bridge/GoingBridge.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/ChangeCssSelectorCommand.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/CreateCssSelectorCommand.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/CreatePageCommand.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DeletePageAction.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DeletePageCommand.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerMoveLayoutCommand.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerResizeAndMoveLayoutCommand.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerResizeLayoutCommand.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/MoveAbsolutePartAction.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/ResizeAbsolutePartAction.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/SetCssStyleCommand.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/editparts/DesignerEditPart.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/editparts/HoverViewerEditPart.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/policies/DesignerAbsoluteDragEditPolicy.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/policies/DesignerDragEditPolicy.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/policies/DesignerXYLayoutEditPolicy.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/viewer/HoverBrowserEventDelegator.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/viewer/HoverBrowserViewer.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/Part.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForHTML.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/css/CssSelector.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/descriptors/DescriptorManager.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/descriptors/TypeDescriptor.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NScreenDescriptor.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/page/PageData.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/page/PageDataPaths.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/page/PageDataSet.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/CssSelecotrAction.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/NewPagePolicy.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/actions/WebUIBuilderActionConstants.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/contextmenu/Messages.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/contextmenu/Messages.properties
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForHTML.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerToolbar.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/ResolutionManger.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingDnDManager.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingTooltipParser.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/actions/GetSourceAction.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/actions/SetTargetAction.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/SetTargetPage.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/model/BindingInfo.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenItem.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenPage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenUtil.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/pages/PagesPage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/pages/PagesViewContextMenu.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/PropertiesPage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/ClipMethod.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/MetricsMethod.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/ScaleMethod.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleEventDelegater.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/DomUtil.java
package/adding_files/macos/ide/IDE.app/Contents/Resources/qt.conf [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/Resources/qt.conf with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/Resources/qt_menu.nib/classes.nib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/Resources/qt_menu.nib/classes.nib with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/Resources/qt_menu.nib/info.nib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/Resources/qt_menu.nib/info.nib with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/Resources/qt_menu.nib/keyedobjects.nib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/Resources/qt_menu.nib/keyedobjects.nib with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/plugins/imageformats/libqgif.dylib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/plugins/imageformats/libqgif.dylib with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/plugins/imageformats/libqico.dylib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/plugins/imageformats/libqico.dylib with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/plugins/imageformats/libqjpeg.dylib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/plugins/imageformats/libqjpeg.dylib with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/plugins/imageformats/libqmng.dylib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/plugins/imageformats/libqmng.dylib with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/plugins/imageformats/libqsvg.dylib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/plugins/imageformats/libqsvg.dylib with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/plugins/imageformats/libqtga.dylib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/plugins/imageformats/libqtga.dylib with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/plugins/imageformats/libqtiff.dylib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/plugins/imageformats/libqtiff.dylib with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/plugins/imageformats/libqwbmp.dylib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/plugins/imageformats/libqwbmp.dylib with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/plugins/platforms/libqcocoa.dylib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/plugins/platforms/libqcocoa.dylib with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/plugins/platforms/libqminimal.dylib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/plugins/platforms/libqminimal.dylib with 100% similarity]
package/adding_files/macos/ide/IDE.app/Contents/plugins/platforms/libqoffscreen.dylib [moved from package/adding_files/macos/ide/TizenIDE.app/Contents/plugins/platforms/libqoffscreen.dylib with 100% similarity]
package/changelog
package/pkginfo.manifest