From 2705cd29d035270dd38a62782fdb0f43b99cd765 Mon Sep 17 00:00:00 2001 From: Jinjin Shi Date: Sat, 8 Dec 2012 10:34:10 +0800 Subject: [PATCH] [UI]Remove needless codes --- NOTICE | 2 +- debian/starter.postinst | 2 +- include/hw_key.h | 4 - include/lock-daemon.h | 2 +- include/lockd-debug.h | 2 +- include/lockd-process-mgr.h | 2 +- include/lockd-window-mgr.h | 2 +- include/menu_daemon.h | 2 - include/pkg_event.h | 6 +- include/starter-util.h | 2 +- include/starter-vconf.h | 2 +- include/starter.h | 4 +- include/util.h | 3 +- include/x11.h | 2 +- include/xmonitor.h | 2 +- lock-setting/CMakeLists.txt | 1 - lock-setting/lockapp-setting/CMakeLists.txt | 39 - .../include/openlock-setting-debug.h | 48 -- .../include/openlock-setting-main.h | 48 -- .../lockapp-setting/include/openlock-setting-pw.h | 30 - .../include/openlock-setting-util.h | 28 - .../lockapp-setting/include/openlock-setting.h | 40 - .../lockapp-setting/src/openlock-setting-main.c | 342 --------- .../lockapp-setting/src/openlock-setting-pw.c | 522 -------------- .../lockapp-setting/src/openlock-setting-util.c | 65 -- .../lockapp-setting/src/openlock-setting.c | 217 ------ lock-setting/lockscreen-options/CMakeLists.txt | 14 - .../include/lockscreen-options-debug.h | 4 +- .../include/lockscreen-options-dualclock.h | 28 - .../include/lockscreen-options-locktitle.h | 26 - .../include/lockscreen-options-main.h | 2 +- .../include/lockscreen-options-shortcuts-edit.h | 25 - .../include/lockscreen-options-shortcuts.h | 26 - .../include/lockscreen-options-util.h | 32 +- .../include/lockscreen-options.h | 2 +- .../res/edje/lockscreen-options-locktitle.edc | 432 ----------- .../res/edje/lockscreen-options-shortcuts.edc | 116 --- .../res/edje/lockscreen-options-thumbnail.edc | 66 -- .../res/edje/lockscreen-options.edc | 23 - .../res/images/B09_Add Text_sip_option_Italic.png | Bin 3404 -> 0 bytes .../res/images/B09_Add Text_sip_option_bg.png | Bin 3297 -> 0 bytes .../res/images/B09_Add Text_sip_option_bold.png | Bin 3616 -> 0 bytes .../res/images/B09_Add Text_sip_option_color.png | Bin 3652 -> 0 bytes .../res/images/B09_Add Text_sip_option_size.png | Bin 3612 -> 0 bytes .../res/images/B09_Add Text_sip_option_style.png | Bin 5205 -> 0 bytes .../images/B09_Add Text_sip_option_underline.png | Bin 3476 -> 0 bytes .../res/images/B09_key_btn_01.png | Bin 3423 -> 0 bytes .../res/images/B09_key_btn_press.png | Bin 3494 -> 0 bytes .../lockscreen-options/res/images/icon_add.png | Bin 1205 -> 0 bytes .../lockscreen-options/res/images/icon_delete.png | Bin 6062 -> 0 bytes .../res/images/icon_delete_press.png | Bin 6231 -> 0 bytes .../res/images/mainmenu_icon.png | Bin 2184 -> 0 bytes .../src/lockscreen-options-dualclock.c | 249 ------- .../src/lockscreen-options-locktitle.c | 535 -------------- .../src/lockscreen-options-main.c | 135 +--- .../src/lockscreen-options-shortcuts-edit.c | 576 --------------- .../src/lockscreen-options-shortcuts.c | 803 --------------------- .../src/lockscreen-options-util.c | 28 +- .../lockscreen-options/src/lockscreen-options.c | 4 - packaging/starter.spec | 16 +- src/hw_key.c | 6 +- src/lock-daemon.c | 10 +- src/lockd-debug.c | 10 +- src/lockd-window-mgr.c | 4 +- src/menu_daemon.c | 22 +- src/pkg_event.c | 12 +- src/xmonitor.c | 12 - starter.init.sh | 3 +- 68 files changed, 47 insertions(+), 4593 deletions(-) mode change 100644 => 100755 include/hw_key.h mode change 100644 => 100755 include/lockd-debug.h mode change 100644 => 100755 include/pkg_event.h mode change 100644 => 100755 include/starter-util.h mode change 100644 => 100755 include/starter.h mode change 100644 => 100755 include/util.h mode change 100644 => 100755 include/x11.h mode change 100644 => 100755 include/xmonitor.h delete mode 100755 lock-setting/lockapp-setting/CMakeLists.txt delete mode 100755 lock-setting/lockapp-setting/include/openlock-setting-debug.h delete mode 100755 lock-setting/lockapp-setting/include/openlock-setting-main.h delete mode 100755 lock-setting/lockapp-setting/include/openlock-setting-pw.h delete mode 100755 lock-setting/lockapp-setting/include/openlock-setting-util.h delete mode 100755 lock-setting/lockapp-setting/include/openlock-setting.h delete mode 100755 lock-setting/lockapp-setting/src/openlock-setting-main.c delete mode 100755 lock-setting/lockapp-setting/src/openlock-setting-pw.c delete mode 100755 lock-setting/lockapp-setting/src/openlock-setting-util.c delete mode 100755 lock-setting/lockapp-setting/src/openlock-setting.c delete mode 100755 lock-setting/lockscreen-options/include/lockscreen-options-dualclock.h delete mode 100755 lock-setting/lockscreen-options/include/lockscreen-options-locktitle.h delete mode 100755 lock-setting/lockscreen-options/include/lockscreen-options-shortcuts-edit.h delete mode 100755 lock-setting/lockscreen-options/include/lockscreen-options-shortcuts.h delete mode 100755 lock-setting/lockscreen-options/res/edje/lockscreen-options-locktitle.edc delete mode 100755 lock-setting/lockscreen-options/res/edje/lockscreen-options-shortcuts.edc delete mode 100755 lock-setting/lockscreen-options/res/edje/lockscreen-options-thumbnail.edc delete mode 100755 lock-setting/lockscreen-options/res/edje/lockscreen-options.edc delete mode 100755 lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_Italic.png delete mode 100755 lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_bg.png delete mode 100755 lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_bold.png delete mode 100755 lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_color.png delete mode 100755 lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_size.png delete mode 100755 lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_style.png delete mode 100755 lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_underline.png delete mode 100755 lock-setting/lockscreen-options/res/images/B09_key_btn_01.png delete mode 100755 lock-setting/lockscreen-options/res/images/B09_key_btn_press.png delete mode 100755 lock-setting/lockscreen-options/res/images/icon_add.png delete mode 100755 lock-setting/lockscreen-options/res/images/icon_delete.png delete mode 100755 lock-setting/lockscreen-options/res/images/icon_delete_press.png delete mode 100755 lock-setting/lockscreen-options/res/images/mainmenu_icon.png delete mode 100755 lock-setting/lockscreen-options/src/lockscreen-options-dualclock.c delete mode 100755 lock-setting/lockscreen-options/src/lockscreen-options-locktitle.c delete mode 100755 lock-setting/lockscreen-options/src/lockscreen-options-shortcuts-edit.c delete mode 100755 lock-setting/lockscreen-options/src/lockscreen-options-shortcuts.c mode change 100644 => 100755 src/lockd-debug.c mode change 100644 => 100755 src/pkg_event.c mode change 100644 => 100755 src/xmonitor.c diff --git a/NOTICE b/NOTICE index ded3804..e5fc676 100755 --- a/NOTICE +++ b/NOTICE @@ -1 +1 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. \ No newline at end of file +Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved. \ No newline at end of file diff --git a/debian/starter.postinst b/debian/starter.postinst index a3c94ed..f1f673f 100755 --- a/debian/starter.postinst +++ b/debian/starter.postinst @@ -2,7 +2,7 @@ vconftool set -t int "memory/starter/sequence" 0 -i -u 5000 -g 5000 -vconftool set -t string file/private/lockscreen/pkgname "org.tizen.draglock" -u 5000 -g 5000 +vconftool set -t string file/private/lockscreen/pkgname "org.tizen.lockscreen" -u 5000 -g 5000 vconftool -i set -t int memory/idle_lock/state "0" -u 5000 -g 5000 diff --git a/include/hw_key.h b/include/hw_key.h old mode 100644 new mode 100755 index 594e810..863cbf3 --- a/include/hw_key.h +++ b/include/hw_key.h @@ -18,7 +18,3 @@ extern void destroy_key_window(void); extern void create_key_window(void); - - - -// End of a file diff --git a/include/lock-daemon.h b/include/lock-daemon.h index 47caf66..6c968f7 100755 --- a/include/lock-daemon.h +++ b/include/lock-daemon.h @@ -21,4 +21,4 @@ int start_lock_daemon(int launch_lock); -#endif /* __LOCK_DAEMON_H__ */ +#endif diff --git a/include/lockd-debug.h b/include/lockd-debug.h old mode 100644 new mode 100755 index 2da144e..5999247 --- a/include/lockd-debug.h +++ b/include/lockd-debug.h @@ -61,4 +61,4 @@ void lockd_log_t(char *fmt, ...); #define FALSE 0 #endif -#endif /* __LOCKD_DEBUG_H__ */ +#endif diff --git a/include/lockd-process-mgr.h b/include/lockd-process-mgr.h index 0d10863..4de8c6b 100755 --- a/include/lockd-process-mgr.h +++ b/include/lockd-process-mgr.h @@ -35,4 +35,4 @@ void lockd_process_mgr_terminate_phone_lock(int phone_lock_pid); int lockd_process_mgr_check_lock(int pid); -#endif /* __LOCKD_PROCESS_MGR_H__ */ +#endif diff --git a/include/lockd-window-mgr.h b/include/lockd-window-mgr.h index 05b27bc..27e837e 100755 --- a/include/lockd-window-mgr.h +++ b/include/lockd-window-mgr.h @@ -39,4 +39,4 @@ lockd_window_mgr_ready_lock(void *data, lockw_data * lockw, void lockd_window_mgr_finish_lock(lockw_data * lockw); lockw_data *lockd_window_init(void); -#endif /* __LOCKD_WINDOW_MGR_H__ */ +#endif diff --git a/include/menu_daemon.h b/include/menu_daemon.h index cde3b5c..3e6a836 100755 --- a/include/menu_daemon.h +++ b/include/menu_daemon.h @@ -25,5 +25,3 @@ extern void menu_daemon_fini(void); extern bool menu_daemon_is_homescreen(pid_t pid); extern int menu_daemon_check_dead_signal(int pid); - -// End of a file diff --git a/include/pkg_event.h b/include/pkg_event.h old mode 100644 new mode 100755 index 0445093..4459999 --- a/include/pkg_event.h +++ b/include/pkg_event.h @@ -21,15 +21,15 @@ #include #if !defined(PUBLIC) -#define PUBLIC __attribute__((visibility("default"))) /** struct appdata { - struct timeval tv_start; /* start time */ + struct timeval tv_start; }; -#endif /* __STARTER_H__ */ +#endif diff --git a/include/util.h b/include/util.h old mode 100644 new mode 100755 index 4956d0d..81312f3 --- a/include/util.h +++ b/include/util.h @@ -28,7 +28,6 @@ #define LOG_TAG "starter" #endif -/* Log */ #if !defined(_W) #define _W(fmt, arg...) LOGW("[%s:%d] "fmt"\n", __func__, __LINE__, ##arg) #endif @@ -76,4 +75,4 @@ } \ } -#endif /* __MENU_DAEMON_UTIL_H__ */ +#endif diff --git a/include/x11.h b/include/x11.h old mode 100644 new mode 100755 index 78735af..40470b9 --- a/include/x11.h +++ b/include/x11.h @@ -23,4 +23,4 @@ void prop_string_set(const char *name, const char *value); void prop_int_set(const char *name, unsigned int val); void set_window_scale(void); -#endif /* __STARTER_X11_H__ */ +#endif diff --git a/include/xmonitor.h b/include/xmonitor.h old mode 100644 new mode 100755 index e904c0b..47388d5 --- a/include/xmonitor.h +++ b/include/xmonitor.h @@ -22,4 +22,4 @@ extern int xmonitor_init(void); extern void xmonitor_fini(void); -#endif /* __MENU_DAEMON_XMONITOR_H__ */ +#endif diff --git a/lock-setting/CMakeLists.txt b/lock-setting/CMakeLists.txt index f754bda..7745b83 100755 --- a/lock-setting/CMakeLists.txt +++ b/lock-setting/CMakeLists.txt @@ -1,7 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(lock-setting C) -ADD_SUBDIRECTORY(lockapp-setting) ADD_SUBDIRECTORY(lockscreen-options) # i18n diff --git a/lock-setting/lockapp-setting/CMakeLists.txt b/lock-setting/lockapp-setting/CMakeLists.txt deleted file mode 100755 index 002b0bd..0000000 --- a/lock-setting/lockapp-setting/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(ug-openlock-setting C) - -SET(PREFIX ${CMAKE_INSTALL_PREFIX}) -SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") -SET(INCLUDEDIR "\${prefix}/include") -SET(VERSION 0.1.0) - -SET(SRCS - ./src/openlock-setting.c - ./src/openlock-setting-util.c - ./src/openlock-setting-main.c - ./src/openlock-setting-pw.c -) - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) - -INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs_lock_settings REQUIRED appcore-efl aul elementary ui-gadget-1 evas ail capi-appfw-application) - -FOREACH(flag ${pkgs_lock_settings_CFLAGS}) - SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}") -ENDFOREACH(flag) - -SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} -fvisibility=hidden -Wall") -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS}") -SET(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS}) - -ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") - -ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_lock_settings_LDFLAGS}) - -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib) -#INSTALL(TARGETS "${CMAKE_CURRENT_SOURCE_DIR}/00_winset_control_top_arrow.png" DESTINATION /opt/ug/res/images/ug-openlock-setting) - diff --git a/lock-setting/lockapp-setting/include/openlock-setting-debug.h b/lock-setting/lockapp-setting/include/openlock-setting-debug.h deleted file mode 100755 index 8855a1b..0000000 --- a/lock-setting/lockapp-setting/include/openlock-setting-debug.h +++ /dev/null @@ -1,48 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#ifndef __OPENLOCK_SETTING_DEBUG_H__ -#define __OPENLOCK_SETTING_DEBUG_H__ - -#include - -#define OPENLOCK_USING_PLATFORM_DEBUG - -#ifdef OPENLOCK_USING_PLATFORM_DEBUG -#ifndef LOG_TAG -#define LOG_TAG "openlock-setting" -#endif -#include - -#define OPENLOCKS_DBG(fmt, args...) LOGD("["LOG_TAG"%s:%d:E] "fmt, __FILE__, __LINE__, ##args) -#define OPENLOCKS_WARN(fmt, args...) LOGW("["LOG_TAG"%s:%d:E] "fmt, __FILE__, __LINE__, ##args) -#define OPENLOCKS_ERR(fmt, args...) LOGE("["LOG_TAG"%s:%d:E] "fmt, __FILE__, __LINE__, ##args) -#else -#define OPENLOCKS_DBG(fmt, args...) do{printf("[OPENLOCKS_DBG][%s(%d)] "fmt " \n", __FILE__, __LINE__, ##args);}while(0); -#define OPENLOCKS_WARN(fmt, args...) do{printf("[OPENLOCKS_WARN][%s(%d)] "fmt " \n", __FILE__, __LINE__, ##args);}while(0); -#define OPENLOCKS_ERR(fmt, args...) do{printf("[OPENLOCKS_ERR][%s(%d)] "fmt " \n", __FILE__, __LINE__, ##args);}while(0); -#endif /* LOCKD_USING_PLATFORM_DEBUG */ - -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - -#endif /* __OPENLOCK_SETTING_DEBUG_H__ */ diff --git a/lock-setting/lockapp-setting/include/openlock-setting-main.h b/lock-setting/lockapp-setting/include/openlock-setting-main.h deleted file mode 100755 index 5155f0a..0000000 --- a/lock-setting/lockapp-setting/include/openlock-setting-main.h +++ /dev/null @@ -1,48 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#ifndef __OPENLOCK_SETTING_MAIN_H__ -#define __OPENLOCK_SETTING_MAIN_H__ - -#include -#include "openlock-setting.h" - -typedef struct _openlock_setting_appdata openlock_setting_appdata; - -struct _openlock_setting_appdata { - openlock_setting_appdata *prev; - openlock_setting_appdata *next; - - char *pkg_name; - char *app_name; - int index; - - Evas_Object *radio; - Evas_Object *entry; - Evas_Object *editfield_layout; - Evas_Object *popup; - /* for pw */ - Evas_Object *ly; - Evas_Object *genlist; - int count; - openlock_ug_data *openlock_data; -}; - -void openlock_setting_main_create_view(openlock_ug_data * openlock_data); - -#endif /* __OPENLOCK_SETTING_MAIN_H__ */ diff --git a/lock-setting/lockapp-setting/include/openlock-setting-pw.h b/lock-setting/lockapp-setting/include/openlock-setting-pw.h deleted file mode 100755 index c1dfd1d..0000000 --- a/lock-setting/lockapp-setting/include/openlock-setting-pw.h +++ /dev/null @@ -1,30 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#ifndef __OPENLOCK_SETTING_PW_H__ -#define __OPENLOCK_SETTING_PW_H__ - -#include - -#include "openlock-setting-main.h" - -void -openlock_setting_pw_create_view(openlock_setting_appdata * - openlock_setting_data); - -#endif /* __OPENLOCK_SETTING_PW_H__ */ diff --git a/lock-setting/lockapp-setting/include/openlock-setting-util.h b/lock-setting/lockapp-setting/include/openlock-setting-util.h deleted file mode 100755 index e95a66d..0000000 --- a/lock-setting/lockapp-setting/include/openlock-setting-util.h +++ /dev/null @@ -1,28 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#ifndef __OPENLOCK_SETTING_UTIL_H__ -#define __OPENLOCK_SETTING_UTIL_H__ - -#include - -Evas_Object *openlock_setting_util_create_navigation(Evas_Object * parent); - -Evas_Object *openlock_setting_util_create_layout(Evas_Object * parent); - -#endif /* __OPENLOCK_SETTING_UTIL_H__ */ diff --git a/lock-setting/lockapp-setting/include/openlock-setting.h b/lock-setting/lockapp-setting/include/openlock-setting.h deleted file mode 100755 index 4adb642..0000000 --- a/lock-setting/lockapp-setting/include/openlock-setting.h +++ /dev/null @@ -1,40 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#ifndef __openlock_setting_H__ -#define __openlock_setting_H__ - -#include -#include -#include - -#define PKGNAME "ug-openlock-setting" - -#define _EDJ(o) elm_layout_edje_get(o) -#define dgettext_noop(s) (s) - -typedef struct _openlock_ug_data { - Evas_Object *win_main; - Evas_Object *base; - ui_gadget_h ug; - - Evas_Object *navi_bar; - ; -} openlock_ug_data; - -#endif /* __openlock_setting_H__ */ diff --git a/lock-setting/lockapp-setting/src/openlock-setting-main.c b/lock-setting/lockapp-setting/src/openlock-setting-main.c deleted file mode 100755 index 03cbce3..0000000 --- a/lock-setting/lockapp-setting/src/openlock-setting-main.c +++ /dev/null @@ -1,342 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#include -#include -#include -#include -#include -#include - -#include "openlock-setting.h" -#include "openlock-setting-pw.h" -#include "openlock-setting-debug.h" -#include "openlock-setting-main.h" -#include "starter-vconf.h" - -#define OPENLOCK_DESKTOP_VALUE_LOCKSCREEN "lock-screen" - -static Elm_Gen_Item_Class itc; -static Evas_Object *radio_group = NULL; - -static void _openlock_setting_main_back_cb(void *data, Evas_Object * obj, - void *event_info) -{ - openlock_ug_data *openlock_data = (openlock_ug_data *) data; - - if (openlock_data == NULL) - return; - - ug_destroy_me(openlock_data->ug); -} - -static void -_openlock_setting_main_button_clicked_cb(void *data, Evas_Object * obj, - void *event_info) -{ - if (data == NULL) - return; - - openlock_setting_appdata *lockapp_data = - (openlock_setting_appdata *) data; - - OPENLOCKS_DBG("edit button pressed : %s", lockapp_data->pkg_name); - - bundle *b = NULL; - - b = bundle_create(); - - bundle_add(b, "mode", "edit"); - aul_launch_app(lockapp_data->pkg_name, b); - - if (b) - bundle_free(b); -} - -static Evas_Object *_openlock_setting_main_gl_icon_get(void *data, - Evas_Object * obj, - const char *part) -{ - if (data == NULL || part == NULL) - return NULL; - - openlock_setting_appdata *lockapp_data = - (openlock_setting_appdata *) data; - Evas_Object *radio = NULL; - Evas_Object *button = NULL; - char *cur_pkg_name = NULL; - char editable_key[512] = { 0, }; - int val = 0; - - OPENLOCKS_DBG("part : %s", part); - - if (!strcmp(part, "elm.icon.1")) { - radio = elm_radio_add(obj); - elm_radio_state_value_set(radio, lockapp_data->index); - - if (lockapp_data->index != 0) { - elm_radio_group_add(radio, radio_group); - } else { - radio_group = radio; - } - - lockapp_data->radio = radio; - - cur_pkg_name = vconf_get_str(VCONF_PRIVATE_LOCKSCREEN_PKGNAME); - OPENLOCKS_DBG("cur pkg : %s, this pkg : %s", cur_pkg_name, - lockapp_data->pkg_name); - if (cur_pkg_name == NULL) { - return NULL; - } - if (!strcmp(cur_pkg_name, lockapp_data->pkg_name)) { - elm_radio_value_set(radio_group, lockapp_data->index); - } - - return radio; - } else if (!strcmp(part, "elm.icon.2")) { - snprintf(editable_key, sizeof(editable_key), - "db/openlockscreen/%s/editable", - lockapp_data->app_name); - int ret = vconf_get_bool(editable_key, &val); - if (ret == 0 && val == 1) { - OPENLOCKS_DBG("app %s have a editable mode!", - lockapp_data->app_name); - button = elm_button_add(obj); - elm_object_style_set(button, "text_only/sweep"); - elm_object_text_set(button, "edit"); - evas_object_smart_callback_add(button, "clicked", - _openlock_setting_main_button_clicked_cb, - lockapp_data); - - return button; - } - } - - return NULL; -} - -static char *_openlock_setting_main_gl_label_get(void *data, Evas_Object * obj, - const char *part) -{ - if (data == NULL || part == NULL) - return NULL; - - openlock_setting_appdata *lockapp_data = - (openlock_setting_appdata *) data; - - if (lockapp_data->app_name && !strcmp(part, "elm.text")) { - return strdup(lockapp_data->app_name); - } - - return NULL; -} - -static void _openlock_setting_main_gl_del(void *data, Evas_Object * obj) -{ - if (data == NULL) - return; - - openlock_setting_appdata *lockapp_data = - (openlock_setting_appdata *) data; - - if (lockapp_data->pkg_name) - free(lockapp_data->pkg_name); - - if (lockapp_data->app_name) - free(lockapp_data->app_name); - - free(lockapp_data); -} - -static void -_openlock_setting_main_gl_sel(void *data, Evas_Object * obj, void *event_info) -{ - char *cur_pkg_name = NULL; - elm_genlist_item_selected_set((Elm_Object_Item *) event_info, - EINA_FALSE); - - if (data == NULL) - return; - - openlock_setting_appdata *lockapp_data = - (openlock_setting_appdata *) data; - - (lockapp_data->count)++; - OPENLOCKS_DBG("lockapp_data->count = %d\n", lockapp_data->count); - - if ((lockapp_data->count) > 1) { - lockapp_data->count = 0; - return; - } - - OPENLOCKS_DBG("lockapp_data->pkg_name = %s\n", lockapp_data->pkg_name); - - if (lockapp_data != NULL && lockapp_data->pkg_name != NULL) { - int ret = 0; - elm_radio_value_set(radio_group, lockapp_data->index); - ret = vconf_set_str(VCONF_PRIVATE_LOCKSCREEN_PKGNAME, - lockapp_data->pkg_name); - if(ret != 0) - { - OPENLOCKS_ERR("Failed to get vconf : VCONF_PRIVATE_LOCKSCREEN_PKGNAME\n"); - } - lockapp_data->count = 0; /* reset the count */ - } -} - - -ail_cb_ret_e _openlock_setting_main_appinfo_cb(const ail_appinfo_h appinfo, - void *user_data) -{ - openlock_setting_appdata *lockapp_data = - (openlock_setting_appdata *) user_data; - openlock_setting_appdata *new_lockapp_data = NULL; - char *pkgname = NULL; - char *appname = NULL; - - ail_appinfo_get_str(appinfo, AIL_PROP_PACKAGE_STR, &pkgname); - ail_appinfo_get_str(appinfo, AIL_PROP_NAME_STR, &appname); - - /* Get tail of the list */ - while (lockapp_data->next != NULL) { - lockapp_data = lockapp_data->next; - } - - if (lockapp_data->index == 0 && lockapp_data->pkg_name == NULL) { - /* first data */ - lockapp_data->pkg_name = strdup(pkgname); - lockapp_data->app_name = strdup(appname); - OPENLOCKS_DBG("appinfo %d) %s, %s", lockapp_data->index, - lockapp_data->pkg_name, lockapp_data->app_name); - } else { - /* create new data */ - new_lockapp_data = (openlock_setting_appdata *) - malloc(sizeof(openlock_setting_appdata)); - memset(new_lockapp_data, 0, sizeof(openlock_setting_appdata)); - new_lockapp_data->pkg_name = strdup(pkgname); - new_lockapp_data->app_name = strdup(appname); - new_lockapp_data->index = lockapp_data->index + 1; - new_lockapp_data->openlock_data = lockapp_data->openlock_data; - - new_lockapp_data->next = NULL; - new_lockapp_data->prev = lockapp_data; - - lockapp_data->next = new_lockapp_data; - - OPENLOCKS_DBG("appinfo %d) %s, %s", new_lockapp_data->index, - new_lockapp_data->pkg_name, - new_lockapp_data->app_name); - } - - return AIL_CB_RET_CONTINUE; -} - -void openlock_setting_main_create_view(openlock_ug_data * openlock_data) -{ - OPENLOCKS_DBG("openlock_setting_main_create_view begin\n"); - Evas_Object *navi_bar = openlock_data->navi_bar; - Evas_Object *back_button = NULL; - Evas_Object *genlist = NULL; - Elm_Object_Item *item = NULL; - int i = 0, count = 0; - openlock_setting_appdata *lockapp_data = NULL; - openlock_setting_appdata *head_lockapp_data = NULL; - - if (navi_bar == NULL) { - OPENLOCKS_WARN("navi_bar is null."); - return; - } - - /* Get app info */ - ail_filter_h filter; - ail_error_e ret; - - ret = ail_filter_new(&filter); - if (ret != AIL_ERROR_OK) { - OPENLOCKS_WARN("Fail ail_filter_new : %d", ret); - return; - } - - ret = - ail_filter_add_str(filter, AIL_PROP_CATEGORIES_STR, - OPENLOCK_DESKTOP_VALUE_LOCKSCREEN); - ret = ail_filter_count_appinfo(filter, &count); - - lockapp_data = (openlock_setting_appdata *) - malloc(sizeof(openlock_setting_appdata)); - memset(lockapp_data, 0, sizeof(openlock_setting_appdata)); - lockapp_data->prev = NULL; - lockapp_data->next = NULL; - lockapp_data->pkg_name = NULL; - lockapp_data->app_name = NULL; - lockapp_data->index = 0; - lockapp_data->openlock_data = openlock_data; - ail_filter_list_appinfo_foreach(filter, - _openlock_setting_main_appinfo_cb, - lockapp_data); - - ail_filter_destroy(filter); - - OPENLOCKS_DBG("lock app count : %d", count); - - if (count > 0) { - /* Create genlist */ - genlist = elm_genlist_add(navi_bar); - - itc.item_style = "dialogue/1text.2icon"; - itc.func.text_get = _openlock_setting_main_gl_label_get; - itc.func.content_get = _openlock_setting_main_gl_icon_get; - itc.func.state_get = NULL; - itc.func.del = _openlock_setting_main_gl_del; - - head_lockapp_data = lockapp_data; - - for (i = 0; i < count; i++) { - /* Find index */ - lockapp_data = head_lockapp_data; - - while (lockapp_data != NULL) { - if (lockapp_data->index == i) { - /* find */ - OPENLOCKS_DBG("%d) [%s][%s]", - lockapp_data->index, - lockapp_data->pkg_name, - lockapp_data->app_name); - elm_genlist_item_append(genlist, - &itc, - lockapp_data, - NULL, - ELM_GENLIST_ITEM_NONE, - _openlock_setting_main_gl_sel, - lockapp_data); - break; - } - lockapp_data = lockapp_data->next; - } - } - } - - /* Set navigation objects and push */ - back_button = elm_button_add(navi_bar); - elm_object_style_set(back_button, "naviframe/back_btn/default"); - evas_object_smart_callback_add(back_button, "clicked", - _openlock_setting_main_back_cb, - openlock_data); - - elm_naviframe_item_push(navi_bar, "Downloaded lock screens", back_button, NULL, genlist, NULL); /* the same tile */ -} diff --git a/lock-setting/lockapp-setting/src/openlock-setting-pw.c b/lock-setting/lockapp-setting/src/openlock-setting-pw.c deleted file mode 100755 index cec2763..0000000 --- a/lock-setting/lockapp-setting/src/openlock-setting-pw.c +++ /dev/null @@ -1,522 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#include -#include -#include -#include - -#include "openlock-setting-pw.h" -#include "openlock-setting-debug.h" -#include "starter-vconf.h" - -static Evas_Object *done_button = NULL; -static Elm_Gen_Item_Class itc_label, itc_entry; -static Evas_Object *_openlock_setting_pw_editfield_create(Evas_Object * parent, - void *data); -static Evas_Object *_openlock_setting_pw_editfield_entry_get(Evas_Object * - parent); - -static Evas_Object *_openlock_setting_pw_create_conformant(Evas_Object * parent) -{ - Evas_Object *conform = NULL; - elm_win_conformant_set(parent, 1); - conform = elm_conformant_add(parent); - elm_object_style_set(conform, "internal_layout"); - evas_object_show(conform); - - return conform; -} - -static void _openlock_setting_pw_done_button_changed(void *data, - Evas_Object * obj, void *e) -{ - openlock_setting_appdata *openlock_setting_data = - (openlock_setting_appdata *) data; - - if (!openlock_setting_data) { - return; - } - int length = strlen(elm_entry_entry_get(obj)); - - if (length == 0) { - elm_object_disabled_set(done_button, EINA_TRUE); - } else { - elm_object_disabled_set(done_button, EINA_FALSE); - } - - if (elm_object_focus_get(obj)) { - if (elm_entry_is_empty(obj)) { - elm_object_signal_emit - (openlock_setting_data->editfield_layout, - "elm,state,eraser,hide", "elm"); - } else { - elm_object_signal_emit - (openlock_setting_data->editfield_layout, - "elm,state,eraser,show", "elm"); - } - } -} - -static void _openlock_setting_pw_focused_cb(void *data, Evas_Object * obj, - void *event_info) -{ - if (!elm_entry_is_empty(obj)) { - elm_object_signal_emit(data, "elm,state,eraser,show", "elm"); - } - elm_object_signal_emit(data, "elm,state,guidetext,hide", "elm"); -} - -static void _openlock_setting_pw_unfocused_cb(void *data, Evas_Object * obj, - void *event_info) -{ - if (elm_entry_is_empty(obj)) { - elm_object_signal_emit(data, "elm,state,guidetext,show", "elm"); - } - elm_object_signal_emit(data, "elm,state,eraser,hide", "elm"); -} - -static void _openlock_setting_pw_eraser_clicked_cb(void *data, - Evas_Object * obj, - const char *emission, - const char *source) -{ - elm_entry_entry_set(data, ""); -} - -static Evas_Object *_openlock_setting_pw_editfield_create(Evas_Object * parent, - void *data) -{ - Evas_Object *layout = NULL; - Evas_Object *entry = NULL; - openlock_setting_appdata *openlock_setting_data = - (openlock_setting_appdata *) data; - static Elm_Entry_Filter_Limit_Size limit_filter_data; - - limit_filter_data.max_char_count = 15; /* hard code for demo */ - limit_filter_data.max_byte_count = 0; - - layout = elm_layout_add(parent); - elm_layout_theme_set(layout, "layout", "editfield", "title"); - - entry = elm_entry_add(parent); - elm_entry_scrollable_set(entry, EINA_TRUE); - elm_entry_single_line_set(entry, EINA_TRUE); - elm_entry_password_set(entry, EINA_TRUE); - elm_entry_input_panel_layout_set(entry, - ELM_INPUT_PANEL_LAYOUT_NUMBERONLY); - elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size, - &limit_filter_data); - elm_object_focus_set(entry, EINA_TRUE); - evas_object_show(entry); - evas_object_smart_callback_add(entry, "changed", - _openlock_setting_pw_done_button_changed, - openlock_setting_data); - evas_object_smart_callback_add(entry, "focused", - _openlock_setting_pw_focused_cb, layout); - evas_object_smart_callback_add(entry, "unfocused", - _openlock_setting_pw_unfocused_cb, - layout); - - elm_object_part_content_set(layout, "elm.swallow.content", entry); - elm_object_part_text_set(layout, "elm.guidetext", ""); - elm_object_signal_callback_add(layout, "elm,eraser,clicked", "elm", - _openlock_setting_pw_eraser_clicked_cb, - entry); - - Ecore_IMF_Context *imf_context = - (Ecore_IMF_Context *) elm_entry_imf_context_get(entry); - if (imf_context) { - ecore_imf_context_input_panel_show(imf_context); - } - elm_object_focus_set(entry, EINA_TRUE); - - return layout; -} - -static Evas_Object *_openlock_setting_pw_editfield_entry_get(Evas_Object * - parent) -{ - Evas_Object *entry = NULL; - - entry = elm_object_part_content_get(parent, "elm.swallow.content"); - - return entry; -} - -static char *_openlock_setting_pw_gl_label_get_title(void *data, - Evas_Object * obj, - const char *part) -{ - openlock_setting_appdata *openlock_setting_data = - (openlock_setting_appdata *) data; - char buf[50] = { 0, }; - - if (!openlock_setting_data || !part) { - return NULL; - } - - if (!strcmp(part, "elm.text")) { - snprintf(buf, sizeof(buf), "%s", "Enter Password"); /* hard code for demo */ - return strdup(buf); - } - return NULL; -} - -static Evas_Object *_openlock_setting_pw_gl_icon_get(void *data, - Evas_Object * obj, - const char *part) -{ - Evas_Object *layout = NULL; - openlock_setting_appdata *openlock_setting_data = - (openlock_setting_appdata *) data; - - if (!openlock_setting_data || !part) { - return NULL; - } - - if (!strcmp(part, "elm.icon")) { - layout = - _openlock_setting_pw_editfield_create(obj, - openlock_setting_data); - openlock_setting_data->editfield_layout = layout; - - return layout; - - } - return NULL; -} - -static void _openlock_setting_pw_list_set_styles() -{ - itc_label.item_style = "dialogue/title"; - itc_label.func.text_get = _openlock_setting_pw_gl_label_get_title; - itc_label.func.content_get = NULL; - itc_label.func.state_get = NULL; - itc_label.func.del = NULL; - - itc_entry.item_style = "dialogue/1icon"; - itc_entry.func.text_get = NULL; - itc_entry.func.content_get = _openlock_setting_pw_gl_icon_get; - itc_entry.func.state_get = NULL; - itc_entry.func.del = NULL; -} - -static void _openlock_setting_pw_back_cb(void *data, Evas_Object * obj, - void *event_info) -{ - openlock_setting_appdata *openlock_setting_data = - (openlock_setting_appdata *) data; - openlock_ug_data *openlock_data = NULL; - - if (!openlock_setting_data) { - return; - } - - openlock_data = openlock_setting_data->openlock_data; - if (!openlock_data) { - return; - } - OPENLOCKS_DBG("_openlock_setting_pw_back_cb\n"); - openlock_setting_data->count = 0; - - elm_naviframe_item_pop(openlock_data->navi_bar); - if (openlock_setting_data->editfield_layout) { - evas_object_del(openlock_setting_data->editfield_layout); - openlock_setting_data->editfield_layout = NULL; - } - if (openlock_setting_data->genlist) { - evas_object_del(openlock_setting_data->genlist); - openlock_setting_data->genlist = NULL; - } - if (openlock_setting_data->ly) { - evas_object_del(openlock_setting_data->ly); - openlock_setting_data->ly = NULL; - } -} - -static Eina_Bool _openlock_setting_pw_input_panel_show_idler(void *data) -{ - Evas_Object *entry = (Evas_Object *) data; - - OPENLOCKS_DBG("_openlock_setting_pw_input_panel_show_idler"); - - elm_object_focus_set(entry, EINA_TRUE); - - return ECORE_CALLBACK_CANCEL; -} - -static void _openlock_setting_pw_imf_context_input_panel_show(void *data) -{ - openlock_setting_appdata *openlock_setting_data = - (openlock_setting_appdata *) data; - Evas_Object *entry = NULL; - - if (!openlock_setting_data) { - return; - } - - OPENLOCKS_DBG("_openlock_setting_pw_imf_context_input_panel_show\n"); - - entry = _openlock_setting_pw_editfield_entry_get( - openlock_setting_data->editfield_layout); - evas_object_show(entry); - - ecore_idler_add(_openlock_setting_pw_input_panel_show_idler, entry); -} - -static void _openlock_setting_pw_imf_context_input_panel_hide(void *data) -{ - openlock_setting_appdata *openlock_setting_data = - (openlock_setting_appdata *) data; - Evas_Object *entry = NULL; - - if (!openlock_setting_data) { - return; - } - - OPENLOCKS_DBG("_openlock_setting_pw_imf_context_input_panel_hide\n"); - - entry = _openlock_setting_pw_editfield_entry_get( - openlock_setting_data->editfield_layout); - evas_object_hide(entry); - - elm_object_focus_set(entry, EINA_FALSE); -} - -static void _openlock_setting_pw_destroy_popup_cb(void *data, Evas_Object * obj, - void *e) -{ - openlock_setting_appdata *openlock_setting_data = - (openlock_setting_appdata *) data; - Evas_Object *popup = NULL; - - OPENLOCKS_DBG("_openlock_setting_pw_destroy_popup_cb\n"); - _openlock_setting_pw_imf_context_input_panel_show - (openlock_setting_data); - - if (!openlock_setting_data) { - return; - } - - popup = openlock_setting_data->popup; - if (popup) { - evas_object_del(popup); - popup = NULL; - } -} - -static void _openlock_setting_pw_show_popup(void *data, const char *mesg) -{ - openlock_setting_appdata *openlock_setting_data = - (openlock_setting_appdata *) data; - openlock_ug_data *openlock_data = NULL; - Evas_Object *popup = NULL; - - if (!openlock_setting_data) { - return; - } - openlock_data = openlock_setting_data->openlock_data; - if (!openlock_data) { - return; - } - - OPENLOCKS_DBG("_openlock_setting_pw_show_popup\n"); - - _openlock_setting_pw_imf_context_input_panel_hide - (openlock_setting_data); - popup = elm_popup_add(openlock_data->win_main); - openlock_setting_data->popup = popup; - evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - elm_object_text_set(popup, mesg); - elm_popup_timeout_set(popup, 3); - evas_object_smart_callback_add(popup, "timeout", - _openlock_setting_pw_destroy_popup_cb, - openlock_setting_data); - evas_object_show(popup); -} - -static void _openlock_setting_pw_set_str(char **s, const char *str) -{ - if (s == NULL) - return; - - if (*s) - free(*s); - - if (str && str[0] != '\0') - *s = strdup(str); - else - *s = NULL; -} - -static void _openlock_setting_pw_done_cb(void *data, Evas_Object * obj, void *e) -{ - openlock_setting_appdata *openlock_setting_data = - (openlock_setting_appdata *) data; - openlock_ug_data *openlock_data = NULL; - Evas_Object *entry = NULL; - Evas_Object *editfield_layout = NULL; - char *str = NULL; - - if (!openlock_setting_data) { - return; - } - - OPENLOCKS_DBG("_openlock_setting_pw_done_cb\n"); - editfield_layout = openlock_setting_data->editfield_layout; - entry = - _openlock_setting_pw_editfield_entry_get - (openlock_setting_data->editfield_layout); - - _openlock_setting_pw_set_str(&str, elm_entry_entry_get(entry)); - OPENLOCKS_DBG("str = %s\n", str); - if (!str) { - _openlock_setting_pw_show_popup(openlock_setting_data, "Wrong Password!"); /* hard code for demo */ - if (entry) { - elm_object_part_text_set(editfield_layout, - "elm.guidetext", ""); - elm_entry_entry_set(entry, ""); - } - } else { - if (strcmp(str, "16777216") == 0) { /* hard code for demo */ - OPENLOCKS_DBG("right pw\n"); - OPENLOCKS_DBG("openlock_setting_data->index: %d", - openlock_setting_data->index); - if (openlock_setting_data != NULL - && openlock_setting_data->pkg_name != NULL) { - vconf_set_str(VCONF_PRIVATE_LOCKSCREEN_PKGNAME, - openlock_setting_data->pkg_name); - OPENLOCKS_DBG("vconf pkgname set : %s", - openlock_setting_data->pkg_name); - } - openlock_data = openlock_setting_data->openlock_data; - if (!openlock_data) { - return; - } - OPENLOCKS_DBG("_openlock_setting_pw_done_cb\n"); - openlock_setting_data->count = 0; /* reset the count */ - - elm_naviframe_item_pop(openlock_data->navi_bar); - if (openlock_setting_data->editfield_layout) { - evas_object_del - (openlock_setting_data->editfield_layout); - openlock_setting_data->editfield_layout = NULL; - } - if (openlock_setting_data->genlist) { - evas_object_del(openlock_setting_data->genlist); - openlock_setting_data->genlist = NULL; - } - if (openlock_setting_data->ly) { - evas_object_del(openlock_setting_data->ly); - openlock_setting_data->ly = NULL; - } - } else { - _openlock_setting_pw_show_popup(openlock_setting_data, "Wrong Password!"); /* hard code for demo */ - if (entry) { - elm_object_part_text_set(editfield_layout, - "elm.guidetext", ""); - elm_entry_entry_set(entry, ""); - } - } - } -} - -void -openlock_setting_pw_create_view(openlock_setting_appdata * - openlock_setting_data) -{ - Evas_Object *navi_bar = NULL; - Evas_Object *win_main = NULL; - Evas_Object *genlist = NULL; - Evas_Object *ly = NULL; - Evas_Object *cancel_button = NULL; - Evas_Object *back_button = NULL; - Elm_Object_Item *genlist_item = NULL; - Elm_Object_Item *navi_it = NULL; - openlock_ug_data *openlock_data = NULL; - - if (!openlock_setting_data) { - return; - } - - openlock_data = openlock_setting_data->openlock_data; - if (!openlock_data) { - return; - } - - OPENLOCKS_DBG("openlock_setting_pw_create_view begin\n"); - - win_main = openlock_data->win_main; - navi_bar = openlock_data->navi_bar; - - ly = _openlock_setting_pw_create_conformant(win_main); - openlock_setting_data->ly = ly; - - /* genlist */ - genlist = elm_genlist_add(navi_bar); - _openlock_setting_pw_list_set_styles(); - genlist_item = - elm_genlist_item_append(genlist, &itc_label, - (void *)openlock_setting_data, NULL, - ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_select_mode_set(genlist_item, EINA_TRUE); - - genlist_item = - elm_genlist_item_append(genlist, &itc_entry, - (void *)openlock_setting_data, NULL, - ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_select_mode_set(genlist_item, EINA_TRUE); - - evas_object_show(genlist); - elm_object_content_set(ly, genlist); - openlock_setting_data->genlist = genlist; - - /* Done button */ - done_button = elm_button_add(navi_bar); - elm_object_style_set(done_button, "naviframe/title/default"); - elm_object_text_set(done_button, "Done"); /* hard code for demo */ - elm_object_disabled_set(done_button, EINA_TRUE); - evas_object_smart_callback_add(done_button, "clicked", - _openlock_setting_pw_done_cb, - openlock_setting_data); - - /* Cancel button */ - cancel_button = elm_button_add(navi_bar); - elm_object_style_set(cancel_button, "naviframe/title/default"); - elm_object_text_set(cancel_button, "Cancel"); /* hard code for demo */ - elm_object_disabled_set(cancel_button, EINA_FALSE); - evas_object_smart_callback_add(cancel_button, "clicked", - _openlock_setting_pw_back_cb, openlock_setting_data); - - /* Set navigation objects and push */ - navi_it = elm_naviframe_item_push(navi_bar, "Enter Password", NULL, NULL, - ly, NULL); /* hard code for demo */ - elm_object_item_part_content_set(navi_it, "title_right_btn", done_button); - elm_object_item_part_content_set(navi_it, "title_left_btn", cancel_button); - - /* Remove <- button */ - back_button = elm_object_item_part_content_get(navi_it, "prev_btn"); - if (back_button != NULL) { - elm_object_item_part_content_set(navi_it, "prev_btn", NULL); - if (back_button != NULL) { - evas_object_del(back_button); - } - } -} diff --git a/lock-setting/lockapp-setting/src/openlock-setting-util.c b/lock-setting/lockapp-setting/src/openlock-setting-util.c deleted file mode 100755 index 3722b2b..0000000 --- a/lock-setting/lockapp-setting/src/openlock-setting-util.c +++ /dev/null @@ -1,65 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#include "openlock-setting-debug.h" -#include "openlock-setting-util.h" - -Evas_Object *openlock_setting_util_create_navigation(Evas_Object * parent) -{ - Evas_Object *navi_bar = NULL; - - if (parent == NULL) { - OPENLOCKS_WARN("Parent is null."); - return NULL; - } - - navi_bar = elm_naviframe_add(parent); - if (navi_bar == NULL) { - OPENLOCKS_ERR("Cannot add naviagtionbar."); - return NULL; - } - - elm_object_part_content_set(parent, "elm.swallow.content", navi_bar); - - evas_object_show(navi_bar); - - return navi_bar; -} - -Evas_Object *openlock_setting_util_create_layout(Evas_Object * parent) -{ - Evas_Object *layout = NULL; - - if (parent == NULL) { - OPENLOCKS_WARN("Parent is null."); - return NULL; - } - - layout = elm_layout_add(parent); - if (layout == NULL) { - OPENLOCKS_ERR("Cannot add layout."); - return NULL; - } - - evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - - evas_object_show(layout); - - return layout; -} diff --git a/lock-setting/lockapp-setting/src/openlock-setting.c b/lock-setting/lockapp-setting/src/openlock-setting.c deleted file mode 100755 index 4b6184a..0000000 --- a/lock-setting/lockapp-setting/src/openlock-setting.c +++ /dev/null @@ -1,217 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#ifndef UG_MODULE_API -#define UG_MODULE_API __attribute__ ((visibility("default"))) -#endif - -#include -#include - -#include "openlock-setting.h" -#include "openlock-setting-util.h" -#include "openlock-setting-main.h" - -static Evas_Object *create_bg(Evas_Object * parent) -{ - Evas_Object *bg = elm_bg_add(parent); - - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - elm_object_style_set(bg, "group_list"); - - elm_object_part_content_set(parent, "elm.swallow.bg", bg); - evas_object_show(bg); - - return bg; -} - -static Evas_Object *create_fullview(Evas_Object * parent, - openlock_ug_data * openlock_data) -{ - Evas_Object *base = NULL; - Evas_Object *navi_bar = NULL; - Evas_Object *bg = NULL; - - base = openlock_setting_util_create_layout(parent); - - elm_layout_theme_set(base, "layout", "application", "default"); - elm_win_resize_object_add(parent, base); - elm_win_indicator_mode_set(parent, ELM_WIN_INDICATOR_SHOW); - - bg = create_bg(base); - - navi_bar = openlock_setting_util_create_navigation(base); - openlock_data->navi_bar = navi_bar; - - openlock_setting_main_create_view(openlock_data); - - return base; -} - -static Evas_Object *create_frameview(Evas_Object * parent, - openlock_ug_data * openlock_data) -{ - Evas_Object *base = NULL; - - /* Create Frame view */ - - return base; -} - -static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, - void *priv) -{ - Evas_Object *parent = NULL; - Evas_Object *win_main = NULL; - openlock_ug_data *openlock_data = NULL; - - if (!ug || !priv) - return NULL; - - bindtextdomain("openlock-setting", "/opt/ug/res/locale"); - - openlock_data = priv; - openlock_data->ug = ug; - - parent = ug_get_parent_layout(ug); - if (!parent) - return NULL; - - win_main = ug_get_window(); - if (!win_main) { - return NULL; - } - - openlock_data->win_main = win_main; - - if (mode == UG_MODE_FULLVIEW) - openlock_data->base = create_fullview(parent, openlock_data); - else - openlock_data->base = create_frameview(parent, openlock_data); - - /* Add del callback for base layout */ - - return openlock_data->base; -} - -static void on_start(ui_gadget_h ug, service_h service, void *priv) -{ -} - -static void on_pause(ui_gadget_h ug, service_h service, void *priv) -{ - -} - -static void on_resume(ui_gadget_h ug, service_h service, void *priv) -{ - -} - -static void on_destroy(ui_gadget_h ug, service_h service, void *priv) -{ - openlock_ug_data *openlock_data; - - if (!ug || !priv) - return; - - openlock_data = priv; - evas_object_del(openlock_data->base); - openlock_data->base = NULL; -} - -static void on_message(ui_gadget_h ug, service_h msg, service_h service, - void *priv) -{ -} - -static void on_event(ui_gadget_h ug, enum ug_event event, service_h 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) -{ - if (!ug) - return; - - switch (event) { - case UG_KEY_EVENT_END: - ug_destroy_me(ug); - break; - default: - break; - } -} - -UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops) -{ - openlock_ug_data *openlock_data; - - if (!ops) - return -1; - - openlock_data = calloc(1, sizeof(openlock_ug_data)); - if (!openlock_data) - return -1; - - ops->create = on_create; - ops->start = on_start; - ops->pause = on_pause; - ops->resume = on_resume; - ops->destroy = on_destroy; - ops->message = on_message; - ops->event = on_event; - ops->key_event = on_key_event; - ops->priv = openlock_data; - ops->opt = UG_OPT_INDICATOR_ENABLE; - - return 0; -} - -UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops) -{ - openlock_ug_data *openlock_data; - - if (!ops) - return; - - openlock_data = ops->priv; - if (openlock_data) - free(openlock_data); -} diff --git a/lock-setting/lockscreen-options/CMakeLists.txt b/lock-setting/lockscreen-options/CMakeLists.txt index e4789c1..09dde8d 100755 --- a/lock-setting/lockscreen-options/CMakeLists.txt +++ b/lock-setting/lockscreen-options/CMakeLists.txt @@ -15,10 +15,6 @@ SET(SRCS ./src/lockscreen-options.c ./src/lockscreen-options-util.c ./src/lockscreen-options-main.c - ./src/lockscreen-options-shortcuts.c - ./src/lockscreen-options-shortcuts-edit.c - ./src/lockscreen-options-dualclock.c - ./src/lockscreen-options-locktitle.c ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) @@ -37,18 +33,8 @@ SET(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS}) ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") -ADD_CUSTOM_TARGET(lockscreen-options.edj COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/res/images - ${CMAKE_CURRENT_SOURCE_DIR}/res/edje/lockscreen-options.edc - ${CMAKE_CURRENT_BINARY_DIR}/lockscreen-options.edj - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/edje/lockscreen-options.edc -) - ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_lock-screen-options_LDFLAGS}) -ADD_DEPENDENCIES(${PROJECT_NAME} lockscreen-options.edj) - INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR}) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lockscreen-options.edj DESTINATION ${EDJEDIR}/ug-lockscreen-options-efl) -INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/images/ DESTINATION ${IMAGEDIR}/ug-lockscreen-options-efl) diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-debug.h b/lock-setting/lockscreen-options/include/lockscreen-options-debug.h index a25f85e..750a759 100755 --- a/lock-setting/lockscreen-options/include/lockscreen-options-debug.h +++ b/lock-setting/lockscreen-options/include/lockscreen-options-debug.h @@ -36,7 +36,7 @@ #define LOCKOPTIONS_DBG(fmt, args...) do{printf("[LOCKOPTIONS_DBG][%s(%d)] "fmt " \n", __FILE__, __LINE__, ##args);}while(0); #define LOCKOPTIONS_WARN(fmt, args...) do{printf("[LOCKOPTIONS_WARN][%s(%d)] "fmt " \n", __FILE__, __LINE__, ##args);}while(0); #define LOCKOPTIONS_ERR(fmt, args...) do{printf("[LOCKOPTIONS_ERR][%s(%d)] "fmt " \n", __FILE__, __LINE__, ##args);}while(0); -#endif /* LOCKD_USING_PLATFORM_DEBUG */ +#endif #ifndef TRUE #define TRUE 1 @@ -45,4 +45,4 @@ #define FALSE 0 #endif -#endif /* __OPENLOCK_SETTING_DEBUG_H__ */ +#endif diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-dualclock.h b/lock-setting/lockscreen-options/include/lockscreen-options-dualclock.h deleted file mode 100755 index 84447f7..0000000 --- a/lock-setting/lockscreen-options/include/lockscreen-options-dualclock.h +++ /dev/null @@ -1,28 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#ifndef __LOCKSCREEN_OPTIONS_DUALCLOCK_H__ -#define __LOCKSCREEN_OPTIONS_DUALCLOCK_H__ - -#include -#include "lockscreen-options.h" - -void lockscreen_options_dualclock_create_view(lockscreen_options_ug_data * ug_data); - -#endif /* __OPENLOCK_SETTING_MAIN_H__ */ - diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-locktitle.h b/lock-setting/lockscreen-options/include/lockscreen-options-locktitle.h deleted file mode 100755 index 28f1910..0000000 --- a/lock-setting/lockscreen-options/include/lockscreen-options-locktitle.h +++ /dev/null @@ -1,26 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#ifndef __LOCKSCREEN_OPTIONS_LOCKTITLE_H__ -#define __LOCKSCREEN_OPTIONS_LOCKTITLE_H__ - -#include "lockscreen-options.h" - -void lockscreen_options_locktitle_create_view(lockscreen_options_ug_data * ug_data); - -#endif /* __LOCKSCREEN_OPTIONS_LOCKTITLE_H__ */ diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-main.h b/lock-setting/lockscreen-options/include/lockscreen-options-main.h index a1c0c49..a57e586 100755 --- a/lock-setting/lockscreen-options/include/lockscreen-options-main.h +++ b/lock-setting/lockscreen-options/include/lockscreen-options-main.h @@ -25,4 +25,4 @@ void lockscreen_options_main_create_view(lockscreen_options_ug_data * ug_data); void lockscreen_options_main_update_view(); -#endif /* __OPENLOCK_SETTING_MAIN_H__ */ +#endif diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-shortcuts-edit.h b/lock-setting/lockscreen-options/include/lockscreen-options-shortcuts-edit.h deleted file mode 100755 index 497b8cc..0000000 --- a/lock-setting/lockscreen-options/include/lockscreen-options-shortcuts-edit.h +++ /dev/null @@ -1,25 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#ifndef __LOCKSCREEN_OPTIONS_SHORTCUTS_EDIT_H__ -#define __LOCKSCREEN_OPTIONS_SHORTCUTS_EDIT_H__ - -void lockscreen_options_shortcuts_create_edit_view(void *data); - -#endif /* __LOCKSCREEN_OPTIONS_SHORTCUTS_EDIT_H__ */ - diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-shortcuts.h b/lock-setting/lockscreen-options/include/lockscreen-options-shortcuts.h deleted file mode 100755 index f7e6d22..0000000 --- a/lock-setting/lockscreen-options/include/lockscreen-options-shortcuts.h +++ /dev/null @@ -1,26 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#ifndef __LOCKSCREEN_OPTIONS_SHORTCUTS_H__ -#define __LOCKSCREEN_OPTIONS_SHORTCUTS_H__ - -void lockscreen_options_shortcuts_create_view(void *data); -void lockscreen_options_shortcuts_update_view(); -Eina_Bool lockscreen_options_shortcuts_check_items(); - -#endif /* __LOCKSCREEN_OPTIONS_SHORTCUTS_H__ */ diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-util.h b/lock-setting/lockscreen-options/include/lockscreen-options-util.h index 0fb97bb..0a7a962 100755 --- a/lock-setting/lockscreen-options/include/lockscreen-options-util.h +++ b/lock-setting/lockscreen-options/include/lockscreen-options-util.h @@ -21,8 +21,6 @@ #include -#define USE_TITLE_AND_CAMERA 0 - enum { IDS_COM_SK_OK = 0, IDS_COM_SK_CANCEL, @@ -30,35 +28,13 @@ enum { }; enum { - IDS_LOCKSCREEN_OPTIONS_SHORTCUTS = - IDS_LOCKSCREEN_OPTIONS_SYSTEM_STRING_MAX, - IDS_LOCKSCREEN_OPTIONS_SHORTCUTS_HELP, -#if USE_TITLE_AND_CAMERA - IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE, - IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE_HELP, -#endif - IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS, + IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS = + IDS_LOCKSCREEN_OPTIONS_SYSTEM_STRING_MAX, IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS_HELP, - IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI, - IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI_HELP, -#if USE_TITLE_AND_CAMERA - IDS_LOCKSCREEN_OPTIONS_CAMERA_QUICK_ACCESS, - IDS_LOCKSCREEN_OPTIONS_CAMERA_QUICK_ACCESS_HELP, -#endif IDS_LOCKSCREEN_OPTIONS_CLOCK, -// IDS_LOCKSCREEN_OPTIONS_DUAL_CLOCK, -// IDS_LOCKSCREEN_OPTIONS_DUAL_CLOCK_HELP, - IDS_LOCKSCREEN_OPTIONS_WEATHER, IDS_LOCKSCREEN_OPTIONS_HELPTEXT, IDS_LOCKSCREEN_OPTIONS_HELPTEXT_HELP, - IDS_LOCKSCREEN_OPTIONS_SET_SHORTCUTS, - IDS_LOCKSCREEN_OPTIONS_EDIT_SHORTCUTS, - IDS_LOCKSCREEN_OPTIONS_SET_SHORTCUTS_ON_LOCKSCREEN, - IDS_LOCKSCREEN_OPTIONS_TAP_SHORTCUTS, - IDS_LOCKSCREEN_OPTIONS_DRAG_DROP_SHORTCUTS, - IDS_LOCKSCREEN_OPTIONS_SELECT_APPLICATIONS, - IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE_GUIDE_TEXT, - IDS_LOCKSCREEN_OPTIONS_APP_STRING_MAX, /* 45 */ + IDS_LOCKSCREEN_OPTIONS_APP_STRING_MAX, }; Evas_Object *lockscreen_options_util_create_navigation(Evas_Object * parent); @@ -69,4 +45,4 @@ void lockscreen_options_util_create_seperator(Evas_Object * genlist); void lockscreen_options_util_create_underline(Evas_Object * genlist); char *lockscreen_optoins_get_string(int id); -#endif /* __OPENLOCK_SETTING_UTIL_H__ */ +#endif diff --git a/lock-setting/lockscreen-options/include/lockscreen-options.h b/lock-setting/lockscreen-options/include/lockscreen-options.h index 2820560..7b24faa 100755 --- a/lock-setting/lockscreen-options/include/lockscreen-options.h +++ b/lock-setting/lockscreen-options/include/lockscreen-options.h @@ -61,4 +61,4 @@ typedef struct _lockscreen_options_ug_data { } lockscreen_options_ug_data; -#endif /* __lockscreen_options_H__ */ +#endif diff --git a/lock-setting/lockscreen-options/res/edje/lockscreen-options-locktitle.edc b/lock-setting/lockscreen-options/res/edje/lockscreen-options-locktitle.edc deleted file mode 100755 index eced5a4..0000000 --- a/lock-setting/lockscreen-options/res/edje/lockscreen-options-locktitle.edc +++ /dev/null @@ -1,432 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#define WIDTH 720 -#define HEIGHT 1280 -#define TOOLBAR_WIDTH 720 -#define TOOLBAR_HEIGHT 84 - -#define BUTTON_BG_NORMAL_OR_PRESS(part_name, rel1_x, rel1_y, rel2_x, rel2_y, normal_icon_name, press_icon_name)\ - part{\ - name: part_name;\ - type: IMAGE;\ - mouse_events: 1;\ - scale: 1;\ - description{\ - state: "default" 0.0;\ - visible: 1;\ - rel1 {relative: rel1_x rel1_y; to: "bg";}\ - rel2 {relative: rel2_x rel2_y; to: "bg";}\ - image.normal: normal_icon_name;\ - image.border: 8 8 0 0;\ - }\ - description{\ - state: "press" 0.0;\ - inherit: "default" 0.0;\ - image.normal: press_icon_name;\ - image.border: 8 8 0 0;\ - }\ - } - -#define BUTTON_NORMAL_OR_PRESS(part_name, normal_icon_name, press_icon_name, part_bg_name)\ - part{\ - name: part_name;\ - type: IMAGE;\ - scale: 1;\ - mouse_events: 1;\ - repeat_events: 1;\ - description{\ - state: "default" 0.0;\ - visible: 1;\ - rel1 {relative: 0.0 0.0; to: part_bg_name;}\ - rel2 {relative: 1.0 1.0; to: part_bg_name;}\ - image.normal: normal_icon_name;\ - }\ - description{\ - state: "press" 0.0;\ - inherit: "default" 0.0;\ - image.normal: press_icon_name;\ - }\ - } -#define TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_1(part_name, singal_name)\ - program{\ - name: "mouse_down_"part_name;\ - signal: "mouse,down,1";\ - source: part_name;\ - action: STATE_SET "press" 0.0;\ - target: part_name;\ - }\ - program{\ - name: "send_event_"part_name;\ - signal: "mouse,clicked,1";\ - source: part_name;\ - action: SIGNAL_EMIT singal_name "";\ - }\ - program{\ - name: "mouse_up_"part_name;\ - signal: "mouse,up,1";\ - source: part_name;\ - action: STATE_SET "default" 0.0;\ - target: part_name;\ - } -#define TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_2(part_name, singal_name)\ - program{\ - name: "send_event_"part_name;\ - signal: "mouse,clicked,1";\ - source: part_name;\ - action: SIGNAL_EMIT singal_name "";\ - } -#define COLOR_RECT(part_name, relative_part_name, color_class_name)\ - part{\ - name: part_name;\ - type: RECT;\ - scale: 1;\ - description{\ - state: "default" 0.0;\ - rel1 { relative: 9/56 40/60; to: relative_part_name;}\ - rel2 { relative: 49/56 50/60; to: relative_part_name;}\ - color_class: color_class_name;\ - }\ - } - -group{ - images{ - image: "B09_Add Text_sip_option_bg.png" COMP; - } - name: "lockscreen.options.locktitle.main"; - parts{ - part{ - name: "background"; - type: RECT; - scale: 1; - description{ - state: "default" 0.0; - visible: 0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - } - } - part{ - name: "elm.swallow.content"; /* editfield */ - type: SWALLOW; - scale: 1; - description{ - state: "default" 0.0; - min: 0 108; - align: 0.0 0.0; - rel1 { relative: 0.0 0.15; to: "background";} - rel2 { relative: 1.0 0.15; to: "background";} - } - } - part{ - name: "toolbar.bg"; - type: IMAGE; - scale: 1; - description{ - state: "default" 0.0; - min: 0 100; - align: 0.0 1.0; - visible: 0; - rel1 { relative: 0.0 1.0; to: "background";} - rel2 { relative: 1.0 1.0; to: "background";} - image.normal: "B09_Add Text_sip_option_bg.png"; - image.border: 8 8 8 8; - } - } - part{ - name: "elm.swallow.toolbar";/* toolbar layout */ - type: SWALLOW; - scale: 1; - description{ - state: "default" 0.0; - visible: 0; - rel1 { relative: 0.0 0.0; to: "toolbar.bg";} - rel2 { relative: 1.0 1.0; to: "toolbar.bg";} - } - } - part{ - name: "elm.swallow.selector";/* font and color selector layout */ - type: SWALLOW; - scale: 1; - description{ - state: "default" 0.0; - visible: 1; - rel1 { relative: 0.0 1.0; to: "toolbar.bg";} - rel2 { relative: 1.0 1.0; to: "background";} - } - } - } - script { - public message(Msg_Type:type, id, ...) { - custom_state(PART:"toolbar.bg", "default", 0.0); - custom_state(PART:"elm.swallow.toolbar", "default", 0.0); - if ((type == MSG_FLOAT) && (id == 1)) { - new Float:rel2_y = Float:getarg(2); - set_state_val(PART:"toolbar.bg", STATE_REL1, 0.0, rel2_y); - set_state_val(PART:"toolbar.bg", STATE_REL2, 1.0, rel2_y); - } - if ((type == MSG_FLOAT) && (id == 2)) { - set_state_val(PART:"toolbar.bg", STATE_VISIBLE, 1); - set_state_val(PART:"elm.swallow.toolbar", STATE_VISIBLE, 1); - } - if ((type == MSG_FLOAT) && (id == 3)) { - set_state_val(PART:"toolbar.bg", STATE_VISIBLE, 0); - set_state_val(PART:"elm.swallow.toolbar", STATE_VISIBLE, 0); - } - set_state(PART:"toolbar.bg", "custom", 0.0); - set_state(PART:"elm.swallow.toolbar", "custom", 0.0); - } - } -} - -group{ - images{ - image: "B09_key_btn_01.png" COMP; - image: "B09_key_btn_press.png" COMP; - image: "B09_Add Text_sip_option_bold.png" COMP; - image: "B09_Add Text_sip_option_Italic.png" COMP; - image: "B09_Add Text_sip_option_underline.png" COMP; - image: "B09_Add Text_sip_option_color.png" COMP; - image: "B09_Add Text_sip_option_style.png" COMP; - image: "B09_Add Text_sip_option_size.png" COMP; - } - name: "lockscreen.options.locktitle.toolbar"; - parts{ - part{ - name: "bg"; - type: RECT; - scale: 1; - description{ - state: "default" 0.0; - visible: 0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - } - } - part{ - name: "font.bg"; - type: IMAGE; - mouse_events: 1; - scale: 1; - description{ - state: "default" 0.0; - visible: 1; - rel1 {relative: 8/TOOLBAR_WIDTH 12/TOOLBAR_HEIGHT; to: "bg";} - rel2 {relative: 144/TOOLBAR_WIDTH 76/TOOLBAR_HEIGHT; to: "bg";} - image.normal: "B09_key_btn_01.png"; - image.border: 5 5 0 0; - } - description{ - state: "press" 0.0; - inherit: "default" 0.0; - image.normal: "B09_key_btn_press.png"; - image.border: 5 5 0 0; - } - } - part{ - name: "font"; - type: IMAGE; - scale: 1; - mouse_events: 1; - repeat_events: 1; - description{ - state: "default" 0.0; - visible: 1; - rel1 {relative: 0.0 0.0; to: font.bg;} - rel2 {relative: 1.0 1.0; to: font.bg;} - image.normal: "B09_Add Text_sip_option_style.png"; - } - description{ - state: "press" 0.0; - inherit: "default" 0.0; - image.normal: "B09_Add Text_sip_option_style.png"; - } - } - part{ - name: "size.bg"; - type: IMAGE; - mouse_events: 1; - scale: 1; - description{ - state: "default" 0.0; - visible: 1; - rel1 {relative: 160/TOOLBAR_WIDTH 12/TOOLBAR_HEIGHT; to: "bg";} - rel2 {relative: 240/TOOLBAR_WIDTH 76/TOOLBAR_HEIGHT; to: "bg";} - image.normal: B09_key_btn_01.png; - image.border: 5 5 0 0; - } - description{ - state: "press" 0.0; - inherit: "default" 0.0; - image.normal: "B09_key_btn_press.png"; - image.border: 5 5 0 0; - } - } - part{ - name: "size"; - type: IMAGE; - scale: 1; - mouse_events: 1; - repeat_events: 1; - description{ - state: "default" 0.0; - visible: 1; - rel1 {relative: 0.0 0.0; to: size.bg;} - rel2 {relative: 1.0 1.0; to: size.bg;} - image.normal: "B09_Add Text_sip_option_size.png"; - } - description{ - state: "press" 0.0; - inherit: "default" 0.0; - image.normal: "B09_Add Text_sip_option_size.png"; - } - } - part{ - name: "draw.bg"; - type: IMAGE; - mouse_events: 1; - scale: 1; - description{ - state: "default" 0.0; - visible: 1; - rel1 {relative: 256/TOOLBAR_WIDTH 12/TOOLBAR_HEIGHT; to: "bg";} - rel2 {relative: 336/TOOLBAR_WIDTH 76/TOOLBAR_HEIGHT; to: "bg";} - image.normal: B09_key_btn_01.png; - image.border: 5 5 0 0; - } - description{ - state: "press" 0.0; - inherit: "default" 0.0; - image.normal: "B09_key_btn_press.png"; - image.border: 5 5 0 0; - } - } - part{ - name: "draw"; - type: IMAGE; - scale: 1; - mouse_events: 1; - repeat_events: 1; - description{ - state: "default" 0.0; - visible: 1; - rel1 {relative: 0.0 0.0; to: draw.bg;} - rel2 {relative: 1.0 1.0; to: draw.bg;} - image.normal: "B09_Add Text_sip_option_color.png"; - } - description{ - state: "press" 0.0; - inherit: "default" 0.0; - image.normal: "B09_Add Text_sip_option_color.png"; - } - } - COLOR_RECT("draw_indictor", "draw", "draw_indictor"); - - BUTTON_BG_NORMAL_OR_PRESS("text.bold.bg", 440/TOOLBAR_WIDTH, 12/TOOLBAR_HEIGHT, - 520/TOOLBAR_WIDTH, 76/TOOLBAR_HEIGHT, "B09_key_btn_01.png", - "B09_key_btn_press.png"); - BUTTON_NORMAL_OR_PRESS("text.bold","B09_Add Text_sip_option_bold.png", "B09_Add Text_sip_option_bold.png", "text.bold.bg"); - BUTTON_BG_NORMAL_OR_PRESS("text.italic.bg", 536/TOOLBAR_WIDTH, 12/TOOLBAR_HEIGHT, - 616/TOOLBAR_WIDTH, 76/TOOLBAR_HEIGHT, "B09_key_btn_01.png", - "B09_key_btn_press.png"); - BUTTON_NORMAL_OR_PRESS("text.italic","B09_Add Text_sip_option_Italic.png", "B09_Add Text_sip_option_Italic.png", "text.italic.bg"); - BUTTON_BG_NORMAL_OR_PRESS("text.underline.bg", 632/TOOLBAR_WIDTH, 12/TOOLBAR_HEIGHT, - 712/TOOLBAR_WIDTH, 76/TOOLBAR_HEIGHT, "B09_key_btn_01.png", - "B09_key_btn_press.png"); - BUTTON_NORMAL_OR_PRESS("text.underline","B09_Add Text_sip_option_underline.png", "B09_Add Text_sip_option_underline.png", "text.underline.bg"); - } - script { - public message(Msg_Type:type, id, ...) { - if ((type == MSG_INT) && (id == 1)) { - new text_mode = getarg(2); - new btnState[128]; - new Float:x; - - if (text_mode == 1) { - //Bold - get_state(PART:"text.bold.bg", btnState, 128, x); - if (strcmp(btnState, "press") == 0) { - set_state(PART:"text.bold.bg", "default", 0.0); - } else { - set_state(PART:"text.bold.bg", "press", 0.0); - } - } else if (text_mode == 2) { - //italic - get_state(PART:"text.italic.bg", btnState, 128, x); - if (strcmp(btnState, "press") == 0) { - set_state(PART:"text.italic.bg", "default", 0.0); - } else { - set_state(PART:"text.italic.bg", "press", 0.0); - } - } else if (text_mode == 3) { - //font_underline - get_state(PART:"text.underline.bg", btnState, 128, x); - if (strcmp(btnState, "press") == 0) { - set_state(PART:"text.underline.bg", "default", 0.0); - } else { - set_state(PART:"text.underline.bg", "press", 0.0); - } - } - } - } - } - programs{ - TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_1("font.bg", "dropdown.fonttype.clicked"); - TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_1("size.bg", "size.button.clicked"); - TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_1("draw.bg", "draw.button.clicked"); - TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_2("text.bold.bg", "text.bold.clicked"); - TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_2("text.italic.bg", "text.italic.clicked"); - TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_2("text.underline.bg", "text.underline.clicked"); - } -} - -group { - name: "lockscreen.options.locktitle.colorselector"; - parts{ - part { - name: "bg"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - visible: 0; - } - } - part { - name: "rect"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - min: 0 109; - rel1 { relative: 0.0 0.0; to: "bg"; offset: 83 83;} - rel2 { relative: 1.0 0.0; to: "bg"; offset: -83 83;} - } - } - part { - name: "color"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; to_x: "bg"; to_y:"rect"; offset: 0 20;} - rel2 { relative: 1.0 1.0; to: "bg"; offset: 0 -20;} - } - } - } -} diff --git a/lock-setting/lockscreen-options/res/edje/lockscreen-options-shortcuts.edc b/lock-setting/lockscreen-options/res/edje/lockscreen-options-shortcuts.edc deleted file mode 100755 index 1f3d3ae..0000000 --- a/lock-setting/lockscreen-options/res/edje/lockscreen-options-shortcuts.edc +++ /dev/null @@ -1,116 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - - group{ - name: "lockscreen.options.shortcuts.main"; - parts{ - part{ - name: "background"; - type: RECT; - scale: 1; - description{ - state: "default" 0.0; - visible: 0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - } - } - part{ - name: "shortcuts.help.title"; - type: SWALLOW; - scale: 1; - description{ - state: "default" 0.0; - align: 0.5 0.0; - min: 0 40; - rel1 { relative: 0.0 0.08; to: "background"; } - rel2 { relative: 1.0 0.08; to: "background"; } - } - } - part{ - name: "blank.rect1"; - type: RECT; - scale: 1; - description{ - state: "default" 0.0; - visible: 0; - min: 0 40; - rel1 { relative: 0.0 1.0; to: "shortcuts.help.title"; } - rel2 { relative: 1.0 1.0; to: "shortcuts.help.title"; } - } - } - part{ - name: "shortcuts.help.contents"; - type: SWALLOW; - scale: 1; - description{ - state: "default" 0.0; - align: 0.5 0.0; - min: 0 80; - rel1 { relative: 0.0 1.0; to: "blank.rect1"; } - rel2 { relative: 1.0 1.0; to: "blank.rect1"; } - } - } - part{ - name: "blank.rect2"; - type: RECT; - scale: 1; - description{ - state: "default" 0.0; - visible: 0; - min: 0 100; - rel1 { relative: 0.0 1.0; to: "shortcuts.help.contents"; } - rel2 { relative: 1.0 1.0; to: "shortcuts.help.contents"; } - } - } - part{ - name: "shortcuts.edit.help.title"; - type: SWALLOW; - scale: 1; - description{ - state: "default" 0.0; - align: 0.5 0.0; - min: 0 40; - rel1 { relative: 0.0 0.14; to: "background"; } - rel2 { relative: 1.0 0.14; to: "background"; } - } - } - part{ - name: "blank.rect3"; - type: RECT; - scale: 1; - description{ - state: "default" 0.0; - visible: 0; - min: 0 40; - rel1 { relative: 0.0 1.0; to: "shortcuts.edit.help.title"; } - rel2 { relative: 1.0 1.0; to: "shortcuts.edit.help.title"; } - } - } - part{ - name: "shortcuts.gengrid"; - type: SWALLOW; - scale: 1; - description{ - state: "default" 0.0; - rel1 { relative: 0.0 1.0; to: "blank.rect2"; } - rel2 { relative: 1.0 1.0; to: "background"; } - } - } - } - } diff --git a/lock-setting/lockscreen-options/res/edje/lockscreen-options-thumbnail.edc b/lock-setting/lockscreen-options/res/edje/lockscreen-options-thumbnail.edc deleted file mode 100755 index a3da17f..0000000 --- a/lock-setting/lockscreen-options/res/edje/lockscreen-options-thumbnail.edc +++ /dev/null @@ -1,66 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -group{ - images{ - image: "icon_delete.png" COMP; - image: "icon_delete_press.png" COMP; - } - - name: "lockscreen.options.shortcuts.thumbnail.main"; - parts{ - part{ - name: "background"; - type: RECT; - mouse_events: 1; - scale: 1; - description{ - state: "default" 0.0; - visible: 1; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - color: 0 0 0 0; - } - } - part{ - name: "elm.swallow.contents"; - type: SWALLOW; - repeat_events: 1; - scale: 1; - description{ - state: "default" 0.0; - rel1 {relative: 0.0 0.0; to: "background";} - rel2 {relative: 1.0 1.0; to: "background";} - } - } - part{ - name: "elm.swallow.button"; - type: SWALLOW; - repeat_events: 0; - scale: 1; - description{ - state: "default" 0.0; - fixed: 1 1; - rel1 {relative: 0.0 0.0; to: "background";} - rel2 {relative: 0.45 0.45; to: "background";} - } - } - } - programs{ - } -} diff --git a/lock-setting/lockscreen-options/res/edje/lockscreen-options.edc b/lock-setting/lockscreen-options/res/edje/lockscreen-options.edc deleted file mode 100755 index d0ba457..0000000 --- a/lock-setting/lockscreen-options/res/edje/lockscreen-options.edc +++ /dev/null @@ -1,23 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -collections { - #include "lockscreen-options-shortcuts.edc" - #include "lockscreen-options-thumbnail.edc" - #include "lockscreen-options-locktitle.edc" -} diff --git a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_Italic.png b/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_Italic.png deleted file mode 100755 index ef2092c4b97a72ec9fd4f74cb57e0889acc5913d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3404 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 diff --git a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_bg.png b/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_bg.png deleted file mode 100755 index dcaef91dc87b140cebc8188fc50a44f62d2b2bc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3297 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 VVvlzOfl8!DV4!2FT?ciF{yS$MtG)mL diff --git a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_bold.png b/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_bold.png deleted file mode 100755 index d222f744aca756d4218920c8d33ba3c8e393f49c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3616 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 O01XwL7j;UuVgCVhtkkOj diff --git a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_underline.png b/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_underline.png deleted file mode 100755 index 959467bd7cddcda96f2122716980d0eca045d080..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3476 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 BV=Vvx diff --git a/lock-setting/lockscreen-options/res/images/B09_key_btn_press.png b/lock-setting/lockscreen-options/res/images/B09_key_btn_press.png deleted file mode 100755 index ee2484d684d71a3762ed713aa7f23f387dda2b99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3494 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 U diff --git a/lock-setting/lockscreen-options/res/images/icon_add.png b/lock-setting/lockscreen-options/res/images/icon_add.png deleted file mode 100755 index efa4733c4154c036c6c8cb361edbb4cb3b17c2f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1205 zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q1|(OsS<3+_$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0ztA(?ZiIb6; zg^7u|v!fwQuSMv>2~2MaLa#Yay`ZF!TL84#CABECEH%ZgC_h&L>}9J=+-?Ed zi_0w#y(zfeVv19*KF~4xpom3^XqXT%^?;c0WDDfL6MkwQFtrx}lXZIU(R>C5Momu_ z$B>F!Z*Cd#H5rIBBpSTiU|qo?mOe9P?wq-IY?>#h7bJh;xZ{v6-gn@Ep8A2Lh=uF7 z%;@^>eNV~si}!=A{U&Q(Tg@ms)6~iC(7?dhCslm6;rZi7kL)s!zi&MieqUaE_2V55 z>=Res`OaW&wd8z%#---TG2i7RxR1GrNCI^*v2X||INVb8&AEMcqo)pQ@-;30wzp9$ zjl$PX*~ZOTI-mEpbV~C3U+hPgU%jNL+Mn@A(a%Po)8N|=(e4V7Oe!2q@v zX#YRmfJ<4S`+0Osq)P%%Ckx-VNZrV-(>L*k+lfLii2Dk5eH2Sz$ZIeUoV=3%5vU;X MboFyt=akR{0KVRso&W#< diff --git a/lock-setting/lockscreen-options/res/images/icon_delete.png b/lock-setting/lockscreen-options/res/images/icon_delete.png deleted file mode 100755 index 7145638a5f44c73aa14a628de3bd38e3d8ddd639..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6062 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 diff --git a/lock-setting/lockscreen-options/src/lockscreen-options-dualclock.c b/lock-setting/lockscreen-options/src/lockscreen-options-dualclock.c deleted file mode 100755 index bdd0d2a..0000000 --- a/lock-setting/lockscreen-options/src/lockscreen-options-dualclock.c +++ /dev/null @@ -1,249 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#include -#include -#include -#include -#include - -#include "lockscreen-options.h" -#include "lockscreen-options-debug.h" -#include "lockscreen-options-main.h" -#include "lockscreen-options-util.h" -#include "lockscreen-options-dualclock.h" - -#define CITY_BUF_SIZE 128 -#define GMT_BUF_SIZE 10 - -static char time_zone_str[CITY_BUF_SIZE + GMT_BUF_SIZE + 3]; -static Elm_Object_Item *genlist_item; - - -static Elm_Gen_Item_Class itc_menu_2text; - -static char *_lockscreen_options_dualclock_gl_label_get(void *data, - Evas_Object * obj, - const char *part) -{ - if (part == NULL) - return NULL; - - if ((strcmp(part, "elm.text.1") == 0)){ - return strdup("Set home city"); - } - if((strcmp(part, "elm.text.2") == 0)) { - return strdup(time_zone_str); - } - - return NULL; -} - - -static void _lockscreen_options_dualclock_create_gl_item(Elm_Gen_Item_Class * item) -{ - item->item_style = "dialogue/2text.3"; - item->func.text_get = _lockscreen_options_dualclock_gl_label_get; - item->func.content_get = NULL; - item->func.state_get = NULL; - item->func.del = NULL; -} - -static void _lockscreen_options_update_timezone() -{ - elm_genlist_item_update(genlist_item); -} - -static void _launch_worldclock_layout_ug_cb(ui_gadget_h ug, - enum ug_mode mode, - void *priv) -{ - LOCKOPTIONS_DBG("_launch_worldclock_layout_ug_cb begin.\n"); - lockscreen_options_ug_data *ug_data = (lockscreen_options_ug_data *) priv; - Evas_Object *base; - - if (!priv) - return; - - base = (Evas_Object *) ug_get_layout(ug); - if (!base) - return; - - switch (mode) { - case UG_MODE_FULLVIEW: - evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - elm_win_resize_object_add(ug_data->win_main, base); - evas_object_show(base); - break; - default: - break; - } - LOCKOPTIONS_DBG("_launch_worldclock_layout_ug_cb end.\n"); -} - -static void _launch_worldclock_result_ug_cb(ui_gadget_h ug, - service_h result, void *priv) -{ - LOCKOPTIONS_DBG("_launch_worldclock_result_ug_cb begin.\n"); - if (!priv) - return; - - char *city = NULL; - char *timezone = NULL; - service_get_extra_data(result, "city", &city); - if(city == NULL) return; - service_get_extra_data(result, "timezone", &timezone); - if(timezone == NULL) return; - - snprintf(time_zone_str, CITY_BUF_SIZE + GMT_BUF_SIZE + 2, "%s, GMT %s", _S(city), _(timezone)); - LOCKOPTIONS_DBG("time_zone_str is [%s]", time_zone_str); - _lockscreen_options_update_timezone(); - - free(city); - free(timezone); - city = timezone = NULL; - LOCKOPTIONS_DBG("_launch_worldclock_result_ug_cb end.\n"); -} - -static void _launch_worldclock_destroy_ug_cb(ui_gadget_h ug, - void *priv) -{ - LOCKOPTIONS_DBG("_launch_worldclock_destroy_ug_cb begin.\n"); - - if (!priv) - return; - - if (ug) { - ug_destroy(ug); - } - - LOCKOPTIONS_DBG("_launch_worldclock_destroy_ug_cb end.\n"); -} - -static void _launch_worldclock(void *data) -{ - LOCKOPTIONS_DBG("Launch world clock begin.\n"); - - if(data == NULL){ - LOCKOPTIONS_ERR("The data (ug_data) transferred to _lauch_worldclock is NULL."); - return; - } - - lockscreen_options_ug_data *ug_data = (lockscreen_options_ug_data *) data; - - struct ug_cbs *cbs = (struct ug_cbs *)calloc(1, sizeof(struct ug_cbs)); - if(cbs == NULL) - return; - cbs->layout_cb = _launch_worldclock_layout_ug_cb; - cbs->result_cb = _launch_worldclock_result_ug_cb; - cbs->destroy_cb = _launch_worldclock_destroy_ug_cb; - cbs->priv = (void *)ug_data; - - LOCKOPTIONS_DBG("Launch worldclock-efl begin.\n"); - ui_gadget_h loading=ug_create(ug_data->ug, "worldclock-efl", UG_MODE_FULLVIEW, NULL, cbs); - if (NULL == loading) { - LOCKOPTIONS_ERR("Launch wordclock-efl failed."); - } - - free(cbs); - LOCKOPTIONS_DBG("Launch world clock end.\n"); -} - -static void _lockscreen_options_dualclock_select_cb(void *data, Evas_Object *obj, - void *event_info) -{ - elm_genlist_item_selected_set(genlist_item, EINA_FALSE); - if(data == NULL){ - LOCKOPTIONS_ERR("ug_data is null."); - return; - } - - _launch_worldclock(data); -} - -static void _lockscreen_options_dualclock_back_cb(void *data, Evas_Object * obj, - void *event_info) -{ - lockscreen_options_ug_data *ug_data = - (lockscreen_options_ug_data *) data; - - if (ug_data == NULL){ - LOCKOPTIONS_ERR("ug_data is null."); - return; - } - - Evas_Object *navi_bar = ug_data->navi_bar; - - if (navi_bar == NULL) { - LOCKOPTIONS_ERR("navi_bar is null."); - return; - } - - elm_naviframe_item_pop(navi_bar); -} - -static void _init_time_zone() -{ - snprintf(time_zone_str, CITY_BUF_SIZE + GMT_BUF_SIZE + 2, "%s, GMT %s", _("Nanjing"), _("+8")); -} - - -void lockscreen_options_dualclock_create_view(lockscreen_options_ug_data * ug_data) -{ - LOCKOPTIONS_DBG("lockscreen_options_dualclock_create_view begin\n"); - - Evas_Object *navi_bar = ug_data->navi_bar; - Evas_Object *back_button = NULL; - Evas_Object *genlist = NULL; - - if (navi_bar == NULL) { - LOCKOPTIONS_ERR("navi_bar is null."); - return; - } - - _init_time_zone(); - - genlist = elm_genlist_add(navi_bar); - elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS); - elm_object_style_set(genlist, "dialogue"); - - _lockscreen_options_dualclock_create_gl_item(&itc_menu_2text); - - lockscreen_options_util_create_seperator(genlist); - - - genlist_item = elm_genlist_item_append(genlist, - &itc_menu_2text, - NULL, NULL, - ELM_GENLIST_ITEM_NONE, - _lockscreen_options_dualclock_select_cb, - ug_data); - - - back_button = elm_button_add(navi_bar); - elm_object_style_set(back_button, "naviframe/back_btn/default"); - evas_object_smart_callback_add(back_button, "clicked", - _lockscreen_options_dualclock_back_cb, - ug_data); - - elm_naviframe_item_push(navi_bar, "Dual clock", back_button, NULL, genlist, NULL); -} - - - diff --git a/lock-setting/lockscreen-options/src/lockscreen-options-locktitle.c b/lock-setting/lockscreen-options/src/lockscreen-options-locktitle.c deleted file mode 100755 index 738818a..0000000 --- a/lock-setting/lockscreen-options/src/lockscreen-options-locktitle.c +++ /dev/null @@ -1,535 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#include - -#include "lockscreen-options.h" -#include "lockscreen-options-debug.h" -#include "lockscreen-options-util.h" -#include "lockscreen-options-locktitle.h" - -#define EDJE_DIR "/usr/ug/res/edje/ug-lockscreen-options-efl" - -typedef struct { - unsigned char red; - unsigned char green; - unsigned char blue; - unsigned char reserved; -} options_locktitle_rgb_s; - -typedef struct { - lockscreen_options_ug_data *ug_data; - Evas_Object *layout; - Evas_Object *toolbar; - Evas_Object *entry; - Ecore_IMF_Context *entry_ctx; - Evas_Object *colorselector; - Evas_Object *fontselector; - Evas_Object *font_radio; - - options_locktitle_rgb_s rgb; -} options_locktile_view_s; - -static options_locktile_view_s *options_locktile_view_data = NULL; - -static const fonttype_size = 5; -static const char *fonttype_value[] = { - "Arial", "Courier New", "Roboto", "Tahoma", "Verdana" -}; - -static char *_fonttype_dropdown_text_get(void *data, Evas_Object * obj, const char *part); -static Evas_Object *_fonttype_dropdown_content_get(void *data, Evas_Object * obj, const char *part); -static Evas_Object *_editfield_content_get(void *data, Evas_Object * obj, const char *part); -static void _lockscreen_options_locktitle_font_selector_create(); -static void _lockscreen_options_locktitle_color_selector_create(); - -static Elm_Genlist_Item_Class itc_fontlist_style = { - .item_style = "1text.1icon.2", - .func.text_get = _fonttype_dropdown_text_get, - .func.content_get = _fonttype_dropdown_content_get, -}; - -static Elm_Genlist_Item_Class itc_editfield_style = { - .item_style = "dialogue/1icon", - .func.text_get = NULL, - .func.content_get = _editfield_content_get, -}; - -static char *_fonttype_dropdown_text_get(void *data, Evas_Object * obj, - const char *part) -{ - int index = (int)data; - if (strcmp(part, "elm.text") == 0) { - return strdup(fonttype_value[index]); - } - return NULL; -} - -static Evas_Object *_fonttype_dropdown_content_get(void *data, - Evas_Object * obj, - const char *part) -{ - int index = (int)data; - if (!strcmp(part, "elm.icon")) { - Evas_Object *radio = elm_radio_add(obj); - elm_radio_state_value_set(radio, index); - elm_radio_group_add(radio, options_locktile_view_data->font_radio); - return radio; - } - return NULL; -} - -static void *_fonttype_sel(void *data, Evas_Object * obj, void *event_info) -{ - //select font type -} - -static void _lockscreen_options_locktitle_delete_cb(void *data, Evas * e, - Evas_Object * obj, - void *event_info) -{ - if (options_locktile_view_data) { - free(options_locktile_view_data); - options_locktile_view_data = NULL; - } -} - -static void _lockscreen_options_locktitle_back_cb(void *data, Evas_Object * obj, - void *event_info) -{ - lockscreen_options_ug_data *ug_data = - (lockscreen_options_ug_data *) data; - - if (ug_data == NULL) { - LOCKOPTIONS_ERR("ug_data is null."); - return; - } - - Evas_Object *navi_bar = ug_data->navi_bar; - - if (navi_bar == NULL) { - LOCKOPTIONS_ERR("navi_bar is null."); - return; - } - elm_naviframe_item_pop(navi_bar); -} - -static void _send_int_message_to_edc(Evas_Object * obj, int msgID, int param) -{ - Edje_Message_Int msg; - msg.val = param; - edje_object_message_send(elm_layout_edje_get(obj), - EDJE_MESSAGE_INT, msgID, &msg); -} - -static void _send_float_message_to_edc(Evas_Object * obj, int msgID, float param) -{ - Edje_Message_Float msg; - msg.val = param; - edje_object_message_send(elm_layout_edje_get(obj), - EDJE_MESSAGE_FLOAT, msgID, &msg); -} - -static void _lockscreen_options_locktitle_entry_imf_state_cb(void *data, - Ecore_IMF_Context * - ctx, int value) -{ - static float val = 1.0; - if (value == ECORE_IMF_INPUT_PANEL_STATE_SHOW) { - Evas_Coord keypad_x = 0; - Evas_Coord keypad_y = 0; - Evas_Coord keypad_w = 0; - Evas_Coord keypad_h = 0; - Evas_Coord window_width = 0; - Evas_Coord window_height = 0; - - ecore_x_window_size_get(ecore_x_window_root_first_get(), - &window_width, &window_height); - ecore_imf_context_input_panel_geometry_get(ctx, &keypad_x, - &keypad_y, &keypad_w, - &keypad_h); - val = (float)(keypad_y) / (float)window_height; - /*set the toolbar's location*/ - _send_float_message_to_edc(options_locktile_view_data->layout, 1, val); - /*set toolbar visible*/ - _send_float_message_to_edc(options_locktile_view_data->layout, 2, 0.0); - } else if (value == ECORE_IMF_INPUT_PANEL_STATE_HIDE - &&options_locktile_view_data->colorselector == NULL - &&options_locktile_view_data->fontselector == NULL) { - _send_float_message_to_edc(options_locktile_view_data->layout, 3, 0.0); - }else { - /*set the toolbar's location*/ - _send_float_message_to_edc(options_locktile_view_data->layout, 1, val); - } -} - -static void _lockscreen_options_locktitle_entry_imf_resize_cb(void *data, - Ecore_IMF_Context - * ctx, int value) -{ - Evas_Coord keypad_x = 0; - Evas_Coord keypad_y = 0; - Evas_Coord keypad_w = 0; - Evas_Coord keypad_h = 0; - Evas_Coord window_width = 0; - Evas_Coord window_height = 0; - - ecore_x_window_size_get(ecore_x_window_root_first_get(), &window_width, - &window_height); - ecore_imf_context_input_panel_geometry_get(ctx, &keypad_x, &keypad_y, - &keypad_w, &keypad_h); -} - -/* This callback is for showing(hiding) X marked button.*/ -static void _changed_cb(void *data, Evas_Object *obj, void *event_info) -{ - if (elm_object_focus_get(data)) { - if (elm_entry_is_empty(obj)) { - elm_object_signal_emit(data, "elm,state,eraser,hide", "elm"); - }else { - elm_object_signal_emit(data, "elm,state,eraser,show", "elm"); - } - } -} - -/* Focused callback will show X marked button and hide guidetext.*/ -static void _focused_cb(void *data, Evas_Object *obj, void *event_info) -{ - if (!elm_entry_is_empty(obj)) { - elm_object_signal_emit(data, "elm,state,eraser,show", "elm"); - } - elm_object_signal_emit(data, "elm,state,guidetext,hide", "elm"); -} - -/*Unfocused callback will show guidetext and hide X marked button.*/ -static void _unfocused_cb(void *data, Evas_Object *obj, void *event_info) -{ - if (elm_entry_is_empty(obj)) { - elm_object_signal_emit(data, "elm,state,guidetext,show", "elm"); - } - elm_object_signal_emit(data, "elm,state,eraser,hide", "elm"); -} - -static void _eraser_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source) // When X marked button clicked, make string as empty. -{ - elm_entry_entry_set(data, ""); -} - -static Evas_Object *_lockscreen_options_editfield_create(Evas_Object *parent) -{ - LOCKOPTIONS_DBG("[ == %s == ]", __func__); - Evas_Object *layout = NULL; - Evas_Object *entry = NULL; - - layout = elm_layout_add(parent); - if(layout == NULL) - return NULL; - elm_layout_theme_set(layout, "layout", "editfield", "default"); - evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - - entry = elm_entry_add(parent); - if(entry == NULL) - return NULL; - evas_object_smart_callback_add(entry, "changed", _changed_cb, layout); - evas_object_smart_callback_add(entry, "focused", _focused_cb, layout); - evas_object_smart_callback_add(entry, "unfocused", _unfocused_cb, layout); - - elm_object_part_content_set(layout, "elm.swallow.content", entry); - elm_object_part_text_set(layout, "elm.guidetext", lockscreen_optoins_get_string(IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE_GUIDE_TEXT)); - elm_object_signal_callback_add(layout, "elm,eraser,clicked", "elm", _eraser_clicked_cb, entry); - - options_locktile_view_data->entry = entry; - - Ecore_IMF_Context *entry_ctx = elm_entry_imf_context_get(entry); - if(entry_ctx != NULL) { - ecore_imf_context_input_panel_event_callback_add((Ecore_IMF_Context *) - entry_ctx, - ECORE_IMF_INPUT_PANEL_STATE_EVENT, - _lockscreen_options_locktitle_entry_imf_state_cb, - options_locktile_view_data); - ecore_imf_context_input_panel_event_callback_add((Ecore_IMF_Context *) - entry_ctx, - ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, - _lockscreen_options_locktitle_entry_imf_resize_cb, - options_locktile_view_data); - options_locktile_view_data->entry_ctx = entry_ctx; - } - - return layout; -} - -static Evas_Object *_editfield_content_get(void *data, - Evas_Object * obj, - const char *part) -{ - if (!strcmp(part, "elm.icon")) { - LOCKOPTIONS_DBG("[ == %s == ]", __func__); - Evas_Object *editfield = NULL; - editfield = _lockscreen_options_editfield_create(obj); - return editfield; - } - return NULL; -} - -static void *_editfield_sel(void *data, Evas_Object * obj, void *event_info) -{ - elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE); -} - -static void _on_text_fonttype_btn_clicked_cb(void *data, Evas_Object * obj, - const char *emission, - const char *source) -{ - if (options_locktile_view_data != NULL) { - if(options_locktile_view_data->fontselector == NULL) { - if(options_locktile_view_data->colorselector != NULL) { - evas_object_del(options_locktile_view_data->colorselector); - options_locktile_view_data->colorselector = NULL; - } - _lockscreen_options_locktitle_font_selector_create(); - /*if create fontselector successfully, hide IME*/ - if(options_locktile_view_data->fontselector != NULL) { - elm_object_focus_set(options_locktile_view_data->entry, EINA_FALSE); - } - }else { - evas_object_del(options_locktile_view_data->fontselector); - options_locktile_view_data->fontselector = NULL; - elm_object_focus_set(options_locktile_view_data->entry, EINA_TRUE); - } - } -} - -static void _on_text_draw_btn_clicked_cb(void *data, Evas_Object * obj, - const char *emission, - const char *source) -{ - if (options_locktile_view_data != NULL) { - if(options_locktile_view_data->colorselector == NULL) { - if(options_locktile_view_data->fontselector != NULL) { - evas_object_del(options_locktile_view_data->fontselector); - options_locktile_view_data->fontselector = NULL; - } - _lockscreen_options_locktitle_color_selector_create(); - /*if create colorselector successfully, hide IME*/ - if(options_locktile_view_data->colorselector != NULL) { - elm_object_focus_set(options_locktile_view_data->entry, EINA_FALSE); - } - }else { - evas_object_del(options_locktile_view_data->colorselector); - options_locktile_view_data->colorselector = NULL; - elm_object_focus_set(options_locktile_view_data->entry, EINA_TRUE); - } - } -} - -static void _on_text_bold_btn_clicked_cb(void *data, Evas_Object * obj, - const char *emission, - const char *source) -{ - if (options_locktile_view_data != NULL) { - _send_int_message_to_edc(options_locktile_view_data->toolbar, 1, 1); - } -} - -static void _on_text_italic_btn_clicked_cb(void *data, Evas_Object * obj, - const char *emission, - const char *source) -{ - if (options_locktile_view_data != NULL) { - _send_int_message_to_edc(options_locktile_view_data->toolbar, 1, 2); - } - -} - -static void _on_text_underline_btn_clicked_cb(void *data, Evas_Object * obj, - const char *emission, - const char *source) -{ - if (options_locktile_view_data != NULL) { - _send_int_message_to_edc(options_locktile_view_data->toolbar, 1, 3); - } -} - -static void _lockscreen_options_locktitle_colorselector_changed_cb(void *data, Evas_Object *obj, void *event_info) -{ - Evas_Object *rect = (Evas_Object *)data; - int r = 0, g = 0, b = 0, a = 0; - elm_colorselector_color_get(obj, &r, &g, &b, &a); - evas_object_color_set(rect, r, g, b, a); -} - -static void _lockscreen_options_locktitle_color_selector_create() -{ - if(options_locktile_view_data == NULL) - return; - Evas_Object *colorselector = NULL; - Evas_Object *rect = NULL; - Evas_Object *color = NULL; - - colorselector = - lockscreen_options_util_create_layout(options_locktile_view_data->layout, - EDJE_DIR - "/lockscreen-options.edj", - "lockscreen.options.locktitle.colorselector"); - if(colorselector == NULL) - return; - - rect = evas_object_rectangle_add(evas_object_evas_get(options_locktile_view_data->layout)); - elm_object_part_content_set(colorselector, "rect", rect); - evas_object_color_set(rect, options_locktile_view_data->rgb.red, options_locktile_view_data->rgb.green, options_locktile_view_data->rgb.blue, options_locktile_view_data->rgb.reserved); - - color = elm_colorselector_add(options_locktile_view_data->layout); - elm_colorselector_mode_set(color, ELM_COLORSELECTOR_COMPONENTS); - elm_object_part_content_set(colorselector, "color", color); - evas_object_smart_callback_add(color, "changed", _lockscreen_options_locktitle_colorselector_changed_cb, rect); - evas_object_color_set(color, options_locktile_view_data->rgb.red, options_locktile_view_data->rgb.green, options_locktile_view_data->rgb.blue, options_locktile_view_data->rgb.reserved); - - options_locktile_view_data->colorselector = colorselector; - elm_object_part_content_set(options_locktile_view_data->layout, "elm.swallow.selector", colorselector); - evas_object_show(colorselector); -} - -static void _lockscreen_options_locktitle_font_selector_create() -{ - if(options_locktile_view_data == NULL) - return; - Evas_Object *fontselector = NULL; - Evas_Object *font_radio = NULL; - - fontselector = elm_genlist_add(options_locktile_view_data->layout); - if(fontselector == NULL) - return; - - font_radio= elm_radio_add(fontselector); - if(font_radio == NULL) - return; - - int index = 0; - for (index = 0; index < fonttype_size; index++) { - elm_genlist_item_append(fontselector, &itc_fontlist_style, - (void *)index, NULL, - ELM_GENLIST_ITEM_NONE, _fonttype_sel, NULL); - } - - options_locktile_view_data->fontselector = fontselector; - options_locktile_view_data->font_radio = font_radio; - elm_object_part_content_set(options_locktile_view_data->layout, "elm.swallow.selector", fontselector); - evas_object_show(fontselector); -} - -static void _lockscreen_options_locktitle_create_toolbar() -{ - if(options_locktile_view_data == NULL) - return; - - Evas_Object *toolbar = NULL; - - toolbar = - lockscreen_options_util_create_layout(options_locktile_view_data->layout, - EDJE_DIR - "/lockscreen-options.edj", - "lockscreen.options.locktitle.toolbar"); - if(toolbar == NULL) - return; - - elm_object_part_content_set(options_locktile_view_data->layout, "elm.swallow.toolbar", toolbar); - evas_object_show(toolbar); - options_locktile_view_data->toolbar = toolbar; - - edje_object_signal_callback_add(elm_layout_edje_get(toolbar), - "dropdown.fonttype.clicked", "*", - _on_text_fonttype_btn_clicked_cb, - NULL); - edje_object_signal_callback_add(elm_layout_edje_get(toolbar), - "draw.button.clicked", "*", - _on_text_draw_btn_clicked_cb, NULL); - edje_object_signal_callback_add(elm_layout_edje_get(toolbar), - "text.bold.clicked", "*", - _on_text_bold_btn_clicked_cb, NULL); - edje_object_signal_callback_add(elm_layout_edje_get(toolbar), - "text.italic.clicked", "*", - _on_text_italic_btn_clicked_cb, NULL); - edje_object_signal_callback_add(elm_layout_edje_get(toolbar), - "text.underline.clicked", "*", - _on_text_underline_btn_clicked_cb, NULL); -} - -void lockscreen_options_locktitle_create_view(lockscreen_options_ug_data * - ug_data) -{ - if (ug_data == NULL) { - LOCKOPTIONS_ERR("ug is NULL"); - return; - } - LOCKOPTIONS_DBG("lockscreen_options_locktitle_create_view begin\n"); - Evas_Object *navi_bar = ug_data->navi_bar; - if (navi_bar == NULL) { - LOCKOPTIONS_ERR("navi_bar is null."); - return; - } - - /*initialization*/ - options_locktile_view_data = - (options_locktile_view_s *) calloc(1, - sizeof(options_locktile_view_s)); - options_locktile_view_data->ug_data = ug_data; - options_locktile_view_data->rgb.red = 255; - options_locktile_view_data->rgb.green = 255; - options_locktile_view_data->rgb.blue = 255; - options_locktile_view_data->rgb.reserved = 255; - - Evas_Object *layout = NULL; - Evas_Object *back_button = NULL; - Evas_Object *genlist = NULL; - - layout = - lockscreen_options_util_create_layout(navi_bar, - EDJE_DIR - "/lockscreen-options.edj", - "lockscreen.options.locktitle.main"); - - if (layout == NULL) { - LOCKOPTIONS_ERR("can't create locktitle layout."); - return; - } - - evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, - _lockscreen_options_locktitle_delete_cb, - NULL); - options_locktile_view_data->layout = layout; - - genlist = elm_genlist_add(layout); - if(genlist == NULL) { - return; - } - elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS); - elm_genlist_item_append(genlist, &itc_editfield_style, NULL, NULL, ELM_GENLIST_ITEM_NONE, _editfield_sel, NULL); - elm_object_part_content_set(layout, "elm.swallow.content", genlist); - evas_object_show(genlist); - - _lockscreen_options_locktitle_create_toolbar(); - - back_button = elm_button_add(navi_bar); - elm_object_style_set(back_button, "naviframe/back_btn/default"); - evas_object_smart_callback_add(back_button, "clicked", - _lockscreen_options_locktitle_back_cb, - ug_data); - - elm_naviframe_item_push(navi_bar, "Lock screen title", back_button, - NULL, layout, NULL); -} diff --git a/lock-setting/lockscreen-options/src/lockscreen-options-main.c b/lock-setting/lockscreen-options/src/lockscreen-options-main.c index feb0caf..10e68a2 100755 --- a/lock-setting/lockscreen-options/src/lockscreen-options-main.c +++ b/lock-setting/lockscreen-options/src/lockscreen-options-main.c @@ -26,17 +26,10 @@ #include "lockscreen-options-debug.h" #include "lockscreen-options-main.h" #include "lockscreen-options-util.h" -#include "lockscreen-options-shortcuts.h" -#include "lockscreen-options-locktitle.h" -#include "lockscreen-options-dualclock.h" #include "starter-vconf.h" -#if USE_TITLE_AND_CAMERA -#define LOCKSCREEN_OPTOINS_GENLIST_ITEM_CNT 12 -#else -#define LOCKSCREEN_OPTOINS_GENLIST_ITEM_CNT 8 -#endif +#define LOCKSCREEN_OPTOINS_GENLIST_ITEM_CNT 5 typedef struct { int glStyle; @@ -45,58 +38,17 @@ typedef struct { void (*func) (void *data, Evas_Object * obj, void *event_info); } lockscreen_menu_item_info; -static void _lockscreen_options_shortcuts_cb(void *data, Evas_Object * obj, - void *event_info); -static void _lockscreen_options_locktitle_cb(void *data, Evas_Object * obj, - void *event_info); -static void _lockscreen_options_dualclock_cb(void *data, Evas_Object * obj, - void *event_info); - static lockscreen_menu_item_info lockscreen_options_menu_item[] = { - {ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_SHORTCUTS, NULL, _lockscreen_options_shortcuts_cb}, //launch short cut setting - {ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_SHORTCUTS_HELP, NULL, NULL}, //help text -#if USE_TITLE_AND_CAMERA - {ENUM_LOCKSCREEN_GENLIST_STYLE_2TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE, NULL, _lockscreen_options_locktitle_cb}, //launch life magazine input view - {ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE_HELP, NULL, NULL}, //help text -#endif - {ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS, NULL, NULL}, //Event notifications - {ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS_HELP, NULL, NULL}, //help text -// {ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI, NULL, NULL}, //Context-aware notifications -// {ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI_HELP, NULL, NULL}, //help text -#if USE_TITLE_AND_CAMERA - {ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_CAMERA_QUICK_ACCESS, NULL, NULL}, //camera qucik access option - {ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_CAMERA_QUICK_ACCESS_HELP, NULL, NULL}, //help text -#endif - {ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_CLOCK, NULL, NULL}, //Clock -// {ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_DUAL_CLOCK, NULL, _lockscreen_options_dualclock_cb}, //Dual Clock -// {ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_DUAL_CLOCK_HELP, NULL, NULL}, //Dual Clock help - {ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_WEATHER, NULL, NULL}, //Weather - {ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_HELPTEXT, NULL, NULL}, //Help text - {ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_HELPTEXT_HELP, NULL, NULL} //help text + {ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS, NULL, NULL}, + {ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS_HELP, NULL, NULL}, + {ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_CLOCK, NULL, NULL}, + {ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_HELPTEXT, NULL, NULL}, + {ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_HELPTEXT_HELP, NULL, NULL} }; static Elm_Gen_Item_Class itc_menu_1text1icon; static Elm_Gen_Item_Class itc_menu_2text1icon; static Elm_Gen_Item_Class itc_help_1text; -static Elm_Object_Item *genlist_shortcuts_item = NULL; - -static void _lockscreen_options_shortcuts_cb(void *data, Evas_Object * obj, - void *event_info) -{ - lockscreen_options_shortcuts_create_view(data); -} - -static void _lockscreen_options_locktitle_cb(void *data, Evas_Object * obj, - void *event_info) -{ - lockscreen_options_locktitle_create_view(data); -} - -static void _lockscreen_options_dualclock_cb(void *data, Evas_Object * obj, - void *event_info) -{ - lockscreen_options_dualclock_create_view(data); -} static void _lockscreen_options_main_back_cb(void *data, Evas_Object * obj, void *event_info) @@ -127,10 +79,6 @@ static char *_lockscreen_options_main_gl_label_get(void *data, (lockoption_data->stringId)); } - if((strcmp(part, "elm.text.2") == 0)) { - return strdup("Life Magazine"); - } - return NULL; } @@ -139,37 +87,18 @@ static void _lockscreen_options_set_menu_status(int stringId, int value) { int ret = 0; switch (stringId) { - case IDS_LOCKSCREEN_OPTIONS_SHORTCUTS: - ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_SHORTCUT_DISPLAY, value); - break; -#if USE_TITLE_AND_CAMERA - case IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE: - break; -#endif case IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS: ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_EVENT_NOTIFICATION_DISPLAY, value); break; - case IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI: - ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_CONTEXT_AWARE_NOTIFICATION_DISPLAY, value); - break; -#if USE_TITLE_AND_CAMERA - case IDS_LOCKSCREEN_OPTIONS_CAMERA_QUICK_ACCESS: - ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_CAMERA_QUICK_ACCESS, value); - break; -#endif case IDS_LOCKSCREEN_OPTIONS_CLOCK: ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_CLOCK_DISPLAY, value); break; - case IDS_LOCKSCREEN_OPTIONS_WEATHER: - ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_WEATHER_DISPLAY, value); - break; case IDS_LOCKSCREEN_OPTIONS_HELPTEXT: ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_HELP_TEXT_DISPLAY, value); break; default: LOCKOPTIONS_DBG("NO VALID STRINGID %d", stringId); break; - } } @@ -179,30 +108,12 @@ static bool _lockscreen_options_get_menu_status(int stringId) int ret = 0; switch (stringId) { - case IDS_LOCKSCREEN_OPTIONS_SHORTCUTS: - ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_SHORTCUT_DISPLAY, &status); - break; -#if USE_TITLE_AND_CAMERA - case IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE: - break; -#endif case IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS: ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_EVENT_NOTIFICATION_DISPLAY, &status); break; - case IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI: - ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_CONTEXT_AWARE_NOTIFICATION_DISPLAY, &status); - break; -#if USE_TITLE_AND_CAMERA - case IDS_LOCKSCREEN_OPTIONS_CAMERA_QUICK_ACCESS: - ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_CAMERA_QUICK_ACCESS, &status); - break; -#endif case IDS_LOCKSCREEN_OPTIONS_CLOCK: ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_CLOCK_DISPLAY, &status); break; - case IDS_LOCKSCREEN_OPTIONS_WEATHER: - ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_WEATHER_DISPLAY, &status); - break; case IDS_LOCKSCREEN_OPTIONS_HELPTEXT: ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_HELP_TEXT_DISPLAY, &status); break; @@ -221,7 +132,6 @@ static bool _lockscreen_options_get_menu_status(int stringId) status); return status; - } static void _lockscreen_options_check_changed_cb(void *data, Evas_Object * obj, @@ -242,10 +152,8 @@ static void _lockscreen_options_check_changed_cb(void *data, Evas_Object * obj, ret == EINA_TRUE ? "ON" : "OFF"); if (ret == EINA_TRUE) { - /* set on */ value = 1; } else { - /* set off */ value = 0; } @@ -277,22 +185,6 @@ static Evas_Object *_lockscreen_options_main_gl_icon_get(void *data, evas_object_pass_events_set(check, 1); evas_object_propagate_events_set(check, 0); - - if (lockoption_data->stringId == IDS_LOCKSCREEN_OPTIONS_SHORTCUTS) { - Eina_Bool is_have = EINA_FALSE; - is_have = lockscreen_options_shortcuts_check_items(); - if(is_have == EINA_TRUE){ - elm_object_disabled_set(check, EINA_FALSE); - }else{ - elm_object_disabled_set(check, EINA_TRUE); - elm_check_state_set(check, EINA_FALSE); - _lockscreen_options_set_menu_status(lockoption_data->stringId, EINA_FALSE); - } - }else if (lockoption_data->stringId == - IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI) { - elm_object_disabled_set(check, EINA_TRUE); - } - evas_object_smart_callback_add(check, "changed", _lockscreen_options_check_changed_cb, lockoption_data); @@ -328,7 +220,6 @@ static void _lockscreen_options_main_gl_sel(void *data, Evas_Object * obj, if (lockoption_data->stringId == IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS || lockoption_data->stringId == IDS_LOCKSCREEN_OPTIONS_CLOCK - || lockoption_data->stringId == IDS_LOCKSCREEN_OPTIONS_WEATHER || lockoption_data->stringId == IDS_LOCKSCREEN_OPTIONS_HELPTEXT) { Eina_Bool check_state = elm_check_state_get(lockoption_data->check); @@ -389,7 +280,7 @@ void lockscreen_options_main_create_view(lockscreen_options_ug_data * ug_data) ENUM_LOCKSCREEN_GENLIST_STYLE_2TEXT1ICON); _lockscreen_options_create_gl_item(&(itc_help_1text), ENUM_LOCKSCREEN_GENLIST_STYLE_HELP); - /* Create genlist */ + genlist = elm_genlist_add(navi_bar); elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS); @@ -440,23 +331,13 @@ void lockscreen_options_main_create_view(lockscreen_options_ug_data * ug_data) LOCKOPTIONS_WARN("lockscreen option has no such type."); return; } - if((lockscreen_options_menu_item[i].stringId) == IDS_LOCKSCREEN_OPTIONS_SHORTCUTS){ - genlist_shortcuts_item = item; - } } - /* Set navigation objects and push */ back_button = elm_button_add(navi_bar); elm_object_style_set(back_button, "naviframe/back_btn/default"); evas_object_smart_callback_add(back_button, "clicked", _lockscreen_options_main_back_cb, ug_data); - elm_naviframe_item_push(navi_bar, _("IDS_ST_BODY_LOCK_SCREEN") , back_button, NULL, genlist, NULL); /* the same tile */ -} - -void lockscreen_options_main_update_view() -{ if(genlist_shortcuts_item){ - elm_gengrid_item_update(genlist_shortcuts_item); - } + elm_naviframe_item_push(navi_bar, _("IDS_ST_BODY_LOCK_SCREEN") , back_button, NULL, genlist, NULL); } diff --git a/lock-setting/lockscreen-options/src/lockscreen-options-shortcuts-edit.c b/lock-setting/lockscreen-options/src/lockscreen-options-shortcuts-edit.c deleted file mode 100755 index 80f2d02..0000000 --- a/lock-setting/lockscreen-options/src/lockscreen-options-shortcuts-edit.c +++ /dev/null @@ -1,576 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#include -#include -#include -#include -#include - -#include "lockscreen-options.h" -#include "lockscreen-options-debug.h" -#include "lockscreen-options-util.h" -#include "lockscreen-options-shortcuts.h" -#include "lockscreen-options-shortcuts-edit.h" - -#define EDJE_DIR "/usr/ug/res/edje/ug-lockscreen-options-efl" -#define IMAGES_DIR "/usr/ug/res/images/ug-lockscreen-options-efl" -#define GENGRID_ITEM_HEIGHT 188 -#define WINDOW_HEIGHT 1280 - -typedef enum { - SET_SHORTCUTS_APP1 = 0, - SET_SHORTCUTS_APP2, - SET_SHORTCUTS_APP3, - SET_SHORTCUTS_APP4 -} shortcuts_type_t; - -typedef struct { - int index; - char *pkg_name; - Elm_Object_Item *item; -} shortcuts_item_s; - -typedef struct { - lockscreen_options_ug_data *ug_data; - Evas_Object *gengrid; - Eina_List *app_list; - shortcuts_type_t shortcuts_type; - Elm_Object_Item *selected_gengrid_item; - Eina_Bool is_moved; -} options_shortcuts_edit_view_s; - -static Elm_Gengrid_Item_Class gic; -static options_shortcuts_edit_view_s *options_shortcuts_edit_view_data = NULL; -static bool delete_icons[4]; - -static Evas_Object *_lockscreen_options_grid_content_get_e(void *data, Evas_Object * obj, const char *part); - -static char *_lockscreen_options_icon_path_get_e(shortcuts_item_s * - shortcuts_item) -{ - ail_appinfo_h handle; - ail_error_e ret; - char *pkg_name = NULL; - char *temp = NULL; - char *icon_path = NULL; - shortcuts_type_t shortcuts_type = SET_SHORTCUTS_APP1; - - if (shortcuts_item == NULL) { - return NULL; - } - - shortcuts_type = shortcuts_item->index; - - switch (shortcuts_type) { - case SET_SHORTCUTS_APP1: - pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT1); - LOCKOPTIONS_ERR("pkg_name is %s", pkg_name); - break; - case SET_SHORTCUTS_APP2: - pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT2); - LOCKOPTIONS_ERR("pkg_name is %s", pkg_name); - break; - case SET_SHORTCUTS_APP3: - pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT3); - LOCKOPTIONS_ERR("pkg_name is %s", pkg_name); - break; - case SET_SHORTCUTS_APP4: - pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT4); - LOCKOPTIONS_ERR("pkg_name is %s", pkg_name); - break; - default: - break; - } - - if (pkg_name == NULL || strlen(pkg_name) == 0) { - LOCKOPTIONS_ERR("pkg_name is NULL"); - return NULL; - } - shortcuts_item->pkg_name = strdup(pkg_name); - - ret = ail_get_appinfo(pkg_name, &handle); - if (ret != AIL_ERROR_OK) { - LOCKOPTIONS_ERR("Fail to ail_get_appinfo"); - return NULL; - } - - ret = ail_appinfo_get_str(handle, AIL_PROP_ICON_STR, &temp); - if (ret != AIL_ERROR_OK) { - LOCKOPTIONS_ERR("Fail to ail_appinfo_get_str"); - ail_destroy_appinfo(handle); - return NULL; - } - - if (temp) { - icon_path = strdup(temp); - } - - ret = ail_destroy_appinfo(handle); - if (ret != AIL_ERROR_OK) { - LOCKOPTIONS_ERR("Fail to ail_destroy_appinfo"); - } - - if (pkg_name) { - free(pkg_name); - pkg_name = NULL; - } - return icon_path; -} - -static void _lockscreen_options_shortcuts_set_e(shortcuts_type_t shortcuts_type, - const char *pkg_name) -{ - int ret = 0; - - switch (shortcuts_type) { - case SET_SHORTCUTS_APP1: - ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT1, pkg_name); - if (ret != 0) { - LOCKOPTIONS_ERR("set failed"); - } - break; - case SET_SHORTCUTS_APP2: - ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT2, pkg_name); - if (ret != 0) { - LOCKOPTIONS_ERR("set failed"); - } - break; - case SET_SHORTCUTS_APP3: - ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT3, pkg_name); - if (ret != 0) { - LOCKOPTIONS_ERR("set failed"); - } - break; - case SET_SHORTCUTS_APP4: - ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT4, pkg_name); - if (ret != 0) { - LOCKOPTIONS_ERR("set failed"); - } - break; - default: - break; - } -} - -static void _lockscreen_options_shortcuts_delete_cb_e(void *data, Evas * e, - Evas_Object * obj, - void *event_info) -{ - void *list_item_data = NULL; - - if (options_shortcuts_edit_view_data == NULL) { - return; - } - - EINA_LIST_FREE(options_shortcuts_edit_view_data->app_list, list_item_data) { - if (list_item_data) { - free(list_item_data); - list_item_data = NULL; - } - } - if (options_shortcuts_edit_view_data->gengrid) { - evas_object_del(options_shortcuts_edit_view_data->gengrid); - options_shortcuts_edit_view_data->gengrid = NULL; - } - if (options_shortcuts_edit_view_data) { - free(options_shortcuts_edit_view_data); - options_shortcuts_edit_view_data = NULL; - } -} - -static void _lockscreen_options_shortcuts_back_cb_e(void *data, Evas_Object * obj, - void *event_info) -{ - lockscreen_options_ug_data *ug_data = - (lockscreen_options_ug_data *) data; - if (ug_data == NULL) { - return; - } - Evas_Object *navi_bar = ug_data->navi_bar; - - if (navi_bar == NULL) { - LOCKOPTIONS_ERR("navi_bar is null."); - return; - } - - elm_naviframe_item_pop(navi_bar); -} - -static void _lockscreen_options_grid_moved_cb_e(void *data, Evas_Object * obj, - void *event_info) -{ - options_shortcuts_edit_view_data->is_moved = EINA_TRUE; -} - -static void _lockscreen_options_shortcuts_done_cb_e(void *data, Evas_Object * obj, - void *event_info) -{ - lockscreen_options_ug_data *ug_data = - (lockscreen_options_ug_data *) data; - if (ug_data == NULL) { - return; - } - - int index = 0; - Elm_Object_Item *object_item = NULL; - shortcuts_item_s *shortcuts_item = NULL; - - object_item = elm_gengrid_first_item_get(options_shortcuts_edit_view_data->gengrid); - while (object_item) { - shortcuts_item = elm_object_item_data_get(object_item); - if (shortcuts_item) { - shortcuts_item->index = index; - if ((shortcuts_item->pkg_name == NULL) - || (strlen(shortcuts_item->pkg_name) == 0) - || (strcmp(shortcuts_item->pkg_name, "(null)") == - 0)) { - _lockscreen_options_shortcuts_set_e(index, ""); - } else { - _lockscreen_options_shortcuts_set_e(index, - shortcuts_item->pkg_name); - } - } - object_item = elm_gengrid_item_next_get(object_item); - index++; - } - while(index<4) - { - _lockscreen_options_shortcuts_set_e(index, ""); - index++; - } - Evas_Object *navi_bar = ug_data->navi_bar; - - if (navi_bar == NULL) { - LOCKOPTIONS_ERR("navi_bar is null."); - return; - } - elm_naviframe_item_pop(navi_bar); - lockscreen_options_shortcuts_update_view(); -} - -static void _lockscreen_options_grid_del_e(void *data, Evas_Object * obj) -{ - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data; - - if (shortcuts_item == NULL) { - return; - } - if (shortcuts_item->pkg_name) { - free(shortcuts_item->pkg_name); - shortcuts_item->pkg_name = NULL; - } - free(shortcuts_item); - shortcuts_item = NULL; -} - -static void _lockscreen_options_shortcuts_thumbnail_delete_cb_e(void *data, - Evas_Object * obj, - void *event_info) -{ - LOCKOPTIONS_DBG("_lockscreen_options_shortcuts_thumbnail_delete_cb"); - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data; - - if (shortcuts_item == NULL || options_shortcuts_edit_view_data->is_moved == EINA_TRUE) { - options_shortcuts_edit_view_data->is_moved = EINA_FALSE; - return; - } - - delete_icons[shortcuts_item->index] = true; - - elm_gengrid_clear(options_shortcuts_edit_view_data->gengrid); - - Evas_Object *gengrid = options_shortcuts_edit_view_data->gengrid; - - evas_object_smart_callback_add(gengrid, "moved", - _lockscreen_options_grid_moved_cb_e, NULL); - - gic.item_style = "default_grid"; - gic.func.text_get = NULL; - gic.func.content_get = _lockscreen_options_grid_content_get_e; - gic.func.state_get = NULL; - gic.func.del = _lockscreen_options_grid_del_e; - - char *pkg_name1 = NULL; - char *pkg_name2 = NULL; - char *pkg_name3 = NULL; - char *pkg_name4 = NULL; - pkg_name1 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT1); - pkg_name2 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT2); - pkg_name3 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT3); - pkg_name4 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT4); - - if((delete_icons[0] == false) && (pkg_name1 != NULL && strlen(pkg_name1) != 0)) - { - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s)); - shortcuts_item->index = 0; - shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic, - (void *)shortcuts_item, NULL, (void *)shortcuts_item); - } - if((delete_icons[1] == false) && (pkg_name2 != NULL && strlen(pkg_name2) != 0)) - { - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s)); - shortcuts_item->index = 1; - shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic, - (void *)shortcuts_item, NULL, (void *)shortcuts_item); - } - if((delete_icons[2] == false) && (pkg_name3 != NULL && strlen(pkg_name3) != 0)) - { - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s)); - shortcuts_item->index = 2; - shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic, - (void *)shortcuts_item, NULL, (void *)shortcuts_item); - } - if((delete_icons[3] == false) && (pkg_name4 != NULL && strlen(pkg_name4) != 0)) - { - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s)); - shortcuts_item->index = 3; - shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic, - (void *)shortcuts_item, NULL, (void *)shortcuts_item); - } - - if(pkg_name1 != NULL) - { - free(pkg_name1); - pkg_name1 = NULL; - } - if(pkg_name2 != NULL) - { - free(pkg_name2); - pkg_name2 = NULL; - } - if(pkg_name3 != NULL) - { - free(pkg_name3); - pkg_name3 = NULL; - } - if(pkg_name4 != NULL) - { - free(pkg_name4); - pkg_name4 = NULL; - } -} - -static Evas_Object *_lockscreen_options_grid_content_get_e(void *data, - Evas_Object * obj, - const char *part) -{ - char *icon_path = NULL; - Evas_Object *icon = NULL; - Evas_Object *button = NULL; - Evas_Object *layout = NULL; - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data; - LOCKOPTIONS_DBG("_lockscreen_options_grid_content_get."); - - if (shortcuts_item == NULL) { - return NULL; - } - - if (!strcmp(part, "elm.swallow.icon")) { - layout = - lockscreen_options_util_create_layout(obj, - EDJE_DIR - "/lockscreen-options.edj", - "lockscreen.options.shortcuts.thumbnail.main"); - icon_path = _lockscreen_options_icon_path_get_e(shortcuts_item); - icon = elm_icon_add(layout); - if (icon_path) { - elm_icon_file_set(icon, icon_path, NULL); - elm_object_part_content_set(layout, - "elm.swallow.contents", - icon); - elm_icon_aspect_fixed_set(icon, EINA_FALSE); - button = elm_button_add(layout); - elm_object_style_set(button, "icon_minus"); - evas_object_pass_events_set(button, 1); - evas_object_repeat_events_set(button, 0); - evas_object_propagate_events_set(button, 0); - elm_object_part_content_set(layout, - "elm.swallow.button", - button); - evas_object_smart_callback_add(button, "clicked", - _lockscreen_options_shortcuts_thumbnail_delete_cb_e, - shortcuts_item); - free(icon_path); - icon_path = NULL; - } else { - return NULL; - } - return layout; - } - return NULL; -} - -static void _lockscreen_options_shortcuts_help_text_create_e(Evas_Object * parent) -{ - Evas_Object *title_label = NULL; - char buffer[1024] = { 0 }; - - title_label = elm_label_add(parent); - snprintf(buffer, sizeof(buffer), - "%s", - lockscreen_optoins_get_string - (IDS_LOCKSCREEN_OPTIONS_DRAG_DROP_SHORTCUTS)); - elm_object_text_set(title_label, buffer); - evas_object_show(title_label); - elm_object_part_content_set(parent, "shortcuts.edit.help.title", - title_label); -} - -static void _lockscreen_options_shortcuts_gengrid_create_e(Evas_Object * parent) -{ - char *pkg_name1 = NULL; - char *pkg_name2 = NULL; - char *pkg_name3 = NULL; - char *pkg_name4 = NULL; - pkg_name1 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT1); - pkg_name2 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT2); - pkg_name3 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT3); - pkg_name4 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT4); - - Evas_Coord window_width = 0; - Evas_Coord window_height = 0; - Evas_Object *gengrid = NULL; - - gengrid = elm_gengrid_add(parent); - ecore_x_window_size_get(ecore_x_window_root_first_get(), &window_width, &window_height); - elm_gengrid_item_size_set(gengrid, window_width / 4, - GENGRID_ITEM_HEIGHT * window_height / - WINDOW_HEIGHT); - elm_gengrid_align_set(gengrid, 0.5, 0.0); - elm_gengrid_reorder_mode_set(gengrid, EINA_TRUE), - evas_object_show(gengrid); - elm_object_part_content_set(parent, "shortcuts.gengrid", gengrid); - - evas_object_smart_callback_add(gengrid, "moved", - _lockscreen_options_grid_moved_cb_e, NULL); - options_shortcuts_edit_view_data->gengrid = gengrid; - - gic.item_style = "default_grid"; - gic.func.text_get = NULL; - gic.func.content_get = _lockscreen_options_grid_content_get_e; - gic.func.state_get = NULL; - gic.func.del = _lockscreen_options_grid_del_e; - - if(pkg_name1 != NULL && strlen(pkg_name1) != 0) - { - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s)); - shortcuts_item->index = 0; - shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic, - (void *)shortcuts_item, NULL, (void *)shortcuts_item); - } - - if(pkg_name2 != NULL && strlen(pkg_name2) != 0) - { - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s)); - shortcuts_item->index = 1; - shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic, - (void *)shortcuts_item, NULL, (void *)shortcuts_item); - } - - if(pkg_name3 != NULL && strlen(pkg_name3) != 0) - { - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s)); - shortcuts_item->index = 2; - shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic, - (void *)shortcuts_item, NULL, (void *)shortcuts_item); - } - - if(pkg_name4 != NULL && strlen(pkg_name4) != 0) - { - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s)); - shortcuts_item->index = 3; - shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic, - (void *)shortcuts_item, NULL, (void *)shortcuts_item); - } - - if(pkg_name1 != NULL) - { - free(pkg_name1); - pkg_name1 = NULL; - } - if(pkg_name2 != NULL) - { - free(pkg_name2); - pkg_name2 = NULL; - } - if(pkg_name3 != NULL) - { - free(pkg_name3); - pkg_name3 = NULL; - } - if(pkg_name4 != NULL) - { - free(pkg_name4); - pkg_name4 = NULL; - } -} - -void lockscreen_options_shortcuts_create_edit_view(void *data) -{ - lockscreen_options_ug_data *ug_data = - (lockscreen_options_ug_data *) data; - if (ug_data == NULL) { - LOCKOPTIONS_ERR("ug is NULL"); - return; - } - Evas_Object *navi_bar = ug_data->navi_bar; - Evas_Object *layout = NULL; - - if (navi_bar == NULL) { - LOCKOPTIONS_ERR("navi_bar is null."); - return; - } - - options_shortcuts_edit_view_data = - (options_shortcuts_edit_view_s *) calloc(1, - sizeof - (options_shortcuts_edit_view_s)); - options_shortcuts_edit_view_data->ug_data = ug_data; - - layout = - lockscreen_options_util_create_layout(navi_bar, - EDJE_DIR - "/lockscreen-options.edj", - "lockscreen.options.shortcuts.main"); - _lockscreen_options_shortcuts_help_text_create_e(layout); - _lockscreen_options_shortcuts_gengrid_create_e(layout); - - Evas_Object *done_button = elm_button_add(navi_bar); - Evas_Object *cancel_button = elm_button_add(navi_bar); - elm_object_style_set(done_button, "naviframe/toolbar/default"); - elm_object_text_set(done_button, _S("IDS_COM_SK_DONE")); - evas_object_smart_callback_add(done_button, "clicked", _lockscreen_options_shortcuts_done_cb_e, ug_data); - elm_object_style_set(cancel_button, "naviframe/toolbar/default"); - elm_object_text_set(cancel_button, _S("IDS_COM_POP_CANCEL")); - evas_object_smart_callback_add(cancel_button, "clicked", _lockscreen_options_shortcuts_back_cb_e, ug_data); - - evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, - _lockscreen_options_shortcuts_delete_cb_e, NULL); - - Elm_Object_Item *navi_item = elm_naviframe_item_push(navi_bar, lockscreen_optoins_get_string(IDS_LOCKSCREEN_OPTIONS_EDIT_SHORTCUTS), NULL, NULL, layout, NULL); - elm_object_item_part_content_set(navi_item, "prev_btn", NULL); - elm_object_item_part_content_set(navi_item , "toolbar_button1", done_button); - elm_object_item_part_content_set(navi_item , "toolbar_button2", cancel_button); - - int i; - for(i = 0;i < 4;i++) - { - delete_icons[i] = false; - } -} diff --git a/lock-setting/lockscreen-options/src/lockscreen-options-shortcuts.c b/lock-setting/lockscreen-options/src/lockscreen-options-shortcuts.c deleted file mode 100755 index 5844852..0000000 --- a/lock-setting/lockscreen-options/src/lockscreen-options-shortcuts.c +++ /dev/null @@ -1,803 +0,0 @@ - /* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.tizenopensource.org/license - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - -#include -#include -#include -#include -#include - -#include "lockscreen-options.h" -#include "lockscreen-options-debug.h" -#include "lockscreen-options-util.h" -#include "lockscreen-options-shortcuts.h" -#include "lockscreen-options-shortcuts-edit.h" - - -#define EDJE_DIR "/usr/ug/res/edje/ug-lockscreen-options-efl" -#define IMAGES_DIR "/usr/ug/res/images/ug-lockscreen-options-efl" -#define GENGRID_ITEM_HEIGHT 188 -#define WINDOW_HEIGHT 1280 - -typedef enum { - SET_SHORTCUTS_APP1 = 0, - SET_SHORTCUTS_APP2, - SET_SHORTCUTS_APP3, - SET_SHORTCUTS_APP4 -} shortcuts_type_t; - -typedef struct { - int index; - char *app_icon; - char *app_name; - char *pkg_name; -} app_list_item_s; - -typedef struct { - int index; - char *pkg_name; - Elm_Object_Item *item; -} shortcuts_item_s; - -typedef struct { - lockscreen_options_ug_data *ug_data; - Evas_Object *gengrid; - Eina_List *app_list; - shortcuts_type_t shortcuts_type; - Elm_Object_Item *selected_gengrid_item; - Eina_Bool is_moved; -} options_shortcuts_view_s; - -static Elm_Gengrid_Item_Class gic; -static Elm_Genlist_Item_Class ltc; -static options_shortcuts_view_s *options_shortcuts_view_data = NULL; -static Evas_Object *edit_item = NULL; - -static Eina_Bool _lockscreen_options_package_name_compare(const char *pkg_name) -{ - char *temp_name = NULL; - - temp_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT1); - if ((temp_name != NULL) && (strcmp(pkg_name, temp_name) == 0)) { - LOCKOPTIONS_DBG("pkg_name is %s", pkg_name); - free(temp_name); - temp_name = NULL; - return EINA_TRUE; - } - - temp_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT2); - if ((temp_name != NULL) && (strcmp(pkg_name, temp_name) == 0)) { - LOCKOPTIONS_DBG("pkg_name is %s", pkg_name); - free(temp_name); - temp_name = NULL; - return EINA_TRUE; - } - - temp_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT3); - if ((temp_name != NULL) && (strcmp(pkg_name, temp_name) == 0)) { - LOCKOPTIONS_DBG("pkg_name is %s", pkg_name); - free(temp_name); - temp_name = NULL; - return EINA_TRUE; - } - - temp_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT4); - if ((temp_name != NULL) && (strcmp(pkg_name, temp_name) == 0)) { - LOCKOPTIONS_DBG("pkg_name is %s", pkg_name); - free(temp_name); - temp_name = NULL; - return EINA_TRUE; - } - - return EINA_FALSE; -} - -static char *_lockscreen_options_icon_path_get(shortcuts_item_s * - shortcuts_item) -{ - ail_appinfo_h handle; - ail_error_e ret; - char *pkg_name = NULL; - char *temp = NULL; - char *icon_path = NULL; - shortcuts_type_t shortcuts_type = SET_SHORTCUTS_APP1; - - if (shortcuts_item == NULL) { - return NULL; - } - - shortcuts_type = shortcuts_item->index; - - switch (shortcuts_type) { - case SET_SHORTCUTS_APP1: - pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT1); - LOCKOPTIONS_ERR("pkg_name is %s", pkg_name); - break; - case SET_SHORTCUTS_APP2: - pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT2); - LOCKOPTIONS_ERR("pkg_name is %s", pkg_name); - break; - case SET_SHORTCUTS_APP3: - pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT3); - LOCKOPTIONS_ERR("pkg_name is %s", pkg_name); - break; - case SET_SHORTCUTS_APP4: - pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT4); - LOCKOPTIONS_ERR("pkg_name is %s", pkg_name); - break; - default: - break; - } - - if (pkg_name == NULL || strlen(pkg_name) == 0) { - LOCKOPTIONS_ERR("pkg_name is NULL"); - return NULL; - } - shortcuts_item->pkg_name = strdup(pkg_name); - - ret = ail_get_appinfo(pkg_name, &handle); - if (ret != AIL_ERROR_OK) { - LOCKOPTIONS_ERR("Fail to ail_get_appinfo"); - return NULL; - } - - ret = ail_appinfo_get_str(handle, AIL_PROP_ICON_STR, &temp); - if (ret != AIL_ERROR_OK) { - LOCKOPTIONS_ERR("Fail to ail_appinfo_get_str"); - ail_destroy_appinfo(handle); - return NULL; - } - - if (temp) { - icon_path = strdup(temp); - } - - ret = ail_destroy_appinfo(handle); - if (ret != AIL_ERROR_OK) { - LOCKOPTIONS_ERR("Fail to ail_destroy_appinfo"); - } - - if (pkg_name) { - free(pkg_name); - pkg_name = NULL; - } - return icon_path; -} - -static void _lockscreen_options_shortcuts_set(shortcuts_type_t shortcuts_type, - const char *pkg_name) -{ - int ret = 0; - - switch (shortcuts_type) { - case SET_SHORTCUTS_APP1: - ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT1, pkg_name); - if (ret != 0) { - LOCKOPTIONS_ERR("set failed"); - } - break; - case SET_SHORTCUTS_APP2: - ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT2, pkg_name); - if (ret != 0) { - LOCKOPTIONS_ERR("set failed"); - } - break; - case SET_SHORTCUTS_APP3: - ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT3, pkg_name); - if (ret != 0) { - LOCKOPTIONS_ERR("set failed"); - } - break; - case SET_SHORTCUTS_APP4: - ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT4, pkg_name); - if (ret != 0) { - LOCKOPTIONS_ERR("set failed"); - } - break; - default: - break; - } -} - -ail_cb_ret_e _lockscreen_options_appinfo_func(const ail_appinfo_h appinfo, - void *user_data) -{ - char *pkg_name = NULL; - char *app_name = NULL; - char *app_icon = NULL; - int index = 0; - Eina_Bool is_same = EINA_FALSE; - - if (AIL_ERROR_OK != - ail_appinfo_get_str(appinfo, AIL_PROP_PACKAGE_STR, &pkg_name)) { - LOCKOPTIONS_ERR("cannot get package name"); - } - - is_same = _lockscreen_options_package_name_compare(pkg_name); - - LOCKOPTIONS_DBG("is_same = %d", is_same); - if (is_same == EINA_FALSE) { - app_list_item_s *list_item = - (app_list_item_s *) calloc(1, sizeof(app_list_item_s)); - - if (pkg_name) { - list_item->pkg_name = strdup(pkg_name); - } - - if (AIL_ERROR_OK != - ail_appinfo_get_str(appinfo, AIL_PROP_NAME_STR, - &app_name)) { - LOCKOPTIONS_ERR("cannot get App name"); - } - if (AIL_ERROR_OK != - ail_appinfo_get_str(appinfo, AIL_PROP_ICON_STR, - &app_icon)) { - LOCKOPTIONS_ERR("cannot get App icon"); - } - list_item->index = index; - if (app_name) { - list_item->app_name = strdup(app_name); - } - if (app_icon && (strcmp(app_icon, "(null)") != 0)) { - list_item->app_icon = strdup(app_icon); - } else { - list_item->app_icon = - strdup(IMAGES_DIR "/mainmenu_icon.png"); - } - options_shortcuts_view_data->app_list = - eina_list_append(options_shortcuts_view_data->app_list, - list_item); - index++; - } - - return AIL_CB_RET_CONTINUE; -} - -void _lockscreen_options_list_all_packages() -{ - ail_filter_h filter; - ail_error_e ret; - - ret = ail_filter_new(&filter); - if (ret != AIL_ERROR_OK) { - return; - } - - ret = ail_filter_add_bool(filter, AIL_PROP_X_SLP_TASKMANAGE_BOOL, true); - if (ret != AIL_ERROR_OK) { - return; - } - - ret = ail_filter_add_bool(filter, AIL_PROP_NODISPLAY_BOOL, false); - if (ret != AIL_ERROR_OK) { - return; - } - - ret = ail_filter_add_str(filter, AIL_PROP_TYPE_STR, "Application"); - if (ret != AIL_ERROR_OK) { - return; - } - - ail_filter_list_appinfo_foreach(filter, - _lockscreen_options_appinfo_func, NULL); - ail_filter_destroy(filter); -} - -static void _lockscreen_options_select_apps_delete_cb(void *data, Evas * e, - Evas_Object * obj, - void *event_info) -{ - void *list_item_data = NULL; - - EINA_LIST_FREE(options_shortcuts_view_data->app_list, list_item_data) { - if (list_item_data) { - free(list_item_data); - list_item_data = NULL; - } - } -} - -static void _lockscreen_options_shortcuts_delete_cb(void *data, Evas * e, - Evas_Object * obj, - void *event_info) -{ - void *list_item_data = NULL; - - if (options_shortcuts_view_data == NULL) { - return; - } - - EINA_LIST_FREE(options_shortcuts_view_data->app_list, list_item_data) { - if (list_item_data) { - free(list_item_data); - list_item_data = NULL; - } - } - if (options_shortcuts_view_data->gengrid) { - evas_object_del(options_shortcuts_view_data->gengrid); - options_shortcuts_view_data->gengrid = NULL; - } - if (options_shortcuts_view_data) { - free(options_shortcuts_view_data); - options_shortcuts_view_data = NULL; - } -} - -static void _lockscreen_options_shortcuts_back_cb(void *data, Evas_Object * obj, - void *event_info) -{ - lockscreen_options_ug_data *ug_data = - (lockscreen_options_ug_data *) data; - if (ug_data == NULL) { - return; - } - Evas_Object *navi_bar = ug_data->navi_bar; - - if (navi_bar == NULL) { - LOCKOPTIONS_ERR("navi_bar is null."); - return; - } - - elm_naviframe_item_pop(navi_bar); -} - -//not used now -static void _lockscreen_options_shortcuts_thumbnail_delete_cb(void *data, - Evas_Object * obj, - void *event_info) -{ - LOCKOPTIONS_DBG("_lockscreen_options_shortcuts_thumbnail_delete_cb"); - Elm_Object_Item *object_item = NULL; - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data; - - if (shortcuts_item == NULL) { - return; - } - - _lockscreen_options_shortcuts_set(shortcuts_item->index, ""); - - object_item = - elm_gengrid_first_item_get(options_shortcuts_view_data->gengrid); - while (object_item) { - shortcuts_item_s *shortcuts_item_info = NULL; - shortcuts_item_info = elm_object_item_data_get(object_item); - if (shortcuts_item->index == shortcuts_item_info->index) { - elm_gengrid_item_update(object_item); - } - object_item = elm_gengrid_item_next_get(object_item); - } -} - -//not used now -static void _lockscreen_options_grid_moved_cb(void *data, Evas_Object * obj, - void *event_info) -{ - int index = 0; - Elm_Object_Item *object_item = NULL; - shortcuts_item_s *shortcuts_item = NULL; - - options_shortcuts_view_data->is_moved = EINA_TRUE; - - object_item = - elm_gengrid_first_item_get(options_shortcuts_view_data->gengrid); - while (object_item) { - shortcuts_item = elm_object_item_data_get(object_item); - if (shortcuts_item) { - LOCKOPTIONS_DBG - ("index = %d, shortcuts_item->pkg_name = %s.", - index, shortcuts_item->pkg_name); - shortcuts_item->index = index; - if ((shortcuts_item->pkg_name == NULL) - || (strlen(shortcuts_item->pkg_name) == 0) - || (strcmp(shortcuts_item->pkg_name, "(null)") == - 0)) { - _lockscreen_options_shortcuts_set(index, ""); - } else { - _lockscreen_options_shortcuts_set(index, - shortcuts_item->pkg_name); - } - } - object_item = elm_gengrid_item_next_get(object_item); - index++; - } -} - -static void _lockscreen_options_gengrid_select_cb(void *data, Evas_Object * obj, - const char *emission, - const char *source) -{ - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data; - - if (shortcuts_item == NULL - || options_shortcuts_view_data->is_moved == EINA_TRUE) { - options_shortcuts_view_data->is_moved = EINA_FALSE; - return; - } - LOCKOPTIONS_DBG("_lockscreen_options_gengrid_select_cb."); - if (shortcuts_item->item != NULL) { - options_shortcuts_view_data->selected_gengrid_item = - shortcuts_item->item; - elm_gengrid_item_selected_set(shortcuts_item->item, EINA_FALSE); - _lockscreen_options_select_applications_create - (shortcuts_item->index); - } -} - -static Evas_Object *_lockscreen_options_grid_content_get(void *data, - Evas_Object * obj, - const char *part) -{ - char *icon_path = NULL; - Evas_Object *icon = NULL; - Evas_Object *layout = NULL; - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data; - LOCKOPTIONS_DBG("_lockscreen_options_grid_content_get."); - - if (shortcuts_item == NULL) { - return NULL; - } - - if (!strcmp(part, "elm.swallow.icon")) { - layout = - lockscreen_options_util_create_layout(obj, - EDJE_DIR - "/lockscreen-options.edj", - "lockscreen.options.shortcuts.thumbnail.main"); - icon_path = _lockscreen_options_icon_path_get(shortcuts_item); - icon = elm_icon_add(layout); - if (icon_path) { - elm_icon_file_set(icon, icon_path, NULL); - elm_object_part_content_set(layout, - "elm.swallow.contents", - icon); - elm_icon_aspect_fixed_set(icon, EINA_FALSE); - /*button = elm_button_add(layout); - elm_object_style_set(button, "minus/extended"); - evas_object_pass_events_set(button, 1); - evas_object_repeat_events_set(button, 0); - evas_object_propagate_events_set(button, 0); - elm_object_part_content_set(layout, - "elm.swallow.button", - button); - evas_object_smart_callback_add(button, "clicked", - _lockscreen_options_shortcuts_thumbnail_delete_cb, - shortcuts_item);*/ - free(icon_path); - icon_path = NULL; - } else { - elm_icon_file_set(icon, IMAGES_DIR "/icon_add.png", - NULL); - elm_object_part_content_set(layout, - "elm.swallow.contents", - icon); - } - edje_object_signal_callback_add(elm_layout_edje_get(layout), - "mouse,clicked,*", "background", - _lockscreen_options_gengrid_select_cb, - shortcuts_item); - return layout; - } - return NULL; -} - -static void _lockscreen_options_grid_del(void *data, Evas_Object * obj) -{ - shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data; - - if (shortcuts_item == NULL) { - return; - } - if (shortcuts_item->pkg_name) { - free(shortcuts_item->pkg_name); - shortcuts_item->pkg_name = NULL; - } - free(shortcuts_item); - shortcuts_item = NULL; -} - -static void _lockscreen_options_shortcuts_help_text_create(Evas_Object * parent) -{ - Evas_Object *title_label = NULL; - Evas_Object *contents_label = NULL; - char buffer[1024] = { 0 }; - - title_label = elm_label_add(parent); - snprintf(buffer, sizeof(buffer), - "%s", - lockscreen_optoins_get_string - (IDS_LOCKSCREEN_OPTIONS_SET_SHORTCUTS_ON_LOCKSCREEN)); - elm_object_text_set(title_label, buffer); - evas_object_show(title_label); - elm_object_part_content_set(parent, "shortcuts.help.title", - title_label); - - contents_label = elm_label_add(parent); - snprintf(buffer, sizeof(buffer), - "%s", - lockscreen_optoins_get_string - (IDS_LOCKSCREEN_OPTIONS_TAP_SHORTCUTS)); - elm_object_text_set(contents_label, buffer); - evas_object_show(contents_label); - elm_object_part_content_set(parent, "shortcuts.help.contents", - contents_label); -} - -static void _lockscreen_options_shortcuts_gengrid_create(Evas_Object * parent) -{ - Evas_Coord window_width = 0; - Evas_Coord window_height = 0; - Evas_Object *gengrid = NULL; - int index = 0; - - gengrid = elm_gengrid_add(parent); - ecore_x_window_size_get(ecore_x_window_root_first_get(), &window_width, - &window_height); - elm_gengrid_item_size_set(gengrid, window_width / 4, - GENGRID_ITEM_HEIGHT * window_height / - WINDOW_HEIGHT); - elm_gengrid_align_set(gengrid, 0.5, 0.0); - //elm_gengrid_reorder_mode_set(gengrid, EINA_TRUE), - evas_object_show(gengrid); - elm_object_part_content_set(parent, "shortcuts.gengrid", gengrid); - - /*evas_object_smart_callback_add(gengrid, "moved", - _lockscreen_options_grid_moved_cb, NULL);*/ - options_shortcuts_view_data->gengrid = gengrid; - - gic.item_style = "default_grid"; - gic.func.text_get = NULL; - gic.func.content_get = _lockscreen_options_grid_content_get; - gic.func.state_get = NULL; - gic.func.del = _lockscreen_options_grid_del; - - for (index = 0; index <= SET_SHORTCUTS_APP4; index++) { - shortcuts_item_s *shortcuts_item = - (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s)); - shortcuts_item->index = index; - shortcuts_item->item = - elm_gengrid_item_append(gengrid, &gic, - (void *)shortcuts_item, NULL, - (void *)shortcuts_item); - } -} - -static char *_lockscreen_options_gl_text_get(void *data, Evas_Object * obj, - const char *part) -{ - int index = (int)data; - app_list_item_s *list_item = (app_list_item_s *) - eina_list_nth(options_shortcuts_view_data->app_list, index); - - if (list_item == NULL || list_item->app_name == NULL) { - return NULL; - } - - if (!strcmp(part, "elm.text")) { - return strdup(list_item->app_name); - } - return NULL; -} - -static Evas_Object *_lockscreen_options_gl_content_get(void *data, - Evas_Object * obj, - const char *part) -{ - int index = (int)data; - Evas_Object *icon = NULL; - app_list_item_s *list_item = (app_list_item_s *) - eina_list_nth(options_shortcuts_view_data->app_list, index); - - if (list_item == NULL || list_item->app_icon == NULL) { - return NULL; - } - - if (!strcmp(part, "elm.icon") || !strcmp(part, "elm.swallow.icon")) { - icon = elm_icon_add(obj); - elm_icon_file_set(icon, list_item->app_icon, NULL); - return icon; - } - - return NULL; -} - -static void _lockscreen_options_gl_options_sel(void *data, Evas_Object * obj, - void *event_info) -{ - Elm_Object_Item *item = (Elm_Object_Item *) event_info; - int index = (int)data; - app_list_item_s *list_item = (app_list_item_s *) - eina_list_nth(options_shortcuts_view_data->app_list, index); - - if (list_item == NULL || list_item->pkg_name == NULL) { - return; - } - LOCKOPTIONS_DBG("list_item->pkg_name = %s", list_item->pkg_name); - if (item != NULL) { - elm_genlist_item_selected_set(item, EINA_FALSE); - _lockscreen_options_shortcuts_set - (options_shortcuts_view_data->shortcuts_type, - list_item->pkg_name); - elm_gengrid_item_update - (options_shortcuts_view_data->selected_gengrid_item); - } - elm_naviframe_item_pop(options_shortcuts_view_data->ug_data->navi_bar); - Eina_Bool is_have = EINA_FALSE; - is_have = lockscreen_options_shortcuts_check_items(); - if(is_have == EINA_TRUE){ - elm_object_disabled_set(edit_item, EINA_FALSE); - }else{ - elm_object_disabled_set(edit_item, EINA_TRUE); - } -} - -void _lockscreen_options_select_applications_create(shortcuts_type_t - shortcuts_type) -{ - Evas_Object *genlist = NULL; - int index = 0; - - _lockscreen_options_list_all_packages(); - - options_shortcuts_view_data->shortcuts_type = shortcuts_type; - genlist = - elm_genlist_add(options_shortcuts_view_data->ug_data->navi_bar); - - ltc.item_style = "1text.1icon.2"; - ltc.func.text_get = _lockscreen_options_gl_text_get; - ltc.func.content_get = _lockscreen_options_gl_content_get; - ltc.func.state_get = NULL; - ltc.func.del = NULL; - - for (index = 0; - index < eina_list_count(options_shortcuts_view_data->app_list); - index++) { - elm_genlist_item_append(genlist, <c, (void *)index, NULL, - ELM_GENLIST_ITEM_NONE, - _lockscreen_options_gl_options_sel, - (void *)index); - } - - evas_object_event_callback_add(genlist, EVAS_CALLBACK_DEL, - _lockscreen_options_select_apps_delete_cb, - NULL); - elm_naviframe_item_push(options_shortcuts_view_data->ug_data->navi_bar, lockscreen_optoins_get_string(IDS_LOCKSCREEN_OPTIONS_SELECT_APPLICATIONS), NULL, NULL, genlist, NULL); /* the same tile */ -} - -static void _lockscreen_options_shortcuts_edit_cb(void *data, Evas_Object * obj, void *event_info) -{ - lockscreen_options_shortcuts_create_edit_view(data); -} - -void lockscreen_options_shortcuts_create_view(void *data) -{ - lockscreen_options_ug_data *ug_data = - (lockscreen_options_ug_data *) data; - if (ug_data == NULL) { - return; - } - Evas_Object *navi_bar = ug_data->navi_bar; - Evas_Object *layout = NULL; - - if (navi_bar == NULL) { - LOCKOPTIONS_ERR("navi_bar is null."); - return; - } - - options_shortcuts_view_data = - (options_shortcuts_view_s *) calloc(1, - sizeof - (options_shortcuts_view_s)); - options_shortcuts_view_data->ug_data = ug_data; - - layout = - lockscreen_options_util_create_layout(navi_bar, - EDJE_DIR - "/lockscreen-options.edj", - "lockscreen.options.shortcuts.main"); - _lockscreen_options_shortcuts_help_text_create(layout); - _lockscreen_options_shortcuts_gengrid_create(layout); - - edit_item= elm_button_add(navi_bar); - elm_object_style_set(edit_item, "naviframe/toolbar/default"); - elm_object_text_set(edit_item, _S("IDS_COM_BODY_EDIT")); - evas_object_smart_callback_add(edit_item, "clicked", _lockscreen_options_shortcuts_edit_cb, ug_data); - - Evas_Object *back_button = elm_button_add(navi_bar); - elm_object_style_set(back_button, "naviframe/back_btn/default"); - evas_object_smart_callback_add(back_button, "clicked", _lockscreen_options_shortcuts_back_cb, ug_data); - evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, - _lockscreen_options_shortcuts_delete_cb, NULL); - - - Elm_Object_Item *navi_item = elm_naviframe_item_push(navi_bar, lockscreen_optoins_get_string(IDS_LOCKSCREEN_OPTIONS_SET_SHORTCUTS), back_button, NULL, layout, NULL); /* the same tile */ - elm_object_item_part_content_set(navi_item , "toolbar_button1", edit_item); - - Eina_Bool is_have = EINA_FALSE; - is_have = lockscreen_options_shortcuts_check_items(); - if(is_have == EINA_TRUE){ - elm_object_disabled_set(edit_item, EINA_FALSE); - }else{ - elm_object_disabled_set(edit_item, EINA_TRUE); - } -} - -void lockscreen_options_shortcuts_update_view() -{ - Elm_Object_Item *object_item = NULL; - - object_item = elm_gengrid_first_item_get(options_shortcuts_view_data->gengrid); - while (object_item) { - elm_gengrid_item_update(object_item); - object_item = elm_gengrid_item_next_get(object_item); - } - - Eina_Bool is_have = EINA_FALSE; - is_have = lockscreen_options_shortcuts_check_items(); - if(is_have == EINA_TRUE){ - elm_object_disabled_set(edit_item, EINA_FALSE); - }else{ - elm_object_disabled_set(edit_item, EINA_TRUE); - } -} - -Eina_Bool lockscreen_options_shortcuts_check_items() -{ - char *pkg_name1 = NULL; - char *pkg_name2 = NULL; - char *pkg_name3 = NULL; - char *pkg_name4 = NULL; - Eina_Bool is_have = EINA_FALSE; - - pkg_name1 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT1); - pkg_name2 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT2); - pkg_name3 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT3); - pkg_name4 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT4); - - if((pkg_name1 == NULL || strlen(pkg_name1) == 0) && (pkg_name2 == NULL || strlen(pkg_name2) == 0) - && (pkg_name3 == NULL || strlen(pkg_name3) == 0) && (pkg_name4 == NULL || strlen(pkg_name4) == 0)) - { - is_have = EINA_FALSE; - //elm_object_disabled_set(edit_item, EINA_TRUE); - } - else - { - is_have = EINA_TRUE; - //elm_object_disabled_set(edit_item, EINA_FALSE); - } - if(pkg_name1 != NULL) - { - free(pkg_name1); - pkg_name1 = NULL; - } - if(pkg_name2 != NULL) - { - free(pkg_name2); - pkg_name2 = NULL; - } - if(pkg_name3 != NULL) - { - free(pkg_name3); - pkg_name3 = NULL; - } - if(pkg_name4 != NULL) - { - free(pkg_name4); - pkg_name4 = NULL; - } - return is_have; -} diff --git a/lock-setting/lockscreen-options/src/lockscreen-options-util.c b/lock-setting/lockscreen-options/src/lockscreen-options-util.c index 4d3afb2..cc5a7c5 100755 --- a/lock-setting/lockscreen-options/src/lockscreen-options-util.c +++ b/lock-setting/lockscreen-options/src/lockscreen-options-util.c @@ -26,35 +26,11 @@ const char *sys_str_table[] = { }; const char *app_str_table[] = { - "IDS_ST_BODY_SHORTCUTS", - "IDS_ST_BODY_SET_SHORTCUTS_ON_LOCK_SCREEN", -#if USE_TITLE_AND_CAMERA - "Lock screen title", - "Show title text on the lock screen", -#endif - //"Event notifications", "IDS_IDLE_MBODY_EVENT_NOTIFICATIONS", - //"View event notification on lock screen", "IDS_IDLE_BODY_VIEW_EVENT_NOTIFICATIONS_ON_THE_LOCK_SCREEN", - "Context-aware notifications", - "View context-aware notifications on lock screen", -#if USE_TITLE_AND_CAMERA - "IDS_ST_MBODY_CAMERA_QUICK_ACCESS", - "IDS_ST_BODY_TAP_AND_HOLD_THE_SCREEN_WHILE_ROTATING_THE_DEVICE_TO_OPEN_CAMERA", -#endif "IDS_ST_BODY_CLOCK", -// "Dual clock", -// "Show dual clock on lock screen when roaming", - "IDS_ST_BODY_WEATHER", "IDS_IM_BODY_HELP_TEXT", - "IDS_ST_BODY_SHOW_HELP_TEXT_ON_LOCK_SCREEN", - "IDS_ST_BODY_SET_SHORTCUTS", - "IDS_ST_OPT_EDIT_SHORTCUTS", - "IDS_ST_BODY_SET_SHORTCUTS_ON_LOCK_SCREEN", - "IDS_ST_BODY_TAP_SHORTCUT_TO_ASSIGN_APPLICATION", - "IDS_ST_BODY_DRAG_AND_DROP_TO_CHANGE_ORDER", - "IDS_ST_BODY_SELECT_APPLICATION", - "Life Magazine" + "IDS_ST_BODY_SHOW_HELP_TEXT_ON_LOCK_SCREEN" }; static Elm_Gen_Item_Class itc_underline; @@ -158,10 +134,8 @@ char *lockscreen_optoins_get_string(int id) char *str = NULL; if (id < IDS_LOCKSCREEN_OPTIONS_SYSTEM_STRING_MAX) { - /* get system string */ str = dgettext("sys_string", sys_str_table[id]); } else { - /* get application string */ str = dgettext(PKGNAME, app_str_table[id - diff --git a/lock-setting/lockscreen-options/src/lockscreen-options.c b/lock-setting/lockscreen-options/src/lockscreen-options.c index 363230e..ab3ab8a 100755 --- a/lock-setting/lockscreen-options/src/lockscreen-options.c +++ b/lock-setting/lockscreen-options/src/lockscreen-options.c @@ -69,8 +69,6 @@ static Evas_Object *create_frameview(Evas_Object * parent, { Evas_Object *base = NULL; - /* Create Frame view */ - return base; } @@ -105,8 +103,6 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, else ug_data->base = create_frameview(parent, ug_data); - /* Add del callback for base layout */ - return ug_data->base; } diff --git a/packaging/starter.spec b/packaging/starter.spec index a075865..d66e67d 100755 --- a/packaging/starter.spec +++ b/packaging/starter.spec @@ -74,21 +74,13 @@ GOPTION="-u 5000 -f" vconftool set -t int "memory/starter/sequence" 0 -i $GOPTION vconftool set -t int "memory/starter/use_volume_key" 0 -i $GOPTION -vconftool set -t string file/private/lockscreen/pkgname "org.tizen.draglock" -u 5000 -g 5000 +vconftool set -t string file/private/lockscreen/pkgname "org.tizen.lockscreen" -u 5000 -g 5000 vconftool set -t int memory/idle_lock/state "0" -i $GOPTION vconftool set -t bool memory/lockscreen/phone_lock_verification 0 -i $GOPTION -vconftool set -t bool db/lockscreen/shortcut_display 0 $GOPTION vconftool set -t bool db/lockscreen/event_notification_display 1 $GOPTION -vconftool set -t bool db/lockscreen/context_aware_notification_display 0 $GOPTION vconftool set -t bool db/lockscreen/clock_display 1 $GOPTION -vconftool set -t bool db/lockscreen/weather_display 1 $GOPTION vconftool set -t bool db/lockscreen/help_text_display 0 $GOPTION -vconftool set -t bool db/lockscreen/camera_quick_access 0 $GOPTION -vconftool set -t string file/lockscreen/shortcut1 "" $GOPTION -vconftool set -t string file/lockscreen/shortcut2 "" $GOPTION -vconftool set -t string file/lockscreen/shortcut3 "" $GOPTION -vconftool set -t string file/lockscreen/shortcut4 "" $GOPTION vconftool set -t string memory/menuscreen/desktop "0" -i -f vconftool set -t int memory/idle-screen/is_idle_screen_launched "0" -i -u 5000 -f @@ -110,15 +102,9 @@ sync %{_sysconfdir}/init.d/rd4starter %{_sysconfdir}/init.d/rd3starter %{_bindir}/starter -/usr/ug/lib/libug-openlock-setting.so -/usr/ug/lib/libug-openlock-setting.so.0.1.0 /usr/ug/lib/libug-lockscreen-options.so /usr/ug/lib/libug-lockscreen-options.so.0.1.0 /usr/ug/res/locale/*/LC_MESSAGES/* -/usr/ug/res/edje/* -/usr/ug/res/edje/ug-lockscreen-options-efl/* -/usr/ug/res/images/* -/usr/ug/res/images/ug-lockscreen-options-efl/* %{_libdir}/systemd/user/starter.service %{_libdir}/systemd/user/core-efl.target.wants/starter.service /usr/share/license/%{name} diff --git a/src/hw_key.c b/src/hw_key.c index 42bd288..12d2e22 100755 --- a/src/hw_key.c +++ b/src/hw_key.c @@ -87,7 +87,7 @@ static Eina_Bool _launch_home_screen(void *data) if (ret < 0) { _E("cannot launch package %s(err:%d)", package, ret); - if (-1 == ret) { // -1 : AUL returns '-1' when there is no package name in DB. + if (-1 == ret) { ret = aul_open_app(HOME_SCREEN_PKG_NAME); if (ret < 0) { _E("Failed to open a default home, %s(err:%d)", HOME_SCREEN_PKG_NAME, ret); @@ -328,7 +328,3 @@ void destroy_key_window(void) media_key_release(); } - - - -// End of a file diff --git a/src/lock-daemon.c b/src/lock-daemon.c index 9e722c5..0086c46 100755 --- a/src/lock-daemon.c +++ b/src/lock-daemon.c @@ -47,7 +47,7 @@ static int phone_lock_pid; struct lockd_data { int lock_app_pid; int phone_lock_app_pid; - int lock_type; /* 0:Normal, 1:Security, 2:Other */ + int lock_type; Eina_Bool request_recovery; lockw_data *lockw; GPollFD *gpollfd; @@ -291,7 +291,7 @@ static void lockd_unlock_lockscreen(struct lockd_data *lockd) inline static void lockd_set_sock_option(int fd, int cli) { int size; - struct timeval tv = { 1, 200 * 1000 }; /* 1.2 sec */ + struct timeval tv = { 1, 200 * 1000 }; size = PHLOCK_SOCK_MAXBUFF; setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size)); @@ -305,7 +305,7 @@ static int lockd_create_sock(void) struct sockaddr_un saddr; int fd; - fd = socket(AF_UNIX, SOCK_STREAM, 0); /* support above version 2.6.27 */ + fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd < 0) { if (errno == EINVAL) { fd = socket(AF_UNIX, SOCK_STREAM, 0); @@ -334,7 +334,6 @@ static int lockd_create_sock(void) } if (chmod(saddr.sun_path, (S_IRWXU | S_IRWXG | S_IRWXO)) < 0) { - /* Flawfinder: ignore */ LOCKD_DBG("failed to change the socket permission"); return -1; } @@ -461,7 +460,6 @@ static int lockd_sock_handler(void *data) lockd_set_sock_option(clifd, 1); - /* receive single packet from socket */ len = recv(clifd, cmd, PHLOCK_SOCK_MAXBUFF, 0); if (cmd == NULL) { @@ -478,10 +476,8 @@ static int lockd_sock_handler(void *data) LOCKD_DBG("cmd %s", cmd); - /* Read command line of the PID from proc fs */ cmdline = lockd_read_cmdline_from_proc(cr.pid); if (cmdline == NULL) { - /* It's weired. no file in proc file system, */ LOCKD_DBG("Error on opening /proc/%d/cmdline", cr.pid); close(clifd); return -1; diff --git a/src/lockd-debug.c b/src/lockd-debug.c old mode 100644 new mode 100755 index 69545de..323f706 --- a/src/lockd-debug.c +++ b/src/lockd-debug.c @@ -28,7 +28,7 @@ #include "lockd-debug.h" #define LINEMAX 256 -#define MAXFILELEN 1048576 /* 32000 */ +#define MAXFILELEN 1048576 #define LOGFILE "/tmp/starter.log" void lockd_log_t(char *fmt, ...) @@ -46,8 +46,7 @@ void lockd_log_t(char *fmt, ...) time_t current_time = 0; bzero((char *)&debugString, LINEMAX); time(¤t_time); - /* local_t = gmtime(¤t_time); */ - gmtime_r(¤t_time, &local_t); /* for prevent 53555 */ + gmtime_r(¤t_time, &local_t); int len = snprintf(debugString, sizeof(debugString), "[%d-%02d-%02d, %02d:%02d:%02d]: ", local_t.tm_year + 1900, local_t.tm_mon + 1, @@ -60,13 +59,10 @@ void lockd_log_t(char *fmt, ...) } len = g_strlcat(debugString, buf, LINEMAX); if (len >= LINEMAX) { - /* TODO:ERROR handling */ return; } else { debugString[len] = '\n'; } - /* FIXME this is for permission.. later we should fix and remove this... */ - /* system("chmod 666 "LOGFILE); */ if ((fd = fopen(LOGFILE, "at+")) == NULL) { LOCKD_DBG("File fopen fail for writing Pwlock information"); } else { @@ -80,7 +76,6 @@ void lockd_log_t(char *fmt, ...) execl("/bin/rm", "rm", "-f", LOGFILE, (char *)0); } - /* system("rm -rf "LOGFILE); */ } else { fseek(fd, 0l, SEEK_END); fileLen = ftell(fd); @@ -92,7 +87,6 @@ void lockd_log_t(char *fmt, ...) execl("/bin/rm", "rm", "-f", LOGFILE, (char *)0); } - /* system("rm -rf "LOGFILE); */ } else fclose(fd); } diff --git a/src/lockd-window-mgr.c b/src/lockd-window-mgr.c index a3ec625..45cb16e 100755 --- a/src/lockd-window-mgr.c +++ b/src/lockd-window-mgr.c @@ -42,10 +42,10 @@ struct _lockw_data { Ecore_Event_Handler *h_wincreate; Ecore_Event_Handler *h_winshow; - Ecore_Timer *pTimerId; /* volume key timer */ + Ecore_Timer *pTimerId; int volume_key_cnt; - int phone_lock_state; /* 0 : disable, 1 : enable */ + int phone_lock_state; int phone_lock_app_pid; }; diff --git a/src/menu_daemon.c b/src/menu_daemon.c index b432bf3..c199e78 100755 --- a/src/menu_daemon.c +++ b/src/menu_daemon.c @@ -43,13 +43,6 @@ int errno; #define RELAUNCH_INTERVAL 100*1000 #define RETRY_MAXCOUNT 30 - - -// Define prototype of the "hidden API of AUL" -//extern int aul_listen_app_dead_signal(int (*func)(int signal, void *data), void *data); - - - static struct info { pid_t home_pid; pid_t volume_pid; @@ -101,7 +94,7 @@ static inline void _open_homescreen(const char *pkgname) if (ret < 0 && strcmp(homescreen, HOME_SCREEN_PKG_NAME)) { _E("cannot launch package %s", homescreen); - if (-1 == ret) { // -1 : AUL returns '-1' when there is no package name in DB. + if (-1 == ret) { ret = aul_open_app(HOME_SCREEN_PKG_NAME); if (ret < 0) { _E("Failed to open a default home, %s(err:%d)", HOME_SCREEN_PKG_NAME, ret); @@ -149,7 +142,7 @@ static void _show_cb(keynode_t* node, void *data) _D("pid[%d] is terminated.", s_info.home_pid); pid = s_info.home_pid; - s_info.home_pid = -1; /* to freeze the dead_cb */ + s_info.home_pid = -1; if (aul_terminate_pid(pid) != AUL_R_OK) _E("Failed to terminate %d", s_info.home_pid); @@ -207,13 +200,9 @@ static void _pkg_changed(keynode_t* node, void *data) if (aul_terminate_pid(s_info.home_pid) != AUL_R_OK) _D("Failed to terminate pid %d", s_info.home_pid); } else { - /* If there is no running home */ _open_homescreen(pkgname); } - /* NOTE: Dead callback will catch the termination of a current menuscreen - * _open_homescreen(pkgname); - */ free(pkgname); return; } @@ -259,11 +248,9 @@ int menu_daemon_check_dead_signal(int pid) return 0; if (pid == s_info.home_pid) { - /* Relaunch */ _D("pkg_name : %s", pkgname); _open_homescreen(pkgname); } else if (pid == s_info.volume_pid) { - /* Relaunch */ _launch_volume(); } else { _D("Unknown process, ignore it (pid %d, home pid %d)", @@ -299,7 +286,6 @@ void menu_daemon_init(void *data) _E("Failed to add callback for show event"); _pkg_changed(NULL, NULL); - // THIS ROUTINE IS FOR SAT. vconf_set_int(VCONFKEY_IDLE_SCREEN_LAUNCHED, VCONFKEY_IDLE_SCREEN_LAUNCHED_TRUE); } @@ -314,7 +300,3 @@ void menu_daemon_fini(void) pkg_event_fini(); destroy_key_window(); } - - - -// End of a file diff --git a/src/pkg_event.c b/src/pkg_event.c old mode 100644 new mode 100755 index c1508f1..367e62f --- a/src/pkg_event.c +++ b/src/pkg_event.c @@ -84,7 +84,6 @@ directory_notify(void* data, Ecore_Fd_Handler* fd_handler) len = read(fd, buf, read_size); if (len < 0) { free(buf); - // Stop monitoring about this invalid file descriptor return ECORE_CALLBACK_CANCEL; } @@ -95,7 +94,6 @@ directory_notify(void* data, Ecore_Fd_Handler* fd_handler) ssize_t idx; int nev_name; - // 1. check the extension of a file nev_name = strlen(event->name) - 1; for (idx = 0; nev_name >= 0 && str_potksed[idx]; idx++) { if (event->name[nev_name] != str_potksed[idx]) { @@ -116,8 +114,7 @@ directory_notify(void* data, Ecore_Fd_Handler* fd_handler) package[nev_name + 1] = '\0'; _D("Package : %s", package); - // add & update - if (event->mask & IN_CLOSE_WRITE || event->mask & IN_MOVED_TO) { // for moving + if (event->mask & IN_CLOSE_WRITE || event->mask & IN_MOVED_TO) { ail_appinfo_h ai = NULL; ail_error_e ret; @@ -135,8 +132,7 @@ directory_notify(void* data, Ecore_Fd_Handler* fd_handler) } } else ; - // delete - } else if (event->mask & IN_DELETE) { // for deleting + } else if (event->mask & IN_DELETE) { if (ail_desktop_remove(package) < 0) _D("Failed to remove a package (%s)", event->name); } else { @@ -266,7 +262,6 @@ void pkg_event_init() s_desktop_notifier.handler = ecore_main_fd_handler_add(s_desktop_notifier.ifd, ECORE_FD_READ, directory_notify, NULL, NULL, NULL); if (!s_desktop_notifier.handler) { - // TODO: Handles me.. EXCEPTION!! _E("cannot add handler for inotify"); } } @@ -301,6 +296,3 @@ void pkg_event_fini(void) s_desktop_notifier.ifd = 0; } } - - -// End of a file diff --git a/src/xmonitor.c b/src/xmonitor.c old mode 100644 new mode 100755 index f337925..92d2a07 --- a/src/xmonitor.c +++ b/src/xmonitor.c @@ -27,11 +27,6 @@ #include #include #include -//#include -//#include -//#include -//#include -//#include #include "menu_daemon.h" #include "util.h" @@ -198,11 +193,6 @@ static inline void _sniff_all_windows(void) while (item->i < item->nr_of_wins) { ret = item->wins[item->i]; - /* - * Now we don't need to care about visibility of window, - * just check whether it is registered or not. - * (ecore_x_window_visible_get(ret)) - */ ecore_x_window_client_sniff(ret); new_item = malloc(sizeof(*new_item)); @@ -300,5 +290,3 @@ void xmonitor_fini(void) ecore_event_handler_del(xmonitor_info.focus_out_handler); xmonitor_info.focus_out_handler = NULL; } - -/* End of a file */ diff --git a/starter.init.sh b/starter.init.sh index b4e0f40..8b13789 100755 --- a/starter.init.sh +++ b/starter.init.sh @@ -1,2 +1 @@ -cp -f /usr/ug/lib/libug-openlock-setting.so /opt/ug/lib -cp -f /usr/ug/lib/libug-openlock-setting.so.0.1.0 /opt/ug/lib + -- 2.7.4