[Title] change windows version specific icon size

[Type] Bugfix
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/tizen/skins/icons/vtm.png b/tizen/skins/icons/vtm.png
deleted file mode 100644 (file)
index 415dd28..0000000
Binary files a/tizen/skins/icons/vtm.png and /dev/null differ

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index 171e5c5..b64ba47 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -469,7 +469,15 @@ static void construct_main_window(void)
                ERR( "getting skin path is failed!!\n");
                exit (1);
        }
+#ifdef _WIN32  
+#if (_WIN32_WINNT >= 0x0601)
        sprintf(emul_img_dir, "%s/icons/vtm.ico", skin);
+#else 
+       sprintf(emul_img_dir, "%s/icons/Emulator_20x20.png", skin);
+#endif
+#else /* _WIN32 */
+       sprintf(emul_img_dir, "%s/icons/vtm.ico", skin);
+#endif/* _WIN32 */
 
        if (g_file_test(emul_img_dir, G_FILE_TEST_EXISTS) == FALSE) {
                ERR( "emulator icon directory %s doesn't exist!!\n", emul_img_dir);

diff --git a/tizen/src/vtm.c b/tizen/src/vtm.c
index ab4fe13..35cff57 100644 (file)
--- a/tizen/src/vtm.c
+++ b/tizen/src/vtm.c
@@ -1738,7 +1738,7 @@ void show_create_window(void)
        skin = get_skin_path();
        if(skin == NULL)
                WARN( "getting icon image path is failed!!\n");
-       sprintf(icon_image, "%s/icons/vtm.png", skin);
+       sprintf(icon_image, "%s/icons/Emulator_20x20.png", skin);
        gtk_window_set_icon_from_file(GTK_WINDOW(sub_window), icon_image, NULL);
 
        g_signal_connect(GTK_OBJECT(sub_window), "delete_event", G_CALLBACK(create_window_deleted_cb), NULL);
@@ -1816,7 +1816,7 @@ int main(int argc, char** argv)
        skin = (char*)get_skin_path();
        if(skin == NULL)
                WARN( "getting icon image path is failed!!\n");
-       sprintf(icon_image, "%s/icons/vtm.png", skin);
+       sprintf(icon_image, "%s/icons/Emulator_20x20.png", skin);
 
        sprintf(full_glade_path, "%s/vtm_conf/vtm.glade", get_bin_path());