fixed N_SE-24038

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ded09d115a8774ed299bc52db2494b675369af37..461cebc0423db98178d00425d91829bb9c3332ae 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,21 +56,21 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_COMMON})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_STORAGE})
+#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_STORAGE})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PHONE})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_CONNECTIVITY})
+#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_CONNECTIVITY})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_DISPLAY})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_MEMORY})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_NETWORK})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PROFILE})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_RESET})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_SECURITY})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_TIME})
+#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_MEMORY})
+#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_NETWORK})
+#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PROFILE})
+#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_RESET})
+#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_SECURITY})
+#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_TIME})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_ABOUT})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PASSWORD})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_MENUSCREEN})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_POWERSAVING})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FONT})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FILEVIEW})
+#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PASSWORD})
+#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_MENUSCREEN})
+#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_POWERSAVING})
+#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FONT})
+#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FILEVIEW})
 ADD_SUBDIRECTORY(src)
 

diff --git a/setting-display/src/setting-display-screen-mode.c b/setting-display/src/setting-display-screen-mode.c
index c9be2035439e11578f2674f50196fb1c92d5513d..505fe120a97d4f6ee4a9a5135711453b8bcf9999 100755 (executable)
--- a/setting-display/src/setting-display-screen-mode.c
+++ b/setting-display/src/setting-display-screen-mode.c
@@ -38,6 +38,7 @@ setting_view setting_view_display_screen_mode = {
 static Evas_Object *__gl_content_get(void *data, Evas_Object *obj, const char *part)
 {
        if (!strcmp(part, "elm.icon")) {
+               #if 0
                Evas_Object *sub_layout = elm_layout_add(obj);
                elm_layout_file_set(sub_layout, SETTING_THEME_EDJ_NAME, "screen_mode");
                evas_object_size_hint_weight_set(sub_layout, EVAS_HINT_EXPAND, 0.0);
@@ -55,6 +56,19 @@ static Evas_Object *__gl_content_get(void *data, Evas_Object *obj, const char *p
 
                elm_object_part_content_set(sub_layout, "content", image);
                return sub_layout;
+               #endif
+               Evas_Object *image;
+               image = elm_image_add(obj);
+               elm_image_file_set(image, IMG_SCREEN_MODE, NULL);
+
+               int w = 668; /* left padding and right padding is 26, so the width = 720 - 26 -26 */
+               int h = 0;
+               elm_image_object_size_get(image, NULL, &h);
+               evas_object_size_hint_min_set(image, w * WIDGET_SCALE_FACTOR, h * WIDGET_SCALE_FACTOR);
+               evas_object_size_hint_max_set(image, w * WIDGET_SCALE_FACTOR, h * WIDGET_SCALE_FACTOR);
+               evas_object_resize(image, w * WIDGET_SCALE_FACTOR, h * WIDGET_SCALE_FACTOR);
+
+               return image;
        }
 
        return NULL;
@@ -105,7 +119,7 @@ static int setting_display_screen_mode_create(void *cb)
                                                        NULL, NULL);
        elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
-       ad->itc_screen_mode.item_style = "1icon";
+       ad->itc_screen_mode.item_style = "1icon/with_no_line";
        ad->itc_screen_mode.func.text_get = NULL;
        ad->itc_screen_mode.func.content_get = __gl_content_get;
        ad->itc_screen_mode.func.state_get = NULL;