fix build error, fix winset style

Change-Id: I2521d06f502c0fe4136669a2d7487855ed55fd60

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d45dd1..84c7570 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib)
 #INSTALL(TARGETS ${MS_KEY_INIT} DESTINATION bin)
 
-INSTALL(FILES LICENSE DESTINATION /usr/share/license RENAME ${PROJECT_NAME})
+INSTALL(FILES LICENSE.Flora DESTINATION /usr/share/license RENAME ${PROJECT_NAME})
 
 ADD_SUBDIRECTORY(po)
 

diff --git a/src/ug-setting-gallery.c b/src/ug-setting-gallery.c
index 886ffdf..2c1a52a 100755 (executable)
--- a/src/ug-setting-gallery.c
+++ b/src/ug-setting-gallery.c
@@ -18,7 +18,7 @@
 #define UG_MODULE_API __attribute__ ((visibility("default")))\r
 #endif\r
 \r
-#define USE_DIALOGUE_STYLE     // new style has bug\r
+//#define USE_DIALOGUE_STYLE   // new style has bug\r
 \r
 #include <stdio.h>\r
 #include <stdbool.h>\r
@@ -411,6 +411,19 @@ _gallery_genlist_realized(void *data, Evas_Object *obj, void *event_info)
 \r
        Elm_Object_Item *item = (Elm_Object_Item *)event_info;\r
 \r
+       int i = 0;\r
+       for(i=0; i<GALLERY_MAIN_MENU_ITEM_MAX; i++)\r
+       {\r
+               if(ugd->gl_it[i] == item)\r
+                       break;\r
+       }\r
+       if(i == GALLERY_MAIN_MENU_ITEM_MAX)\r
+       {\r
+               gallery_info("extended style");\r
+               elm_object_item_signal_emit(item, "elm,state,center", "");\r
+               return;\r
+       }\r
+\r
        int index = (int)elm_object_item_data_get(item);\r
 \r
        if(index-1 == GALLERY_MAIN_MENU_TITLE)\r
@@ -545,13 +558,13 @@ _gallery_genlist_items_add (Evas_Object *parent, struct ug_data *ugd)
        ugd->two_txt_icon_itc.func.state_get = NULL;\r
        ugd->two_txt_icon_itc.func.del = NULL;\r
 \r
-       ugd->seperator_itc.item_style = "grouptitle.dialogue.seperator";\r
+       ugd->seperator_itc.item_style = "dialogue/separator";\r
        ugd->seperator_itc.func.text_get = NULL;\r
        ugd->seperator_itc.func.content_get = NULL;\r
        ugd->seperator_itc.func.state_get = NULL;\r
        ugd->seperator_itc.func.del = NULL;\r
 \r
-       ugd->seperator_end_itc.item_style = "dialogue/separator/end";\r
+       ugd->seperator_end_itc.item_style = "dialogue/separator";\r
        ugd->seperator_end_itc.func.text_get = NULL;\r
        ugd->seperator_end_itc.func.content_get = NULL;\r
        ugd->seperator_end_itc.func.state_get = NULL;\r