skin: modified display off guide image name and packaging

blank-guide.png -> display_off_guide.png

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

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 8f2a4ab..24cf315 100755 (executable)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -180,12 +180,10 @@ endif
 ifdef CONFIG_JAVA_UI
        cp -pP skin/client/emulator-skin.jar $(EMUL_DIR)/bin
        cp -pPR skin/client/skins $(EMUL_DIR)
-ifdef CONFIG_SDL
-       cp -pP skin/client/resource/images/blank-guide.png $(EMUL_DIR)/images
-endif
 endif
 
 ifdef CONFIG_QT
+       cp -pP ui/resource/images/display_off_guide.png $(EMUL_DIR)/images
 ifdef CONFIG_DARWIN
        cp -pP ui/resource/icons/emulator_icon.ico $(EMUL_DIR)/icons
 endif
@@ -313,13 +311,10 @@ endif
 # resources and jar for skin
 ifdef CONFIG_JAVA_UI
        cp -pP skin/client/emulator-skin.jar $(DIBS_COMMON_DIR)/bin
-       cp -pP skin/client/resource/images/blank-guide.png $(DIBS_COMMON_DIR)/images
-ifdef CONFIG_SDL
-       cp -pP skin/client/emulator-skin.jar $(DIBS_COMMON_DIR)/bin
-endif
 endif
 
 ifdef CONFIG_QT
+       cp -pP ui/resource/images/display_off_guide.png $(DIBS_COMMON_DIR)/images
 ifdef CONFIG_DARWIN
        cp -pP ui/resource/icons/emulator_icon.ico $(DIBS_COMMON_DIR)/icons
 endif

diff --git a/tizen/src/display/maru_sdl.c b/tizen/src/display/maru_sdl.c
index 288c612..0535640 100644 (file)
--- a/tizen/src/display/maru_sdl.c
+++ b/tizen/src/display/maru_sdl.c
@@ -75,7 +75,7 @@ static bool blank_guide_enable;
 static unsigned int blank_cnt;
 #define MAX_BLANK_FRAME_CNT 10
 #define BLANK_GUIDE_IMAGE_PATH "../images/"
-#define BLANK_GUIDE_IMAGE_NAME "blank-guide.png"
+#define BLANK_GUIDE_IMAGE_NAME "display_off_guide.png"
 
 #ifdef SDL_THREAD
 extern QemuMutex sdl_mutex;

diff --git a/tizen/src/skin/client/resource/images/blank-guide.png b/tizen/src/skin/client/resource/images/display_off_guide.png
similarity index 100%
rename from tizen/src/skin/client/resource/images/blank-guide.png
rename to tizen/src/skin/client/resource/images/display_off_guide.png

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ImageRegistry.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ImageRegistry.java
index 399b9f7..fdcda07 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ImageRegistry.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ImageRegistry.java
@@ -56,7 +56,7 @@ public class ImageRegistry {
 
        public enum ResourceImageName {
                RESOURCE_ABOUT("about_Tizen_SDK.png"),
-               RESOURCE_BLANK_GUIDE("blank-guide.png");
+               RESOURCE_BLANK_GUIDE("display_off_guide.png");
 
                private String name;
 

diff --git a/tizen/src/ui/displaybase.cpp b/tizen/src/ui/displaybase.cpp
index 6225b8a..4f253d4 100644 (file)
--- a/tizen/src/ui/displaybase.cpp
+++ b/tizen/src/ui/displaybase.cpp
@@ -37,7 +37,7 @@ void maru_tablet_event(int event_type, int x, int y, int btn, int btn_status);
 }
 
 #define BLANK_GUIDE_IMAGE_PATH "../images/"
-#define BLANK_GUIDE_IMAGE_NAME "blank-guide.png"
+#define BLANK_GUIDE_IMAGE_NAME "display_off_guide.png"
 
 uint32_t qt5_window_width = 0;
 uint32_t qt5_window_height = 0;