From 1597450fa0c4fece407d00127604a21ca51da919 Mon Sep 17 00:00:00 2001 From: jooyoul_lee Date: Fri, 16 May 2014 15:56:57 +0900 Subject: [PATCH] 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 --- .../src/org/tizen/webuibuilder/ui/editor/PageDesigner.java | 8 +++++--- .../src/org/tizen/webuibuilder/ui/editor/PageDesignerToolbar.java | 2 ++ .../src/org/tizen/webuibuilder/ui/views/nscreen/NScreenPage.java | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java index 16c53c1..d4f7bd4 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java @@ -986,9 +986,9 @@ public class PageDesigner extends GraphicalEditor implements CommandStackListene // GraphicalViewerKeyHandler keyHandler = new GraphicalViewerKeyHandler(viewer); keyHandler.put(KeyStroke.getPressed(SWT.DEL, 127, SWT.NONE), getActionRegistry().getAction(ActionFactory.DELETE.getId())); - keyHandler.put(KeyStroke.getPressed((char)26, 122, SWT.CTRL), // Ctrl+z + keyHandler.put(KeyStroke.getPressed((char) 26, 122, SWT.CTRL), // Ctrl+z getActionRegistry().getAction(ActionFactory.UNDO.getId())); - keyHandler.put(KeyStroke.getPressed((char)25, 121, SWT.CTRL), // Ctrl+y + keyHandler.put(KeyStroke.getPressed((char) 25, 121, SWT.CTRL), // Ctrl+y getActionRegistry().getAction(ActionFactory.REDO.getId())); keyHandler.put(KeyStroke.getPressed(SWT.ARROW_LEFT, SWT.NONE), getActionRegistry() .getAction(Messages.ACTION_MOVE_LEFT)); @@ -1724,7 +1724,9 @@ public class PageDesigner extends GraphicalEditor implements CommandStackListene @Override public void pageChanged(PageDataEvent e) { - getViewer().updateStyle(); + if (getViewer() != null) { + getViewer().updateStyle(); + } } diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerToolbar.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerToolbar.java index 67d77f7..5f97721 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerToolbar.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerToolbar.java @@ -200,6 +200,8 @@ public class PageDesignerToolbar implements ISelectionListener { device = devices.get(1); } else if (profile.contains("wearable")) { device = devices.get(0); + } else { + device = devices.get(1); } nscreen = new NScreenHistory(); nscreen.setLastResolution(device.getDisplayName()); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenPage.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenPage.java index 47a2a89..d027ce3 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenPage.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenPage.java @@ -121,6 +121,8 @@ public class NScreenPage extends Page { device = devices.get(1); } else if (profile.contains("wearable")) { device = devices.get(0); + } else { + device = devices.get(1); } commonHistory.setModelName(model.getName()); commonHistory.setLastResolution(device.getDisplayName()); -- 2.7.4