Adapt (part 2) 37/26737/1
authorJanusz Kozerski <j.kozerski@samsung.com>
Thu, 26 Jun 2014 08:46:23 +0000 (10:46 +0200)
committerJanusz Kozerski <j.kozerski@samsung.com>
Thu, 28 Aug 2014 11:28:52 +0000 (13:28 +0200)
Change-Id: I486ebbb075fec323428d0c21ac8de699fb4cbc18
Signed-off-by: Janusz Kozerski <j.kozerski@samsung.com>
CMakeLists.txt
include/im-uigadget.h
packaging/im-ui.spec
src/CMakeLists.txt
src/im-main-menu.c
src/im-uigadget.c

index 68cf2b5..9bfdb67 100644 (file)
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(ug-im-ui C)
+PROJECT(im-ui C)
 
 INCLUDE(FindPkgConfig)
 
@@ -10,12 +10,12 @@ SET(BINDIR "${PREFIX}/bin")
 SET(RESDIR "${PREFIX}/res")
 SET(LOCALEDIR "${RESDIR}/locale")
 
-SET(CMAKE_C_FLAGS_RELEASE "-g -O2")
+#SET(CMAKE_C_FLAGS_RELEASE "-g -O2")
 SET(CMAKE_C_FLAGS_DEBUG   "-g -O0 -ggdb")
-SET(CMAKE_C_CFLAS_CCOV    "-g -O2 --coverage")
+#SET(CMAKE_C_CFLAS_CCOV    "-g -O2 --coverage")
 
 # Set compiler warning flags
-ADD_DEFINITIONS("-Werror")
+#ADD_DEFINITIONS("-Werror")
 ADD_DEFINITIONS("-Wall")
 ADD_DEFINITIONS("-Wextra")
 
@@ -26,10 +26,10 @@ ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
 ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"")
 ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"")
 
-IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
+#IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
     ADD_DEFINITIONS("-DTIZEN_DEBUG_ENABLE")
     ADD_DEFINITIONS("-DBUILD_TYPE_DEBUG")
-ENDIF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
+#ENDIF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
 
 #SET(TARGET_IM_UIGADGET "ug-im-ui")
 SET(TARGET_IM_UIGADGET "im-ui")
index 7d5886f..566a9e1 100644 (file)
 //#include <dlog.h>
 //#include <efl_assist.h>
 #include <Elementary.h>
-//#include <ui-gadget.h>
-//#include <ui-gadget-module.h>
 #include <glib.h>
 
-#define LOGD printf
-#define LOGE printf
+// FIXME: for test purpose only, can be removed later.
+//        dlog.h should be included when these macros will be removed
+#define LOGD(...) printf(__VA_ARGS__); printf("\n")
+#define LOGE(...) printf(__VA_ARGS__); printf("\n")
+
+//#ifdef LOG_TAG
+//    #undef LOG_TAG
+//#endif
+//
+//#ifndef LOG_TAG
+//    #define LOG_TAG "IM_UI"
+//#endif
 
 #ifndef PACKAGE
-//#define PACKAGE "ug-im-ui"
 #define PACKAGE "im-ui"
 #endif
 
