skin: move General skin to mobile-specific path

tools/emulator/skins -> platforms/mobile-3.0/emulator-resources/skins

Change-Id: If28d1499ca23c67cb9c1851ff56902fc934668c4
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/package/build.macos-64 b/package/build.macos-64
index 6c494cc365c0e8a0e51eeffa42476c808dae1914..dcddca7a44577605f7bbc568d2f56614c5fc6dcd 100755 (executable)
--- a/package/build.macos-64
+++ b/package/build.macos-64
@@ -143,6 +143,7 @@ install()
     mv common $COMMON_BIN_DIR/emulator
 
     #profile skins
+    cp -pPR src/skin/client/skins/mobile-general-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/
     cp -pPR src/skin/client/skins/mobile-480x800-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/
     cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/
 }

diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32
index c820c86c55e52a903bd97899bc154a6c88d37c70..3c29dc97d72d47a377f77f5a73dd9a0261d6e27c 100755 (executable)
--- a/package/build.ubuntu-32
+++ b/package/build.ubuntu-32
@@ -96,6 +96,7 @@ install()
        mv common $COMMON_BIN_DIR/emulator
 
        #profile skins
+       cp -pPR src/skin/client/skins/mobile-general-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/
        cp -pPR src/skin/client/skins/mobile-480x800-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/
        cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/
 }

diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64
index 3b9c1a071ad9da5ae807ae8a02ad202c1033735b..624303ad9c4ceedcf88f107d76899ca9e365d629 100755 (executable)
--- a/package/build.ubuntu-64
+++ b/package/build.ubuntu-64
@@ -96,6 +96,7 @@ install()
        mv common $COMMON_BIN_DIR/emulator
 
        #profile skins
+       cp -pPR src/skin/client/skins/mobile-general-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/
        cp -pPR src/skin/client/skins/mobile-480x800-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/
        cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/
 }

diff --git a/package/build.windows-32 b/package/build.windows-32
index 90b381f28d3fcdf315585cbd7ec43f95a0b4f1cc..92b25a312fce6fe432d9646295f03fe63f1a2880 100755 (executable)
--- a/package/build.windows-32
+++ b/package/build.windows-32
@@ -106,6 +106,7 @@ install()
        mv common $COMMON_BIN_DIR/emulator
 
        #profile skins
+       cp -pPR src/skin/client/skins/mobile-general-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/
        cp -pPR src/skin/client/skins/mobile-480x800-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/
        cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/
 }

diff --git a/package/changelog b/package/changelog
index cd78a0f121468d7b1733be70d234601217f0928d..c41aec0e2e77bfe1183c75006af4f2a1e3d3dbdf 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 1.7.15
+- move General skin to mobile-specific path
+== GiWoong Kim <giwoong.kim@samsung.com> 2014-01-13
 * 1.7.14
 - disabled unstable spice because runtime library dependency
 == Sungmin Ha <sungmin82.ha@samsung.com> 2013-01-07

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 885458b8aff7a288ffb1813cc784e2e694363b58..0aaa81dbb1c06ec32b2aa3f20dcf7eff349134b8 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 1.7.14
+Version: 1.7.15
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 Source: emulator
 

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 0a256f764665094b7281bd0246a0244bdc8d4b40..fc9fb19d464c0d54afc33528054f1d8a387f5736 100644 (file)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -212,9 +212,9 @@ endif
 
 # resources and jar for skin
        cp -pP skin/client/emulator-skin.jar $(DIBS_COMMON_DIR)/bin
-       cp -pPR skin/client/skins $(DIBS_COMMON_DIR)
-       rm -rf $(DIBS_COMMON_DIR)/skins/mobile-480x800-3btn/
-       rm -rf $(DIBS_COMMON_DIR)/skins/mobile-720x1280-3btn/
+       #cp -pPR skin/client/skins $(DIBS_COMMON_DIR)
+       #rm -rf $(DIBS_COMMON_DIR)/skins/mobile-480x800-3btn/
+       #rm -rf $(DIBS_COMMON_DIR)/skins/mobile-720x1280-3btn/
 ifndef CONFIG_USE_SHM
        cp -pP skin/client/resource/images/blank-guide.png $(DIBS_COMMON_DIR)/images
 endif

diff --git a/tizen/src/skin/client/skins/emul-general-3btn/default.dbi b/tizen/src/skin/client/skins/emul-general-3btn/default.dbi
deleted file mode 100644 (file)
index 0f0e969..0000000
--- a/tizen/src/skin/client/skins/emul-general-3btn/default.dbi
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EmulatorUI xmlns="http://www.tizen.org/emulator/skin/dbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <dbi_version>2.2</dbi_version>
-    <rotations>
-        <rotation name="Portrait">
-            <display id="0">
-            </display>
-            <keyMapList>
-                <keyMap>
-                    <eventInfo>
-                        <keyCode>169</keyCode>
-                        <keyName>Menu</keyName>
-                    </eventInfo>
-                    <tooltip>Menu</tooltip>
-                </keyMap>
-                <keyMap>
-                    <eventInfo>
-                        <keyCode>139</keyCode>
-                        <keyName>Home</keyName>
-                    </eventInfo>
-                    <tooltip>Home</tooltip>
-                </keyMap>
-                <keyMap>
-                    <eventInfo>
-                        <keyCode>158</keyCode>
-                        <keyName>Back</keyName>
-                    </eventInfo>
-                    <tooltip>Back</tooltip>
-                </keyMap>
-                <keyMap>
-                    <eventInfo>
-                        <keyCode>116</keyCode>
-                        <keyName>Power</keyName>
-                    </eventInfo>
-                    <tooltip>Power</tooltip>
-                </keyMap>
-                <keyMap>
-                    <eventInfo>
-                        <keyCode>115</keyCode>
-                        <keyName>Volume +</keyName>
-                    </eventInfo>
-                    <tooltip>Volume +</tooltip>
-                </keyMap>
-                <keyMap>
-                    <eventInfo>
-                        <keyCode>114</keyCode>
-                        <keyName>Volume -</keyName>
-                    </eventInfo>
-                    <tooltip>Volume -</tooltip>
-                </keyMap>
-            </keyMapList>
-        </rotation>
-        <rotation name="Landscape">
-            <display id="0">
-            </display>
-        </rotation>
-        <rotation name="Reverse Portrait">
-            <display id="0">
-            </display>
-        </rotation>
-        <rotation name="Reverse Landscape">
-            <display id="0">
-            </display>
-        </rotation>
-    </rotations>
-    <hover>
-        <color B="255" G="255" R="255" />
-    </hover>
-    <popupMenu>
-        <topmostItem visible="true" />
-        <rotateItem visible="true" />
-        <scaleItem visible="true" />
-        <keywindowItem visible="true" />
-        <hostKeyboardItem visible="true" />
-        <shellItem visible="true" />
-    </popupMenu>
-    <option>
-        <blankGuide visible="true" />
-    </option>
-</EmulatorUI>

