NSCREEN : Enable/Disable bug fixed, etc.

1. NScreen Item enable/disable bug fix (css selection bug)
2. NScreen group name added
3. NScreen Title added
4. ground.js indentation fixed
5. data-binding dialog dependency fixed (webapp-eplugin package changed)

Change-Id: I26c23986583d3cb6a3f55816f9db32535b68db9a
Signed-off-by: jooyoul_lee <jy.exe.lee@samsung.com>

diff --git a/org.tizen.webuibuilder/META-INF/MANIFEST.MF b/org.tizen.webuibuilder/META-INF/MANIFEST.MF
index 17ae711..7addf2c 100644 (file)
--- a/org.tizen.webuibuilder/META-INF/MANIFEST.MF
+++ b/org.tizen.webuibuilder/META-INF/MANIFEST.MF
@@ -40,6 +40,8 @@ Import-Package: org.eclipse.core.filesystem,
  org.eclipse.wst.jsdt.core.refactoring,
  org.eclipse.wst.jsdt.core.refactoring.descriptors,
  org.eclipse.wst.sse.ui,
+ org.tizen.web.config.schema.model,
+ org.tizen.web.editor.configuration,
  org.w3c.css.sac;version="1.3.0",
  org.w3c.css.sac.helpers;version="1.3.0"
 Export-Package: org.tizen.webuibuilder.extintrf,

diff --git a/org.tizen.webuibuilder/res/html/ground.js b/org.tizen.webuibuilder/res/html/ground.js
index 7c762a9..01a1904 100644 (file)
--- a/org.tizen.webuibuilder/res/html/ground.js
+++ b/org.tizen.webuibuilder/res/html/ground.js
@@ -142,8 +142,8 @@ function getClientBound() {
                b : parseInt(wgt.css("margin-bottom")),
                left : parseInt(pos.left),
                top : parseInt(pos.top),
-    width : parseInt(wgt.width()),
-    height : parseInt(wgt.height())
+               width : parseInt(wgt.width()),
+               height : parseInt(wgt.height())
        };
        if (bound.w < 1)
                bound.w = 1;
@@ -174,8 +174,8 @@ function getWindowBound() {
                b : parseInt(wgt.css("margin-bottom")),
                left : parseInt(pos.left),
                top : parseInt(pos.top),
-    width : parseInt(wgt.width()),
-    height : parseInt(wgt.height())
+               width : parseInt(wgt.width()),
+               height : parseInt(wgt.height())
        };
        if (bound.w < 1)
                bound.w = 1;
@@ -203,8 +203,8 @@ function getPageBound() {
                b : parseInt(wgt.css("margin-bottom")),
                left : parseInt(pos.left),
                top : parseInt(pos.top),
-    width : parseInt(wgt.width()),
-    height : parseInt(wgt.height())
+               width : parseInt(wgt.width()),
+               height : parseInt(wgt.height())
        };
        return bound;
 }