@@ -48,7 +55,6 @@ struct ug_data {
     Evas_Object         *bg;
     Evas_Object         *layout_main;
     Evas_Object         *navi_bar;
-//    ui_gadget_h         ug;
     Evas_Object         *popup;
     char                *popup_content;
     Elm_Theme           *theme;
@@ -56,12 +62,4 @@ struct ug_data {
     const char          *fileselector_default_path;
 };
 
-//#ifdef LOG_TAG
-//    #undef LOG_TAG
-//#endif
-//
-//#ifndef LOG_TAG
-//    #define LOG_TAG "IM_UIGADGET"
-//#endif
-
 #endif /* __IM_UIGADGET_H__ */
index dcf65bb..d5a52b0 100644 (file)
@@ -35,13 +35,13 @@ Tizen Integrity Management UI
 %prep
 %setup -q
 
-#%define _ugdir /usr/ug
-%define _ugdir /usr
+%define _usrdir /usr
 
 %build
+%define build_type DEBUG 
 %{!?build_type:%define build_type "Release"}
 %cmake . -DVERSION=%{version} \
-         -DCMAKE_INSTALL_PREFIX="%{_ugdir}" \
+         -DCMAKE_INSTALL_PREFIX="%{_usrdir}" \
          -DCMAKE_BUILD_TYPE=%{build_type}
 make
 
@@ -62,7 +62,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %manifest %{_datadir}/im-ui.manifest
 %{_datadir}/license/%{name}
-%{_ugdir}/res/locale/*/LC_MESSAGES/*
-%{_ugdir}/bin/*
+%{_usrdir}/res/locale/*/LC_MESSAGES/*
+%{_usrdir}/bin/*
 /usr/share/icons/default/small/org.tizen.im-ui.png
 /usr/share/packages/org.tizen.im-ui.xml
index 0bcf0e9..8b154e9 100644 (file)
@@ -5,7 +5,6 @@ pkg_check_modules(im-uigadget_pkgs
      evas
      #efl-assist
      dlog
-     #libima
 )
 
 SET(SRCS
@@ -28,7 +27,6 @@ INCLUDE_DIRECTORIES(SYSTEM
     ${im-uigadget_pkgs_INCLUDE_DIRS}
 )
 
-#ADD_LIBRARY(${TARGET_IM_UIGADGET} SHARED ${SRCS})
 ADD_EXECUTABLE(${TARGET_IM_UIGADGET} ${SRCS})
 
 TARGET_LINK_LIBRARIES(${TARGET_IM_UIGADGET}
@@ -40,6 +38,5 @@ TARGET_LINK_LIBRARIES(${TARGET_IM_UIGADGET}
 INSTALL(TARGETS
     ${TARGET_IM_UIGADGET}
     DESTINATION
-    #${LIBDIR}
     ${BINDIR}
 )
index d9a1533..79d1272 100644 (file)
@@ -31,7 +31,7 @@
 
 // FIXME: For testing/debug purpose only
 //        This flag cause that errors from libimaevm will be ignored.
-//#define DO_NOT_CHECK_ERROR
+#define DO_NOT_CHECK_ERROR
 
 static int _ima_state;     // 0 for disabled, 1 for enabled
 static int _ima_fix_state; // 0 for fix off (ima enabled), 1 for fix on
@@ -507,7 +507,8 @@ void im_main_menu_cb(void *data, Evas_Object *obj, void *event_info)
     }
 
     genlist = elm_genlist_add(ad->navi_bar);
-    elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
+//    elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
+    elm_genlist_mode_set(genlist, ELM_LIST_LIMIT);
 
     evas_object_smart_callback_add(genlist, "selected", genlist_clicked_cb, NULL);
 
@@ -558,6 +559,6 @@ void im_main_menu_cb(void *data, Evas_Object *obj, void *event_info)
     elm_naviframe_item_pop_cb_set(nf_it, quit_cb, data);
 
     elm_naviframe_prev_btn_auto_pushed_set(ad->navi_bar, EINA_FALSE);
-    //ea_object_event_callback_add(ad->navi_bar, EA_CALLBACK_BACK, ea_naviframe_back_cb, NULL);
-    //ea_object_event_callback_add(ad->navi_bar, EA_CALLBACK_MORE, ea_naviframe_more_cb, NULL);
+//    ea_object_event_callback_add(ad->navi_bar, EA_CALLBACK_BACK, ea_naviframe_back_cb, NULL);
+//    ea_object_event_callback_add(ad->navi_bar, EA_CALLBACK_MORE, ea_naviframe_more_cb, NULL);
 }
index e725a86..7dfb3e9 100644 (file)
@@ -53,7 +53,8 @@ static Evas_Object *_create_win(const char *name)
             //int t = h * 3. / 4.;
             //w = (t < w) ? t : w;
         }
-        evas_object_resize(eo, 600, 400);
+        // FIXME: Hardcoded size
+        evas_object_resize(eo, 1000, 1000);
     }
     return eo;
 }
@@ -62,7 +63,6 @@ static Evas_Object *_create_win(const char *name)
 static bool on_create(void *data)
 {
     printf("Enter function: %s\n", __func__);
-//    int theme = 0;
     if (NULL == data)
         return EINA_FALSE;
 
@@ -77,12 +77,6 @@ static bool on_create(void *data)
     evas_object_show(ugd->win_main);
     elm_win_indicator_mode_set(ugd->win_main, ELM_WIN_INDICATOR_SHOW);
 
-//    if (strncmp(elm_theme_get(NULL ), "tizen-HD-dark", strlen("tizen-HD-dark")) == 0) {
-//        theme = 0;
-//    } else if (strncmp(elm_theme_get(NULL ), "tizen-HD-light", strlen("tizen-HD-light")) == 0) {
-//        theme = 1;
-//    }
-
     ugd->bg = elm_bg_add(ugd->win_main);
     if (!ugd->bg) {
         LOGD("ugd->bg is null");
@@ -90,11 +84,14 @@ static bool on_create(void *data)
         return EINA_FALSE;
     }
     elm_win_resize_object_add(ugd->win_main, ugd->bg);
-    evas_object_size_hint_weight_set(ugd->bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_resize(ugd->bg, 600, 400);
+//  evas_object_size_hint_weight_set(ugd->bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_weight_set(ugd->bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_resize(ugd->bg, 1000, 1000);
     evas_object_show(ugd->bg);
 
+
     ugd->layout_main = elm_layout_add(ugd->win_main);
+
     if (!ugd->layout_main) {
         LOGD("ugd->layout_main is null");
         free(ugd->win_main);
@@ -103,18 +100,14 @@ static bool on_create(void *data)
     }
 
     ugd->theme = elm_theme_new();
-//
-//    if (theme == 1) {
-//        elm_theme_set(ugd->theme, "tizen-HD-light");
-//    } else {
-//        elm_theme_set(ugd->theme, "tizen-HD-dark");
-    elm_theme_set(ugd->theme, "default");
-//    }
+    elm_theme_set(ugd->theme, "tizen-HD-dark");
+
     elm_object_theme_set(ugd->layout_main, ugd->theme);
     elm_layout_theme_set(ugd->layout_main, "layout", "application", "default");
-    evas_object_size_hint_weight_set(ugd->layout_main, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_min_set(ugd->layout_main, 600, 400);
-    evas_object_resize(ugd->layout_main, 600, 400);
+    //evas_object_size_hint_weight_set(ugd->layout_main, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_weight_set(ugd->layout_main, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    //evas_object_size_hint_min_set(ugd->layout_main, 600, 400);
+    evas_object_resize(ugd->layout_main, 1000, 1000);
     evas_object_show(ugd->layout_main);
 
     elm_object_part_content_set(ugd->layout_main, "elm.swallow.bg", ugd->bg);
@@ -134,15 +127,6 @@ static bool on_create(void *data)
 
     return EINA_TRUE;
 }
-/*
-static void on_start(ui_gadget_h ug, service_h service, void *priv)
-{
-    (void)ug;
-    (void)service;
-    (void)priv;
-}
-*/
-
 
 static void on_pause(void *priv)
 {
@@ -175,109 +159,44 @@ static void on_destroy(void *priv)
     ugd->layout_main = NULL;
 }
 
-static void _tmp(void *priv)
-{
-    (void)priv;
-    printf("Enter function: %s\n", __func__);
-}
-
-static  void _tmp2(app_device_orientation_e  mode, void *priv)
-{
-    (void)priv;
-    (void)mode;
-    printf("Enter function: %s\n", __func__);
-}
-
-/*
-static void on_message(ui_gadget_h ug, service_h msg, service_h service, void *priv)
-{
-    (void)ug;
-    (void)msg;
-    (void)service;
-    (void)priv;
-}
-*/
-
-/*
-static void on_event(ui_gadget_h ug, enum ug_event event, service_h service, void *priv)
-{
-    (void)ug;
-    (void)service;
-    (void)priv;
-
-    switch (event) {
-    case UG_EVENT_LOW_MEMORY:
-        break;
-    case UG_EVENT_LOW_BATTERY:
-        break;
-    case UG_EVENT_LANG_CHANGE:
-        break;
-    case UG_EVENT_ROTATE_PORTRAIT:
-        break;
-    case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN:
-        break;
-    case UG_EVENT_ROTATE_LANDSCAPE:
-        break;
-    case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN:
-        break;
-    default:
-        break;
-    }
-}
-*/
-
-/*
-static void on_key_event(ui_gadget_h ug, enum ug_key_event event, service_h service, void *priv)
-{
-    (void)service;
-    (void)priv;
-
-    if (NULL == ug) {
-        //LOGD("NULL == ug; return");
-        return;
-    }
-
-    switch (event) {
-    case UG_KEY_EVENT_END:
-        ug_destroy_me(ug);
-        break;
-    default:
-        break;
-    }
-}
-*/
+//static void _tmp(void *priv)
+//{
+//    (void)priv;
+//    printf("Enter function: %s\n", __func__);
+//}
+//
+//static  void _tmp2(app_device_orientation_e  mode, void *priv)
+//{
+//    (void)priv;
+//    (void)mode;
+//    printf("Enter function: %s\n", __func__);
+//}
 
 int main(int argc, char *argv[])
 {
     printf("Enter function: %s\n", __func__);
-    struct ug_data ugd; // = calloc(1, sizeof(struct ug_data));
+    struct ug_data ugd;
     memset(&ugd, 0x0, sizeof(struct ug_data));
 
     app_event_callback_s event_callback;
 
     event_callback.create    = on_create;
-    //event_callback.start   = on_start;
     event_callback.pause     = on_pause;
     event_callback.resume    = on_resume;
     event_callback.terminate = on_destroy;
 
-//    event_callback.service               = NULL;
-//    event_callback.low_memory            = NULL;
-//    event_callback.low_battery           = NULL;
-//    event_callback.device_orientation    = NULL;
-//    event_callback.language_changed      = NULL;
-//    event_callback.region_format_changed = NULL;
     event_callback.service               = NULL;
-    event_callback.low_memory            = _tmp;
-    event_callback.low_battery           = _tmp;
-    event_callback.device_orientation    = _tmp2;
-    event_callback.language_changed      = _tmp;
-    event_callback.region_format_changed = _tmp;
-    // event_callback.message = on_message;
-    //event_callback.event = on_event;
-    //event_callback.key_event = on_key_event;
-
-    //on_create(&ugd);
+    event_callback.low_memory            = NULL;
+    event_callback.low_battery           = NULL;
+    event_callback.device_orientation    = NULL;
+    event_callback.language_changed      = NULL;
+    event_callback.region_format_changed = NULL;
+//    event_callback.service               = NULL;
+//    event_callback.low_memory            = _tmp;
+//    event_callback.low_battery           = _tmp;
+//    event_callback.device_orientation    = _tmp2;
+//    event_callback.language_changed      = _tmp;
+//    event_callback.region_format_changed = _tmp;
 
     int ret = app_efl_main(&argc, &argv, &event_callback, &ugd);
     switch (ret) {
@@ -301,24 +220,3 @@ int main(int argc, char *argv[])
     printf("return function: %s (%d)\n", __func__, ret);
     return ret;
 }
-
-/*
-UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)
-{
-    if (NULL == ops) {
-        LOGD("NULL == ops; return");
-        return;
-    }
-
-    struct ug_data *ugd = ops->priv;
-    free(ugd);
-}
-
-UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
-{
-    (void)service;
-    (void)priv;
-    return 0;
-}
-*/
-