diff --git a/tizen/src/skin/client/skins/emul-general-3btn/info.ini b/tizen/src/skin/client/skins/emul-general-3btn/info.ini
deleted file mode 100644 (file)
index 8adeb01..0000000
--- a/tizen/src/skin/client/skins/emul-general-3btn/info.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-skin.name=General purpose
-resolution.width=all
-resolution.height=all
-manager.priority=2

diff --git a/tizen/src/skin/client/skins/mobile-general-3btn/default.dbi b/tizen/src/skin/client/skins/mobile-general-3btn/default.dbi
new file mode 100644 (file)
index 0000000..0f0e969
--- /dev/null
+++ b/tizen/src/skin/client/skins/mobile-general-3btn/default.dbi
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmulatorUI xmlns="http://www.tizen.org/emulator/skin/dbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <dbi_version>2.2</dbi_version>
+    <rotations>
+        <rotation name="Portrait">
+            <display id="0">
+            </display>
+            <keyMapList>
+                <keyMap>
+                    <eventInfo>
+                        <keyCode>169</keyCode>
+                        <keyName>Menu</keyName>
+                    </eventInfo>
+                    <tooltip>Menu</tooltip>
+                </keyMap>
+                <keyMap>
+                    <eventInfo>
+                        <keyCode>139</keyCode>
+                        <keyName>Home</keyName>
+                    </eventInfo>
+                    <tooltip>Home</tooltip>
+                </keyMap>
+                <keyMap>
+                    <eventInfo>
+                        <keyCode>158</keyCode>
+                        <keyName>Back</keyName>
+                    </eventInfo>
+                    <tooltip>Back</tooltip>
+                </keyMap>
+                <keyMap>
+                    <eventInfo>
+                        <keyCode>116</keyCode>
+                        <keyName>Power</keyName>
+                    </eventInfo>
+                    <tooltip>Power</tooltip>
+                </keyMap>
+                <keyMap>
+                    <eventInfo>
+                        <keyCode>115</keyCode>
+                        <keyName>Volume +</keyName>
+                    </eventInfo>
+                    <tooltip>Volume +</tooltip>
+                </keyMap>
+                <keyMap>
+                    <eventInfo>
+                        <keyCode>114</keyCode>
+                        <keyName>Volume -</keyName>
+                    </eventInfo>
+                    <tooltip>Volume -</tooltip>
+                </keyMap>
+            </keyMapList>
+        </rotation>
+        <rotation name="Landscape">
+            <display id="0">
+            </display>
+        </rotation>
+        <rotation name="Reverse Portrait">
+            <display id="0">
+            </display>
+        </rotation>
+        <rotation name="Reverse Landscape">
+            <display id="0">
+            </display>
+        </rotation>
+    </rotations>
+    <hover>
+        <color B="255" G="255" R="255" />
+    </hover>
+    <popupMenu>
+        <topmostItem visible="true" />
+        <rotateItem visible="true" />
+        <scaleItem visible="true" />
+        <keywindowItem visible="true" />
+        <hostKeyboardItem visible="true" />
+        <shellItem visible="true" />
+    </popupMenu>
+    <option>
+        <blankGuide visible="true" />
+    </option>
+</EmulatorUI>

diff --git a/tizen/src/skin/client/skins/mobile-general-3btn/info.ini b/tizen/src/skin/client/skins/mobile-general-3btn/info.ini
new file mode 100644 (file)
index 0000000..59ea685
--- /dev/null
+++ b/tizen/src/skin/client/skins/mobile-general-3btn/info.ini
@@ -0,0 +1,4 @@
+skin.name=General purpose mobile
+resolution.width=all
+resolution.height=all
+manager.priority=2

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java
index 1062e353aa4f6dd80b95fedc9c657acf2b9a1557..ff11a55b183ffb7f4f1ca779545e2ae57c6c1ca4 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java
@@ -72,7 +72,7 @@ import org.tizen.emulator.skin.util.SwtUtil;
  */
 public class EmulatorSkinMain {
        public static final String SKINS_FOLDER = "skins";
-       public static final String DEFAULT_SKIN_FOLDER = "emul-general-3btn";
+       public static final String DEFAULT_SKIN_FOLDER = "mobile-general-3btn";
 
        public static final String SKIN_INFO_FILE_NAME = "info.ini";
        public static final String SKIN_PROPERTIES_FILE_NAME = ".skin.properties";