@@ -225,8 +225,8 @@ function getOneWidgetBound(wgt) {
                b : parseInt(wgt.css("margin-bottom")),
                left : parseInt(pos.left),
                top : parseInt(pos.top),
-    width : parseInt(wgt.width()),
-    height : parseInt(wgt.height()),
+               width : parseInt(wgt.width()),
+               height : parseInt(wgt.height()),
                transform : wgt.css("-webkit-transform"),
                transformOriginX : parseFloat(origin[0]),
                transformOriginY : parseFloat(origin[1]),

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/figure/PartFigure.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/figure/PartFigure.java
index 8cdaf98..011a72f 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/figure/PartFigure.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/figure/PartFigure.java
@@ -44,8 +44,6 @@ public class PartFigure extends Figure {
     private boolean borderVisible = false;
 
     private PointList polygonPoints;
-    private TooltipFigure tooltipFigure = null;
-    private boolean bBinded = false;
 
     protected boolean containtsInChidren(IFigure f, int x, int y) {
         List<IFigure> children = f.getChildren();

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
index b83a3b3..c00c4d7 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
@@ -193,9 +193,9 @@ public class HtmlMetaReader_ver_1 {
             }
 
             // cssfile
-            if (screen.getAttribute("cssFileName").length() > 0) {
-                model.setFileName(screen.getAttribute("cssFileName"));
-            }
+//            if (screen.getAttribute("cssFileName").length() > 0) {
+//                model.setFileName(screen.getAttribute("cssFileName"));
+//            }
 
             // menu
             if (screen.getAttribute("defaultInMenu").length() > 0) {

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageReader_ver_2.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageReader_ver_2.java
index 5f58925..9e41822 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageReader_ver_2.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageReader_ver_2.java
@@ -161,9 +161,10 @@ public class PageReader_ver_2 {
                                model.setWidth(Integer.parseInt(child.getTextContent()));
                            } else if ("height".equals(tagName)) {
                                model.setHeight(Integer.parseInt(child.getTextContent()));
-                           } else if ("cssFileName".equals(tagName)) {
-                               model.setFileName(child.getTextContent());
-                           }
+                           } 
+//                         else if ("cssFileName".equals(tagName)) {
+//                             model.setFileName(child.getTextContent());
+//                         }
                     }
                 }
                 pageFileData.getNscreenModelList().add(model);

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModel.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModel.java
index c11f8e0..16031f3 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModel.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModel.java
@@ -49,7 +49,6 @@ public class NScreenModel {
     }
 
     // Nscreen Info
-    private String nscreenName;
     private NScreenType type = null;
     private HashMap<String, Boolean> enablePages = new HashMap<String, Boolean>();
     private HashMap<String, Integer> link = new HashMap<String, Integer>();
@@ -79,7 +78,7 @@ public class NScreenModel {
     // private int minDeviceWidth;
     // private int maxDeviceWidth;
 
-    private String fileName;
+    private String nscreenName;
 
     public NScreenModel(String name, NScreenType type) {
         this.nscreenName = name;
@@ -258,10 +257,6 @@ public class NScreenModel {
         this.grid = grid;
     }
 
-    public String getOriginFileName() {
-        return fileName;
-    }
-
     public String getAspectRatio() {
         return reduceRatio(width, height);
     }
@@ -314,13 +309,12 @@ public class NScreenModel {
     }
 
     public String getFileName() {
+        String fileName = nscreenName.toLowerCase();
+        fileName = fileName.replaceAll(" ", "_");
+        fileName = fileName.replaceAll(":", "x");
         return fileName;
     }
 
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
     public HashMap<String, Boolean> getEnablePages() {
         return enablePages;
     }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelManager.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelManager.java
index ed5eeac..3f37366 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelManager.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelManager.java
@@ -39,7 +39,6 @@ public class NScreenModelManager {
 
     public NScreenModel createCommonNscreen() {
         NScreenModel model = new NScreenModel(BuilderConstants.NSCREENCOMMON, NScreenType.COMMON);
-        model.setFileName(BuilderConstants.NSCREENCOMMON.toLowerCase());
         model.setDefaultInMenu(true);
         model.setEnableInMenu(false);
         model.setLinkInMenu(false);

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NScreenDescriptor.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NScreenDescriptor.java
index 506dd4c..916ba3a 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NScreenDescriptor.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NScreenDescriptor.java
@@ -142,11 +142,11 @@ public class NScreenDescriptor {
             model.setDeviceHeight(deviceHeight);
         }
 
-        if (fileName != null) {
-            if (!fileName.isEmpty()) {
-                model.setFileName(fileName);
-            }
-        }
+//        if (fileName != null) {
+//            if (!fileName.isEmpty()) {
+//                model.setFileName(fileName);
+//            }
+//        }
         this.setMenuFlag(model);
         this.list.add(model);
     }

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 19fab66..32125fd 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
@@ -174,6 +174,7 @@ import org.tizen.webuibuilder.ui.editor.ruler.DesignerRulerProvider;
 import org.tizen.webuibuilder.ui.editor.texteditor.TextEditor;
 import org.tizen.webuibuilder.ui.views.nscreen.NScreenHistory;
 import org.tizen.webuibuilder.ui.views.nscreen.NScreenItem;
+import org.tizen.webuibuilder.ui.views.nscreen.NScreenUtil;
 import org.tizen.webuibuilder.ui.views.pages.ThumbnailEditPart;
 import org.tizen.webuibuilder.ui.views.properties.PropertiesPage;
 import org.tizen.webuibuilder.ui.views.properties.PropertiesPage.PropertiesMode;
@@ -297,7 +298,7 @@ public class PageDesigner extends GraphicalEditor implements CommandStackListene
 
     public void setNscreenIndex(NScreenModel model) {
 
-        String cssFileName = pageData.getName() + "_" + model.getName() + ".css";
+        String cssFileName = pageData.getName() + "_" + model.getFileName() + ".css";
 
         File curFile = new File(pageData.getCurrentCssFile().getCssFilePath());
 
@@ -342,7 +343,7 @@ public class PageDesigner extends GraphicalEditor implements CommandStackListene
         List<CssFile> list = pageData.getCssFiles();
         List<CssFile> applyList = new ArrayList<CssFile>();
         for (NScreenModel model : models) {
-            String cssFileName = pageData.getName() + "_" + model.getName() + ".css";
+            String cssFileName = pageData.getName() + "_" + model.getFileName() + ".css";
 
             int size = list.size();
             for (int i = 0; i < size; i++) {
@@ -359,7 +360,7 @@ public class PageDesigner extends GraphicalEditor implements CommandStackListene
             setCssFileToModel(applyList.get(i));
         }
         if (null != itemHistory) {
-            String cssFileName = pageData.getName() + "_" + itemHistory.getModelName() + ".css";
+            String cssFileName = pageData.getName() + "_" + itemHistory.getFileName() + ".css";
             boolean isSet = false;
             for (int i = 0; i < list.size(); i++) {
                 CssFile file = list.get(i);
@@ -374,6 +375,8 @@ public class PageDesigner extends GraphicalEditor implements CommandStackListene
                 pageData.setCssFileIndex(0);
             }
         }
+        
+        NScreenUtil.nscreen_log("current page css : " +pageData.getCurrentCssFile().getCssFilePath());
         getViewer().updateStyle();
 
     }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForAppXML.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForAppXML.java
index 1108ef8..932ae7f 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForAppXML.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForAppXML.java
@@ -148,11 +148,11 @@ public class PageDesignerForAppXML extends PageDesigner {
                         e.printStackTrace();
                     }
 
-                    model.setFileName(cssPath.substring(cssPath.lastIndexOf(IPath.SEPARATOR) + 1));
-                    cssFile = loadCssFile(cssPath);
-                    if (cssFile != null) {
-                        pageData.addCssFile(cssFile);
-                    }
+//                    model.setFileName(cssPath.substring(cssPath.lastIndexOf(IPath.SEPARATOR) + 1));
+//                    cssFile = loadCssFile(cssPath);
+//                    if (cssFile != null) {
+//                        pageData.addCssFile(cssFile);
+//                    }
                 } else {
 //                    for ( String page : model.getEnalbePages() ) {
 //                        String cssPath =

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForHTML.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForHTML.java
index c2dab35..9104f55 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForHTML.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForHTML.java
@@ -152,7 +152,7 @@ public class PageDesignerForHTML extends PageDesigner implements ITextEditorList
                     String cssFileName =
                     // pageData.getName() + BuilderConstants.UNDERBAR
                             page.getName() + BuilderConstants.UNDERBAR
-                                    + BuilderConstants.NSCREENCOMMON
+                                    + BuilderConstants.NSCREENCOMMON.toLowerCase()
                                     + BuilderConstants.CSS_EXTENSION;
                     String cssPath = appManager.getCssFolder() + IPath.SEPARATOR + cssFileName;
 
@@ -184,7 +184,7 @@ public class PageDesignerForHTML extends PageDesigner implements ITextEditorList
                     setCssFileToModel(page.getCurrentCssFile());
                 } else {
                     for (File f : pageCssFile) {
-                        if (f.getName().contains(BuilderConstants.NSCREENCOMMON)) {
+                        if (f.getName().contains(BuilderConstants.NSCREENCOMMON.toLowerCase())) {
                             CssFile cssFile = loadCssFile(f.getPath());
                             page.addCssFile(cssFile);
                             pageCssFile.remove(f);
@@ -216,7 +216,7 @@ public class PageDesignerForHTML extends PageDesigner implements ITextEditorList
                     if(model == null){
                         continue;
                     }
-                    String cssFileName = page.getName() + "_" + model.getName() + ".css";
+                    String cssFileName = page.getName() + "_" + model.getFileName() + ".css";
                     int size = list.size();
                     for (int i = 0; i < size; i++) {
                         CssFile cssFileItem = list.get(i);

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/ResolutionManger.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/ResolutionManger.java
index f0a8d16..8487b52 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/ResolutionManger.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/ResolutionManger.java
@@ -176,7 +176,12 @@ public class ResolutionManger {
     }
 
     private void addScreenSize(Device device) {
-        addScreenSize(device.getDeviceWidth(), device.getDeviceHeight(), device.getDisplayName());
+        int width = device.getDeviceWidth();
+        int height = device.getDeviceHeight();
+        height = (320 *height)/width ; 
+        
+        addScreenSize(320, height, device.getDisplayName());
+//        addScreenSize(device.getDeviceWidth(), device.getDeviceHeight(), device.getDisplayName());
         devices.add(device);
     }
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/Helper.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/Helper.java
index 5d76ad0..27433e9 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/Helper.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/Helper.java
@@ -72,9 +72,9 @@ import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
 import org.eclipse.ui.model.WorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 import org.tizen.web.config.schema.model.Privilege;
-import org.tizen.web.project.configuration.ConfigurationException;
-import org.tizen.web.project.configuration.ConfiguratorFactory;
-import org.tizen.web.project.configuration.ITizenConfigurator;
+import org.tizen.web.editor.configuration.ConfigurationException;
+import org.tizen.web.editor.configuration.ConfiguratorFactory;
+import org.tizen.web.editor.configuration.ITizenConfigurator;
 import org.tizen.webuibuilder.BuilderConstants;
 import org.tizen.webuibuilder.ui.views.databinding.model.TreeItemData;
 import org.tizen.webuibuilder.utility.ResourceManager;

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/FontUtil.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/FontUtil.java
index 0c20352..42a111a 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/FontUtil.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/FontUtil.java
@@ -16,11 +16,15 @@ public class FontUtil {
     private static FontRegistry fontRegistry = new FontRegistry();
     private static final Font defaultFont = getDADefaultFont();
 
+    
     public static final Font NSCREEN_TITLE =
-            getFont("nscreen_title", setDefaultFontStyleAndSize(SWT.ITALIC, 15));//$NON-NLS-1$
-    // mac 11
+            getFont("nscreen_title", setDefaultFontStyleAndSize(SWT.BOLD, 15));//$NON-NLS-1$
 
-    public static final Font COMMON = getFont("nscreen_common", resizeDefaultFont(14, 1));//$NON-NLS-1$
+    public static final Font NSCREEN_GROUP =
+            getFont("nscreen_group", setDefaultFontStyleAndSize(SWT.ITALIC, 12));//$NON-NLS-1$
+    // mac 11
+    
+    public static final Font NSCREEN_ITEM = getFont("nscreen_item", resizeDefaultFont(11, 1));//$NON-NLS-1$
     // mac 11
 
     public static final Font ORIENTATION = getFont("nscreen_orientation", resizeDefaultFont(14, 1));//$NON-NLS-1$
@@ -28,7 +32,7 @@ public class FontUtil {
 
     public static final Font PIXELRATIO = getFont("nscreen_pixelratio", resizeDefaultFont(14, 1));//$NON-NLS-1$
     // mac 11
-    public static final Font DEVICE = getFont("nscreen_device", resizeDefaultFont(12, 1));//$NON-NLS-1$
+    public static final Font DEVICE = getFont("nscreen_device", resizeDefaultFont(14, 1));//$NON-NLS-1$
     // mac 11
 
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenBaseComposite.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenBaseComposite.java
index e9cac7e..f3fb6f8 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenBaseComposite.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenBaseComposite.java
@@ -13,11 +13,16 @@ import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
 import org.tizen.webuibuilder.animator.ui.views.timeline.common.ColorResource;
@@ -27,8 +32,10 @@ import org.tizen.webuibuilder.ui.views.nscreen.model.NScreenPageModel;
 
 public class NScreenBaseComposite extends ScrolledComposite {
 
+    public static final int NSCREEN_TITLE_HEIGHT = 50;
+    public static int SEPARATOR_HEIGHT = 10;
+
     private List<NScreenGroup> groups = new ArrayList<NScreenGroup>();
-    private static int SEPARATOR_HEIGHT = 10;
     private Composite comp = null;
     private Menu popup = null;
     private NScreenPageModel pageModel = null;
@@ -50,26 +57,42 @@ public class NScreenBaseComposite extends ScrolledComposite {
                 setMinSize(comp.computeSize(r.width, SWT.DEFAULT));
             }
         });
-    }
 
-    private Composite addSeparator() {
-        Composite separator = new Composite(this, SWT.NONE);
-        separator.addPaintListener(new PaintListener() {
+        comp.addPaintListener(new PaintListener() {
 
             @Override
             public void paintControl(PaintEvent e) {
-                e.gc.setBackground(ColorResource.BLACK);
-                e.gc.fillRectangle(getBounds());
+                Rectangle rect = getClientArea();
+                rect.height = NSCREEN_TITLE_HEIGHT;
+                String title = "= " + pageModel.getPageData().getName() + " =";
+
+                Font oldFont = e.gc.getFont();
+                Color oldBgColor = e.gc.getBackground();
+                Color oldFgColor = e.gc.getForeground();
+
+                e.gc.setForeground(ColorResource.BLACK);
+                e.gc.setFont(FontUtil.NSCREEN_TITLE);
+                Point textWH = FontUtil.getTextArea(title, e.gc);
+                int x = rect.x + (rect.width - textWH.x) / 2;
+                int y = rect.y + (rect.height - textWH.y) / 2;
+                e.gc.drawText(title, x, y);
+
+                e.gc.setFont(oldFont);
+                e.gc.setBackground(oldBgColor);
+                e.gc.setForeground(oldFgColor);
+            }
+        });
+
+        comp.addListener(SWT.MouseDoubleClick, new Listener() {
+
+            @Override
+            public void handleEvent(Event event) {
+                boolean logEnabled = NScreenUtil.isLogEnabled();
+                NScreenUtil.nscreen_log("NSCreenLog Off");
+                NScreenUtil.enableNScreenLog(!logEnabled);
+                NScreenUtil.nscreen_log("NSCreenLog On");
             }
         });
-        int size = groups.size();
-        FormData data = new FormData();
-        data.top = new FormAttachment(groups.get(size - 1), 0);
-        data.left = new FormAttachment(0, 0);
-        data.right = new FormAttachment(100, 0);
-        data.height = SEPARATOR_HEIGHT;
-        separator.setLayoutData(data);
-        return separator;
     }
 
     private void createPopupMenu() {
@@ -184,17 +207,7 @@ public class NScreenBaseComposite extends ScrolledComposite {
     }
 
     public NScreenGroup createNewGroup(NScreenType groupId, String title) {
-        int height = 0;
         int count = groups.size();
-        Composite separator = null;
-        if (count > 0) {
-            for (NScreenGroup g : groups) {
-                height += g.getGroupHeight();
-            }
-            height += (count - 1) * SEPARATOR_HEIGHT;
-            separator  = addSeparator();
-//            height += SEPARATOR_HEIGHT;
-        }
 
         NScreenGroup newGroup = new NScreenGroup(this, SWT.NONE, groupId);
         if (title != null) {
@@ -205,7 +218,7 @@ public class NScreenBaseComposite extends ScrolledComposite {
         if (count > 0) {
             data.top = new FormAttachment(groups.get(count - 1), 4);
         } else {
-            data.top = new FormAttachment(0, 0);
+            data.top = new FormAttachment(0, NSCREEN_TITLE_HEIGHT);
         }
         data.left = new FormAttachment(0, 0);
         data.right = new FormAttachment(100, 0);

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenGroup.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenGroup.java
index 774d38a..09b204d 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenGroup.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenGroup.java
@@ -31,8 +31,8 @@ public class NScreenGroup extends Composite {
     private List<NScreenItem> items = new ArrayList<NScreenItem>();
 
     // FIXME
-    public static final int GROUP_LABEL_HEIGHT = 50;
-    public static final int MIN_GROUP_ITEM_HEIGHT = 50;
+    public static final int GROUP_LABEL_HEIGHT = 30;
+    public static final int MIN_GROUP_ITEM_HEIGHT = 38;
     public static final int ITEM_MARGIN = 0;
 
     private int height = MIN_GROUP_ITEM_HEIGHT;
@@ -61,7 +61,7 @@ public class NScreenGroup extends Composite {
             e.gc.setForeground(ColorResource.BLACK);
 
             if (null != title) {
-                e.gc.setFont(FontUtil.NSCREEN_TITLE);
+                e.gc.setFont(FontUtil.NSCREEN_GROUP);
                 Point textWH = FontUtil.getTextArea(title, e.gc);
                 int x = rect.x + (rect.width - textWH.x) / 2;
                 int y = rect.y + (GROUP_LABEL_HEIGHT - textWH.y) / 2;
@@ -102,11 +102,6 @@ public class NScreenGroup extends Composite {
 
     public NScreenItem addItem(NScreenModel model) {
         int count = items.size();
-        // FIXME : contant -> margin is 1
-        int h = 0;
-        if (count > 0) {
-            h = height * (count - 1) + ITEM_MARGIN;
-        }
         FormData data = new FormData();
         data.left = new FormAttachment(0, 0);
         data.right = new FormAttachment(100, -0);
@@ -161,7 +156,9 @@ public class NScreenGroup extends Composite {
 
     public int getGroupHeight() {
         int h = 0;
-        if (groupType == NScreenType.COMMON) {
+//        if (groupType == NScreenType.COMMON) {
+        if (title != null)
+        {
             h = (height * items.size() + (items.size() - 1) * ITEM_MARGIN) + GROUP_LABEL_HEIGHT;
         } else {
             h = (height * items.size() + (items.size() - 1) * ITEM_MARGIN);
@@ -221,34 +218,34 @@ public class NScreenGroup extends Composite {
     }
 
     public List<NScreenItem> getLinkedItems(NScreenItem item) {
-        NScreenItem root = item;
-        if (!item.isRoot()) {
-            root = item.getReference();
-        }
-
-        List<NScreenItem> linked = root.getLinkedList();
-        int size = linked.size() + 1;
-        int index = 100;
-        NScreenItem childItem = null;
-        for (NScreenItem ni : linked) {
-            int linkIndex = getItems().indexOf(ni);
-            if (linkIndex < index) {
-                index = linkIndex;
-                childItem = ni;
-            }
-        }
-
-        int firstIndex = -1;
-        if (getItems().indexOf(root) > getItems().indexOf(childItem)) {
-            firstIndex = getItems().indexOf(childItem);
-        } else {
-            firstIndex = getItems().indexOf(root);
-        }
+//        NScreenItem root = item;
+//        if (!item.isRoot()) {
+//            root = item.getReference();
+//        }
+//
+//        List<NScreenItem> linked = root.getLinkedList();
+//        int size = linked.size() + 1;
+//        int index = 100;
+//        NScreenItem childItem = null;
+//        for (NScreenItem ni : linked) {
+//            int linkIndex = getItems().indexOf(ni);
+//            if (linkIndex < index) {
+//                index = linkIndex;
+//                childItem = ni;
+//            }
+//        }
+//
+//        int firstIndex = -1;
+//        if (getItems().indexOf(root) > getItems().indexOf(childItem)) {
+//            firstIndex = getItems().indexOf(childItem);
+//        } else {
+//            firstIndex = getItems().indexOf(root);
+//        }
 
         List<NScreenItem> retList = new ArrayList<NScreenItem>();
-        for (int i = firstIndex; i < firstIndex + size; i++) {
-            retList.add(getItems().get(i));
-        }
+//        for (int i = firstIndex; i < firstIndex + size; i++) {
+//            retList.add(getItems().get(i));
+//        }
 
         return retList;
     }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenHistory.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenHistory.java
index dce769f..cd7fde1 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenHistory.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenHistory.java
@@ -5,7 +5,7 @@ package org.tizen.webuibuilder.ui.views.nscreen;
 public class NScreenHistory {
     private String lastResolution = null;
     private float lastScale = 0f;
-    private String modelName = null;
+    private String nscreenName = null;
 
     public NScreenHistory() {
 
@@ -28,11 +28,17 @@ public class NScreenHistory {
     }
 
     public String getModelName() {
-        return modelName;
+        return nscreenName;
     }
 
     public void setModelName(String modelName) {
-        this.modelName = modelName;
+        this.nscreenName = modelName;
     }
 
+    public String getFileName() {
+        String fileName = nscreenName.toLowerCase();
+        fileName = fileName.replaceAll(" ", "_");
+        fileName = fileName.replaceAll(":", "x");
+        return fileName;
+    }
 }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenItem.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenItem.java
index e196715..8e5c77d 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenItem.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenItem.java
@@ -291,24 +291,26 @@ public class NScreenItem extends Composite {
     }
 
     public String getFileName() {
-        if (model.isLinked(getPageId())) {
-            return reference.getFileName();
-        }
+//        if (model.isLinked(getPageId())) {
+//            return reference.getFileName();
+//        }
         String pageId = parent.getNScreenPageModel().getPageData().getName();
-        String screenName = model.getName();
+        String screenFileName = model.getFileName();
         StringBuffer strBuffer = new StringBuffer();
-        strBuffer.append(pageId).append("_").append(screenName).append(".css");
+        strBuffer.append(pageId).append("_").append(screenFileName).append(".css");
         return strBuffer.toString();
     }
 
     public void enableAction() {
         Command command = new NScreenEnableCommand(this);
         parent.getNScreenPageModel().getPageDesigner().getCommandStack().execute(command);
+        clicked();
     }
 
     public void disableAction() {
         Command command = new NScreenDisableCommand(this);
         parent.getNScreenPageModel().getPageDesigner().getCommandStack().execute(command);
+        clicked();
     }
 
     public void moveUpAction() {

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenItemFloatRenderer.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenItemFloatRenderer.java
index 3cd2fe8..6c88e95 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenItemFloatRenderer.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenItemFloatRenderer.java
@@ -2,25 +2,21 @@
 
 package org.tizen.webuibuilder.ui.views.nscreen;
 
-import static org.tizen.webuibuilder.ui.views.nscreen.NScreenItem.STATE_HOVER;
-import static org.tizen.webuibuilder.ui.views.nscreen.NScreenItem.STATE_NORMAL;
-import static org.tizen.webuibuilder.ui.views.nscreen.NScreenItem.STATE_PUSH;
+//import static org.tizen.webuibuilder.ui.views.nscreen.NScreenItem.STATE_HOVER;
+//import static org.tizen.webuibuilder.ui.views.nscreen.NScreenItem.STATE_NORMAL;
+//import static org.tizen.webuibuilder.ui.views.nscreen.NScreenItem.STATE_PUSH;
 
-import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;
-import org.tizen.webuibuilder.animator.ui.views.timeline.common.ColorResource;
 import org.tizen.webuibuilder.model.nscreen.NScreenModel;
-import org.tizen.webuibuilder.model.nscreen.NScreenModel.NScreenType;
 
 
 public class NScreenItemFloatRenderer implements INScreenDrawRenderer {
-    private static int IMAGE_SIZE = 30;
-    private static int X_MARGIN = 4;
-
-    private static int TEXT_MARGIN_X = X_MARGIN + IMAGE_SIZE + 30;
+//    private static int IMAGE_SIZE = 30;
+//    private static int X_MARGIN = 4;
+//
+//    private static int TEXT_MARGIN_X = X_MARGIN + IMAGE_SIZE + 30;
 
     @Override
     public void draw(GC gc, Canvas canvas, int state, boolean isSelected, boolean enabled,

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 78c5b8c..21dda6a 100644 (file)
--- 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
@@ -84,10 +84,11 @@ public class NScreenPage extends Page {
         for (NScreenModel model : models) {
             if (groups.size() == 0) {
                 group =
-                        mParentComposite.createNewGroup(model.getType(), mNScreenPageModel
-                                .getPageData().getName());
-                group.setHeight(50);
-                NScreenItem rootItem = group.addItem(model);
+//                        mParentComposite.createNewGroup(model.getType(), mNScreenPageModel
+//                                .getPageData().getName());
+                        mParentComposite.createNewGroup(model.getType(), model.getType().toString());
+//                group.setHeight(40);
+                group.addItem(model);
             } else {
                 NScreenGroup selectedGroup = null;
                 for (NScreenGroup g : groups) {
@@ -97,8 +98,8 @@ public class NScreenPage extends Page {
                     }
                 }
                 if (selectedGroup == null) {
-                    group = mParentComposite.createNewGroup(model.getType(), null);
-                    group.setHeight(50);
+                    group = mParentComposite.createNewGroup(model.getType(), model.getType().toString());
+//                    group.setHeight(40);
                     group.addItem(model);
                 } else {
                     selectedGroup.addItem(model);

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenSimpleRenderer.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenSimpleRenderer.java
index 849d74e..00d1934 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenSimpleRenderer.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenSimpleRenderer.java
@@ -195,21 +195,21 @@ public class NScreenSimpleRenderer implements INScreenDrawRenderer {
     }
 
     private Font getGroupFont(NScreenModel model) {
-        Font font = null;
-        NScreenType type = model.getType();
-        if (type == NScreenType.COMMON) {
-            font = FontUtil.COMMON;
-        } else if (type == NScreenType.ORIENTATION) {
-            font = FontUtil.ORIENTATION;
-        } else if (type == NScreenType.PIXELRATIO) {
-            font = FontUtil.PIXELRATIO;
-        } else if (type == NScreenType.RESOLUTION) {
-            font = FontUtil.DEVICE;
-        } else {
-            font = FontUtil.DEVICE;
-        }
-
-        return font;
+//        Font font = null;
+//        NScreenType type = model.getType();
+//        if (type == NScreenType.COMMON) {
+//            font = FontUtil.NSCREEN_GROUP;
+//        } else if (type == NScreenType.ORIENTATION) {
+//            font = FontUtil.ORIENTATION;
+//        } else if (type == NScreenType.PIXELRATIO) {
+//            font = FontUtil.PIXELRATIO;
+//        } else if (type == NScreenType.RESOLUTION) {
+//            font = FontUtil.DEVICE;
+//        } else {
+//            font = FontUtil.DEVICE;
+//        }
+
+        return FontUtil.NSCREEN_ITEM;
     }
 
     private void setContents(Canvas canvas, NScreenModel model, GC gc) {

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenUtil.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenUtil.java
index ff2b474..02e2a59 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenUtil.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenUtil.java
@@ -20,6 +20,22 @@ import org.tizen.webuibuilder.utility.ResourceManager;
 
 
 public class NScreenUtil {
+    private static boolean logEnabled = false;
+
+    public static void enableNScreenLog(boolean enabled) {
+        logEnabled = enabled;
+    }
+
+    public static boolean isLogEnabled() {
+        return logEnabled;
+    }
+
+    public static void nscreen_log(String log) {
+        if (logEnabled) {
+            System.out.println("[NSCREEN_LOG] " + log);
+        }
+    }
+
     public static boolean copyFile(String srcPath, String destPath) {
         boolean success = false;
         FileInputStream fi = null;
@@ -44,6 +60,7 @@ public class NScreenUtil {
         } finally {
             tryClose(fi, fo);
         }
+        nscreen_log("file copy : " + success);
         return success;
     }
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenDisableCommand.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenDisableCommand.java
index 91f15cd..f9c909c 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenDisableCommand.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenDisableCommand.java
@@ -57,8 +57,8 @@ public class NScreenDisableCommand extends Command {
             }
 
             if (!item.isRoot()) {
-                item.getReference().getLinkedList().remove(item);
-                item.getReference().redrawItem();
+//                item.getReference().getLinkedList().remove(item);
+//                item.getReference().redrawItem();
             }
 
             if (item.isRoot()) {

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenEnableCommand.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenEnableCommand.java
index fb10209..efbd89f 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenEnableCommand.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/command/NScreenEnableCommand.java
@@ -24,21 +24,6 @@ public class NScreenEnableCommand extends Command {
 
     @Override
     public void execute() {
-//        String filePath = group.getNScreenPageModel().getAppManager().getCssFolder();
-//        CssFile cssFile = new CssFile(filePath + IPath.SEPARATOR + item.getFileName());
-//        File newCSSFile = new File(filePath + IPath.SEPARATOR + item.getFileName());
-//
-//        try {
-//            if (!newCSSFile.exists()) {
-//                File dir = newCSSFile.getParentFile();
-//                dir.mkdirs();
-//                newCSSFile.createNewFile();
-//            }
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-//
-//        group.getNScreenPageModel().getPageData().addCssFile(cssFile);
         item.createFile();
         item.setItemEnabled(true);