From: GiWoong Kim Date: Mon, 20 Jul 2015 05:04:58 +0000 (+0900) Subject: skin: modified emulator skin packaging X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~289^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f898b887da28dfac06f737d0285e14e3f2e24818;p=sdk%2Femulator%2Fqemu.git skin: modified emulator skin packaging - remove .dbi fies for SWT GUI - copy cropped images to Qt skin path from SWT skin path - packaging from Qt GUI resource path (tizen/src/ui/resource/) Change-Id: I5cb7792b5fc5906ae5d934887702330a684e5722 Signed-off-by: GiWoong Kim --- diff --git a/package/build.macos-64 b/package/build.macos-64 index 25f1628856..eaa0459ffe 100755 --- a/package/build.macos-64 +++ b/package/build.macos-64 @@ -128,14 +128,15 @@ install() mv common $COMMON_BIN_DIR/emulator #profile skins - cp -pPR src/skin/client/skins/mobile-general-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/mobile-480x800-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/mobile-540x960-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/wearable-general-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/wearable-320x320-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/wearable-360x480-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/tv-1920x1080 $TV_2_4_SKIN_RESOURCE_DIR/ + SRC_SKIN_PATH=src/ui/resource/skins + cp -pPR $SRC_SKIN_PATH/mobile-general-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/mobile-480x800-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/mobile-540x960-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/mobile-720x1280-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/wearable-general-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/wearable-320x320-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/wearable-360x480-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/tv-1920x1080 $TV_2_4_SKIN_RESOURCE_DIR/ } [ "$1" = "clean" ] && clean diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32 index f3f125eff1..f16fa9cdca 100755 --- a/package/build.ubuntu-32 +++ b/package/build.ubuntu-32 @@ -87,14 +87,15 @@ install() mv common $COMMON_BIN_DIR/emulator #profile skins - cp -pPR src/skin/client/skins/mobile-general-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/mobile-480x800-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/mobile-540x960-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/wearable-general-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/wearable-320x320-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/wearable-360x480-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/tv-1920x1080 $TV_2_4_SKIN_RESOURCE_DIR/ + SRC_SKIN_PATH=src/ui/resource/skins + cp -pPR $SRC_SKIN_PATH/mobile-general-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/mobile-480x800-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/mobile-540x960-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/mobile-720x1280-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/wearable-general-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/wearable-320x320-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/wearable-360x480-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/tv-1920x1080 $TV_2_4_SKIN_RESOURCE_DIR/ } [ "$1" = "clean" ] && clean diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64 index 71ce1aaf28..63b6cae8d7 100755 --- a/package/build.ubuntu-64 +++ b/package/build.ubuntu-64 @@ -87,14 +87,15 @@ install() mv common $COMMON_BIN_DIR/emulator #profile skins - cp -pPR src/skin/client/skins/mobile-general-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/mobile-480x800-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/mobile-540x960-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/wearable-general-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/wearable-320x320-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/wearable-360x480-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/tv-1920x1080 $TV_2_4_SKIN_RESOURCE_DIR/ + SRC_SKIN_PATH=src/ui/resource/skins + cp -pPR $SRC_SKIN_PATH/mobile-general-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/mobile-480x800-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/mobile-540x960-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/mobile-720x1280-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/wearable-general-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/wearable-320x320-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/wearable-360x480-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/tv-1920x1080 $TV_2_4_SKIN_RESOURCE_DIR/ } [ "$1" = "clean" ] && clean diff --git a/package/build.windows-32 b/package/build.windows-32 index ac3185f16f..4a1d3d8ea1 100755 --- a/package/build.windows-32 +++ b/package/build.windows-32 @@ -92,14 +92,15 @@ install() mv common $COMMON_BIN_DIR/emulator #profile skins - cp -pPR src/skin/client/skins/mobile-general-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/mobile-480x800-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/mobile-540x960-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/wearable-general-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/wearable-320x320-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/wearable-360x480-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR src/skin/client/skins/tv-1920x1080 $TV_2_4_SKIN_RESOURCE_DIR/ + SRC_SKIN_PATH=src/ui/resource/skins + cp -pPR $SRC_SKIN_PATH/mobile-general-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/mobile-480x800-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/mobile-540x960-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/mobile-720x1280-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/wearable-general-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/wearable-320x320-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/wearable-360x480-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ + cp -pPR $SRC_SKIN_PATH/tv-1920x1080 $TV_2_4_SKIN_RESOURCE_DIR/ } [ "$1" = "clean" ] && clean diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default.dbi b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default.dbi deleted file mode 100644 index e64aebba56..0000000000 --- a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default.dbi +++ /dev/null @@ -1,249 +0,0 @@ - - - 2.2 - - - - - - - default_0.png - default_0_p.png - - - - - - 169 - Menu - - Menu - - - - - 139 - Home - - Home - - - - - 158 - Back - - Back - - - - - 116 - Power - - Power - - - - - 115 - Volume + - - Volume + - - - - - 114 - Volume - - - Volume - - - - - - - - - - default_L90.png - default_L90_p.png - - - - - - 169 - Menu - - Menu - - - - - 139 - Home - - Home - - - - - 158 - Back - - Back - - - - - 116 - Power - - Power - - - - - 115 - Volume + - - Volume + - - - - - 114 - Volume - - - Volume - - - - - - - - - - default_180.png - default_180_p.png - - - - - - 169 - Menu - - Menu - - - - - 139 - Home - - Home - - - - - 158 - Back - - Back - - - - - 116 - Power - - Power - - - - - 115 - Volume + - - Volume + - - - - - 114 - Volume - - - Volume - - - - - - - - - - default_R90.png - default_R90_p.png - - - - - - 169 - Menu - - Menu - - - - - 139 - Home - - Home - - - - - 158 - Back - - Back - - - - - 116 - Power - - Power - - - - - 115 - Volume + - - Volume + - - - - - 114 - Volume - - - Volume - - - - - - - - - - - - - diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_0.png b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_0.png index c440bfbbc7..75576c2163 100644 Binary files a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_0.png and b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_0.png differ diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_0_p.png b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_0_p.png index 2bc3a6cc9f..7dcde121cc 100644 Binary files a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_0_p.png and b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_0_p.png differ diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_180.png b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_180.png index d4ab274930..170161f664 100644 Binary files a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_180.png and b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_180.png differ diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_180_p.png b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_180_p.png index 49752fc3c7..e11181aac7 100644 Binary files a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_180_p.png and b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_180_p.png differ diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_L90.png b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_L90.png index 7826ddac80..c135fc3a02 100644 Binary files a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_L90.png and b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_L90.png differ diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_L90_p.png b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_L90_p.png index a1125bc4a1..954da91f02 100644 Binary files a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_L90_p.png and b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_L90_p.png differ diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_R90.png b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_R90.png index eb989a1032..1d68991bf3 100644 Binary files a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_R90.png and b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_R90.png differ diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_R90_p.png b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_R90_p.png index a4b0da9d43..8d056d9cc7 100644 Binary files a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_R90_p.png and b/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_R90_p.png differ diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile-480x800-3btn/layout.xml index d7b04c3262..973ee93ad8 100644 --- a/tizen/src/ui/resource/skins/mobile-480x800-3btn/layout.xml +++ b/tizen/src/ui/resource/skins/mobile-480x800-3btn/layout.xml @@ -4,44 +4,44 @@
- + 0 default_0.png default_0_p.png - + 169 Menu F2 - + 139 Home F1 - + 158 Back - + 116 Power F3 - + 115 Volume + Ctrl+] - + 114 Volume - Ctrl+[ @@ -50,43 +50,43 @@
- + 270 default_L90.png default_L90_p.png - + 169 Menu F2 - + 139 Home F1 - + 158 Back - + 116 Power F3 - + 115 Volume + Ctrl+] - + 114 Volume - Ctrl+[ @@ -95,43 +95,43 @@
- + 180 default_180.png default_180_p.png - + 169 Menu F2 - + 139 Home F1 - + 158 Back - + 116 Power F3 - + 115 Volume + Ctrl+] - + 114 Volume - Ctrl+[ @@ -140,43 +140,43 @@
- + 90 default_R90.png default_R90_p.png - + 169 Menu F2 - + 139 Home F1 - + 158 Back - + 116 Power F3 - + 115 Volume + Ctrl+] - + 114 Volume - Ctrl+[ diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default.dbi b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default.dbi deleted file mode 100644 index dd44034e50..0000000000 --- a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default.dbi +++ /dev/null @@ -1,250 +0,0 @@ - - - - - - - - - - default_0.png - default_0_p.png - - - - - - 169 - Menu - - Menu - - - - - 139 - Home - - Home - - - - - 158 - Back - - Back - - - - - 116 - Power - - Power - - - - - 115 - Volume + - - Volume + - - - - - 114 - Volume - - - Volume - - - - - - - - - - default_L90.png - default_L90_p.png - - - - - - 169 - Menu - - Menu - - - - - 139 - Home - - Home - - - - - 158 - Back - - Back - - - - - 116 - Power - - Power - - - - - 115 - Volume + - - Volume + - - - - - 114 - Volume - - - Volume - - - - - - - - - - default_180.png - default_180_p.png - - - - - - 169 - Menu - - Menu - - - - - 139 - Home - - Home - - - - - 158 - Back - - Back - - - - - 116 - Power - - Power - - - - - 115 - Volume + - - Volume + - - - - - 114 - Volume - - - Volume - - - - - - - - - - default_R90.png - default_R90_p.png - - - - - - 169 - Menu - - Menu - - - - - 139 - Home - - Home - - - - - 158 - Back - - Back - - - - - 116 - Power - - Power - - - - - 115 - Volume + - - Volume + - - - - - 114 - Volume - - - Volume - - - - - - - - - - - - - - diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_0.png b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_0.png index a9872a33eb..c70c05c4cf 100644 Binary files a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_0.png and b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_0.png differ diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_0_p.png b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_0_p.png index 09d7468ddc..11afc3956a 100644 Binary files a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_0_p.png and b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_0_p.png differ diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_180.png b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_180.png index f73a6ef671..fda0c165fe 100644 Binary files a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_180.png and b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_180.png differ diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_180_p.png b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_180_p.png index aa509b72d8..ca4a332fb5 100644 Binary files a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_180_p.png and b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_180_p.png differ diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_L90.png b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_L90.png index d9936e1fa5..bda521f1ba 100644 Binary files a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_L90.png and b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_L90.png differ diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_L90_p.png b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_L90_p.png index 472705330c..4aea3fc279 100644 Binary files a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_L90_p.png and b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_L90_p.png differ diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_R90.png b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_R90.png index 61703dc7b5..8e0a1b6ede 100644 Binary files a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_R90.png and b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_R90.png differ diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_R90_p.png b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_R90_p.png index 8aaeeebc47..bbc522b835 100644 Binary files a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_R90_p.png and b/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_R90_p.png differ diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile-540x960-3btn/layout.xml index 298d7dd9b3..42ba76bd3a 100644 --- a/tizen/src/ui/resource/skins/mobile-540x960-3btn/layout.xml +++ b/tizen/src/ui/resource/skins/mobile-540x960-3btn/layout.xml @@ -4,44 +4,44 @@ - + 0 default_0.png default_0_p.png - + 169 Menu F2 - + 139 Home F1 - + 158 Back - + 116 Power F3 - + 115 Volume + Ctrl+] - + 114 Volume - Ctrl+[ @@ -50,43 +50,43 @@
- + 270 default_L90.png default_L90_p.png - + 169 Menu F2 - + 139 Home F1 - + 158 Back - + 116 Power F3 - + 115 Volume + Ctrl+] - + 114 Volume - Ctrl+[ @@ -95,43 +95,43 @@
- + 180 default_180.png default_180_p.png - + 169 Menu F2 - + 139 Home F1 - + 158 Back - + 116 Power F3 - + 115 Volume + Ctrl+] - + 114 Volume - Ctrl+[ @@ -140,43 +140,43 @@
- + 90 default_R90.png default_R90_p.png - + 169 Menu F2 - + 139 Home F1 - + 158 Back - + 116 Power F3 - + 115 Volume + Ctrl+] - + 114 Volume - Ctrl+[ diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default.dbi b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default.dbi deleted file mode 100644 index 1ba4d64679..0000000000 --- a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default.dbi +++ /dev/null @@ -1,250 +0,0 @@ - - - 2.2 - - - - - - - default_0.png - default_0_p.png - - - - - - 169 - Menu - - Menu - - - - - 139 - Home - - Home - - - - - 158 - Back - - Back - - - - - 116 - Power - - Power - - - - - 115 - Volume + - - Volume + - - - - - 114 - Volume - - - Volume - - - - - - - - - - default_L90.png - default_L90_p.png - - - - - - 169 - Menu - - Menu - - - - - 139 - Home - - Home - - - - - 158 - Back - - Back - - - - - 116 - Power - - Power - - - - - 115 - Volume + - - Volume + - - - - - 114 - Volume - - - Volume - - - - - - - - - - default_180.png - default_180_p.png - - - - - - 169 - Menu - - Menu - - - - - 139 - Home - - Home - - - - - 158 - Back - - Back - - - - - 116 - Power - - Power - - - - - 115 - Volume + - - Volume + - - - - - 114 - Volume - - - Volume - - - - - - - - - - default_R90.png - default_R90_p.png - - - - - - 169 - Menu - - Menu - - - - - 139 - Home - - Home - - - - - 158 - Back - - Back - - - - - 116 - Power - - Power - - - - - 115 - Volume + - - Volume + - - - - - 114 - Volume - - - Volume - - - - - - - - - - - - - - diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_0.png b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_0.png index 04e01d6e03..919442890c 100644 Binary files a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_0.png and b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_0.png differ diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_0_p.png b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_0_p.png index 4049ae29f6..4beca5a19d 100644 Binary files a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_0_p.png and b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_0_p.png differ diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_180.png b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_180.png index 750d056fc6..cd0a47d4ba 100644 Binary files a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_180.png and b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_180.png differ diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_180_p.png b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_180_p.png index c3fefa649b..e2fcbfde68 100644 Binary files a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_180_p.png and b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_180_p.png differ diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_L90.png b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_L90.png index 6d0724c950..fdc04d1e3b 100644 Binary files a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_L90.png and b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_L90.png differ diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_L90_p.png b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_L90_p.png index babe9d452b..74fbd322fe 100644 Binary files a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_L90_p.png and b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_L90_p.png differ diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_R90.png b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_R90.png index 462c544153..0fb06e9eac 100644 Binary files a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_R90.png and b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_R90.png differ diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_R90_p.png b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_R90_p.png index 2d54428e19..b83d97efd0 100644 Binary files a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_R90_p.png and b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_R90_p.png differ diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/layout.xml index 6e4c25f9bd..b67df0aec6 100644 --- a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/layout.xml +++ b/tizen/src/ui/resource/skins/mobile-720x1280-3btn/layout.xml @@ -4,44 +4,44 @@ - + 0 default_0.png default_0_p.png - + 169 Menu F2 - + 139 Home F1 - + 158 Back - + 116 Power F3 - + 115 Volume + Ctrl+] - + 114 Volume - Ctrl+[ @@ -50,43 +50,43 @@
- + 270 default_L90.png default_L90_p.png - + 169 Menu F2 - + 139 Home F1 - + 158 Back - + 116 Power F3 - + 115 Volume + Ctrl+] - + 114 Volume - Ctrl+[ @@ -95,43 +95,43 @@
- + 180 default_180.png default_180_p.png - + 169 Menu F2 - + 139 Home F1 - + 158 Back - + 116 Power F3 - + 115 Volume + Ctrl+] - + 114 Volume - Ctrl+[ @@ -140,43 +140,43 @@
- + 90 default_R90.png default_R90_p.png - + 169 Menu F2 - + 139 Home F1 - + 158 Back - + 116 Power F3 - + 115 Volume + Ctrl+] - + 114 Volume - Ctrl+[ diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/background.png b/tizen/src/ui/resource/skins/tv-1920x1080/background.png new file mode 100644 index 0000000000..73094ddb06 Binary files /dev/null and b/tizen/src/ui/resource/skins/tv-1920x1080/background.png differ diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/basic_US_normal.png b/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/basic_US_normal.png new file mode 100644 index 0000000000..1fc3e33368 Binary files /dev/null and b/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/basic_US_normal.png differ diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/basic_US_pushed.png b/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/basic_US_pushed.png new file mode 100644 index 0000000000..54a53628a7 Binary files /dev/null and b/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/basic_US_pushed.png differ diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/info.ini b/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/info.ini new file mode 100644 index 0000000000..dc7933877c --- /dev/null +++ b/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/info.ini @@ -0,0 +1 @@ +priority=5 diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/layout.xml b/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/layout.xml new file mode 100644 index 0000000000..364c38ad57 --- /dev/null +++ b/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/layout.xml @@ -0,0 +1,253 @@ + + + 2.4 + + basic_US_normal.png + basic_US_pushed.png + + + + 116 + Power + + + + 64 + Source + + + + 2 + 1 + + + + 3 + 2 + + + + 4 + 3 + + + + 5 + 4 + + + + 6 + 5 + + + + 7 + 6 + + + + 8 + 7 + + + + 9 + 8 + + + + 10 + 9 + + + + 12 + Plus 100 + + + + 11 + 0 + + + + 182 + Prev + + + + 68 + VOL+ + + + + 67 + VOL- + + + + 66 + Mute + + + + 65 + Channel List + + + + 88 + CH+ + + + + 87 + CH- + + + + 125 + Menu + + + + 63 + Smart Home + + + + 130 + Guide + + + + 127 + Tools + + + + 188 + Info + + + + 1 + Back + + + + 174 + Exit + + + + 103 + Up + + + + 105 + Left + + + + 106 + Right + + + + 108 + Down + + + + 28 + Ok + + + + 59 + A + + + + 60 + B + + + + 61 + C + + + + 62 + D + + + + 213 + CC + + + + 187 + MTS + + + + 132 + Picture Size + + + + 140 + KeyPad + + + + 217 + Search + + + + 191 + 3D + + + + 168 + Rewind + + + + 201 + Pause + + + + 208 + FF + + + + 167 + Rec + + + + 200 + Play + + + + 166 + Stop + + + + + + + diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/info.ini b/tizen/src/ui/resource/skins/tv-1920x1080/info.ini new file mode 100644 index 0000000000..a1076947c2 --- /dev/null +++ b/tizen/src/ui/resource/skins/tv-1920x1080/info.ini @@ -0,0 +1,4 @@ +skin.name=TV 1920X1080 +resolution.width=1920 +resolution.height=1080 +manager.priority=1 diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/layout.xml b/tizen/src/ui/resource/skins/tv-1920x1080/layout.xml new file mode 100644 index 0000000000..335b5eb6e8 --- /dev/null +++ b/tizen/src/ui/resource/skins/tv-1920x1080/layout.xml @@ -0,0 +1,60 @@ + + + 2.4 + +
+ + + 0 + + background.png + background.png +
+ + + + + + Ctrl+F1 + + + + Ctrl+F2 + + + Ctrl+F9 + Ctrl+F10 + + 100 + 75 + 50 + 25 + + + + + + + + Ctrl+F7 + + + + + Ctrl+F4 + + + + + Ctrl+F5 + + + Ctrl+F6 + + + + F4 + + + + diff --git a/tizen/src/ui/resource/skins/wearable-320x320-1btn/default.dbi b/tizen/src/ui/resource/skins/wearable-320x320-1btn/default.dbi deleted file mode 100644 index 8ef39c04f1..0000000000 --- a/tizen/src/ui/resource/skins/wearable-320x320-1btn/default.dbi +++ /dev/null @@ -1,91 +0,0 @@ - - - 2.2 - - - - - - - default_0.png - default_0_p.png - - - - - - 116 - Power - - Power - - - - - - - - - default_L90.png - default_L90_p.png - - - - - - 116 - Power - - Power - - - - - - - - - default_180.png - default_180_p.png - - - - - - 116 - Power - - Power - - - - - - - - - default_R90.png - default_R90_p.png - - - - - - 116 - Power - - Power - - - - - - - - - - - - - - diff --git a/tizen/src/ui/resource/skins/wearable-320x320-1btn/default_0.png b/tizen/src/ui/resource/skins/wearable-320x320-1btn/default_0.png old mode 100755 new mode 100644 diff --git a/tizen/src/ui/resource/skins/wearable-360x480-1btn/default.dbi b/tizen/src/ui/resource/skins/wearable-360x480-1btn/default.dbi deleted file mode 100644 index 11c28d606b..0000000000 --- a/tizen/src/ui/resource/skins/wearable-360x480-1btn/default.dbi +++ /dev/null @@ -1,91 +0,0 @@ - - - 2.2 - - - - - - - default_0.png - default_0_p.png - - - - - - 116 - Power - - Power - - - - - - - - - default_L90.png - default_L90_p.png - - - - - - 116 - Power - - Power - - - - - - - - - default_180.png - default_180_p.png - - - - - - 116 - Power - - Power - - - - - - - - - default_R90.png - default_R90_p.png - - - - - - 116 - Power - - Power - - - - - - - - - - - - - - diff --git a/version.rc b/version.rc index 1560ab155b..c7922d5200 100644 --- a/version.rc +++ b/version.rc @@ -28,7 +28,7 @@ FILESUBTYPE VFT2_UNKNOWN } #ifdef CONFIG_MARU -IDI_ICON1 ICON "tizen/src/skin/client/resource/icons/emulator_icon.ico" +IDI_ICON1 ICON "tizen/src/ui/resource/icons/emulator_icon.ico" #else IDI_ICON1 ICON "pc-bios/qemu-nsis.ico" #endif