Merge remote-tracking branch 'origin/nscreen' into develop 69/20769/1
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Mon, 12 May 2014 16:02:28 +0000 (01:02 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Mon, 12 May 2014 16:02:28 +0000 (01:02 +0900)
commit19743167f0cdcc9dd9a7a357ae81af7b28744f5e
treef048a10910d7a261f43df5037668560e98d84410
parentf3f24e2607dde799b3ca146b88351c0903e0ae92
Merge remote-tracking branch 'origin/nscreen' into develop

* origin/nscreen: (23 commits)
  Merge remote-tracking branch 'origin/develop' into nscreen
  NSCREEN : cssfile loader added cssfile loading added
  NSCREEN : remove unused code. remove unused code.
  NSCREEN : Old nscreen source delete NScreenList, NScreenListItem class delete
  NSCREEN : NScreen view implement update NScreen view contents changed NScreen view action changed Nscreen icons added
  NSCREEN : Modify meta reader&writer. Modify meta reader and writer for Nscreen view menu info.
  NSCREEN: Make nscreenModelManager. Make nscreenModelManger.
  NSCREEN : add getNscreeNModelList(device info) get NscreenModellist.
  NSCREEN : Update device Info and modify NscreenModel Update real device and Modify Nscreenmodel.
  Nscreen: Add Fields in NscreenModel. It was meaning that allowed menu in Nscreen View.
  NSCREEN : Add device and deviceManager add Real device info and deviceManager
  NSCREEN: move  initializion of nscreenModel. If index.meta.xml file is net exist, uibuilder initialize  nscreen model. If index.meta.xml file is exist, uibuidlder read this.
  NSCREEN : Modify XSLT by new NScreenModel.
  NSCREEN : Remove unused function and Modify NscreenLisitItem. remove printNscreenModel and modify NscreenListItem.
  NSCREEN : initialize nscreenmodel. initialize nscreenmodel.
  NSCREEN : add nscreenmodel controller. when page added, nscreen item add page info. nscreen controller add nscreen item for page info.
  NScreen : add Common nscreen. addCommonNscreen() in Appmanger.
  NSCREEN : Modify nscreen model. add attribute ( link, EnabePages, devicePixelRatio ). Remove attribute (Prefix min,max attribute).
  NSCREEN : Change path for Nscreen model. Change path for Nscreen model.
  NSCREEN : Modify N-Screen model scope. page - > application.
  ...

Change-Id: Ic5ca93f769f0585532aec93565392c884ad7494f
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
76 files changed:
org.tizen.webuibuilder/res/icons/common.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/orientation-landscape.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/orientation-portrait.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/pixel-ratio10.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/pixel-ratio15.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/pixel-ratio20.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/pixel-ratio30.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/resoluion-1-1.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/resoluion-10-16.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/resoluion-16-10.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/resoluion-16-9.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/resoluion-2-3.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/resoluion-3-2.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/resoluion-3-4.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/resoluion-3-5.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/resoluion-4-3.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/resoluion-4-5.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/resoluion-5-3.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/resoluion-5-4.png [new file with mode: 0644]
org.tizen.webuibuilder/res/icons/resoluion-9-16.png [new file with mode: 0644]
org.tizen.webuibuilder/res/xslt/page_managed_css_ver0_0_3.xslt
org.tizen.webuibuilder/src/org/tizen/webuibuilder/BuilderConstants.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/common/ColorManager.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/common/ColorResource.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/Part.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManager.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForHTML.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaWriter_ver_1.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/css/CssFile.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/filedata/HtmlMetaFileData.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/filedata/PageFileData.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageReader_ver_2.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageWriter_ver_2.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/Device.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/DeviceManager.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModel.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelController.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelManager.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NScreenDescriptor.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/page/PageData.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForAppXML.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/nscreen/FontUtil.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/INScreenDrawRenderer.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenAddCommand.java [deleted file]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenBaseComposite.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenCustomDialog.java [deleted file]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenDeleteCommand.java [deleted file]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenGroup.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenHistory.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenItem.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenItemFloatRenderer.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenList.java [deleted file]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenListItem.java [deleted file]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenListItemImageComposite.java [deleted file]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenPage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenSimpleRenderer.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenUtil.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenView.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenDisableCommand.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenEnableCommand.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenLinkCutCommand.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenLinkDownCommand.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenLinkUpCommand.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenMoveDownCommand.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenMoveUpCommand.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/dialog/NScreenInputWizardPage.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/dialog/NScreenViewMessages.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/dialog/NScreenViewMessages.properties [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/dialog/NscreenInputWizard.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/model/NScreenModel.java [deleted file]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/model/NScreenPageModel.java