summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJisung Ahn <jcastle.ahn@samsung.com>2012-08-21 12:33:06 (GMT)
committerJisung Ahn <jcastle.ahn@samsung.com>2012-08-21 12:48:17 (GMT)
commita914248a31229bb81ed4ede970ca23e2490e0387 (patch)
tree8e3d763e83861131c778b442b3333496be1b23b7
parent8b42d4bb33943903b7160bb963bf7e7c6824e9ef (diff)
downloadug-image-viewer-efl-a914248a31229bb81ed4ede970ca23e2490e0387.zip
ug-image-viewer-efl-a914248a31229bb81ed4ede970ca23e2490e0387.tar.gz
ug-image-viewer-efl-a914248a31229bb81ed4ede970ca23e2490e0387.tar.bz2
initial upload
Change-Id: Ie9df15e2a3ce6a47e65f48aa0cfb43c2622b74d7
-rwxr-xr-xCMakeLists.txt52
-rwxr-xr-x[-rw-r--r--]NOTICE0
-rwxr-xr-xcommon/CMakeLists.txt36
-rwxr-xr-xcommon/NOTICE1
-rwxr-xr-xcommon/include/debug.h76
-rwxr-xr-xcommon/include/ivug-debug.h108
-rwxr-xr-xcommon/include/ivug-mouse-event.h43
-rwxr-xr-xcommon/include/statistics.h79
-rwxr-xr-xcommon/src/debug.c57
-rwxr-xr-xcommon/src/ivug-mouse-event.c300
-rwxr-xr-xcommon/src/statistics.c188
-rwxr-xr-xdebian/changelog8
-rwxr-xr-xdebian/compat1
-rwxr-xr-xdebian/control42
-rwxr-xr-xdebian/libug-image-viewer-efl.install.in3
-rwxr-xr-xdebian/libug-image-viewer-efl.postinst8
-rwxr-xr-xdebian/rules132
-rwxr-xr-xmain/CMakeLists.txt177
-rwxr-xr-xmain/NOTICE1
-rwxr-xr-xmain/layout/genlist/genlist_group_index.edc35
-rwxr-xr-xmain/layout/genlist/genlist_macro.edc32
-rwxr-xr-xmain/layout/genlist/genlist_size.edc31
-rwxr-xr-xmain/layout/genlist/genlist_styles.edc194
-rwxr-xr-xmain/layout/genlist/genlist_textblock_styles.edc79
-rwxr-xr-xmain/layout/genlist/ivug-genlist.edc47
-rwxr-xr-xmain/layout/images/T01_btn_cancel.pngbin4800 -> 0 bytes
-rwxr-xr-xmain/layout/images/T01_btn_cancel_press.pngbin4898 -> 0 bytes
-rwxr-xr-xmain/layout/images/T01_btn_ok.pngbin5070 -> 0 bytes
-rwxr-xr-xmain/layout/images/T01_btn_ok_dim.pngbin4515 -> 0 bytes
-rwxr-xr-xmain/layout/images/T01_btn_ok_press.pngbin5156 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/00_winset_btn_prev.pngbin3258 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/I01_control_top_bg.pngbin2814 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/T01_Option_header_bt.pngbin3064 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/T01_Option_header_bt_dim.pngbin24351 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/T01_Option_header_bt_press.pngbin2996 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/T01_btn_prev.pngbin3228 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/T01_control_top_arrow.pngbin3055 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/T01_control_top_bg.pngbin2812 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/T01_title_btn.pngbin3129 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/T01_title_btn_press.pngbin3126 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/T01_toolbar_bg.pngbin2797 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/T01_toolbar_press.pngbin2877 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/magnifier.pngbin5126 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/magnifier_line.pngbin4153 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/magnifier_noarrow.pngbin9467 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/magnifier_noarrow_line.pngbin9530 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/reader_handler_down.pngbin6139 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/reader_handler_up.pngbin3454 -> 0 bytes
-rwxr-xr-xmain/layout/images/gray-theme/reader_longtap_blue.pngbin2802 -> 0 bytes
-rwxr-xr-xmain/layout/ivug-base.edc53
-rwxr-xr-xmain/layout/ivug-button.edc1332
-rwxr-xr-xmain/layout/ivug-details.edc38
-rwxr-xr-xmain/layout/ivug-effect.edc31
-rwxr-xr-xmain/layout/ivug-icons.edc38
-rwxr-xr-xmain/layout/ivug-main.edc168
-rwxr-xr-xmain/layout/ivug-naviframe.edc2196
-rwxr-xr-xmain/layout/ivug-selectioninfo.edc64
-rwxr-xr-xmain/layout/ivug-setas.edc388
-rwxr-xr-xmain/layout/ivug-slider.edc79
-rwxr-xr-xmain/layout/ivug-toolbar.edc886
-rwxr-xr-xmain/res/images/01_Control icon/T01_controlbar_icon_info.pngbin3273 -> 0 bytes
-rwxr-xr-xmain/res/images/T01_Nocontents_broken.pngbin4880 -> 0 bytes
-rwxr-xr-xmain/res/po/CMakeLists.txt3
-rwxr-xr-xmain/res/po/POTFILES.in2
-rwxr-xr-xmain/res/po/de_DE.po27
-rwxr-xr-xmain/res/po/el_GR.po27
-rwxr-xr-xmain/res/po/en.po27
-rwxr-xr-xmain/res/po/es_ES.po27
-rwxr-xr-xmain/res/po/fr_FR.po27
-rwxr-xr-xmain/res/po/it_IT.po27
-rwxr-xr-xmain/res/po/ja_JP.po43
-rwxr-xr-xmain/res/po/ko_KR.po27
-rwxr-xr-xmain/res/po/nl_NL.po29
-rwxr-xr-xmain/res/po/pt_PT.po27
-rwxr-xr-xmain/res/po/ru_RU.po27
-rwxr-xr-xmain/res/po/tr_TR.po27
-rwxr-xr-xmain/res/po/zh_CN.po27
-rwxr-xr-xmain/res/po/zh_HK.po29
-rwxr-xr-xmain/res/po/zh_TW.po29
-rwxr-xr-xmain/src/common/ivug-common.h42
-rwxr-xr-xmain/src/common/ivug-config.c200
-rwxr-xr-xmain/src/common/ivug-config.h50
-rwxr-xr-xmain/src/common/ivug-datatypes.h32
-rwxr-xr-xmain/src/common/ivug-define.h60
-rwxr-xr-xmain/src/common/ivug-string.h112
-rwxr-xr-xmain/src/control/ivug-ext-ug.c75
-rwxr-xr-xmain/src/control/ivug-ext-ug.h34
-rwxr-xr-xmain/src/control/ivug-main.c258
-rwxr-xr-xmain/src/control/ivug-main.h44
-rwxr-xr-xmain/src/control/ivug-parameter.c271
-rwxr-xr-xmain/src/control/ivug-parameter.h87
-rwxr-xr-xmain/src/control/ivug-uuid.c94
-rwxr-xr-xmain/src/control/ivug-uuid.h52
-rwxr-xr-xmain/src/data/ivug-data-filter.c101
-rwxr-xr-xmain/src/data/ivug-data-filter.h56
-rwxr-xr-xmain/src/data/ivug-data-list.c282
-rwxr-xr-xmain/src/data/ivug-data-list.h40
-rwxr-xr-xmain/src/data/ivug-data-priv.h61
-rwxr-xr-xmain/src/data/ivug-data-shuffle.c238
-rwxr-xr-xmain/src/data/ivug-data-shuffle.h54
-rwxr-xr-xmain/src/data/ivug-data.c683
-rwxr-xr-xmain/src/data/ivug-data.h85
-rwxr-xr-xmain/src/data/ivug-mediadata.c301
-rwxr-xr-xmain/src/data/ivug-mediadata.h87
-rwxr-xr-xmain/src/effect/include/ivug-anim.h56
-rwxr-xr-xmain/src/effect/include/ivug-effect.h90
-rwxr-xr-xmain/src/effect/ivug-anim.c178
-rwxr-xr-xmain/src/effect/ivug-effect.c201
-rwxr-xr-xmain/src/effect/ivug-slide.c107
-rwxr-xr-xmain/src/effect/template.c83
-rwxr-xr-xmain/src/ug-image-viewer.c387
-rwxr-xr-xmain/src/ug-image-viewer.h35
-rwxr-xr-xmain/src/util/ivug-file-info.c403
-rwxr-xr-xmain/src/util/ivug-file-info.h57
-rwxr-xr-xmain/src/util/ivug-listpopup.c274
-rwxr-xr-xmain/src/util/ivug-listpopup.h81
-rwxr-xr-xmain/src/util/ivug-util.c286
-rwxr-xr-xmain/src/util/ivug-util.h78
-rwxr-xr-xmain/src/util/ivug-widget.c209
-rwxr-xr-xmain/src/util/ivug-widget.h68
-rwxr-xr-xmain/src/view/ivug-detail-info.c437
-rwxr-xr-xmain/src/view/ivug-detail-info.h80
-rwxr-xr-xmain/src/view/ivug-details-view.c300
-rwxr-xr-xmain/src/view/ivug-details-view.h64
-rwxr-xr-xmain/src/view/ivug-main-view.c1837
-rwxr-xr-xmain/src/view/ivug-main-view.h133
-rwxr-xr-xmain/src/view/ivug-popup.c262
-rwxr-xr-xmain/src/view/ivug-popup.h60
-rwxr-xr-xmain/src/view/ivug-setas-view.c1013
-rwxr-xr-xmain/src/view/ivug-setas-view.h97
-rwxr-xr-xmain/src/view/ivug-slider-item.c703
-rwxr-xr-xmain/src/view/ivug-slider-item.h137
-rwxr-xr-xmain/src/view/ivug-slider-mouse.c439
-rwxr-xr-xmain/src/view/ivug-slider-priv.h164
-rwxr-xr-xmain/src/view/ivug-slider-slideshow.c334
-rwxr-xr-xmain/src/view/ivug-slider.c1245
-rwxr-xr-xmain/src/view/ivug-slider.h95
-rwxr-xr-xpackaging/ug-image-viewer-efl.spec81
138 files changed, 5271 insertions, 15637 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a20194..9b7858c 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,52 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-SET(CMAKE_SOURCE_COMMON_DIR "${CMAKE_SOURCE_DIR}/common")
-SET(CMAKE_SOURCE_WIDGET_DIR "${CMAKE_SOURCE_DIR}/widget")
-SET(CMAKE_SOURCE_MAIN_DIR "${CMAKE_SOURCE_DIR}/main")
+SET(IVUG_PACKAGE_NAME "ug-image-viewer-efl")
-ADD_SUBDIRECTORY(common)
-ADD_SUBDIRECTORY(main)
+# BUILD_TC can have TRUE or FALSE
+SET(BUILD_TC FALSE)
+
+IF("${ARCH}" STREQUAL "arm")
+ ADD_DEFINITIONS("-DTARGET")
+ENDIF("${ARCH}" STREQUAL "arm")
+
+ADD_DEFINITIONS("-DDATADIR=\"${CMAKE_DATA_DIR}\"")
+ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+ADD_DEFINITIONS("-DPACKAGE=\"${IVUG_PACKAGE_NAME}\"")
+
+SET(IVUG_SOURCE_COMMON_DIR "${CMAKE_SOURCE_DIR}/common")
+SET(IVUG_SOURCE_WIDGET_DIR "${CMAKE_SOURCE_DIR}/widget")
+SET(IVUG_SOURCE_MAIN_DIR "${CMAKE_SOURCE_DIR}/main")
+SET(IVUG_SOURCE_MEDIA_DIR "${CMAKE_SOURCE_DIR}/medialist")
+SET(IVUG_SOURCE_SLIDESHOW_DIR "${CMAKE_SOURCE_DIR}/slideshow")
+SET(IVUG_SOURCE_FEATURE_DIR "${CMAKE_SOURCE_DIR}/feature")
+FUNCTION (BUILD_EDJ _in _out _base _dir)
+ ADD_CUSTOM_TARGET(${_out}
+ COMMAND
+ edje_cc -id ${_base}/${_dir}
+ ${CMAKE_CURRENT_SOURCE_DIR}/${_base}/${_in}
+ ${CMAKE_CURRENT_SOURCE_DIR}/${_base}/${_out}
+ DEPENDS
+ ${CMAKE_CURRENT_SOURCE_DIR}/${_base}/${_in}
+ )
+ ADD_DEPENDENCIES(${PROJECT_NAME} ${_out})
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_base}/${_out} DESTINATION ${CMAKE_INSTALL_PREFIX}/res/edje/${IVUG_PACKAGE_NAME})
+ENDFUNCTION (BUILD_EDJ)
+
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/images/ DESTINATION ${CMAKE_INSTALL_PREFIX}/res/images/${IVUG_PACKAGE_NAME})
+
+#CONFIGURE_FILE(${IVUG_PACKAGE_NAME}.desktop.in ${CMAKE_BINARY_DIR}/${IVUG_PACKAGE_NAME}.desktop)
+#INSTALL(FILES ${CMAKE_BINARY_DIR}/${IVUG_PACKAGE_NAME}.desktop DESTINATION /opt/share/applications)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/manifest/${IVUG_PACKAGE_NAME}.xml DESTINATION /opt/share/packages)
+
+ADD_SUBDIRECTORY(main)
+ADD_SUBDIRECTORY(common)
+ADD_SUBDIRECTORY(medialist)
+ADD_SUBDIRECTORY(widget)
+ADD_SUBDIRECTORY(slideshow)
+ADD_SUBDIRECTORY(feature)
+IF (BUILD_TC)
+ ADD_SUBDIRECTORY(TC)
+ENDIF()
diff --git a/NOTICE b/NOTICE
index e69de29..e69de29 100644..100755
--- a/NOTICE
+++ b/NOTICE
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index fca8475..f51ffea 100755
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -8,33 +8,55 @@ SET(SRCS
src/ivug-mouse-event.c
src/debug.c
src/statistics.c
+ src/ivug-uuid.c
+ src/ivug-util.c
+ src/ivug-drm.c
+ src/ivug-file-info.c
+ src/ivug-callback.c
+ src/ivug-config.c
+ src/ivug-message.c
+ src/ivug-exif.c
+ src/ivug-db.c
)
INCLUDE_DIRECTORIES(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/include
+ include
+ src
)
+MESSAGE("Checking " ${PROJECT_NAME} )
+
INCLUDE(FindPkgConfig)
-pkg_check_modules(commonpkgs REQUIRED
+pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED
elementary
evas
- ui-gadget
+ ecore-evas
+ ecore-file
+ efreet-mime
dlog
+ drm-client
+ libexif
+ vconf
+ capi-system-power
+ capi-media-metadata-extractor
+ capi-content-mime-type
+ capi-content-media-content
)
-FOREACH(flag ${commonpkgs_CFLAGS})
+FOREACH(flag ${${PROJECT_NAME}_pkgs_CFLAGS})
SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}")
ENDFOREACH(flag)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS} -Wall")
-SET(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS})
+SET(CMAKE_C_FLAGS "${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 ${VERSION} )
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${commonpkgs_LDFLAGS} -lm )
+
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${${PROJECT_NAME}_pkgs_LDFLAGS})
INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
diff --git a/common/NOTICE b/common/NOTICE
deleted file mode 100755
index ded3804..0000000
--- a/common/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. \ No newline at end of file
diff --git a/common/include/debug.h b/common/include/debug.h
index 4f6bf64..daa8583 100755
--- a/common/include/debug.h
+++ b/common/include/debug.h
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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 __ELM_MYPHOTOCAM_DEBUG_H__
#define __ELM_MYPHOTOCAM_DEBUG_H__
@@ -97,6 +96,8 @@ enum
extern "C" {
#endif
+#undef DISABLE_LOG
+
// Time analyzer
#define DEFINE_PERFORM_TIME(aa) long aa = 0; struct timeval tv
@@ -122,7 +123,19 @@ typedef struct {
unsigned long time;
} debug_msg_type;
-void _custom_debug_msg(debug_msg_type *debug_msg, const char *msg, ...);
+void __custom_debug_msg(debug_msg_type *debug_msg, const char *msg, ...);
+
+#ifdef DISABLE_LOG
+
+#define __MSG_FATAL(level, szCat, ...)
+#define __MSG_ERROR(level, szCat, ...)
+#define __MSG_WARN(level, szCat, ...)
+#define __MSG_HIGH(level, szCat, ...)
+#define __MSG_MED(level, szCat, ...)
+#define __MSG_LOW(level, szCat, ...)
+#define __MSG_DEBUG(level, szCat, ...)
+
+#else // DISABLE_LOG
/* coverity[+kill] */
#define __MSG_FATAL(level, szCat, ...) \
@@ -136,7 +149,7 @@ void _custom_debug_msg(debug_msg_type *debug_msg, const char *msg, ...);
DBG_MSG_FATAL, \
"FATAL", \
}; \
- _custom_debug_msg(&msg______unique______name___, ##__VA_ARGS__); \
+ __custom_debug_msg(&msg______unique______name___, ##__VA_ARGS__); \
} \
} while(0)
@@ -151,7 +164,7 @@ void _custom_debug_msg(debug_msg_type *debug_msg, const char *msg, ...);
DBG_MSG_ERROR, \
"ERROR", \
}; \
- _custom_debug_msg(&msg______unique______name___, ##__VA_ARGS__); \
+ __custom_debug_msg(&msg______unique______name___, ##__VA_ARGS__); \
} \
} while(0)
@@ -167,7 +180,7 @@ void _custom_debug_msg(debug_msg_type *debug_msg, const char *msg, ...);
DBG_MSG_WARN, \
"WARN", \
}; \
- _custom_debug_msg(&msg______unique______name___, ##__VA_ARGS__); \
+ __custom_debug_msg(&msg______unique______name___, ##__VA_ARGS__); \
} \
} while(0)
@@ -182,7 +195,7 @@ void _custom_debug_msg(debug_msg_type *debug_msg, const char *msg, ...);
DBG_MSG_HIGH, \
"HIGH", \
}; \
- _custom_debug_msg(&msg______unique______name___, ##__VA_ARGS__); \
+ __custom_debug_msg(&msg______unique______name___, ##__VA_ARGS__); \
} \
} while(0)
@@ -197,7 +210,7 @@ void _custom_debug_msg(debug_msg_type *debug_msg, const char *msg, ...);
DBG_MSG_MED, \
"MED", \
}; \
- _custom_debug_msg(&msg______unique______name___, ##__VA_ARGS__); \
+ __custom_debug_msg(&msg______unique______name___, ##__VA_ARGS__); \
} \
} while(0)
@@ -213,10 +226,27 @@ void _custom_debug_msg(debug_msg_type *debug_msg, const char *msg, ...);
DBG_MSG_LOW, \
"LOW", \
}; \
- _custom_debug_msg(&msg______unique______name___, ##__VA_ARGS__); \
+ __custom_debug_msg(&msg______unique______name___, ##__VA_ARGS__); \
} \
} while(0)
+#define __MSG_DBG(level, szCat, ...) \
+ do { \
+ if ((level) & DBG_MSG_BIT_CUST13) \
+ { \
+ static debug_msg_type msg______unique______name___ = { \
+ __FILE__, \
+ __LINE__, \
+ szCat, \
+ DBG_MSG_BIT_CUST13, \
+ "DBG", \
+ }; \
+ __custom_debug_msg(&msg______unique______name___, ##__VA_ARGS__); \
+ } \
+ } while(0)
+
+
+#endif // DISABLE_LOG
#define ASSERT(level, szCat, expr) \
do { \
diff --git a/common/include/ivug-debug.h b/common/include/ivug-debug.h
index fae7537..94621ce 100755
--- a/common/include/ivug-debug.h
+++ b/common/include/ivug-debug.h
@@ -1,27 +1,57 @@
-/*
- * 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.
- */
-
+/*
+ * 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 _IVUG_DEBUG_H_
#define _IVUG_DEBUG_H_
#include <dlog.h>
+#include "statistics.h"
#define IVUG_LOG_OUTPUT_DLOG
+#define PERF_TIME
+
+#define LVL0 (0)
+#define LVL1 (1)
+#define LVL2 (2)
+#define LVL3 (3)
+#define LVL4 (4)
+#define LVL5 (5)
+#define LVL6 (6)
+#define LVL7 (7)
+
+#ifdef PERF_TIME
+
+// accum item handling
+#define PERF_CHECK_BEGIN(lvl, name) iv_ta_accum_item_begin(lvl, name,false,__FILE__,__LINE__)
+#define PERF_CHECK_END(lvl, name) iv_ta_accum_item_end(lvl, name,false,__FILE__,__LINE__)
+
+// Print out
+#define PERF_SHOW_RESULT(fp) iv_ta_accum_show_result_fp(fp)
+
+#else
+
+#define PERF_CHECK_BEGIN(lvl, name)
+#define PERF_CHECK_END(lvl, name)
+
+// Print out
+#define PERF_SHOW_RESULT(fp)
+
+#endif // PERF_TIME
+
enum {
IVUG_MSG_COLOR_DEFAULT = 0,
IVUG_MSG_COLOR_BLACK = 30,
@@ -34,6 +64,7 @@ enum {
IVUG_MSG_COLOR_WHITE = 37,
};
+
#ifdef IVUG_LOG_OUTPUT_DLOG
#undef LOG_TAG
@@ -48,8 +79,8 @@ enum {
#define IVUG_DEBUG_MSG(fmt, arg...) fprintf(stdout, "[D: %s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
#define IVUG_DEBUG_WARNING(fmt, arg...) fprintf(stdout, "[W: %s : %05d]" fmt "\n", __func__, __LINE__, ##arg)
#define IVUG_DEBUG_ERROR(fmt, arg...) fprintf(stdout, "[E: %s : %05d]" fmt "\n", __func__, __LINE__ , ##arg)
-#define IVUG_DEBUG_CRITICAL(fmt, arg...) fprintf(stdout, "[E: %s : %05d]" fmt "\n", __func__, __LINE__ , ##arg)
-#define IVUG_DEBUG_PRINT(fmt,arg...) fprintf(stdout, "[%s : %05d] >>> leave \n", __func__, __LINE__ , ##arg)
+#define IVUG_DEBUG_CRITICAL(fmt, arg...) fprintf(stdout, "[E: %s : %05d]" fmt "\n", __func__, __LINE__ , ##arg)
+#define IVUG_DEBUG_PRINT(fmt,arg...) fprintf(stdout, "[%s : %05d] >>> leave \n", __func__, __LINE__ , ##arg)
#endif //IVUG_LOG_OUTPUT_DLOG
@@ -204,18 +235,29 @@ enum {
#define MSG_SLIST_MED(...) __MSG_MED(LVL_SLIST_ITEM, SLIST_ITEM_SZ, ##__VA_ARGS__)
#define MSG_SLIST_LOW(...) __MSG_LOW(LVL_SLIST_ITEM, SLIST_ITEM_SZ, ##__VA_ARGS__)
-
#define IV_ASSERT(expr) ASSERT(DBG_MSG_LVL_ALL, "IV-COMMON", expr)
+#define MSG_ASSERT(expr) ASSERT(DBG_MSG_LVL_ALL, LOG_CAT, expr)
+
+#define MSG_FATAL(...) __MSG_FATAL(LOG_LVL, LOG_CAT, ##__VA_ARGS__)
+#define MSG_WARN(...) __MSG_ERROR(LOG_LVL, LOG_CAT, ##__VA_ARGS__)
+#define MSG_ERROR(...) __MSG_WARN(LOG_LVL, LOG_CAT, ##__VA_ARGS__)
+#define MSG_HIGH(...) __MSG_HIGH(LOG_LVL, LOG_CAT, ##__VA_ARGS__)
+#define MSG_MED(...) __MSG_MED(LOG_LVL, LOG_CAT, ##__VA_ARGS__)
+#define MSG_LOW(...) __MSG_LOW(LOG_LVL, LOG_CAT, ##__VA_ARGS__)
+#define MSG_DEBUG(...) __MSG_DBG(LOG_LVL, LOG_CAT, ##__VA_ARGS__)
+
+//expr check statements.
+// Will deprecated
#define IVUG_FUNC_ENTER() MSG_IVUG_HIGH("ENTER %s(L%d)", __func__, __LINE__)
#define IVUG_FUNC_LEAVE() MSG_IVUG_HIGH("LEAVE %s(L%d)", __func__, __LINE__)
-//expr check statements
+
#define ivug_ret_if(expr) \
do { \
if(expr) { \
- MSG_IMAGEVIEW_WARN("[%s] Return", #expr );\
+ MSG_IVUG_ERROR("[%s] Return", #expr );\
return; \
} \
} while (0)
@@ -223,7 +265,7 @@ enum {
#define ivug_retv_if(expr, val) \
do { \
if(expr) { \
- MSG_IMAGEVIEW_WARN("[%s] Return value %d", #expr, val );\
+ MSG_IVUG_ERROR("[%s] Return value %d", #expr, val );\
return (val); \
} \
} while (0)
@@ -231,7 +273,7 @@ enum {
#define ivug_retm_if(expr, fmt, args...) \
do { \
if(expr) { \
- MSG_IMAGEVIEW_WARN("[%s] Return, message "fmt, #expr, ##args );\
+ MSG_IVUG_ERROR("[%s] Return, message "fmt, #expr, ##args );\
return; \
} \
} while (0)
@@ -239,12 +281,30 @@ enum {
#define ivug_retvm_if(expr, val, fmt, args...) \
do { \
if(expr) { \
- MSG_IMAGEVIEW_WARN("[%s] Return value, message "fmt, #expr, ##args );\
+ MSG_IVUG_ERROR("[%s] Return value, message "fmt, #expr, ##args );\
return (val); \
} \
} while (0)
+// Use this instead of ivug_ret_if
+
+#define IV_RET_IF(expr, fmt, args...) \
+ do { \
+ if(expr) { \
+ MSG_IVUG_FATAL("[%s] Return, message "fmt, #expr, ##args );\
+ return; \
+ } \
+ } while (0)
+
+#define IV_RETV_IF(expr, val, fmt, args...) \
+ do { \
+ if(expr) { \
+ MSG_IVUG_FATAL("[%s] Return value, message "fmt, #expr, ##args );\
+ return (val); \
+ } \
+ } while (0)
+
#include "debug.h"
diff --git a/common/include/ivug-mouse-event.h b/common/include/ivug-mouse-event.h
index 40ecc5a..cc2832a 100755
--- a/common/include/ivug-mouse-event.h
+++ b/common/include/ivug-mouse-event.h
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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.
+ */
#pragma once
@@ -36,13 +35,25 @@ typedef struct {
void (*onMouseUp)(Evas_Object *obj, MouseEvent *up, void *data);
void (*onMouseMove)(Evas_Object *obj, MouseEvent *prev, MouseEvent *cur, void *data);
+ void (*onPinchStart)(Evas_Object *obj, MouseEvent *center, int dist, void *data);
+ void (*onPinchMove)(Evas_Object *obj, MouseEvent *center, int dist, void *data);
+ void (*onPinchEnd)(Evas_Object *obj, MouseEvent *end, void *data); // Is it really needed????
+
} mouse_callback_t;
typedef void *Ivug_Event_Handle;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
Ivug_Event_Handle
ivug_mouse_event_add(Evas_Object *obj, mouse_callback_t *pCallback, void *client_data, const char *alias /* for debugging*/);
void ivug_mouse_event_del(Ivug_Event_Handle handle);
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/common/include/statistics.h b/common/include/statistics.h
index 3ef8df9..fa455de 100755
--- a/common/include/statistics.h
+++ b/common/include/statistics.h
@@ -1,71 +1,40 @@
-/*
- * 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 __ELM_MYPHOTOCAM_STATISTICS_H__
-#define __ELM_MYPHOTOCAM_STATISTICS_H__
+/*
+ * 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 __STATISTICS_H__
+#define __STATISTICS_H__
#include <stdbool.h>
#include <stdio.h>
-#define PERF_TIME
-
-#define LVL1 " "
-#define LVL2 " "
-#define LVL3 " "
-#define LVL4 " "
-#define LVL5 " "
-#define LVL6 " "
-
-
#ifdef __cplusplus
extern "C" {
#endif
-int mm_ta_accum_item_begin(const char* name, bool show, const char* filename, int line);
-int mm_ta_accum_item_end(const char* name, bool show, const char* filename, int line);
-void mm_ta_accum_show_result_fp(FILE *fp);
-
-int PERF_INIT();
-int PERF_DEINIT();
-
-#ifdef PERF_TIME
-
-// accum item handling
-#define PERF_CHECK_BEGIN(name) mm_ta_accum_item_begin(name,false,__FILE__,__LINE__)
-#define PERF_CHECK_END(name) mm_ta_accum_item_end(name,false,__FILE__,__LINE__)
-
-// Print out
-#define PERF_SHOW_RESULT(fp) mm_ta_accum_show_result_fp(fp)
-
-#else
-
-#define PERF_CHECK_BEGIN(name)
-#define PERF_CHECK_END(name)
-
-// Print out
-#define PERF_SHOW_RESULT(fp)
-
+int iv_ta_accum_item_begin(int lvl, const char* name, bool show, const char* filename, int line);
+int iv_ta_accum_item_end(int lvl, const char* name, bool show, const char* filename, int line);
+void iv_ta_accum_show_result_fp(FILE *fp);
-#endif // PERF_TIME
+int IV_PERF_INIT();
+int IV_PERF_DEINIT();
#ifdef __cplusplus
}
#endif
-#endif /* __ELM_MYPHOTOCAM_STATISTICS_H__ */
+#endif /* __STATISTICS_H__ */
diff --git a/common/src/debug.c b/common/src/debug.c
index 800d69a..2dc7e7c 100755
--- a/common/src/debug.c
+++ b/common/src/debug.c
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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 <stdio.h>
#include <stdarg.h>
@@ -102,30 +101,16 @@ static unsigned long get_sys_elapsed_time(void)
return ((current_time.tv_sec * 1E3 + current_time.tv_usec / 1E3) - (init_time.tv_sec * 1E3 + init_time.tv_usec / 1E3));
}
-char *get_fmt_string__inline (const char *msg, va_list va)
-{
-#define MAX_CHAR_PER_LINE ( 1024 )
-
- static char szPrint[MAX_CHAR_PER_LINE];
-
- vsnprintf(szPrint, 1024, msg, va);
-
- return szPrint;
-}
-
-
void _custom_debug_init()
{
get_sys_elapsed_time();
}
-
void _custom_debug_deinit()
{
}
-
void
_custom_err_trace_write( const char *func_name, int line_num, const char *fmt, ... )
{
@@ -240,7 +225,7 @@ DBG_MSG_CUST13 = 14,
-void _custom_debug_msg(debug_msg_type *debug_msg, const char *msg, ...)
+void __custom_debug_msg(debug_msg_type *debug_msg, const char *msg, ...)
{
va_list va;
@@ -270,7 +255,7 @@ void _custom_debug_msg(debug_msg_type *debug_msg, const char *msg, ...)
if ( _DEBUG_OUTPUT_DIRECTION & _DEBUG_OUTPUT_DIRECTION_CONSOLE )
{
- printf(_DEBUG_PREFIX"%s[F:%-16.16s L:%5d][%s:%s] ",time_string , pFileName, debug_msg->nline , debug_msg->szcategory, level );
+ printf(_DEBUG_PREFIX"%s[F:%-16.16s L:%5d][%s:%s] ", time_string , pFileName, debug_msg->nline , debug_msg->szcategory, level );
vprintf(msg, va);
printf("\n");
}
@@ -291,6 +276,14 @@ void _custom_debug_msg(debug_msg_type *debug_msg, const char *msg, ...)
// vprint_log(prio,_DEBUG_MODULE, msg, va);
}
+#if 0
+ if ( _DEBUG_OUTPUT_DIRECTION & _DEBUG_OUTPUT_DIRECTION_FILE )
+ {
+ fprintf(_DEBUG_PREFIX"%s[F:%-16.16s L:%5d][%s:%s] ",time_string , pFileName, debug_msg->nline , szCategory[debug_msg->category], level );
+ vprintf(msg, va);
+ fprintf("\n");
+ }
+#endif
va_end(va);
if ( G_UNLIKELY(debug_msg->msg_level == DBG_MSG_FATAL) )
diff --git a/common/src/ivug-mouse-event.c b/common/src/ivug-mouse-event.c
index db3e52c..e58240a 100755
--- a/common/src/ivug-mouse-event.c
+++ b/common/src/ivug-mouse-event.c
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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 <Elementary.h>
#include <stdbool.h>
@@ -32,12 +31,16 @@ typedef enum {
MOUSE_DOWN_UNKNWON,
MOUSE_DOWN_NONE,
MOUSE_DOWN_1,
- MOUSE_DOWN_ERROR, // Error
+ MOUSE_DOWN_2,
+ MOUSE_DOWN_3,
+ MOUSE_DOWN_4, // Invalid state.
} MouseState;
+
#define INVALID_DEVICE_ID (-1)
-#define NUM_MAX_BUTTON (1)
+#define MULTI_INDEX (9)
+#define NUM_MAX_BUTTON (3)
typedef struct _mouse_data_t{
void *pClientData;
@@ -56,8 +59,12 @@ typedef struct _mouse_data_t{
unsigned int prev_dist;
- MouseEvent center;
+ int multi_min_idx; // multi min index is different in each target. Temp solution
+ bool bSendPinchStart;
+
+ MouseEvent center;
+ int pinch_dist;
// For debugging purpose, later will be removed.
char alias[100]; //
} mouse_data_t;
@@ -67,6 +74,15 @@ typedef struct _mouse_data_t{
#define __UNUSED__ __attribute__((unused))
#endif
+static unsigned int _get_distance(int prevX, int prevY, int X, int Y)
+{
+#include <math.h>
+ int dx = prevX - X;
+ int dy = prevY - Y;
+
+ return sqrt(dx*dx + dy*dy);
+}
+
static void _on_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info)
{
if ( data == NULL )
@@ -116,6 +132,55 @@ static void _on_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj,
MSG_MOUSE_MED("Func:%s Device=%d XY(%d,%d)", "_on_mouse_down", pressed, ev->x , ev->y );
}
+ else if ( pData->m_state == MOUSE_DOWN_2 )
+ {
+ MouseEvent *other = NULL;
+
+ if ( pData->bDown[ (pressed + 1) % NUM_MAX_BUTTON] == true )
+ {
+ other = &pData->event[(pressed + 1) % NUM_MAX_BUTTON];
+ }
+
+ if ( pData->bDown[(pressed + 2) % NUM_MAX_BUTTON] == true )
+ {
+ if ( other != NULL )
+ {
+ MSG_MOUSE_ERROR("Error!!!");
+ }
+ other = &pData->event[(pressed + 2) % NUM_MAX_BUTTON];
+ }
+
+ if ( other == NULL )
+ {
+ MSG_MOUSE_ERROR("[%s] Error! Pressed(%d,%d,%d)", pData->alias,
+ pData->bDown[0],
+ pData->bDown[1],
+ pData->bDown[2]);
+
+ return ; // Fix for B/S
+ }
+
+ int centerX = ( other->x + ev->x ) / 2;
+ int centerY = ( other->y + ev->y ) / 2;
+
+ int dist = _get_distance(other->x, other->y, ev->x, ev->y);
+
+ MSG_MOUSE_HIGH("[%s] Callback PinchStart : Dev=%d OtherDev=%d Center(%d,%d) Dist=%d", pData->alias, ev->device, other->device, centerX, centerY, dist);
+
+ if ( pData->cb.onPinchStart )
+ {
+ pData->center.x = centerX;
+ pData->center.y = centerY;
+ pData->center.timestamp = ev->timestamp;
+ pData->pinch_dist = dist;
+
+ (pData->cb.onPinchStart)(pData->obj, &pData->center, dist, pData->pClientData);
+ }
+
+ pData->prev_dist = dist;
+
+ MSG_MOUSE_HIGH("[%s] Two fingure is clicked. Distance=%d", pData->alias, pData->prev_dist);
+ }
else
{
MSG_MOUSE_WARN("[%s] Ignore third finger! State=%d Dev=%d bPressed(%d,%d,%d)", pData->alias, pData->m_state, ev->device,
@@ -189,7 +254,17 @@ static void _on_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj, vo
pData->bDown[pressed] = false;
- if ( pData->m_state == MOUSE_DOWN_NONE )
+ if ( pData->m_state == MOUSE_DOWN_1 )
+ {
+ MSG_MOUSE_HIGH("[%s] Callback Pinch End", pData->alias);
+
+ if ( pData->cb.onPinchEnd )
+ {
+ pData->bSendPinchStart = false;
+ (pData->cb.onPinchEnd)(pData->obj, ev, pData->pClientData);
+ }
+ }
+ else if ( pData->m_state == MOUSE_DOWN_NONE )
{
MSG_MOUSE_HIGH("[%s] Callback Mouse Up : Dev=%d (%d,%d)", pData->alias, ev->device, ev->x, ev->y);
@@ -248,25 +323,83 @@ static void _on_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj,
switch ( pData->m_state )
{
- case MOUSE_DOWN_1:
+ case MOUSE_DOWN_3:
+ // Ignore Mouse Event when all 3 buttons is pressed.
+ return ;
+ case MOUSE_DOWN_2:
+ {
+ MouseEvent *other = NULL;
+
+ if ( pData->bDown[ (pressed + 1) % NUM_MAX_BUTTON] == true )
{
- MSG_MOUSE_MED("Func:%s. Device=%d Old(%d,%d) Cur(%d,%d)", __FUNCTION__, pressed,
- pData->event[pressed].x, pData->event[pressed].y,
- ev->x , ev->y);
+ other = &pData->event[(pressed + 1) % NUM_MAX_BUTTON];
+ }
- if ( pData->cb.onMouseMove )
+ if ( pData->bDown[(pressed + 2) % NUM_MAX_BUTTON] == true )
+ {
+ if ( other != NULL )
{
- MSG_MOUSE_MED("[%s] Callback Mouse Move : (%d,%d)", pData->alias, ev->x, ev->y);
- (pData->cb.onMouseMove)(pData->obj, &pData->event[pressed], ev, pData->pClientData);
+ MSG_MOUSE_ERROR("Debug me!!!");
}
+ other = &pData->event[(pressed + 2) % NUM_MAX_BUTTON];
+ }
+
+ if ( other == NULL )
+ {
+ MSG_MOUSE_ERROR("[%s] Error! Pressed(%d,%d,%d)", pData->alias,
+ pData->bDown[0],
+ pData->bDown[1],
+ pData->bDown[2]);
+
+ // TODO : Recover.
+ return;
+ }
- pData->event[pressed] = *ev;
+ int centerX = ( other->x + ev->x ) / 2;
+ int centerY = ( other->y + ev->y ) / 2;
- break;
+ int dist = _get_distance(other->x, other->y, ev->x, ev->y);
+
+ if ( pData->cb.onPinchMove )
+ {
+ MSG_MOUSE_MED("Callback Pinch : (%d,%d) dDistance=%d", centerX, centerY, dist - pData->prev_dist);
+
+ pData->center.x = centerX;
+ pData->center.y = centerY;
+ pData->center.timestamp = ev->timestamp;
+ pData->pinch_dist = dist;
+
+ (pData->cb.onPinchMove)(pData->obj, &pData->center, pData->pinch_dist , pData->pClientData);
+ }
+
+ pData->prev_dist = dist;
+
+ MSG_MOUSE_LOW("Pinch zoom. Pos1(%d,%d) Pos2(%d,%d) Delta=%d", other->x, other->y, ev->x, ev->y, pData->prev_dist);
+
+ pData->event[pressed] = *ev;
+
+ return ;
+ }
+ break;
+ case MOUSE_DOWN_1:
+ {
+ MSG_MOUSE_MED("Func:%s. Device=%d Old(%d,%d) Cur(%d,%d)", __FUNCTION__, pressed,
+ pData->event[pressed].x, pData->event[pressed].y,
+ ev->x , ev->y);
+
+ if ( pData->cb.onMouseMove )
+ {
+ MSG_MOUSE_MED("[%s] Callback Mouse Move : (%d,%d)", pData->alias, ev->x, ev->y);
+ (pData->cb.onMouseMove)(pData->obj, &pData->event[pressed], ev, pData->pClientData);
}
- default:
- MSG_MOUSE_ERROR("[%s] Something wrong. state=%d", pData->alias, pData->m_state);
- break;
+
+ pData->event[pressed] = *ev;
+
+ break;
+ }
+ default:
+ MSG_MOUSE_ERROR("[%s] Something wrong. state=%d", pData->alias, pData->m_state);
+ break;
}
@@ -333,6 +466,102 @@ static void _proxy_on_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object
}
+static void _proxy_on_mouse_multi_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info)
+{
+ Evas_Event_Multi_Down *ev = event_info;
+ mouse_data_t *pData = data;
+
+ MouseEvent event;
+
+ if ( pData->multi_min_idx == INVALID_DEVICE_ID)
+ {
+ MSG_MOUSE_HIGH("[%s] Min Device Index=%d", pData->alias, ev->device);
+ pData->multi_min_idx = ev->device -1; // Index start from 0. so -1 is needed
+ }
+
+ event.device = ev->device - pData->multi_min_idx; // ev->device is 10(for second), 11(3rd), 12(4th) finger
+ event.timestamp = ev->timestamp;
+ event.x = ev->canvas.x;
+ event.y = ev->canvas.y;
+ event.button_flags = 0;
+ event.event_flags = ev->event_flags;
+
+
+ if(event.device >= NUM_MAX_BUTTON)
+ {
+ MSG_MOUSE_FATAL("[%s] Invalid Device. Dev=%d Min=%d", pData->alias, event.device, pData->multi_min_idx);
+ return;
+ }
+
+ MSG_MOUSE_MED("%s Dev=%d", __func__, ev->device);
+
+ _on_mouse_down(data, NULL, obj, (void *)&event);
+}
+
+static void _proxy_on_mouse_multi_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info)
+{
+ Evas_Event_Multi_Up *ev = event_info;
+ mouse_data_t *pData = data;
+
+ MouseEvent event;
+
+ if ( pData->multi_min_idx == INVALID_DEVICE_ID)
+ {
+ // Sometimes Multi up came ealry
+ MSG_MOUSE_HIGH("[%s] Min Device Index=%d", pData->alias, ev->device);
+ pData->multi_min_idx = ev->device -1; // Index start from 0. so -1 is needed
+ }
+
+ event.device = ev->device - pData->multi_min_idx;
+ event.timestamp = ev->timestamp;
+ event.x = ev->canvas.x;
+ event.y = ev->canvas.y;
+ event.button_flags = 0;
+ event.event_flags = ev->event_flags;
+
+ if(event.device >= NUM_MAX_BUTTON)
+ {
+ MSG_MOUSE_FATAL("[%s] Invalid Device. Dev=%d Min=%d", pData->alias, event.device, pData->multi_min_idx);
+ return;
+ }
+
+ MSG_MOUSE_MED("%s Dev=%d", __func__, ev->device);
+
+ _on_mouse_up(data, NULL, obj, (void *)&event);
+
+}
+
+static void _proxy_on_mouse_multi_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info)
+{
+ Evas_Event_Multi_Move *ev = event_info;
+ mouse_data_t *pData = data;
+
+ MouseEvent event;
+
+ if ( pData->multi_min_idx == INVALID_DEVICE_ID)
+ {
+ // Mouse Move come faster than Mouse down
+ MSG_MOUSE_HIGH("[%s] Min Device Index=%d", pData->alias, ev->device);
+ pData->multi_min_idx = ev->device -1;
+ }
+
+ event.device = ev->device - pData->multi_min_idx;
+ event.timestamp = ev->timestamp;
+ event.x = ev->cur.canvas.x;
+ event.y = ev->cur.canvas.y;
+ event.button_flags = 0;
+ event.event_flags = ev->event_flags;
+
+ if(event.device >= NUM_MAX_BUTTON)
+ {
+ MSG_MOUSE_FATAL("[%s] Invalid Device. Dev=%d Min=%d", pData->alias, event.device, pData->multi_min_idx);
+ return;
+ }
+
+ MSG_MOUSE_MED("%s Dev=%d", __func__, ev->device);
+
+ _on_mouse_move(data, NULL, obj, (void *)&event);
+}
Ivug_Event_Handle
ivug_mouse_event_add(Evas_Object *obj, mouse_callback_t *pCallback, void *client_data, const char *alias)
@@ -345,6 +574,7 @@ ivug_mouse_event_add(Evas_Object *obj, mouse_callback_t *pCallback, void *client
pData->obj = obj;
pData->pClientData = client_data;
pData->m_state = MOUSE_DOWN_NONE;
+ pData->multi_min_idx = INVALID_DEVICE_ID;
strncpy(pData->alias, alias, sizeof(pData->alias));
memcpy(&pData->cb, pCallback, sizeof(mouse_callback_t));
@@ -352,6 +582,9 @@ ivug_mouse_event_add(Evas_Object *obj, mouse_callback_t *pCallback, void *client
evas_object_event_callback_add(pData->obj, EVAS_CALLBACK_MOUSE_DOWN, _proxy_on_mouse_down, pData);
evas_object_event_callback_add(pData->obj, EVAS_CALLBACK_MOUSE_UP, _proxy_on_mouse_up, pData);
evas_object_event_callback_add(pData->obj, EVAS_CALLBACK_MOUSE_MOVE, _proxy_on_mouse_move, pData);
+ evas_object_event_callback_add(pData->obj, EVAS_CALLBACK_MULTI_DOWN, _proxy_on_mouse_multi_down, pData);
+ evas_object_event_callback_add(pData->obj, EVAS_CALLBACK_MULTI_UP, _proxy_on_mouse_multi_up, pData);
+ evas_object_event_callback_add(pData->obj, EVAS_CALLBACK_MULTI_MOVE, _proxy_on_mouse_multi_move, pData);
MSG_MOUSE_HIGH("Mouse Event Handler Add : Alias(%s) 0x%08x for Object(0x%08x)", alias, pData, obj);
@@ -366,6 +599,9 @@ void ivug_mouse_event_del(Ivug_Event_Handle handle)
evas_object_event_callback_del(pData->obj, EVAS_CALLBACK_MOUSE_DOWN, _proxy_on_mouse_down);
evas_object_event_callback_del(pData->obj, EVAS_CALLBACK_MOUSE_UP, _proxy_on_mouse_up);
evas_object_event_callback_del(pData->obj, EVAS_CALLBACK_MOUSE_MOVE, _proxy_on_mouse_move);
+ evas_object_event_callback_del(pData->obj, EVAS_CALLBACK_MULTI_DOWN, _proxy_on_mouse_multi_down);
+ evas_object_event_callback_del(pData->obj, EVAS_CALLBACK_MULTI_UP, _proxy_on_mouse_multi_up);
+ evas_object_event_callback_del(pData->obj, EVAS_CALLBACK_MULTI_MOVE, _proxy_on_mouse_multi_move);
MSG_MOUSE_HIGH("Mouse Event Handler Remove : 0x%08x", pData);
diff --git a/common/src/statistics.c b/common/src/statistics.c
index 5eaa56e..9b8284b 100755
--- a/common/src/statistics.c
+++ b/common/src/statistics.c
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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 <sys/time.h> // gettimeofday
@@ -31,10 +30,70 @@
#define EXPORT_API
#endif
+#ifdef _WIN32
+#include <time.h>
+#include <Windows.h>
+
+#pragma comment(lib,"Ws2_32.lib")
+
+#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_NONSTDC_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE
+
+#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
+ #define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64
+#else
+ #define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
+#endif
+
+struct timezone
+{
+ int tz_minuteswest; /* minutes W of Greenwich */
+ int tz_dsttime; /* type of dst correction */
+};
+
+int gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+ FILETIME ft;
+ unsigned __int64 tmpres = 0;
+ static int tzflag;
+
+ if (NULL != tv)
+ {
+ GetSystemTimeAsFileTime(&ft);
+
+ tmpres |= ft.dwHighDateTime;
+ tmpres <<= 32;
+ tmpres |= ft.dwLowDateTime;
+
+ /*converting file time to unix epoch*/
+ tmpres /= 10; /*convert into microseconds*/
+ tmpres -= DELTA_EPOCH_IN_MICROSECS;
+ tv->tv_sec = (long)(tmpres / 1000000UL);
+ tv->tv_usec = (long)(tmpres % 1000000UL);
+ }
+
+ if (NULL != tz)
+ {
+ if (!tzflag)
+ {
+ _tzset();
+ tzflag++;
+ }
+ tz->tz_minuteswest = _timezone / 60;
+ tz->tz_dsttime = _daylight;
+ }
+
+ return 0;
+}
+
+#else
#include <sys/time.h>
#include <sys/utsname.h>
#include <sys/resource.h>
#include <unistd.h>
+#endif
+
#include <stdarg.h>
#include "statistics.h"
@@ -46,7 +105,7 @@
#define MM_TA_MAX_ACCUM 100
-typedef struct _mm_ta_accum_item
+typedef struct _iv_ta_accum_item
{
unsigned long long elapsed_accum;
unsigned long num_calls;
@@ -56,11 +115,12 @@ typedef struct _mm_ta_accum_item
unsigned long long last_end;
char* name;
+ int lvl;
unsigned long long timestamp;
int on_estimate;
int num_unpair;
-} mm_ta_accum_item;
+} iv_ta_accum_item;
static void PrintLog(const char *file, int line, const char *msg, ...)
@@ -79,24 +139,24 @@ static void PrintLog(const char *file, int line, const char *msg, ...)
// internal func.
static void __free_accums(void);
-static int __get_accum_index(const char* name);
+static int __get_accum_index(int lvl, const char* name);
// global var.
-static mm_ta_accum_item ** g_accums = NULL;
+static iv_ta_accum_item ** g_accums = NULL;
static int g_accum_index = 0;
static int g_accum_longest_name = 0;
static unsigned long long g_accum_first_time = MAX_UINT64; // jmlee
-int PERF_INIT(void)
+int IV_PERF_INIT(void)
{
if (g_accums)
{
return 0;
}
- g_accums = (mm_ta_accum_item **) malloc ( MM_TA_MAX_ACCUM * sizeof(mm_ta_accum_item *) );
+ g_accums = (iv_ta_accum_item **) malloc ( MM_TA_MAX_ACCUM * sizeof(iv_ta_accum_item *) );
if(!g_accums)
{
assert(0);
@@ -108,7 +168,7 @@ int PERF_INIT(void)
return 0;
}
-int PERF_DEINIT(void)
+int IV_PERF_DEINIT(void)
{
if ( ! g_accums )
{
@@ -123,7 +183,7 @@ int PERF_DEINIT(void)
}
-static int __get_accum_index(const char* name)
+static int __get_accum_index(int lvl, const char* name)
{
int i;
@@ -132,7 +192,7 @@ static int __get_accum_index(const char* name)
// find index
for ( i = 0; i < g_accum_index; i++ )
{
- if ( strcmp( name, g_accums[i]->name ) == 0 )
+ if ( (lvl == g_accums[i]->lvl) && (strcmp( name, g_accums[i]->name ) == 0) )
return i;
}
@@ -168,9 +228,9 @@ static void __free_accums(void)
-int mm_ta_accum_item_begin(const char* name, bool show, const char* filename, int line)
+int iv_ta_accum_item_begin(int lvl, const char* name, bool show, const char* filename, int line)
{
- mm_ta_accum_item * accum = NULL;
+ iv_ta_accum_item * accum = NULL;
int index = 0;
int name_len = 0;
struct timeval t;
@@ -184,14 +244,14 @@ int mm_ta_accum_item_begin(const char* name, bool show, const char* filename, in
if ( !name )
return -1;
- name_len = strlen(name);
+ name_len = strlen(name) + (lvl * 2);
if( name_len == 0 )
return -1;
// if 'name' is new one. create new item.
- if ( (index = __get_accum_index(name)) == -1 )
+ if ( (index = __get_accum_index(lvl, name)) == -1 )
{
- accum = ( mm_ta_accum_item * ) malloc( sizeof( mm_ta_accum_item ) );
+ accum = ( iv_ta_accum_item * ) malloc( sizeof( iv_ta_accum_item ) );
if ( !accum )
{
assert(0);
@@ -199,10 +259,11 @@ int mm_ta_accum_item_begin(const char* name, bool show, const char* filename, in
}
// clear first.
- memset( accum, 0, sizeof (mm_ta_accum_item) );
+ memset( accum, 0, sizeof (iv_ta_accum_item) );
accum->elapsed_min = MAX_UINT64;
accum->name = strdup(name);
+ accum->lvl = lvl;
// add it to list.
g_accums[g_accum_index] = accum;
g_accum_index++;
@@ -248,9 +309,9 @@ int mm_ta_accum_item_begin(const char* name, bool show, const char* filename, in
return 0;
}
-int mm_ta_accum_item_end(const char* name, bool show, const char* filename, int line)
+int iv_ta_accum_item_end(int lvl, const char* name, bool show, const char* filename, int line)
{
- mm_ta_accum_item * accum = NULL;
+ iv_ta_accum_item * accum = NULL;
unsigned long long tval = 0LL;
int index = 0;
struct timeval t;
@@ -268,7 +329,7 @@ int mm_ta_accum_item_end(const char* name, bool show, const char* filename, int
return -1;
// varify the 'name' is already exist.
- if ( (index = __get_accum_index(name)) == -1 )
+ if ( (index = __get_accum_index(lvl, name)) == -1 )
{
MyPrintf("[%s] is not added before!\n", name);
return -1;
@@ -291,6 +352,13 @@ int mm_ta_accum_item_end(const char* name, bool show, const char* filename, int
// update last_end
accum->last_end = tval;
+#if 0
+ if ( accum->first_start > accum->last_end )
+ {
+ MyPrintf("Invalied timestamp:%s. Start:%lu End=%lu\n", accum->name, accum->first_start , accum->last_end);
+ }
+#endif
+
// make get elapsed time.
tval = tval - accum->timestamp;
@@ -310,9 +378,6 @@ int mm_ta_accum_item_end(const char* name, bool show, const char* filename, int
void __print_some_info(FILE* fp)
{
- if (!fp)
- return;
-
// General infomation
{
time_t t_val;
@@ -366,28 +431,29 @@ void __print_some_info(FILE* fp)
}
}
- fprintf(fp, "g_accum_first_time = %llu\n", g_accum_first_time);
+ fprintf(fp, "g_accum_first_time = %llu", g_accum_first_time);
fprintf(fp, "\n\n");
}
-void mm_ta_accum_show_result_fp(FILE *fp)
+void iv_ta_accum_show_result_fp(FILE *fp)
{
int i = 0;
char format[256];
-// __print_some_info(fp);
+ __print_some_info(fp);
+ fprintf(fp, "\n\n");
fprintf(fp, "============================ BEGIN RESULT ACCUM (usec) ====================\n");
- snprintf(format, (size_t)sizeof(format), "[Idx] %%-%ds %%10s %%6s %%10s %%10s %%10s %%4s \n", g_accum_longest_name);
+ snprintf(format, (size_t)sizeof(format), "[Idx] [Lvl] %%-%ds %%10s %%10s %%6s %%10s %%10s %%4s \n", g_accum_longest_name);
- fprintf(fp, format, "Name", "avg", "hit", "total", "min", "max", "pair");
+ fprintf(fp, format, "Name", "avg", "total", "hit", "min", "max", "pair");
- snprintf(format, (size_t)sizeof(format), "[%%3d] %%-%ds %%10llu %%6lu %%10llu %%10llu %%10llu %%4s \n", g_accum_longest_name);
+ snprintf(format, (size_t)sizeof(format), "[%%3d] [%%3d] %%-%ds %%10llu %%10llu %%6lu %%10llu %%10llu %%4s \n", g_accum_longest_name);
for ( i = 0; i < g_accum_index; i++ )
{
@@ -395,13 +461,23 @@ void mm_ta_accum_show_result_fp(FILE *fp)
if (g_accums[i]->num_calls == 0)
g_accums[i]->num_calls = 1;
+ static char space[256];
+
+ int j;
+ for ( j = 0; j < g_accums[i]->lvl * 2; j++)
+ {
+ space[j] = '_';
+ }
+ space[g_accums[i]->lvl*2] = '\0';
+
fprintf(fp,
format,
i,
- g_accums[i]->name,
+ g_accums[i]->lvl,
+ strcat(space, g_accums[i]->name),
(g_accums[i]->elapsed_accum == 0)?0:(g_accums[i]->elapsed_accum / g_accums[i]->num_calls), // Fix it! : devide by zero.
- g_accums[i]->num_calls,
g_accums[i]->elapsed_accum,
+ g_accums[i]->num_calls,
g_accums[i]->elapsed_min,
g_accums[i]->elapsed_max,
g_accums[i]->num_unpair == 1 ? "F" : "T" );
@@ -409,13 +485,23 @@ void mm_ta_accum_show_result_fp(FILE *fp)
fprintf(fp, "============================ END RESULT ACCUM ============================\n");
- if ( fp != stdout && fp != stderr )
- {
- fclose(fp);
- }
}
+#define _CONSTRUCTOR __attribute__ ((constructor))
+#define _DESTRUCTOR __attribute__ ((destructor))
+
+static void _CONSTRUCTOR _DLLInit(void)
+{
+ IV_PERF_INIT();
+}
+
+static void _DESTRUCTOR _DLLExit(void)
+{
+ IV_PERF_DEINIT();
+
+}
+
#ifdef STANDALONE
int main(int argc, char* argv[])
@@ -423,7 +509,7 @@ int main(int argc, char* argv[])
int a = 0, b = 0;
- PERF_CHECK_BEGIN("Test 1");
+ PERF_CHECK_BEGIN(LVL1, "Test 1");
for ( a = 0 ; a < 10; a++)
{
@@ -431,7 +517,7 @@ int main(int argc, char* argv[])
usleep(1*10E6);
}
- PERF_CHECK_END("Test 1");
+ PERF_CHECK_END(LVL1, "Test 1");
printf("Test 111\n");
return 0;
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100755
index eec177b..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-ug-image-viewer-efl (1.4-14) unstable; urgency=low
-
- * Initial version
- * Git: pkgs/u/ug-image-viewer-efl.git
- * Tag: ug-image-viewer-efl_1.4.14
-
- -- Jisung Ahn <jcastle.ahn@samsung.com> Wed, 07 Dec 2011 15:01:09 +0900
-
diff --git a/debian/compat b/debian/compat
deleted file mode 100755
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
deleted file mode 100755
index f274e0e..0000000
--- a/debian/control
+++ /dev/null
@@ -1,42 +0,0 @@
-Source: ug-image-viewer-efl
-Section: misc
-Priority: extra
-Maintainer: Li Suxia <suxia.li@samsung.com>, Tang Feng <feng.tang@samsung.com>, Hyunwoo Kim <hw4444.kim@samsung.com>, Jisung Ahn <jcastle.ahn@samsung.com>, Sangjin Han <sjhan.han@samsung.com>
-Uploaders: Tang Feng <feng.tang@samsung.com>, Hyunwoo Kim <hw4444.kim@samsung.com>
-Build-Depends: debhelper (>= 5),
- libelm-dev,
- libedje-dev,
- libevas-dev,
- libecore-dev,
- libslp-utilx-dev,
- libmedia-service-dev,
- libui-gadget-dev,
- libaul-1-dev,
- libmm-utility-dev,
- libexif-dev,
- libefreet-dev,
- execstack,
- libmm-fileinfo-dev,
- libicu-dev,
- dlog-dev,
- libmm-common-dev,
- libappcore-efl-dev,
- libslp-pm-dev,
- libappsvc-dev,
- libvconf-dev,
- libvconf-keys-dev,
-Standards-Version: 0.1.0
-
-Package: libug-image-viewer-efl
-Section: misc
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Image Viewer UI Gadget v1.0
-
-Package: libug-image-viewer-efl-dbg
-Section: debug
-Architecture: any
-Depends: ${misc:Depends}, libug-image-viewer-efl (= ${Source-Version})
-Description: Image Viewer UI Gadget(unstripped)
-
-
diff --git a/debian/libug-image-viewer-efl.install.in b/debian/libug-image-viewer-efl.install.in
deleted file mode 100755
index 1709ce6..0000000
--- a/debian/libug-image-viewer-efl.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-@PREFIX@/lib/*
-@PREFIX@/res/*
-@DATADIR@
diff --git a/debian/libug-image-viewer-efl.postinst b/debian/libug-image-viewer-efl.postinst
deleted file mode 100755
index fb2a4cf..0000000
--- a/debian/libug-image-viewer-efl.postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# Create a directory to store image-viewer pictures and stuffs.
-
-if [ ${USER} == "root" ]
-then
- chown 5000:5000 /opt/data/ug-image-viewer-efl
-fi
-
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index ed0233c..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-CFLAGS += -Wall -Wextra -g -fpie -fPIC -O0 -Wno-unused-parameter -Wno-missing-field-initializers -finstrument-functions
-CXXFLAGS += -Wall -Wextra -g -fpie -fPIC -O0 -Wno-unused-parameter -Wno-missing-field-initializers -finstrument-functions
-LDFLAGS += -Wl,-zdefs
-
-PREFIX ?= /opt/ug
-DATADIR ?= /opt/data
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- CXXFLAGS += -O0
-else
- CFLAGS += -O2
- CXXFLAGS += -O2
-endif
-
-LDFLAGS += -Wl,--rpath,/usr/lib -Wl,--as-needed -Wl,--hash-style=both -pie
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" cmake . -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DCMAKE_DATA_DIR=$(DATADIR)
-
- touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- #docbook-to-man debian/wavplayer.sgml > wavplayer.1
-
- for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
- cat $$f > $${f%.in}; \
- sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \
- sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \
- done
-
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
- rm -rf CMakeCache.txt
- rm -rf CMakeFiles
- rm -rf cmake_install.cmake
- rm -rf Makefile
- rm -rf install_manifest.txt
- rm -rf *.so
- rm -rf *.desktop
- find -name CMakeFiles | xargs rm -rf
- find -name cmake_install.cmake | xargs rm -rf
- find -name Makefile | xargs rm -rf
- find -name "*.cmake" | xargs rm -rf
- find -name "*.edj" | xargs rm -rf
-
- for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
- rm -f $${f%.in}; \
- done
-
- dh_clean
-
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/wavplayer.
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
- execstack -c $(CURDIR)/debian/tmp/opt/ug/lib/libug-image-viewer-efl.so.0.1.0
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-
-# dh_installchangelogs
-# dh_installdocs
- dh_installexamples
- dh_install --sourcedir=debian/tmp --list-missing
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip --dbg-package=libug-image-viewer-efl-dbg
- dh_compress
- dh_fixperms
-# dh_perl
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
-
-
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 776e475..252c54c 100755
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -13,61 +13,56 @@ SET(SRCS
# Entry point
src/ug-image-viewer.c
-# Common
- src/common/ivug-config.c
-
# View related
- src/view/ivug-main-view.c
- src/view/ivug-setas-view.c
- src/view/ivug-detail-info.c
+ src/view/ivug-main-view.cpp
+ src/view/ivug-main-view-toolbar.cpp
+ src/view/ivug-main-view-menu.cpp
+
+ src/view/ivug-name-view.c
src/view/ivug-details-view.c
- src/view/ivug-popup.c
- src/view/ivug-slider.c
- src/view/ivug-slider-item.c
- src/view/ivug-slider-slideshow.c
- src/view/ivug-slider-mouse.c
+ src/view/ivug-crop-view.cpp
+
+# SetAs View
+ src/view/ivug-setas-view.c
+ src/view/ivug-setas-view-wallpaper.cpp
+ src/view/ivug-setas-view-callerid.cpp
+
+# Slider
+ src/slider/ivug-slider.cpp
+ src/slider/ivug-slider-item.cpp
+ src/slider/ivug-slider-mouse.cpp
# Control related
- src/control/ivug-uuid.c
src/control/ivug-parameter.c
- src/control/ivug-ext-ug.c
- src/control/ivug-main.c
-
-# Helper files
- src/util/ivug-util.c
- src/util/ivug-file-info.c
- src/util/ivug-widget.c
- src/util/ivug-listpopup.c
-
-# Data & List management
- src/data/ivug-data.c
- src/data/ivug-data-list.c
- src/data/ivug-data-shuffle.c
- src/data/ivug-mediadata.c
- src/data/ivug-data-filter.c
-
-# Effect files
- src/effect/ivug-effect.c
- src/effect/ivug-slide.c
- src/effect/ivug-anim.c
+ src/control/ivug-context.c
+ src/control/ivug-filter.c
+ src/control/ivug-detail-info.c
+ src/control/ivug-setas.cpp
+ src/control/ivug-crop-ug.cpp
+ src/control/ivug-widget.c
+ src/control/ivug-selectioninfo.c
+ src/control/ivug-popup.c
)
# message("System = ${CMAKE_SYSTEM_VERSION}")
INCLUDE_DIRECTORIES(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_SOURCE_WIDGET_DIR}/include
- ${CMAKE_SOURCE_COMMON_DIR}/include
+ ${CMAKE_SOURCE_DIR}/include
+ ${IVUG_SOURCE_WIDGET_DIR}/include
+ ${IVUG_SOURCE_COMMON_DIR}/include
+ ${IVUG_SOURCE_MEDIA_DIR}/include
src
- src/common
- src/view
- src/util
+ src/include
src/control
- src/widget
- src/data
- src/effect/include
+ ${IVUG_SOURCE_FEATURE_DIR}/include
+ ${IVUG_SOURCE_SLIDESHOW_DIR}/include
+
+# Below include directory should be removed for make module more indepentatly
+ ${IVUG_SOURCE_SLIDESHOW_DIR}/src/effect/include
)
+MESSAGE("Checking " ${PROJECT_NAME} )
+
INCLUDE(FindPkgConfig)
pkg_check_modules(pkgs REQUIRED
elementary
@@ -78,27 +73,18 @@ pkg_check_modules(pkgs REQUIRED
ecore
ecore-file
ecore-imf
- ecore-input
ecore-x
+ ecore-input
ecore-evas
- efreet-mime
utilX
- ui-gadget
- libmedia-service
- aul
- libexif
- appcore-efl
- appcore-common
- bundle
- mm-fileinfo
+ ui-gadget-1
+ drm-client
icu-i18n
- icu-io
- icu-le
- icu-lx
- icu-uc
- pmapi
- appsvc
+ glib-2.0
vconf
+ capi-appfw-application
+ capi-appfw-app-manager
+ capi-system-runtime-info
)
@@ -106,28 +92,26 @@ FOREACH(flag ${pkgs_CFLAGS})
SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
ENDFOREACH(flag)
-if("${CMAKE_SYSTEM_VERSION}" STREQUAL "arm")
- pkg_check_modules(armpkgs REQUIRED
- )
-
- FOREACH(flag ${armpkgs_CFLAGS})
- SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
- ENDFOREACH(flag)
-
-endif()
+#if("${CMAKE_SYSTEM_VERSION}" STREQUAL "arm")
+# pkg_check_modules(armpkgs REQUIRED
+# )
+#
+# FOREACH(flag ${armpkgs_CFLAGS})
+# SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+# ENDFOREACH(flag)
+#
+#endif()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-#message("CFLAGS="${CMAKE_C_FLAGS})
-#message("CXXFLAGS="${CMAKE_CXX_FLAGS})
-#message("LDFLAGS="${LDFLAGS})
+message("CFLAGS="${CMAKE_C_FLAGS})
+message("CXXFLAGS="${CMAKE_CXX_FLAGS})
+message("LDFLAGS="${LDFLAGS})
+message("LDFLAGS1="${pkgs_LDFLAGS})
-ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
ADD_DEFINITIONS("-DUG_MODULE_API=__attribute__ \(\(visibility\(\"default\"\)\)\)")
ADD_DEFINITIONS("-DPACKAGE=\"${PROJECT_NAME}\"")
-ADD_DEFINITIONS("-DDATADIR=\"${CMAKE_DATA_DIR}\"")
-#ADD_DEFINITIONS("-D_USE_MEDIAINFO_STRINGID_")
#ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
@@ -138,39 +122,32 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_P
TARGET_LINK_LIBRARIES(${PROJECT_NAME}
${pkgs_LDFLAGS} ${armpkgs_LDFLAGS}
- -ldl
- ivug_common
+ "-ldl"
+ ivug_common ivug_widget ivug_medialist ivug_slideshow
)
INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-FUNCTION (BUILD_EDJ _in _out _base _dir)
- ADD_CUSTOM_TARGET(${_out}
- COMMAND
- edje_cc -id ${_base}/${_dir}
- ${CMAKE_CURRENT_SOURCE_DIR}/${_base}/${_in}
- ${CMAKE_CURRENT_SOURCE_DIR}/${_base}/${_out}
- DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/${_base}/${_in}
- )
- ADD_DEPENDENCIES(${PROJECT_NAME} ${_out})
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_base}/${_out} DESTINATION ${CMAKE_INSTALL_PREFIX}/res/edje/${PROJECT_NAME})
-ENDFUNCTION (BUILD_EDJ)
-
+SET(THEME_FOLDER images/theme)
+SET(THEME white)
# Build edc files
-BUILD_EDJ(ivug-base.edc ivug-base.edj layout images)
-BUILD_EDJ(ivug-main.edc ivug-main.edj layout images)
-BUILD_EDJ(ivug-icons.edc ivug-icons.edj layout icons)
-BUILD_EDJ(ivug-setas.edc ivug-setas.edj layout images)
-BUILD_EDJ(ivug-naviframe.edc ivug-naviframe.edj layout images/gray-theme)
-BUILD_EDJ(ivug-toolbar.edc ivug-toolbar.edj layout images/gray-theme)
-BUILD_EDJ(ivug-button.edc ivug-button.edj layout images/gray-theme)
-BUILD_EDJ(ivug-effect.edc ivug-effect.edj layout images)
-BUILD_EDJ(ivug-slider.edc ivug-slider.edj layout icons)
-BUILD_EDJ(ivug-details.edc ivug-details.edj layout images)
-BUILD_EDJ(ivug-selectioninfo.edc ivug-selectioninfo.edj layout images)
-BUILD_EDJ(ivug-genlist.edc ivug-genlist.edj layout/genlist images/gray-theme)
+BUILD_EDJ(ivug-base.edc ivug-base.edj layout images)
+BUILD_EDJ(ivug-main.edc ivug-main.edj layout images)
+BUILD_EDJ(ivug-effect.edc ivug-effect.edj layout images)
+BUILD_EDJ(ivug-details.edc ivug-details.edj layout images)
+BUILD_EDJ(ivug-selectioninfo.edc ivug-selectioninfo.edj layout images)
+BUILD_EDJ(ivug-popup.edc ivug-popup.edj layout images)
+BUILD_EDJ(ivug-crop-view.edc ivug-crop-view.edj layout crop-view)
+BUILD_EDJ(ivug-icons.edc ivug-icons.edj layout icons)
+BUILD_EDJ(ivug-slider.edc ivug-slider.edj layout icons)
+BUILD_EDJ(ivug-gengrid.edc ivug-gengrid.edj layout gengrid)
+
+BUILD_EDJ(ivug-setas.edc ivug-setas.edj layout ${THEME_FOLDER}/${THEME})
+BUILD_EDJ(ivug-naviframe.edc ivug-naviframe.edj layout ${THEME_FOLDER}/${THEME})
+BUILD_EDJ(ivug-name-view.edc ivug-name-view.edj layout ${THEME_FOLDER}/${THEME})
+BUILD_EDJ(ivug-genlist.edc ivug-genlist.edj layout/genlist ../${THEME_FOLDER}/${THEME})
+
# Install image files.
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/images/ DESTINATION ${CMAKE_INSTALL_PREFIX}/res/images/${PROJECT_NAME})
@@ -180,3 +157,5 @@ INSTALL(DIRECTORY DESTINATION ${CMAKE_DATA_DIR}/${PROJECT_NAME})
# i18n
ADD_SUBDIRECTORY(res/po)
+
+
diff --git a/main/NOTICE b/main/NOTICE
deleted file mode 100755
index ded3804..0000000
--- a/main/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. \ No newline at end of file
diff --git a/main/layout/genlist/genlist_group_index.edc b/main/layout/genlist/genlist_group_index.edc
index 2891049..fe95b95 100755
--- a/main/layout/genlist/genlist_group_index.edc
+++ b/main/layout/genlist/genlist_group_index.edc
@@ -1,22 +1,18 @@
-/*
- * 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 GENLIST_PART_FONT_INDEX_LIST_COLOR_INC 240 240 240 255
-#define GENLIST_DIALOGUE_GROUP_BG_COLOR_INC 15 15 15 255
+/*
+ * 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 GENLIST_PART_INDEX_LIST_BASE_EVENT_INC \
part { name: "base_event";\
@@ -88,6 +84,7 @@
size: GENLIST_FONT_32_INC;
min: 1 1;
align: 0.0 0.5;
+ text_class: "slp_medium";
}
}
}
diff --git a/main/layout/genlist/genlist_macro.edc b/main/layout/genlist/genlist_macro.edc
index 879d0f2..55ab855 100755
--- a/main/layout/genlist/genlist_macro.edc
+++ b/main/layout/genlist/genlist_macro.edc
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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 GENLIST_PART_BASE( param_item_height ) \
part { name: "base"; \
@@ -454,6 +453,7 @@
size: 24; \
min: 1 1; \
align: 0.5 0.5; \
+ text_class: "slp_roman"; \
} \
} \
}
diff --git a/main/layout/genlist/genlist_size.edc b/main/layout/genlist/genlist_size.edc
index 73c285a..30cbb6a 100755
--- a/main/layout/genlist/genlist_size.edc
+++ b/main/layout/genlist/genlist_size.edc
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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.
+ */
/* hd_inc */
diff --git a/main/layout/genlist/genlist_styles.edc b/main/layout/genlist/genlist_styles.edc
index 4eeeca9..fd0b4c9 100755
--- a/main/layout/genlist/genlist_styles.edc
+++ b/main/layout/genlist/genlist_styles.edc
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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: "elm/genlist/item/ivug/2text.2/default";
alias: "elm/genlist/item_odd/ivug/2text.2/default";
@@ -59,6 +58,7 @@ group { name: "elm/genlist/item/ivug/2text.2/default";
size: GENLIST_FONT_20_INC;
min: 0 1;
align: 0.0 0.5;
+ text_class: "slp_roman";
}
}
description { state: "selected" 0.0;
@@ -90,6 +90,7 @@ group { name: "elm/genlist/item/ivug/2text.2/default";
size: GENLIST_FONT_28_INC;
min: 0 1;
align: 0.0 0.5;
+ text_class: "slp_medium";
}
}
description { state: "selected" 0.0;
@@ -140,6 +141,162 @@ group { name: "elm/genlist/item/ivug/2text.2/default";
}
}
+ group { name: "elm/genlist/item_compress/ivug/multiline/2text.1icon/default";
+ alias: "elm/genlist/item_compress_odd/ivug/multiline/2text.1icon/default";
+ data.item: "stacking" "above";
+ data.item: "selectraise" "on";
+ data.item: "texts" "elm.text.1 elm.text.2";
+ data.item: "contents" "elm.icon";
+ parts {
+ part { name: "base";
+ type: RECT;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ color: GENLIST_PART_BG_COLOR_INC;
+ }
+ }
+ GENLIST_PART_BG_IMAGE
+ GENLIST_PART_BOTTOM_LINE
+ GENLIST_PART_PADDING_TOP( GENLIST_PADDING_8_INC )
+ GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_8_INC )
+ GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_10_INC )
+ GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_10_INC )
+ part { name: "elm.text.1";
+ clip_to: "disclip";
+ type: TEXT;
+ mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 0 GENLIST_SIZE_26_INC;
+ fixed: 0 1;
+ rel1 {
+ relative: 1.0 1.0;
+ to_x: "elm.padding.left";
+ to_y: "elm.padding.top";
+ }
+ rel2 {
+ relative: 0.0 1.0;
+ to_x: "elm.padding.icon.left";
+ to_y: "elm.padding.top";
+ }
+ align: 0.0 0.0;
+ color: 160 160 160 255; //GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+ text {
+ font: "SLP:style=Roman";
+ size: GENLIST_FONT_32_INC;
+ min: 0 1;
+ align: 0.0 0.5;
+ text_class: "list_item";
+ }
+ }
+ description { state: "selected" 0.0;
+ inherit: "default" 0.0;
+ color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+ }
+ }
+ part { name: "elm.icon";
+ clip_to: "disclip";
+ type: SWALLOW;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1 {
+ relative: 0.0 1.0;
+ to_x: "elm.padding.right";
+ to_y: "elm.padding.top";
+ }
+ rel2 {
+ relative: 0.0 0.0;
+ to_x: "elm.padding.right";
+ to_y: "elm.padding.bottom";
+ }
+ align: 1.0 0.5;
+ }
+ GENLIST_DESCRIPTION_FLIP_ENABLED
+ }
+ part { name: "elm.padding.icon.left";
+ clip_to: "disclip";
+ type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: GENLIST_PADDING_16_INC 0;
+ fixed: 1 0;
+ rel1.to_x: "elm.icon";
+ rel2 {
+ relative: 0.0 1.0;
+ to_x: "elm.icon";
+ }
+ align: 1.0 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "elm.text.2";
+ clip_to: "disclip";
+ type: TEXTBLOCK;
+ mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel1 {
+ relative: 1.0 1.0;
+ to_x: "elm.padding.left";
+ to_y: "elm.text.1";
+ }
+ rel2 {
+ relative: 0.0 0.0;
+ to_x: "elm.padding.icon.left";
+ to_y: "elm.padding.bottom";
+ }
+ text {
+ style: "genlist_textblock_sub_style";
+ min: 0 1;
+ align: 0.0 0.5;
+ }
+ }
+ description { state: "selected" 0.0;
+ inherit: "default" 0.0;
+ text.style: "genlist_textblock_sub_selected_style";
+ }
+ }
+ GENLIST_PART_DISCLIP
+ }
+ programs {
+ // signal: elm,state,%s,active
+ // a "check" item named %s went active
+ // signal: elm,state,%s,passive
+ // a "check" item named %s went passive
+ // default is passive
+ program { name: "go_active";
+ signal: "elm,state,selected";
+ source: "elm";
+ action: STATE_SET "selected" 0.0;
+ target: "bg_image";
+ target: "elm.text.1";
+ target: "elm.text.2";
+ }
+ program { name: "go_passive";
+ signal: "elm,state,unselected";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "bg_image";
+ target: "elm.text.1";
+ target: "elm.text.2";
+ transition: LINEAR 0.1;
+ }
+ program { name: "go_disabled";
+ signal: "elm,state,disabled";
+ source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "disclip";
+ }
+ program { name: "go_enabled";
+ signal: "elm,state,enabled";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "disclip";
+ }
+ }
+ }
+
group { name: "elm/genlist/item_compress/ivug/multiline/2text/default";
alias: "elm/genlist/item_compress_odd/ivug/multiline/2text/default";
alias: "elm/genlist/item_compress/ivug/multiline.2text/default";
@@ -186,6 +343,7 @@ group { name: "elm/genlist/item/ivug/2text.2/default";
size: GENLIST_FONT_32_INC;
min: 0 1;
align: 0.0 0.5;
+ text_class: "list_item";
}
}
description { state: "selected" 0.0;
@@ -210,14 +368,14 @@ group { name: "elm/genlist/item/ivug/2text.2/default";
to_y: "elm.padding.bottom";
}
text {
- style: "genlist_textblock_flexible_style";
+ style: "genlist_textblock_sub_style";
min: 0 1;
align: 0.0 0.5;
}
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- text.style: "genlist_textblock_flexible_selected_style";
+ text.style: "genlist_textblock_sub_selected_style";
}
}
GENLIST_PART_DISCLIP
diff --git a/main/layout/genlist/genlist_textblock_styles.edc b/main/layout/genlist/genlist_textblock_styles.edc
index 02ac574..cec6f45 100755
--- a/main/layout/genlist/genlist_textblock_styles.edc
+++ b/main/layout/genlist/genlist_textblock_styles.edc
@@ -1,35 +1,18 @@
-/*
- * 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.
- */
-
-
-/* hd_inc */
-#define GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_MATCH_TAG_COLOR_INC "+ color=#3F8DAD"
-
-#define GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_LIST_SUB_TEXT_STYLE_COLOR_INC "#646464FF"
-#define GENLIST_PART_FONT_FLEXIBLE_TEXT_MAIN_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_FLEXIBLE_TEXT_SUB_STYLE_COLOR_INC "#959595FF"
-#define GENLIST_PART_FONT_MULTILINE_TEXT_STYLE_COLOR_INC "#959595FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_READ_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_UNREAD_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_FOCUS_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_STYLE_COLOR_INC "#F9F9F9FF"//"#688998FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_FOCUS_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_HELP_TEXT_STYLE_COLOR_INC "#929292FF"
+/*
+ * 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 TEXTBLOCK_TAG \
tag: "br" "\n";\
@@ -40,7 +23,7 @@
styles {
style { name: "text_style"; // TODO: remove this later
- base: "font=SLP:style=Roman font_size=28 color=#000000 wrap=char ellipsis=1.0";
+ base: "font=SLP:style=Roman font_size=28 color=#000000 wrap=char ellipsis=1.0 text_class=slp_roman";
tag: "br" "\n";
tag: "ps" "ps";
tag: "tab" "\t";
@@ -48,63 +31,63 @@
tag: "match" "+ color=#E58616FF";
}
style { name: "genlist_default_textblock_style";
- base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_44_INC" color="GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
+ base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_44_INC" color="GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_STYLE_COLOR_INC" text_class=slp_roman ellipsis=1.0";
TEXTBLOCK_TAG
}
style { name: "genlist_default_textblock_selected_style";
- base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_44_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
+ base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_44_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" text_class=slp_roman ellipsis=1.0";
TEXTBLOCK_TAG
}
style { name: "genlist_sub_textblock_style";
- base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_FONT_LIST_SUB_TEXT_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
+ base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_FONT_LIST_SUB_TEXT_STYLE_COLOR_INC" text_class=slp_medium ellipsis=1.0";
TEXTBLOCK_TAG
}
style { name: "genlist_sub_textblock_selected_style";
- base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
+ base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" text_class=slp_medium ellipsis=1.0";
TEXTBLOCK_TAG
}
style { name: "genlist_multiline_textblock_style";
- base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_FONT_MULTILINE_TEXT_STYLE_COLOR_INC" wrap=char text_class=list_item";
+ base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_FONT_MULTILINE_TEXT_STYLE_COLOR_INC" wrap=char text_class=slp_medium";
TEXTBLOCK_TAG
}
style { name: "genlist_multiline_textblock_selected_style";
- base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=list_item";
+ base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=slp_medium";
TEXTBLOCK_TAG
}
style { name: "genlist_textblock_style";
- base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_42_INC" color="GENLIST_PART_FONT_3LINE_MAIN_TEXT_UNREAD_STYLE_COLOR_INC" wrap=char text_class=list_item";
+ base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_42_INC" color="GENLIST_PART_FONT_3LINE_MAIN_TEXT_UNREAD_STYLE_COLOR_INC" wrap=char text_class=slp_roman";
TEXTBLOCK_TAG
}
style { name: "genlist_textblock_selected_style";
- base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_42_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=list_item";
+ base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_42_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=slp_roman";
TEXTBLOCK_TAG
}
style { name: "genlist_textblock_sub_style";
- base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_STYLE_COLOR_INC" wrap=char text_class=list_item";
+ base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_STYLE_COLOR_INC" wrap=char text_class=slp_medium";
TEXTBLOCK_TAG
}
style { name: "genlist_textblock_sub_selected_style";
- base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=list_item";
+ base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=slp_medium";
TEXTBLOCK_TAG
}
style { name: "genlist_textblock_flexible_style";
- base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_FONT_FLEXIBLE_TEXT_MAIN_STYLE_COLOR_INC" wrap=char text_class=list_item";// fixed by ivug
+ base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_FONT_FLEXIBLE_TEXT_MAIN_STYLE_COLOR_INC" wrap=char text_class=slp_roman";//fixed by ivug
TEXTBLOCK_TAG
}
style { name: "genlist_textblock_flexible_selected_style";
- base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_48_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=list_item";
+ base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_48_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=slp_roman";
TEXTBLOCK_TAG
}
style { name: "genlist_textblock_flexible_sub_style";
- base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_FONT_FLEXIBLE_TEXT_SUB_STYLE_COLOR_INC" wrap=char text_class=list_item";
+ base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_FONT_FLEXIBLE_TEXT_SUB_STYLE_COLOR_INC" wrap=char text_class=slp_roman";
TEXTBLOCK_TAG
}
style { name: "genlist_textblock_flexible_sub_selected_style";
- base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=list_item";
+ base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=slp_roman";
TEXTBLOCK_TAG
}
style { name: "genlist_textblock_help_style";
- base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_FONT_HELP_TEXT_STYLE_COLOR_INC" wrap=mixed text_class=list_item";
+ base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_FONT_HELP_TEXT_STYLE_COLOR_INC" wrap=mixed text_class=slp_medium";
TEXTBLOCK_TAG
}
}
diff --git a/main/layout/genlist/ivug-genlist.edc b/main/layout/genlist/ivug-genlist.edc
index f9d527b..3dd35f2 100755
--- a/main/layout/genlist/ivug-genlist.edc
+++ b/main/layout/genlist/ivug-genlist.edc
@@ -1,33 +1,20 @@
-/*
- * 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 GENLIST_PART_BG_COLOR_INC 0 0 0 0
-
-#define GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC 249 249 249 255
-#define GENLIST_PART_TEXT_PRESS_COLOR_INC 249 249 249 255
-
-#define GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC 100 100 100 255
-
-#define GENLIST_PART_DISCLIP_COLOR_INC 255 255 255 64
-
-/* 1.0 */
-#define GENLIST_PART_LIST_BG_COLOR_INC 0 0 0 0
-#define GENLIST_PART_LIST_LINE_COLOR_INC 68 68 68 0
-#define GENLIST_PART_LIST_PRESS_COLOR_INC 0 140 210 255
+/*
+ * 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 "../ivug-theme.edc"
collections {
diff --git a/main/layout/images/T01_btn_cancel.png b/main/layout/images/T01_btn_cancel.png
deleted file mode 100755
index 051ff04..0000000
--- a/main/layout/images/T01_btn_cancel.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/T01_btn_cancel_press.png b/main/layout/images/T01_btn_cancel_press.png
deleted file mode 100755
index 32f7e76..0000000
--- a/main/layout/images/T01_btn_cancel_press.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/T01_btn_ok.png b/main/layout/images/T01_btn_ok.png
deleted file mode 100755
index adb15aa..0000000
--- a/main/layout/images/T01_btn_ok.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/T01_btn_ok_dim.png b/main/layout/images/T01_btn_ok_dim.png
deleted file mode 100755
index 9cc983b..0000000
--- a/main/layout/images/T01_btn_ok_dim.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/T01_btn_ok_press.png b/main/layout/images/T01_btn_ok_press.png
deleted file mode 100755
index 4a59cfd..0000000
--- a/main/layout/images/T01_btn_ok_press.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/00_winset_btn_prev.png b/main/layout/images/gray-theme/00_winset_btn_prev.png
deleted file mode 100755
index 15b43b0..0000000
--- a/main/layout/images/gray-theme/00_winset_btn_prev.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/I01_control_top_bg.png b/main/layout/images/gray-theme/I01_control_top_bg.png
deleted file mode 100755
index 287ef80..0000000
--- a/main/layout/images/gray-theme/I01_control_top_bg.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/T01_Option_header_bt.png b/main/layout/images/gray-theme/T01_Option_header_bt.png
deleted file mode 100755
index 3c6987f..0000000
--- a/main/layout/images/gray-theme/T01_Option_header_bt.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/T01_Option_header_bt_dim.png b/main/layout/images/gray-theme/T01_Option_header_bt_dim.png
deleted file mode 100755
index 501d9e8..0000000
--- a/main/layout/images/gray-theme/T01_Option_header_bt_dim.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/T01_Option_header_bt_press.png b/main/layout/images/gray-theme/T01_Option_header_bt_press.png
deleted file mode 100755
index 978107c..0000000
--- a/main/layout/images/gray-theme/T01_Option_header_bt_press.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/T01_btn_prev.png b/main/layout/images/gray-theme/T01_btn_prev.png
deleted file mode 100755
index ccaf337..0000000
--- a/main/layout/images/gray-theme/T01_btn_prev.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/T01_control_top_arrow.png b/main/layout/images/gray-theme/T01_control_top_arrow.png
deleted file mode 100755
index 3f2ee50..0000000
--- a/main/layout/images/gray-theme/T01_control_top_arrow.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/T01_control_top_bg.png b/main/layout/images/gray-theme/T01_control_top_bg.png
deleted file mode 100755
index e7b5045..0000000
--- a/main/layout/images/gray-theme/T01_control_top_bg.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/T01_title_btn.png b/main/layout/images/gray-theme/T01_title_btn.png
deleted file mode 100755
index 20c31f1..0000000
--- a/main/layout/images/gray-theme/T01_title_btn.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/T01_title_btn_press.png b/main/layout/images/gray-theme/T01_title_btn_press.png
deleted file mode 100755
index 49861ed..0000000
--- a/main/layout/images/gray-theme/T01_title_btn_press.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/T01_toolbar_bg.png b/main/layout/images/gray-theme/T01_toolbar_bg.png
deleted file mode 100755
index e02c6c6..0000000
--- a/main/layout/images/gray-theme/T01_toolbar_bg.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/T01_toolbar_press.png b/main/layout/images/gray-theme/T01_toolbar_press.png
deleted file mode 100755
index 703cc05..0000000
--- a/main/layout/images/gray-theme/T01_toolbar_press.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/magnifier.png b/main/layout/images/gray-theme/magnifier.png
deleted file mode 100755
index 4ae3188..0000000
--- a/main/layout/images/gray-theme/magnifier.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/magnifier_line.png b/main/layout/images/gray-theme/magnifier_line.png
deleted file mode 100755
index c4dd14c..0000000
--- a/main/layout/images/gray-theme/magnifier_line.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/magnifier_noarrow.png b/main/layout/images/gray-theme/magnifier_noarrow.png
deleted file mode 100755
index 7cbd2a7..0000000
--- a/main/layout/images/gray-theme/magnifier_noarrow.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/magnifier_noarrow_line.png b/main/layout/images/gray-theme/magnifier_noarrow_line.png
deleted file mode 100755
index fcfdb10..0000000
--- a/main/layout/images/gray-theme/magnifier_noarrow_line.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/reader_handler_down.png b/main/layout/images/gray-theme/reader_handler_down.png
deleted file mode 100755
index 8e95761..0000000
--- a/main/layout/images/gray-theme/reader_handler_down.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/reader_handler_up.png b/main/layout/images/gray-theme/reader_handler_up.png
deleted file mode 100755
index 172e2a3..0000000
--- a/main/layout/images/gray-theme/reader_handler_up.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/images/gray-theme/reader_longtap_blue.png b/main/layout/images/gray-theme/reader_longtap_blue.png
deleted file mode 100755
index 16df225..0000000
--- a/main/layout/images/gray-theme/reader_longtap_blue.png
+++ /dev/null
Binary files differ
diff --git a/main/layout/ivug-base.edc b/main/layout/ivug-base.edc
index fae85c6..3c2ec3e 100755
--- a/main/layout/ivug-base.edc
+++ b/main/layout/ivug-base.edc
@@ -1,47 +1,34 @@
-/*
- * 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.
- */
-
+/*
+ * 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 {
group {
name: "ivug_base";
parts {
part {
- name: "indication";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- rel1 { relative: 0.0 0.0; }
- rel2 { relative: 1.0 0.0; }
- min: 0 0;
- fixed: 0 1;
- align: 0.5 0.0;
- visible: 0;
- }
- }
-
- part {
name: "clip";
type: RECT;
scale: 1;
+ mouse_events: 0;
description {
state: "default" 0.0;
- rel1 { relative: 0.0 1.0; to_y: "indication";}
+ visible: 1;
+ rel1 { relative: 0.0 0.0; }
rel2 { relative: 1.0 1.0; }
+ color: 255 255 255 255;
}
}
part {
@@ -52,6 +39,8 @@ collections {
scale: 1;
clip_to: "clip";
description {
+ state: "default" 0.0;
+ visible: 1;
rel1.to: "clip";
rel2.to: "clip";
}
diff --git a/main/layout/ivug-button.edc b/main/layout/ivug-button.edc
deleted file mode 100755
index 19fb76d..0000000
--- a/main/layout/ivug-button.edc
+++ /dev/null
@@ -1,1332 +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 BUTTON_STATE_ENABLED 0
-#define BUTTON_STATE_DISABLED 1
-
-#define NAVIBAR_PREV_BUTTON_LEFT_SEPARATOR_COLOR_INC 3 3 3 255
-#define NAVIBAR_PREV_BUTTON_RIGHT_SEPARATOR_COLOR_INC 52 52 52 255
-
-/* Default black themem text color
-#define BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC 78 73 69 255
-*/
-#define BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC 255 255 255 255
-#define BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC 255 255 255 255
-#define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 255 255 255 255
-#define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 185 185 185 255
-
-#define BUTTON_TEXT_STYLE1_BG_MIN_INC 100 74
-#define BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC 148 74
-#define BUTTON_TEXT_STYLE1_ICONONLY_BG_MIN_INC 74 74
-#define BUTTON_TEXT_STYLE1_BG_BORDER_INC 5 5 5 5
-#define BUTTON_TEXT_STYLE1_PADDING_MIN_INC 5 5
-#define BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC 38 38
-#define BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC 10 0
-#define BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC 38 38
-#define BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC 38 38
-#define BUTTON_TEXT_STYLE1_FONT_SIZE_INC 28
-
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_COLOR_INC 160 151 145 255
-
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_W_INC 36
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_H_INC 74
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_BORDER_INC 5 5 5 5
-
-#define BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC 16 2
-#define BUTTON_NAVIBAR_CENTER_ICON_RECT_VISIBLE_MIN_SIZE 36 36
-#define BUTTON_NAVIBAR_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
-
-#define BUTTON_NAVIBAR_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
-
-#define BUTTON_NAVIBAR_BACK_BUTTON_BUTTON_IMAGE_MIN_INC 106 40
-#define BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC 36 32
-
-#define BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC 36 36
-#define BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
-
-#define BUTTON_NAVIBAR_CENTER_TEXT_FONT_SIZE_INC 32
-
-#define NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC 69 87 94 0
-#define NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC 0 15 30 0
-
-
-#define IV_EDC_IMAGE_OPTION_HEADER_BT "T01_Option_header_bt.png"
-#define IV_EDC_IMAGE_OPTION_HEADER_BT_DIM "T01_Option_header_bt_dim.png"
-#define IV_EDC_IMAGE_OPTION_HEADER_BT_PRESS "T01_Option_header_bt_press.png"
-
-#define IV_EDC_IMAGE_NAVIFRAME_MORE_BT "T01_title_btn.png"
-#define IV_EDC_IMAGE_NAVIFRAME_MORE_BT_DIM "T01_title_btn.png"
-#define IV_EDC_IMAGE_NAVIFRAME_MORE_BT_PRESS "T01_title_btn_press.png"
-
-#define IV_EDC_IMAGE_BTN_PREV "T01_btn_prev.png"
-#define IV_EDC_IMAGE_BTN_PREV_PRESS "00_winset_btn_prev.png" /* TODO: Replace with T01_XXX image */
-
-#define IV_EDC_OPTION_HEADER_BT_TEXT_COLOR_INC 255 255 255 255
-
-#define BUTTON_MULTILINE_TEXT_FONT_SIZE_INC 32 /* */
-
-collections {
-
-///////////////////////////////////////////////////////////////////////////////////////
- group { name: "elm/button/base/style1";
- alias: "elm/button/base/text_only/style1";
- alias: "elm/button/base/center";
- alias: "elm/button/base/icon_and_text/center";
- alias: "elm/button/base/nocontents/search_button";
- alias: "elm/button/base/naviframe/title/default";
- images {
- image: IV_EDC_IMAGE_NAVIFRAME_MORE_BT COMP;
- image: IV_EDC_IMAGE_NAVIFRAME_MORE_BT_DIM COMP;
- image: IV_EDC_IMAGE_NAVIFRAME_MORE_BT_PRESS COMP;
- }
- script {
- public button_state = BUTTON_STATE_ENABLED;
- }
- parts {
- part { name: "button_image";
- scale: 1;
- description { state: "default" 0.0;
- image {
- normal: IV_EDC_IMAGE_NAVIFRAME_MORE_BT;
- border: BUTTON_TEXT_STYLE1_BG_BORDER_INC;
- border_scale: 1;
- }
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- image {
- normal: IV_EDC_IMAGE_NAVIFRAME_MORE_BT_PRESS;
- }
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image {
- normal: IV_EDC_IMAGE_NAVIFRAME_MORE_BT_DIM;
- }
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- image {
- normal: IV_EDC_IMAGE_NAVIFRAME_MORE_BT_PRESS;
- }
- }
- }
- part { name: "padding_left_top";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- align: 0.0 0.0;
- rel2 {
- relative: 0.0 0.0;
- }
- min: BUTTON_TEXT_STYLE1_PADDING_MIN_INC;
- fixed: 1 1;
- visible: 0;
- }
- }
- part { name: "bg";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- min: BUTTON_TEXT_STYLE1_BG_MIN_INC;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- min: BUTTON_TEXT_STYLE1_VISIBLE_BG_MIN_INC;
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- min: BUTTON_TEXT_STYLE1_ICONONLY_BG_MIN_INC;
- }
- }
- part { name: "padding_right_bottom";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- rel1 {
- relative: 1.0 1.0;
- }
- min: BUTTON_TEXT_STYLE1_PADDING_MIN_INC;
- fixed: 1 1;
- visible: 0;
- }
- }
- part { name: "icon_rect";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- visible: 0;
- min: 0 0;
- fixed: 1 0;
- rel1 {
- relative: 1.0 1.0;
- to: "padding_left_top";
- }
- rel2 {
- relative: 1.0 0.0;
- to_x: "padding_left_top";
- to_y: "padding_right_bottom";
- }
- align: 0.0 0.5;
- }
- description { state: "visible" 0.0;
- visible: 0;
- min: BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC;
- max: BUTTON_TEXT_STYLE1_VISIBLE_ICON_RECT_MIN_MAX_INC;
- fixed: 1 0;
- rel1 {
- relative: 1.0 1.0;
- to: "padding_left_top";
- }
- rel2 {
- relative: 1.0 0.0;
- to_x: "padding_left_top";
- to_y: "padding_right_bottom";
- }
- align: 0.0 0.5;
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- }
- }
- part { name: "padding_after_icon";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0; //when only icon or no icon is there
- align: 0.0 0.0;
- rel1 {
- relative: 1.0 0.0;
- to: "icon_rect";
- }
- rel2 {
- to: "icon_rect";
- }
- fixed: 1 0;
- min: 0 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- visible: 0;
- align: 0.0 0.0;
- rel1 {
- relative: 1.0 0.0;
- to: "icon_rect";
- }
- rel2 {
- to: "icon_rect";
- }
- fixed: 1 0;
- min: BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- }
- }
- part { name: "padding_before_text";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0; //when only icon or no icon is there
- align: 1.0 0.5;
- rel1 {
- relative: 0.0 1.0;
- to_x: "elm.text";
- to_y: "padding_left_top";
- }
- rel2 {
- relative: 0.0 0.0;
- to_x: "elm.text";
- to_y: "padding_right_bottom";
- }
- fixed: 1 0;
- min: BUTTON_TEXT_STYLE1_VISIBLE_PADDING_ICON_TEXT_MIN_INC;
- visible: 0;
- }
- }
- part { name: "elm.swallow.content";
- type: SWALLOW;
- scale: 1;
- clip_to: "clipper";
- description { state: "default" 0.0;
- visible: 0;
- align: 0.0 0.5;
- rel1 {
- relative: 1.0 1.0;
- to: "padding_left_top";
- }
- rel2 {
- relative: 1.0 0.0;
- to_x: "padding_left_top";
- to_y: "padding_right_bottom";
- }
- fixed: 1 0;
- }
- description { state: "visible" 0.0;
- fixed: 1 0;
- min: BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC;
- max: BUTTON_TEXT_STYLE1_VISIBLE_ICON_MIN_MAX_INC;
- align: 1.0 0.5;
- rel1 {
- relative: 0.0 1.0;
- to_x: "padding_before_text";
- to_y: "padding_left_top";
- }
- rel2 {
- relative: 0.0 0.0;
- to_x: "padding_before_text";
- to_y: "padding_right_bottom";
- }
- }
- description { state: "icononly" 0.0;
- min: BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC;
- max: BUTTON_TEXT_STYLE1_ICONONLY_ICON_MIN_MAX_INC;
- align: 0.5 0.5;
- }
- }
- part { name: "elm.text";
- type: TEXT;
- mouse_events: 0;
- scale: 1;
- clip_to: "clipper";
- description { state: "default" 0.0;
- visible: 0;
- rel1 {
- relative: 1.0 1.0;
- to_x: "padding_after_icon";
- to_y: "padding_left_top";
- }
- rel2 {
- relative: 0.0 0.0;
- to: "padding_right_bottom";
- }
- color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
- text {
- font: "HelveticaNeue:style=Medium";
- size: BUTTON_TEXT_STYLE1_FONT_SIZE_INC;
- min: 0 0;
- max: 1 0;
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 0 0 0 128;
- }
- description { state: "disabled_visible" 0.0;
- inherit: "default" 0.0;
- color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
- visible: 1;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC;
- }
- }
- part { name: "over2";
- type: RECT;
- repeat_events: 1;
- ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- part { name: "over3";
- type: RECT;
- repeat_events: 1;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- part { name: "clipper";
- type: RECT;
- description { state: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "disabler";
- type: RECT;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- visible: 0;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- }
- programs {
- program { name: "button_click";
- signal: "mouse,down,1";
- source: "over2";
- action: SIGNAL_EMIT "elm,action,press" "";
- after: "button_click_anim";
- }
- program { name: "button_click_anim";
- action: STATE_SET "clicked" 0.0;
- target: "button_image";
- after: "text_clicked";
- }
- program { name: "text_clicked";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "visible"))
- set_state(PART:"elm.text", "clicked", 0.0);
- }
- }
- program { name: "button_unpress";
- action: SIGNAL_EMIT "elm,action,unpress" "";
- }
- program { name: "button_mouseout_clicked";
- signal: "mouse,up,1";
- source: "over3";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.swallow.content", st, 30, vl);
- if (strcmp(st, "icononly"))
- {
- emit("elm,action,default,text,set", "");
- set_state(PART:"elm.text", "visible", 0.0);
- }
- if (get_int(button_state) != BUTTON_STATE_DISABLED)
- set_state(PART:"button_image", "default", 0.0);
- }
- after: button_unpress;
- }
- program { name: "button_unclick3";
- signal: "mouse,clicked,1";
- source: "over2";
- action: SIGNAL_EMIT "elm,action,click" "";
- }
- program { name: "text_show";
- signal: "elm,state,text,visible";
- source: "elm";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.swallow.content", st, 30, vl);
- if (!strcmp(st, "icononly"))
- {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"icon_rect", "visible", 0.0);
- set_state(PART:"padding_after_icon", "visible", 0.0);
- set_state(PART:"bg", "visible", 0.0);
- }
- if (get_int(button_state) != BUTTON_STATE_DISABLED)
- set_state(PART:"elm.text", "visible", 0.0);
- else
- set_state(PART:"elm.text", "disabled_visible", 0.0);
- }
- }
- program { name: "text_hide";
- signal: "elm,state,text,hidden";
- source: "elm";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.swallow.content", st, 30, vl);
- if (!strcmp(st, "visible"))
- {
- set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"icon_rect", "icononly", 0.0);
- set_state(PART:"padding_after_icon", "icononly", 0.0);
- set_state(PART:"bg", "icononly", 0.0);
- }
- set_state(PART:"elm.text", "default", 0.0);
- }
- }
- program { name: "icon_show";
- signal: "elm,state,icon,visible";
- source: "elm";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "visible"))
- {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"icon_rect", "visible", 0.0);
- set_state(PART:"padding_after_icon", "visible", 0.0);
- set_state(PART:"bg", "visible", 0.0);
- }
- else
- {
- set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"icon_rect", "icononly", 0.0);
- set_state(PART:"padding_after_icon", "icononly", 0.0);
- set_state(PART:"bg", "icononly", 0.0);
- }
- }
- }
- program { name: "icon_hide";
- signal: "elm,state,icon,hidden";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.swallow.content";
- target: "padding_after_icon";
- target: "icon_rect";
- target: "bg";
- }
- program { name: "disable";
- signal: "elm,state,disabled";
- source: "elm";
- action: STATE_SET "disabled" 0.0;
- target: "button_image";
- target: "disabler";
- after: "disable_text";
- }
- program { name: "disable_text";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "visible"))
- set_state(PART:"elm.text", "disabled_visible", 0.0);
- else
- set_state(PART:"elm.text", "disabled", 0.0);
- set_int(button_state, BUTTON_STATE_DISABLED);
- }
- }
- program { name: "enable";
- signal: "elm,state,enabled";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "button_image";
- target: "disabler";
- after: "enable_text";
- }
- program { name: "enable_text";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "disabled_visible"))
- set_state(PART:"elm.text", "visible", 0.0);
- else
- set_state(PART:"elm.text", "default", 0.0);
- set_int(button_state, BUTTON_STATE_ENABLED);
- }
- }
- program { name: "focused";
- //signal: "elm,action,focus";
- //source: "elm";
- action: STATE_SET "focused" 0.0;
- target: "button_image";
- target: "elm.text";
- }
- program { name: "unfocused";
- //signal: "elm,action,unfocus";
- //source: "elm";
- action: STATE_SET "default" 0.0;
- target: "button_image";
- after: "unfocus_text";
- }
- program { name: "unfocus_text";
- action: STATE_SET "visible" 0.0;
- target: "elm.text";
- }
- }
- }
-
-///////////////////////////////////////////////////////////////////////////////////////
- group { name: "elm/button/base/naviframe_control/default";
- alias: "elm/button/base/naviframe_control/center";
- /* TODO: Remove this alias later */
- alias: "elm/button/base/navigationbar_control/center";
- script {
- public button_state = BUTTON_STATE_ENABLED;
- }
- images.image: IV_EDC_IMAGE_OPTION_HEADER_BT COMP;
- images.image: IV_EDC_IMAGE_OPTION_HEADER_BT_DIM COMP;
- images.image: IV_EDC_IMAGE_OPTION_HEADER_BT_PRESS COMP;
- parts {
- part { name: "button_image";
- type: IMAGE;
- mouse_events: 1;
- scale: 1;
- description { state: "default" 0.0;
- min: BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_W_INC BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_H_INC;
- rel1.offset: 0 0;
- rel2.offset: -1 -1;
- image.normal: IV_EDC_IMAGE_OPTION_HEADER_BT;
- image.border: BUTTON_NAVIBAR_CENTER_BG_NORMAL_BORDER_INC;
- color: IV_EDC_OPTION_HEADER_BT_TEXT_COLOR_INC;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: IV_EDC_IMAGE_OPTION_HEADER_BT; /*FIXME*/
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- image.normal: IV_EDC_IMAGE_OPTION_HEADER_BT_PRESS;
- }
- }
- part {
- name: "padding_left_top";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- align: 0.0 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 0.0 0.0;
- min: BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC;
- fixed: 1 1;
- visible: 0;
- }
- }
- part {
- name: "padding_right_bottom";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- rel1.relative: 1.0 1.0;
- rel2.relative: 1.0 1.0;
- min: BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC;
- fixed: 1 1;
- visible: 0;
- }
- }
- part {
- name: "icon_rect";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- visible: 1;
- min: 0 0;
- fixed: 1 0;
- rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
- rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
- align: 0.0 0.5;
- color: 0 0 0 0;
- }
- description { state: "visible" 0.0;
- visible: 1;
- min: BUTTON_NAVIBAR_CENTER_ICON_RECT_VISIBLE_MIN_SIZE;
- fixed: 1 0;
- rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
- rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
- align: 0.0 0.5;
- color: 0 0 0 0;
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- }
- }
- part {
- name: "padding_after_icon";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0; //when only icon or no icon is there
- align: 0.0 0.0;
- rel1 { relative: 1.0 0.0; to: "icon_rect"; }
- rel2 { relative: 1.0 1.0; to: "icon_rect"; }
- fixed: 1 0;
- min: 0 0;
- color: 0 0 0 0;
- }
- description { state: "visible" 0.0;
- visible: 1;
- align: 0.0 0.0;
- rel1 { relative: 1.0 0.0; to: "icon_rect"; }
- rel2 { relative: 1.0 1.0; to: "icon_rect"; }
- fixed: 1 0;
- min: BUTTON_NAVIBAR_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC;
- color: 0 0 0 0;
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- }
- }
- part {
- name: "padding_before_text";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0; //when only icon or no icon is there
- align: 1.0 0.5;
- rel1 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "padding_left_top"; }
- rel2 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "padding_right_bottom"; }
- fixed: 1 0;
- min: BUTTON_NAVIBAR_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC;
- color: 0 0 0 0;
- }
- }
- part { name: "elm.swallow.content";
- type: SWALLOW;
- scale: 1;
- clip_to: "clipper";
- description { state: "default" 0.0;
- visible: 0;
- align: 0.0 0.5;
- rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
- rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
- fixed: 1 0;
- }
- description { state: "visible" 0.0;
- fixed: 1 0;
- visible: 1;
- min: BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
- max: BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
- align: 1.0 0.5;
- rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
- rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
- }
- description { state: "icononly" 0.0;
- visible: 1;
- min: BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
- max: BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
- rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
- rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
- align: 0.5 0.5;
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
- }
- }
- part { name: "elm.text";
- type: TEXT;
- mouse_events: 0;
- scale: 1;
- clip_to: "clipper";
- description { state: "default" 0.0;
- visible: 0;
- rel1 { relative: 1.0 1.0; to_x: "padding_after_icon"; to_y: "padding_left_top"; }
- rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
- align: 0.5 0.5;
- color: 255 255 255 255;
- text {
- font: "HelveticaNeue:style=Medium";
- size: BUTTON_NAVIBAR_CENTER_TEXT_FONT_SIZE_INC;
- min: 0 0;
- max: 1 0;
- align: 0.5 0.5;
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- min: 0 0;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- min: 0 0;
- color: 255 255 255 255;
- }
- }
- part { name: "over2";
- type: RECT;
- mouse_events: 1;
- repeat_events: 1;
- ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- part { name: "over3";
- type: RECT;
- mouse_events: 1;
- repeat_events: 1;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- part { name: "clipper";
- type: RECT;
- description { state: "default" 0.0;
- color: 255 255 255 255;
- }
- description { state: "disabled" 0.0;
- color: 255 255 255 127;
- }
- }
- part { name: "disabler";
- type: RECT;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- visible: 0;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- }
- programs {
- program { name: "button_click";
- signal: "mouse,down,1";
- source: "over2";
- action: SIGNAL_EMIT "elm,action,press" "";
- after: "button_click_anim";
- }
- program { name: "button_click_anim";
- action: STATE_SET "clicked" 0.0;
- target: "button_image";
- after: "text_clicked";
- }
- program { name: "text_clicked";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "visible"))
- set_state(PART:"elm.text", "clicked", 0.0);
- }
- }
- program { name: "button_unpress";
- action: SIGNAL_EMIT "elm,action,unpress" "";
- }
- program { name: "button_mouseout_clicked";
- signal: "mouse,up,1";
- source: "over3";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.swallow.content", st, 30, vl);
- if (strcmp(st, "icononly"))
- {
- emit("elm,action,default,text,set", "");
- set_state(PART:"elm.text", "visible", 0.0);
- }
- if(get_int(button_state) != BUTTON_STATE_DISABLED)
- set_state(PART:"button_image", "default", 0.0);
- }
- after: button_unpress;
- }
- program { name: "button_unclick3";
- signal: "mouse,clicked,1";
- source: "over2";
- action: SIGNAL_EMIT "elm,action,click" "";
- }
- program { name: "text_show";
- signal: "elm,state,text,visible";
- source: "elm";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.swallow.content", st, 30, vl);
- if (!strcmp(st, "icononly"))
- {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"icon_rect", "visible", 0.0);
- set_state(PART:"padding_after_icon", "visible", 0.0);
- }
- set_state(PART:"elm.text", "visible", 0.0);
- }
- }
- program { name: "text_hide";
- signal: "elm,state,text,hidden";
- source: "elm";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.swallow.content", st, 30, vl);
- if (!strcmp(st, "visible"))
- {
- set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"icon_rect", "icononly", 0.0);
- set_state(PART:"padding_after_icon", "icononly", 0.0);
- }
- set_state(PART:"elm.text", "default", 0.0);
- }
- }
- program { name: "icon_show";
- signal: "elm,state,icon,visible";
- source: "elm";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "visible"))
- {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"icon_rect", "visible", 0.0);
- set_state(PART:"padding_after_icon", "visible", 0.0);
- }
- else
- {
- set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"icon_rect", "icononly", 0.0);
- set_state(PART:"padding_after_icon", "icononly", 0.0);
- }
- }
- }
- program { name: "icon_hide";
- signal: "elm,state,icon,hidden";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.swallow.content";
- target: "icon_rect";
- target: "padding_after_icon";
- }
- program { name: "disable";
- signal: "elm,state,disabled";
- source: "elm";
- action: STATE_SET "disabled" 0.0;
- target: "button_image";
- target: "clipper";
- target: "disabler";
- after: "disable_text";
- }
- program { name: "disable_text";
- script {
- set_int(button_state, BUTTON_STATE_DISABLED);
- set_state(PART:"elm.text", "visible", 0.0);
- }
- }
- program { name: "enable";
- signal: "elm,state,enabled";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "button_image";
- target: "clipper";
- target: "disabler";
- after: "enable_text";
- }
- program { name: "enable_text";
- script {
- set_int(button_state, BUTTON_STATE_ENABLED);
- set_state(PART:"elm.text", "visible", 0.0);
- }
- }
- program { name: "focused";
- action: STATE_SET "focused" 0.0;
- target: "button_image";
- target: "elm.text";
- }
- program { name: "unfocused";
- action: STATE_SET "default" 0.0;
- target: "button_image";
- after: "unfocus_text";
- }
- program { name: "unfocus_text";
- action: STATE_SET "visible" 0.0;
- target: "elm.text";
- }
- }
- }
-
-///////////////////////////////////////////////////////////////////////////////////////
- group { name: "elm/button/base/multiline";
- alias: "elm/button/base/text_only/multiline";
- images {
- image: IV_EDC_IMAGE_OPTION_HEADER_BT COMP;
- image: IV_EDC_IMAGE_OPTION_HEADER_BT_PRESS COMP;
- image: IV_EDC_IMAGE_OPTION_HEADER_BT_DIM COMP;
- }
- script {
- public button_state = BUTTON_STATE_ENABLED;
- }
- styles{
- style { name: "btn_multiline_style";
- base: "font=HelveticaNeue:style=Medium font_size="BUTTON_MULTILINE_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed";
- tag: "br" "\n";
- tag: "ps" "ps";
- tag: "tab" "\t";
- }
- }
- parts {
- part { name: "button_image";
- mouse_events: 1;
- scale: 1;
- description { state: "default" 0.0;
- min: 10 46;
- image {
- normal: IV_EDC_IMAGE_OPTION_HEADER_BT;
- border: 4 4 3 3;
- border_scale: 1;
- }
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- image.normal: IV_EDC_IMAGE_OPTION_HEADER_BT_PRESS;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: IV_EDC_IMAGE_OPTION_HEADER_BT_DIM;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- image.normal: IV_EDC_IMAGE_OPTION_HEADER_BT_PRESS;
- }
- }
- part {
- name: "padding_left_top";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- align: 0.0 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 0.0 0.0;
- min: 2 2;
- fixed: 1 1;
- visible: 0;
- }
- }
- part {
- name: "padding_right_bottom";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- rel1.relative: 1.0 1.0;
- rel2.relative: 1.0 1.0;
- min: 2 2;
- fixed: 1 1;
- visible: 0;
- }
- }
- part {
- name: "icon_rect";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- visible: 1;
- min: 0 40;
- fixed: 1 0;
- rel1 { relative: 0.0 1.0; to_x: "elm.swallow.content"; to_y: "padding_left_top"; }
- rel2 { relative: 1.0 0.0; to_x: "elm.swallow.content"; to_y: "padding_right_bottom"; }
- align: 0.0 0.5;
- color: 0 0 0 0;
- }
- }
- part {
- name: "padding_icon_text";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0; //when only icon or no icon is there
- align: 0.0 0.0;
- rel1 { relative: 1.0 0.0; to: "icon_rect"; }
- rel2 { relative: 1.0 1.0; to: "icon_rect"; }
- fixed: 1 0;
- min: 0 0;
- color: 0 0 0 0;
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- }
- description { state: "visible" 0.0; //when icon is visible
- align: 0.0 0.0;
- rel1 { relative: 1.0 0.0; to: "icon_rect"; }
- rel2 { relative: 1.0 1.0; to: "icon_rect"; }
- fixed: 1 0;
- min: 5 0;
- color: 0 0 0 0;
- }
- }
- part { name: "elm.swallow.content";
- type: SWALLOW;
- scale: 1;
- description { state: "default" 0.0;
- visible: 0;
- align: 0.0 0.5;
- rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
- rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
- fixed: 1 0;
- }
- description { state: "visible" 0.0;
- fixed: 1 0;
- visible: 1;
- align: 0.0 0.5;
- rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
- rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
- }
- description { state: "icononly" 0.0;
- visible: 1;
- min: 40 40;
- rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
- rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
- align: 0.5 0.5;
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
- }
- }
- part { name: "elm.text";
- type: TEXTBLOCK;
- mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- visible: 0;
- rel1 { relative: 1.0 1.0; to_x: "padding_icon_text"; to_y: "padding_left_top"; }
- rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
- align: 0.5 0.5;
- color: BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC;
- text {
- style: "btn_multiline_style";
- min: 0 0;
- max: 0 1;
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- min: 80 0;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- min: 0 0;
- color: BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 0 0 0 128;
- }
- description { state: "disabled_visible" 0.0;
- inherit: "default" 0.0;
- color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_COLOR_INC;
- visible: 1;
- min: 80 0;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- min: 0 0;
- color: BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC;
- }
- }
- part { name: "over2";
- type: RECT;
- mouse_events: 1;
- repeat_events: 1;
- ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- part { name: "over3";
- type: RECT;
- mouse_events: 1;
- repeat_events: 1;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- part { name: "disabler";
- type: RECT;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- visible: 0;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- }
- programs {
- program { name: "button_click";
- signal: "mouse,down,1";
- source: "over2";
- action: SIGNAL_EMIT "elm,action,press" "";
- after: "button_click_anim";
- }
- program { name: "button_click_anim";
- action: STATE_SET "clicked" 0.0;
- target: "button_image";
- after: "text_clicked";
- }
- program { name: "text_clicked";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "visible"))
- set_state(PART:"elm.text", "clicked", 0.0);
- }
- }
- program { name: "button_unpress";
- action: SIGNAL_EMIT "elm,action,unpress" "";
- }
- program { name: "button_mouseout_clicked";
- signal: "mouse,up,1";
- source: "over3";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.swallow.content", st, 30, vl);
- if (strcmp(st, "icononly"))
- {
- emit("elm,action,default,text,set", "");
- set_state(PART:"elm.text", "visible", 0.0);
- }
- if(get_int(button_state) != BUTTON_STATE_DISABLED)
- set_state(PART:"button_image", "default", 0.0);
- }
- after: button_unpress;
- }
- program { name: "button_unclick3";
- signal: "mouse,clicked,1";
- source: "over2";
- action: SIGNAL_EMIT "elm,action,click" "";
- }
- program { name: "text_show";
- signal: "elm,state,text,visible";
- source: "elm";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.swallow.content", st, 30, vl);
- if (!strcmp(st, "icononly"))
- {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"padding_icon_text", "visible", 0.0);
- }
- if(get_int(button_state) != BUTTON_STATE_DISABLED)
- set_state(PART:"elm.text", "visible", 0.0);
- else
- set_state(PART:"elm.text", "disabled_visible", 0.0);
- }
- }
- program { name: "text_hide";
- signal: "elm,state,text,hidden";
- source: "elm";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.swallow.content", st, 30, vl);
- if (!strcmp(st, "visible"))
- {
- set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"padding_icon_text", "icononly", 0.0);
- }
- set_state(PART:"elm.text", "default", 0.0);
- }
- }
- program { name: "icon_show";
- signal: "elm,state,icon,visible";
- source: "elm";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "visible"))
- {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"padding_icon_text", "visible", 0.0);
- }
- else
- {
- set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"padding_icon_text", "icononly", 0.0);
- }
- }
- }
- program { name: "icon_hide";
- signal: "elm,state,icon,hidden";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.swallow.content";
- target: "padding_icon_text";
- }
- program { name: "disable";
- signal: "elm,state,disabled";
- source: "elm";
- action: STATE_SET "disabled" 0.0;
- target: "button_image";
- target: "disabler";
- after: "disable_text";
- }
- program { name: "disable_text";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "visible"))
- set_state(PART:"elm.text", "disabled_visible", 0.0);
- else
- set_state(PART:"elm.text", "disabled", 0.0);
- set_int(button_state, BUTTON_STATE_DISABLED);
- }
- }
- program { name: "enable";
- signal: "elm,state,enabled";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "button_image";
- target: "disabler";
- after: "enable_text";
- }
- program { name: "enable_text";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "disabled_visible"))
- set_state(PART:"elm.text", "visible", 0.0);
- else
- set_state(PART:"elm.text", "default", 0.0);
- set_int(button_state, BUTTON_STATE_ENABLED);
- }
- }
- program { name: "focused";
- //signal: "elm,action,focus";
- //source: "elm";
- action: STATE_SET "focused" 0.0;
- target: "button_image";
- target: "elm.text";
- }
- program { name: "unfocused";
- //signal: "elm,action,unfocus";
- //source: "elm";
- action: STATE_SET "default" 0.0;
- target: "button_image";
- after: "unfocus_text";
- }
- program { name: "unfocus_text";
- action: STATE_SET "visible" 0.0;
- target: "elm.text";
- }
- }
- }
-
-}
diff --git a/main/layout/ivug-details.edc b/main/layout/ivug-details.edc
index 4c38245..fbba4d7 100755
--- a/main/layout/ivug-details.edc
+++ b/main/layout/ivug-details.edc
@@ -1,18 +1,18 @@
-/*
- * 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.
- */
+/*
+ * 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.
+ */
/*
@@ -25,6 +25,9 @@
#define BTN_THUMB_PLAY_W_INC 64
#define BTN_THUMB_PLAY_H_INC 64
+#define CONTROLBAR_LARGE_HEIGHT_INC 122
+#define CONTROLBAR_LARGE_LANDSCAPE_H 108
+
#define BTN_THUMB_PLAY "T01_btn_thumbnail_play.png"
collections {
@@ -50,7 +53,7 @@ collections {
}
part {
- name: "detailsview.genlist";
+ name: "details_view.genlist";
type: SWALLOW;
repeat_events : 0;
mouse_events : 1;
@@ -60,11 +63,8 @@ collections {
visible: 1;
rel1 { relative: 0.0 0.0; }
rel2 { relative: 1.0 1.0; }
-// rel2 { relative: 1.0 0.0; to_y: "detailsview.ctrlbar";}
-// rel2 { relative: 0.0 0.0; to_x: "detailsview.thumb"; to_y: "detailsview.ctrlbar";}
}
}
-
}
} // end of group
} // end of collections
diff --git a/main/layout/ivug-effect.edc b/main/layout/ivug-effect.edc
index 519f1da..7a19e6a 100755
--- a/main/layout/ivug-effect.edc
+++ b/main/layout/ivug-effect.edc
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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 {
group {
diff --git a/main/layout/ivug-icons.edc b/main/layout/ivug-icons.edc
index 95fff2d..38b1169 100755
--- a/main/layout/ivug-icons.edc
+++ b/main/layout/ivug-icons.edc
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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 DEFINE_ICON(_name, _fname) \
images { image: _fname COMP; } \
@@ -46,15 +45,18 @@ collections { group { name: _name; \
#define BTN_PLAY_VIDEO "T01_btn_play.png"
+#define BTN_PAUSED_VIDEO "T01_btn_paused.png"
DEFINE_ICON("btn.video.play", BTN_PLAY_VIDEO)
+DEFINE_ICON("btn.video.paused", BTN_PAUSED_VIDEO)
#define HEADER_ICON_PATH "01_Header icon"
#define HEADER_ICON_DONE "01_header_icon_done.png"
#define HEADER_ICON_CANCEL "01_header_icon_cancel.png"
-#define HEADER_ICON_OTHERS "01_header_icon_others.png"
+#define HEADER_ICON_ADD "01_header_icon_add.png"
DEFINE_ICON("navi.icon.done", HEADER_ICON_PATH"/"HEADER_ICON_DONE)
DEFINE_ICON("navi.icon.cancel", HEADER_ICON_PATH"/"HEADER_ICON_CANCEL)
-DEFINE_ICON("navi.icon.others", HEADER_ICON_PATH"/"HEADER_ICON_OTHERS)
+DEFINE_ICON("navi.icon.add", HEADER_ICON_PATH"/"HEADER_ICON_ADD)
+
diff --git a/main/layout/ivug-main.edc b/main/layout/ivug-main.edc
index 1b8e803..76264ea 100755
--- a/main/layout/ivug-main.edc
+++ b/main/layout/ivug-main.edc
@@ -1,27 +1,26 @@
-/*
- * 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.
- */
+/*
+ * 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.
+ */
// main view
-#define LAYOUT_INDICATOR_HEIGHT_INC 50
-#define LAYOUT_INDICATOR_COLOR 92 92 92 255 // Same as Naviframe
+#include "ivug-theme.edc"
#define NAVI_VIEW_HEIGHT 120
-#define CTRL_VIEW_HEIGHT 95
+#define CTRL_VIEW_HEIGHT 114
collections {
group {
@@ -72,7 +71,7 @@ group {
state: "default" 0.0;
align: 0.5 0.0;
visible: 1;
- rel1 { relative: 0.0 0.0;}
+ rel1 { relative: 0.0 0.0; }
rel2 { relative: 1.0 1.0;}
}
@@ -83,14 +82,27 @@ group {
}
}
+ part { name: "mainview.area";
+ type: SWALLOW;
+ scale: 1;
+ mouse_events: 0;
+ repeat_events : 1;
+ description {
+ state: "default" 0.0;
+ align: 0.5 0.5;
+ visible: 1;
+ rel1 { relative: 0.0 0.0; offset: 0 LAYOUT_INDICATOR_HEIGHT_INC;}
+ rel2 { relative: 1.0 1.0;}
+ }
+ }
}
programs {
program {
- name: "main_view_click";
- signal: "mouse,down,1";
- source: "mainview";
- action: SIGNAL_EMIT "elm,action,press" "";
+ name: "main_view_click";
+ signal: "mouse,down,1";
+ source: "mainview";
+ action: SIGNAL_EMIT "elm,action,press" "";
}
program {
name: "hide_menu";
@@ -111,21 +123,18 @@ group {
after: "show_end";
}
program {
- name: "show_end";
- action: SIGNAL_EMIT "menu,show,finished" "edc";
+ name: "show_end";
+ action: SIGNAL_EMIT "menu,show,finished" "edc";
}
program {
- name: "hide_end";
- action: SIGNAL_EMIT "menu,hide,finished" "edc";
+ name: "hide_end";
+ action: SIGNAL_EMIT "menu,hide,finished" "edc";
}
}
}
-#define EMPTY_VIEW_HEIGHT (720-LAYOUT_INDICATOR_HEIGHT_INC-NAVI_VIEW_HEIGHT-CTRL_VIEW_HEIGHT)
-//#define EMPTY_VIEW_HEIGHT 1000
-
group {
name: "navi_content";
parts {
@@ -133,7 +142,8 @@ group {
name: "base";
type: RECT;
scale: 1;
- repeat_events: 1;
+ mouse_events: 1;
+ repeat_events: 0;
description {
state: "default" 0.0;
@@ -142,7 +152,6 @@ group {
color: 0 0 0 0;
}
}
-
part { name: "mainview.slider";
type: SWALLOW;
mouse_events: 1;
@@ -153,7 +162,46 @@ group {
rel1 { relative: 0.0 0.0; }
rel2 { relative: 1.0 1.0; }
}
- }
+ }
+
+ part {
+ name: "controlbar_area";
+ type: RECT;
+ scale : 1;
+ mouse_events:0;
+ description {
+ state: "default" 0.0;
+ min : 0 114;
+ fixed : 0 1;
+ rel1{ relative : 0.0 1.0; }
+ rel2{ relative : 1.0 1.0; }
+ align: 0.5 1.0;
+ color: 0 0 0 0;
+ visible : 1;
+ }
+ }
+
+ part {
+ name: "zoom_slider_area";
+ type: SWALLOW;
+ scale : 1;
+ mouse_events:1;
+ description {
+ state: "default" 0.0;
+ visible : 1;
+ min : 375 100;
+ fixed : 0 1;
+ color: 255 0 0 255;
+ rel1{ relative : 0.5 0.0; to_y:"controlbar_area";}
+ rel2{ relative : 0.5 0.0; to_y:"controlbar_area";}
+ align: 0.5 1.0;
+ }
+ description {
+ state: "hide" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
#define ICON_ZOOM_GAP 50
@@ -180,19 +228,23 @@ group {
type: IMAGE;
scale: 1;
- mouse_events: 1;
+ mouse_events: 0;
description {
visible: 1;
fixed: 1 1;
min: 56 56;
state: "default" 0.0;
- align: 0.5 0.0;
- /*rel1 { relative: (238/720) ((EMPTY_VIEW_HEIGHT-50-56)/EMPTY_VIEW_HEIGHT);}
- rel2 { relative: (238/720) ((EMPTY_VIEW_HEIGHT-50-56)/EMPTY_VIEW_HEIGHT);}*/
- rel1 { relative: ((238+28)/720) 1.0;
- offset: 0.0 -56-CTRL_VIEW_HEIGHT;}
+ align: 1.0 0.0;
+ /*rel1 { relative: ((238+28)/720) 1.0;
+ offset: 0.0 -56-CTRL_VIEW_HEIGHT-10;}
rel2 { relative: ((238+28)/720) 1.0;
- offset: 0.0 -56-CTRL_VIEW_HEIGHT;}
+ offset: 0.0 -56-CTRL_VIEW_HEIGHT-10;}*/
+ rel1 { relative: 0.0 1.0;
+ to_x: "zoom_slider_area";
+ offset: 0.0 -56-CTRL_VIEW_HEIGHT-20;}
+ rel2 { relative: 0.0 1.0;
+ to_x: "zoom_slider_area";
+ offset: 0.0 -56-CTRL_VIEW_HEIGHT-20;}
image.normal: ICON_ZOOM_OUT;
}
@@ -243,19 +295,23 @@ group {
type: IMAGE;
scale: 1;
- mouse_events: 1;
+ mouse_events: 0;
description {
visible: 1;
fixed: 1 1;
min: 56 56;
state: "default" 0.0;
- align: 0.5 0.0;
- /*rel1 { relative: ((238+56+132)/720) ((EMPTY_VIEW_HEIGHT-50-56)/EMPTY_VIEW_HEIGHT);}
- rel2 { relative: ((238+56+132)/720) ((EMPTY_VIEW_HEIGHT-50-56)/EMPTY_VIEW_HEIGHT);}*/
- rel1 { relative: ((720-238-28)/720) 1.0;
- offset: 0.0 -56-CTRL_VIEW_HEIGHT;}
+ align: 0.0 0.0;
+ /*rel1 { relative: ((720-238-28)/720) 1.0;
+ offset: 0.0 -56-CTRL_VIEW_HEIGHT-10;}
rel2 { relative: ((720-238-28)/720) 1.0;
- offset: 0.0 -56-CTRL_VIEW_HEIGHT;}
+ offset: 0.0 -56-CTRL_VIEW_HEIGHT-10;}*/
+ rel1 { relative: 1.0 1.0;
+ to_x: "zoom_slider_area";
+ offset: 0.0 -56-CTRL_VIEW_HEIGHT-20;}
+ rel2 { relative: 1.0 1.0;
+ to_x: "zoom_slider_area";
+ offset: 0.0 -56-CTRL_VIEW_HEIGHT-20;}
image.normal: ICON_ZOOM_IN;
}
@@ -350,7 +406,21 @@ group {
}
- programs {
+ programs {
+ program {
+ name: "hide_zoom_slider";
+ signal: "elm,state,zoom_slider,hide";
+ source: "elm";
+ action: STATE_SET "hide" 0.0;
+ target: "zoom_slider_area";
+ }
+ program {
+ name: "show_zoom_slider";
+ signal: "elm,state,zoom_slider,show";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "zoom_slider_area";
+ }
program {
name: "hide_btn_zoom_out";
signal: "elm,state,btn_zoom_out,hide";
@@ -455,7 +525,7 @@ group {
target: "mainview.btn_zoom_in";
}
}
-
}
+
}
diff --git a/main/layout/ivug-naviframe.edc b/main/layout/ivug-naviframe.edc
index d2d0368..0aa6895 100755
--- a/main/layout/ivug-naviframe.edc
+++ b/main/layout/ivug-naviframe.edc
@@ -1,66 +1,26 @@
-/*
- * 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.
- */
-
+/*
+ * 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.
+ */
/*
* Refer to themes/groups/naviframe.edc
*/
-#define NAVIFRAME_VIEW_TRANS_TIME 0.3
-#define NAVIFRAME_TEXT_PADDING_INC 144
-#define NAVIFRAME_TEXT_PADDING_MORE_BUTTON_INC 278
-#define NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 186
-
-#define NAVIFRAME_TITLE_H_INC 100
-#define NAVIFRAME_OH_CLOSED_H_INC 8
-#define NAVIFRAME_OH_OPENED_H_INC 106
-#define NAVIFRAME_OH_CONTENT_H_INC 74
-#define NAVIFRAME_OH_PADDING_INC 16
-#define NAVIFRAME_OH_OPENED_DOUBLE_H_INC 196
-#define NAVIFRAME_OH_SHADOW_H_INC 0
-#define NAVIFRAME_INDICATOR_W_INC 128
-#define NAVIFRAME_PADDING_EXPANDED_INC 141
-#define NAVIFRAME_TITLE_FONT_SIZE_INC 36
-#define NAVIFRAME_ICON_SIZE_INC 32 32
-#define NAVIFRAME_ICON_PADDING_INC 16 0
-#define NAVIFRAME_OH_ARROW_SIZE_INC 19 12
-#define NAVIFRAME_TITLE_TEXT_COLOR_INC 235 236 237 255
-#define NAVIFRAME_TITLE_BG_COLOR_INC 92 92 92 255
-#define NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC 3 3 3 255
-#define NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC 52 52 52 255
-#define NAVIFRAME_OH_BORDER_INC 0 0 4 0
+#include "ivug-theme.edc"
-#define NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 10
-#define NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 10
-#define NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC 124 80
-#define NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 144
-#define NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 52
-#define NAVIFRAME_CONTROLBAR_BG_COLOR_INC 0 0 0 255
-#define CONTROLBAR_LARGE_HEIGHT_INC 95//122
-#define CONTROLBAR_SMALL_HEIGHT_INC CONTROLBAR_LARGE_HEIGHT_INC//102
-#define NAVIFRAME_PREV_BTN_W_INC 124
-#define NAVIFRAME_CONTROLBAR_PADDING_INC 5
-#define NAVIFRAME_SEGMENT_TITLE_H_INC 136
-
-#define NAVIFRAME_TITLE_SEGMENT_FONT_SIZE_INC 28
-#define NAVIFRAME_TITLE_SEGMENT_TEXT_H_INC 50
-#define NAVIFRAME_TITLE_SEGMENT_H_INC 74
-
-#define LAYOUT_INDICATOR_HEIGHT_INC 50
-#define LAYOUT_INDICATOR_COLOR 0 0 0 0 //92 92 92 255 // Same as Naviframe
+#define NAVIFRAME_VIEW_TRANS_TIME 0.3
///////////////////////////////////////////////////////////////////////////
// Naviframe
@@ -76,11 +36,14 @@ collections {
}
}
}
- group { name:"elm/naviframe/item/basic/ivug/default";
- alias:"elm/naviframe/item/1line/ivug/default";
+ group { name:"elm/naviframe/item/basic/ivug-main/default";
+ alias:"elm/naviframe/item/1line/ivug-main/default";
images {
- image: "T01_control_top_bg.png" COMP;
- image: "T01_control_top_arrow.png" COMP;
+ image: "00_winset_control_top_bg.png" COMP;
+ image: "00_winset_control_top_arrow.png" COMP;
+ image: "00_winset_title_line.png" COMP;
+ image: "00_winset_control_toolbar_bg.png" COMP;
+ image: "00_winset_title_bg.png" COMP;
}
script {
public oh_show = 0; //optionheader show/hide
@@ -91,31 +54,9 @@ collections {
public right_btn_visible = 0; //whether right btn is shown
public more_btn_visible = 0; //whether more btn is shown
public large_padded_center_align = 0; //large padding based on button size for center align for 1/2 buttons.
+ public subtitle_visible = 0; //whether subtitle is shown
}
parts {
- part {
- name: "indicator";
- type: RECT;
- scale: 1;
- repeat_events : 0;
- description {
- state: "default" 0.0;
- rel1 { relative: 0.0 0.0; }
- rel2 { relative: 1.0 0.0; }
- min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
- fixed: 0 1;
- align: 0.5 0.0;
- color: LAYOUT_INDICATOR_COLOR;
- visible: 1;
- }
-
- description {
- state: "hide" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
-
part { name: "base";
type: RECT;
mouse_events: 0;
@@ -160,7 +101,7 @@ collections {
}
}
- part { name: "elm.swallow.detail";
+ part { name: "elm.swallow.detail"; // Detail view.
type: SWALLOW;
scale: 1;
repeat_events: 0;
@@ -177,8 +118,31 @@ collections {
}
}
+ part {
+ name: "indicator";
+ type: RECT;
+ scale: 1;
+ repeat_events : 0;
+ clip_to: "content_clip";
+ description {
+ state: "default" 0.0;
+ min: 0 LAYOUT_INDICATOR_HEIGHT_INC;
+// max: 0 LAYOUT_INDICATOR_HEIGHT_INC;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 0.0;
+ fixed: 0 1;
+ align: 0.5 0.0;
+ color: LAYOUT_INDICATOR_COLOR_INC;
+ visible: 1;
+ }
+
+ description {
+ state: "hide" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
part { name: "title_bg";
- type: RECT;
scale: 1;
description { state: "default" 0.0;
min: 1 NAVIFRAME_TITLE_H_INC;
@@ -186,7 +150,7 @@ collections {
fixed: 0 1;
rel1 { relative: 0.0 0.0; to: "base"; }
rel2 { relative: 1.0 0.0; to: "base"; }
- color: NAVIFRAME_TITLE_BG_COLOR_INC;
+ image.normal: "00_winset_title_bg.png";
}
description { state: "hide" 0.0;
inherit: "default" 0.0;
@@ -214,7 +178,7 @@ collections {
rel1.relative: 0 1;
rel2.to: "title_bg";
visible: 0;
- image { normal: "T01_control_top_bg.png";
+ image { normal: "00_winset_control_top_bg.png";
border: NAVIFRAME_OH_BORDER_INC;
}
}
@@ -259,7 +223,7 @@ collections {
min: 0 NAVIFRAME_OH_CONTENT_H_INC;
rel1 { relative: 0.0 1.0; to: "optionheader_top_padding"; }
rel2 { relative: 1.0 1.0; to: "optionheader_top_padding"; }
- fixed: 0 1;
+ fixed: 1 1;
align: 0.0 0.0;
}
}
@@ -276,76 +240,1002 @@ collections {
visible: 0;
}
}
- part { name: "padding_before_left_btn";
+ part { name: "optionheader_shadow";
type: RECT;
- mouse_events: 0;
+ scale: 1;
+ clip_to: "optionheader_clip";
+ description { state: "default" 0.0;
+ min: 0 NAVIFRAME_OH_SHADOW_INC;
+ rel1 { relative: 0.0 1.0; to: "optionheader_bottom_padding"; }
+ rel2 { relative: 1.0 1.0; to: "optionheader_bottom_padding"; }
+ fixed: 0 1;
+ align: 0.0 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "left_btn_separator";
+ type: IMAGE;
scale: 1;
clip_to: "title_clip";
description { state: "default" 0.0;
- min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
- fixed: 1 0;
- align: 0.0 0.5;
- rel1 { relative: 0.0 0.0; to: "title_bg"; }
- rel2 { relative: 0.0 1.0; to: "title_bg"; }
+ min: 2 48;
+ max: 2 48;
+ fixed: 1 1;
+ align: 1.0 0.5;
+ rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
+ rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
+ image.normal: "00_winset_title_line.png";
+ visible: 0;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part { name: "right_btn_separator";
+ type: IMAGE;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ min: 2 48;
+ max: 2 48;
+ fixed: 1 1;
+ align: 1.0 0.5;
+ rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+ rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+ image.normal: "00_winset_title_line.png";
visible: 0;
}
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
}
- part { name: "padding_after_left_btn";
+ part { name: "padding_before_text";
type: RECT;
scale: 1;
+ mouse_events: 0;
clip_to: "title_clip";
description { state: "default" 0.0;
- min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+ align: 0.0 0.0;
+ rel1 { relative: 0.0 0.0; to: "title_bg"; }
+ rel2 { relative: 0.0 1.0; to: "title_bg"; }
fixed: 1 0;
- align: 0 0.5;
- rel1 { relative: 1.0 0.0; to: "title_left_btn"; }
- rel2 { relative: 1.0 1.0; to: "title_left_btn"; }
+ min: NAVIFRAME_ICON_PADDING_INC;
visible: 0;
}
}
- part { name: "padding_before_more_btn";
+ part { name: "padding_center_text1";
type: RECT;
scale: 1;
+ mouse_events: 0;
clip_to: "title_clip";
description { state: "default" 0.0;
- min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+ min: 0 0;
fixed: 1 0;
- align: 1.0 0.5;
- rel1 { relative: 0.0 0.0; to: "title_more_btn"; }
- rel2 { relative: 0.0 1.0; to: "title_more_btn"; }
+ align: 0.0 0.0;
+ rel1 { relative: 1.0 0.0; to: "padding_before_text"; }
+ rel2 { relative: 1.0 1.0; to: "padding_before_text"; }
visible: 0;
}
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ }
+ description { state: "icon" 0.0;
+ inherit: "default" 0.0;
+ min: NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 0;
+ }
+ description { state: "icon_left_button" 0.0;
+ inherit: "default" 0.0;
+ min: NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 0;
+ }
}
- part { name: "padding_after_right_btn";
+ part { name: "padding_center_text2";
type: RECT;
mouse_events: 0;
scale: 1;
clip_to: "title_clip";
description { state: "default" 0.0;
- min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+ min: 0 0;
fixed: 1 0;
align: 1.0 0.5;
rel1 { relative: 1.0 0.0; to: "title_bg"; }
rel2 { relative: 1.0 1.0; to: "title_bg"; }
visible: 0;
}
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ min: NAVIFRAME_TEXT_PADDING_INC 0;
}
- part { name: "padding_before_right_btn";
+ }
+ part { name: "elm.text.title";
+ type: TEXT;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ text { font: "SLP:style=Medium";
+ size: NAVIFRAME_TITLE_FONT_SIZE_INC;
+ min: 0 0;
+ max: 1 0;
+ align: 0.5 0.5;
+ text_class: "slp_medium";
+ }
+ color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
+ align: 0.0 0.5;
+ fixed: 1 0;
+ rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "title_bg"; }
+ rel2 { relative: 0.0 1.0; to_x: "padding_center_text2"; to_y: "title_bg"; }
+ }
+ description { state: "right_and_more_button" 0.0;
+ inherit: "default" 0.0;
+ rel2 { relative: 0.0 1.0; to_x: "title_more_btn"; to_y: "title_bg"; }
+ }
+ description { state: "subtitle_is_set" 0.0;
+ inherit: "default" 0.0;
+ rel2 { relative: 0.0 0.7; to_x: "padding_center_text2"; to_y: "title_bg"; }
+ }
+ description { state: "subtitle_right_more_button_is_set" 0.0;
+ inherit: "default" 0.0;
+ rel2 { relative: 0.0 0.7; to_x: "title_more_btn"; to_y: "title_bg"; }
+ }
+ }
+ part { name: "elm.text.subtitle";
+ type: TEXT;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ text { font: "SLP:style=Medium";
+ size: NAVIFRAME_SUBTITLE_FONT_SIZE_INC;
+ min: 0 0;
+ max: 1 0;
+ align: 0.5 0.5;
+ text_class: "slp_medium";
+ }
+ color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC;
+ align: 0.0 0.5;
+ fixed: 1 0;
+ rel1 {
+ relative: 1.0 1.0;
+ to_x: "padding_center_text1";
+ to_y: "elm.text.title";
+ }
+ rel2 {
+ relative: 0.0 1.0;
+ to_x: "padding_center_text2";
+ to_y: "elm.text.title";
+ }
+ }
+ description { state: "right_and_more_button" 0.0;
+ inherit: "default" 0.0;
+ rel2 {
+ relative: 0.0 1.0;
+ to_x: "title_more_btn";
+ to_y: "elm.text.title";
+ }
+ }
+ }
+ part { name: "elm.swallow.icon";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ max: NAVIFRAME_ICON_SIZE_INC;
+ fixed: 1 1;
+ rel1 { relative: 0.0 0.0; to: "padding_center_text1"; }
+ rel2 { relative: 0.0 1.0; to: "padding_center_text1"; }
+ aspect: 1.0 1.0;
+ aspect_preference: VERTICAL;
+ align: 0.0 0.5;
+ }
+ }
+ part { name: "click_event_area";
+ ignore_flags: ON_HOLD;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ rel1 { to: "title_bg"; }
+ rel2 { to: "title_bg"; }
+ }
+ }
+ part { name: "title_left_btn";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+ fixed: 1 1;
+ align: 1 0.5;
+ rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+ rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+ }
+ }
+ part { name: "title_right_btn";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+ align: 1 0.5;
+ fixed: 1 1;
+ rel1 { relative: 1.0 0.0; to: "title_bg"; }
+ rel2 { relative: 1.0 1.0; to: "title_bg"; }
+ }
+ }
+ part { name: "title_more_btn";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+ fixed: 1 1;
+ align: 1 0.5;
+ rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
+ rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
+ }
+ }
+ part { name: "optionheader_arrow";
+ type: IMAGE;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: NAVIFRAME_OH_ARROW_SIZE_INC;
+ max: NAVIFRAME_OH_ARROW_SIZE_INC;
+ fixed: 1 1;
+ align: 0.5 0.0;
+ rel1 { relative: 0.0 1.1; to: "title_more_btn"; }
+ rel2 { relative: 1.0 1.2; to: "title_more_btn"; }
+ //image.normal: "00_winset_control_top_arrow.png";
+ color: 255 255 255 0;
+ }
+ description { state: "show" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "controlbar_bg";
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 0 0;
+ max: 999999 0;
+ fixed: 0 1;
+ align: 0.0 1.0;
+ visible: 0;
+ rel1 { to: "base"; }
+ rel2 { to: "base"; }
+ image.normal: "00_winset_control_toolbar_bg.png";
+ }
+ description { state: "show" 0.0;
+ inherit: "default" 0.0;
+ min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+ max: 999999 CONTROLBAR_SMALL_HEIGHT_INC;
+ visible: 1;
+ }
+ }
+ part { name: "controlbar_clip";
type: RECT;
mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "controlbar_bg";
+ rel2.to: "controlbar_bg";
+ }
+ }
+ part { name: "elm.prev_btn_bg";
+ type: RECT;
scale: 1;
- clip_to: "title_clip";
+ clip_to: "controlbar_clip";
description { state: "default" 0.0;
min: 0 0;
fixed: 1 0;
+ align: 1.0 0.0;
+ rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+ rel2.to: "controlbar_bg";
+ visible: 0;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
+ }
+ }
+ part { name: "elm.swallow.prev_btn";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "controlbar_clip";
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ align: 0.5 0.5;
+ rel1.to: "elm.prev_btn_bg";
+ rel2.to: "elm.prev_btn_bg";
+ }
+ }
+ part { name: "controlbar";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "controlbar_clip";
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "controlbar_bg";
+ rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+ }
+ }
+ }
+ programs {
+ program { name: "content_new_pushed";
+ signal: "elm,state,new,pushed,internal";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+ transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
+ after: "show_finished";
+ }
+ program { name: "content_cur_pushed";
+ signal: "elm,state,cur,pushed,internal";
+ source: "";
+ action: STATE_SET "left" 0.0;
+ target: "base";
+ transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
+ after: "pushed_finished";
+ }
+ program { name: "content_prev_popped";
+ signal: "elm,state,prev,popped,internal";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+ transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
+ after: "show_finished";
+ }
+ program { name: "content_cur_popped";
+ signal: "elm,state,cur,popped,internal";
+ source: "";
+ action: STATE_SET "right" 0.0;
+ target: "base";
+ transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
+ after: "popped_finished";
+ }
+ program { name: "cur_pushed";
+ signal: "elm,state,cur,pushed";
+ source: "elm";
+ script {
+ set_state(PART:"base", "default", 0.0);
+ emit("elm,state,cur,pushed,internal", "");
+ }
+ }
+ program { name: "new_pushed";
+ signal: "elm,state,new,pushed";
+ source: "elm";
+ script {
+ set_state(PART:"base", "right", 0.0);
+ emit("elm,state,new,pushed,internal", "");
+ }
+ }
+ program { name: "prev_popped";
+ signal: "elm,state,prev,popped";
+ source: "elm";
+ script {
+ set_state(PART:"base", "left", 0.0);
+ emit("elm,state,prev,popped,internal", "");
+ }
+ }
+ program { name: "cur_popped";
+ signal: "elm,state,cur,popped";
+ source: "elm";
+ script {
+ set_state(PART:"base", "default", 0.0);
+ emit("elm,state,cur,popped,internal", "");
+ }
+ }
+ program { name: "visible";
+ signal: "elm,state,visible";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+ }
+ program { name: "title_show";
+ signal: "elm,state,title,show";
+ source: "elm";
+ script {
+ set_state(PART:"indicator", "default", 0.0);
+ set_state(PART:"title_bg", "default", 0.0);
+ if (get_int(oh_show) == 1) {
+ if (get_int(oh_close) == 1) {
+ emit("elm,state,optionheader,instant_close", "");
+ }else {
+ emit("elm,state,optionheader,instant_open", "");
+ }
+ }
+ else
+ set_state(PART:"optionheader_bg", "default", 0.0);
+ }
+ }
+ program { name: "title_hide";
+ signal: "elm,state,title,hide";
+ source: "elm";
+ action: STATE_SET "hide" 0.0;
+ target: "title_bg";
+ target: "optionheader_bg";
+ target: "indicator";
+ }
+ program { name: "prev_btn_show";
+ signal: "elm,state,prev_btn,show";
+ source: "elm";
+ script {
+ emit("elm,state,controlbar_bg,show", "elm");
+ set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
+ }
+ }
+ program { name: "prev_btn_hide";
+ signal: "elm,state,prev_btn,hide";
+ source: "elm";
+ script {
+ emit("elm,state,controlbar_bg,hide", "elm");
+ set_state(PART:"elm.prev_btn_bg", "default", 0.0);
+ }
+ }
+ program { name: "subtitle_show";
+ signal: "elm,state,subtitle,show";
+ source: "elm";
+ script {
+ set_int(subtitle_visible, 1);
+ if (get_int(large_padded_center_align) == 0)
+ set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+ else
+ set_state(PART:"elm.text.title", "subtitle_is_set", 0.0);
+ }
+ }
+ program { name: "subtitle_hide";
+ signal: "elm,state,subtitle,hide";
+ source: "elm";
+ script {
+ set_int(subtitle_visible, 0);
+ if (get_int(large_padded_center_align) == 0)
+ set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+ else
+ set_state(PART:"elm.text.title", "default", 0.0);
+ }
+ }
+ program { name: "left_btn_show";
+ signal: "elm,state,title_left_btn,show";
+ source: "elm";
+ script {
+ set_int(left_btn_visible, 1);
+ set_state(PART:"left_btn_separator", "visible", 0.0);
+ if (get_int(icon_visible) == 1)
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ if ((get_int(more_btn_visible) == 1) && (get_int(right_btn_visible) == 1)) {
+ if (get_int(subtitle_visible) == 1)
+ set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+ else
+ set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+ set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
+ set_int(large_padded_center_align, 0);
+ }
+ else {
+ set_state(PART:"padding_center_text2", "visible", 0.0);
+ set_int(large_padded_center_align, 1);
+ }
+ }
+ }
+ program { name: "left_btn_hide";
+ signal: "elm,state,title_left_btn,hide";
+ source: "elm";
+ script {
+ set_int(left_btn_visible, 0);
+ set_state(PART:"left_btn_separator", "default", 0.0);
+ if ((get_int(more_btn_visible) == 0) && (get_int(right_btn_visible) == 0)) {
+ set_state(PART:"padding_center_text2", "default", 0.0);
+ set_int(large_padded_center_align, 0);
+ }
+ else {
+ set_state(PART:"padding_center_text2", "visible", 0.0);
+ set_int(large_padded_center_align, 1);
+ }
+ if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else if (get_int(large_padded_center_align) == 1)
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ else if (get_int(icon_visible) == 1)
+ set_state(PART:"padding_center_text1", "icon", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "default", 0.0);
+ }
+ }
+ program { name: "right_btn_show";
+ signal: "elm,state,title_right_btn,show";
+ source: "elm";
+ script {
+ set_int(right_btn_visible, 1);
+ set_state(PART:"right_btn_separator", "visible", 0.0);
+ if (get_int(more_btn_visible) == 1) {
+ if (get_int(subtitle_visible) == 1)
+ set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+ else
+ set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+ set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
+ set_int(large_padded_center_align, 0);
+ }
+ else {
+ set_state(PART:"padding_center_text2", "visible", 0.0);
+ set_int(large_padded_center_align, 1);
+ }
+ if ((get_int(icon_visible) == 1) && ((get_int(left_btn_visible) == 1) ||
+ (get_int(large_padded_center_align) == 1)))
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else if ((get_int(left_btn_visible) == 1) || (get_int(large_padded_center_align) == 1))
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ else if (get_int(icon_visible) == 1)
+ set_state(PART:"padding_center_text1", "icon", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "default", 0.0);
+ }
+ }
+ program { name: "right_btn_hide";
+ signal: "elm,state,title_right_btn,hide";
+ source: "elm";
+ script {
+ set_int(right_btn_visible, 0);
+ set_state(PART:"right_btn_separator", "default", 0.0);
+ if ((get_int(more_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
+ set_state(PART:"padding_center_text2", "default", 0.0);
+ set_int(large_padded_center_align, 0);
+ }
+ else {
+ set_state(PART:"padding_center_text2", "visible", 0.0);
+ set_int(large_padded_center_align, 1);
+ }
+ if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else if (get_int(large_padded_center_align) == 1)
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ else if (get_int(icon_visible) == 1)
+ set_state(PART:"padding_center_text1", "icon", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "default", 0.0);
+ }
+ }
+ program { name: "more_btn_show";
+ signal: "elm,state,title_more_btn,show";
+ source: "elm";
+ script {
+ set_int(more_btn_visible, 1);
+ if (get_int(right_btn_visible) == 1) {
+ if (get_int(subtitle_visible) == 1)
+ set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+ else
+ set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+ set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
+ set_int(large_padded_center_align, 0);
+ }
+ else {
+ set_state(PART:"padding_center_text2", "visible", 0.0);
+ set_int(large_padded_center_align, 1);
+ }
+ if ((get_int(icon_visible) == 1) && ((get_int(left_btn_visible) == 1) ||
+ (get_int(large_padded_center_align) == 1)))
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else if ((get_int(left_btn_visible) == 1) || (get_int(large_padded_center_align) == 1))
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ else if (get_int(icon_visible) == 1)
+ set_state(PART:"padding_center_text1", "icon", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "default", 0.0);
+ }
+ }
+ program { name: "more_btn_hide";
+ signal: "elm,state,title_more_btn,hide";
+ source: "elm";
+ script {
+ set_int(more_btn_visible, 0);
+ if ((get_int(right_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
+ set_state(PART:"padding_center_text2", "default", 0.0);
+ set_int(large_padded_center_align, 0);
+ }
+ else {
+ set_state(PART:"padding_center_text2", "visible", 0.0);
+ set_int(large_padded_center_align, 1);
+ }
+ if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else if (get_int(large_padded_center_align) == 1)
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ else if (get_int(icon_visible) == 1)
+ set_state(PART:"padding_center_text1", "icon", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "default", 0.0);
+ }
+ }
+ program { name: "icon_show";
+ signal: "elm,state,icon,show";
+ source: "elm";
+ script {
+ set_int(icon_visible, 1);
+ if ((get_int(large_padded_center_align) == 1) || (get_int(left_btn_visible) == 1))
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "icon", 0.0);
+ }
+ }
+ program { name: "icon_hide";
+ signal: "elm,state,icon,hide";
+ source: "elm";
+ script {
+ set_int(icon_visible, 0);
+ if ((get_int(large_padded_center_align) == 1) || (get_int(left_btn_visible) == 1))
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "default", 0.0);
+ }
+ }
+ program { name: "controlbar_show";
+ signal: "elm,state,controlbar,show";
+ source: "elm";
+ script {
+ emit("elm,state,controlbar_bg,show", "elm");
+ }
+ }
+ program { name: "controlbar_hide";
+ signal: "elm,state,controlbar,hide";
+ source: "elm";
+ script {
+ emit("elm,state,controlbar_bg,hide", "elm");
+ }
+ }
+ program { name: "controlbar_bg_show";
+ signal: "elm,state,controlbar_bg,show";
+ source: "elm";
+ script {
+ set_state(PART:"controlbar_bg", "show", 0.0);
+ set_int(cbar_bg, get_int(cbar_bg) + 1);
+ }
+ }
+ program { name: "controlbar_bg_hide";
+ signal: "elm,state,controlbar_bg,hide";
+ source: "elm";
+ script {
+ set_int(cbar_bg, get_int(cbar_bg) - 1);
+ if (get_int(cbar_bg) <= 0)
+ set_state(PART:"controlbar_bg", "default", 0.0);
+ }
+ }
+ program { name: "optionheader_show";
+ signal: "elm,state,optionheader,show";
+ source: "elm";
+ script {
+ set_state(PART:"optionheader_bg", "show", 0.0);
+ set_state(PART:"optionheader_arrow", "show", 0.0);
+ set_int(oh_show, 1);
+ }
+ }
+ program { name: "optionheader_hide";
+ signal: "elm,state,optionheader,hide";
+ source: "elm";
+ script {
+ set_state(PART:"optionheader_bg", "default", 0.0);
+ set_state(PART:"optionheader_arrow", "default", 0.0);
+ set_int(oh_show, 0);
+ }
+ }
+ program { name: "optionheader_open";
+ signal: "elm,state,optionheader,open";
+ source: "";
+ action: STATE_SET "show" 0.0;
+ target: "optionheader_bg";
+ target: "optionheader_arrow";
+ transition: LINEAR 0.2;
+ after: "optionheader_open_set";
+ }
+ program { name: "optionheader_close";
+ signal: "elm,state,optionheader,close";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "optionheader_bg";
+ target: "optionheader_arrow";
+ transition: LINEAR 0.2;
+ after: "optionheader_close_set";
+ }
+ program { name: "optionheader_instant_open";
+ signal: "elm,state,optionheader,instant_open";
+ source: "";
+ action: STATE_SET "show" 0.0;
+ target: "optionheader_bg";
+ target: "optionheader_arrow";
+ after: "optionheader_open_set";
+ }
+ program { name: "optionheader_instant_close";
+ signal: "elm,state,optionheader,instant_close";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "optionheader_bg";
+ target: "optionheader_arrow";
+ after: "optionheader_close_set";
+ }
+ program { name: "optionheader_close_set";
+ signal: "elm,state,optionheader,close_set";
+ source: "";
+ script {
+ set_int(oh_close, 1);
+ }
+ }
+ program { name: "optionheader_open_set";
+ signal: "elm,state,optionheader,open_set";
+ source: "";
+ script {
+ set_int(oh_close, 0);
+ }
+ }
+ program { name: "controlbar_open";
+ signal: "elm,state,controlbar,open";
+ source: "";
+ action: STATE_SET "show" 0.0;
+ target: "controlbar_bg";
+ transition: LINEAR 0.2;
+ }
+ program { name: "controlbar_close";
+ signal: "elm,state,controlbar,close";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "controlbar_bg";
+ transition: LINEAR 0.2;
+ }
+ program { name: "controlbar_instant_open";
+ signal: "elm,state,controlbar,instant_open";
+ source: "";
+ script {
+ emit("elm,state,prev_btn,show", "elm");
+ emit("elm,state,controlbar,show", "elm");
+ }
+ }
+ program { name: "controlbar_instant_close";
+ signal: "elm,state,controlbar,instant_close";
+ source: "";
+ script {
+ emit("elm,state,prev_btn,hide", "elm");
+ emit("elm,state,controlbar,hide", "elm");
+ }
+ }
+ program { name: "show_finished";
+ action: SIGNAL_EMIT "elm,action,show,finished" "";
+ }
+ program { name: "pushed_finished";
+ action: SIGNAL_EMIT "elm,action,pushed,finished" "";
+ }
+ program { name: "popped_finished";
+ action: SIGNAL_EMIT "elm,action,popped,finished" "";
+ }
+ program {
+ name: "title_clicked";
+ signal: "mouse,clicked,1";
+ source: "click_event_area";
+ action: SIGNAL_EMIT "elm,action,title,clicked" "";
+ }
+ }
+ }
+
+ group { name:"elm/naviframe/item/basic/ivug-main/noindicator";
+ alias:"elm/naviframe/item/1line/ivug-main/noindicator";
+ images {
+ image: "00_winset_control_top_bg.png" COMP;
+ image: "00_winset_control_top_arrow.png" COMP;
+ image: "00_winset_title_line.png" COMP;
+ image: "00_winset_control_toolbar_bg.png" COMP;
+ image: "00_winset_title_bg.png" COMP;
+ }
+ script {
+ public oh_show = 0; //optionheader show/hide
+ public oh_close = 0; //optionheader close/open
+ public cbar_bg = 0; //Controlbar BG Show call count
+ public left_btn_visible = 0; //whether left btn is shown
+ public icon_visible = 0; //whether icon is shown
+ public right_btn_visible = 0; //whether right btn is shown
+ public more_btn_visible = 0; //whether more btn is shown
+ public large_padded_center_align = 0; //large padding based on button size for center align for 1/2 buttons.
+ public subtitle_visible = 0; //whether subtitle is shown
+ }
+ parts {
+ part { name: "base";
+ type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ visible: 0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 1.0;
+ }
+ description { state: "left" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: -1.0 0.0;
+ rel2.relative: 0.0 1.0;
+ }
+ description { state: "right" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 1.0 0.0;
+ rel2.relative: 2.0 1.0;
+ }
+ }
+
+ part { name: "elm.swallow.content";
+ type: SWALLOW;
+ scale: 1;
+ mouse_events: 1;
+ repeat_events: 0;
+ clip_to: "content_clip";
+ description { state: "default" 0.0;
+ align: 0.0 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 1.0;
+ }
+ }
+ part { name: "content_clip";
+ type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "elm.swallow.content";
+ rel2.to: "elm.swallow.content";
+ }
+ }
+
+ part { name: "elm.swallow.detail"; // Detail view.
+ type: SWALLOW;
+ scale: 1;
+ repeat_events: 0;
+ description { state: "default" 0.0;
+ color: 255 0 0 100;
+ align: 0.0 0.0;
+ rel1.relative: 0.0 1.0;
+ rel1.to_x: "base";
+ rel1.to_y: "optionheader_bg";
+ rel2.relative: 1.0 0.0;
+ rel2.to_x: "base";
+ rel2.to_y: "controlbar_bg";
+ visible: 1;
+ }
+ }
+
+ part { name: "title_bg";
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 1 NAVIFRAME_TITLE_H_INC;
+ align: 0.0 0.0;
+ fixed: 0 1;
+ rel1 { relative: 0.0 0.0; to: "base"; }
+ rel2 { relative: 1.0 0.0; to: "base"; }
+ image.normal: "00_winset_title_bg.png";
+ }
+ description { state: "hide" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ max: 0 0;
+ fixed: 1 1;
+ }
+ }
+ part { name: "title_clip";
+ type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1 { to: "title_bg"; }
+ rel2 { to: "title_bg"; }
+ }
+ }
+ part { name: "optionheader_bg";
+ type: IMAGE;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 1 0;
+ align: 0.5 0;
+ fixed: 0 1;
+ rel1.to: "title_bg";
+ rel1.relative: 0 1;
+ rel2.to: "title_bg";
+ visible: 0;
+ image { normal: "00_winset_control_top_bg.png";
+ border: NAVIFRAME_OH_BORDER_INC;
+ }
+ }
+ description { state: "show" 0.0;
+ inherit: "default" 0.0;
+ min: 1 NAVIFRAME_OH_OPENED_H_INC;
+ visible: 1;
+ }
+ description { state: "hide" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ max: 0 0;
+ fixed: 1 1;
+ }
+ }
+ part { name: "optionheader_clip";
+ type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1 { to: "optionheader_bg"; }
+ rel2 { to: "optionheader_bg"; }
+ }
+ }
+ part { name: "optionheader_top_padding";
+ type: RECT;
+ scale: 1;
+ clip_to: "optionheader_clip";
+ description { state: "default" 0.0;
+ min: 0 NAVIFRAME_OH_PADDING_INC;
+ rel1 { relative: 0.0 0.0; to: "optionheader_bg"; }
+ rel2 { relative: 1.0 0.0; to: "optionheader_bg"; }
+ fixed: 0 1;
+ align: 0.0 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "optionheader";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "optionheader_clip";
+ description { state: "default" 0.0;
+ min: 0 NAVIFRAME_OH_CONTENT_H_INC;
+ rel1 { relative: 0.0 1.0; to: "optionheader_top_padding"; }
+ rel2 { relative: 1.0 1.0; to: "optionheader_top_padding"; }
+ fixed: 1 1;
+ align: 0.0 0.0;
+ }
+ }
+ part { name: "optionheader_bottom_padding";
+ type: RECT;
+ scale: 1;
+ clip_to: "optionheader_clip";
+ description { state: "default" 0.0;
+ min: 0 NAVIFRAME_OH_PADDING_INC;
+ rel1 { relative: 0.0 1.0; to: "optionheader"; }
+ rel2 { relative: 1.0 1.0; to: "optionheader"; }
+ fixed: 0 1;
+ align: 0.0 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "optionheader_shadow";
+ type: RECT;
+ scale: 1;
+ clip_to: "optionheader_clip";
+ description { state: "default" 0.0;
+ min: 0 NAVIFRAME_OH_SHADOW_INC;
+ rel1 { relative: 0.0 1.0; to: "optionheader_bottom_padding"; }
+ rel2 { relative: 1.0 1.0; to: "optionheader_bottom_padding"; }
+ fixed: 0 1;
+ align: 0.0 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "left_btn_separator";
+ type: IMAGE;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ min: 2 48;
+ max: 2 48;
+ fixed: 1 1;
+ align: 1.0 0.5;
+ rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
+ rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
+ image.normal: "00_winset_title_line.png";
+ visible: 0;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part { name: "right_btn_separator";
+ type: IMAGE;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ min: 2 48;
+ max: 2 48;
+ fixed: 1 1;
align: 1.0 0.5;
rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+ image.normal: "00_winset_title_line.png";
visible: 0;
}
- description { state: "right_and_more_button" 0.0;
+ description { state: "visible" 0.0;
inherit: "default" 0.0;
- min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+ visible: 1;
}
}
part { name: "padding_before_text";
@@ -354,9 +1244,9 @@ collections {
mouse_events: 0;
clip_to: "title_clip";
description { state: "default" 0.0;
- align: 1.0 0.5;
- rel1 { relative: 0.0 0.0; to_x: "elm.text.title"; to_y: "title_bg"; }
- rel2 { relative: 0.0 1.0; to_x: "elm.text.title"; to_y: "title_bg"; }
+ align: 0.0 0.0;
+ rel1 { relative: 0.0 0.0; to: "title_bg"; }
+ rel2 { relative: 0.0 1.0; to: "title_bg"; }
fixed: 1 0;
min: NAVIFRAME_ICON_PADDING_INC;
visible: 0;
@@ -368,16 +1258,16 @@ collections {
mouse_events: 0;
clip_to: "title_clip";
description { state: "default" 0.0;
- min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+ min: 0 0;
fixed: 1 0;
align: 0.0 0.0;
- rel1 { relative: 0.0 0.0; to: "title_bg"; }
- rel2 { relative: 0.0 1.0; to: "title_bg"; }
+ rel1 { relative: 1.0 0.0; to: "padding_before_text"; }
+ rel2 { relative: 1.0 1.0; to: "padding_before_text"; }
visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- min: NAVIFRAME_TEXT_PADDING_INC 0;
+ min: 0 0;
}
description { state: "icon" 0.0;
inherit: "default" 0.0;
@@ -394,7 +1284,7 @@ collections {
scale: 1;
clip_to: "title_clip";
description { state: "default" 0.0;
- min: NAVIFRAME_TITLE_FUNC_BTN_PADDING_W_INC 0;
+ min: 0 0;
fixed: 1 0;
align: 1.0 0.5;
rel1 { relative: 1.0 0.0; to: "title_bg"; }
@@ -411,22 +1301,65 @@ collections {
scale: 1;
clip_to: "title_clip";
description { state: "default" 0.0;
- text { font: "HelveticaNeue:style=Medium";
+ text { font: "SLP:style=Medium";
size: NAVIFRAME_TITLE_FONT_SIZE_INC;
min: 0 0;
max: 1 0;
align: 0.5 0.5;
+ text_class: "slp_medium";
}
color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
- align: 0.5 0.5;
+ align: 0.0 0.5;
fixed: 1 0;
- rel1 { relative: 1.0 0.0; to: "padding_center_text1"; }
- rel2 { relative: 0.0 1.0; to: "padding_center_text2"; }
+ rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "title_bg"; }
+ rel2 { relative: 0.0 1.0; to_x: "padding_center_text2"; to_y: "title_bg"; }
}
description { state: "right_and_more_button" 0.0;
inherit: "default" 0.0;
- rel1 { relative: 1.0 0.0; to: "padding_after_left_btn"; }
- rel2 { relative: 0.0 1.0; to: "padding_before_more_btn"; }
+ rel2 { relative: 0.0 1.0; to_x: "title_more_btn"; to_y: "title_bg"; }
+ }
+ description { state: "subtitle_is_set" 0.0;
+ inherit: "default" 0.0;
+ rel2 { relative: 0.0 0.7; to_x: "padding_center_text2"; to_y: "title_bg"; }
+ }
+ description { state: "subtitle_right_more_button_is_set" 0.0;
+ inherit: "default" 0.0;
+ rel2 { relative: 0.0 0.7; to_x: "title_more_btn"; to_y: "title_bg"; }
+ }
+ }
+ part { name: "elm.text.subtitle";
+ type: TEXT;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ text { font: "SLP:style=Medium";
+ size: NAVIFRAME_SUBTITLE_FONT_SIZE_INC;
+ min: 0 0;
+ max: 1 0;
+ align: 0.5 0.5;
+ text_class: "slp_medium";
+ }
+ color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC;
+ align: 0.0 0.5;
+ fixed: 1 0;
+ rel1 {
+ relative: 1.0 1.0;
+ to_x: "padding_center_text1";
+ to_y: "elm.text.title";
+ }
+ rel2 {
+ relative: 0.0 1.0;
+ to_x: "padding_center_text2";
+ to_y: "elm.text.title";
+ }
+ }
+ description { state: "right_and_more_button" 0.0;
+ inherit: "default" 0.0;
+ rel2 {
+ relative: 0.0 1.0;
+ to_x: "title_more_btn";
+ to_y: "elm.text.title";
+ }
}
}
part { name: "elm.swallow.icon";
@@ -436,11 +1369,11 @@ collections {
description { state: "default" 0.0;
max: NAVIFRAME_ICON_SIZE_INC;
fixed: 1 1;
- rel1 { relative: 0.0 0.0; to: "padding_before_text"; }
- rel2 { relative: 0.0 1.0; to: "padding_before_text"; }
+ rel1 { relative: 0.0 0.0; to: "padding_center_text1"; }
+ rel2 { relative: 0.0 1.0; to: "padding_center_text1"; }
aspect: 1.0 1.0;
aspect_preference: VERTICAL;
- align: 1.0 0.5;
+ align: 0.0 0.5;
}
}
part { name: "click_event_area";
@@ -458,9 +1391,9 @@ collections {
description { state: "default" 0.0;
max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
fixed: 1 1;
- align: 0 0.5;
- rel1 { relative: 1.0 0.0; to: "padding_before_left_btn"; }
- rel2 { relative: 1.0 1.0; to: "padding_before_left_btn"; }
+ align: 1 0.5;
+ rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+ rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
}
}
part { name: "title_right_btn";
@@ -471,8 +1404,8 @@ collections {
max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
align: 1 0.5;
fixed: 1 1;
- rel1 { relative: 0.0 0.0; to: "padding_after_right_btn"; }
- rel2 { relative: 0.0 1.0; to: "padding_after_right_btn"; }
+ rel1 { relative: 1.0 0.0; to: "title_bg"; }
+ rel2 { relative: 1.0 1.0; to: "title_bg"; }
}
}
part { name: "title_more_btn";
@@ -483,8 +1416,8 @@ collections {
max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
fixed: 1 1;
align: 1 0.5;
- rel1 { relative: 0.0 0.0; to: "padding_before_right_btn"; }
- rel2 { relative: 0.0 1.0; to: "padding_before_right_btn"; }
+ rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
+ rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
}
}
part { name: "optionheader_arrow";
@@ -495,9 +1428,9 @@ collections {
max: NAVIFRAME_OH_ARROW_SIZE_INC;
fixed: 1 1;
align: 0.5 0.0;
- rel1 { relative: 0.0 1.025; to: "title_more_btn"; }
- rel2 { relative: 1.0 1.025; to: "title_more_btn"; }
- image.normal: "T01_control_top_arrow.png";
+ rel1 { relative: 0.0 1.1; to: "title_more_btn"; }
+ rel2 { relative: 1.0 1.2; to: "title_more_btn"; }
+ //image.normal: "00_winset_control_top_arrow.png";
color: 255 255 255 0;
}
description { state: "show" 0.0;
@@ -506,7 +1439,6 @@ collections {
}
}
part { name: "controlbar_bg";
- type: RECT;
scale: 1;
description { state: "default" 0.0;
min: 0 0;
@@ -516,7 +1448,7 @@ collections {
visible: 0;
rel1 { to: "base"; }
rel2 { to: "base"; }
- color: NAVIFRAME_CONTROLBAR_BG_COLOR_INC;
+ image.normal: "00_winset_control_toolbar_bg.png";
}
description { state: "show" 0.0;
inherit: "default" 0.0;
@@ -573,7 +1505,6 @@ collections {
}
}
programs {
-
program { name: "content_new_pushed";
signal: "elm,state,new,pushed,internal";
source: "";
@@ -648,7 +1579,6 @@ collections {
signal: "elm,state,title,show";
source: "elm";
script {
- set_state(PART:"indicator", "default", 0.0);
set_state(PART:"title_bg", "default", 0.0);
if (get_int(oh_show) == 1) {
if (get_int(oh_close) == 1) {
@@ -667,7 +1597,6 @@ collections {
action: STATE_SET "hide" 0.0;
target: "title_bg";
target: "optionheader_bg";
- target: "indicator";
}
program { name: "prev_btn_show";
signal: "elm,state,prev_btn,show";
@@ -685,17 +1614,44 @@ collections {
set_state(PART:"elm.prev_btn_bg", "default", 0.0);
}
}
+ program { name: "subtitle_show";
+ signal: "elm,state,subtitle,show";
+ source: "elm";
+ script {
+ set_int(subtitle_visible, 1);
+ if (get_int(large_padded_center_align) == 0)
+ set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+ else
+ set_state(PART:"elm.text.title", "subtitle_is_set", 0.0);
+ }
+ }
+ program { name: "subtitle_hide";
+ signal: "elm,state,subtitle,hide";
+ source: "elm";
+ script {
+ set_int(subtitle_visible, 0);
+ if (get_int(large_padded_center_align) == 0)
+ set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+ else
+ set_state(PART:"elm.text.title", "default", 0.0);
+ }
+ }
program { name: "left_btn_show";
signal: "elm,state,title_left_btn,show";
source: "elm";
script {
set_int(left_btn_visible, 1);
+ set_state(PART:"left_btn_separator", "visible", 0.0);
if (get_int(icon_visible) == 1)
set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
else
set_state(PART:"padding_center_text1", "visible", 0.0);
if ((get_int(more_btn_visible) == 1) && (get_int(right_btn_visible) == 1)) {
+ if (get_int(subtitle_visible) == 1)
+ set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+ else
set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+ set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
set_int(large_padded_center_align, 0);
}
else {
@@ -709,6 +1665,7 @@ collections {
source: "elm";
script {
set_int(left_btn_visible, 0);
+ set_state(PART:"left_btn_separator", "default", 0.0);
if ((get_int(more_btn_visible) == 0) && (get_int(right_btn_visible) == 0)) {
set_state(PART:"padding_center_text2", "default", 0.0);
set_int(large_padded_center_align, 0);
@@ -732,9 +1689,13 @@ collections {
source: "elm";
script {
set_int(right_btn_visible, 1);
+ set_state(PART:"right_btn_separator", "visible", 0.0);
if (get_int(more_btn_visible) == 1) {
+ if (get_int(subtitle_visible) == 1)
+ set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+ else
set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
- set_state(PART:"padding_before_right_btn", "right_and_more_button", 0.0);
+ set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
set_int(large_padded_center_align, 0);
}
else {
@@ -757,7 +1718,7 @@ collections {
source: "elm";
script {
set_int(right_btn_visible, 0);
- set_state(PART:"padding_before_right_btn", "default", 0.0);
+ set_state(PART:"right_btn_separator", "default", 0.0);
if ((get_int(more_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
set_state(PART:"padding_center_text2", "default", 0.0);
set_int(large_padded_center_align, 0);
@@ -782,8 +1743,11 @@ collections {
script {
set_int(more_btn_visible, 1);
if (get_int(right_btn_visible) == 1) {
+ if (get_int(subtitle_visible) == 1)
+ set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+ else
set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
- set_state(PART:"padding_before_right_btn", "right_and_more_button", 0.0);
+ set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
set_int(large_padded_center_align, 0);
}
else {
@@ -806,7 +1770,6 @@ collections {
source: "elm";
script {
set_int(more_btn_visible, 0);
- set_state(PART:"padding_before_right_btn", "default", 0.0);
if ((get_int(right_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
set_state(PART:"padding_center_text2", "default", 0.0);
set_int(large_padded_center_align, 0);
@@ -826,7 +1789,7 @@ collections {
}
}
program { name: "icon_show";
- signal: "elm,state,elm.swallow.icon,show";
+ signal: "elm,state,icon,show";
source: "elm";
script {
set_int(icon_visible, 1);
@@ -837,7 +1800,7 @@ collections {
}
}
program { name: "icon_hide";
- signal: "elm,state,elm.swallow.icon,hide";
+ signal: "elm,state,icon,hide";
source: "elm";
script {
set_int(icon_visible, 0);
@@ -992,5 +1955,936 @@ collections {
}
}
-}
+ group { name:"elm/naviframe/item/basic/ivug/default";
+ alias:"elm/naviframe/item/1line/ivug/default";
+ images {
+ image: "00_winset_control_top_bg.png" COMP;
+ image: "00_winset_control_top_arrow.png" COMP;
+ image: "00_winset_title_line.png" COMP;
+ image: "00_winset_control_toolbar_bg.png" COMP;
+ image: "00_winset_title_bg.png" COMP;
+ }
+ script {
+ public oh_show = 0; //optionheader show/hide
+ public oh_close = 0; //optionheader close/open
+ public cbar_bg = 0; //Controlbar BG Show call count
+ public left_btn_visible = 0; //whether left btn is shown
+ public icon_visible = 0; //whether icon is shown
+ public right_btn_visible = 0; //whether right btn is shown
+ public more_btn_visible = 0; //whether more btn is shown
+ public large_padded_center_align = 0; //large padding based on button size for center align for 1/2 buttons.
+ public subtitle_visible = 0; //whether subtitle is shown
+ }
+ parts {
+ part { name: "base";
+ type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ visible: 0;
+ }
+ description { state: "left" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: -1.0 0.0;
+ rel2.relative: 0.0 1.0;
+ }
+ description { state: "right" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 1.0 0.0;
+ rel2.relative: 2.0 1.0;
+ }
+ }
+ part { name: "title_bg";
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 1 NAVIFRAME_TITLE_H_INC;
+ align: 0.0 0.0;
+ fixed: 0 1;
+ rel1 { relative: 0.0 0.0; to: "base"; }
+ rel2 { relative: 1.0 0.0; to: "base"; }
+ image.normal: "00_winset_title_bg.png";
+ }
+ description { state: "hide" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ max: 0 0;
+ fixed: 1 1;
+ }
+ }
+ part { name: "title_clip";
+ type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1 { to: "title_bg"; }
+ rel2 { to: "title_bg"; }
+ }
+ }
+ part { name: "optionheader_bg";
+ type: IMAGE;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 1 0;
+ align: 0.5 0;
+ fixed: 0 1;
+ rel1.to: "title_bg";
+ rel1.relative: 0 1;
+ rel2.to: "title_bg";
+ visible: 0;
+ image { normal: "00_winset_control_top_bg.png";
+ border: NAVIFRAME_OH_BORDER_INC;
+ }
+ }
+ description { state: "show" 0.0;
+ inherit: "default" 0.0;
+ min: 1 NAVIFRAME_OH_OPENED_H_INC;
+ visible: 1;
+ }
+ description { state: "hide" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ max: 0 0;
+ fixed: 1 1;
+ }
+ }
+ part { name: "optionheader_clip";
+ type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1 { to: "optionheader_bg"; }
+ rel2 { to: "optionheader_bg"; }
+ }
+ }
+ part { name: "optionheader_top_padding";
+ type: RECT;
+ scale: 1;
+ clip_to: "optionheader_clip";
+ description { state: "default" 0.0;
+ min: 0 NAVIFRAME_OH_PADDING_INC;
+ rel1 { relative: 0.0 0.0; to: "optionheader_bg"; }
+ rel2 { relative: 1.0 0.0; to: "optionheader_bg"; }
+ fixed: 0 1;
+ align: 0.0 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "optionheader";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "optionheader_clip";
+ description { state: "default" 0.0;
+ min: 0 NAVIFRAME_OH_CONTENT_H_INC;
+ rel1 { relative: 0.0 1.0; to: "optionheader_top_padding"; }
+ rel2 { relative: 1.0 1.0; to: "optionheader_top_padding"; }
+ fixed: 1 1;
+ align: 0.0 0.0;
+ }
+ }
+ part { name: "optionheader_bottom_padding";
+ type: RECT;
+ scale: 1;
+ clip_to: "optionheader_clip";
+ description { state: "default" 0.0;
+ min: 0 NAVIFRAME_OH_PADDING_INC;
+ rel1 { relative: 0.0 1.0; to: "optionheader"; }
+ rel2 { relative: 1.0 1.0; to: "optionheader"; }
+ fixed: 0 1;
+ align: 0.0 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "optionheader_shadow";
+ type: RECT;
+ scale: 1;
+ clip_to: "optionheader_clip";
+ description { state: "default" 0.0;
+ min: 0 NAVIFRAME_OH_SHADOW_INC;
+ rel1 { relative: 0.0 1.0; to: "optionheader_bottom_padding"; }
+ rel2 { relative: 1.0 1.0; to: "optionheader_bottom_padding"; }
+ fixed: 0 1;
+ align: 0.0 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "elm.swallow.content";
+ type: SWALLOW;
+ scale: 1;
+ repeat_events: 0;
+ clip_to: "content_clip";
+ description { state: "default" 0.0;
+ align: 0.0 0.0;
+ rel1.relative: 0.0 1.0;
+ rel1.to_x: "base";
+ rel1.to_y: "optionheader_bg";
+ rel2.relative: 1.0 0.0;
+ rel2.to_x: "base";
+ rel2.to_y: "controlbar_bg";
+ }
+ }
+ part { name: "content_clip";
+ type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "elm.swallow.content";
+ rel2.to: "elm.swallow.content";
+ }
+ }
+
+
+
+
+
+ part { name: "left_btn_separator";
+ type: IMAGE;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ min: 2 48;
+ max: 2 48;
+ fixed: 1 1;
+ align: 1.0 0.5;
+ rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
+ rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
+ image.normal: "00_winset_title_line.png";
+ visible: 0;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part { name: "right_btn_separator";
+ type: IMAGE;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ min: 2 48;
+ max: 2 48;
+ fixed: 1 1;
+ align: 1.0 0.5;
+ rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+ rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+ image.normal: "00_winset_title_line.png";
+ visible: 0;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part { name: "padding_before_text";
+ type: RECT;
+ scale: 1;
+ mouse_events: 0;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ align: 0.0 0.0;
+ rel1 { relative: 0.0 0.0; to: "title_bg"; }
+ rel2 { relative: 0.0 1.0; to: "title_bg"; }
+ fixed: 1 0;
+ min: NAVIFRAME_ICON_PADDING_INC;
+ visible: 0;
+ }
+ }
+ part { name: "padding_center_text1";
+ type: RECT;
+ scale: 1;
+ mouse_events: 0;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ min: 0 0;
+ fixed: 1 0;
+ align: 0.0 0.0;
+ rel1 { relative: 1.0 0.0; to: "padding_before_text"; }
+ rel2 { relative: 1.0 1.0; to: "padding_before_text"; }
+ visible: 0;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ }
+ description { state: "icon" 0.0;
+ inherit: "default" 0.0;
+ min: NAVIFRAME_NO_BUTTON_ICON_PADDING_INC 0;
+ }
+ description { state: "icon_left_button" 0.0;
+ inherit: "default" 0.0;
+ min: NAVIFRAME_TEXT_PADDING_ICON_VISIBLE_INC 0;
+ }
+ }
+ part { name: "padding_center_text2";
+ type: RECT;
+ mouse_events: 0;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ min: 0 0;
+ fixed: 1 0;
+ align: 1.0 0.5;
+ rel1 { relative: 1.0 0.0; to: "title_bg"; }
+ rel2 { relative: 1.0 1.0; to: "title_bg"; }
+ visible: 0;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ min: NAVIFRAME_TEXT_PADDING_INC 0;
+ }
+ }
+ part { name: "elm.text.title";
+ type: TEXT;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ text { font: "SLP:style=Medium";
+ size: NAVIFRAME_TITLE_FONT_SIZE_INC;
+ min: 0 0;
+ max: 1 0;
+ align: 0.5 0.5;
+ text_class: "slp_medium";
+ }
+ color: NAVIFRAME_TITLE_TEXT_COLOR_INC;
+ align: 0.0 0.5;
+ fixed: 1 0;
+ rel1 { relative: 1.0 0.0; to_x: "padding_center_text1"; to_y: "title_bg"; }
+ rel2 { relative: 0.0 1.0; to_x: "padding_center_text2"; to_y: "title_bg"; }
+ }
+ description { state: "right_and_more_button" 0.0;
+ inherit: "default" 0.0;
+ rel2 { relative: 0.0 1.0; to_x: "title_more_btn"; to_y: "title_bg"; }
+ }
+ description { state: "subtitle_is_set" 0.0;
+ inherit: "default" 0.0;
+ rel2 { relative: 0.0 0.7; to_x: "padding_center_text2"; to_y: "title_bg"; }
+ }
+ description { state: "subtitle_right_more_button_is_set" 0.0;
+ inherit: "default" 0.0;
+ rel2 { relative: 0.0 0.7; to_x: "title_more_btn"; to_y: "title_bg"; }
+ }
+ }
+ part { name: "elm.text.subtitle";
+ type: TEXT;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ text { font: "SLP:style=Medium";
+ size: NAVIFRAME_SUBTITLE_FONT_SIZE_INC;
+ min: 0 0;
+ max: 1 0;
+ align: 0.5 0.5;
+ text_class: "slp_medium";
+ }
+ color: NAVIFRAME_SUBTITLE_TEXT_COLOR_INC;
+ align: 0.0 0.5;
+ fixed: 1 0;
+ rel1 {
+ relative: 1.0 1.0;
+ to_x: "padding_center_text1";
+ to_y: "elm.text.title";
+ }
+ rel2 {
+ relative: 0.0 1.0;
+ to_x: "padding_center_text2";
+ to_y: "elm.text.title";
+ }
+ }
+ description { state: "right_and_more_button" 0.0;
+ inherit: "default" 0.0;
+ rel2 {
+ relative: 0.0 1.0;
+ to_x: "title_more_btn";
+ to_y: "elm.text.title";
+ }
+ }
+ }
+ part { name: "elm.swallow.icon";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ max: NAVIFRAME_ICON_SIZE_INC;
+ fixed: 1 1;
+ rel1 { relative: 0.0 0.0; to: "padding_center_text1"; }
+ rel2 { relative: 0.0 1.0; to: "padding_center_text1"; }
+ aspect: 1.0 1.0;
+ aspect_preference: VERTICAL;
+ align: 0.0 0.5;
+ }
+ }
+ part { name: "click_event_area";
+ ignore_flags: ON_HOLD;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ rel1 { to: "title_bg"; }
+ rel2 { to: "title_bg"; }
+ }
+ }
+ part { name: "title_left_btn";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+ fixed: 1 1;
+ align: 1 0.5;
+ rel1 { relative: 0.0 0.0; to: "title_right_btn"; }
+ rel2 { relative: 0.0 1.0; to: "title_right_btn"; }
+ }
+ }
+ part { name: "title_right_btn";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+ align: 1 0.5;
+ fixed: 1 1;
+ rel1 { relative: 1.0 0.0; to: "title_bg"; }
+ rel2 { relative: 1.0 1.0; to: "title_bg"; }
+ }
+ }
+ part { name: "title_more_btn";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "title_clip";
+ description { state: "default" 0.0;
+ max: NAVIFRAME_TITLE_FUNC_BTN_SIZE_INC;
+ fixed: 1 1;
+ align: 1 0.5;
+ rel1 { relative: 0.0 0.0; to: "title_left_btn"; }
+ rel2 { relative: 0.0 1.0; to: "title_left_btn"; }
+ }
+ }
+ part { name: "optionheader_arrow";
+ type: IMAGE;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: NAVIFRAME_OH_ARROW_SIZE_INC;
+ max: NAVIFRAME_OH_ARROW_SIZE_INC;
+ fixed: 1 1;
+ align: 0.5 0.0;
+ rel1 { relative: 0.0 1.1; to: "title_more_btn"; }
+ rel2 { relative: 1.0 1.2; to: "title_more_btn"; }
+ //image.normal: "00_winset_control_top_arrow.png";
+ color: 255 255 255 0;
+ }
+ description { state: "show" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "controlbar_bg";
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 0 0;
+ max: 999999 0;
+ fixed: 0 1;
+ align: 0.0 1.0;
+ visible: 0;
+ rel1 { to: "base"; }
+ rel2 { to: "base"; }
+ image.normal: "00_winset_control_toolbar_bg.png";
+ }
+ description { state: "show" 0.0;
+ inherit: "default" 0.0;
+ min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+ max: 999999 CONTROLBAR_SMALL_HEIGHT_INC;
+ visible: 1;
+ }
+ }
+ part { name: "controlbar_clip";
+ type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "controlbar_bg";
+ rel2.to: "controlbar_bg";
+ }
+ }
+ part { name: "elm.prev_btn_bg";
+ type: RECT;
+ scale: 1;
+ clip_to: "controlbar_clip";
+ description { state: "default" 0.0;
+ min: 0 0;
+ fixed: 1 0;
+ align: 1.0 0.0;
+ rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+ rel2.to: "controlbar_bg";
+ visible: 0;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
+ }
+ }
+ part { name: "elm.swallow.prev_btn";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "controlbar_clip";
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ align: 0.5 0.5;
+ rel1.to: "elm.prev_btn_bg";
+ rel2.to: "elm.prev_btn_bg";
+ }
+ }
+ part { name: "controlbar";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "controlbar_clip";
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "controlbar_bg";
+ rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+ }
+ }
+ }
+ programs {
+ program { name: "content_new_pushed";
+ signal: "elm,state,new,pushed,internal";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+ transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
+ after: "show_finished";
+ }
+ program { name: "content_cur_pushed";
+ signal: "elm,state,cur,pushed,internal";
+ source: "";
+ action: STATE_SET "left" 0.0;
+ target: "base";
+ transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
+ after: "pushed_finished";
+ }
+ program { name: "content_prev_popped";
+ signal: "elm,state,prev,popped,internal";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+ transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
+ after: "show_finished";
+ }
+ program { name: "content_cur_popped";
+ signal: "elm,state,cur,popped,internal";
+ source: "";
+ action: STATE_SET "right" 0.0;
+ target: "base";
+ transition: DECELERATE NAVIFRAME_VIEW_TRANS_TIME;
+ after: "popped_finished";
+ }
+ program { name: "cur_pushed";
+ signal: "elm,state,cur,pushed";
+ source: "elm";
+ script {
+ set_state(PART:"base", "default", 0.0);
+ emit("elm,state,cur,pushed,internal", "");
+ }
+ }
+ program { name: "new_pushed";
+ signal: "elm,state,new,pushed";
+ source: "elm";
+ script {
+ set_state(PART:"base", "right", 0.0);
+ emit("elm,state,new,pushed,internal", "");
+ }
+ }
+ program { name: "prev_popped";
+ signal: "elm,state,prev,popped";
+ source: "elm";
+ script {
+ set_state(PART:"base", "left", 0.0);
+ emit("elm,state,prev,popped,internal", "");
+ }
+ }
+ program { name: "cur_popped";
+ signal: "elm,state,cur,popped";
+ source: "elm";
+ script {
+ set_state(PART:"base", "default", 0.0);
+ emit("elm,state,cur,popped,internal", "");
+ }
+ }
+ program { name: "visible";
+ signal: "elm,state,visible";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+ }
+ program { name: "title_show";
+ signal: "elm,state,title,show";
+ source: "elm";
+ script {
+ set_state(PART:"title_bg", "default", 0.0);
+ if (get_int(oh_show) == 1) {
+ if (get_int(oh_close) == 1) {
+ emit("elm,state,optionheader,instant_close", "");
+ }else {
+ emit("elm,state,optionheader,instant_open", "");
+ }
+ }
+ else
+ set_state(PART:"optionheader_bg", "default", 0.0);
+ }
+ }
+ program { name: "title_hide";
+ signal: "elm,state,title,hide";
+ source: "elm";
+ action: STATE_SET "hide" 0.0;
+ target: "title_bg";
+ target: "optionheader_bg";
+ }
+ program { name: "prev_btn_show";
+ signal: "elm,state,prev_btn,show";
+ source: "elm";
+ script {
+ emit("elm,state,controlbar_bg,show", "elm");
+ set_state(PART:"elm.prev_btn_bg", "visible", 0.0);
+ }
+ }
+ program { name: "prev_btn_hide";
+ signal: "elm,state,prev_btn,hide";
+ source: "elm";
+ script {
+ emit("elm,state,controlbar_bg,hide", "elm");
+ set_state(PART:"elm.prev_btn_bg", "default", 0.0);
+ }
+ }
+ program { name: "subtitle_show";
+ signal: "elm,state,subtitle,show";
+ source: "elm";
+ script {
+ set_int(subtitle_visible, 1);
+ if (get_int(large_padded_center_align) == 0)
+ set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+ else
+ set_state(PART:"elm.text.title", "subtitle_is_set", 0.0);
+ }
+ }
+ program { name: "subtitle_hide";
+ signal: "elm,state,subtitle,hide";
+ source: "elm";
+ script {
+ set_int(subtitle_visible, 0);
+ if (get_int(large_padded_center_align) == 0)
+ set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+ else
+ set_state(PART:"elm.text.title", "default", 0.0);
+ }
+ }
+ program { name: "left_btn_show";
+ signal: "elm,state,title_left_btn,show";
+ source: "elm";
+ script {
+ set_int(left_btn_visible, 1);
+ set_state(PART:"left_btn_separator", "visible", 0.0);
+ if (get_int(icon_visible) == 1)
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ if ((get_int(more_btn_visible) == 1) && (get_int(right_btn_visible) == 1)) {
+ if (get_int(subtitle_visible) == 1)
+ set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+ else
+ set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+ set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
+ set_int(large_padded_center_align, 0);
+ }
+ else {
+ set_state(PART:"padding_center_text2", "visible", 0.0);
+ set_int(large_padded_center_align, 1);
+ }
+ }
+ }
+ program { name: "left_btn_hide";
+ signal: "elm,state,title_left_btn,hide";
+ source: "elm";
+ script {
+ set_int(left_btn_visible, 0);
+ set_state(PART:"left_btn_separator", "default", 0.0);
+ if ((get_int(more_btn_visible) == 0) && (get_int(right_btn_visible) == 0)) {
+ set_state(PART:"padding_center_text2", "default", 0.0);
+ set_int(large_padded_center_align, 0);
+ }
+ else {
+ set_state(PART:"padding_center_text2", "visible", 0.0);
+ set_int(large_padded_center_align, 1);
+ }
+ if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else if (get_int(large_padded_center_align) == 1)
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ else if (get_int(icon_visible) == 1)
+ set_state(PART:"padding_center_text1", "icon", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "default", 0.0);
+ }
+ }
+ program { name: "right_btn_show";
+ signal: "elm,state,title_right_btn,show";
+ source: "elm";
+ script {
+ set_int(right_btn_visible, 1);
+ set_state(PART:"right_btn_separator", "visible", 0.0);
+ if (get_int(more_btn_visible) == 1) {
+ if (get_int(subtitle_visible) == 1)
+ set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+ else
+ set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+ set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
+ set_int(large_padded_center_align, 0);
+ }
+ else {
+ set_state(PART:"padding_center_text2", "visible", 0.0);
+ set_int(large_padded_center_align, 1);
+ }
+ if ((get_int(icon_visible) == 1) && ((get_int(left_btn_visible) == 1) ||
+ (get_int(large_padded_center_align) == 1)))
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else if ((get_int(left_btn_visible) == 1) || (get_int(large_padded_center_align) == 1))
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ else if (get_int(icon_visible) == 1)
+ set_state(PART:"padding_center_text1", "icon", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "default", 0.0);
+ }
+ }
+ program { name: "right_btn_hide";
+ signal: "elm,state,title_right_btn,hide";
+ source: "elm";
+ script {
+ set_int(right_btn_visible, 0);
+ set_state(PART:"right_btn_separator", "default", 0.0);
+ if ((get_int(more_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
+ set_state(PART:"padding_center_text2", "default", 0.0);
+ set_int(large_padded_center_align, 0);
+ }
+ else {
+ set_state(PART:"padding_center_text2", "visible", 0.0);
+ set_int(large_padded_center_align, 1);
+ }
+ if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else if (get_int(large_padded_center_align) == 1)
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ else if (get_int(icon_visible) == 1)
+ set_state(PART:"padding_center_text1", "icon", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "default", 0.0);
+ }
+ }
+ program { name: "more_btn_show";
+ signal: "elm,state,title_more_btn,show";
+ source: "elm";
+ script {
+ set_int(more_btn_visible, 1);
+ if (get_int(right_btn_visible) == 1) {
+ if (get_int(subtitle_visible) == 1)
+ set_state(PART:"elm.text.title", "subtitle_right_more_button_is_set", 0.0);
+ else
+ set_state(PART:"elm.text.title", "right_and_more_button", 0.0);
+ set_state(PART:"elm.text.subtitle", "right_and_more_button", 0.0);
+ set_int(large_padded_center_align, 0);
+ }
+ else {
+ set_state(PART:"padding_center_text2", "visible", 0.0);
+ set_int(large_padded_center_align, 1);
+ }
+ if ((get_int(icon_visible) == 1) && ((get_int(left_btn_visible) == 1) ||
+ (get_int(large_padded_center_align) == 1)))
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else if ((get_int(left_btn_visible) == 1) || (get_int(large_padded_center_align) == 1))
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ else if (get_int(icon_visible) == 1)
+ set_state(PART:"padding_center_text1", "icon", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "default", 0.0);
+ }
+ }
+ program { name: "more_btn_hide";
+ signal: "elm,state,title_more_btn,hide";
+ source: "elm";
+ script {
+ set_int(more_btn_visible, 0);
+ if ((get_int(right_btn_visible) == 0) && (get_int(left_btn_visible) == 0)) {
+ set_state(PART:"padding_center_text2", "default", 0.0);
+ set_int(large_padded_center_align, 0);
+ }
+ else {
+ set_state(PART:"padding_center_text2", "visible", 0.0);
+ set_int(large_padded_center_align, 1);
+ }
+ if ((get_int(large_padded_center_align) == 1) && (get_int(icon_visible) == 1))
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else if (get_int(large_padded_center_align) == 1)
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ else if (get_int(icon_visible) == 1)
+ set_state(PART:"padding_center_text1", "icon", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "default", 0.0);
+ }
+ }
+ program { name: "icon_show";
+ signal: "elm,state,icon,show";
+ source: "elm";
+ script {
+ set_int(icon_visible, 1);
+ if ((get_int(large_padded_center_align) == 1) || (get_int(left_btn_visible) == 1))
+ set_state(PART:"padding_center_text1", "icon_left_button", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "icon", 0.0);
+ }
+ }
+ program { name: "icon_hide";
+ signal: "elm,state,icon,hide";
+ source: "elm";
+ script {
+ set_int(icon_visible, 0);
+ if ((get_int(large_padded_center_align) == 1) || (get_int(left_btn_visible) == 1))
+ set_state(PART:"padding_center_text1", "visible", 0.0);
+ else
+ set_state(PART:"padding_center_text1", "default", 0.0);
+ }
+ }
+ program { name: "controlbar_show";
+ signal: "elm,state,controlbar,show";
+ source: "elm";
+ script {
+ emit("elm,state,controlbar_bg,show", "elm");
+ }
+ }
+ program { name: "controlbar_hide";
+ signal: "elm,state,controlbar,hide";
+ source: "elm";
+ script {
+ emit("elm,state,controlbar_bg,hide", "elm");
+ }
+ }
+ program { name: "controlbar_bg_show";
+ signal: "elm,state,controlbar_bg,show";
+ source: "elm";
+ script {
+ set_state(PART:"controlbar_bg", "show", 0.0);
+ set_int(cbar_bg, get_int(cbar_bg) + 1);
+ }
+ }
+ program { name: "controlbar_bg_hide";
+ signal: "elm,state,controlbar_bg,hide";
+ source: "elm";
+ script {
+ set_int(cbar_bg, get_int(cbar_bg) - 1);
+ if (get_int(cbar_bg) <= 0)
+ set_state(PART:"controlbar_bg", "default", 0.0);
+ }
+ }
+ program { name: "optionheader_show";
+ signal: "elm,state,optionheader,show";
+ source: "elm";
+ script {
+ set_state(PART:"optionheader_bg", "show", 0.0);
+ set_state(PART:"optionheader_arrow", "show", 0.0);
+ set_int(oh_show, 1);
+ }
+ }
+ program { name: "optionheader_hide";
+ signal: "elm,state,optionheader,hide";
+ source: "elm";
+ script {
+ set_state(PART:"optionheader_bg", "default", 0.0);
+ set_state(PART:"optionheader_arrow", "default", 0.0);
+ set_int(oh_show, 0);
+ }
+ }
+ program { name: "optionheader_open";
+ signal: "elm,state,optionheader,open";
+ source: "";
+ action: STATE_SET "show" 0.0;
+ target: "optionheader_bg";
+ target: "optionheader_arrow";
+ transition: LINEAR 0.2;
+ after: "optionheader_open_set";
+ }
+ program { name: "optionheader_close";
+ signal: "elm,state,optionheader,close";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "optionheader_bg";
+ target: "optionheader_arrow";
+ transition: LINEAR 0.2;
+ after: "optionheader_close_set";
+ }
+ program { name: "optionheader_instant_open";
+ signal: "elm,state,optionheader,instant_open";
+ source: "";
+ action: STATE_SET "show" 0.0;
+ target: "optionheader_bg";
+ target: "optionheader_arrow";
+ after: "optionheader_open_set";
+ }
+ program { name: "optionheader_instant_close";
+ signal: "elm,state,optionheader,instant_close";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "optionheader_bg";
+ target: "optionheader_arrow";
+ after: "optionheader_close_set";
+ }
+ program { name: "optionheader_close_set";
+ signal: "elm,state,optionheader,close_set";
+ source: "";
+ script {
+ set_int(oh_close, 1);
+ }
+ }
+ program { name: "optionheader_open_set";
+ signal: "elm,state,optionheader,open_set";
+ source: "";
+ script {
+ set_int(oh_close, 0);
+ }
+ }
+ program { name: "controlbar_open";
+ signal: "elm,state,controlbar,open";
+ source: "";
+ action: STATE_SET "show" 0.0;
+ target: "controlbar_bg";
+ transition: LINEAR 0.2;
+ }
+ program { name: "controlbar_close";
+ signal: "elm,state,controlbar,close";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ target: "controlbar_bg";
+ transition: LINEAR 0.2;
+ }
+ program { name: "controlbar_instant_open";
+ signal: "elm,state,controlbar,instant_open";
+ source: "";
+ script {
+ emit("elm,state,prev_btn,show", "elm");
+ emit("elm,state,controlbar,show", "elm");
+ }
+ }
+ program { name: "controlbar_instant_close";
+ signal: "elm,state,controlbar,instant_close";
+ source: "";
+ script {
+ emit("elm,state,prev_btn,hide", "elm");
+ emit("elm,state,controlbar,hide", "elm");
+ }
+ }
+ program { name: "show_finished";
+ action: SIGNAL_EMIT "elm,action,show,finished" "";
+ }
+ program { name: "pushed_finished";
+ action: SIGNAL_EMIT "elm,action,pushed,finished" "";
+ }
+ program { name: "popped_finished";
+ action: SIGNAL_EMIT "elm,action,popped,finished" "";
+ }
+ program {
+ name: "title_clicked";
+ signal: "mouse,clicked,1";
+ source: "click_event_area";
+ action: SIGNAL_EMIT "elm,action,title,clicked" "";
+ }
+ }
+ }
+}
diff --git a/main/layout/ivug-selectioninfo.edc b/main/layout/ivug-selectioninfo.edc
index 00a1340..bf704fd 100755
--- a/main/layout/ivug-selectioninfo.edc
+++ b/main/layout/ivug-selectioninfo.edc
@@ -1,34 +1,33 @@
-/*
- * 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.
- */
-
+/*
+ * 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.
+ */
/*
* Refer to themes\groups\selectioninfo.edc
*/
-#define SELECTION_INFO_BACKGROUND_COLOR_INC 91 91 91 255
-#define SELECTION_INFO_TEXT_COLOR_INC 255 255 255 255
+#define SELECTION_INFO_BACKGROUND_COLOR_INC 42 54 74 255
+#define SELECTION_INFO_TEXT_COLOR_INC 249 249 249 255
#define SELECTION_INFO_MIN_VER_W_INC 720
#define SELECTION_INFO_MIN_HORZ_W_INC 1280
#define SELECTION_INFO_VER_PADDING_INC 48
#define SELECTION_INFO_LEFT_PADDING_INC 16
#define SELECTION_INFO_TEXT_FONT_SIZE_INC 32
-#define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC 143//=95+48 150
-#define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC 143//=95+48 186
+#define SELECTION_INFO_MIN_VER_BOTTOM_64_H_INC 160//=95+48 150
+#define SELECTION_INFO_MIN_VER_BOTTOM_86_H_INC 160//=95+48 186
collections {
@@ -36,8 +35,6 @@ collections {
parts {
part { name: "bg";
type: RECT;
- mouse_events: 1;
- repeat_events: 1;
scale : 1;
description {
state: "default" 0.0;
@@ -61,9 +58,10 @@ collections {
rel2 { to: "bg"; }
color: SELECTION_INFO_TEXT_COLOR_INC;
text {
- font: "HelveticaNeue";
+ font: "SLP";
size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
text: "";
+ text_class: "slp";
}
}
}
@@ -121,9 +119,10 @@ collections {
rel2 { to: "base"; }
color: SELECTION_INFO_TEXT_COLOR_INC;
text {
- font: "HelveticaNeue";
+ font: "SLP";
size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
text: "";
+ text_class: "slp";
}
}
}
@@ -183,9 +182,10 @@ collections {
rel2 { to: "base"; }
color: SELECTION_INFO_TEXT_COLOR_INC;
text {
- font: "HelveticaNeue";
+ font: "SLP";
size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
text: "";
+ text_class: "slp";
}
}
}
@@ -229,9 +229,10 @@ collections {
rel2 { to: "bg"; }
color: SELECTION_INFO_TEXT_COLOR_INC;
text {
- font: "HelveticaNeue";
+ font: "SLP";
size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
text: "";
+ text_class: "slp";
}
}
}
@@ -289,9 +290,10 @@ collections {
rel2 { to: "base"; }
color: SELECTION_INFO_TEXT_COLOR_INC;
text {
- font: "HelveticaNeue";
- size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
+ font: "SLP";
+ size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
text: "";
+ text_class: "slp";
}
}
}
@@ -351,9 +353,10 @@ collections {
rel2 { to: "base"; }
color: SELECTION_INFO_TEXT_COLOR_INC;
text {
- font: "HelveticaNeue";
- size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
+ font: "SLP";
+ size: SELECTION_INFO_TEXT_FONT_SIZE_INC;
text: "";
+ text_class: "slp";
}
}
}
@@ -369,3 +372,4 @@ collections {
}
}
+
diff --git a/main/layout/ivug-setas.edc b/main/layout/ivug-setas.edc
index 7ec8ab1..8646f0b 100755
--- a/main/layout/ivug-setas.edc
+++ b/main/layout/ivug-setas.edc
@@ -1,57 +1,35 @@
-/*
- * 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.
- */
+/*
+ * 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 "ivug-theme.edc"
+
+#define PADDING_VISIBILITY 0
+collections {
-#define BTN_CANCEL_WIDTH 86
-#define BTN_CANCEL_HEIGHT 86
-
-#define BTN_OK_WIDTH 86
-#define BTN_OK_HEIGHT 86
-
-#define BTN_CANCEL "T01_btn_cancel.png"
-#define BTN_CANCEL_PRESS "T01_btn_cancel_press.png"
-
-#define BTN_OK "T01_btn_ok.png"
-#define BTN_OK_PRESS "T01_btn_ok_press.png"
-#define BTN_OK_DIM "T01_btn_ok_dim.png"
-
-#define _STATE_ENABLED 1
-#define _STATE_DISABLED 0
+#define PROGRESSBAR_WIDTH 100
+#define PROGRESSBAR_HEIGHT 100
-collections {
group {
name: "setas_view";
- images {
- image: BTN_CANCEL COMP;
- image: BTN_CANCEL_PRESS COMP;
-
- image: BTN_OK COMP;
- image: BTN_OK_PRESS COMP;
- image: BTN_OK_DIM COMP;
- }
- script {
- public ok_state = _STATE_ENABLED;
- }
parts{
part {
name: "bg";
type: RECT;
- mouse_events: 1;
- repeat_events: 0;
scale:1;
description {
state: "default" 0.0;
@@ -70,18 +48,50 @@ collections {
description {
state: "default" 0.0;
+ visible: 1;
rel1 { relative: 0 0; to:bg; }
rel2 { relative: 1 1; to:bg; }
}
}
+ part{
+ name: "setasview.thumbnail";
+ type: SWALLOW;
+ mouse_events: 1;
+ repeat_events: 0;
+ scale: 1; //allow scaling
+ description {
+ state: "default" 0.0;
+ align: 0.5 0.5;
+ visible: 1;
+ rel1 { relative: 0 0; to:bg; }
+ rel2 { relative: 1 1; to:bg; }
+ }
+ }
+
+ part{
+ name: "setasview.progressbar";
+ type: SWALLOW;
+ scale: 1; //allow scaling
+
+ description {
+ state: "default" 0.0;
+ min: PROGRESSBAR_WIDTH PROGRESSBAR_WIDTH;
+ max: PROGRESSBAR_WIDTH PROGRESSBAR_WIDTH;
+ fixed: 1 1;
+ visible: 1;
+ align: 0.5 0.5;
+ rel1 { relative: 0 0; to:"setasview.photocam"; }
+ rel2 { relative: 1 1; to:"setasview.photocam"; }
+ }
+ }
+
part {
name: "event";
type: RECT;
repeat_events: 1;
mouse_events: 1;
scale:1;
-
description {
state: "default" 0.0;
color: 0 0 0 0;
@@ -91,188 +101,152 @@ collections {
}
}
- part { name: "setasview.btn_cancel";
- type: IMAGE;
- scale: 1;
+ part{
+ name: "setasview.scissorbox";
+ type: SWALLOW;
mouse_events: 1;
+ repeat_events: 1;
+ scale: 1;
description {
- visible: 0;
- min: BTN_CANCEL_WIDTH BTN_CANCEL_HEIGHT;
- max: BTN_CANCEL_WIDTH BTN_CANCEL_HEIGHT;
- fixed: 1 1;
state: "default" 0.0;
- align: 1.0 1.0;
- rel1 { relative: 0.0 0.0;}
- rel2 { relative: 0.944 0.975;}
- }
-
- description {
- state: "show" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- image.normal: BTN_CANCEL;
+ visible: 0;
+ rel1 { relative: 0 0; to:bg; }
+ rel2 { relative: 1 1; to:bg; }
}
+ }
- description {
- state: "pressed" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- image.normal: BTN_CANCEL_PRESS;
- }
- description {
- state: "hide" 0.0;
- visible: 0;
- }
+ }
+ programs {
+ program {
+ name: "bg_clicked";
+ signal: "mouse,clicked,1";
+ source: "event";
+ action: SIGNAL_EMIT "setasview,bg,clicked" "edc";
}
+ }
- part { name: "setasview.btn_ok";
- type: IMAGE;
- scale: 1;
- mouse_events: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- min: BTN_OK_WIDTH BTN_OK_HEIGHT;
- max: BTN_OK_WIDTH BTN_OK_HEIGHT;
- fixed: 1 1;
- align: 0.0 1.0;
- image.normal: BTN_OK;
- rel1 { relative: 0.056 0.0;}
- rel2 { relative: 1.0 0.975;}
- }
+ }
+}
- description {
- state: "pressed" 0.0;
- inherit: "default" 0.0;
- image.normal: BTN_OK_PRESS;
- }
- description {
- state: "dim" 0.0;
- inherit: "default" 0.0;
- image.normal: BTN_OK_DIM;
- }
+collections {
+#define BTN_SET_CALLER_IMAGE_WIDTH 86
+#define BTN_SET_CALLER_IMAGE_HEIGHT 86
+#if 1
+ group {
+ name: "setas_view_btn";
+
+ images {
+ image: "00_winset_control_toolbar_bg.png" COMP;
+ }
+
+ parts{
+ part {
+ name: "base";
+ type: RECT;
+ scale:1;
+ mouse_events: 1;
+ repeat_events: 1;
description {
- state: "hide" 0.0;
- visible: 0;
+ state: "default" 0.0;
+ color: 0 0 0 0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 1.0;
}
}
+ part { name: "controlbar_bg";
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
+ max: 999999 CONTROLBAR_SMALL_HEIGHT_INC;
+ fixed: 0 1;
+ align: 0.0 1.0;
+ visible: 1;
+ rel1 { to: "base"; }
+ rel2 { to: "base"; }
+ //image.normal: "00_winset_control_toolbar_bg.png";
+ }
+ description { state: "hide" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "controlbar_clip";
+ type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "controlbar_bg";
+ rel2.to: "controlbar_bg";
+ visible: 1;
+ }
+ description { state: "hide" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "elm.prev_btn_bg";
+ type: RECT;
+ scale: 1;
+ clip_to: "controlbar_clip";
+ description { state: "default" 0.0;
+ min: 0 0;
+ fixed: 1 0;
+ align: 1.0 0.0;
+ rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
+ rel2.to: "controlbar_bg";
+ visible: 0;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
+ }
+ }
+ part { name: "elm.swallow.prev_btn";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "controlbar_clip";
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ align: 0.5 0.5;
+ rel1.to: "elm.prev_btn_bg";
+ rel2.to: "elm.prev_btn_bg";
+ }
+ }
+ part { name: "controlbar";
+ type: SWALLOW;
+ scale: 1;
+ clip_to: "controlbar_clip";
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "controlbar_bg";
+ rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
+ visible: 1;
+ }
+ }
}
programs {
-/* For button cancel */
- program {
- name: "hide_btn_cancel";
- signal: "setasview,hide,btn_cancel";
- source: "elm";
- action: STATE_SET "hide" 0.0;
- target: "setasview.btn_cancel";
- }
-
- program {
- name: "show_btn_cancel";
- signal: "setasview,show,btn_cancel";
- source: "elm";
- action: STATE_SET "show" 0.0;
- target: "setasview.btn_cancel";
- }
-
- program {
- name: "btn_cancel_mouse_down";
- signal: "mouse,down,1";
- source: "setasview.btn_cancel";
- action: STATE_SET "pressed" 0.0;
- target: "setasview.btn_cancel";
- }
-
- program {
- name: "btn_cancel_mouse_up";
- signal: "mouse,up,1";
- source: "setasview.btn_cancel";
- after: "show_btn_cancel";
- }
-
- program {
- name: "btn_cancel_clicked";
- signal: "mouse,clicked,1";
- source: "setasview.btn_cancel";
- action: SIGNAL_EMIT "setasview,cancel,clicked" "";
- }
-
-/* For button ok */
- program {
- name: "hide_btn_set";
- signal: "setasview,hide,btn_ok";
- source: "elm";
- action: STATE_SET "hide" 0.0;
- target: "setasview.btn_ok";
- }
-
- program {
- name: "show_btn_set";
- signal: "setasview,show,btn_ok";
- source: "elm";
- script {
- if ( get_int(ok_state) == _STATE_DISABLED )
- set_state(PART:"setasview.btn_ok", "dim", 0.0);
- else
- set_state(PART:"setasview.btn_ok", "default", 0.0);
- }
- }
- program {
- name: "dim_btn_set";
- signal: "setasview,disable,btn_ok";
- source: "elm";
-
- script {
- set_int(ok_state, _STATE_DISABLED);
- set_state(PART:"setasview.btn_ok", "dim", 0.0);
- }
- }
-
- program {
- name: "enable_btn_set";
- signal: "setasview,enable,btn_ok";
- source: "elm";
- script {
- set_int(ok_state, _STATE_ENABLED);
- set_state(PART:"setasview.btn_ok", "default", 0.0);
- }
- }
-
- program {
- name: "btn_set_mouse_down";
- signal: "mouse,down,1";
- source: "setasview.btn_ok";
-
- script {
- if ( get_int(ok_state) == _STATE_ENABLED )
- set_state(PART:"setasview.btn_ok", "pressed", 0.0);
+ program {
+ name: "hide_menu";
+ signal: "elm,state,hide";
+ source: "event";
+ action: STATE_SET "hide" 0.0;
+ target: "controlbar_clip";
+ target: "controlbar_bg";
}
- }
-
- program {
- name: "btn_set_mouse_up";
- signal: "mouse,up,1";
- source: "setasview.btn_ok";
- after: "show_btn_set";
- }
-
- program {
- name: "btn_set_clicked";
- signal: "mouse,clicked,1";
- source: "setasview.btn_ok";
- script {
- if ( get_int(ok_state) == _STATE_ENABLED )
- {
- emit("setasview,set,clicked", "");
- }
- }
- }
+ program {
+ name: "show_menu";
+ signal: "elm,state,show";
+ source: "event";
+ action: STATE_SET "default" 0.0;
+ target: "controlbar_clip";
+ target: "controlbar_bg";
+ }
}
}
}
+
diff --git a/main/layout/ivug-slider.edc b/main/layout/ivug-slider.edc
index ea0c0b7..0e3aafa 100755
--- a/main/layout/ivug-slider.edc
+++ b/main/layout/ivug-slider.edc
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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.
+ */
// slider layout
@@ -24,6 +23,7 @@ group {
images {
image: "T01_btn_play.png" COMP;
+ image: "T01_btn_paused.png" COMP;
}
parts {
@@ -41,7 +41,7 @@ group {
}
}
- part { name: "slider.photocam";
+ part { name: "slider.contents";
type: SWALLOW;
mouse_events: 1;
scale: 1;
@@ -72,28 +72,28 @@ group {
}
}
-
+#if 1
part { name: "slider.icon";
- type: IMAGE;
+ type: SWALLOW;
mouse_events: 1;
scale: 1;
description {
state: "default" 0.0;
- align: 0.5 0.5;
+ align: 0.5 0.5;
visible: 0;
- fixed: 1 1;
- max: 72 72;
+ fixed: 1 1;
+ max: 72 72;
rel1 { relative: 0.0 0.0; }
rel2 { relative: 1.0 1.0; }
- image.normal: "T01_btn_play.png";
}
description {
- state: "show" 0.0;
- inherit: "default" 0.0;
+ state: "show" 0.0;
+ inherit: "default" 0.0;
visible: 1;
}
}
+#endif
part { name: "slider.progress";
type: SWALLOW;
@@ -135,44 +135,45 @@ group {
}
program {
- name: "show_icon";
- signal: "elm,state,show_icon";
+ name: "show_progress";
+ signal: "elm,state,show,progress";
source: "slider";
action: STATE_SET "show" 0.0;
- target: "slider.icon";
+ target: "slider.progress";
}
program {
- name: "hide_icon";
- signal: "elm,state,hide_icon";
+ name: "hide_progress";
+ signal: "elm,state,hide,progress";
source: "slider";
action: STATE_SET "default" 0.0;
- target: "slider.icon";
+ target: "slider.progress";
}
-
+#if 1
program {
- name: "show_progress";
- signal: "elm,state,show,progress";
+ name: "show_icon";
+ signal: "elm,state,show_icon";
source: "slider";
action: STATE_SET "show" 0.0;
- target: "slider.progress";
+ target: "slider.icon";
}
program {
- name: "hide_progress";
- signal: "elm,state,hide,progress";
+ name: "hide_icon";
+ signal: "elm,state,hide_icon";
source: "slider";
action: STATE_SET "default" 0.0;
- target: "slider.progress";
+ target: "slider.icon";
}
+
program {
name: "icon_click";
signal: "mouse,clicked,1";
source: "slider.icon";
action: SIGNAL_EMIT "slider,icon,click" "";
}
-
+#endif
}//programs
} //group
diff --git a/main/layout/ivug-toolbar.edc b/main/layout/ivug-toolbar.edc
deleted file mode 100755
index c65ea20..0000000
--- a/main/layout/ivug-toolbar.edc
+++ /dev/null
@@ -1,886 +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.
- */
-
-
-/*
-* Refer to themes\widgets\toolbar.edc
-*/
-
-#define ITEM_STATE_ENABLED 0
-#define ITEM_STATE_DISABLED 1
-
-/* 1.0 */
-#define BUTTON_CONTROLBAR_ITEM_BUTTON_TEXT_SIZE_INC 28
-#define BUTTON_CONTROLBAR_ITEM_BUTTON_TEXTBLOCK_COLOR_INC "#f9f9f9"
-#define BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC 56 56
-
-#define BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC 249 249 249 255
-#define BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC 249 249 249 255
-
-collections {
-
- group { name: "elm/toolbar/base/ivug-toolbar/default";
- images {
- image: "T01_toolbar_bg.png" COMP;
- }
- parts {
- part { name: "base";
- mouse_events: 1;
- description { state: "default" 0.0;
- image.normal: "T01_toolbar_bg.png";
- }
- }
- part { name: "clipper";
- type: RECT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- rel1 {
- to: "base";
- offset: 2 2;
- }
- rel2 {
- to: "base";
- offset: -3 -3;
- }
- }
- }
- part { name: "elm.swallow.content";
- clip_to: "clipper";
- type: SWALLOW;
- description {
- state: "default" 0.0;
- rel1.to: "clipper";
- rel2.to: "clipper";
- }
- }
- part { name: "event";
- type: RECT;
- mouse_events: 1;
- repeat_events: 1;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- }
- }
-
- group { name: "elm/toolbar/item/ivug-toolbar/default";
- images {
- image: "T01_toolbar_press.png" COMP;
- }
- styles{
- style { name: "toolbar_style";
- base: "font=SLP:style=Medium font_size="BUTTON_CONTROLBAR_ITEM_BUTTON_TEXT_SIZE_INC" align=center color="BUTTON_CONTROLBAR_ITEM_BUTTON_TEXTBLOCK_COLOR_INC" wrap=mixed ellipsis=1";
- tag: "br" "\n";
- tag: "ps" "ps";
- tag: "hilight" "+ font=SLP:style=Bold";
- tag: "b" "+ font=SLP:style=Bold";
- tag: "tab" "\t";
- }
- }
-
- data.item: "transition_animation_on" "1";
- script {
- public item_state = ITEM_STATE_ENABLED;
- }
- parts {
- part { name: "bg";
- mouse_events: 0;
- description { state: "default" 0.0;
- visible: 0;
- color: 255 255 255 0;
- rel1 {
- relative: 1.0 1.0;
- to: "padding_left_top";
- }
- rel2 {
- relative: 0.0 0.0;
- to: "padding_right_bottom";
- }
- image {
- normal: "T01_toolbar_press.png";
- border: 3 3 3 3;
- }
- image.middle: SOLID;
- fill.smooth: 0;
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- color: 255 255 255 0;
- }
- }
- part { name: "padding_left_top";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- align: 0.0 0.0;
- rel2.relative: 0.0 0.0;
- min: 10 8;
- fixed: 1 1;
- visible: 1;
- color: 0 0 0 0;
- }
- }
- part { name: "padding_right_bottom";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- align: 1.0 1.0;
- rel1.relative: 1.0 1.0;
- min: 10 5;
- fixed: 1 1;
- visible: 1;
- color: 0 0 0 0;
- }
- }
- part {
- name: "icon_rect";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- min: 0 0;
- fixed: 0 1;
- rel1 {
- relative: 1.0 1.0;
- to: "padding_left_top";
- }
- rel2 {
- relative: 0.0 1.0;
- to_x: "padding_right_bottom";
- to_y: "padding_left_top";
- }
- align: 0.5 0.0;
- color: 0 0 0 0;
- }
- description { state: "visible" 0.0;
- min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
- fixed: 0 1;
- rel1 {
- relative: 1.0 1.0;
- to: "padding_left_top";
- }
- rel2 {
- relative: 0.0 1.0;
- to_x: "padding_right_bottom";
- to_y: "padding_left_top";
- }
- align: 0.5 0.0;
- color: 0 0 0 0;
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- }
- }
- part { name: "padding_after_icon";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0; //when only icon or no icon is there
- align: 0.0 0.0;
- rel1 {
- relative: 0.0 1.0;
- to: "icon_rect";
- }
- rel2.to: "icon_rect";
- fixed: 0 1;
- min: 0 0;
- color: 0 0 0 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- }
- }
- part { name: "padding_before_text";
- type: RECT;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0; //when only icon or no icon is there
- align: 0.5 1.0;
- rel1 {
- relative: 1.0 0.0;
- to_x: "padding_left_top";
- to_y: "elm.text";
- }
- rel2 {
- relative: 0.0 0.0;
- to_x: "padding_right_bottom";
- to_y: "elm.text";
- }
- fixed: 0 1;
- min: 0 0;
- color: 0 0 0 0;
- }
- }
- part { name: "elm.swallow.icon";
- type: SWALLOW;
- scale: 1;
- clip_to: "elm.icon.clipper";
- description { state: "default" 0.0;
- visible: 0;
- align: 0.5 0.0;
- rel1 {
- relative: 1.0 1.0;
- to: "padding_left_top";
- }
- rel2 {
- relative: 0.0 1.0;
- to_x: "padding_right_bottom";
- to_y: "padding_left_top";
- }
- fixed: 0 1;
- }
- description { state: "visible" 0.0;
- fixed: 0 1;
- min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
- max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
- rel1 {
- relative: 1.0 1.0;
- to: "padding_left_top";
- }
- rel2 {
- relative: 0.0 0.0;
- to_x: "padding_right_bottom";
- to_y: "padding_before_text";
- }
- aspect: 1.0 1.0;
- aspect_preference: HORIZONTAL;
- }
- description { state: "icononly" 0.0;
- min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
- max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
- rel1 {
- relative: 1.0 1.0;
- to: "padding_left_top";
- }
- rel2 {
- relative: 0.0 0.0;
- to: "padding_right_bottom";
- }
- aspect: 1.0 1.0;
- aspect_preference: HORIZONTAL;
- }
- }
- part { name: "elm.swallow.icon_new";
- type: SWALLOW;
- scale: 1;
- clip_to: "elm.icon_new.clipper";
- description { state: "default" 0.0;
- visible: 0;
- align: 0.5 0.0;
- rel1 {
- relative: 1.0 1.0;
- to: "padding_left_top";
- }
- rel2 {
- relative: 0.0 1.0;
- to_x: "padding_right_bottom";
- to_y: "padding_left_top";
- }
- fixed: 0 1;
- }
- description { state: "visible" 0.0;
- fixed: 0 1;
- min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
- max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
- rel1 {
- relative: 1.0 1.0;
- to: "padding_left_top";
- }
- rel2 {
- relative: 0.0 0.0;
- to_x: "padding_right_bottom";
- to_y: "padding_before_text";
- }
- aspect: 1.0 1.0;
- aspect_preference: HORIZONTAL;
- }
- description { state: "icononly" 0.0;
- min: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
- max: BUTTON_CONTROLBAR_ITEM_BUTTON_ICON_SIZE_INC;
- rel1 {
- relative: 1.0 1.0;
- to: "padding_left_top";
- }
- rel2 {
- relative: 0.0 0.0;
- to: "padding_right_bottom";
- }
- aspect: 1.0 1.0;
- aspect_preference: HORIZONTAL;
- }
- }
- part { name: "elm.text";
- type: TEXTBLOCK;
- mouse_events: 0;
- scale: 1;
- clip_to: "elm.text.clipper";
- description { state: "default" 0.0;
- visible: 1;
- rel1 {
- relative: 1.0 1.0;
- to_x: "padding_left_top";
- to_y: "padding_after_icon";
- }
- rel2 {
- relative: 0.0 0.0;
- to: "padding_right_bottom";
- }
- color: BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC;
- fixed: 1 1;
- text {
- style: "toolbar_style";
- min: 0 1;
- max: 0 1;
- }
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC;
- }
- }
- part { name: "elm.text_new";
- type: TEXTBLOCK;
- mouse_events: 0;
- scale: 1;
- clip_to: "elm.text_new.clipper";
- description { state: "default" 0.0;
- visible: 1;
- rel1 {
- relative: 1.0 1.0;
- to_x: "padding_left_top";
- to_y: "padding_after_icon";
- }
- rel2 {
- relative: 0.0 0.0;
- to: "padding_right_bottom";
- }
- color: BUTTON_NAVIFRAME_DEFAULT_TEXT_COLOR_INC;
- fixed: 1 1;
- text {
- style: "toolbar_style";
- min: 0 1;
- max: 0 1;
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC;
- }
- }
- part { name: "elm.text.clipper";
- type: RECT;
- description { state: "default" 0.0;
- color: 255 255 255 255;
- }
- description { state: "animation" 0.0;
- color: 255 255 255 0;
- }
- description { state: "disabled" 0.0;
- color: 255 255 255 153;
- }
- }
- part { name: "elm.text_new.clipper";
- type: RECT;
- description { state: "default" 0.0;
- color: 255 255 255 0;
- }
- description { state: "animation" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "elm.icon.clipper";
- type: RECT;
- description { state: "default" 0.0;
- color: 255 255 255 255;
- }
- description { state: "animation" 0.0;
- color: 255 255 255 0;
- }
- description { state: "disabled" 0.0;
- color: 255 255 255 153;
- }
- }
- part { name: "elm.icon_new.clipper";
- type: RECT;
- description { state: "default" 0.0;
- color: 255 255 255 0;
- }
- description { state: "animation" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "event";
- type: RECT;
- mouse_events: 1;
- ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- part { name: "event2";
- type: RECT;
- mouse_events: 1;
- repeat_events: 1;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- }
- programs {
- program { name: "pressed";
- signal: "mouse,down,1";
- source: "event";
- script {
- if (get_int(item_state) != ITEM_STATE_DISABLED)
- set_state(PART:"bg", "selected", 0.0);
- }
- transition: LINEAR 0.2;
- }
- program { name: "unpressed";
- signal: "mouse,up,1";
- source: "event2";
- action: STATE_SET "default" 0.0;
- target: "bg";
- transition: LINEAR 0.1;
- }
- program { name: "go";
- signal: "mouse,up,1";
- source: "event";
- action: SIGNAL_EMIT "elm,action,click" "elm";
- }
- program { name: "mouse,in";
- signal: "mouse,in";
- source: "event";
- action: SIGNAL_EMIT "elm,mouse,in" "elm";
- }
- program { name: "mouse,out";
- signal: "mouse,out";
- source: "event";
- action: SIGNAL_EMIT "elm,mouse,out" "elm";
- }
- program { name: "disable";
- signal: "elm,state,disabled";
- source: "elm";
- action: STATE_SET "disabled" 0.0;
- target: "bg";
- after: "disable_text";
- }
- program { name: "disable_text";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "visible"))
- {
- set_state(PART:"elm.text", "disabled_visible", 0.0);
- set_state(PART:"elm.text_new", "disabled_visible", 0.0);
- }
- else
- {
- set_state(PART:"elm.text", "disabled", 0.0);
- set_state(PART:"elm.text_new", "disabled", 0.0);
- }
- set_state(PART:"elm.text.clipper", "disabled", 0.0);
- set_state(PART:"elm.icon.clipper", "disabled", 0.0);
- set_int(item_state, ITEM_STATE_DISABLED);
- }
- }
- program { name: "enable";
- signal: "elm,state,enabled";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "bg";
- after: "enable_text";
- }
- program { name: "enable_text";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "disabled_visible"))
- {
- set_state(PART:"elm.text", "visible", 0.0);
- set_state(PART:"elm.text_new", "visible", 0.0);
- }
- else
- {
- set_state(PART:"elm.text", "default", 0.0);
- set_state(PART:"elm.text_new", "default", 0.0);
- }
- set_state(PART:"elm.text.clipper", "default", 0.0);
- set_state(PART:"elm.icon.clipper", "default", 0.0);
- set_int(item_state, ITEM_STATE_ENABLED);
- }
- }
- program { name: "label_set,animation,forward";
- signal: "elm,state,label_set,forward";
- source: "elm";
- after: "label_set,animation";
- }
- program { name: "label_set,animation,backward";
- signal: "elm,state,label_set,backward";
- source: "elm";
- after: "label_set,animation";
- }
- program { name: "label_set,animation";
- signal: "elm,state,label_set";
- source: "elm";
- action: STATE_SET "animation" 0.0;
- target: "elm.text.clipper";
- target: "elm.text_new.clipper";
- transition: LINEAR 0.2;
- after: "label_set,animation,done";
- }
- program { name: "label_set,animation,done";
- action: SIGNAL_EMIT "elm,state,label_set,done" "elm";
- }
- program { name: "label,reset";
- signal: "elm,state,label,reset";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.text.clipper";
- target: "elm.text_new.clipper";
- }
- program { name: "icon_set,animation,forward";
- signal: "elm,state,icon_set,forward";
- source: "elm";
- after: "icon_set,animation";
- }
- program { name: "icon_set,animation,backward";
- signal: "elm,state,icon_set,backward";
- source: "elm";
- after: "icon_set,animation";
- }
- program { name: "icon_set,animation";
- signal: "elm,state,icon_set";
- source: "elm";
- action: STATE_SET "animation" 0.0;
- target: "elm.icon.clipper";
- target: "elm.icon_new.clipper";
- transition: LINEAR 0.2;
- after: "icon_set,animation,done";
- }
- program { name: "icon_set,animation,done";
- action: SIGNAL_EMIT "elm,state,icon_set,done" "elm";
- }
- program { name: "icon,reset";
- signal: "elm,state,icon,reset";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.icon.clipper";
- target: "elm.icon_new.clipper";
- }
- program { name: "text_show";
- signal: "elm,state,text,visible";
- source: "elm";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.swallow.icon", st, 30, vl);
- if (!strcmp(st, "icononly"))
- {
- set_state(PART:"elm.swallow.icon", "visible", 0.0);
- set_state(PART:"icon_rect", "visible", 0.0);
- set_state(PART:"padding_after_icon", "visible", 0.0);
- }
- set_state(PART:"elm.text", "visible", 0.0);
- }
- }
- program { name: "text_hide";
- signal: "elm,state,text,hidden";
- source: "elm";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.swallow.icon", st, 30, vl);
- if (!strcmp(st, "visible"))
- {
- set_state(PART:"elm.swallow.icon", "icononly", 0.0);
- set_state(PART:"icon_rect", "icononly", 0.0);
- set_state(PART:"padding_after_icon", "icononly", 0.0);
- }
- set_state(PART:"elm.text", "default", 0.0);
- }
- }
- program { name: "icon_show";
- signal: "elm,state,icon,visible";
- source: "elm";
- script {
- new st[31];
- new Float:vl;
- get_state(PART:"elm.text", st, 30, vl);
- if (!strcmp(st, "visible"))
- {
- set_state(PART:"elm.swallow.icon", "visible", 0.0);
- set_state(PART:"icon_rect", "visible", 0.0);
- set_state(PART:"padding_after_icon", "visible", 0.0);
- }
- else
- {
- set_state(PART:"elm.swallow.icon", "icononly", 0.0);
- set_state(PART:"icon_rect", "icononly", 0.0);
- set_state(PART:"padding_after_icon", "icononly", 0.0);
- }
- }
- }
- }
- }
-
- group { name: "elm/toolbar/item/ivug-toolbar/item_horizontal";
- inherit: "elm/toolbar/item/ivug-toolbar/default";
- script {
- public item_state = ITEM_STATE_ENABLED;
- }
- parts {
- part { name: "icon_rect";
- description { state: "default" 0.0;
- fixed: 1 0;
- align: 0.0 0.5;
- }
- description { state: "visible" 0.0;
- fixed: 1 0;
- rel2 {
- relative: 1.0 0.0;
- to_x: "padding_left_top";
- to_y: "padding_right_bottom";
- }
- align: 0.0 0.5;
- }
- }
- part { name: "padding_after_icon";
- description { state: "default" 0.0; //when only icon or no icon is there
- rel1.relative: 1.0 0.0;
- fixed: 1 1;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- min: 6 0;
- }
- }
- part { name: "padding_before_text";
- description { state: "default" 0.0; //when only icon or no icon is there
- align: 1.0 0.5;
- rel1 {
- relative: 0.0 1.0;
- to_x: "elm.text";
- to_y: "padding_left_top";
- }
- rel2 {
- to_x: "elm.text";
- to_y: "padding_right_bottom";
- }
- fixed: 1 0;
- min: 6 0;
- }
- }
- part { name: "elm.swallow.icon";
- description { state: "default" 0.0;
- align: 0.0 0.5;
- rel2 {
- relative: 1.0 0.0;
- to_x: "padding_left_top";
- to_y: "padding_right_bottom";
- }
- fixed: 1 0;
- }
- description { state: "visible" 0.0;
- fixed: 1 0;
- align: 1.0 0.5;
- rel1 {
- relative: 0.0 1.0;
- to_x: "padding_before_text";
- to_y: "padding_left_top";
- }
- rel2 {
- relative: 0.0 0.0;
- to_x: "padding_before_text";
- to_y: "padding_right_bottom";
- }
- aspect_preference: VERTICAL;
- }
- description { state: "icononly" 0.0;
- aspect_preference: VERTICAL;
- }
- }
- part { name: "elm.swallow.icon_new";
- description { state: "default" 0.0;
- align: 0.0 0.5;
- rel2 {
- relative: 1.0 0.0;
- to_x: "padding_left_top";
- to_y: "padding_right_bottom";
- }
- fixed: 1 0;
- }
- description { state: "visible" 0.0;
- fixed: 1 0;
- align: 1.0 0.5;
- rel1 {
- relative: 0.0 1.0;
- to_x: "padding_before_text";
- to_y: "padding_left_top";
- }
- rel2 {
- relative: 0.0 0.0;
- to_x: "padding_before_text";
- to_y: "padding_right_bottom";
- }
- aspect_preference: VERTICAL;
- }
- description { state: "icononly" 0.0;
- aspect_preference: VERTICAL;
- }
- }
- part { name: "elm.text";
- type: TEXTBLOCK;
- description { state: "default" 0.0;
- rel1 {
- relative: 1.0 1.0;
- to_x: "padding_after_icon";
- to_y: "padding_left_top";
- }
- text {
- style: "toolbar_style";
- min: 1 0;
- max: 1 0;
- }
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC;
- }
- }
- part { name: "elm.text_new";
- type: TEXTBLOCK;
- description { state: "default" 0.0;
- rel1 {
- relative: 1.0 1.0;
- to_x: "padding_after_icon";
- to_y: "padding_left_top";
- }
- text {
- style: "toolbar_style";
- min: 1 0;
- max: 1 0;
- }
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- color: BUTTON_NAVIFRAME_FOCUSED_TEXT_COLOR_INC;
- }
- }
- }
- }
-
- /*group { name: "elm/toolbar/separator/ivug-toolbar/default";
- images {
- image: "separator_v.png" COMP;
- }
- parts {
- part { name: "separator"; // separator group
- description { state: "default" 0.0;
- min: 2 2;
- max: 2 9999;
- rel1.offset: 4 4;
- rel2.offset: -5 -5;
- image {
- normal: "separator_v.png";
- }
- fill {
- smooth: 0;
- }
- }
- }
- }
- }*/
-
- group { name: "elm/toolbar/object/ivug-toolbar/default";
- parts {
- part { name: "elm.swallow.object"; // object group
- type: SWALLOW;
- description {
- state: "default" 0.0;
- }
- }
- }
- }
-}
-
diff --git a/main/res/images/01_Control icon/T01_controlbar_icon_info.png b/main/res/images/01_Control icon/T01_controlbar_icon_info.png
deleted file mode 100755
index 9e746c8..0000000
--- a/main/res/images/01_Control icon/T01_controlbar_icon_info.png
+++ /dev/null
Binary files differ
diff --git a/main/res/images/T01_Nocontents_broken.png b/main/res/images/T01_Nocontents_broken.png
deleted file mode 100755
index 9326d0a..0000000
--- a/main/res/images/T01_Nocontents_broken.png
+++ /dev/null
Binary files differ
diff --git a/main/res/po/CMakeLists.txt b/main/res/po/CMakeLists.txt
index 1bead45..b678985 100755
--- a/main/res/po/CMakeLists.txt
+++ b/main/res/po/CMakeLists.txt
@@ -1,6 +1,6 @@
# for i18n
-SET(POFILES de_DE.po el_GR.po en.po es_ES.po fr_FR.po it_IT.po ja_JP.po ko_KR.po
+SET(POFILES de_DE.po el_GR.po en.po es_ES.po fr_FR.po it_IT.po ja_JP.po ko_KR.po
nl_NL.po pt_PT.po ru_RU.po tr_TR.po zh_CN.po zh_HK.po zh_TW.po)
SET(MSGFMT "/usr/bin/msgfmt")
@@ -23,3 +23,4 @@ ENDFOREACH(pofile)
MESSAGE(".mo files: ${moFiles}")
ADD_CUSTOM_TARGET(po ALL DEPENDS ${moFiles})
+
diff --git a/main/res/po/POTFILES.in b/main/res/po/POTFILES.in
index c6b625a..5b882fb 100755
--- a/main/res/po/POTFILES.in
+++ b/main/res/po/POTFILES.in
@@ -1 +1 @@
-# List of source files containing translatable strings.
+# List of source files containing translatable strings.
diff --git a/main/res/po/de_DE.po b/main/res/po/de_DE.po
index 9c924e7..f6b731e 100755
--- a/main/res/po/de_DE.po
+++ b/main/res/po/de_DE.po
@@ -157,3 +157,30 @@ msgstr "Tag-Info"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "Hintergrund für gesperrten und Home-Bildschirm"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "Bewegung verwenden"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "Tag erst."
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "Start- und gesperrte Bildschirme"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "In Zwischenablage kopieren"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "Zuschneiden"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "Home-Bildschirm"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "Bildschirmsperre"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "Nach links drehen"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "Nach rechts drehen"
+
diff --git a/main/res/po/el_GR.po b/main/res/po/el_GR.po
index 865fd29..e934edc 100755
--- a/main/res/po/el_GR.po
+++ b/main/res/po/el_GR.po
@@ -157,3 +157,30 @@ msgstr "Ετικέτα"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "Ταπετσαρία αρχικής οθόνης και οθόνης κλειδώματος"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "Χρήση κίνησης"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "Δημ. ετικ."
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "Αρχική οθόνη και οθόνη κλειδώματος"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "Αντιγραφή στο πρόχειρο"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "Περικοπή"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "Αρχική οθόνη"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "Κλείδωμα οθόνης"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "Περιστροφή προς τα αριστερά"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "Περιστροφή προς τα δεξιά"
+
diff --git a/main/res/po/en.po b/main/res/po/en.po
index 265973d..3bed3f6 100755
--- a/main/res/po/en.po
+++ b/main/res/po/en.po
@@ -157,3 +157,30 @@ msgstr "Tag"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "Home and lock screen wallpaper"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "Use motion"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "Create tag"
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "Home and lock screens"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "Copy to clipboard"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "Crop"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "Home screen"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "Lock screen"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "Rotate left"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "Rotate right"
+
diff --git a/main/res/po/es_ES.po b/main/res/po/es_ES.po
index ee6d2a8..a33c1f2 100755
--- a/main/res/po/es_ES.po
+++ b/main/res/po/es_ES.po
@@ -157,3 +157,30 @@ msgstr "Etiqueta"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "Fondo de pantalla de pantalla de inicio y bloqueo"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "Utilizar movimiento"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "Crear etiq"
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "Pantallas de inicio y de bloqueo"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "Copiar en portapapeles"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "Recortar"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "Pantalla de inicio"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "Pantalla de bloqueo"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "Girar a la izquierda"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "Girar a la derecha"
+
diff --git a/main/res/po/fr_FR.po b/main/res/po/fr_FR.po
index 137e9f3..c6b24f2 100755
--- a/main/res/po/fr_FR.po
+++ b/main/res/po/fr_FR.po
@@ -157,3 +157,30 @@ msgstr "Etiqueter"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "Fonds d'écran de verrouillage et d'accueil"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "Utiliser les mouvements"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "Nv libellé"
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "Ecrans d'accueil et de verrouillage"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "Copier dans le presse-papiers"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "Rogner"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "Ecran d'accueil"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "Ecran de verrouillage"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "Rotation à gauche"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "Rotation à droite"
+
diff --git a/main/res/po/it_IT.po b/main/res/po/it_IT.po
index e54168a..a8aa273 100755
--- a/main/res/po/it_IT.po
+++ b/main/res/po/it_IT.po
@@ -157,3 +157,30 @@ msgstr "Tag"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "Sfondo schermata iniziale e blocco"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "Sensore di movimento"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "Crea tag"
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "Schermata Home e di blocco"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "Copia negli appunti"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "Ritaglia"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "Sfondo principale"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "Schermata di blocco"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "Ruota a sinistra"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "Ruota a destra"
+
diff --git a/main/res/po/ja_JP.po b/main/res/po/ja_JP.po
index cffcb88..7d5b9f3 100755
--- a/main/res/po/ja_JP.po
+++ b/main/res/po/ja_JP.po
@@ -2,10 +2,10 @@ msgid "IDS_IV_BODY_ACCUMULATED_TIME"
msgstr "累積​時間"
msgid "IDS_IV_HEADER_ADD_TAG"
-msgstr "タグ​を​追加​"
+msgstr "タグ​を​追加"
msgid "IDS_IV_POP_ADDED"
-msgstr "追加しました。"
+msgstr "追加​しました。"
msgid "IDS_IV_BODY_ANY"
msgstr "どれか"
@@ -68,7 +68,7 @@ msgid "IDS_IV_BODY_LOCATIONS"
msgstr "場所"
msgid "IDS_IV_HEADER_LOCK_SCREEN_WALLPAPER_ABB"
-msgstr "画面ロック時の壁紙"
+msgstr "画面​ロック​時​の​壁紙"
msgid "IDS_IV_BODY_LONGITUDE"
msgstr "経度"
@@ -95,7 +95,7 @@ msgid "IDS_IV_OPT_PRINT_VIA_BLUETOOTH"
msgstr "Bluetoothで印刷"
msgid "IDS_IV_BODY_RESOLUTION"
-msgstr "撮影サイズ"
+msgstr "撮影​サイズ"
msgid "IDS_IV_BODY_RIGHT_STATUS"
msgstr "権限の状態"
@@ -140,16 +140,16 @@ msgid "IDS_IV_OPT_FILE_TRANSFER"
msgstr "ファイル​転送"
msgid "IDS_IV_BODY_DO_NOT_SHOW_AGAIN"
-msgstr "今後​表示​しない"
+msgstr "今後​​表示​​しない"
msgid "IDS_IV_BODY_TAP_AND_HOLD_AT_TWO_POINTS_THEN_TILT_DEVICE_BACK_AND_FORTH_TO_REDUCE_OR_ENLARGE_SCREEN"
-msgstr "画面表示を縮小/拡大するには、画面の2箇所を長押しし、端末を前後に傾けます。"
+msgstr "画面​表示​を​縮小/​拡大​する​に​は、​画面​の​2​箇所​を​長​押し​し、​端末​を​前後​に​傾​け​ま​す。"
msgid "IDS_IV_HEADER_LEARN_ABOUT_TILT"
-msgstr "チルト操作について"
+msgstr "端末​​を​​傾ける​​操作​​に​​ついて"
msgid "IDS_IV_HEADER_ALL_ALBUMS"
-msgstr "全アルバム"
+msgstr "全​アルバム"
msgid "IDS_IV_OPT_TAG"
msgstr "タグ"
@@ -157,3 +157,30 @@ msgstr "タグ"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "ホーム画面/ロック画面用壁紙"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "モーション​を​使用"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "タグ​作成"
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "ホーム画面とロック画面"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "クリップ​ボード​に​コピー"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "トリミング"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "ホーム画面"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "ロック画面"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "左​に​回転"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "右​に​回転"
+
diff --git a/main/res/po/ko_KR.po b/main/res/po/ko_KR.po
index deb9ac6..40f5d6b 100755
--- a/main/res/po/ko_KR.po
+++ b/main/res/po/ko_KR.po
@@ -157,3 +157,30 @@ msgstr "태그"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "홈 및 잠금화면 배경"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "모션 기능 사용"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "태그 추가"
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "홈 화면 및 잠금화면"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "클립보드에 복사"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "잘라내기"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "홈 화면"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "잠금화면"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "왼쪽으로 회전"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "오른쪽으로 회전"
+
diff --git a/main/res/po/nl_NL.po b/main/res/po/nl_NL.po
index 5e786da..a62f2f7 100755
--- a/main/res/po/nl_NL.po
+++ b/main/res/po/nl_NL.po
@@ -140,7 +140,7 @@ msgid "IDS_IV_OPT_FILE_TRANSFER"
msgstr "Bestandsoverdracht"
msgid "IDS_IV_BODY_DO_NOT_SHOW_AGAIN"
-msgstr "Niet meer tonen"
+msgstr "Niet meer laten zien"
msgid "IDS_IV_BODY_TAP_AND_HOLD_AT_TWO_POINTS_THEN_TILT_DEVICE_BACK_AND_FORTH_TO_REDUCE_OR_ENLARGE_SCREEN"
msgstr "Tik en houd vast op twee punten en kantel het apparaat heen en terug om het scherm te verkleinen/vergroten"
@@ -157,3 +157,30 @@ msgstr "Tag"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "Achtergrond voor start- en vergrendelscherm"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "Beweging gebruiken"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "Tag maken"
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "Start- en vergrendelscherm"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "Kopiëren naar klembord"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "Bijsnijden"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "Startscherm"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "Vergrendelscherm"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "Linksom draaien"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "Rechtsom draaien"
+
diff --git a/main/res/po/pt_PT.po b/main/res/po/pt_PT.po
index ac6f45d..42c993f 100755
--- a/main/res/po/pt_PT.po
+++ b/main/res/po/pt_PT.po
@@ -157,3 +157,30 @@ msgstr "Etiqueta"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "Fundo do ecrã principal e ecrã bloqueado"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "Utilizar movimento"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "Criar etiq."
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "Ecrãs principal e de bloqueio"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "Copiar para bloco de notas"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "Recortar"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "Ecrã principal"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "Ecrã bloqueado"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "Rodar para a esquerda"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "Rodar para a direita"
+
diff --git a/main/res/po/ru_RU.po b/main/res/po/ru_RU.po
index 4983089..12e06d8 100755
--- a/main/res/po/ru_RU.po
+++ b/main/res/po/ru_RU.po
@@ -157,3 +157,30 @@ msgstr "Метка"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "Обои для главного экрана и экрана блокировки"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "Использовать движение"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "Создать метку"
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "Главный экран и экран блокировки"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "Копировать в буфер обмена"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "Обрезать"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "Главный экран"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "Экран блокировки"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "Повернуть влево"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "Повернуть вправо"
+
diff --git a/main/res/po/tr_TR.po b/main/res/po/tr_TR.po
index aabaeee..2c0f3c6 100755
--- a/main/res/po/tr_TR.po
+++ b/main/res/po/tr_TR.po
@@ -157,3 +157,30 @@ msgstr "İm"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "Ana ekran ve kilit ekranı duvar kağıdı"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "Hareket kullan"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "İm oluştur"
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "Ana ve kilit ekranları"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "Panoya kopyala"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "Kırp"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "Ana sayfa ekranı"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "Ekranı kilitle"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "Saat yönünün tersine döndür"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "Saat yönünde döndür"
+
diff --git a/main/res/po/zh_CN.po b/main/res/po/zh_CN.po
index 5094669..0e96f48 100755
--- a/main/res/po/zh_CN.po
+++ b/main/res/po/zh_CN.po
@@ -157,3 +157,30 @@ msgstr "标签"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "主屏和锁屏壁纸"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "使用动作"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "创建标签"
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "主屏和锁屏"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "复制至剪贴板"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "裁剪"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "主屏"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "锁定屏幕"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "向左旋转"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "向右旋转"
+
diff --git a/main/res/po/zh_HK.po b/main/res/po/zh_HK.po
index f8fcc7e..08b6eb2 100755
--- a/main/res/po/zh_HK.po
+++ b/main/res/po/zh_HK.po
@@ -140,7 +140,7 @@ msgid "IDS_IV_OPT_FILE_TRANSFER"
msgstr "檔案傳輸"
msgid "IDS_IV_BODY_DO_NOT_SHOW_AGAIN"
-msgstr "不要再顯示"
+msgstr "不再顯示"
msgid "IDS_IV_BODY_TAP_AND_HOLD_AT_TWO_POINTS_THEN_TILT_DEVICE_BACK_AND_FORTH_TO_REDUCE_OR_ENLARGE_SCREEN"
msgstr "輕觸並按住兩點,然後來回傾斜手機以縮小或放大螢幕"
@@ -157,3 +157,30 @@ msgstr "標籤"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "主螢幕與鎖定螢幕牆紙"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "使用動作"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "建立標籤"
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "主螢幕和鎖定螢幕"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "複製到剪貼板"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "裁剪"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "主螢幕"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "鎖定螢幕"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "左轉"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "右轉"
+
diff --git a/main/res/po/zh_TW.po b/main/res/po/zh_TW.po
index 495ed00..da69f96 100755
--- a/main/res/po/zh_TW.po
+++ b/main/res/po/zh_TW.po
@@ -149,7 +149,7 @@ msgid "IDS_IV_HEADER_LEARN_ABOUT_TILT"
msgstr "瞭解關於傾斜"
msgid "IDS_IV_HEADER_ALL_ALBUMS"
-msgstr "所有專輯"
+msgstr "所有相簿"
msgid "IDS_IV_OPT_TAG"
msgstr "標籤"
@@ -157,3 +157,30 @@ msgstr "標籤"
msgid "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"
msgstr "主螢幕與鎖定畫面桌布"
+msgid "IDS_IV_OPT_USE_MOTION"
+msgstr "使用動作"
+
+msgid "IDS_MEDIABR_OPT_CREATE_TAG"
+msgstr "建立標籤"
+
+msgid "IDS_IV_BODY_HOME_AND_LOCK_SCREENS"
+msgstr "主螢幕與鎖定畫面"
+
+msgid "IDS_IV_OPT_COPY_TO_CLIPBOARD"
+msgstr "複製到剪貼簿"
+
+msgid "IDS_IV_BODY_CROP"
+msgstr "裁剪"
+
+msgid "IDS_IV_BODY_HOME_SCREEN"
+msgstr "主螢幕"
+
+msgid "IDS_IV_BODY_LOCK_SCREEN"
+msgstr "鎖定螢幕"
+
+msgid "IDS_IV_OPT_ROTATE_LEFT"
+msgstr "向左旋轉"
+
+msgid "IDS_IV_OPT_ROTATE_RIGHT"
+msgstr "向右旋轉"
+
diff --git a/main/src/common/ivug-common.h b/main/src/common/ivug-common.h
deleted file mode 100755
index ba817eb..0000000
--- a/main/src/common/ivug-common.h
+++ /dev/null
@@ -1,42 +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 __IVUG_COMMON_H__
-#define __IVUG_COMMON_H__
-
-#include "ivug-define.h"
-#include "ivug-datatypes.h"
-#include "ivug-uuid.h"
-
-#include <Elementary.h>
-#include <assert.h>
-
-#include "statistics.h"
-#include "ivug-debug.h"
-#include "ivug-string.h"
-#include "ivug-util.h"
-#include "ivug-define.h"
-#include "ivug-config.h"
-#include "ivug-widget.h"
-
-
-#define _EDJ(o) elm_layout_edje_get(o)
-
-#define IMAGE_BETWEEN_MARGIN (30) // The value is width between photocam(unit is pixel).
-
-#endif /* __IVUG_COMMON_H__ */
-
diff --git a/main/src/common/ivug-config.c b/main/src/common/ivug-config.c
deleted file mode 100755
index 06efce5..0000000
--- a/main/src/common/ivug-config.c
+++ /dev/null
@@ -1,200 +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 "ivug-common.h"
-#include "ivug-define.h"
-#include "ivug-effect.h"
-#include "ivug-config.h"
-
-#include <vconf.h>
-#include <vconf-keys.h>
-
-// TODO: Request vconf key to setting part, Slide show setting vconf key
-#define VCONFKEY_GALLERY_INTERVAL_TIME "db/setting/gallery/interval_time" //double
-#define VCONFKEY_GALLERY_REPEAT_STATE "db/setting/gallery/repeat_state" //boolean
-#define VCONFKEY_GALLERY_SHUFFLE_STATE "db/setting/gallery/shuffle_state" //boolean
-#define VCONFKEY_GALLERY_TRANSITION_EFFECT "db/setting/gallery/ss_effect" //char
-
-enum { STATE_FALSE = 0, STATE_TRUE = 1, };
-
-/*
- Set lock screen with given image.
-
- CAUTION : does not check filepath integrity
-*/
-bool ivug_config_set_lockscreen_image(const char* filepath)
-{
- if(filepath == NULL)
- {
- MSG_IMAGEVIEW_ERROR("Lock screen path is NULL");
- return FALSE;
- }
-
- if(vconf_set_str( VCONFKEY_IDLE_LOCK_BGSET, filepath ) < 0)
- {
- MSG_IMAGEVIEW_ERROR("Lockscreen set Error : %s", filepath);
- return FALSE;
- }
-
- MSG_IMAGEVIEW_HIGH("Set Lockscreen filepath = %s", filepath);
-
- return TRUE;
-}
-
-/*
- Set home screen with given image
-
- CAUTION : does not check filepath integrity
-*/
-bool ivug_config_set_homescreen_image( const char* filepath )
-{
- if(filepath == NULL)
- {
- MSG_IMAGEVIEW_ERROR("Home screen path is NULL");
- return FALSE;
- }
-// TODO : Need to check file existence?????
- if(vconf_set_str(VCONFKEY_BGSET, filepath) < 0)
- {
- MSG_IMAGEVIEW_ERROR("Homescreen set Error");
- return FALSE;
- }
-
- MSG_IMAGEVIEW_HIGH("Set Homescreen filepath = %s", filepath);
- return TRUE;
-}
-
-
-static bool
-_ivug_config_get_slideshow_repeat_state(void)
-{
- int repeat_state = STATE_FALSE;
-
- if(vconf_get_bool(VCONFKEY_GALLERY_REPEAT_STATE, &repeat_state) < 0)
- {
- MSG_IMAGEVIEW_ERROR("vconf_get_bool failed, set as repeat state as default: false");
- return false;
- }
-
- MSG_IMAGEVIEW_HIGH("repeat state is: %d", repeat_state);
-
- return (repeat_state == STATE_TRUE ? true : false);
-}
-
-static bool
-_ivug_config_get_slideshow_shuffle_state(void)
-{
- int shuffle_state = STATE_FALSE;
-
- if(vconf_get_bool(VCONFKEY_GALLERY_SHUFFLE_STATE, &shuffle_state) < 0)
- {
- MSG_IMAGEVIEW_ERROR("vconf_get_bool failed, set as shuffle state as default: false");
- return false;
- }
-
- MSG_IMAGEVIEW_HIGH("shuffle state is: %d", shuffle_state);
-
- return (shuffle_state == STATE_TRUE ? true : false);
-}
-
-static double
-_ivug_config_get_slideshow_interval_time(void)
-{
- double interval_time = 0.0;
-
- if(vconf_get_dbl(VCONFKEY_GALLERY_INTERVAL_TIME, &interval_time) < 0)
- {
- MSG_IMAGEVIEW_ERROR("vconf_get_dbl failed, set as interval time as -1");
-
- interval_time = -1.0;
- }
-
- MSG_IMAGEVIEW_HIGH("interval time is: %f", interval_time);
- return interval_time;
-}
-
-static char *
-_ivug_config_get_slideshow_effect_type(void)
-{
-// TODO : Free returned string??
- char *effect_str = NULL;
- effect_str = vconf_get_str(VCONFKEY_GALLERY_TRANSITION_EFFECT);
-
- if(!effect_str)
- {
- MSG_IMAGEVIEW_ERROR("vconf_get_str failed, set as effect type as default");
-
- effect_str = NULL;
- }
-
- MSG_IMAGEVIEW_HIGH("effect is: %s", effect_str);
-
- return effect_str;
-}
-
-static ivug_effect_type
-_ivug_config_get_effect_type_by_string(char *effect_str)
-{
- ivug_retv_if(!effect_str, EFFECT_NONE);
-
- ivug_effect_type type = IVUG_EFFECT_TYPE_SLIDE;
-
- if(!strncmp(effect_str, "Slide", strlen(effect_str)))
- {
- type = IVUG_EFFECT_TYPE_SLIDE;
- }
- else //Set all other cases as default NONE
- {
- MSG_SLIDER_WARN("Invalid type : %s", effect_str);
- type = EFFECT_NONE;
- }
-
- MSG_IMAGEVIEW_HIGH("effect_str = %s, type = %d", effect_str, type);
-
- return type;
-}
-
-void
-ivug_config_get_slideshow_setting(slide_show_mode *mode,
- double *interval_time,
- ivug_effect_type *effect_type)
-{
- *mode = SLIDE_SHOW_MODE_NORMAL;
-
- bool state;
-
- state = _ivug_config_get_slideshow_repeat_state();
- if(state == true)
- {
- *mode |= SLIDE_SHOW_MODE_REPEAT;
- }
-
- state = _ivug_config_get_slideshow_shuffle_state();
- if(state == true)
- {
- *mode |= SLIDE_SHOW_MODE_SHUFFLE;
- }
-
- *interval_time = _ivug_config_get_slideshow_interval_time();
-
- /* EFFECT_NONE, EFFECT_FADE, EFFECT_BLIND, EFFECT_IRIS */
- char *effect = _ivug_config_get_slideshow_effect_type();
-
- *effect_type = _ivug_config_get_effect_type_by_string(effect);
-}
-
-
diff --git a/main/src/common/ivug-config.h b/main/src/common/ivug-config.h
deleted file mode 100755
index 31d9533..0000000
--- a/main/src/common/ivug-config.h
+++ /dev/null
@@ -1,50 +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 __IVUG_CONFIG_H__
-#define __IVUG_CONFIG_H__
-
-typedef enum {
- SLIDE_SHOW_MODE_NORMAL = 0x00,
- SLIDE_SHOW_MODE_REPEAT = 0x01,
- SLIDE_SHOW_MODE_SHUFFLE = 0x02,
- SLIDE_SHOW_MODE_SHUFFLE_REPEAT = 0x03,
-} slide_show_mode;
-
-typedef enum {
- IVUG_EFFECT_TYPE_SLIDE = 0x00,
- IVUG_EFFECT_TYPE_MAX,
-} ivug_effect_type;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool ivug_config_set_lockscreen_image(const char* filepath);
-
-bool ivug_config_set_homescreen_image(const char* filepath);
-
-void ivug_config_get_slideshow_setting(slide_show_mode * /* OUT */ mode,
- double * /* OUT */ interval_time,
- ivug_effect_type * /* OUT */ effect_type);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif // __IVUG_CONFIG_H__
diff --git a/main/src/common/ivug-datatypes.h b/main/src/common/ivug-datatypes.h
deleted file mode 100755
index dc616e3..0000000
--- a/main/src/common/ivug-datatypes.h
+++ /dev/null
@@ -1,32 +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 __IVUG_DATATYPES_H__
-#define __IVUG_DATATYPES_H__
-
-#include "ivug-define.h"
-
-typedef void *Handle;
-
-#ifdef _USE_MEDIAINFO_STRINGID_
-typedef const char *UUID;
-#else
-typedef int UUID;
-#endif
-
-#endif // __IVUG_DATATYPES_H__
-
diff --git a/main/src/common/ivug-define.h b/main/src/common/ivug-define.h
deleted file mode 100755
index 0cddf5b..0000000
--- a/main/src/common/ivug-define.h
+++ /dev/null
@@ -1,60 +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.
- */
-
-
-/*
- system widely used definition.
-*/
-
-#pragma once
-
-#define IVUG_MAX_FILE_PATH_LEN (4096)
-
-/*
-Definition "PREFIX" is declared in CMakelist.txt
- PREFIX is "/opt/ug"
- PACKAGE is "ug-image-viewer-efl"
-
- Path name does not include trailing /.
-
- DATA_PATH is /opt/data
-*/
-#define LOCALE_PATH PREFIX"/res/locale"
-#define IMAGE_PATH PREFIX"/res/images/"PACKAGE
-#define EDJ_PATH PREFIX"/res/edje/"PACKAGE
-
-/*
- Home screen and Lock screen image should be put in DATA_PATH.
-*/
-#define DATA_PATH DATADIR"/"PACKAGE
-
-// TODO : Add comments
-#define IV_WINDOW_SIZE (41)//41 /* it's better to be odd number */
-#define IV_WINDOW_SIZE_FOR_SLIDE_SHOW (1)
-#define IV_RELOAD_OFFSET (4)//IV_WINDOW_SIZE/10 // it's better to be larger than 2
-
-#define USE_WIN_AS_PARENT
-
-#define NAVI_OPTION_BTN_STYLE "multiline"
-
-#define IVUG_DEFAULT_BG_COLOR 48
-
-#define _USE_MEDIAINFO_STRINGID_
-
-#define FEATURE_DYNAMIC_POPUP_HEIGHT
-
-#define USE_CUSTOM_STYLE
-
diff --git a/main/src/common/ivug-string.h b/main/src/common/ivug-string.h
deleted file mode 100755
index ab4458d..0000000
--- a/main/src/common/ivug-string.h
+++ /dev/null
@@ -1,112 +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 __IVUG_STRING_H__
-#define __IVUG_STRING_H__
-
-#include <libintl.h>
-
-/* Original code is in appcore-common.h */
-#define _(str) gettext(str) /**< gettext alias */
-#define gettext_noop(str) (str) /**< keyword for xgettext to extract translatable strings */
-#define N_(str) gettext_noop(str) /**< gettext_noop alias */
-
-
-#define LOCALE_PATH PREFIX"/res/locale" /*TODO!!!*/
-
-#ifndef PACKAGE
-#error PACKAGE is not defined
-#endif
-
-#ifndef LOCALE_PATH
-#error LOCALE_PATH is not defined
-#endif
-
-//string
-#define IVUG_TEXT_DOMAIN PACKAGE
-#define IVUG_LOCALEDIR LOCALE_PATH
-
-// Not yet translated
-#define IDS_NULL _("")
-
-#define IDS_INVALID_IMAGE_FILE (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_POP_INVALID_IMAGE_FILE"))
-#define IDS_PERMISSION_DENIED (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_POP_PERMISSION_DENIED"))
-#define IDS_APPLICATION_NOT_INSTALLED (dgettext("sys_string","IDS_COM_BODY_APPLICATION_NOT_INSTALLED"))
-
-/*#define Details*/
-#define IDS_FORMAT (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_FILE_FORMAT"))
-#define IDS_DATE_CREATED (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_DATE_CREATED"))
-#define IDS_LOCATION (dgettext(IVUG_TEXT_DOMAIN, "IDS_COM_BODY_LOCATION"))
-#define IDS_FILE_LOCATION (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_FILE_LOCATION"))
-#define IDS_RESOLUTION (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_RESOLUTION"))
-#define IDS_LATITUDE (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_LATITUDE"))
-#define IDS_LONGITUDE (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_LONGITUDE"))
-
-#define IDS_N_A (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_N_A"))
-#define IDS_PRINT (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_BODY_PRINT"))
-
-/* Registered string in STMS IV */
-#define IDS_ADDED (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_POP_ADDED"))
-#define IDS_SLIDE_SHOW (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_OPT_SLIDE_SHOW"))
-
-#define IDS_SD_CARD_REMOVED (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_POP_SD_CARD_REMOVED"))
-#define IDS_SET_AS (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_OPT_SET_AS"))
-
-#define IDS_HOME_SCREEN_WALLPAPER (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_HEADER_HOME_SCREEN_WALLPAPER_ABB"))
-#define IDS_LOCK_SCREEN_WALLPAPER (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_HEADER_LOCK_SCREEN_WALLPAPER_ABB"))
-#define IDS_SET_WALLPAPER_FOR_HOME_SCREEN_AND_LOCK_SCREEN (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_POP_SET_WALLPAPER_FOR_HOME_SCREEN_AND_LOCK_SCREEN"))
-#define IDS_HOME_AND_LOCK_SCREEN_WALLPAPER (dgettext(IVUG_TEXT_DOMAIN, "IDS_IV_OPT_HOME_AND_LOCK_SCREEN_WALLPAPER"))
-
-// System string.
-#define IDS_DELETE_MSG (dgettext("sys_string","IDS_COM_POP_DELETE_Q"))
-#define IDS_NAME (dgettext("sys_string", "IDS_COM_BODY_DETAILS_NAME"))
-#define IDS_SIZE (dgettext("sys_string", "IDS_COM_BODY_SIZE"))
-
-#define IDS_COPY (dgettext("sys_string","IDS_COM_BODY_COPY"))
-
-#define IDS_ERROR (dgettext("sys_string","IDS_COM_POP_ERROR"))
-#define IDS_UNKNOWN (dgettext("sys_string", "IDS_COM_BODY_UNKNOWN"))
-
-#define IDS_LOADING (dgettext("sys_string", "IDS_COM_BODY_LOADING"))
-
-#define IDS_BLUETOOTH (dgettext("sys_string", "IDS_COM_BODY_BLUETOOTH"))
-
-#define IDS_CANCEL (dgettext("sys_string", "IDS_COM_SK_CANCEL"))
-#define IDS_DONE (dgettext("sys_string","IDS_COM_SK_DONE"))
-
-#define IDS_SET (dgettext("sys_string","IDS_COM_SK_SET"))
-#define IDS_BACK (dgettext("sys_string","IDS_COM_BODY_BACK"))
-
-#define IDS_OK (dgettext("sys_string","IDS_COM_SK_OK"))
-#define IDS_DELETE (dgettext("sys_string","IDS_COM_BODY_DELETE"))
-#define IDS_DELETED (dgettext("sys_string","IDS_COM_POP_DELETED"))
-
-#define IDS_SAVED (dgettext("sys_string","IDS_COM_POP_SAVED"))
-#define IDS_NO (dgettext("sys_string","IDS_COM_SK_NO"))
-#define IDS_YES (dgettext("sys_string","IDS_COM_SK_YES"))
-
-#define IDS_SUCCESS (dgettext("sys_string", "IDS_COM_POP_SUCCESS"))
-#define IDS_FAILED (dgettext("sys_string", "IDS_COM_POP_FAILED"))
-
-#define IDS_DETAILS (dgettext("sys_string","IDS_COM_BODY_DETAILS"))
-
-#define IDS_CLOSE (dgettext("sys_string", "IDS_COM_BODY_CLOSE"))
-#define IDS_NO_NAME (dgettext("sys_string", "IDS_COM_BODY_NO_NAME"))
-
-#endif // __IVUG_STRING_H__
-
-
diff --git a/main/src/control/ivug-ext-ug.c b/main/src/control/ivug-ext-ug.c
deleted file mode 100755
index e3c5398..0000000
--- a/main/src/control/ivug-ext-ug.c
+++ /dev/null
@@ -1,75 +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 "ivug-ext-ug.h"
-#include "ivug-data.h"
-#include "ivug-popup.h"
-
-#include <ui-gadget.h>
-#include <aul.h>
-#include <appsvc.h>
-#include <Ecore_X.h> // UG_INIT_EFL
-
-//define
-#define VIDEOPLAYER_PKG_NAME "org.tizen.video-player"
-#define BLUETOOTH_PKG_NAME "org.tizen.bluetooth"
-
-#define MIME_TYPE_LEN 255
-
-bool
-ivug_ext_aul_launch(Evas_Object *parent, enum IVUG_EXT_AUL_TYPE type, const char *filepath, void *data)
-{
- if(!filepath)
- {
- MSG_UTIL_ERROR("file path is NULL");
- return false;
- }
- MSG_IMAGEVIEW_HIGH("Creating AUL. type=%d file path =%s", type, filepath);
-
- bundle* b = bundle_create();
- char mime_type[MIME_TYPE_LEN] = {0,};
- aul_get_mime_from_file(filepath, mime_type, sizeof(mime_type));
- MSG_IMAGEVIEW_HIGH("mime type=%s", mime_type);
-
- IV_ASSERT(b!= NULL);
- switch( type )
- {
- case IVUG_EXT_AUL_VIDEOPLAYER:
- bundle_add( b, "path", filepath);
- bundle_add( b, "launching_application", "image_viewer");
- aul_launch_app(VIDEOPLAYER_PKG_NAME, b);
- break;
-
- case IVUG_EXT_AUL_SIMPLE_VIDEOPLAYER:
- bundle_add( b, "path", filepath);
- bundle_add( b, "launching_application", "light_play_view");
-// Camera -> Image Viewer -> Video player, In this case, launching_application bundle's value should be "light_play_view"
-
- aul_launch_app(VIDEOPLAYER_PKG_NAME, b);
- break;
-
- default:
- bundle_free(b);
- return false;
- }
-
- bundle_free(b);
-
- return true;
-}
-
-
diff --git a/main/src/control/ivug-ext-ug.h b/main/src/control/ivug-ext-ug.h
deleted file mode 100755
index dc4a924..0000000
--- a/main/src/control/ivug-ext-ug.h
+++ /dev/null
@@ -1,34 +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 "ivug-common.h"
-#include "ivug-data.h"
-
-#ifndef __IVUG_EXT_UG_H__
-#define __IVUG_EXT_UG_H__
-
-typedef enum IVUG_EXT_AUL_TYPE{
- IVUG_EXT_AUL_NONE = 0x00,
- IVUG_EXT_AUL_VIDEOPLAYER,
- IVUG_EXT_AUL_SIMPLE_VIDEOPLAYER,
-} _ivug_ext_aul_type;
-
-
-bool
-ivug_ext_aul_launch(Evas_Object *parent, enum IVUG_EXT_AUL_TYPE type, const char *filepath, void *data);
-
-#endif //__IVUG_EXT_UG_H__
diff --git a/main/src/control/ivug-main.c b/main/src/control/ivug-main.c
deleted file mode 100755
index 3efb9c8..0000000
--- a/main/src/control/ivug-main.c
+++ /dev/null
@@ -1,258 +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 "ivug-common.h"
-#include "ivug-main.h"
-#include "ivug-data.h"
-#include "ivug-util.h"
-
-
-#include <ui-gadget-module.h> // ug_destroy_me
-#include <media-svc.h>
-
-#define MAX_INSTALNCE (5)
-
-typedef struct
-{
- struct ui_gadget *ug; // ug handle
-
- Evas_Object *parent_win;
-// EFL theme
- Elm_Theme *th;
-
-// Window Geometry
- int win_w, win_h; //size
-
- MediaSvcHandle *media_svc_hadle;
-
-} AppData;
-
-static Eina_List *ContextList = NULL;
-
-Elm_Theme*
-gGetSystemTheme(void)
-{
- AppData *ugContext;
- ugContext = eina_list_data_get(ContextList);
-
- IV_ASSERT(ugContext != NULL);
-
- return ugContext->th;
-}
-
-void
-gGetSystemDimension(int *w, int *h)
-{
- AppData *ugContext;
- ugContext = eina_list_data_get(ContextList);
-
- IV_ASSERT(ugContext != NULL);
- IV_ASSERT(w != NULL);
- IV_ASSERT(h != NULL);
-
- *w = ugContext->win_w;
- *h = ugContext->win_h;
-}
-
-int gGetScreenWidth()
-{
- AppData *ugContext;
- ugContext = eina_list_data_get(ContextList);
-
- IV_ASSERT(ugContext != NULL);
-
- return ugContext->win_w;
-
-}
-
-int gGetScreenHeight()
-{
- AppData *ugContext;
- ugContext = eina_list_data_get(ContextList);
-
- IV_ASSERT(ugContext != NULL);
-
- return ugContext->win_h;
-
-}
-
-struct ui_gadget *
-gGetUGHandle(void)
-{
- AppData *ugContext;
- ugContext = eina_list_data_get(ContextList);
-
- IV_ASSERT(ugContext != NULL);
-
- MSG_IMAGEVIEW_HIGH("Get ug handle = 0x%08x", ugContext->ug);
-
- return ugContext->ug;
-}
-
-MediaSvcHandle *
-gGetMediaSVCHandle(void)
-{
- AppData *ugContext;
- ugContext = eina_list_data_get(ContextList);
-
- IV_ASSERT(ugContext != NULL);
-
- return ugContext->media_svc_hadle;
-}
-
-#define IVUG_NAVIFRAME_NAME EDJ_PATH"/ivug-naviframe.edj"
-#define IVUG_TOOLLBAR_NAME EDJ_PATH"/ivug-toolbar.edj"
-#define IVUG_BUTTON_NAME EDJ_PATH"/ivug-button.edj"
-#define IVUG_SELECTION_INFO_NAME EDJ_PATH"/ivug-selectioninfo.edj"
-#define IVUG_GENLIST EDJ_PATH"/ivug-genlist.edj"
-
-static char *edj[] = {
- IVUG_NAVIFRAME_NAME,
- IVUG_TOOLLBAR_NAME,
- IVUG_BUTTON_NAME,
- IVUG_SELECTION_INFO_NAME,
- IVUG_GENLIST,
- NULL,
-};
-
-bool
-ivug_main_init(struct ui_gadget *ug)
-{
- AppData *Context = malloc(sizeof(AppData));
- if(Context == NULL)
- {
- MSG_IVUG_ERROR("Cannot allock memory");
- return false;
- }
-
- Context->ug = ug;
- Context->parent_win = ug_get_window();
-
-//get window width, height
- int w, h;
-
- evas_object_geometry_get(Context->parent_win, NULL, NULL, &w, &h);
- MSG_IMAGEVIEW_HIGH("Screen WH(%dx%d)", w, h);
-// ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
- Context->win_w = w;
- Context->win_h = h;
-
-
- int i = 0;
-
- Context->th = elm_theme_new();
-
- IV_ASSERT(Context->th != NULL);
-
- elm_theme_ref_set(Context->th, NULL);
-
- for ( i = 0; edj[i] != NULL; i++)
- {
- elm_theme_extension_add(Context->th, edj[i]);
- }
-
- ContextList = eina_list_prepend(ContextList, Context);
-
- MSG_IVUG_HIGH("Append to list. Context=0x%08x", Context);
-
-//media browser service.
- int err = media_svc_connect(&(Context->media_svc_hadle));
- if (err == MB_SVC_ERROR_NONE)
- {
- bindtextdomain(IVUG_TEXT_DOMAIN, IVUG_LOCALEDIR); //bind text domain
- return TRUE;
- }
-
-/**** Error routine ****/
- MSG_SDATA_WARN("media service init error=%d", err);
-
- Context = eina_list_data_get(ContextList);
- ContextList = eina_list_remove_list(ContextList, ContextList);
-
- if(Context->th)
- {
- int i = 0;
- for ( i = 0; edj[i] != NULL; i++)
- {
- elm_theme_extension_del(Context->th, edj[i]);
- }
-
- elm_theme_free(Context->th);
- }
-
- MSG_IVUG_HIGH("Remove from list. Context=0x%08x, ug=0x%08x", Context, Context->ug);
-
- free(Context);
-
- return false;
-}
-
-
-bool
-ivug_main_deinit(struct ui_gadget *ug)
-{
- AppData *Context;
-
- Eina_List *l = NULL;
- Eina_List *l_next = NULL;
-
- EINA_LIST_FOREACH_SAFE(ContextList, l, l_next, Context)
- {
- if(Context == NULL)
- {
- MSG_SDATA_ERROR("Context is NULL");
- return false;
- }
- if (Context->ug == ug)
- {
- ContextList = eina_list_remove_list(ContextList, l);
- break;
- }
- }
-
- //media browser service.
- int err = media_svc_disconnect(Context->media_svc_hadle);
- if (err != MB_SVC_ERROR_NONE)
- {
- MSG_SDATA_WARN("media service finalize error=%d", err);
- // go through
- }
- else
- {
- MSG_SDATA_HIGH("MInfo finalized");
- }
-
- if(Context->th)
- {
- int i = 0;
- for ( i = 0; edj[i] != NULL; i++)
- {
- elm_theme_extension_del(Context->th, edj[i]);
- }
- elm_theme_free(Context->th);
- }
-
- MSG_IVUG_HIGH("Remove from list. Context=0x%08x, ug=0x%08x", Context, Context->ug);
-
- free(Context);
-
- return true;
-}
-
-
-
-
diff --git a/main/src/control/ivug-main.h b/main/src/control/ivug-main.h
deleted file mode 100755
index 86d9837..0000000
--- a/main/src/control/ivug-main.h
+++ /dev/null
@@ -1,44 +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 __IVUG_MAIN_H__
-#define __IVUG_MAIN_H__
-
-#include "ivug-common.h"
-#include <ui-gadget.h>
-#include <media-svc.h>
-
-bool
-ivug_main_deinit(struct ui_gadget *ug);
-
-bool
-ivug_main_init(struct ui_gadget *ug);
-
-Elm_Theme*
-gGetSystemTheme(void);
-
-struct ui_gadget *
-gGetUGHandle(void);
-
-MediaSvcHandle *
-gGetMediaSVCHandle(void);
-
-int gGetScreenWidth();
-int gGetScreenHeight();
-
-
-#endif //__IVUG_MAIN_H__
diff --git a/main/src/control/ivug-parameter.c b/main/src/control/ivug-parameter.c
index 5717181..5bc94c7 100755
--- a/main/src/control/ivug-parameter.c
+++ b/main/src/control/ivug-parameter.c
@@ -1,26 +1,27 @@
-/*
- * 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 <bundle.h>
+/*
+ * 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 <string.h>
#include "ivug-common.h"
#include "ivug-debug.h"
#include "ivug-parameter.h"
+#include "ivug-file-info.h"
+
+#include "ivug-db.h"
//bundle key
#define IVUG_BUNDLE_KEY_VIEW_MODE "View Mode"
@@ -30,6 +31,7 @@
#define IVUG_BUNDLE_KEY_VIEW_BY "View By"
#define IVUG_BUNDLE_KEY_INDEX "Index"
#define IVUG_BUNDLE_KEY_SORT_BY "Sort By"
+#define IVUG_BUNDLE_KEY_FOOTSTEPS "Footsteps"
#define IVUG_BUNDLE_KEY_MAX_LONGITUDE "LON_MAX"
#define IVUG_BUNDLE_KEY_MIN_LONGITUDE "LON_MIN"
@@ -38,11 +40,28 @@
#define IVUG_BUNDLE_KEY_SETAS_TYPE "Setas type"
+#define IVUG_BUNDLE_KEY_RESOLUTION "Resolution"
+#define IVUG_BUNDLE_KEY_FIXED_RATIO "Fixed ratio"
+
#define IVUG_BUNDLE_KEY_MEDIA_TYPE "Media type"
+#define IVUG_BUNDLE_KEY_MSS_SERVER_ID "MSS_ServerID"
+#define IVUG_BUNDLE_KEY_MSS_SORT_TYPE "MSS_Sort_type"
+
+#define IVUG_BUNDLE_KEY_STANDALONE "Standalone"
+
+#define IVUG_BUNDLE_KEY_CONTACT_ID "Contact id"
+
//default values
#define IVUG_DEFAULT_MODE IVUG_MODE_SINGLE
-#define IVUG_DEFAULT_INDEX (-1)
+#define IVUG_DEFAULT_INDEX (1) // First item
+
+static inline
+void _ivug_free(char **val)
+{
+ free(*val);
+ *val = NULL;
+}
static ivug_mode
_get_view_mode(ivug_parameter* data, const char* val)
@@ -56,6 +75,8 @@ _get_view_mode(ivug_parameter* data, const char* val)
#define IVUG_BUNDLE_VALUE_VIEW_MODE_CAMERA "CAMERA"
#define IVUG_BUNDLE_VALUE_VIEW_MODE_DISPLAY "DISPLAY"
#define IVUG_BUNDLE_VALUE_VIEW_MODE_SETAS "SETAS"
+#define IVUG_BUNDLE_VALUE_VIEW_MODE_SLIDESHOW "SLIDESHOW"
+
int len = strlen(val);
if (strncmp(val, IVUG_BUNDLE_VALUE_VIEW_MODE_NORMAL, len) == 0
@@ -91,6 +112,14 @@ _get_view_mode(ivug_parameter* data, const char* val)
data->view_by = IVUG_VIEW_BY_FILE;
return IVUG_MODE_SETAS;
}
+ else if(strncmp(val, IVUG_BUNDLE_VALUE_VIEW_MODE_SLIDESHOW, len) == 0)
+ {
+ if(data->view_by != IVUG_VIEW_BY_ALL)
+ {
+ data->view_by = IVUG_VIEW_BY_FOLDER;
+ }
+ return IVUG_MODE_SLIDESHOW;
+ }
MSG_IVUG_ERROR("Invalid mode : %s", val);
return IVUG_MODE_INVAILD;
@@ -102,8 +131,10 @@ _get_view_by(const char* val)
{
//bundle value
#define IVUG_BUNDLE_VALUE_VIEW_BY_ALL "All"
+#define IVUG_BUNDLE_VALUE_VIEW_BY_FAVORITES "Favorites"
#define IVUG_BUNDLE_VALUE_VIEW_BY_FLODER "By Folder"
#define IVUG_BUNDLE_VALUE_VIEW_BY_PLACES "Places"
+#define IVUG_BUNDLE_VALUE_VIEW_BY_CONTACT_ID "Contact id"
IV_ASSERT(val != NULL);
@@ -121,6 +152,10 @@ _get_view_by(const char* val)
{
return IVUG_VIEW_BY_PLACES;
}
+ else if (strncmp(val, IVUG_BUNDLE_VALUE_VIEW_BY_CONTACT_ID, len) == 0)
+ {
+ return IVUG_VIEW_BY_CONTACT_ID;
+ }
MSG_IVUG_ERROR("Invalid view by : %s", val);
@@ -135,6 +170,10 @@ _get_setas_type(const char* val)
IV_ASSERT(val != NULL);
#define IVUG_BUNDLE_VALUE_SETAS_UG_WALLPAPER "Wallpaper"
+#define IVUG_BUNDLE_VALUE_SETAS_UG_CALLERID "CallerID"
+#define IVUG_BUNDLE_VALUE_SETAS_UG_VIDEO_CALLEID "VideoCallID"
+#define IVUG_BUNDLE_VALUE_SETAS_UG_CROP "Crop"
+#define IVUG_BUNDLE_VALUE_SETAS_UG_WALLPAPER_ONLY "Wallpaper only"
int len = strlen(val);
@@ -142,6 +181,22 @@ _get_setas_type(const char* val)
{
return IVUG_SET_AS_UG_TYPE_WALLPAPER;
}
+ else if (strncmp(val, IVUG_BUNDLE_VALUE_SETAS_UG_WALLPAPER_ONLY, len) == 0 )
+ {
+ return IVUG_SET_AS_UG_TYPE_WALLPAPER_ONLY;
+ }
+ else if (strncmp(val, IVUG_BUNDLE_VALUE_SETAS_UG_CALLERID, len) == 0)
+ {
+ return IVUG_SET_AS_UG_TYPE_CALLER_ID;
+ }
+ else if (strncmp(val, IVUG_BUNDLE_VALUE_SETAS_UG_VIDEO_CALLEID, len) == 0)
+ {
+ return IVUG_SET_AS_UG_TYPE_VIDEO_CALL_ID;
+ }
+ else if (strncmp(val, IVUG_BUNDLE_VALUE_SETAS_UG_CROP, len) == 0)
+ {
+ return IVUG_SET_AS_UG_TYPE_CROP;
+ }
MSG_IVUG_ERROR("Invalid setas ug type : %s", val);
return IVUG_SET_AS_UG_TYPE_INVALID;
@@ -174,38 +229,54 @@ _get_media_type(const char* val)
return IVUG_MEDIA_TYPE_MAX;
}
+static bool _data_print(service_h service, const char *key, void *user_data)
+{
+ char *value;
+
+ service_get_extra_data(service, key, &value);
+ MSG_IVUG_HIGH(" %s : %s", key, value);
-static void
-_bundle_print(const char *key, const char *val, void *data)
+ free(value);
+
+ return true;
+}
+
+static void _print_service_data(service_h service)
{
- MSG_IVUG_HIGH(" %s:%s",key, val);
+ int ret = service_foreach_extra_data(service, _data_print, NULL);
+
+ if(SERVICE_ERROR_NONE != ret)
+ {
+ MSG_IVUG_ERROR("service_foreach_extra_data ERROR");
+ }
}
//parsing bundle
ivug_parameter*
-ivug_param_create_from_bundle(bundle* b)
+ivug_param_create_from_bundle(service_h service)
{
- if (b == NULL)
+ if (service == NULL)
{
MSG_IVUG_WARN("bundle value is NULL");
return NULL;
}
- int nbundle_cnt = bundle_get_count(b);
-
- if ( nbundle_cnt == 0 )
- {
- MSG_IVUG_WARN("bundle count is %d", nbundle_cnt);
- return NULL;
- }
-
//print key and value.
MSG_IVUG_HIGH("**********************************");
- MSG_IVUG_HIGH(" Bundle Count = %d", nbundle_cnt);
- bundle_iterate(b, _bundle_print, NULL);
+ _print_service_data(service);
MSG_IVUG_HIGH("**********************************");
+ char *path = NULL;
+ service_get_uri(service, &path); // app gadget
+ if(path)
+ {
+ MSG_IMAGEVIEW_ERROR("App gadget launched %s", path);
+ service_add_extra_data (service, "Path", path);
+ service_add_extra_data (service, "View Mode", "SINGLE");
+ _ivug_free(&path);
+ }
+
//parsing param
ivug_parameter* data = (ivug_parameter*)calloc(1, sizeof(ivug_parameter));
@@ -215,15 +286,31 @@ ivug_param_create_from_bundle(bundle* b)
return NULL;
}
+// appsvc
+ char* standalone = NULL;
+
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_STANDALONE, &standalone);
+ if (standalone != NULL)
+ {
+ data->bStandalone = true;
+ _ivug_free(&standalone);
+ }
+ else
+ {
+ data->bStandalone = false;
+ }
+
// View By
- const char* szViewBy = NULL;
+ char* szViewBy = NULL;
- szViewBy = bundle_get_val(b, IVUG_BUNDLE_KEY_VIEW_BY);
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_VIEW_BY, &szViewBy);
if (szViewBy != NULL)
{
MSG_IVUG_HIGH("View By = %s", szViewBy);
data->view_by = _get_view_by(szViewBy);
+
+ _ivug_free(&szViewBy);
}
else
{
@@ -232,13 +319,14 @@ ivug_param_create_from_bundle(bundle* b)
}
//parse image index at album
- const char* val = NULL;
+ char* val = NULL;
- val = bundle_get_val(b, IVUG_BUNDLE_KEY_INDEX);
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_INDEX, &val);
if(val)
{
- data->start_index = atoi(val);
+ data->start_index = ivug_atoi(val);
MSG_IVUG_HIGH("Slide Index = %d", data->start_index);
+ _ivug_free(&val);
}
else
{
@@ -247,14 +335,14 @@ ivug_param_create_from_bundle(bundle* b)
}
//parse mode
- const char* szMode = NULL;
-
- szMode = bundle_get_val(b, IVUG_BUNDLE_KEY_VIEW_MODE);
+ char* szMode = NULL;
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_VIEW_MODE, &szMode);
if (szMode != NULL)
{
data->mode = _get_view_mode(data, szMode);
MSG_IVUG_HIGH("View mode is %s(%d)", szMode, data->mode);
+ _ivug_free(&szMode);
}
else
{
@@ -263,19 +351,25 @@ ivug_param_create_from_bundle(bundle* b)
}
//parse path
- const char* szFilePath = NULL;
-
- szFilePath = bundle_get_val(b, IVUG_BUNDLE_KEY_PATH);
+ char* szFilePath = NULL;
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_PATH, &szFilePath);
if ( szFilePath != NULL )
{
data->filepath = strdup(szFilePath);
MSG_IVUG_HIGH("Current File = %s", data->filepath);
+ _ivug_free(&szFilePath);
}
+ else
+ {
+ MSG_IVUG_ERROR("File path is NULL");
- //parse album id -album id is cluster id of media service
- val = bundle_get_val(b, IVUG_BUNDLE_KEY_ALBUM_IDX);
+ ivug_param_delete(data);
+ return NULL;
+ }
+ //parse album id -album id is cluster id of media service
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_ALBUM_IDX, &val);
if(val && data->view_by != IVUG_VIEW_BY_ALL)
{
data->album_id = uuid_getuuid(val);
@@ -286,6 +380,9 @@ ivug_param_create_from_bundle(bundle* b)
data->album_id = INVALID_UUID;
MSG_IVUG_WARN("Album index is NULL");
}
+ if(val)
+ _ivug_free(&val);
+
if (data->mode == IVUG_MODE_CAMERA)
{
/*
@@ -296,19 +393,28 @@ ivug_param_create_from_bundle(bundle* b)
**********************************
*/
// Get album id from file path.
- UUID cluster_id = ivug_get_album_id_from_filepath(data->filepath);
+ media_handle m_handle = ivug_db_get_folder_handle(ecore_file_dir_get(data->filepath));
+ if(m_handle == NULL)
+ {
+ MSG_IVUG_FATAL("View by Folder. but media handle is NULL" );
+ ivug_param_delete(data);
+ return NULL;
+ }
+
+ data->album_id = ivug_db_get_folder_id(m_handle);
- data->album_id = uuid_assign(cluster_id);
+ ivug_db_destroy_folder_handle(m_handle);
MSG_IVUG_HIGH("Get Album ID(%s) from file %s", uuid_getchar(data->album_id), data->filepath);
}
// TODO : Check parameter integrity
- val = bundle_get_val(b, IVUG_BUNDLE_KEY_MEDIA_TYPE);
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_MEDIA_TYPE, &val);
if(val != NULL)
{
data->media_type = _get_media_type(val);
MSG_IVUG_HIGH("Media Type=%s(%d)", val, data->media_type);
+ _ivug_free(&val);
}
else
{
@@ -318,59 +424,114 @@ ivug_param_create_from_bundle(bundle* b)
long long int m = 0;
long int e = 0;
- val = bundle_get_val(b, IVUG_BUNDLE_KEY_MAX_LONGITUDE);
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_MAX_LONGITUDE, &val);
if(val != NULL)
{
eina_convert_atod(val, strlen(val), &m, &e);
data->max_longitude = ldexp((double)m, e);
MSG_IVUG_HIGH("Max Longitude =%f", data->max_longitude);
+ _ivug_free(&val);
}
else
{
MSG_IVUG_MED("Max Longitude is not specified.");
}
- val = bundle_get_val(b, IVUG_BUNDLE_KEY_MIN_LONGITUDE);
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_MIN_LONGITUDE, &val);
if(val != NULL)
{
eina_convert_atod(val, strlen(val), &m, &e);
data->min_longitude = ldexp((double)m, e);
MSG_IVUG_HIGH("Min Longitude =%f", data->min_longitude);
+ _ivug_free(&val);
}
else
{
MSG_IVUG_MED("Min Longitude is not specified.");
}
- val = bundle_get_val(b, IVUG_BUNDLE_KEY_MAX_LATITUDE);
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_MAX_LATITUDE, &val);
if(val != NULL)
{
eina_convert_atod(val, strlen(val), &m, &e);
data->max_latitude = ldexp((double)m, e);
MSG_IVUG_HIGH("Max Latitude =%f", data->max_latitude);
+ _ivug_free(&val);
}
else
{
MSG_IVUG_MED("Max Latitude is not specified.");
}
- val = bundle_get_val(b, IVUG_BUNDLE_KEY_MIN_LATITUDE);
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_MIN_LATITUDE, &val);
if(val != NULL)
{
eina_convert_atod(val, strlen(val), &m, &e);
data->min_latitude = ldexp((double)m, e);
MSG_IVUG_HIGH("Min Latitude =%f", data->min_latitude);
+ _ivug_free(&val);
}
else
{
MSG_IVUG_MED("Min Latitude is not specified.");
}
- val = bundle_get_val(b, IVUG_BUNDLE_KEY_SETAS_TYPE);
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_SETAS_TYPE, &val);
if (val)
{
MSG_IVUG_HIGH("SetAs UG Type=%s", val);
data->setas_type = _get_setas_type(val);
+
+ char* resolution = NULL;
+
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_RESOLUTION, &resolution);
+ if(resolution)
+ {
+ sscanf(resolution, "%5dx%5d", &(data->width), &(data->height));
+ MSG_IVUG_HIGH("Rectangle width = %d, height = %d", data->width, data->height);
+ if(data->width == 0 || data->height == 0)
+ {
+ MSG_IVUG_ERROR("Resolution is invalid");
+ _ivug_free(&resolution);
+ _ivug_free(&val);
+ ivug_param_delete(data);
+ return NULL;
+ }
+ }
+ else
+ {
+ /* TODO : remove default value, width & height needed */
+ data->width = 100;
+ data->height = 100;
+ MSG_IVUG_HIGH("Rectangle ratio is not set. Set as default : %dx%d", data->width, data->height);
+ }
+
+ data->bRatioFix = false;
+ char* bRatioFix = NULL;
+
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_FIXED_RATIO, &bRatioFix);
+ if(bRatioFix)
+ {
+ MSG_IVUG_HIGH("Fixed ratio=%s", bRatioFix);
+ if(strcmp(bRatioFix, "TRUE") == 0)
+ {
+ data->bRatioFix = true;
+ }
+ _ivug_free(&bRatioFix);
+ }
+ _ivug_free(&val);
+ }
+
+ data->footsteps = false; /* default */
+ service_get_extra_data (service, IVUG_BUNDLE_KEY_FOOTSTEPS, &val);
+ if (val)
+ {
+ MSG_IVUG_HIGH("Footsteps=%s", val);
+ if(strcmp(val, "TRUE") == 0)
+ {
+ data->footsteps = true;
+ }
+ _ivug_free(&val);
}
return data;
diff --git a/main/src/control/ivug-parameter.h b/main/src/control/ivug-parameter.h
index 1de14c4..7a97336 100755
--- a/main/src/control/ivug-parameter.h
+++ b/main/src/control/ivug-parameter.h
@@ -1,94 +1,85 @@
-/*
- * 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.
- */
-
+/*
+ * 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 __IVUG_PARAMETER_H__
#define __IVUG_PARAMETER_H__
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#include <stdbool.h>
-#include <bundle.h>
+#include <app.h>
+#include "ivug-datatypes.h"
typedef enum {
IVUG_MODE_INVAILD = 0x00,
- IVUG_MODE_NORMAL, // normal
+ IVUG_MODE_NORMAL,
IVUG_MODE_SINGLE, // just show one slide
IVUG_MODE_DISPLAY, // from "take a photo" in messenger
IVUG_MODE_FILE, // file viewer(can flick)
IVUG_MODE_CAMERA, // camera(can flick)
IVUG_MODE_SETAS, // SetAs in setting menu.
+ IVUG_MODE_SLIDESHOW, // Slideshow
} ivug_mode;
-typedef enum {
- IVUG_VIEW_BY_INVAILD = 0x00,
- IVUG_VIEW_BY_FILE,
- IVUG_VIEW_BY_ALL,
- IVUG_VIEW_BY_FOLDER,
- IVUG_VIEW_BY_PLACES,
-} ivug_view_by;
-
//set as ug
typedef enum {
IVUG_SET_AS_UG_TYPE_INVALID = 0x00,
IVUG_SET_AS_UG_TYPE_WALLPAPER,
+ IVUG_SET_AS_UG_TYPE_CALLER_ID,
+ IVUG_SET_AS_UG_TYPE_VIDEO_CALL_ID,
+ IVUG_SET_AS_UG_TYPE_CROP, // For OSP
+ IVUG_SET_AS_UG_TYPE_WALLPAPER_ONLY,
IVUG_SET_AS_UG_TYPE_MAX,
} ivug_setas_type;
-typedef enum {
- IVUG_MEDIA_TYPE_ALL = 0x00, //default value
- IVUG_MEDIA_TYPE_IMAGE,
- IVUG_MEDIA_TYPE_VIDEO,
- IVUG_MEDIA_TYPE_MAX,
-} ivug_media_type;
-
-typedef enum {
- IVUG_MEDIA_SORT_NONE = 0x00, /**< No sort */
- IVUG_MEDIA_ASC_BY_NAME, /**< Ascending sort as file name */
- IVUG_MEDIA_DESC_BY_NAME, /**< Descending sort as file name */
- IVUG_MEDIA_ASC_BY_DATE, /**< Ascending sort as created date */
- IVUG_MEDIA_DESC_BY_DATE, /**< Descending sort as created date */
-} ivug_sort_type;
-
typedef struct {
ivug_mode mode;
+ ivug_setas_type setas_type; // Only needed when mode is IVUG_MODE_SETAS
+
+ bool bStandalone; // launched by appsvc
+
+ ivug_view_by view_by;
char* filepath;
UUID album_id; //cluster id of media service
- ivug_view_by view_by;
- ivug_setas_type setas_type;
ivug_media_type media_type;
ivug_sort_type sort_type; // TODO : extract from here. sort type can be used in case of default
/* for places view */
+ bool footsteps;
double max_longitude;
double min_longitude;
double max_latitude;
double min_latitude;
+ /* for set as view crop box*/
+ unsigned int width;
+ unsigned int height;
+ bool bRatioFix;
+
int start_index;
} ivug_parameter;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
ivug_parameter*
-ivug_param_create_from_bundle(bundle* b);
+ivug_param_create_from_bundle(service_h service);
void
ivug_param_delete(ivug_parameter* data);
diff --git a/main/src/control/ivug-uuid.c b/main/src/control/ivug-uuid.c
deleted file mode 100755
index b2c8eeb..0000000
--- a/main/src/control/ivug-uuid.c
+++ /dev/null
@@ -1,94 +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 "ivug-uuid.h"
-
-UUID uuid_assign(UUID id)
-{
-#ifdef _USE_MEDIAINFO_STRINGID_
- if ( id == NULL )
- return NULL;
-
- return strdup(id);
-#else
- return id;
-#endif
-}
-
-
-void uuid_free(UUID id)
-{
-#ifdef _USE_MEDIAINFO_STRINGID_
- if ( id != NULL )
- free((void *)id);
-#endif
-}
-
-
-int uuid_compare(UUID id1, UUID id2)
-{
-#ifdef _USE_MEDIAINFO_STRINGID_
- return strcmp(id1, id2);
-#else
- return id1 - id2;
-#endif
-}
-
-const char *uuid_getchar(UUID id)
-{
-#ifdef _USE_MEDIAINFO_STRINGID_
- if ( id == NULL )
- {
- return "NULL";
- }
-
- return id;
-#else
- {
- static char buffer[255];
-
- sprintf(buffer, "%d", id);
-
- return buffer;
- }
-#endif
-
-}
-
-
-UUID uuid_getuuid(const char *szID)
-{
- if ( szID == NULL )
- {
- return INVALID_UUID;
- }
-
-#ifdef _USE_MEDIAINFO_STRINGID_
- return strdup(szID);
-#else
- return atoi(szID);
-#endif
-
-}
-
-bool uuid_is_valid(UUID id)
-{
- return (id != INVALID_UUID) ? true : false;
-}
-
-
-
diff --git a/main/src/control/ivug-uuid.h b/main/src/control/ivug-uuid.h
deleted file mode 100755
index e90bf6b..0000000
--- a/main/src/control/ivug-uuid.h
+++ /dev/null
@@ -1,52 +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 __IVUG_UUID_H__
-#define __IVUG_UUID_H__
-
-#include "ivug-common.h"
-#include <stdbool.h>
-
-#ifdef _USE_MEDIAINFO_STRINGID_
- #define INVALID_UUID ((UUID)NULL)
-#else
- #define INVALID_UUID ((UUID)-1)
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-UUID uuid_assign(UUID id);
-
-void uuid_free(UUID id);
-
-int uuid_compare(UUID id1, UUID id2);
-
-const char *uuid_getchar(UUID id);
-
-UUID uuid_getuuid(const char *szID);
-
-bool uuid_is_valid(UUID id);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __IVUG_UUID_H__
-
diff --git a/main/src/data/ivug-data-filter.c b/main/src/data/ivug-data-filter.c
deleted file mode 100755
index 754a723..0000000
--- a/main/src/data/ivug-data-filter.c
+++ /dev/null
@@ -1,101 +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 "ivug-common.h"
-#include "ivug-data-filter.h"
-
-List_Filter *ivug_data_filter_create(const ivug_parameter *param)
-{
- IV_ASSERT(param != NULL);
-
- List_Filter *filter = calloc(1, sizeof(List_Filter));
-
- IV_ASSERT(filter != NULL);
-
- filter->view_by = param->view_by;
- filter->media_type = param->media_type;
- filter->sort_type = param->sort_type;
-
- MSG_SDATA_HIGH("param->view_by is %d", param->view_by);
- switch(param->view_by)
- {
- case IVUG_VIEW_BY_PLACES:
- filter->place.max_longitude = param->max_longitude;
- filter->place.min_longitude = param->min_longitude;
- filter->place.max_latitude = param->max_latitude;
- filter->place.min_latitude = param->min_latitude;
- break;
- case IVUG_VIEW_BY_FILE:
- filter->file_path = strdup(param->filepath);
- break;
- case IVUG_VIEW_BY_ALL:
- filter->album_id = uuid_assign(param->album_id);
- break;
-
- case IVUG_VIEW_BY_FOLDER:
- filter->album_id = uuid_assign(param->album_id);
- break;
-
- case IVUG_VIEW_BY_INVAILD:
- default:
- MSG_SDATA_WARN("Invalid ViewBy : %d", param->view_by);
- break;
-
- }
-
- return filter;
-
-}
-
-void ivug_data_filter_delete(List_Filter *filter)
-{
- IV_ASSERT(filter != NULL);
-
- MSG_SDATA_HIGH("Removing filter. ViewBy=%d", filter->view_by);
-
- switch(filter->view_by)
- {
- case IVUG_VIEW_BY_PLACES:
- break;
-
- case IVUG_VIEW_BY_FILE:
- if ( filter->file_path )
- {
- free(filter->file_path);
- }
- break;
- case IVUG_VIEW_BY_ALL:
- uuid_free(filter->album_id);
- break;
-
- case IVUG_VIEW_BY_FOLDER:
- uuid_free(filter->album_id);
-
- break;
-
- case IVUG_VIEW_BY_INVAILD:
- default:
- MSG_SDATA_WARN("Invalid ViewBy : %d", filter->view_by);
- break;
- }
-
-
- free(filter);
-}
-
-
-
diff --git a/main/src/data/ivug-data-filter.h b/main/src/data/ivug-data-filter.h
deleted file mode 100755
index e4969de..0000000
--- a/main/src/data/ivug-data-filter.h
+++ /dev/null
@@ -1,56 +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 __IVUG_DATA_FILTER_H__
-#define __IVUG_DATA_FILTER_H__
-
-#include "ivug-parameter.h"
-
-typedef struct {
- ivug_view_by view_by;
- ivug_media_type media_type;
- ivug_sort_type sort_type;
-
- union { /* CAUTION : Union type. check view_by variable before free()*/
- char *file_path;
- struct {
- double max_longitude;
- double min_longitude;
- double max_latitude;
- double min_latitude;
- } place;
-
- UUID album_id; // Cluster id
- };
-
-} List_Filter;
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-List_Filter *ivug_data_filter_create(const ivug_parameter *param);
-void ivug_data_filter_delete(List_Filter *filter);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif // __IVUG_DATA_FILTER_H__
-
diff --git a/main/src/data/ivug-data-list.c b/main/src/data/ivug-data-list.c
deleted file mode 100755
index 697b158..0000000
--- a/main/src/data/ivug-data-list.c
+++ /dev/null
@@ -1,282 +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 "ivug-main.h"
-#include "ivug-common.h"
-
-#include "ivug-data-priv.h"
-
-// List
-static int
-_ivug_list_count_cb(Mitem* item, void* user_data )
-{
- int *count = (int *)user_data;
-
- (*count)++;
-
- return 0;
-}
-
-//Eina List Function.
-static int
-_ivug_list_mitem_cb(Mitem* item, void* user_data )
-{
- IV_ASSERT(user_data != NULL);
- Eina_List **list = (Eina_List **)user_data;
-
- *list = eina_list_prepend(*list, item);
-
- return 0;
-}
-
-
-Eina_List *
-ivug_list_load_items(List_Filter *filter, int stp, int endp)
-{
- IV_ASSERT(filter != NULL);
-
- Eina_List *item_list = NULL;
-
- if (filter->view_by == IVUG_VIEW_BY_FILE)
- {
- Eina_List *list = NULL;
- Media_Data *mData = ivug_alloc_mediadata_from_filepath(filter->file_path);
-
- list = eina_list_append(list, mData);
- return list;
- }
-
-// TODO : Check idx validation.
- minfo_item_filter item_filter = {0, }; //create filter
-
- switch(filter->media_type)
- {
- case IVUG_MEDIA_TYPE_IMAGE:
- item_filter.file_type = MINFO_ITEM_IMAGE;
- break;
- case IVUG_MEDIA_TYPE_VIDEO:
- item_filter.file_type = MINFO_ITEM_VIDEO;
- break;
- case IVUG_MEDIA_TYPE_ALL:
- item_filter.file_type = MINFO_ITEM_IMAGE | MINFO_ITEM_VIDEO;
- break;
- default:
- MSG_SITEM_FATAL("Invalid media type : %d", filter->media_type);
- return NULL;
- break;
- }
-
- item_filter.favorite = MINFO_MEDIA_FAV_ALL;
-
- if(filter->view_by == IVUG_VIEW_BY_PLACES)
- {
- item_filter.sort_type = MINFO_MEDIA_SORT_BY_NAME_ASC;
- }
- else
- {
- item_filter.sort_type = MINFO_MEDIA_SORT_BY_DATE_DESC; //MINFO_MEDIA_SORT_BY_NAME_ASC; //minfo_media_sort_type
- }
-
- item_filter.start_pos = stp;
- item_filter.end_pos = endp;
- item_filter.with_meta = false;
-
- int ret = MB_SVC_ERROR_NONE;
-
- switch(filter->view_by)
- {
- case IVUG_VIEW_BY_FOLDER:
- ret = minfo_get_item_list(gGetMediaSVCHandle(), filter->album_id, item_filter, _ivug_list_mitem_cb, &item_list);
- break;
-
- case IVUG_VIEW_BY_ALL:
- ret = minfo_get_all_item_list(gGetMediaSVCHandle(), MINFO_CLUSTER_TYPE_LOCAL_ALL, item_filter, _ivug_list_mitem_cb, &item_list);
- break;
-
- case IVUG_VIEW_BY_PLACES:
- ret = minfo_get_geo_item_list(gGetMediaSVCHandle(), INVALID_UUID, MINFO_CLUSTER_TYPE_LOCAL_ALL, item_filter,
- filter->place.min_longitude, filter->place.max_longitude,
- filter->place.min_latitude, filter->place.max_latitude,
- _ivug_list_mitem_cb, &item_list); // NULL means query all folder
- break;
- default:
- MSG_SDATA_FATAL("Invalid Mode=%d", filter->view_by);
- return NULL;
- }
-
- if ( ret != MB_SVC_ERROR_NONE )
- {
- MSG_SDATA_ERROR("[%s] Error=%d VieBy=%d", __func__, ret, filter->view_by);
- return NULL;
- }
-
-// Creating media_list.
- Eina_List *slide_list = NULL;
-
- Eina_List *item;
- Mitem* mitem;
-
- Media_Data *mdata = NULL;
-
- EINA_LIST_FOREACH(item_list, item, mitem)
- {
- mdata = ivug_alloc_mediadata_from_mitem(mitem);
-
- IV_ASSERT(mdata != NULL);
-
- MSG_SDATA_LOW("Add Mdata. Mdata=0x%08x %s", mdata, mdata->filepath);
- slide_list = eina_list_prepend(slide_list, mdata);
- }
-
- EINA_LIST_FREE(item_list, mitem)
- {
- minfo_destroy_mtype_item(mitem);
- }
-
- eina_list_free(item_list);
-
- MSG_SDATA_HIGH("Item loaded(%d~%d)", stp, endp);
-
- return slide_list;
-}
-
-
-int
-ivug_list_get_item_cnt(List_Filter *filter)
-{
- IV_ASSERT(filter != NULL);
-
-// TODO : Check idx validation.
- minfo_item_filter item_filter = {0, }; //create filter
-
- switch(filter->media_type)
- {
- case IVUG_MEDIA_TYPE_IMAGE:
- item_filter.file_type = MINFO_ITEM_IMAGE;
- break;
- case IVUG_MEDIA_TYPE_VIDEO:
- item_filter.file_type = MINFO_ITEM_VIDEO;
- break;
- case IVUG_MEDIA_TYPE_ALL:
- item_filter.file_type = MINFO_ITEM_IMAGE | MINFO_ITEM_VIDEO;
- break;
- default:
- MSG_SITEM_FATAL("Invalid media type : %d", filter->media_type);
- return -1;
- break;
- }
-
- item_filter.favorite = MINFO_MEDIA_FAV_ALL;
-
- if(filter->view_by == IVUG_VIEW_BY_PLACES)
- {
- item_filter.sort_type = MINFO_MEDIA_SORT_BY_NAME_ASC;
- }
- else
- {
- item_filter.sort_type = MINFO_MEDIA_SORT_BY_DATE_DESC; //MINFO_MEDIA_SORT_BY_NAME_ASC; //minfo_media_sort_type
- }
-
- item_filter.start_pos = -1;
- item_filter.end_pos = -1;
- item_filter.with_meta = false;
-
- int ret = MB_SVC_ERROR_NONE;
-
- int count = 0;
-
- switch(filter->view_by)
- {
- case IVUG_VIEW_BY_ALL :
- ret = minfo_get_item_cnt(gGetMediaSVCHandle(), filter->album_id, item_filter, &count);
- if(ret < 0)
- {
- MSG_SDATA_ERROR("Error! AlbumUUID=%s Ret=%d", uuid_getchar(filter->album_id), ret );
- return -1;
- }
-
- MSG_SDATA_HIGH("IVUG_VIEW_BY_ALL. MediaType=%d Count=%d", filter->media_type, count);
- return count;
- break;
-
-/* minfo_get_geo_item_list doesn't provide minfo get count api */
-/* So get total count menually by list callback function */
- case IVUG_VIEW_BY_PLACES:
- ret = minfo_get_geo_item_list(gGetMediaSVCHandle(), INVALID_UUID, MINFO_CLUSTER_TYPE_LOCAL_ALL, item_filter,
- filter->place.min_longitude, filter->place.max_longitude,
- filter->place.min_latitude, filter->place.max_latitude,
- _ivug_list_count_cb, &count); // NULL means query all folder
-
- if (ret < 0)
- {
- MSG_SDATA_ERROR("minfo_get_geo_item_list ERROR");
- return -1;
- }
-
- MSG_SDATA_HIGH("IVUG_VIEW_BY_PLACES. Count=%d", count);
- return count;
-
- break;
- case IVUG_VIEW_BY_FOLDER:
- ret = minfo_get_item_cnt(gGetMediaSVCHandle(), filter->album_id, item_filter, &count);
- if(ret < 0)
- {
- MSG_SDATA_ERROR("Error! AlbumUUID=%s Ret=%d", uuid_getchar(filter->album_id), ret );
- return -1;
- }
- MSG_SDATA_HIGH("IVUG_VIEW_BY_FOLDER. Count=%d", count);
- return count;
-
- break;
-
- case IVUG_VIEW_BY_FILE:
- return 1; // item count is always 1 when by file
- break;
-
- default:
- MSG_SDATA_ERROR("Unhandled view_by : %d", filter->view_by);
- break;
- }
-
- return -1;
-}
-
-
-void ivug_list_delete_items(Eina_List *items)
-{
- Media_Data* mdata;
-
- if ( items == NULL )
- {
- MSG_SDATA_HIGH("Item list is NULL.");
- return;
- }
-
- MSG_SDATA_HIGH("Removing items");
-
- EINA_LIST_FREE(items, mdata)
- {
- if(mdata == NULL)
- {
- MSG_IVUG_ERROR("media list is NULL, can not free all media list");
- }
- else
- {
- ivug_free_mediadata(mdata);
- }
- }
-}
diff --git a/main/src/data/ivug-data-list.h b/main/src/data/ivug-data-list.h
deleted file mode 100755
index 59920b7..0000000
--- a/main/src/data/ivug-data-list.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 __IVUG_DATA_LIST_H__
-#define __IVUG_DATA_LIST_H__
-
-#include "ivug-data-filter.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-Eina_List *ivug_list_load_items(List_Filter *filter, int stp, int endp);
-
-int ivug_list_get_item_cnt(List_Filter *filter);
-
-void ivug_list_delete_items(Eina_List *items);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-
diff --git a/main/src/data/ivug-data-priv.h b/main/src/data/ivug-data-priv.h
deleted file mode 100755
index eb10f3d..0000000
--- a/main/src/data/ivug-data-priv.h
+++ /dev/null
@@ -1,61 +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 __IVUG_DATA_PRIV_H
-#define __IVUG_DATA_PRIV_H
-
-#include "ivug-data.h"
-#include "ivug-parameter.h"
-#include "ivug-data-filter.h"
-
-typedef struct {
- Eina_List *header;
-
- /* window loading setting */
- int window_size;
- int window_reload_offset;
- int window_count;
-
- int left_end;
- int right_end;
-
-/*save bundle param*/
- List_Filter *filter;
-
- Eina_List *ss_shuffle_header;
- Media_Item *ss_shuffle_current;
- Media_Item *ss_shuffle_end;
-
-} _Media_List;
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-Eina_List *
-_ivug_data_create_window_size_list(Media_List *mList, int start_index, int total_count);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif // __IVUG_DATA_PRIV_H
-
diff --git a/main/src/data/ivug-data-shuffle.c b/main/src/data/ivug-data-shuffle.c
deleted file mode 100755
index fa4d07d..0000000
--- a/main/src/data/ivug-data-shuffle.c
+++ /dev/null
@@ -1,238 +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 "ivug-common.h"
-#include "ivug-data.h"
-#include "ivug-data-priv.h"
-#include "ivug-data-shuffle.h"
-
-static void _swap_eina_list(Eina_List* list, int i, int j)
-{
- Eina_List *first;
- Eina_List *second;
- int temp;
-
- if ( i == j ) return ;
-
- first = eina_list_nth_list(list, i);
- second = eina_list_nth_list(list, j);
-
- temp = (int)(first->data);
- first->data = second->data;
- second->data = (void *)temp;
-}
-
-void _shuffle_eina_list(Eina_List *list, int count)
-{
- int i;
- int r;
-
- IV_ASSERT(list != NULL);
-
- srand((unsigned)time(NULL));
-
- for(i=0; i<count; i++)
- {
- r = rand()%count;
- //MSG_UTIL_HIGH("rand = %d", r);
- _swap_eina_list(list, i, r);
- }
-}
-
-static Eina_List *_create_eina_list(int count)
-{
- int i;
-
- Eina_List *list = NULL;
-
- for(i=1; i <= count; i++) /* 1 ~ total count */
- {
- list = eina_list_append(list, (void *)i);
- }
-
- _shuffle_eina_list(list, count);
-
- return list;
-}
-
-
-bool ivug_data_init_shuffle_slide_show(Media_List *mList, slide_show_mode ss_mode, int cur_index, int total_count)
-{
- IV_ASSERT(mList != NULL);
-
- Eina_List *item = NULL;
- _Media_List *_mList = (_Media_List *)mList;
-
- if(total_count == 1 && !(ss_mode & SLIDE_SHOW_MODE_REPEAT))
- {
- return false;
- }
-
- item = eina_list_data_find_list(_mList->ss_shuffle_header, (void * )cur_index);
- if(item == NULL)
- {
- MSG_SDATA_ERROR("Can't find cur index item %d", cur_index);
- item = _mList->ss_shuffle_header;
- }
- _mList->ss_shuffle_end = item;
- _mList->ss_shuffle_current = eina_list_next(item);
-
- if( _mList->ss_shuffle_current == NULL)
- {
- _mList->ss_shuffle_current = _mList->ss_shuffle_header; /* back to first */
- }
-
- return true;
-}
-
-void ivug_data_deinit_shuffle_slide_show(Media_List *mList, int total_count)
-{
- IV_ASSERT(mList != NULL);
-
- _Media_List *_mList = (_Media_List *)mList;
-
- _mList->ss_shuffle_end = NULL;
- _mList->ss_shuffle_current = NULL;
-
- _shuffle_eina_list(_mList->ss_shuffle_header, total_count);
-}
-
-void ivug_data_create_shuffled_list(Media_List *mList, int total_count)
-{
- _Media_List *_mList = (_Media_List *)mList;
-
- _mList->ss_shuffle_header = _create_eina_list(total_count);
- _shuffle_eina_list(_mList->ss_shuffle_header, total_count); // Shuffle
-
-}
-
-int ivug_data_get_next_slide_show_index(Media_List *mList, slide_show_mode ss_mode, int next_index, int total_count, bool increase_flag)
-{
- IV_ASSERT(mList != NULL);
- _Media_List *_mList = (_Media_List *)mList;
- int index = -1;
- Eina_List *item = NULL;
- Eina_List *list = NULL;
-
- if(ss_mode & SLIDE_SHOW_MODE_SHUFFLE)
- {
- item = _mList->ss_shuffle_current;
-
- list = eina_list_next(item);
- if ( list == NULL)
- {
- list = _mList->ss_shuffle_header; /* back to start */
- }
- if(list == _mList->ss_shuffle_end && !(ss_mode & SLIDE_SHOW_MODE_REPEAT))
- {
- if(increase_flag == true)
- {
- _mList->ss_shuffle_current = NULL;
- }
- return -1;
- }
- if(increase_flag == true)
- {
- _mList->ss_shuffle_current = list;
- }
- index = (int)eina_list_data_get(list);
- }
- else
- {
- index = next_index + 1;
- if(index > total_count && (ss_mode & SLIDE_SHOW_MODE_REPEAT) )
- {
- index = 1; /* back to start */
- }
- }
- return index;
-}
-
-Media_Item * ivug_data_get_current_slide_show_item(Media_List *mList, slide_show_mode ss_mode, int cur_index, int *next_index, int total_count)
-{
- IV_ASSERT(mList != NULL);
-
- Eina_List *item = NULL;
- int index;
- Media_Item *slide_show_item = NULL;
- _Media_List *_mList = (_Media_List *)mList;
-
- if(ss_mode & SLIDE_SHOW_MODE_SHUFFLE)
- {
- item = _mList->ss_shuffle_current;
-
- index = (int)eina_list_data_get(item);
- }
- else
- {
- index = cur_index + 1;
- if(index > total_count && (ss_mode & SLIDE_SHOW_MODE_REPEAT) )
- {
- index = 1; /* back to start */
- }
- }
- MSG_SDATA_HIGH("*******current shuffle index is %d", index);
-
- slide_show_item = _ivug_data_create_window_size_list(mList, index, total_count);
- if(slide_show_item == NULL)
- {
- MSG_SDATA_HIGH("*******current shuffle item is NULL");
- return NULL;
- }
- *next_index = index;
-
- return slide_show_item;
-}
-
-Media_Item * ivug_data_set_next_slide_show_item(Media_List *mList, slide_show_mode ss_mode, int *next_index, int total_count)
-{
- IV_ASSERT(mList != NULL);
-
- int index;
- Media_Item *slide_show_item = NULL;
-
- index = ivug_data_get_next_slide_show_index(mList, ss_mode, *next_index, total_count, false);
- if(index < 0)
- {
- MSG_SDATA_HIGH("*******Next slide show item is NULL");
- return NULL;
- }
-
- MSG_SDATA_HIGH("*******Next slide show index is %d", index);
-
- slide_show_item = _ivug_data_create_window_size_list(mList, index, total_count);
- if(slide_show_item == NULL)
- {
- MSG_SDATA_HIGH("*******Next slide show item is NULL");
- return NULL;
- }
- ivug_data_append_media_item(mList, slide_show_item);
-
- return slide_show_item;
-}
-
-
-Media_Item *
-ivug_data_get_next_shuffle_item(Media_List *mList)
-{
- IV_ASSERT(mList != NULL);
-
- _Media_List *_mList = (_Media_List *)mList;
-
- return _mList->ss_shuffle_current; // current is set at next slide
-}
-
diff --git a/main/src/data/ivug-data-shuffle.h b/main/src/data/ivug-data-shuffle.h
deleted file mode 100755
index c478443..0000000
--- a/main/src/data/ivug-data-shuffle.h
+++ /dev/null
@@ -1,54 +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 __IVUG_DATA_SHUFFLER_H__
-#define __IVUG_DATA_SHUFFLER_H__
-
-#include "ivug-config.h"
-#include "ivug-data.h"
-
-typedef struct {
- Eina_List *ss_shuffle_header;
- Eina_List *ss_shuffle_current;
- Eina_List *ss_shuffle_end;
-} SlideShow_List;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool ivug_data_init_shuffle_slide_show(Media_List *mList, slide_show_mode ss_mode, int cur_index, int total_count);
-
-void ivug_data_deinit_shuffle_slide_show(Media_List *mList, int total_count);
-
-Media_Item * ivug_data_get_current_slide_show_item(Media_List *mList, slide_show_mode ss_mode, int cur_index, int *next_index, int total_count);
-
-Media_Item * ivug_data_set_next_slide_show_item(Media_List *mList, slide_show_mode ss_mode, int *cur_index, int total_count);
-
-Media_Item * ivug_data_get_next_shuffle_item(Media_List *mList);
-
-int ivug_data_get_next_slide_show_index(Media_List *mList, slide_show_mode ss_mode, int cur_index, int total_count, bool increase_flag);
-
-void ivug_data_create_shuffled_list(Media_List *mList, int total_count);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif // __IVUG_DATA_SHUFFLER_H__
-
diff --git a/main/src/data/ivug-data.c b/main/src/data/ivug-data.c
deleted file mode 100755
index 4e05214..0000000
--- a/main/src/data/ivug-data.c
+++ /dev/null
@@ -1,683 +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 "ivug-main.h"
-#include "ivug-common.h"
-
-#include "ivug-data.h"
-#include "ivug-util.h"
-#include "ivug-data-priv.h"
-#include "ivug-data-list.h"
-#include "ivug-data-filter.h"
-
-
-#include <media-svc.h>
-
-static bool
-_ivug_data_set_window_section(Media_List *mList, int start_index, int total_count, int *stp, int *endp)
-{
- IV_ASSERT(mList != NULL);
-
- _Media_List *_mList = (_Media_List *)mList;
-
- //if(total_count > _mList->window_size && start_index > 0) // TODO : IV_ASSERT(start_index > 0); after fix gallery
- if(start_index > 0 && total_count > 0 && start_index <= total_count) // TODO : IV_ASSERT(start_index > 0); after fix gallery
- {
- *stp = (start_index-1) - (_mList->window_size/2);
- if(*stp < 0)
- {
- *stp = 0;
- }
- *endp = (start_index-1) + (_mList->window_size/2);
- if(*endp > total_count-1)
- {
- *endp = total_count-1;
- }
- if(_mList->window_count > 0)
- {
- if(*stp < _mList->left_end) /* load left window */
- {
- if(*endp > _mList->left_end-1)
- {
- *endp = _mList->left_end -1;
- }
- _mList->left_end = *stp;
- }
- if(*endp > _mList->right_end) /* load right window */
- {
- if(*stp < _mList->right_end+1)
- {
- *stp = _mList->right_end +1;
- }
- _mList->right_end = *endp;
- }
- }
- else // first window loding
- {
- MSG_SDATA_HIGH("First window loading");
- _mList->left_end = *stp;
- _mList->right_end = *endp;
- _mList->window_count++;
- }
- MSG_SDATA_HIGH("Window loading [%d~%d]", *stp, *endp);
-
- MSG_SDATA_HIGH("true : _mlist [%d~%d]", _mList->left_end, _mList->right_end);
- return true;
- }
- else
- {
- if(_mList->window_count == 0)
- {
- MSG_SDATA_HIGH("Entire loading");
- _mList->left_end = 0;
- _mList->right_end = total_count-1;
- }
- MSG_SDATA_HIGH("false : _mlist [%d~%d]", _mList->left_end, _mList->right_end);
- return false;
- }
-}
-
-
-static bool
-_ivug_data_add_media_item(Eina_List **list, const char *filepath)
-{
- IV_ASSERT(list != NULL);
-
- int ret = 0;
- Mitem* item = NULL;
-
- if (ivug_is_web_uri(filepath) == false)
- { //local file.
- ret = minfo_get_item(gGetMediaSVCHandle(), filepath, &item); //get cluster id
- if (ret != MB_SVC_ERROR_NONE)
- {
- MSG_SDATA_ERROR("Cannot find file in media db for %s", filepath);
- }
- }
-
- Media_Data* mdata = NULL;
-
- if (item != NULL)
- {
- mdata = ivug_alloc_mediadata_from_mitem(item);
- minfo_destroy_mtype_item(item);
- }
- else
- {
- mdata = ivug_alloc_mediadata_from_filepath(filepath);
- }
-
- if ( mdata == NULL )
- {
- MSG_SDATA_ERROR("Cannot create slide data for %s", filepath);
- return false;
- }
-
- *list = eina_list_append(*list, mdata);
-
- return true;
-
-}
-
-Eina_List *_ivug_data_create_window_size_list(Media_List *mList, int start_index, int total_count)
-{
- IV_ASSERT(mList != NULL);
-
- _Media_List *_mList = (_Media_List *)mList;
- Eina_List* slide_list = NULL;
-
- MSG_SDATA_HIGH("start index is %d", start_index);
-
- if(start_index < 1 || start_index > total_count)
- {
- MSG_SDATA_ERROR("start index is invalid %d", start_index);
- return NULL;
- }
-
-// Eina_List *ivug_list_load_items(List_Filter *filter, int stp, int endp);
-
- int stp = 0, endp = 0;
-
- _ivug_data_set_window_section(mList, start_index, total_count, &stp, &endp);
-
- slide_list = ivug_list_load_items(_mList->filter, stp, endp);
-
- if(slide_list == NULL)
- {
- MSG_SDATA_ERROR("Create list ERROR");
- return NULL;
- }
-
- return slide_list;
-}
-
-static Media_Item *
-_ivug_data_create_list(Media_List *mList, Eina_List **list, const char *filepath, int *start_index, int *total_count)
-{
- IV_ASSERT(mList != NULL);
- IV_ASSERT(filepath != NULL);
-
- MSG_SDATA_HIGH("Creating slide data list");
-
- _Media_List *_mList = (_Media_List *)mList;
- Media_Item *item = NULL;
-
- *total_count = -1;
-
- if(_mList->filter->view_by == IVUG_VIEW_BY_FILE)
- {
- if (filepath == NULL)
- {
- MSG_SDATA_ERROR("file path is NULL");
- return NULL;
- }
-
- // No need to create list. just one file only.
- if ( _ivug_data_add_media_item(list, filepath) == false)
- {
- MSG_SDATA_ERROR("Cannot add file : %s", filepath);
- return NULL;
- }
- *total_count = 1;
- item = *list;
- return item;
- }
- else
- {
- *total_count = ivug_list_get_item_cnt(_mList->filter);
-
- *list = _ivug_data_create_window_size_list(mList, *start_index, *total_count);
- }
-
- if(*list == NULL)
- {
- MSG_SDATA_ERROR("list is NULL");
- return NULL;
- }
-
- if(*total_count == 1)
- {
- item = *list;
- *start_index = 1;
- return item;
- }
- else if(*start_index > 0 && *start_index <= *total_count)
- {
- item = eina_list_nth_list(*list, (*start_index-1)-_mList->left_end);
- }
-
- Media_Data *mdata = NULL;
- bool find = false;
- int index = 0;
-
- if(item != NULL)
- {
- MSG_SDATA_HIGH("start index exist");
- mdata = ivug_data_get_data(item);
-
- if(mdata != NULL)
- {
- if ((mdata)->filepath)
- {
- if(strncmp(filepath, mdata->filepath, strlen(filepath)) == 0)
- {
- MSG_SLIDER_HIGH("Founded Filepath=%s Index=%d", ivug_get_filename(mdata->filepath), *start_index);
- index = *start_index; // recieve from bundle
- find = true;
- }
- }
- if (find == false && mdata->fileurl)
- {
- if (strncmp(filepath, mdata->fileurl, strlen(filepath)) == 0) //match
- {
- MSG_SLIDER_HIGH("Founded Fileurl=%s Index=%d", ivug_get_filename(mdata->fileurl), *start_index);
- index = *start_index; // recieve from bundle
- find = true;
- }
- }
- if(find == false)
- {
- MSG_SLIDER_WARN("param index is not match to real index");
- }
- }
- }
- //check indexed item
- if(item == NULL || find == false) // start index is not exist || can't find filename at window list
- {
- item = ivug_data_find_item(*list, filepath, &index);
-
- if (item == NULL)
- {
- // TODO : find file at whole file list
- MSG_SLIDER_ERROR("Item is not found for file %s", filepath);
- return NULL;
- }
- }
- *start_index = index;
- MSG_SDATA_HIGH("Create slide data list END");
- return item;
-}
-
-Media_List *ivug_data_init_media_list(const ivug_parameter *param)
-{
- _Media_List *_mList = calloc(1, sizeof(_Media_List));
- IV_ASSERT(_mList != NULL);
-
- _mList->window_size = IV_WINDOW_SIZE;
- _mList->window_reload_offset = IV_RELOAD_OFFSET;
- _mList->window_count = 0;
- _mList->left_end = 0;
-
- _mList->filter = ivug_data_filter_create(param);
-
- return (Media_List *)_mList;
-}
-
-Media_Item *
-ivug_data_create_media_list_from_param
- (Media_List *mList, Eina_List **list, const char *filepath, int *start_index, int *total_count)
-{
- IV_ASSERT(mList != NULL);
-
- MSG_SDATA_HIGH("Creating slide data list");
-
- _Media_List *_mList = (_Media_List *)mList;
-
- if(list == NULL)
- {
- return _ivug_data_create_list(mList, &(_mList->header), filepath, start_index, total_count);
- }
- else
- {
- return _ivug_data_create_list(mList, list, filepath, start_index, total_count);
- }
-}
-
-bool ivug_data_set_window_size(Media_List *mList, int size)
-{
- _Media_List *_mList = (_Media_List *)mList;
-
- if(size < 1)
- {
- MSG_SDATA_ERROR("Set window size error, size = %d", size);
- _mList->window_size = 0;
- return false;
- }
-
- _mList->window_size = size;
- return true;
-}
-
-void ivug_data_reset_window_load_count(Media_List *mList)
-{
- _Media_List *_mList = (_Media_List *)mList;
-
- _mList->window_count = 0;
-}
-
-void
-ivug_data_delete_media_list(Media_List *mList)
-{
- IV_ASSERT(mList != NULL);
- _Media_List *_mList = (_Media_List *)mList;
-
- MSG_SDATA_HIGH("Removing all media data");
-
- ivug_list_delete_items(_mList->header);
-
- ivug_data_filter_delete(_mList->filter);
-
- free(_mList);
-}
-
-
-
-#ifdef TRACE_CALLER
-Media_Data *
-dbg_ivug_data_get_data(Media_Item *media_item, const char *func, unsigned int line)
-#else
-Media_Data *
-ivug_data_get_data(Media_Item *media_item)
-#endif // TRACE_CALLER
-{
-#ifdef TRACE_CALLER
- MSG_SDATA_HIGH("Called by %s(%d) Item=0x%08x", func, line, media_item);
-#endif
- IV_ASSERT(media_item != NULL);
-
- Eina_List *item = media_item;
-
- return eina_list_data_get(item);
-
-}
-
-Media_Item *
-ivug_data_get_first(Media_List *mList)
-{
- IV_ASSERT(mList != NULL);
- _Media_List *_mList = (_Media_List *)mList;
-
- return (Media_Item *)_mList->header;
-}
-
-
-Media_Item *
-ivug_data_get_next(Media_Item *media_item)
-{
- IV_ASSERT(media_item != NULL);
-
- Eina_List *item = media_item;
-
- Eina_List *list;
-
- list = eina_list_next(item);
-
- if ( list == NULL )
- {
- MSG_SDATA_ERROR("Next item is NULL");
- return NULL;
- }
-
- return list;
-}
-
-Media_Item *
-ivug_data_get_prev(Media_Item *media_item)
-{
- IV_ASSERT(media_item != NULL);
-
- Eina_List *item = media_item;
-
- Eina_List *list;
-
- list = eina_list_prev(item);
-
- if ( list == NULL )
- {
- MSG_SDATA_ERROR("Prev item is NULL");
- return NULL;
- }
-
- return list;
-}
-
-Media_Item *
-ivug_data_find_item(Eina_List *list, const char* fileuri, int /*OUT*/ *index)
-{
- IV_ASSERT(list != NULL);
- IV_ASSERT(fileuri != NULL);
-
- Eina_List *item;
- Media_Data* mdata;
-
- unsigned int i = 1;
-
- EINA_LIST_FOREACH(list, item, mdata)
- {
- if(mdata == NULL)
- {
- MSG_SDATA_FATAL("sdata cannot be NULL");
- return NULL;
- }
-
- if (mdata->filepath)
- {
- if (strncmp(mdata->filepath, fileuri, strlen(mdata->filepath)) == 0) //match
- {
- MSG_SDATA_HIGH("Founded Filepath=%s Index=%d", ivug_get_filename(mdata->filepath), i);
- *index = i;
- return item;
- }
- }
-
- if (mdata->fileurl)
- {
- if (strncmp(mdata->fileurl, fileuri, strlen(mdata->fileurl)) == 0) //match
- {
- MSG_SDATA_HIGH("Founded Fileuri=%s Index=%d", mdata->fileurl, i);
- *index = i;
- return item;
- }
- }
- i++;
- }
-
- *index = 0;
- return NULL;
-}
-
-
-bool
-ivug_data_delete_media_item(Media_List *mList, Media_Item *media_item)
-{
- IV_ASSERT(mList != NULL);
- IV_ASSERT(media_item != NULL);
-
- _Media_List *_mList = (_Media_List *)mList;
-
- int ret;
-
- Media_Data* mdata;
-
- mdata = (Media_Data*)eina_list_data_get(media_item);
-
- IV_ASSERT(mdata != NULL);
-
- if (uuid_is_valid(mdata->mediaID) == true)
- {
- ret = minfo_delete_media_id(gGetMediaSVCHandle(), mdata->mediaID);
-
- if (ret == MB_SVC_ERROR_NONE)
- {
- if (mdata->filepath)
- {
- if(ivug_remove_file(mdata->filepath) == false)
- {
- MSG_SDATA_ERROR("unlink error , file path =%s", mdata->filepath);
- }
- }
- }
- else
- {
- MSG_SDATA_ERROR("minfo_delete_media_id faild=%d uuid=%s file=%s", ret, uuid_getchar(mdata->mediaID), mdata->filepath);
- goto ERROR;
- }
-
- }
- else
- {
- if (mdata->filepath)
- {
- if(ivug_remove_file(mdata->filepath) == false)
- {
- MSG_SDATA_ERROR("file remove error , file path =%s", mdata->filepath);
- }
- }
- else
- {
- MSG_SDATA_ERROR("delete faild file path is NULL");
- goto ERROR;
- }
-
- }
-
-// TODO : Handle when current is deleted
- ivug_free_mediadata(mdata); // Free data
-
- _mList->header = eina_list_remove_list(_mList->header, media_item);
- _mList->right_end--;
-
- return true;
-
-ERROR:
- ivug_free_mediadata(mdata); // Free data
- _mList->header = eina_list_remove_list(_mList->header, media_item);
- _mList->right_end--;
-
- MSG_SDATA_ERROR("ivug_data_delete_slide faild.");
- return false;
-
-}
-
-/* it delete start ~ end item */
-/* if end is null, it delete until last */
-bool
-ivug_data_delete_window_list(Media_List *mList, Media_Item *start_item, Media_Item *end_item)
-{
- IV_ASSERT(mList != NULL);
- IV_ASSERT(start_item != NULL);
-
- _Media_List *_mList = (_Media_List *)mList;
-
- Media_Item *current = start_item;
- Media_Item *next = NULL;
-
- Media_Data* mdata;
-
- do
- {
- MSG_SDATA_HIGH("delete window list");
- next = eina_list_next(current);
-
- mdata = (Media_Data*)eina_list_data_get(current);
- ivug_free_mediadata(mdata); // Free data
- _mList->header = eina_list_remove_list(_mList->header, current);
- if(end_item == NULL) /* delete right window */
- {
- /* TODO : _mList->right_end--; */
- }
- else /* delete left window */
- {
- /* TODO : _mList->left_end++; */
- }
- current = next;
- }while(current && current != end_item);
-
- if(current) /* delete end item */
- {
- mdata = (Media_Data*)eina_list_data_get(current);
- ivug_free_mediadata(mdata); // Free data
- _mList->header = eina_list_remove_list(_mList->header, current);
- _mList->left_end++; /* this case is delete left window */
- }
-
- _mList->window_count--;
-
- return true;
-}
-
-
-void
-ivug_data_delete_all_window_list(Media_List *mList)
-{
- _Media_List *_mList = (_Media_List *)mList;
-
- ivug_data_delete_window_list(mList, _mList->header, NULL);
-}
-
-
-void ivug_data_append_media_item(Media_List *mList, Eina_List* list)
-{
- IV_ASSERT(mList != NULL);
-
- _Media_List *_mList = (_Media_List *)mList;
-
- MSG_SDATA_HIGH("original : slide_list_count is %d", eina_list_count(_mList->header));
- if(_mList->window_count > 3)
- {
- /* TODO : delete window item */
- //ivug_data_delete_window_list(mList, _mList->header, _mList->contact_point);
- MSG_SDATA_HIGH("after delete : slide_list_count is %d", eina_list_count(_mList->header));
- }
- //_mList->contact_point = eina_list_last(_mList->header);
-
- _mList->header = eina_list_merge(_mList->header, list);
- MSG_SDATA_HIGH("merge next : slide_list_count is %d", eina_list_count(_mList->header));
-
- _mList->window_count++;
-}
-
-void ivug_data_prepend_media_item(Media_List *mList, Eina_List* list)
-{
- IV_ASSERT(mList != NULL);
-
- _Media_List *_mList = (_Media_List *)mList;
-
- MSG_SDATA_HIGH("original : slide_list_count is %d", eina_list_count(_mList->header));
- if(_mList->window_count > 3)
- {
- /* TODO : delete window item */
- //ivug_data_delete_window_list(mList, _mList->contact_point, NULL);
- MSG_SDATA_HIGH("after delete : slide_list_count is %d", eina_list_count(_mList->header));
- }
- //_mList->contact_point = _mList->header;
-
- _mList->header = eina_list_merge(list, _mList->header);
- MSG_SDATA_HIGH("merge prev : slide_list_count is %d", eina_list_count(_mList->header));
-
- _mList->window_count++;
-}
-
-
-Load_State
-ivug_data_set_window_loading(Media_List *mList, int cur_index, int total_count)
-{
- Eina_List* slide_list_prev = NULL;
- Eina_List* slide_list_next = NULL;
- int start = -1;
-
- IV_ASSERT(mList != NULL);
-
- _Media_List *_mList = (_Media_List *)mList;
-
- /* load right widow */
- if(_mList->right_end < total_count-1 && cur_index-1 > _mList->right_end - _mList->window_reload_offset)
- {
- /* start index is basis for view's index(1~total) because +1 needed */
- start = (_mList->right_end+1) + (_mList->window_size/2+1);
- if(start > total_count) // index is 1~total
- {
- start = total_count;
- }
- MSG_SDATA_HIGH("start = %d, _mList->right_end = %d", start, _mList->right_end);
- slide_list_next = _ivug_data_create_window_size_list(mList, start, total_count);
- if(slide_list_next != NULL)
- {
- ivug_data_append_media_item(mList, slide_list_next);
- return IVUG_SLIDER_LOADED_RIGHT;
- }
- }
- /* load left widow */
- else if(_mList->left_end > 0 && cur_index-1 < _mList->left_end + _mList->window_reload_offset)
- {
- /* start index is basis for view's index(1~total) because +1 needed */
- start = (_mList->left_end+1) - (_mList->window_size/2+1);
- if(start < 1) // index is 1~total
- {
- start = 1;
- }
- MSG_SDATA_HIGH("start = %d, _mList->left_end = %d", start, _mList->left_end);
- slide_list_prev = _ivug_data_create_window_size_list(mList, start, total_count);
- if(slide_list_prev != NULL)
- {
- ivug_data_prepend_media_item(mList, slide_list_prev);
- return IVUG_SLIDER_LOADED_LEFT;
- }
- }
- return IVUG_SLIDER_LOADED_NONE;
-}
-
diff --git a/main/src/data/ivug-data.h b/main/src/data/ivug-data.h
deleted file mode 100755
index 2dd9965..0000000
--- a/main/src/data/ivug-data.h
+++ /dev/null
@@ -1,85 +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 __IVUG_DATA_H__
-#define __IVUG_DATA_H__
-
-#include "ivug-common.h"
-#include "ivug-parameter.h"
-#include "ivug-mediadata.h"
-
-
-typedef enum {
- IVUG_SLIDER_LOADED_NONE = 0x00, /* default value */
- IVUG_SLIDER_LOADED_LEFT,
- IVUG_SLIDER_LOADED_RIGHT,
- IVUG_SLIDER_LOADED_STATUS_MAX,
-} Load_State;
-
-
-/* Opaque pointer for media list. */
-typedef void *Media_List;
-typedef Eina_List Media_Item; // Same as Eina_List
-
-#undef TRACE_CALLER
-
-bool
-ivug_data_set_window_size(Media_List *mList, int size);
-
-Load_State
-ivug_data_set_window_loading(Media_List *mList, int cur_index, int total_count);
-
-void ivug_data_reset_window_load_count(Media_List *mList);
-
-Media_List * ivug_data_init_media_list(const ivug_parameter *param);
-
-Media_Item *
-ivug_data_create_media_list_from_param(Media_List *mList, Eina_List **list, const char *filepath, int *start_index, int *total_count);
-
-void
-ivug_data_delete_media_list(Media_List *mList);
-
-void
-ivug_data_delete_all_window_list(Media_List *mList);
-
-Media_Item *
-ivug_data_get_first(Media_List *mList);
-
-Media_Item *
-ivug_data_get_prev(Media_Item *media_item);
-
-Media_Item *
-ivug_data_get_next(Media_Item *media_item);
-
-#ifdef TRACE_CALLER
-#define ivug_data_get_data(media_item) dbg_ivug_data_get_data(media_item , __func__, __LINE__)
-
-Media_Data *
-dbg_ivug_data_get_data(Media_Item *media_item, const char *func, unsigned int line);
-#else
-Media_Data *
-ivug_data_get_data(Media_Item *media_item);
-#endif
-
-void ivug_data_append_media_item(Media_List *mList, Eina_List* list);
-
-bool ivug_data_delete_media_item(Media_List *mList, Media_Item *media_item);
-
-Media_Item * ivug_data_find_item(Eina_List *list, const char* fileuri, int /*OUT*/ *index);
-
-#endif //__IVUG_DATA_H__
-
diff --git a/main/src/data/ivug-mediadata.c b/main/src/data/ivug-mediadata.c
deleted file mode 100755
index b46a5da..0000000
--- a/main/src/data/ivug-mediadata.c
+++ /dev/null
@@ -1,301 +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 "ivug-main.h"
-#include "ivug-common.h"
-#include <media-svc.h>
-#include "ivug-mediadata.h"
-#include "ivug-file-info.h"
-
-Media_Data *ivug_alloc_mediadata_from_mitem(Mitem * item)
-{
- IV_ASSERT(item != NULL);
- IV_ASSERT(item->file_url != NULL);
- Media_Data * mdata = NULL;
- mdata = (Media_Data *) calloc(1, sizeof(Media_Data));
- if (mdata == NULL)
- {
- MSG_SDATA_ERROR("Cannot allocate memory");
- return NULL;
- }
-
- mdata->mediaID = uuid_assign(item->uuid);
-
- //file url
- mdata->fileurl = strdup(item->file_url);
- if (mdata->fileurl == NULL)
- {
- MSG_SDATA_ERROR("strdup return NULL");
- free(mdata);
- return NULL;
- }
-
- if (item->type == MINFO_ITEM_IMAGE)
- {
- //check file path.
- MSG_SDATA_HIGH("Local image : %s. %s", uuid_getchar( mdata->mediaID ), mdata->fileurl);
-
- mdata->thumbnail_path = NULL;
-
- mdata->slide_type = SLIDE_TYPE_IMAGE;
- mdata->filepath = strdup(mdata->fileurl);
- if (mdata->filepath == NULL)
- {
- free(mdata->fileurl);
- MSG_SDATA_ERROR("strdup return NULL");
- free(mdata);
- return NULL;
- }
- }
- else if (item->type == MINFO_ITEM_VIDEO)
- {
- MSG_SDATA_HIGH("Local video : %s. %s", uuid_getchar(mdata->mediaID), mdata->fileurl);
-
- if (item->thumb_url)
- {
- mdata->thumbnail_path = strdup(item->thumb_url); //thumbnail address
- if (mdata->thumbnail_path == NULL)
- {
- free(mdata->fileurl);
- MSG_SDATA_ERROR("strdup return NULL");
- free(mdata);
- return NULL;
- }
- }
-
- mdata->slide_type = SLIDE_TYPE_VIDEO;
- mdata->filepath = strdup(mdata->fileurl);
- if (mdata->filepath == NULL)
- {
- free(mdata->fileurl);
- if (mdata->thumbnail_path)
- {
- free(mdata->thumbnail_path);
- }
- MSG_SDATA_ERROR("strdup return NULL");
- free(mdata);
- return NULL;
- }
- }
- return mdata;
-}
-
-Media_Data *ivug_alloc_mediadata_from_filepath(const char *filepath)
-{
- IV_ASSERT(filepath != NULL);
-
-
- // No need to create list. just one file only.
- Mitem * item = NULL;
- if (ivug_is_web_uri(filepath) == false)
- {
-
- //local file.
- int ret = MB_SVC_ERROR_NONE;
- ret = minfo_get_item(gGetMediaSVCHandle(), filepath, &item); //get cluster id
- if (ret != MB_SVC_ERROR_NONE)
- {
- MSG_SDATA_ERROR("Cannot find file in media db for %s",filepath);
- // Go through
- }
- }
-
- Media_Data * mdata = NULL;
- if (item != NULL)
- {
- MSG_SDATA_HIGH("File path is given. but founded in DB.");
- mdata = ivug_alloc_mediadata_from_mitem(item);
- minfo_destroy_mtype_item(item);
- if (mdata == NULL)
- {
- MSG_SDATA_ERROR("Cannot add file : %s", filepath);
- return NULL;
- }
- return mdata;
- }
- mdata = (Media_Data *) calloc(1, sizeof(Media_Data));
- if (mdata == NULL)
- {
- MSG_SDATA_ERROR("Cannot allocate memory");
- return NULL;
- }
- mdata->mediaID = INVALID_UUID; //copy id mitem
-
- char *mime_type = NULL;
- mime_type = ivug_fileinfo_get_mime_type(filepath);
- if (mime_type == NULL)
- {
- MSG_SDATA_WARN("file path is not vaild = %s", filepath);
- mdata->slide_type = SLIDE_TYPE_UNKNOWN;
- mdata->fileurl = NULL;
- mdata->filepath = NULL;
- return mdata;
- }
-
-
- Media_Type slide_type = SLIDE_TYPE_NONE;
-
- //image
- if (strncmp(mime_type, "image/", strlen("image/")) == 0)
- {
- slide_type = SLIDE_TYPE_IMAGE;
- }
- else if (strncmp(mime_type, "video/", strlen("video/")) == 0)
- {
- slide_type = SLIDE_TYPE_VIDEO;
- }
- else
- {
- slide_type = SLIDE_TYPE_NONE;
- }
- MSG_SDATA_HIGH("File=%s Mime=%s", filepath, mime_type);
- free(mime_type); //free strdup
-
- mdata->thumbnail_path = NULL;
-
- if (slide_type == SLIDE_TYPE_IMAGE)
- {
- mdata->slide_type = SLIDE_TYPE_IMAGE;
- mdata->fileurl = strdup(filepath);
- if (mdata->fileurl == NULL)
- {
- MSG_SDATA_ERROR("strdup return NULL");
- goto ERROR;
- }
- mdata->filepath = strdup(filepath);
- if (mdata->filepath == NULL)
- {
- MSG_SDATA_ERROR("strdup return NULL");
- free(mdata->fileurl);
- goto ERROR;
- }
- }
- else if (slide_type == SLIDE_TYPE_VIDEO)
- {
- mdata->slide_type = SLIDE_TYPE_VIDEO;
- mdata->fileurl = strdup(filepath);
- if (mdata->fileurl == NULL)
- {
- MSG_SDATA_ERROR("strdup return NULL");
- goto ERROR;
- }
- mdata->filepath = strdup(filepath);
- if (mdata->filepath == NULL)
- {
- MSG_SDATA_ERROR("strdup return NULL");
- free(mdata->fileurl);
- goto ERROR;
- }
- }
- else
- {
- MSG_SDATA_WARN("file path is not vaild = %s", filepath);
- mdata->slide_type = SLIDE_TYPE_UNKNOWN;
- mdata->fileurl = NULL;
- mdata->filepath = NULL;
- }
- return mdata;
-ERROR:
-
- if (mdata)
- {
- free(mdata);
- }
- return NULL;
-}
-
-void ivug_free_mediadata(Media_Data * mdata)
-{
- IV_ASSERT(mdata != NULL);
-
- uuid_free(mdata->mediaID);
-
- //file path
- if (mdata->filepath)
- {
- //IVUG_DEBUG_MSG("filepath =%s", sd->filepath);
- free(mdata->filepath);
- mdata->filepath = NULL;
- }
-
- //file url
- if (mdata->fileurl)
- {
- MSG_SDATA_HIGH("Remove media data. %s", mdata->fileurl);
- free(mdata->fileurl);
- mdata->fileurl = NULL;
- }
-
- if (mdata->thumbnail_path)
- {
- free(mdata->thumbnail_path);
- mdata->thumbnail_path = NULL;
- }
-
- free(mdata);
-}
-
-bool ivug_delete_mediadata(Media_Data * mdata)
-{
- IV_ASSERT(mdata != NULL);
-
- if (uuid_is_valid(mdata->mediaID) == true )
- {
- int ret = minfo_delete_media_id(gGetMediaSVCHandle(), mdata->mediaID);
-
- if (ret == MB_SVC_ERROR_NONE)
- {
- if (mdata->filepath)
- {
- MSG_SDATA_HIGH("File removed. %s", mdata->filepath);
- if (ivug_remove_file(mdata->filepath) == false)
- {
- MSG_SDATA_ERROR("file remove error : %s", mdata->filepath);
- }
- }
- else
- {
- MSG_SDATA_ERROR("File path is NULL", mdata->filepath);
- }
- }
- else
- {
- MSG_SDATA_ERROR("minfo_delete_media_id faild=%d uuid=%s file=%s", ret, uuid_getchar(mdata->mediaID), mdata->filepath);
- return false;
- }
- }
- else
- {
- if (mdata->filepath)
- {
- MSG_SDATA_HIGH("File removed. %s", mdata->filepath);
-
- if (ivug_remove_file(mdata->filepath) == false)
- {
- MSG_SDATA_ERROR("file remove error : %s", mdata->filepath);
- }
- }
- else
- {
- MSG_SDATA_ERROR("File path is NULL", mdata->filepath);
- }
-
- }
-
- return true;
-}
-
diff --git a/main/src/data/ivug-mediadata.h b/main/src/data/ivug-mediadata.h
deleted file mode 100755
index 43b5e9e..0000000
--- a/main/src/data/ivug-mediadata.h
+++ /dev/null
@@ -1,87 +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 __IVUG_MEDIADATA_H__
-#define __IVUG_MEDIADATA_H__
-
-#include <media-svc.h>
-#include <visual-svc.h> // Mitem
-
-//slide type
-typedef enum {
- SLIDE_TYPE_NONE = 0x00,
- SLIDE_TYPE_IMAGE,
- SLIDE_TYPE_VIDEO,
- SLIDE_TYPE_UNKNOWN, // File is exists but it's type is unknown.
-} Media_Type;
-
-/*
- This struct represents data for slide.
- thumbnail_path is slide's thumbnail image path.
- fileurl is saved item in media service.
- filepath is local file path. if fileurl is http://.../test.jpg, filepath is NULL, when complete download filepath change to saved local file path.
-*/
-typedef struct {
-//Data
- Media_Type slide_type; //image, video
-
- UUID mediaID; // Media ID
-
- char* thumbnail_path; // thumbnail image file path.
- char* fileurl; // file url.
- char* filepath; // file path in local file system.
-} Media_Data;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Converting Media_Data from filepath
- * @param filepath[in]
- *
-**/
-Media_Data *ivug_alloc_mediadata_from_filepath(const char* filepath);
-
-/**
- * Converting Mitem to Media_Data
- * @param item[in]
- *
-**/
-Media_Data *ivug_alloc_mediadata_from_mitem(Mitem* item);
-
-
-/**
- * Free memory used by Media_Data
- * @param mdata[in]
- *
-**/
-void ivug_free_mediadata(Media_Data* mdata);
-
-/**
- *
- * Delete file indicated by @p mdata
- *
-**/
-bool ivug_delete_mediadata(Media_Data* mdata);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __IVUG_MEDIADATA_H__ \ No newline at end of file
diff --git a/main/src/effect/include/ivug-anim.h b/main/src/effect/include/ivug-anim.h
deleted file mode 100755
index cf7ddfa..0000000
--- a/main/src/effect/include/ivug-anim.h
+++ /dev/null
@@ -1,56 +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 __IVUG_ANIM_H__
-#define __IVUG_ANIM_H__
-
-#include <stdbool.h>
-
-typedef enum {
- ANIM_TYPE_LINEAR,
- ANIM_TYPE_QUARTIC_INOUT,
- ANIM_TYPE_QUINTIC_INOUT,
- ANIM_TYPE_SINE,
-} anim_type_t;
-
-/*
- t: current time b: start time c: change in value d: duration
-*/
-typedef double (*anim_transit_func_t) (double t, double b, double c, double d);
-
-typedef struct {
-/* private */
- double duration;
- double t_start;
- double t_varing;
-
- anim_transit_func_t transit_func;
-
- void *user_data;
-} anim_handle_t;
-
-anim_handle_t *create_animation();
-
-void delete_animation(anim_handle_t *anim);
-
-bool update_animation(anim_handle_t *anim, double current, int *value);
-
-bool set_animation_type(anim_handle_t *anim, anim_type_t type);
-
-bool set_animation(anim_handle_t *anim, int start, int end, double duration);
-
-#endif
diff --git a/main/src/effect/include/ivug-effect.h b/main/src/effect/include/ivug-effect.h
deleted file mode 100755
index 7594c54..0000000
--- a/main/src/effect/include/ivug-effect.h
+++ /dev/null
@@ -1,90 +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 __IVUG_EFFECT_H__
-#define __IVUG_EFFECT_H__
-
-#include <stdbool.h>
-#include <Elementary.h>
-#include "ivug-anim.h"
-
-#define EFFECT_LBYTES_ARGB8888(w) (((w) * 4))
-#define MAX_PERCENT (100.0f)
-#define MIN_PERCENT (0.0f)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void *Effect_Data ;
-
-typedef void (*FuncFinished)(void *data);
-
-typedef struct {
- Effect_Data eng_data;
-
- FuncFinished pFinishedCB;
- void *ClientData;
-
- double t_base; // start time.
- anim_handle_t *anim;
- Ecore_Animator *animator;
-
- struct {
- Effect_Data (*init) (Evas_Object *src, Evas_Object *dst, int screen_w, int screen_h, int rotation);
- void (*animate) (Effect_Data data, double percent);
- void (*pause) (Effect_Data data); /* Not used*/
- void (*resume) (Effect_Data data); /* Not used*/
- void (*finalize) (Effect_Data data);
-
- double (*get_duration)(Effect_Data data);
- } func;
-
-} Effect_Engine;
-
-typedef enum _Effect_Type {
- EFFECT_NONE,
- EFFECT_SLIDE,
- EFFECT_MAX
-} Effect_Type;
-
-
-Effect_Engine *ivug_effect_add(Effect_Type type);
-
-bool ivug_effect_init(Effect_Engine *engine, Evas_Object *src, Evas_Object *dst, int w, int h, int rotation);
-bool ivug_effect_start(Effect_Engine *engine, FuncFinished pFunc, void *data);
-bool ivug_effect_pause(Effect_Engine *engine);
-bool ivug_effect_resume(Effect_Engine *engine);
-bool ivug_effect_finalize(Effect_Engine *engine);
-
-
-/*
- Private function for adding effect. Do not use below functions directly..
-*/
-Effect_Engine *ivug_fade_add(void);
-Effect_Engine *ivug_iris_add(void);
-Effect_Engine *ivug_dissolve_add(void);
-Effect_Engine *ivug_blind_add(void);
-Effect_Engine *ivug_slide_add(void);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* __IVUG_EFFECT_H__ */
diff --git a/main/src/effect/ivug-anim.c b/main/src/effect/ivug-anim.c
deleted file mode 100755
index b12d1fb..0000000
--- a/main/src/effect/ivug-anim.c
+++ /dev/null
@@ -1,178 +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 <stddef.h> /* for NULL */
-#include <memory.h>
-#include <stdlib.h>
-
-#include "ivug-common.h"
-
-#include "ivug-anim.h"
-
-/*
- t: current time b: start time c: change in value d: duration
-*/
-static double _anim_linear(double t, double b, double c, double d)
-{
- if(d != 0.0)
- t /= d;
- return b + c * (t);
-}
-
-static double _anim_sine(double t, double b, double c, double d)
-{
-/* TODO : Consider below table reconstruct. need only 0.0 ~ 1.0 range*/
- static const double const SIN_TABLE[91] = {
- 0.0000f, 0.0174f, 0.0349f, 0.0523f, 0.0698f,
- 0.0872f, 0.1045f, 0.1219f, 0.1392f, 0.1564f,
- 0.1736f, 0.1908f, 0.2079f, 0.2249f, 0.2419f,
- 0.2588f, 0.2756f, 0.2924f, 0.3090f, 0.3256f,
- 0.3420f, 0.3584f, 0.3746f, 0.3907f, 0.4067f,
- 0.4226f, 0.4384f, 0.4540f, 0.4695f, 0.4848f,
- 0.5000f, 0.5150f, 0.5299f, 0.5446f, 0.5592f,
- 0.5736f, 0.5878f, 0.6018f, 0.6157f, 0.6293f,
- 0.6528f, 0.6561f, 0.6691f, 0.6820f, 0.6947f,
- 0.7071f, 0.7193f, 0.7314f, 0.7431f, 0.7547f,
- 0.7660f, 0.7772f, 0.7880f, 0.7986f, 0.8090f,
- 0.8191f, 0.8290f, 0.8387f, 0.8480f, 0.8571f,
- 0.8660f, 0.8746f, 0.8829f, 0.8910f, 0.8988f,
- 0.9063f, 0.9135f, 0.9205f, 0.9272f, 0.9336f,
- 0.9397f, 0.9455f, 0.9511f, 0.9563f, 0.9613f,
- 0.9659f, 0.9703f, 0.9744f, 0.9781f, 0.9816f,
- 0.9848f, 0.9877f, 0.9903f, 0.9926f, 0.9945f,
- 0.9962f, 0.9976f, 0.9986f, 0.9994f, 0.9998f,
- 1.0f
- };
-
- if(d != 0.0)
- t /= d; /* normalize */
-
- int idx = (int)(90.0 * t);
-
- return b + c * (SIN_TABLE[idx]);
-
-}
-
-static double _anim_ease_inout_quartic(double t, double b,
- double c, double d)
-{
- if(d != 0.0)
- t /= d;
- double ts = t * t;
- double tc = ts * t;
- return b + c * (-2 * tc + 3 * ts);
-
-}
-
-static double _anim_ease_inout_quintic(double t, double b,
- double c, double d)
-{
- if(d != 0.0)
- t /= d;
- double ts = t * t;
- double tc = ts * t;
- return b + c * (6 * tc * ts + -15 * ts * ts + 10 * tc);
-}
-
-anim_handle_t *create_animation()
-{
- anim_handle_t *anim;
-
- anim = calloc(1, sizeof(anim_handle_t));
-
- if (anim == NULL) {
- MSG_IVUG_ERROR("Cannot allocate memory");
- return NULL;
- }
-
- return anim;
-
-}
-
-void delete_animation(anim_handle_t *anim)
-{
- IV_ASSERT(anim != NULL);
-
- free(anim);
-
-}
-
-bool set_animation_type(anim_handle_t *anim, anim_type_t type)
-{
- IV_ASSERT(anim != NULL);
-
- switch (type) {
- case ANIM_TYPE_LINEAR:
- anim->transit_func = _anim_linear;
- break;
- case ANIM_TYPE_QUARTIC_INOUT:
- anim->transit_func = _anim_ease_inout_quartic;
- break;
-
- case ANIM_TYPE_QUINTIC_INOUT:
- anim->transit_func = _anim_ease_inout_quintic;
- break;
-
- case ANIM_TYPE_SINE:
- anim->transit_func = _anim_sine;
- break;
- default:
- MSG_IVUG_ERROR("Invalid transition type=%d", type);
- return false;
- break;
- }
-
- return true;
-}
-
-bool set_animation(anim_handle_t *anim, int start, int end, double duration)
-{
- IV_ASSERT(anim != NULL);
-
- MSG_IVUG_MED("Set Anim. Start=%d End=%d Dur=%f", start, end, duration);
- anim->duration = duration;
- anim->t_start = start;
- anim->t_varing = end - start;
-
- return true;
-}
-
-bool update_animation(anim_handle_t *anim, double current, int *value)
-{
- IV_ASSERT(anim != NULL);
- IV_ASSERT(anim->transit_func != NULL);
-
- if (current >= anim->duration) {
- *value = anim->t_start + anim->t_varing;
- MSG_IVUG_MED("End Start:%f Varing:%f Duration=%f",
- anim->t_start, anim->t_varing, anim->duration);
-
- MSG_IVUG_MED("End Current=%f Value=%d", current, *value);
-
- return false; /* End of animation */
- }
-
- MSG_IVUG_MED("Start:%f Varing:%f Duration=%f Current=%f", anim->t_start,
- anim->t_varing, anim->duration, current);
-
- *value = (int)anim->transit_func(current, anim->t_start, anim->t_varing,
- anim->duration);
-
- MSG_IVUG_MED("Value = %d", *value);
-
- return true;
-}
diff --git a/main/src/effect/ivug-effect.c b/main/src/effect/ivug-effect.c
deleted file mode 100755
index ea17ee5..0000000
--- a/main/src/effect/ivug-effect.c
+++ /dev/null
@@ -1,201 +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 "ivug-common.h"
-#include "ivug-effect.h"
-
-#define SIN_TABLE_NUM 91
-
-/* Animation acceleration table */
-static const float const EFFECT_SIN_TABLE[SIN_TABLE_NUM] = {
- 0.0000f, 0.0174f, 0.0349f, 0.0523f, 0.0698f,
- 0.0872f, 0.1045f, 0.1219f, 0.1392f, 0.1564f,
- 0.1736f, 0.1908f, 0.2079f, 0.2249f, 0.2419f,
- 0.2588f, 0.2756f, 0.2924f, 0.3090f, 0.3256f,
- 0.3420f, 0.3584f, 0.3746f, 0.3907f, 0.4067f,
- 0.4226f, 0.4384f, 0.4540f, 0.4695f, 0.4848f,
- 0.5000f, 0.5150f, 0.5299f, 0.5446f, 0.5592f,
- 0.5736f, 0.5878f, 0.6018f, 0.6157f, 0.6293f,
- 0.6528f, 0.6561f, 0.6691f, 0.6820f, 0.6947f,
- 0.7071f, 0.7193f, 0.7314f, 0.7431f, 0.7547f,
- 0.7660f, 0.7772f, 0.7880f, 0.7986f, 0.8090f,
- 0.8191f, 0.8290f, 0.8387f, 0.8480f, 0.8571f,
- 0.8660f, 0.8746f, 0.8829f, 0.8910f, 0.8988f,
- 0.9063f, 0.9135f, 0.9205f, 0.9272f, 0.9336f,
- 0.9397f, 0.9455f, 0.9511f, 0.9563f, 0.9613f,
- 0.9659f, 0.9703f, 0.9744f, 0.9781f, 0.9816f,
- 0.9848f, 0.9877f, 0.9903f, 0.9926f, 0.9945f,
- 0.9962f, 0.9976f, 0.9986f, 0.9994f, 0.9998f,
- 1.0f
-};
-
-#define SLIDESHOW_ANI_TIME (1.0f)
-
-
-static Eina_Bool
-_on_effect_animator(void *data)
-{
- IV_ASSERT( data != NULL);
- Effect_Engine *engine = data;
-
- int value = 0;
-
- if ( update_animation(engine->anim, ecore_loop_time_get() - engine->t_base, &value) == false ) // If last frame
- {
- engine->animator = NULL;
-
- MSG_EFFECT_HIGH("Last effect frame. value=%d", value);
-
- engine->func.animate(engine->eng_data, value); // Draw last frame.
- // Inform to user.
- if ( engine->pFinishedCB )
- {
- engine->pFinishedCB(engine->ClientData);
- }
-
- return ECORE_CALLBACK_CANCEL;
- }
-
- engine->func.animate(engine->eng_data, value);
-
- return ECORE_CALLBACK_RENEW;
-}
-
-
-bool ivug_effect_init(Effect_Engine *engine, Evas_Object *src, Evas_Object *dst, int w, int h, int rotation)
-{
- IV_ASSERT(engine != NULL );
-
- void *data = engine->func.init(src, dst, w, h, rotation);
- if (data == NULL) {
- MSG_EFFECT_ERROR("init returned data is NULL");
-
- return false;
- }
-
- engine->eng_data = data;
-
- engine->anim = create_animation();
- return true;
-}
-
-bool ivug_effect_start(Effect_Engine *engine, FuncFinished pFunc, void *data)
-{
- ivug_retvm_if(engine == NULL, false, "engine is NULL");
-
- IV_ASSERT(engine->func.animate != NULL);
- IV_ASSERT(engine->eng_data != NULL);
-
-// Set up slide show animator
- engine->t_base = ecore_loop_time_get();
-
- double duration = SLIDESHOW_ANI_TIME;
-
- if (engine->func.get_duration )
- {
- duration = engine->func.get_duration(engine->eng_data);
- }
-
- set_animation_type(engine->anim, ANIM_TYPE_LINEAR);
- set_animation(engine->anim, 0, 100, duration); // 0~100% during 1 seconds
-
- engine->pFinishedCB = pFunc;
- engine->ClientData = data;
-
- if (engine->animator == NULL)
- {
- engine->animator = ecore_animator_add(_on_effect_animator, engine);
- }
-
- return true;
-}
-
-bool ivug_effect_pause(Effect_Engine *engine)
-{
-/* Unused. */
- return true;
-}
-
-bool ivug_effect_resume(Effect_Engine *engine)
-{
-/* Unused. */
- return true;
-}
-
-bool ivug_effect_finalize(Effect_Engine *engine)
-{
- ivug_retvm_if(engine == NULL, false, "engine is NULL");
-
- if ( engine->animator )
- {
- ecore_animator_del(engine->animator);
- engine->animator = NULL;
- }
-
- if (engine->eng_data)
- {
- if (engine->func.finalize)
- {
- MSG_EFFECT_HIGH("finalize");
- engine->func.finalize(engine->eng_data);
- }
- else
- {
- MSG_EFFECT_ERROR("engine->func.finalize is NULL");
- }
-
- engine->eng_data = NULL;
- }
- else
- {
- MSG_EFFECT_ERROR("engine->eng_data is NULL");
- }
-
- if ( engine->anim )
- {
- delete_animation(engine->anim);
- }
-
- free(engine);
- engine = NULL;
-
- return true;
-}
-
-Effect_Engine *ivug_effect_add(Effect_Type type)
-{
- Effect_Engine *eng = NULL;
-
- switch (type) {
- case EFFECT_SLIDE:
- eng = ivug_slide_add();
- break;
-
- default:
- MSG_EFFECT_ERROR("Unknown effect type=%d", type);
- return NULL;
- break;
- }
-
- if (eng == NULL)
- {
- MSG_EFFECT_ERROR("Cannot create effect enigne. type=%d", type);
- return NULL;
- }
-
- return eng;
-}
diff --git a/main/src/effect/ivug-slide.c b/main/src/effect/ivug-slide.c
deleted file mode 100755
index adb38f9..0000000
--- a/main/src/effect/ivug-slide.c
+++ /dev/null
@@ -1,107 +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 "ivug-common.h"
-#include "ivug-effect.h"
-
-
-typedef struct {
- Evas_Object *src;
- Evas_Object *dst;
-
- int screen_w;
- int screen_h;
-} Priv_Data;
-
-
-static Effect_Data __ivug_slide_init(Evas_Object *src, Evas_Object *dst, int screen_w, int screen_h, int rotation)
-{
- Priv_Data *pData = calloc(1, sizeof(Priv_Data));
- IV_ASSERT(pData != NULL);
-
- pData->src = src;
- pData->dst = dst;
-
- pData->screen_w = screen_w;
- pData->screen_h = screen_h;
-
- evas_object_stack_below(dst, src);
-
- evas_object_move(pData->src, 0, 0);
-
-// ivug_slider_item_move(sd->slide[NEXT_SLIDE], x + sd->slide[CENTER_SLIDE]->w + IMAGE_BETWEEN_MARGIN , y);
-
- return (Effect_Data)pData;
-}
-
-static void __ivug_slide_anim(Effect_Data data, double percent)
-{
- Priv_Data *pData = (Priv_Data *)data;
-
- int first = 0;
- int last = -pData->screen_w -IMAGE_BETWEEN_MARGIN;
-
- int value = (double)first * (1.0f - percent / 100.0f) + (double)last * (percent / 100.0f);
-
- MSG_EFFECT_MED("Slide animation. Value=%d %f", value, percent);
-
- Evas_Coord ox, oy, ow, oh;
- evas_object_geometry_get(pData->src, &ox, &oy, &ow, &oh);
-
- evas_object_move(pData->src, value, oy);
- evas_object_move(pData->dst, value + ow + IMAGE_BETWEEN_MARGIN, oy);
-
-}
-
-static void __ivug_slide_pause(Effect_Data data)
-{
-
-}
-
-static void __ivug_slide_resume(Effect_Data data)
-{
-
-}
-
-static void __ivug_slide_finialize(Effect_Data data)
-{
- Priv_Data *pData = (Priv_Data *)data;
-
- free(pData);
-
-}
-
-static double __ivug_slide_get_duration(Effect_Data data)
-{
- return 0.2f;
-}
-
-
-
-Effect_Engine *ivug_slide_add(void)
-{
- Effect_Engine *eng_slide = calloc(1, sizeof(Effect_Engine));
- ivug_retvm_if(eng_slide == NULL, NULL, "calloc failed");
-
- eng_slide->func.init = __ivug_slide_init;
- eng_slide->func.animate = __ivug_slide_anim;
- eng_slide->func.pause = __ivug_slide_pause;
- eng_slide->func.resume = __ivug_slide_resume;
- eng_slide->func.finalize = __ivug_slide_finialize;
- eng_slide->func.get_duration = __ivug_slide_get_duration;
-
- return eng_slide;
-}
diff --git a/main/src/effect/template.c b/main/src/effect/template.c
deleted file mode 100755
index 22868eb..0000000
--- a/main/src/effect/template.c
+++ /dev/null
@@ -1,83 +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 "ivug-common.h"
-#include "ivug-effect.h"
-
-
-typedef struct {
- Evas_Object *src;
- Evas_Object *dst;
-
- Evas_Object *object;
- Evas_Object *orig_cliper;
-
- Evas_Object *cliper;
-
- int screen_w;
- int screen_h;
-} effect_data;
-
-
-static Effect_Data __ivug_init(Evas_Object *src, Evas_Object *dst, int screen_w, int screen_h, int rotation)
-{
- IVUG_FUNC_ENTER();
-
- IVUG_FUNC_LEAVE();
-}
-
-static void __ivug_anim(Effect_Data data, double percent)
-{
-/* IVUG_FUNC_ENTER(); */
-
-/* IVUG_FUNC_LEAVE(); */
-}
-
-static void __ivug_pause(Effect_Data data)
-{
- IVUG_FUNC_ENTER();
-
- IVUG_FUNC_LEAVE();
-}
-
-static void __ivug_resume(Effect_Data data)
-{
- IVUG_FUNC_ENTER();
-
- IVUG_FUNC_LEAVE();
-}
-
-static void __ivug_spin_finialize(Effect_Data data)
-{
- IVUG_FUNC_ENTER();
-
- IVUG_FUNC_LEAVE();
-}
-
-Effect_Engine *ivug_xxx_add(void)
-{
- Effect_Engine *eng_spin = calloc(1, sizeof(Effect_Engine));
- ivug_retvm_if(eng_spin == NULL, NULL, "calloc failed");
-
- eng_spin->func.init = &__ivug_init;
- eng_spin->func.animate = &__ivug_anim;
- eng_spin->func.pause = &__ivug_pause;
- eng_spin->func.resume = &__ivug_resume;
- eng_spin->func.finalize = &__ivug_finialize;
-
- return eng_spin;
-}
diff --git a/main/src/ug-image-viewer.c b/main/src/ug-image-viewer.c
index 44958fd..ab2377f 100755
--- a/main/src/ug-image-viewer.c
+++ b/main/src/ug-image-viewer.c
@@ -1,37 +1,98 @@
-/*
- * 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.
- */
-
+/*
+ * 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 <Elementary.h>
#include <ui-gadget-module.h>
+#include <app.h>
+
#include <Ecore_X.h> /*EFL*/
#include "ivug-common.h" //common
#include "ivug-util.h"
-#include "ivug-main.h"
#include "ivug-main-view.h"
#include "ivug-setas-view.h"
+#include "ivug-crop-ug.h"
#include "ivug-details-view.h"
-#include "ivug-slider.h"
+
+#include "ivug-callback.h"
+#include "ivug-context.h"
#include "ug-image-viewer.h"
-#include "ivug-data.h"
#include "ivug-parameter.h"
+static void _on_base_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ Evas_Coord x,y,w,h;
+ evas_object_geometry_get(obj, &x, &y, &w, &h);
+
+ MSG_IMAGEVIEW_HIGH("Base layout resized geomtery XYWH(%d,%d,%d,%d) angle=%d", x, y, w, h, elm_win_rotation_get(ug_get_window()));
+}
+
+static void _on_base_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ Evas_Coord x,y,w,h;
+ evas_object_geometry_get(obj, &x, &y, &w, &h);
+
+ MSG_IMAGEVIEW_HIGH("Base layout moved geomtery XYWH(%d,%d,%d,%d) angle=%d", x, y, w, h, elm_win_rotation_get(ug_get_window()));
+}
+
+static void _on_receive_mouse_down (void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ MSG_MAIN_HIGH("Base layout clicked : %s Layer=%d",evas_object_name_get(obj), evas_object_layer_get(obj));
+}
+
+static void _print_render_method(Evas *e)
+{
+ IV_ASSERT(e != NULL );
+
+ Eina_List *engines, *l;
+ int cur_id;
+ int id;
+ char *name;
+
+ engines = evas_render_method_list ();
+ if (!engines) {
+ MSG_IMAGEVIEW_ERROR("No engine is specified");
+ return;
+ }
+
+ cur_id = evas_output_method_get (e);
+
+ EINA_LIST_FOREACH (engines, l, name) {
+ id = evas_render_method_lookup (name);
+ if (name && id == cur_id)
+ {
+ MSG_IMAGEVIEW_HIGH("Render method is %s", name);
+ break;
+ }
+ }
+
+}
+
+static void _on_render_post(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ MSG_IMAGEVIEW_HIGH("***************render_post***************");
+}
+
+static void _on_render_pre(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ MSG_IMAGEVIEW_HIGH("***************render_pre***************");
+}
+
static Evas_Object *create_fullview(Evas_Object *win, struct ug_data *ugd)
{
Evas_Object *base;
@@ -42,7 +103,7 @@ static Evas_Object *create_fullview(Evas_Object *win, struct ug_data *ugd)
Eina_Bool ret;
ret = elm_layout_file_set(base , EDJ_PATH"/ivug-base.edj", "ivug_base" );
-
+ evas_object_name_set(base, "Base layout");
if ( ret == EINA_FALSE)
{
MSG_IMAGEVIEW_HIGH("Cannot set layout. EDJ=%s Group=%s", EDJ_PATH"/ivug-base.edj", "ivug_base");
@@ -65,16 +126,20 @@ static Evas_Object *create_frameview(Evas_Object *parent, struct ug_data *ugd)
/* Create Frame view */
base = elm_layout_add(parent);
+ evas_object_name_set(base, "Base layout frame");
elm_layout_theme_set(base, "layout", "application", "default");
return base;
}
-static void *on_create(struct ui_gadget *ug, enum ug_mode mode, bundle *data, void *priv)
+
+static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, void *priv)
{
struct ug_data *ugd;
- PERF_CHECK_BEGIN("On Create");
+ PERF_CHECK_END(LVL0, "UG_MODULE_INIT -> On Create");
+
+ PERF_CHECK_BEGIN(LVL0, "On Create");
MSG_IMAGEVIEW_HIGH("Image Viewer : %s ug=0x%08x", __func__, ug);
@@ -96,25 +161,27 @@ static void *on_create(struct ui_gadget *ug, enum ug_mode mode, bundle *data, vo
return NULL;
}
- PERF_CHECK_BEGIN(LVL1 "main_init");
+ PERF_CHECK_BEGIN(LVL1, "init context");
//init
- if (!ivug_main_init(ug))
+ if (!ivug_context_init(ug))
{
MSG_IMAGEVIEW_ERROR("ivug_main_init error");
return NULL;
}
- PERF_CHECK_END(LVL1 "main_init");
+ PERF_CHECK_END(LVL1, "init context");
- PERF_CHECK_BEGIN(LVL1 "parse bundle");
+ PERF_CHECK_BEGIN(LVL1, "parse bundle");
- ugd->ivug_param = ivug_param_create_from_bundle(data);
+ ugd->ivug_param = ivug_param_create_from_bundle(service);
if ( ugd->ivug_param == NULL )
{
MSG_IMAGEVIEW_ERROR("Cannot parse parameter");
- ivug_main_deinit(ug);
+ ivug_context_deinit(ug);
return NULL;
}
- PERF_CHECK_END(LVL1 "parse bundle");
+ PERF_CHECK_END(LVL1, "parse bundle");
+
+ PERF_CHECK_BEGIN(LVL1, "creating base");
//create base
if (mode == UG_MODE_FULLVIEW)
@@ -127,6 +194,7 @@ static void *on_create(struct ui_gadget *ug, enum ug_mode mode, bundle *data, vo
MSG_IMAGEVIEW_MED("create base layout for FrameView");
ugd->base = create_frameview(ug_get_window(), ugd);
}
+ PERF_CHECK_END(LVL1, "creating base");
if ( ugd->base == NULL )
{
@@ -134,14 +202,60 @@ static void *on_create(struct ui_gadget *ug, enum ug_mode mode, bundle *data, vo
return NULL;
}
+ MSG_IMAGEVIEW_HIGH("UG base created : 0x%08x", ugd->base);
+ evas_object_event_callback_add(ugd->base, EVAS_CALLBACK_MOUSE_DOWN, _on_receive_mouse_down, NULL);
+
+ evas_object_event_callback_add(ugd->base, EVAS_CALLBACK_RESIZE, _on_base_resize, NULL);
+ evas_object_event_callback_add(ugd->base, EVAS_CALLBACK_MOVE, _on_base_move, NULL);
+
+ evas_object_event_callback_add(ugd->base, EVAS_CALLBACK_RENDER_PRE, _on_render_pre, NULL);
+ evas_object_event_callback_add(ugd->base, EVAS_CALLBACK_RENDER_POST, _on_render_post, NULL);
+
if(ugd->ivug_param->mode == IVUG_MODE_SETAS)
{
MSG_IMAGEVIEW_HIGH("UG types=%d", ugd->ivug_param->setas_type);
- if(ugd->ivug_param->setas_type == IVUG_SET_AS_UG_TYPE_WALLPAPER)
+ ivug_setas_mode setas_mode = IVUG_SETAS_UG;
+ if(ugd->ivug_param->bStandalone == true)
+ {
+ setas_mode = IVUG_SETAS_APPSVC;
+ }
+
+ if(ugd->ivug_param->setas_type == IVUG_SET_AS_UG_TYPE_CALLER_ID)
+ {
+ ugd->setas_view = ivug_setas_view_callerid_ug_create(ugd->base, ugd->ivug_param->filepath,
+ setas_mode, ugd->ivug_param->width, ugd->ivug_param->height);
+ }
+ else if(ugd->ivug_param->setas_type == IVUG_SET_AS_UG_TYPE_VIDEO_CALL_ID)
+ {
+ ugd->setas_view = ivug_setas_view_video_call_id_ug_create(ugd->base, ugd->ivug_param->filepath,
+ setas_mode, ugd->ivug_param->width, ugd->ivug_param->height);
+ }
+ else if(ugd->ivug_param->setas_type == IVUG_SET_AS_UG_TYPE_WALLPAPER)
{
// From Wall paper in Setting
- ugd->setas_view = ivug_setas_view_screen_ug_create(ugd->base, ugd->ivug_param->filepath);
+ if(setas_mode == IVUG_SETAS_APPSVC)
+ {
+ ugd->setas_view = ivug_setas_view_screen_ug_create(ugd->base, ugd->ivug_param->filepath,
+ setas_mode, IVUG_CTRLBAR_SET_SCREEN_HOME);
+ }
+ else
+ {
+ ugd->setas_view = ivug_setas_view_screen_ug_create(ugd->base, ugd->ivug_param->filepath,
+ setas_mode, IVUG_CTRLBAR_SET_SCREEN_UNDEFINED);
+ }
+ }
+ else if(ugd->ivug_param->setas_type == IVUG_SET_AS_UG_TYPE_CROP)
+ {
+ // Crop UG
+ ugd->crop_ug = ivug_crop_ug_create(ugd->base,
+ ugd->ivug_param->width, ugd->ivug_param->height,
+ ugd->ivug_param->bRatioFix, ugd->ivug_param->filepath);
+ }
+ else if(ugd->ivug_param->setas_type == IVUG_SET_AS_UG_TYPE_WALLPAPER_ONLY)
+ {
+ ugd->setas_view = ivug_setas_view_screen_ug_create(ugd->base, ugd->ivug_param->filepath,
+ setas_mode, IVUG_CTRLBAR_SET_SCREEN_HOME);
}
else
{
@@ -149,19 +263,22 @@ static void *on_create(struct ui_gadget *ug, enum ug_mode mode, bundle *data, vo
return NULL;
}
- if(ugd->setas_view == NULL)
+ if(ugd->setas_view == NULL && ugd->crop_ug == NULL)
{
MSG_IMAGEVIEW_ERROR("SetAS UG creation failed Type:%d", ugd->ivug_param->setas_type);
- ivug_main_deinit(ug);
- if (ugd->base)
- {
- evas_object_del(ugd->base);
- ugd->base = NULL;
- }
- return NULL;
+ goto ON_CREATE_ERROR;
}
- Evas_Object *layout = ivug_setas_view_object_get(ugd->setas_view);
+ Evas_Object *layout = NULL;
+
+ if(ugd->setas_view)
+ {
+ layout = ivug_setas_view_object_get(ugd->setas_view);
+ }
+ else if(ugd->crop_ug)
+ {
+ layout = ivug_crop_ug_get_layout(ugd->crop_ug);
+ }
elm_object_part_content_set(ugd->base, "elm.swallow.content", layout); //swallow
evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -170,59 +287,92 @@ static void *on_create(struct ui_gadget *ug, enum ug_mode mode, bundle *data, vo
}
else
{
- PERF_CHECK_BEGIN(LVL1 "main_view_create");
+ PERF_CHECK_BEGIN(LVL1, "main_view_create");
ugd->main_view = ivug_main_view_create(ugd->base, ugd->ivug_param->mode, ugd->ivug_param->view_by);
+ PERF_CHECK_END(LVL1, "main_view_create");
+
if (ugd->main_view == NULL) //set main view.
{
MSG_IMAGEVIEW_ERROR("Main View Layout Lading Fail");
- ivug_main_deinit(ug);
- if (ugd->base)
- {
- evas_object_del(ugd->base);
- ugd->base = NULL;
- }
- return NULL;
+ goto ON_CREATE_ERROR;
}
- PERF_CHECK_END(LVL1 "main_view_create");
-
// Load list.
+ PERF_CHECK_BEGIN(LVL1, "main_view_load_list");
+
if ( ivug_main_view_load_list(ugd->main_view, ugd->ivug_param) == false)
{
MSG_IMAGEVIEW_ERROR("Cannot load media list.");
// Need popup?
- ivug_main_deinit(ug);
- if (ugd->base)
- {
- evas_object_del(ugd->base);
- ugd->base = NULL;
- }
- return NULL;
-
+ goto ON_CREATE_ERROR;
}
Evas_Object *layout = ivug_main_view_object_get(ugd->main_view);
elm_object_part_content_set(ugd->base, "elm.swallow.content", layout); //swallow
+
evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(layout);
-
+ PERF_CHECK_END(LVL1, "main_view_load_list");
}
- PERF_CHECK_END("On Create");
+
+ PERF_CHECK_BEGIN(LVL1, "Force render");
+
+ evas_render(evas_object_evas_get(ugd->base));
+
+ PERF_CHECK_END(LVL1, "Force render");
+
+ PERF_CHECK_END(LVL0, "On Create");
+
+ PERF_CHECK_BEGIN(LVL0, "On Create -> On Start");
return ugd->base;
+
+ON_CREATE_ERROR:
+ if(ugd->main_view)
+ {
+ ivug_main_view_destroy(ugd->main_view);
+ }
+ ivug_context_deinit(ug);
+ if (ugd->base)
+ {
+ evas_object_del(ugd->base);
+ ugd->base = NULL;
+ }
+ return NULL;
}
-static void on_start(struct ui_gadget *ug, bundle *data, void *priv)
+static void on_start(ui_gadget_h ug, service_h service, void *priv)
{
+ PERF_CHECK_END(LVL0, "On Create -> On Start");
+
+ PERF_CHECK_BEGIN(LVL0, "On Start");
+
MSG_IMAGEVIEW_HIGH("Image Viewer : %s", __func__);
+
+ if (!ug || !priv)
+ {
+ MSG_IMAGEVIEW_ERROR("Invalid UG. UG=0x%08x Priv=0x%08x", ug, priv);
+ return ;
+ }
+
+ struct ug_data *ugd = (struct ug_data *)priv;
+
+ if ( ugd->main_view )
+ {
+ PERF_CHECK_BEGIN(LVL1, "main_view_start");
+ ivug_main_view_start(ugd->main_view);
+ PERF_CHECK_END(LVL1, "main_view_start");
+ }
+
+ PERF_CHECK_END(LVL0, "On Start");
}
-static void on_pause(struct ui_gadget *ug, bundle *data, void *priv)
+static void on_pause(ui_gadget_h ug, service_h service, void *priv)
{
MSG_IMAGEVIEW_HIGH("Image Viewer : %s", __func__);
@@ -236,12 +386,12 @@ static void on_pause(struct ui_gadget *ug, bundle *data, void *priv)
if ( ugd->main_view )
{
- ivug_slider_stop_slide_show(ugd->main_view->slider);
+ ivug_main_view_pause(ugd->main_view);
}
}
-static void on_resume(struct ui_gadget *ug, bundle *data, void *priv)
+static void on_resume(ui_gadget_h ug, service_h service, void *priv)
{
MSG_IMAGEVIEW_HIGH("Image Viewer : %s", __func__);
@@ -255,18 +405,16 @@ static void on_resume(struct ui_gadget *ug, bundle *data, void *priv)
if ( ugd->main_view )
{
- ivug_main_view_update(ugd->main_view);
-
-// ivug_slider_resume_slide_show(ugd->main_view->slider);
+ ivug_main_view_resume(ugd->main_view);
}
}
-static void on_destroy(struct ui_gadget *ug, bundle *data, void *priv)
+static void on_destroy(ui_gadget_h ug, service_h service, void *priv)
{
MSG_IMAGEVIEW_HIGH("Image Viewer : %s UG=0x%08x", __func__, ug);
- PERF_CHECK_BEGIN("On Destroy");
+ PERF_CHECK_BEGIN(LVL0, "On Destroy");
if (!ug || !priv)
{
@@ -277,17 +425,28 @@ static void on_destroy(struct ui_gadget *ug, bundle *data, void *priv)
struct ug_data *ugd = (struct ug_data *)priv;
MSG_IMAGEVIEW_HIGH("On Destroy : ug=0x%08x", ug);
- //destroy main view.
- if ( ugd->main_view )
- {
- ivug_main_view_destroy(ugd->main_view);
- ugd->main_view = NULL;
- }
if(ugd->setas_view)
{
+ PERF_CHECK_BEGIN(LVL1, "SetAsView");
ivug_setas_view_destroy(ugd->setas_view);
ugd->setas_view = NULL;
+ PERF_CHECK_END(LVL1, "SetAsView");
+ }
+
+ if(ugd->crop_ug)
+ {
+ ivug_crop_ug_destroy(ugd->crop_ug);
+ ugd->crop_ug = NULL;
+ }
+
+ //destroy main view.
+ if ( ugd->main_view )
+ {
+ PERF_CHECK_BEGIN(LVL1, "MainView");
+ ivug_main_view_destroy(ugd->main_view);
+ ugd->main_view = NULL;
+ PERF_CHECK_END(LVL1, "MainView");
}
//delete param.
@@ -298,30 +457,66 @@ static void on_destroy(struct ui_gadget *ug, bundle *data, void *priv)
}
//finalize data
- if ( !ivug_main_deinit(ug))
+ PERF_CHECK_BEGIN(LVL1, "Context");
+ if ( !ivug_context_deinit(ug))
{
MSG_IMAGEVIEW_ERROR("ivug_main_deinit failed");
}
+ PERF_CHECK_END(LVL1, "Context");
if (ugd->base)
{
+ PERF_CHECK_BEGIN(LVL1, "Base layout");
evas_object_del(ugd->base);
ugd->base = NULL;
+ PERF_CHECK_END(LVL1, "Base layout");
}
MSG_IMAGEVIEW_HIGH("Destroyed all ug");
- PERF_CHECK_END("On Destroy");
-
+ PERF_CHECK_END(LVL0, "On Destroy");
}
+static bool _data_print(service_h service, const char *key, void *user_data)
+{
+ MSG_IVUG_HIGH(" %s", key);
+
+ return true;
+}
-static void on_message(struct ui_gadget *ug, bundle *msg, bundle *data, void *priv)
+static void on_message(ui_gadget_h ug, service_h msg, service_h service, void *priv)
{
MSG_IMAGEVIEW_HIGH("Image Viewer : %s UG=0x%08x", __func__, ug); //on message
+
+ if (!ug || !priv)
+ {
+ MSG_IMAGEVIEW_ERROR("Invalid UG. UG=0x%08x Priv=0x%08x", ug, priv);
+ return;
+ }
+
+ int ret = service_foreach_extra_data(service, _data_print, NULL);
+
+ if(SERVICE_ERROR_NONE != ret)
+ {
+ MSG_IVUG_ERROR("service_foreach_extra_data ERROR");
+ }
+
+ struct ug_data *ugd = (struct ug_data *)priv;
+
+ //ivug_msg_type msg_type = IVUG_MSG_NONE;
+
+ if(ugd->main_view == NULL)
+ {
+ MSG_IMAGEVIEW_ERROR("main view is NULL");
+ return;
+ }
+
+ ivug_callback_call(gGetCallbackHandle(), service, NULL, NULL);
+
+ return;
}
-static void on_event(struct ui_gadget *ug, enum ug_event event, bundle *data, void *priv)
+static void on_event(ui_gadget_h ug, enum ug_event event, service_h service, void *priv)
{
if (!ug || !priv)
{
@@ -330,8 +525,6 @@ static void on_event(struct ui_gadget *ug, enum ug_event event, bundle *data, vo
}
MSG_IMAGEVIEW_HIGH("Image Viewer : %s UG=0x%08x", __func__, ug); //on message
- //struct ug_data *ugd = (struct ug_data *)priv;
-
switch (event) {
case UG_EVENT_LOW_MEMORY:
MSG_IMAGEVIEW_HIGH("Get Event : Low Memory");
@@ -342,6 +535,14 @@ static void on_event(struct ui_gadget *ug, enum ug_event event, bundle *data, vo
case UG_EVENT_LANG_CHANGE:
MSG_IMAGEVIEW_HIGH("Get Event : Language changed");
break;
+
+ case UG_EVENT_ROTATE_PORTRAIT:
+ case UG_EVENT_ROTATE_LANDSCAPE:
+ case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN:
+ case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN:
+ // Rotate event is not used now.. plz, use only resized callback.
+ break;
+
default:
MSG_IMAGEVIEW_ERROR("Unknown event type : %d", event);
break;
@@ -352,7 +553,7 @@ UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
{
struct ug_data *ugd;
- MSG_IMAGEVIEW_HIGH("UG_MODULE_INIT");
+ MSG_IMAGEVIEW_HIGH("UG_MODULE_INIT. Ver=12.0");
if (!ops)
{
@@ -367,7 +568,7 @@ UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
return -1;
}
- PERF_INIT();
+ IV_PERF_INIT();
ops->create = on_create;
ops->start = on_start;
@@ -379,6 +580,8 @@ UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
ops->priv = ugd;
ops->opt = UG_OPT_INDICATOR_ENABLE;
+ PERF_CHECK_BEGIN(LVL0, "UG_MODULE_INIT -> On Create");
+
return 0;
}
@@ -400,9 +603,21 @@ UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)
MSG_IMAGEVIEW_HIGH("UG_MODULE_EXIT");
- PERF_SHOW_RESULT(stdout);
+#ifdef TA_SAVETO_FILE
+ FILE *fp = NULL;
+
+ fp = fopen(DATADIR"/"PACKAGE"/TimeAnal", "a");
+
+ IV_ASSERT(fp != NULL);
+
+ PERF_SHOW_RESULT(fp);
+
+ fclose(fp);
+#else
+ PERF_SHOW_RESULT(stderr);
+#endif
- PERF_DEINIT();
+ IV_PERF_DEINIT();
}
diff --git a/main/src/ug-image-viewer.h b/main/src/ug-image-viewer.h
index 412a53b..4c21b7c 100755
--- a/main/src/ug-image-viewer.h
+++ b/main/src/ug-image-viewer.h
@@ -1,25 +1,23 @@
-/*
- * 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.
- */
-
+/*
+ * 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_IMAGE_VIEWER_H__
#define __UG_IMAGE_VIEWER_H__
#include <Elementary.h>
-#include <libintl.h>
#include "ivug-common.h"
@@ -30,11 +28,11 @@ typedef struct ug_data {
// View Data;
Ivug_MainView *main_view;
Ivug_SetAsView *setas_view;
+ IvugCropUG *crop_ug;
ivug_parameter* ivug_param;
bool bUseBlackTheme; // TODO : SetAs view from setting does not use black theme
-
} _AppData;
#ifdef __cplusplus
@@ -48,3 +46,4 @@ extern "C" {
#endif
#endif /* __UG_IMAGE_VIEWER_H__ */
+
diff --git a/main/src/util/ivug-file-info.c b/main/src/util/ivug-file-info.c
deleted file mode 100755
index 6419761..0000000
--- a/main/src/util/ivug-file-info.c
+++ /dev/null
@@ -1,403 +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 "ivug-common.h"
-
-#include <libexif/exif-data.h> //for exif
-#include <mm_file.h>
-#include <mmf/mm.h>
-#include <mmf/mm_file.h>
-#include <aul.h>
-
-#include "ivug-file-info.h"
-
-bool _get_video_gps_info(const char *filepath, double *latitude, double *longitude)
-{
- IV_ASSERT(filepath != NULL);
- IV_ASSERT(latitude != NULL);
- IV_ASSERT(longitude != NULL);
-
- MMHandleType tag = (MMHandleType) NULL;
- int err = -1;
- char *err_msg = NULL;
- double gps_value = 0.0;
-
- *latitude = 0.0;
- *longitude = 0.0;
-
- err = mm_file_create_tag_attrs(&tag, filepath);
- if (!tag)
- {
- MSG_UTIL_ERROR("mm_file_create_tag_attrs ERROR %s", filepath);
- return false;
- }
-
- err = mm_file_get_attrs(tag, &err_msg, MM_FILE_TAG_LATIDUE, &gps_value, NULL);
- if (err == 0)
- {
- MSG_UTIL_HIGH("latitude: %f", gps_value);
- if (gps_value != 0.0)
- {
- *latitude = gps_value;
- }
- }
- else if (err_msg)
- {
- MSG_UTIL_ERROR("mm_file_get_attrs fails : %s", err_msg);
- free(err_msg);
- err_msg = NULL;
- mm_file_destroy_tag_attrs(tag);
-
- return false;
- }
-
- err = mm_file_get_attrs(tag, &err_msg, MM_FILE_TAG_LONGITUDE, &gps_value, NULL);
- if (err == 0)
- {
- MSG_UTIL_HIGH("longitude: %f", gps_value);
- if (gps_value != 0.0)
- {
- *longitude = gps_value;
- }
- }
- else if (err_msg)
- {
- MSG_UTIL_ERROR("mm_file_get_attrs fails : %s", err_msg);
- free(err_msg);
- err_msg = NULL;
- mm_file_destroy_tag_attrs(tag);
- return false;
- }
-
- mm_file_destroy_tag_attrs(tag);
- return true;
-}
-
-bool _get_image_gps_info(const char* filepath, double *latitude, double *longitude)
-{
- IV_ASSERT(filepath != NULL);
- IV_ASSERT(latitude != NULL);
- IV_ASSERT(longitude != NULL);
-
-#define BUF_LEN (255)
-
- ExifData *ed = NULL;
- ExifEntry *entry = NULL;
- ExifIfd ifd;
- ExifTag tag;
- char buf[BUF_LEN+1] = {'\0',};
-
- /** get exifdata*/
- ed = exif_data_new_from_file(filepath);
- if (!ed)
- {
- return false;
- }
-
- ifd = EXIF_IFD_GPS;
- tag = EXIF_TAG_GPS_LATITUDE;
-
- /** get exifentry*/
- entry = exif_data_get_entry(ed, tag);
-
- if (!entry)
- {
- return false;
- }
-
- /** get value of the entry*/
- if(exif_entry_get_value(entry, buf, BUF_LEN) == NULL)
- {
- exif_data_unref(ed);
- return false;
- }
-
- {
- buf[strlen(buf)] = '\0';
- double tmp_arr[3] = { 0.0, 0.0, 0.0 };
- int count = 0;
- char* p = strtok(buf, ", ");
- /** split the buf by , */
- while(p != NULL)
- {
- tmp_arr[count] = atof(p);
- count++;
- p=strtok(NULL, ", ");
- }
-
- if( count != 3 )
- {
- MSG_UTIL_ERROR("Cannot get latitude info : %s", p);
- exif_data_unref(ed);
- return false;
- }
- *latitude = tmp_arr[0] + tmp_arr[1]/60 + tmp_arr[2]/3600;
- }
-
- tag = EXIF_TAG_GPS_LONGITUDE;
-
- entry = exif_data_get_entry(ed, tag);
-
- /** get value of the entry*/
- if(exif_entry_get_value(entry, buf, BUF_LEN) == NULL)
- {
- exif_data_unref(ed);
- return false;
- }
-
- {
- buf[strlen(buf)] = '\0';
- double tmp_arr[3] = { 0.0, 0.0, 0.0 };
- int count = 0;
- char* p = strtok(buf, ", ");
- /** split the buf by , */
- while(p != NULL)
- {
- tmp_arr[count] = atof(p);
- count++;
- p=strtok(NULL, ", ");
- }
-
- if( count != 3 )
- {
- MSG_UTIL_ERROR("Cannot get Longitude info : %s", p);
- exif_data_unref(ed);
- return false;
- }
-
- *longitude = tmp_arr[0] + tmp_arr[1]/60 + tmp_arr[2]/3600;
- }
-
- exif_data_unref(ed);
-
- return true;
-}
-
-
-
-static bool _get_image_resolution(const char *path, int * /* OUT */ pWidth, int * /* OUT */pHeight)
-{
- IV_ASSERT(path != NULL);
-
- int width = 0;
- int height = 0;
-
- Evas *canvas;
- Ecore_Evas *ee;
-
- ee = ecore_evas_buffer_new(1, 1);
- if (!ee)
- {
- MSG_DETAIL_ERROR("Cannot get EVAS");
- return false;
- }
-
- canvas = ecore_evas_get(ee);
-
- Evas_Object *img = evas_object_image_add(canvas);
-
- evas_object_image_file_set(img, NULL, NULL);
- evas_object_image_load_orientation_set(img, EINA_TRUE);
- evas_object_image_load_scale_down_set(img, 0);
-
- evas_object_image_file_set(img, path, NULL); // TODO : Error check
- evas_object_image_size_get(img, &width, &height);
-
- evas_object_image_file_set(img, NULL, NULL);
- evas_object_del(img);
-
- ecore_evas_free(ee);
-
- *pWidth = width;
- *pHeight = height;
-
- MSG_DETAIL_HIGH("widht & height is [%d, %d]", width, height);
-
- return true;
-}
-
-
-static bool
-_get_video_resolution(const char *path, int * /* OUT */ pWidth, int * /* OUT */pHeight)
-{
- IV_ASSERT(path != NULL);
-
- int w = 0;
- int h = 0;
- int error_code = MM_ERROR_NONE;
-
- MMHandleType content = 0;
- char *err_attr_name = NULL;
-
- error_code = mm_file_create_content_attrs(&content, path);
-
- if ( error_code != MM_ERROR_NONE )
- {
- MSG_UTIL_ERROR("mm_file_create_content_attrs() failed : ret=0x%08x", error_code);
- return false;
- }
-
- error_code = MM_ERROR_NONE;
- error_code = mm_file_get_attrs(content, &err_attr_name,
- MM_FILE_CONTENT_VIDEO_WIDTH, &w,
- MM_FILE_CONTENT_VIDEO_HEIGHT, &h,
- NULL
- );
-
- if (error_code != MM_ERROR_NONE)
- {
- MSG_DETAIL_ERROR("mm_file_get_attrs() failed : ret=0x%08x", error_code);
- MSG_DETAIL_ERROR("Error attribute name : %s", err_attr_name);
- free(err_attr_name);
-
- error_code = mm_file_destroy_content_attrs(content);
- if (error_code != 0)
- {
- MSG_DETAIL_ERROR("mm_file_destroy_content_attrs() failed : ret=0x%08x", error_code);
- }
-
- return false;
- }
-
- *pWidth = w;
- *pHeight = h;
-
- error_code = mm_file_destroy_content_attrs(content);
- if (error_code != 0)
- {
- MSG_DETAIL_ERROR("mm_file_destroy_content_attrs() failed : ret=0x%08x", error_code);
- }
-
- return true;
-}
-
-bool ivug_fileinfo_get_image_resolution(const char *path, int * /* OUT */ pWidth, int * /* OUT */pHeight)
-{
- if ( path == NULL )
- {
- MSG_UTIL_ERROR("Cannot get image resolution. path is NULL");
- return false;
- }
-
- if(ivug_is_file_exist(path) == false)
- {
- MSG_UTIL_ERROR("%s : %s is not exist", __func__, path);
- return false;
- }
-
- return _get_image_resolution(path, pWidth, pHeight);
-}
-
-
-bool ivug_fileinfo_get_video_resolution(const char *path, int * /* OUT */ pWidth, int * /* OUT */pHeight)
-{
- if ( path == NULL )
- {
- MSG_UTIL_ERROR("Cannot get video resolution. path is NULL");
- return false;
- }
-
- if(ivug_is_file_exist(path) == false)
- {
- MSG_UTIL_ERROR("%s : %s is not exist", __func__, path);
- return false;
- }
-
- return _get_video_resolution(path, pWidth, pHeight);
-}
-
-bool ivug_fileinfo_get_video_gps_info(const char *path, double *latitude, double *longitude)
-{
- if ( path == NULL )
- {
- MSG_UTIL_ERROR("Cannot get video gps location. path is NULL");
- return false;
- }
-
- if(ivug_is_file_exist(path) == false)
- {
- MSG_UTIL_ERROR("%s : %s is not exist", __func__, path);
- return false;
- }
-
- return _get_video_gps_info(path, latitude, longitude);
-}
-
-
-bool ivug_fileinfo_get_image_gps_info(const char* path, double *latitude, double *longitude)
-{
- if ( path == NULL )
- {
- MSG_UTIL_ERROR("Cannot get image gps location. path is NULL");
- return false;
- }
-
- if(ivug_is_file_exist(path) == false)
- {
- MSG_UTIL_ERROR("%s : %s is not exist", __func__, path);
- return false;
- }
-
- return _get_image_gps_info(path, latitude, longitude);
-}
-
-
-char *ivug_fileinfo_get_file_extension(const char *path)
-{
- if ( path == NULL )
- {
- MSG_UTIL_ERROR("Cannot get file extension. path is NULL");
- return NULL;
- }
-
- char *ext = NULL;
-
- ext = strrchr(path, '.');
-
- if ( (ext != NULL) && ((ext+1) != NULL) )
- {
- return strdup(ext + 1);
- }
-
- return NULL;
-
-}
-
-char *ivug_fileinfo_get_mime_type(const char *path)
-{
- if ( path == NULL )
- {
- MSG_UTIL_ERROR("Cannot get mine type. path is NULL");
- return NULL;
- }
-
- //check mine type.
- char *mime_type = NULL;
-
- efreet_mime_init();
- const char *type = NULL;
- type = efreet_mime_type_get(ecore_file_file_get(path));
- if ( type != NULL )
- {
- mime_type = strdup(type);
- }
- efreet_mime_shutdown();
-
- return mime_type;
-}
-
-
diff --git a/main/src/util/ivug-file-info.h b/main/src/util/ivug-file-info.h
deleted file mode 100755
index ac8a3fa..0000000
--- a/main/src/util/ivug-file-info.h
+++ /dev/null
@@ -1,57 +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 __IVUG_FILE_INFO_H__
-#define __IVUG_FILE_INFO_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- ivug_fileinfo_*() returns false when error. otherwise return true and fill proper value in [out] param
-*/
-bool ivug_fileinfo_get_image_gps_info(const char* filepath, double * /* OUT */ latitude, double * /* OUT */ longitude);
-bool ivug_fileinfo_get_video_gps_info(const char *filepath, double * /* OUT */ latitude, double * /* OUT */ longitude);
-
-bool ivug_fileinfo_get_video_resolution(const char *filepath, int * /* OUT */ pWidth, int * /* OUT */pHeight);
-bool ivug_fileinfo_get_image_resolution(const char *filepath, int * /* OUT */ pWidth, int * /* OUT */pHeight);
-
-
-/*
- return file extension string.
-
- CAUTION : user should free returned string.
-*/
-char *ivug_fileinfo_get_file_extension(const char *filepath);
-
-
-/*
- return mine type from file.
-
- CAUTION : user should free returned string.
-*/
-char *ivug_fileinfo_get_mime_type(const char *path);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif // __IVUG_FILE_INFO_H__
-
diff --git a/main/src/util/ivug-listpopup.c b/main/src/util/ivug-listpopup.c
deleted file mode 100755
index 6ea395f..0000000
--- a/main/src/util/ivug-listpopup.c
+++ /dev/null
@@ -1,274 +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 "ivug-common.h"
-#include "ivug-listpopup.h"
-
-
-#define POPUP_RESPONSE_NOT_SELECTED (-99)
-
-
-typedef struct {
- Evas_Object *popup;
-
- Evas_Smart_Cb response;
- void* user_data;
-
-} Selectpopup;
-
-
-static char *
-_on_label_set(void *data, Evas_Object *obj, const char *part)
-{
- IV_ASSERT( data != NULL);
-
- ivug_listpopup_item *item = (ivug_listpopup_item *)data;
-
- return strdup(item->caption); //dump
-}
-
-
-static void
-_on_genlist_selected(void *data, Evas_Object *obj, void *event_info)
-{
- Selectpopup *pData = data;
- Evas_Object *genlist = obj;
- Elm_Object_Item *genitem = (Elm_Object_Item *)event_info;
-
- IV_ASSERT( genlist != NULL);
-
- if (genitem == NULL)
- {
- MSG_MAIN_ERROR("genlist item is NULL");
- return;
- }
-
- ivug_listpopup_item *item = (ivug_listpopup_item *)elm_object_item_data_get(genitem);
-
-// Call response
- pData->response(pData->user_data, pData->popup, item);
-
-}
-
-
-static ivug_listpopup_item *_dup_item(ivug_listpopup_item *item)
-{
- ivug_listpopup_item *newitem = NULL;
-
- newitem = calloc(1, sizeof(ivug_listpopup_item));
-
- newitem->index = item->index;
-
- if ( item->iconpath )
- newitem->iconpath = strdup(item->iconpath);
-
- if ( item->caption )
- newitem->caption = strdup(item->caption); // Should be freed
-
- newitem->data = item->data;
-
- return newitem;
-}
-
-
-static void _on_genlist_item_del(void *data, Evas_Object *obj)
-{
- IV_ASSERT( data != NULL);
-
- ivug_listpopup_item *item = data;
-
- MSG_IMAGEVIEW_HIGH("Remove genlist item");
-
- if ( item->caption )
- free(item->caption);
-
- if ( item->iconpath )
- free(item->iconpath);
-
- free(item);
-}
-
-
-static void
-_on_popup_close(void *data, Evas_Object *obj, void *event_info)
-{
- Selectpopup *pData = data;
-
- pData->response(pData->user_data, pData->popup, NULL); // Call user callback
-}
-
-static void _on_popup_deleted(void * data, Evas * e, Evas_Object * obj, void * event_info)
-{
- MSG_IMAGEVIEW_HIGH("Remove popup");
-
- Selectpopup *pData = data;
-
- free(pData);
-}
-
-
-
-typedef struct {
- Eina_List *list;
-} _ivug_listpopup_itemlist;
-
-
-ivug_listpopup_itemlist ivug_listpopup_itemlist_new()
-{
- _ivug_listpopup_itemlist *pList = malloc(sizeof(_ivug_listpopup_itemlist));
- IV_ASSERT(pList != NULL);
-
- pList->list = NULL;
-
- return (ivug_listpopup_itemlist)pList;
-}
-
-unsigned int ivug_listpopup_itemlist_get_count(ivug_listpopup_itemlist items)
-{
- _ivug_listpopup_itemlist *pList = items;
- IV_ASSERT(pList != NULL);
-
- return eina_list_count(pList->list);
-}
-
-ivug_listpopup_item *ivug_listpopup_itemlist_add(ivug_listpopup_itemlist items, int index, const char *iconpath, const char *caption, void *data, bool bDisabled)
-{
- _ivug_listpopup_itemlist *pList = items;
- IV_ASSERT(pList != NULL);
-
- ivug_listpopup_item *item = NULL;
-
- {
- item = calloc(1, sizeof(ivug_listpopup_item));
-
- item->index = index;
-
- if ( iconpath )
- item->iconpath = strdup(iconpath);
-
- if ( caption )
- item->caption = strdup(caption); // Should be freed
-
- item->data = data;
- item->bDisabled = bDisabled;
- }
-
- pList->list = eina_list_append(pList->list, item);
-
- return item;
-
-
-}
-
-void ivug_listpopup_itemlist_free(ivug_listpopup_itemlist items)
-{
- _ivug_listpopup_itemlist *pList = items;
- IV_ASSERT(pList != NULL);
-
- ivug_listpopup_item *item = NULL;
-
- EINA_LIST_FREE(pList->list, item )
- {
- if ( item->caption )
- free(item->caption);
-
- if ( item->iconpath )
- free(item->iconpath);
-
- free(item);
- }
-
- free(pList);
-}
-
-
-Evas_Object *ivug_listpopup_show(Evas_Object *parent, const char* title, ivug_listpopup_itemlist items, Evas_Smart_Cb response, void* user_data)
-{
- Evas_Object *popup;
-
-// create popup
- popup = elm_popup_add(parent);
- if (!popup)
- {
- MSG_IMAGEVIEW_ERROR("Error : popup create failed.");
- return NULL;
- }
-
- elm_object_style_set(popup, "menustyle");
- elm_object_part_text_set(popup, "title,text", title);
-
- evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_weight_set(popup, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
- Evas_Object *btn_close = elm_button_add(popup);
- elm_object_text_set(btn_close, IDS_CLOSE);
- elm_object_part_content_set(popup, "button1", btn_close);
-
-// create genlist
- Evas_Object *genlist;
- static Elm_Genlist_Item_Class itc = {0,};
-
- genlist = elm_genlist_add(popup);
-
- itc.version = ELM_GENLIST_ITEM_CLASS_VERSION;
- itc.item_style = "1text";
- itc.func.text_get = _on_label_set;
- itc.func.content_get = NULL;
- itc.func.state_get = NULL;
- itc.func.del = _on_genlist_item_del;
-
- evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
- Selectpopup *pData = malloc(sizeof(Selectpopup));
-
- pData->popup = popup;
- pData->response = response;
- pData->user_data = user_data;
-
- _ivug_listpopup_itemlist *pList = items;
-
- ivug_listpopup_item *pItem = NULL;
- Eina_List *tmp;
- Elm_Object_Item *gItem;
-
-
- EINA_LIST_FOREACH(pList->list, tmp, pItem)
- {
- gItem = elm_genlist_item_append(genlist, &itc, _dup_item(pItem), NULL /* parent */, ELM_GENLIST_ITEM_NONE, _on_genlist_selected, pData);
-
- elm_object_item_disabled_set(gItem, pItem->bDisabled);
- }
-
-// Put together
- Evas_Object *box;
- box = elm_box_add(popup);
- evas_object_show(genlist);
- elm_box_pack_end(box, genlist);
- elm_object_content_set(popup, box);
-
- evas_object_smart_callback_add(btn_close, "clicked", _on_popup_close, pData);
-
- evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _on_popup_deleted, pData);
-
- evas_object_show(popup);
-
- return popup;
-
-}
-
-
diff --git a/main/src/util/ivug-listpopup.h b/main/src/util/ivug-listpopup.h
deleted file mode 100755
index 11715eb..0000000
--- a/main/src/util/ivug-listpopup.h
+++ /dev/null
@@ -1,81 +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 __IVUG_LISTPOPUP_H__
-#define __IVUG_LISTPOPUP_H__
-
-typedef struct {
- int index;
-
- char *iconpath;
- char *caption;
- void *data;
-
- bool bDisabled; // Item is disabled when true.
-} ivug_listpopup_item;
-
-typedef void *ivug_listpopup_itemlist;
-
-/*
- Helper functions for ivug_listpopup_item
-*/
-ivug_listpopup_itemlist ivug_listpopup_itemlist_new();
-
-ivug_listpopup_item *ivug_listpopup_itemlist_add(ivug_listpopup_itemlist items, int index, const char *iconpath, const char *caption, void *data, bool bDisabled);
-
-void ivug_listpopup_itemlist_free(ivug_listpopup_itemlist items);
-
-
-
-/*
- Create & Show popup including genlist.
-
- example
-
- void _on_selected(void *data, Evas_Object *obj, void *event_info)
- {
- Evas_Object *popup = genlist;
- ivug_listpopup_item *item = event_info;
- int nIndex = event_info;
-
- if ( nIndex == 1 )
- printf("1 is selected");
-
- evas_object_del(popup); // Show destroy popup explicitly
- mypopup = NULL;
- }
-
- ...
- {
- ivug_listpopup_itemlist items = ivug_listpopup_itemlist_new();
-
- ivug_listpopup_itemlist_add(items, 0, NULL, "Select me 1", NULL, false);
- ivug_listpopup_itemlist_add(items, 1, NULL, "Select me 1", NULL, false);
- ivug_listpopup_itemlist_add(items, 2, "/data/myicon.png", "Select me 1", NULL, false);
-
- mypopup = ivug_selectpopup_show(parent, "example", items, v, myData);
-
- eina_list_free(items);
- }
-
-
-*/
-Evas_Object *ivug_listpopup_show(Evas_Object *parent, const char* title, ivug_listpopup_itemlist items , Evas_Smart_Cb response, void* user_data);
-
-
-#endif // __IVUG_LISTPOPUP_H__
-
diff --git a/main/src/util/ivug-util.c b/main/src/util/ivug-util.c
deleted file mode 100755
index 496f027..0000000
--- a/main/src/util/ivug-util.c
+++ /dev/null
@@ -1,286 +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 "ivug-common.h"
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <aul.h>
-
-#include <vconf.h>
-#include <vconf-keys.h>
-#include <pmapi.h>
-
-#include <media-svc.h>
-#include <visual-svc.h>
-
-/*
- If filepath is web url, return TRUE.
-
-*/
-bool ivug_is_web_uri(const char* uri)
-{
-//check file url type. local , http, ftp.
- IV_ASSERT(uri != NULL);
-
- static const char* web_protocal_name[] =
- {
- "http://",
- "ftp://",
- NULL,
- };
-
- int i = 0;
- while (web_protocal_name[i] != NULL)
- {
- if ( strlen(uri) > strlen(web_protocal_name[i]) )
- {
- if (strncmp(uri, web_protocal_name[i], strlen(web_protocal_name[i])) == 0)
- {
- return true;
- }
- }
-
- i++;
- }
-
- MSG_UTIL_MED("Not web uri. %s", uri);
-
- return false;
-}
-
-
-unsigned int get_distance(int prevX, int prevY, int X, int Y)
-{
-#include <math.h>
- int dx = prevX - X;
- int dy = prevY - Y;
-
- return sqrt(dx*dx + dy*dy);
-}
-
-
-
-#define USE_ECORE_FILE
-
-#include <Ecore_File.h>
-
-/*
- Remove fname file.
- Returns true fname is not exist or removed sucessfully
-*/
-bool ivug_remove_file(const char *filepath)
-{
- char error_msg[256];
- if (ecore_file_exists(filepath) == EINA_FALSE)
- {
- MSG_UTIL_ERROR("Already removed.%s", filepath);
- return true;
- }
-
-#ifdef USE_ECORE_FILE
- if ( ecore_file_unlink(filepath) == EINA_FALSE)
- {
- MSG_UTIL_ERROR("Cannot remove file : %s %s", filepath, strerror_r(errno, error_msg, sizeof(error_msg)) );
- return false;
- }
-
- return true;
-#else
- if ( unlink(filepath) != 0 )
- {
- MSG_UTIL_ERROR("Cannot remove file : %s %s", filepath, strerror_r(errno, error_msg, sizeof(error_msg)) );
- return false;
- }
-
- return true;
-#endif
-}
-
-bool ivug_rename_file(const char *src, const char *dst)
-{
- if (ecore_file_exists(src) == EINA_FALSE)
- {
- MSG_UTIL_ERROR("Source file is not exist : %s", src);
- return false;
- }
-
- if (dst == NULL)
- {
- MSG_UTIL_ERROR("Destination file is NULL");
- return false;
- }
-
-
- char error_msg[256];
-
- if ( rename(src, dst) < 0)
- {
- MSG_UTIL_ERROR("Cannot rename from %s to %s : %s", src, dst, strerror_r(errno, error_msg, sizeof(error_msg)) );
- return false;
- }
-
- return true;
-}
-
-char *
-ivug_mktemp(char* filepath, char*ext)
-{
- ivug_retv_if(!filepath || !ext, NULL);
-
- MSG_IVUG_HIGH("filepath %s, ext %s", filepath, ext);
-
- char tempname[IVUG_MAX_FILE_PATH_LEN+1] = {0};
- snprintf(tempname, sizeof(tempname), "%s_0.%s",filepath, ext);
- int i = 1;
-
-// TODO : Will implement with another algorithm
- while(ecore_file_exists(tempname) == EINA_TRUE )
- {
- snprintf(tempname, sizeof(tempname),"%s_%d.%s", filepath, i, ext);
- i++;
- }
-
- MSG_IVUG_HIGH( " tempname %s, i %d", tempname, i);
-
- return strdup(tempname);
-}
-
-
-/*
- Check whether given filepath file exists
-
- CAUTION : filepath cannot be NULL.
-*/
-bool ivug_is_file_exist(const char* filepath)
-{
- IV_ASSERT(filepath != NULL);
-
- if ( ecore_file_exists(filepath) == EINA_TRUE)
- {
- return true;
- }
-
- return false;
-}
-
-
-/*
- Returns start pointer of filename within filepath.
- No memory allocated in this function. so user do not free returned pointer.
-
- CAUTION : filepath cannot be NULL.
-*/
-const char * ivug_get_filename(const char *filepath)
-{
- if ( filepath == NULL )
- {
- MSG_UTIL_WARN("File path is NULL");
- return "NULL";
- }
-
-#define DIRECORY_SPLITTER '/'
- const char*pFileName = NULL;
-
- pFileName = strrchr(filepath, DIRECORY_SPLITTER);
- pFileName = (NULL == pFileName)? "": (pFileName+1);
-
- return pFileName;
-}
-
-
-/*
-
- Media service utility
-
-*/
-
-#include <media-svc.h>
-
-UUID ivug_get_album_id_from_filepath(const char *filepath)
-{
- int ret = 0;
- Mitem* item = NULL;
-
- MediaSvcHandle *dbhandle = NULL;
-
- int err = media_svc_connect(&dbhandle);
- if (err != MB_SVC_ERROR_NONE)
- {
- MSG_UTIL_ERROR("DB open error. %d", err);
- return NULL;
- }
-
- ret = minfo_get_item(dbhandle, filepath, &item); //get cluster id
- if (ret != MB_SVC_ERROR_NONE)
- {
- MSG_UTIL_ERROR("Cannot find file in media db for %s", filepath);
- return NULL; // Invalid id
- }
-
- UUID cluster_uuid = INVALID_UUID;
-
- cluster_uuid = uuid_assign(item->cluster_uuid);
-
- minfo_destroy_mtype_item(item);
-
- err = media_svc_disconnect(dbhandle);
- if (err != MB_SVC_ERROR_NONE)
- {
- MSG_SDATA_ERROR("media service finalize error=%d", err);
- }
-
- return cluster_uuid;
-
-}
-
-int ivug_prohibit_lcd_off(void)
-{
- MSG_UTIL_MED("START : Sleep disabled");
- return pm_lock_state(LCD_NORMAL, GOTO_STATE_NOW, 0);
-}
-
-int ivug_allow_lcd_off(void)
-{
- MSG_UTIL_MED("END : Sleep disabled");
- return pm_unlock_state(LCD_NORMAL, PM_KEEP_TIMER);
-}
-
-#define MIME_TYPE_LEN (255)
-#define MIME_TYPE_3GPP "video/3gpp"
-#define PATH_CAMERA_LOCAL "/opt/media/Camera shots"
-#define PATH_CAMERA_SDCARD "/opt/storage/sdcard/Camera shots/"
-
-/* Video editor can start when video exist in camera folder and 3gp file format */
-
-bool ivug_is_editable_video_file(char *filepath)
-{
- MSG_UTIL_MED("path = %s", filepath);
- if(strncmp(filepath, PATH_CAMERA_LOCAL, strlen(PATH_CAMERA_LOCAL)) == 0
- || strncmp(filepath, PATH_CAMERA_SDCARD, strlen(PATH_CAMERA_SDCARD)) == 0)
- {
- char mime_type[MIME_TYPE_LEN] = {0,};
- aul_get_mime_from_file(filepath, mime_type, sizeof(mime_type));
- MSG_UTIL_MED("mime type = %s", mime_type);
- if(strcmp(mime_type, MIME_TYPE_3GPP) == 0)
- {
- return true;
- }
- }
- return false;
-}
-
diff --git a/main/src/util/ivug-util.h b/main/src/util/ivug-util.h
deleted file mode 100755
index 0c07169..0000000
--- a/main/src/util/ivug-util.h
+++ /dev/null
@@ -1,78 +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 __IVUG_UTIL_H__
-#define __IVUG_UTIL_H__
-
-#include <stdbool.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-
-*/
-bool ivug_is_web_uri(const char* uri);
-
-bool ivug_remove_file(const char *filepath);
-
-bool ivug_is_file_exist(const char* filepath);
-
-bool ivug_rename_file(const char *src, const char *dst);
-
-inline const char *ivug_get_filename(const char *filepath);
-
-inline unsigned int get_distance(int prevX, int prevY, int X, int Y);
-
-/*
- Generate temporary file name with given path and extension.
- returned value should free() by user.
-*/
-char *ivug_mktemp(char* filepath, char*ext);
-
-
-/*
- Media service wrapper utility
-*/
-
-UUID ivug_get_album_id_from_filepath(const char *filepath);
-
-
-/*
- LCD sleep control.
-*/
-int ivug_prohibit_lcd_off(void);
-int ivug_allow_lcd_off(void);
-
-
-/*
- Get mime type from file path.
- should free returned after use.
-*/
-
-bool ivug_is_editable_video_file(char *filepath);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-#endif //__IVUG_UTIL_H__
-
diff --git a/main/src/util/ivug-widget.c b/main/src/util/ivug-widget.c
deleted file mode 100755
index fd43992..0000000
--- a/main/src/util/ivug-widget.c
+++ /dev/null
@@ -1,209 +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 "ivug-common.h"
-#include "ivug-widget.h"
-#include <ui-gadget-module.h>
-
-#include <Elementary.h>
-
-static void _on_obj_deleted(void * data, Evas * e, Evas_Object * obj, void * event_info)
-{
- char *szMsg = (char *)data;
- IV_ASSERT(szMsg != NULL);
-
- MSG_MAIN_HIGH("On Object deleted. %s", szMsg);
-
- free(szMsg);
-}
-
-void ivug_on_obj_deleted(Evas_Object* obj, char *msg, const char *func, int line)
-{
- static char buf[1024];
-
- sprintf(buf, "%s(L%d):%s", func, line, msg);
-
- evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _on_obj_deleted, strdup(buf));
-}
-
-Evas_Object* ivug_bg_add(Evas_Object* parent, int r, int g, int b)
-{
- IV_ASSERT(parent != NULL);
-
- Evas_Object *bg = elm_bg_add(parent);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-// elm_win_resize_object_add(parent, bg);
-
- elm_bg_color_set(bg, r, g, b);
-
- evas_object_show(bg);
-
- return bg;
-}
-
-Evas_Object *
-ivug_layout_add(Evas_Object *win, const char *edj, const char *group)
-{
- IV_ASSERT(win != NULL);
-
- Evas_Object *layout;
-
- layout = elm_layout_add(win);
-
- if ( layout == NULL )
- {
- MSG_SETAS_ERROR("Cannot create layout");
- return NULL;
- }
-
- if (elm_layout_file_set(layout, edj, group) == EINA_FALSE)
- {
- MSG_SETAS_ERROR("edj loading fail, filepath=%s Group=%s", edj, group);
- evas_object_del(layout);
- return NULL;
- }
-
- evas_object_size_hint_expand_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_fill_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-#ifdef USE_WIN_AS_PARENT
- elm_win_resize_object_add( ug_get_window(), layout);
-#else
- Evas_Coord x, y, w, h;
- evas_object_geometry_get(win, &x, &y, &w, &h);
-
- evas_object_move(layout, x, y);
- evas_object_resize(layout, w, h);
-#endif
-
- evas_object_show(layout);
- return layout;
-}
-
-Evas_Object*
-ivug_default_layout_add( Evas_Object *win)
-{
- IV_ASSERT(win != NULL);
-
- Evas_Object *layout;
- layout = elm_layout_add(win);
-
- if ( layout == NULL )
- {
- MSG_SETAS_ERROR("Cannot create layout");
- return NULL;
- }
-
- if ( elm_layout_theme_set( layout, "layout", "application", "default") == EINA_FALSE)
- {
- MSG_SETAS_ERROR("theme set fail, layout/application/defaulty");
- evas_object_del(layout);
- return NULL;
- }
-
- evas_object_size_hint_expand_set( layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_fill_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL );
-
-#ifdef USE_WIN_AS_PARENT
- elm_win_resize_object_add( ug_get_window(), layout);
-#else
- Evas_Coord x, y, w, h;
- evas_object_geometry_get(parent, &x, &y, &w, &h);
-
- evas_object_move(layout, x, y);
- evas_object_resize(layout, w, h);
-#endif
-
- evas_object_show(layout);
- return layout;
-}
-
-
-Evas_Object *ivug_button_add(Evas_Object *parent, char *style, char *caption, Evas_Object *icon, OnClickCB pFunc, const void * data )
-{
- IV_ASSERT(parent != NULL);
-
- Evas_Object *btn;
-
- btn = elm_button_add(parent);
- if ( btn == NULL )
- {
- return NULL;
- }
-
- if ( style )
- elm_object_style_set(btn, style);
-
- if ( caption )
- elm_object_text_set(btn, caption);
-
- if ( icon )
- elm_object_part_content_set(btn, "icon", icon);
-
- elm_object_focus_allow_set(btn, EINA_FALSE);
- evas_object_propagate_events_set(btn, EINA_FALSE);
-
- evas_object_smart_callback_add(btn, "clicked", pFunc, (void*)data);
-
- return btn;
-}
-
-Evas_Object *ivug_icon_add(Evas_Object *parent, char *edjname, char *groupname)
-{
- Evas_Object *icon;
-
- icon = elm_icon_add(parent);
-
- if ( elm_icon_file_set(icon, edjname, groupname) == EINA_FALSE)
- {
- MSG_IVUG_ERROR("Cannot file set. EDJ=%s Group=%s", edjname, groupname);
- evas_object_del(icon);
- return NULL;
- }
-
- evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
- elm_icon_resizable_set(icon, EINA_TRUE, EINA_TRUE);
- evas_object_size_hint_expand_set(icon, 1, 1);
-
- return icon;
-}
-
-Evas_Object *ivug_controlbar_add(Evas_Object *parent, const char *style)
-{
- Evas_Object *toolbar = elm_toolbar_add(parent);
- if (!toolbar)
- {
- MSG_MAIN_ERROR("create tool bar failed");
- return NULL;
- }
- elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
- elm_object_style_set(toolbar, style);
-
- return toolbar;
-}
-
-
-
-void
-ivug_object_del(Evas_Object *obj)
-{
- evas_object_del(obj);
-}
-
-
diff --git a/main/src/util/ivug-widget.h b/main/src/util/ivug-widget.h
deleted file mode 100755
index 151ee1e..0000000
--- a/main/src/util/ivug-widget.h
+++ /dev/null
@@ -1,68 +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 __IVUG_WIDGET_H__
-#define __IVUG_WIDGET_H__
-
-
-typedef void(*OnClickCB)(void *data, Evas_Object *obj, void *event_info);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- Internal use only... use macro DELETE_LOG instead
-*/
-void ivug_on_obj_deleted(Evas_Object* obj, char *msg, const char *func, int line);
-
-
-#define DELETE_NOTIFY(obj) \
- ivug_on_obj_deleted(obj, #obj, __func__, __LINE__)
-
-/*
- Create elm_bg with color - r,g,b
-*/
-Evas_Object *
-ivug_bg_add(Evas_Object* parent, int r, int g, int b);
-
-Evas_Object *
-ivug_layout_add(Evas_Object *win, const char *edjname, const char *groupname);
-
-Evas_Object*
-ivug_default_layout_add( Evas_Object *win);
-
-Evas_Object *
-ivug_button_add(Evas_Object *parent, char *style, char *caption, Evas_Object *icon, OnClickCB pFunc, const void *data );
-
-Evas_Object *
-ivug_icon_add(Evas_Object *parent, char *edjname, char *groupname);
-
-Evas_Object *
-ivug_controlbar_add(Evas_Object *parent, const char *style);
-
-void
-ivug_object_del(Evas_Object *obj);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif // __IVUG_WIDGET_H__
-
diff --git a/main/src/view/ivug-detail-info.c b/main/src/view/ivug-detail-info.c
deleted file mode 100755
index 77061e3..0000000
--- a/main/src/view/ivug-detail-info.c
+++ /dev/null
@@ -1,437 +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 "ivug-detail-info.h"
-
-#include <vconf.h>
-#include <vconf-keys.h>
-
-#include <appcore-efl.h>
-#include <appcore-common.h>
-
-#include <unicode/udat.h>
-#include <unicode/ustring.h>
-#include <unicode/uloc.h>
-#include <unicode/ucal.h>
-#include <unicode/udatpg.h>
-#include <unicode/utmscale.h>
-
-#include "ivug-details-view.h"
-#include <libexif/exif-data.h>
-
-#include "ivug-file-info.h"
-
-
-#define NOMAL_BUF 128
-
-#define DETAILS_DIR_PATH_LEN_MAX 4096
-
-enum IVUG_SIZE_TYPE
-{
- SIZE_BYTE = 0,
- SIZE_KB,
- SIZE_MB,
- SIZE_GB
-};
-
-/*
- Shuld free returned value after use
-*/
-static char*
-_get_icu_time_string(const char *locale, const char *customSkeleton, const char *timezone, UDate date)
-{
-#define UG_ICU_ARR_LENGTH 256
-
- IV_ASSERT(customSkeleton != NULL);
- IV_ASSERT(timezone != NULL);
-
- /*
- Copy a byte string encoded in the default codepage to a ustring.
- Copies at most n characters. The result will be null terminated if the length of src is less than n. Performs a host byte to UChar conversion
- */
- UChar ucustomSkeleton[UG_ICU_ARR_LENGTH] = {0,};
-
- if(u_uastrncpy(ucustomSkeleton, customSkeleton, UG_ICU_ARR_LENGTH) == NULL)
- {
- MSG_UTIL_ERROR("u_uastrncpy() error.");
- return NULL;
- }
-
- UChar utimezone[UG_ICU_ARR_LENGTH] = {0,};
-
- if ( u_uastrncpy(utimezone, timezone, UG_ICU_ARR_LENGTH) == NULL )
- {
- MSG_UTIL_ERROR("u_uastrncpy() error.");
- return NULL;
- }
-
- UErrorCode status = U_ZERO_ERROR;
- UDateTimePatternGenerator *generator;
- UDateFormat *formatter;
-
- UChar bestPattern[UG_ICU_ARR_LENGTH] = {0,};
- UChar formatted[UG_ICU_ARR_LENGTH] = {0,};
- char formattedString[UG_ICU_ARR_LENGTH] = {0,};
- int32_t bestPatternLength, formattedLength;
-
- ucal_setDefaultTimeZone(utimezone , &status);
-
- if (U_FAILURE(status))
- {
- MSG_UTIL_ERROR("ucal_setDefaultTimeZone() is failed");
- return NULL;
- }
-
- uloc_setDefault(getenv("LC_TIME"), &status);
-
- if (U_FAILURE(status))
- {
- MSG_UTIL_ERROR("ucal_setDefaultTimeZone() is failed");
- return NULL;
- }
-
- generator = udatpg_open(locale, &status);
- if(generator == NULL)
- {
- return NULL;
- }
-
- bestPatternLength = udatpg_getBestPattern(generator, ucustomSkeleton, u_strlen(ucustomSkeleton), bestPattern, UG_ICU_ARR_LENGTH, &status);
- if(bestPatternLength <= 0)
- {
- return NULL;
- }
-
- formatter = udat_open(UDAT_IGNORE, UDAT_IGNORE, locale, NULL, -1, bestPattern, -1, &status);
- if(formatter == 0)
- {
- return NULL;
- }
-
- formattedLength = udat_format(formatter, date, formatted, UG_ICU_ARR_LENGTH, NULL, &status);
- if(formattedLength <= 0)
- {
- return NULL;
- }
-
- u_austrcpy(formattedString, formatted);
- udatpg_close(generator);
- udat_close(formatter);
-
- if(strlen(formattedString) == 0)
- {
- return NULL;
- }
-
- return strdup(formattedString);
-}
-
-
-static char*
-_get_icu_date(time_t mtime)
-{
-#define UG_DATE_FORMAT_12 "yMMMdhms"
-#define UG_DATE_FORMAT_24 "yMMMdHms"
-
- char* skeleton = NULL;
-
- enum appcore_time_format timeformat;
-
- int ret = appcore_get_timeformat(&timeformat);
- if(ret == -1)
- {
- MSG_DETAIL_ERROR("Cannot get timeformat.");
- timeformat = APPCORE_TIME_FORMAT_12; // Default value.
-// Go through
- }
-
- if(timeformat == APPCORE_TIME_FORMAT_12)
- {
- skeleton = UG_DATE_FORMAT_12;
- }
- else if(timeformat == APPCORE_TIME_FORMAT_24)
- {
- skeleton = UG_DATE_FORMAT_24;
- }
- else
- {
- MSG_DETAIL_ERROR("Invalid time format : %d", timeformat);
- skeleton = UG_DATE_FORMAT_12; // Default value.
- }
-
- char *locale = vconf_get_str(VCONFKEY_REGIONFORMAT); /* eg. en_US.UTF-8*/
- if(locale == NULL)
- {
- MSG_DETAIL_ERROR("Cannot get region format.");
- locale = "en_US.UTF-8"; // Default value.
- }
-
- char *timezone = NULL;
-
- timezone = vconf_get_str(VCONFKEY_SETAPPL_TIMEZONE_ID); // eg Asia/Seoul
- if(timezone == NULL)
- {
-// TODO : How to get default time zone????
- MSG_DETAIL_ERROR("Cannot get time zone");
- return NULL;
- }
-
- MSG_DETAIL_HIGH("Locale:%s TimeZone:%s TimeFormat:%s", locale, skeleton, timezone);
-
- char* datestr = NULL;
-
- datestr = _get_icu_time_string(locale, skeleton, timezone, (UDate)mtime * 1000);
-
- if(datestr == NULL)
- {
- MSG_DETAIL_ERROR("Cannot get time string");
- return NULL;
- }
-
- MSG_DETAIL_HIGH("ICU Date : %s", datestr);
- return datestr;
-
-}
-
-
-
-
-static char *
-_get_filesize_string(size_t size)
-{
-#define FILE_SIZE_LEN_MAX 64
-#define BASIC_SIZE 1024 //used for file size check
-
- int count = 0;
-
- unsigned long int lsize = (unsigned long int)size;
-
- char *tmp = (char *)calloc(1, sizeof(char)*FILE_SIZE_LEN_MAX + 1);
- if ( tmp == NULL)
- {
- return NULL;
- }
-
- while(size >= ( BASIC_SIZE ) )
- {
- lsize = size;
- size /= BASIC_SIZE;
- count++;
- }
-
- float remain = ((float)lsize/BASIC_SIZE) - size;
-
- if(count == SIZE_BYTE)
- {
- snprintf(tmp,FILE_SIZE_LEN_MAX,"%zu B", size);
- }
- else if(count == SIZE_KB)
- {
- snprintf(tmp,FILE_SIZE_LEN_MAX,"%zu KB", size);
- }
- else if(count == SIZE_MB)
- {
- // need another algorithm
- snprintf(tmp,FILE_SIZE_LEN_MAX,"%.1f MB", size+remain);
- }
- else if(count == SIZE_GB)
- {
- snprintf(tmp,FILE_SIZE_LEN_MAX,"%.1f GB", size+remain);
- }
-
- MSG_DETAIL_HIGH("Size = %lu, OrigSize=%zu", lsize, size);
- return tmp;
-}
-
-void
-ivug_details_info_set_file_information(ivug_file_info_t * const pFileInfo, const char *path)
-{
- ivug_ret_if( NULL == pFileInfo );
- ivug_ret_if( NULL == path );
-
-/*** get file path*/
- pFileInfo->filepath = strdup(path);
-
- struct stat statbuf;
-
- if(stat(path,&statbuf) == -1)
- {
- MSG_DETAIL_ERROR("Cannot get stat()");
- return ;
- }
-
- pFileInfo->size = statbuf.st_size;
- pFileInfo->date = statbuf.st_mtime;
-
- pFileInfo->create_date = _get_icu_date(pFileInfo->date);
-
- if ( pFileInfo->create_date == NULL )
- {
- pFileInfo->create_date = strdup(IDS_N_A);
- }
-
- pFileInfo->file_ext = ivug_fileinfo_get_file_extension(path);
-
- if ( pFileInfo->file_ext == NULL )
- {
- pFileInfo->file_ext = strdup(IDS_UNKNOWN);
- }
-
- pFileInfo->filesize = _get_filesize_string(pFileInfo->size);
-
- MSG_DETAIL_HIGH("Basic Info : ext=%s size=%s", pFileInfo->file_ext, pFileInfo->filesize);
-
- return ;
-
-}
-
-
-void
-ivug_details_info_set_gps_info(ivug_file_info_t * const pFileInfo, const char *path)
-{
-#define UG_EXIF_ARR_LENGTH 255
-
- ivug_retm_if(!pFileInfo, "data is NULL");
- ivug_retm_if(!path, "path is NULL");
-
- pFileInfo->longitude = calloc(1, sizeof(char)*UG_EXIF_ARR_LENGTH);
- if(pFileInfo->longitude == NULL)
- {
- return;
- }
-
- pFileInfo->latitude = calloc(1, sizeof(char)*UG_EXIF_ARR_LENGTH);
- if(pFileInfo->latitude == NULL)
- {
- return;
- }
-
-
- double longtitude = 0.0;
- double latitude = 0.0;
-
- bool bret = false;
-
- if(pFileInfo->file_type == IVUG_DETAIL_IMAGE_TYPE) // this will be removed!!!!
- {
- bret = ivug_fileinfo_get_image_gps_info(path, &latitude, &longtitude);
- }
- else if(pFileInfo->file_type == IVUG_DETAIL_VIDEO_TYPE)
- {
- bret = ivug_fileinfo_get_video_gps_info(path, &latitude, &longtitude);
- }
-
- if ( bret == false)
- {
- latitude = 0;
- longtitude = 0;
- }
-
- if(latitude != 0.0)
- {
- snprintf(pFileInfo->latitude, UG_EXIF_ARR_LENGTH, "%.5f", latitude);
- }
- else
- {
- snprintf(pFileInfo->latitude, UG_EXIF_ARR_LENGTH, "%s", IDS_UNKNOWN);
- }
- if(longtitude != 0.0)
- {
- snprintf(pFileInfo->longitude, UG_EXIF_ARR_LENGTH, "%.5f", longtitude);
- }
- else
- {
- snprintf(pFileInfo->longitude, UG_EXIF_ARR_LENGTH, "%s", IDS_UNKNOWN);
- }
-}
-
-void
-ivug_details_info_set_resolution(ivug_file_info_t * const pFileInfo, const char *path, int stype)
-{
- ivug_retm_if(!pFileInfo, "data is NULL");
- ivug_retm_if(!path, "path is NULL");
-
- MSG_DETAIL_HIGH("slide type is %d", stype);
-
- pFileInfo->resolution = (char *)malloc(sizeof(char)*NOMAL_BUF+1);
- if(pFileInfo->resolution == NULL)
- {
- return ;
- }
- memset(pFileInfo->resolution,0,(sizeof(char)* NOMAL_BUF + 1));
-
-
- int width, height;
-
- switch(stype)
- {
- case SLIDE_TYPE_IMAGE:
- pFileInfo->file_type = IVUG_DETAIL_IMAGE_TYPE;
-
- if ( ivug_fileinfo_get_image_resolution(path, &width, &height) == false)
- {
- snprintf(pFileInfo->resolution, NOMAL_BUF, "%s", IDS_N_A);
- }
- else
- {
- snprintf(pFileInfo->resolution, NOMAL_BUF,"%dX%d", width, height);
- }
-
- break;
-
- /* Video type */
- case SLIDE_TYPE_VIDEO:
- pFileInfo->file_type = IVUG_DETAIL_VIDEO_TYPE;
-
- if ( ivug_fileinfo_get_video_resolution(path, &width, &height) == false)
- {
- snprintf(pFileInfo->resolution, NOMAL_BUF, "%s", IDS_N_A);
- }
- else
- {
- snprintf(pFileInfo->resolution, NOMAL_BUF,"%dX%d", width, height);
- }
-
- break;
-
- default:
- break;
-
- }
-
-}
-
-void
-ivug_details_info_set_location(ivug_file_info_t * const pFileInfo, const char *path)
-{
- ivug_retm_if(!pFileInfo, "data is NULL");
- ivug_retm_if(!path, "path is NULL");
-
- pFileInfo->file_location = strdup(path);
-}
-
-void
-ivug_details_info_set_filename(ivug_file_info_t * const pFileInfo, const char *path)
-{
- ivug_retm_if(!pFileInfo, "data is NULL");
- ivug_retm_if(!path, "path is NULL");
-
- /** get file name */
- pFileInfo->filename = ecore_file_strip_ext(ecore_file_file_get(path));
-}
-
-
diff --git a/main/src/view/ivug-detail-info.h b/main/src/view/ivug-detail-info.h
deleted file mode 100755
index 6b7b9cb..0000000
--- a/main/src/view/ivug-detail-info.h
+++ /dev/null
@@ -1,80 +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 __IVUG_DETAIL_COMMON_H__
-#define __IVUG_DETAIL_COMMON_H__
-
-#include <unicode/udat.h>
-
-#include "ivug-common.h"
-
-typedef enum {
- IVUG_DETAIL_ERROR_TYPE = -1,
- IVUG_DETAIL_IMAGE_TYPE,
- IVUG_DETAIL_VIDEO_TYPE
-} ivug_detail_file_t;
-
-typedef struct {
-/** Common info*/
- time_t date; // Seconds since 1970-1-1
- size_t size;
-
- ivug_detail_file_t file_type;
-
- char *filesize;
- char *filepath;
- char *filename;
- char *file_ext;
- char *file_location;
- char *contains;
- char *create_date;
-
-
-/**resolution */
- char *resolution;
-
-/**Gps info */
- char *latitude;
- char *longitude;
-
-}ivug_file_info_t;
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// TODO : Remove dependacy ivug-detail-view and ivug-detail-info.
-
-void ivug_details_info_set_file_information(ivug_file_info_t * const pFileInfo, const char *path);
-
-void ivug_details_info_set_gps_info(ivug_file_info_t * const pFileInfo, const char *path);
-
-void ivug_details_info_set_resolution(ivug_file_info_t * const pFileInfo, const char *path, int stype);
-
-void ivug_details_info_set_location(ivug_file_info_t * const pFileInfo, const char *path);
-
-void ivug_details_info_set_filename(ivug_file_info_t * const pFileInfo, const char *path);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif // __IVUG_DETAIL_COMMON_H__
-
diff --git a/main/src/view/ivug-details-view.c b/main/src/view/ivug-details-view.c
index e66df21..77fefdb 100755
--- a/main/src/view/ivug-details-view.c
+++ b/main/src/view/ivug-details-view.c
@@ -1,34 +1,32 @@
-/*
- * 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.
- */
-
+/*
+ * 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 <ui-gadget-module.h>
#include "ivug-common.h"
-#include "ivug-main.h"
#include "ivug-main-view.h"
#include "ivug-string.h"
+#include "ivug-file-info.h"
#include "ivug-details-view.h"
#include "ivug-detail-info.h"
-#include "ivug-widget.h"
+#include "ivug-drm.h"
#define DETAILS_EDJ_FILE EDJ_PATH"/ivug-details.edj"
-#define TRANSITION_EFFECT
#define FILE_DETILES_NUM 6
#define FILE_EXIF_INFO_NUM 2
@@ -99,6 +97,26 @@ static void _ivug_details_free_file_info(ivug_file_info_t * const pFileInfo)
free(pFileInfo->longitude);
pFileInfo->longitude = NULL;
}
+
+ if(pFileInfo->vendor)
+ {
+ free(pFileInfo->vendor);
+ pFileInfo->vendor = NULL;
+ }
+
+ if(pFileInfo->forwarding)
+ {
+ free(pFileInfo->forwarding);
+ pFileInfo->forwarding = NULL;
+ }
+
+ if(pFileInfo->type)
+ {
+ free(pFileInfo->type);
+ pFileInfo->type = NULL;
+
+ }
+
}
static char *
@@ -160,6 +178,26 @@ _ivug_details_gl_label_get(void *data, Evas_Object *obj, const char *part )
{
text2 = pDetailsView->file_Info.longitude;
}
+ else if(strncmp(IDS_VENDOR, params->m_ItemName, strlen(IDS_VENDOR)) == 0)
+ {
+ text2 = pDetailsView->file_Info.vendor;
+ }
+ else if(strncmp(IDS_FORWARDING, params->m_ItemName, strlen(IDS_FORWARDING)) == 0)
+ {
+ text2 = pDetailsView->file_Info.forwarding;
+ }
+ else if(strncmp(IDS_AVAILABLE_USES, params->m_ItemName, strlen(IDS_AVAILABLE_USES)) == 0)
+ {
+ text2 = pDetailsView->file_Info.available_uses;
+ }
+ else if(strncmp(IDS_TYPE, params->m_ItemName, strlen(IDS_TYPE)) == 0)
+ {
+ text2 = pDetailsView->file_Info.type;
+ }
+ else if(strncmp(IDS_VALIDITY, params->m_ItemName, strlen(IDS_VALIDITY)) == 0)
+ {
+ text2 = pDetailsView->file_Info.validity;
+ }
if (text2) {
return elm_entry_utf8_to_markup(text2);
@@ -205,6 +243,82 @@ _ivug_details_gl_label_get_title(void *data, Evas_Object *obj,const char *part )
return NULL;
}
+static void _on_rename_view_response(ivug_name_response resp, const char *str, void *pClientData)
+{
+ Ivug_DetailsView *pDetailsView = (Ivug_DetailsView *)pClientData;
+
+ pDetailsView->pAddTagView = NULL; // Will removed in add tag view.
+
+ if(resp != NAME_VIEW_RESPONSE_OK)
+ {
+ MSG_DETAIL_HIGH("rename is canceled");
+ return;
+ }
+
+ Media_Data *mdata = pDetailsView->mdata;
+ const char *old_fullpath = mdata->filepath;
+ char *old_dir = ecore_file_dir_get(old_fullpath);
+ char *ext = ivug_fileinfo_get_file_extension(old_fullpath);
+
+ char new_fullpath[IVUG_MAX_FILE_PATH_LEN] = {0,};
+ snprintf(new_fullpath, sizeof(new_fullpath),"%s/%s.%s", old_dir, str, ext);
+
+ if(ivug_rename_file(old_fullpath, new_fullpath) == false)
+ {
+ MSG_DETAIL_ERROR("ivug_rename_file failed");
+ }
+ else
+ {
+ MSG_DETAIL_HIGH("Rename %s -> %s", old_fullpath, new_fullpath);
+ free(mdata->filepath);
+ mdata->filepath = strdup(new_fullpath);
+
+ ivug_details_info_set_filename(&pDetailsView->file_Info, new_fullpath);
+
+ elm_genlist_realized_items_update(pDetailsView->genlist);
+
+ const char *name = ecore_file_file_get(mdata->filepath);
+
+ evas_object_smart_callback_call(pDetailsView->layout, "renamed", (void *)name);
+ }
+}
+
+static void _rename_button_clicked_cb(void *data, Evas_Object * obj, void *event_info)
+{
+ Ivug_DetailsView *pDetailsView = (Ivug_DetailsView *)data;
+ Media_Data *mdata = pDetailsView->mdata;
+
+ MSG_DETAIL_HIGH("clicked event on Button");
+
+ pDetailsView->pAddTagView = ivug_name_view_create(pDetailsView->layout, IDS_CHANGE_NAME);
+
+ const char *name = ecore_file_strip_ext(ecore_file_file_get(mdata->filepath));
+
+ ivug_name_view_set_entry(pDetailsView->pAddTagView, name);
+
+ ivug_name_view_set_response_callback(pDetailsView->pAddTagView, _on_rename_view_response, (void*)pDetailsView);
+}
+
+static Evas_Object *_ivug_details_gl_icon_get_title(void *data, Evas_Object *obj, const char *part)
+{
+ ivug_file_list_item *params = (ivug_file_list_item *)data;
+
+ ivug_retvm_if(params == NULL, NULL, "params is NULL");
+
+ Ivug_DetailsView *pDetailsView = (Ivug_DetailsView *)params->pDetailsView;
+ ivug_retvm_if(pDetailsView == NULL, NULL, "pDetailsView is NULL");
+
+ Evas_Object *btn;
+
+ if (!strcmp(part, "elm.icon") || !strcmp(part, "elm.icon.1")) {
+ btn = elm_button_add(pDetailsView->layout);
+ elm_object_style_set(btn, "rename");
+ evas_object_smart_callback_add(btn, "clicked", _rename_button_clicked_cb, (void *)pDetailsView);
+ }
+
+ return btn;
+}
+
static Eina_Bool
_ivug_details_gl_state_get(void *data, Evas_Object *obj, const char *part )
{
@@ -222,31 +336,46 @@ _ivug_details_view_genlist_create(Ivug_DetailsView *pDetailsView, Evas_Object *p
ivug_retvm_if(NULL == genlist, NULL, "Create Details genlist failed..");
elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
- elm_genlist_select_mode_set(genlist, ELM_OBJECT_SELECT_MODE_NONE);
elm_object_theme_set(genlist, gGetSystemTheme());
- pDetailsView->file_Status.itc.item_style = "ivug/2text.2";
- //pDetailsView->file_Status.itc.item_style = "2text.2";
- pDetailsView->file_Status.itc.func.text_get = _ivug_details_gl_label_get;
- pDetailsView->file_Status.itc.func.content_get = NULL;
- pDetailsView->file_Status.itc.func.state_get = _ivug_details_gl_state_get;
- pDetailsView->file_Status.itc.func.del = _ivug_details_gl_del;
+ memset(&pDetailsView->itc, 0, sizeof(Elm_Genlist_Item_Class) );
+
+ pDetailsView->itc.version = ELM_GENLIST_ITEM_CLASS_VERSION;
+ pDetailsView->itc.item_style = "ivug/2text.2";
+ pDetailsView->itc.func.text_get = _ivug_details_gl_label_get;
+ pDetailsView->itc.func.content_get = NULL;
+ pDetailsView->itc.func.state_get = _ivug_details_gl_state_get;
+ pDetailsView->itc.func.del = _ivug_details_gl_del;
+
+ memset(&pDetailsView->title_itc, 0, sizeof(Elm_Genlist_Item_Class) );
// Set item class for dialogue group title
- pDetailsView->file_Status.title_itc.item_style = "ivug/grouptitle";
- //pDetailsView->file_Status.title_itc.item_style = "grouptitle";
- pDetailsView->file_Status.title_itc.func.text_get = _ivug_details_gl_label_get_title;
- pDetailsView->file_Status.title_itc.func.content_get = NULL;
- pDetailsView->file_Status.title_itc.func.state_get = NULL;
- pDetailsView->file_Status.title_itc.func.del = NULL;
-
- pDetailsView->file_Status.multiline_itc.item_style = "ivug/multiline.2text";
- //pDetailsView->file_Status.multiline_itc.item_style = "multiline.2text";
- pDetailsView->file_Status.multiline_itc.func.text_get = _ivug_details_gl_label_get;
- pDetailsView->file_Status.multiline_itc.func.content_get = NULL;
- pDetailsView->file_Status.multiline_itc.func.state_get = NULL;
- pDetailsView->file_Status.multiline_itc.func.del = _ivug_details_gl_del;
+ pDetailsView->title_itc.version = ELM_GENLIST_ITEM_CLASS_VERSION;
+ pDetailsView->title_itc.item_style = "ivug/grouptitle";
+ pDetailsView->title_itc.func.text_get = _ivug_details_gl_label_get_title;
+ pDetailsView->title_itc.func.content_get = NULL;
+ pDetailsView->title_itc.func.state_get = NULL;
+ pDetailsView->title_itc.func.del = NULL;
+
+ memset(&pDetailsView->multiline_icon_itc, 0, sizeof(Elm_Genlist_Item_Class) );
+
+ // Set item class for dialogue group title with icon
+ pDetailsView->multiline_icon_itc.version = ELM_GENLIST_ITEM_CLASS_VERSION;
+ pDetailsView->multiline_icon_itc.item_style = "ivug/multiline/2text.1icon";
+ pDetailsView->multiline_icon_itc.func.text_get = _ivug_details_gl_label_get;
+ pDetailsView->multiline_icon_itc.func.content_get = _ivug_details_gl_icon_get_title;
+ pDetailsView->multiline_icon_itc.func.state_get = NULL;
+ pDetailsView->multiline_icon_itc.func.del = NULL;
+
+ memset(&pDetailsView->multiline_itc, 0, sizeof(Elm_Genlist_Item_Class) );
+
+ pDetailsView->multiline_itc.version = ELM_GENLIST_ITEM_CLASS_VERSION;
+ pDetailsView->multiline_itc.item_style = "ivug/multiline/2text";
+ pDetailsView->multiline_itc.func.text_get = _ivug_details_gl_label_get;
+ pDetailsView->multiline_itc.func.content_get = NULL;
+ pDetailsView->multiline_itc.func.state_get = NULL;
+ pDetailsView->multiline_itc.func.del = _ivug_details_gl_del;
return genlist;
}
@@ -277,8 +406,7 @@ _ivug_detail_genlist_view_gps_create(Ivug_DetailsView *pDetailsView )
m_TempItem->m_ItemName = strdup(m_ItemName[index]);
m_TempItem->pDetailsView = pDetailsView;
- it = elm_genlist_item_append(genlist, &pDetailsView->file_Status.multiline_itc, m_TempItem, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ it = elm_genlist_item_append(genlist, &pDetailsView->multiline_itc, m_TempItem, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
}
@@ -308,7 +436,7 @@ _ivug_detail_genlist_view_file_view_create(Ivug_DetailsView *pDetailsView)
m_ItemName[4] = IDS_RESOLUTION;
m_ItemName[5] = IDS_FILE_LOCATION;
- git = elm_genlist_item_append(genlist, &pDetailsView->file_Status.title_itc, strdup(IDS_DETAILS), NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ git = elm_genlist_item_append(genlist, &pDetailsView->title_itc, strdup(IDS_DETAILS), NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL);
elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
for (index = 0; index < FILE_DETILES_NUM; index++)
@@ -328,12 +456,63 @@ _ivug_detail_genlist_view_file_view_create(Ivug_DetailsView *pDetailsView)
m_TempItem->m_ItemName = strdup(m_ItemName[index]);
m_TempItem->pDetailsView = pDetailsView;
- it = elm_genlist_item_append(genlist, &pDetailsView->file_Status.multiline_itc, m_TempItem, NULL,
- ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ if(index == 0) // for rename icon
+ {
+ it = elm_genlist_item_append(genlist, &pDetailsView->multiline_icon_itc, m_TempItem, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ }
+ else
+ {
+ it = elm_genlist_item_append(genlist, &pDetailsView->multiline_itc, m_TempItem, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ }
elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
}
}
+static void
+_ivug_detail_genlist_view_drm_create(Ivug_DetailsView *pDetailsView)
+{
+ IV_ASSERT(pDetailsView != NULL);
+
+ Evas_Object *genlist = NULL;
+ int index = 0;
+
+ Elm_Object_Item *it = NULL;
+
+ ivug_file_list_item *m_TempItem = NULL;
+ char *m_ItemName[FILE_DETILES_NUM] = {0,};
+
+ genlist = pDetailsView->genlist;
+
+ m_ItemName[0] = IDS_VENDOR;
+ m_ItemName[1] = IDS_FORWARDING;
+ m_ItemName[2] = IDS_AVAILABLE_USES;
+ m_ItemName[3] = IDS_TYPE;
+ m_ItemName[4] = IDS_VALIDITY;
+
+ for (index = 0; index < FILE_DETILES_NUM; index++)
+ {
+ if(m_ItemName[index] == NULL)
+ {
+ continue;
+ }
+
+ m_TempItem = (ivug_file_list_item *)malloc(sizeof(ivug_file_list_item));
+ if(m_TempItem == NULL)
+ {
+ continue;
+ }
+ memset(m_TempItem, 0, sizeof(ivug_file_list_item));
+
+ m_TempItem->m_ItemName = strdup(m_ItemName[index]);
+ m_TempItem->pDetailsView = pDetailsView;
+
+ it = elm_genlist_item_append(genlist, &pDetailsView->multiline_itc, m_TempItem, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ }
+
+}
+
+
Ivug_DetailsView *
ivug_details_view_screen_create(Evas_Object *parent, Media_Data *mdata, ivug_view_by view_by)
{
@@ -352,13 +531,30 @@ ivug_details_view_screen_create(Evas_Object *parent, Media_Data *mdata, ivug_vie
return NULL;
}
+ pDetailsView->mdata = mdata;
+
ivug_details_info_set_file_information(&pDetailsView->file_Info, filepath);
ivug_details_info_set_resolution(&pDetailsView->file_Info, filepath, stype);
ivug_details_info_set_gps_info(&pDetailsView->file_Info, filepath);
- ivug_details_info_set_filename(&pDetailsView->file_Info, filepath);
- ivug_details_info_set_location(&pDetailsView->file_Info, filepath);
+ if(stype == SLIDE_TYPE_STREAMING ) // If remote file
+ {
+ /* Location: show url */
+ ivug_details_info_set_filename(&pDetailsView->file_Info, mdata->fileurl); // TODO : Check this. how to extract filename from URL????
+ ivug_details_info_set_location(&pDetailsView->file_Info, mdata->fileurl);
+ }
+ else
+ {
+ ivug_details_info_set_filename(&pDetailsView->file_Info, filepath);
+ ivug_details_info_set_location(&pDetailsView->file_Info, filepath);
+ }
+
+ if(mdata->bIsDRMContent)
+ {
+ ivug_details_info_set_drm_info(&pDetailsView->file_Info, filepath);
+ }
+
// Creating GUI
pDetailsView->evas = evas_object_evas_get(parent);
@@ -394,9 +590,17 @@ ivug_details_view_screen_create(Evas_Object *parent, Media_Data *mdata, ivug_vie
_ivug_detail_genlist_view_file_view_create(pDetailsView);
- _ivug_detail_genlist_view_gps_create(pDetailsView);
+// TODO : Should check below routine. why DRM has no GPS info???
+ if(mdata->bIsDRMContent == EINA_TRUE)
+ {
+ _ivug_detail_genlist_view_drm_create(pDetailsView);
+ }
+ else
+ {
+ _ivug_detail_genlist_view_gps_create(pDetailsView);
+ }
- elm_object_part_content_set( pDetailsView->layout, "detailsview.genlist" , pDetailsView->genlist );
+ elm_object_part_content_set(pDetailsView->layout, "details_view.genlist" , pDetailsView->genlist );
MSG_DETAIL_HIGH("Detail view(0x%08x) created for %s", pDetailsView, filepath);
diff --git a/main/src/view/ivug-details-view.h b/main/src/view/ivug-details-view.h
deleted file mode 100755
index af159d5..0000000
--- a/main/src/view/ivug-details-view.h
+++ /dev/null
@@ -1,64 +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 __DETAILS_VIEW_H__
-#define __DETAILS_VIEW_H__
-
-#include <unicode/udat.h>
-#include "ivug-data.h"
-#include "ivug-parameter.h"
-#include "ivug-detail-info.h"
-
-
-typedef struct {
- Elm_Genlist_Item_Class itc;
- Elm_Genlist_Item_Class title_itc;
- Elm_Genlist_Item_Class multiline_itc;
-} ivug_file_status_t;
-
-typedef struct {
- Evas_Object *parent;
- Evas_Object *bg;
-
- Evas_Object *layout;
- Evas *evas;
- Evas_Object *genlist;
-
-/*
- |---------------|
- | naviframe |
- |---------------|
- | |
- | genlist |
- | |
- |---------------|
-*/
-
- ivug_file_status_t file_Status; // TODO : Will remove
- ivug_file_info_t file_Info;
-} Ivug_DetailsView;
-
-
-Ivug_DetailsView *ivug_details_view_screen_create(Evas_Object *parent, Media_Data *mdata, ivug_view_by view_by);
-
-void ivug_details_view_destroy(Ivug_DetailsView *pDetailsView);
-
-Evas_Object *ivug_details_view_object_get(Ivug_DetailsView *pDetailsView);
-
-#endif // __DETAILS_VIEW_H__
-
-
diff --git a/main/src/view/ivug-main-view.c b/main/src/view/ivug-main-view.c
deleted file mode 100755
index 75af879..0000000
--- a/main/src/view/ivug-main-view.c
+++ /dev/null
@@ -1,1837 +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 <ui-gadget-module.h> // ug_destroy_me, ug_send_result
-#include <media-svc.h>
-#include <vconf.h>
-#include <vconf-keys.h>
-#include <utilX.h> // Key event
-
-#include "ivug-common.h"
-#include "ivug-parameter.h"
-
-#include "ivug-main-view.h"
-#include "ivug-util.h"
-#include "ivug-data.h"
-#include "ivug-ext-ug.h"
-#include "ivug-popup.h"
-#include "ivug-slider-item.h"
-#include "ivug-slider.h"
-#include "ivug-main.h"
-
-#include "ivug-setas-view.h"
-#include "ivug-details-view.h"
-
-#include "ivug-data.h"
-
-#define ELM_INTERNAL_API_ARGESFSDFEFC
-
-#include <elm_widget.h> // elm_selection_set
-#include <appsvc.h> // app service
-
-#undef HIDE_INDICATOR // For testing.
-
-#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon"
-
-#define ICON_PATH_DELETE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_delete.png"
-#define ICON_PATH_SLIDESHOW CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_slideshow.png"
-#define ICON_PATH_INFO CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_info.png"
-
-#define ICON_PATH_OPTIONTRAY IMAGE_PATH"/T01_btn_optiontray.png"
-
-// EDJE
-#define IVUG_MAIN_EDJ EDJ_PATH"/ivug-main.edj"
-
-#define IVUG_RESPONSE_OK (1)
-
-#undef TEST_MOUSE_EVENT
-
-void
-_ivug_main_view_show_menu_bar(Ivug_MainView *pMainView);
-
-void
-_ivug_main_view_hide_menu_bar(Ivug_MainView *pMainView);
-
-static void
-_ivug_main_view_back_cb(void *data, Evas_Object *obj, void *event_info);
-
-Evas_Object *_create_tool_bar(Evas_Object *parent);
-
-static void
-_ivug_main_view_navibar_detail_cb(void *data, Evas_Object *obj, void *event_info);
-
-static void
-_ivug_main_view_navibar_detail_close_cb(void *data, Evas_Object *obj, void *event_info);
-
-static enum CTRL_BAR_TYPE
-_get_ctrl_bar_type(ivug_mode mode, Media_Type slide_type);
-static enum NAVI_BAR_TYPE
-_get_tool_bar_type(ivug_mode mode, Media_Type slide_type );
-
-#define IVUG_MAIN_DESTROY_ME(a) _ivug_main_view_destroy_me(a, __func__, __LINE__);
-
-static void
-_ivug_main_view_destroy_me(Ivug_MainView *pMainView, const char *fname, int nLine)
-{
- ivug_ret_if(!pMainView);
-
- MSG_MAIN_WARN("Main view request ug_destroy_me at [%s:%d]", fname, nLine);
-
- int x = 0;
- int y = 0;
- int w = 0;
- int h = 0;
-
- MSG_MAIN_WARN("Apply event blocker");
- pMainView->event_blocker = evas_object_rectangle_add(evas_object_evas_get(pMainView->layout));
- evas_object_geometry_get(pMainView->layout, &x, &y, &w, &h);
- evas_object_move(pMainView->event_blocker, x, y);
- evas_object_resize(pMainView->event_blocker, w, h);
- evas_object_color_set(pMainView->event_blocker, 0, 0, 0, 0);
- evas_object_show(pMainView->event_blocker);
-
- ug_destroy_me(pMainView->ugHandle);
-}
-
-static void
-_selection_info_deleted(void * data, Evas * e, Evas_Object * obj, void * event_info)
-{
- ivug_retm_if(!data, "data is NULL");
- MSG_MAIN_WARN("selection info deleted");
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- pMainView->selectioninfo = NULL;
-
- return;
-}
-
-static inline void
-_main_view_create_selection_info(Ivug_MainView *pMainView, const char *string)
-{
- IV_ASSERT(pMainView != NULL);
- if(pMainView->selectioninfo)
- {
- evas_object_event_callback_del(pMainView->selectioninfo, EVAS_CALLBACK_DEL,
- _selection_info_deleted);
- evas_object_del(pMainView->selectioninfo);
- pMainView->selectioninfo = NULL;
- }
- pMainView->selectioninfo = ivug_popup_selectioninfo(pMainView->layout, string);
- ivug_retm_if(pMainView->selectioninfo == NULL, "selectioninfo is NULL");
- evas_object_event_callback_add(pMainView->selectioninfo, EVAS_CALLBACK_DEL,
- _selection_info_deleted, pMainView);
-}
-
-
-//copy popup
-static void
-_ivug_main_copy_popup_response_cb(void *data, Evas_Object *obj, void *event_info)
-{
- int response_id = (int)event_info;
- IV_ASSERT(data != NULL);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- MSG_MAIN_HIGH("Copy popup response : %d", response_id);
-
- if (pMainView->copy_popup)
- {
- evas_object_del(pMainView->copy_popup);
- pMainView->copy_popup = NULL;
- }
- else
- {
- MSG_MAIN_WARN("copy popup is NULL");
- }
-}
-
-static void
-_ivug_main_copy_popup_selected_cb(void *data, Evas_Object *obj, void *event_info)
-{
- ivug_ret_if(!data);
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- //get current file path.
- Slide_Item *sitem = ivug_slider_get_current_slide_item(pMainView->slider);
- Media_Data *mdata = ivug_data_get_data(sitem->mitem);
-
- if (mdata == NULL)
- {
- MSG_MAIN_ERROR("slider data is NULL");
- return;
- }
-
- char *path = NULL;
- int len = 0;
- // This Will add to the article
- char buf[IVUG_MAX_FILE_PATH_LEN] = {0,};
-
- path = mdata->filepath;
- len = strlen(mdata->filepath)+strlen("file://")+1;
- snprintf(buf, IVUG_MAX_FILE_PATH_LEN, "file://%s", mdata->filepath);
-
- if (len < IVUG_MAX_FILE_PATH_LEN)
- {
- MSG_MAIN_HIGH("file path = %s, file url =%s", path, buf);
- if ( pMainView->parent)
- {
- elm_cnp_selection_set(pMainView->layout, ELM_SEL_TYPE_CLIPBOARD, ELM_SEL_FORMAT_IMAGE, buf, sizeof(buf));
- }
- }
- else
- {
- MSG_MAIN_ERROR("slider file path is too long");
- }
-
- evas_object_del(pMainView->copy_popup);
- pMainView->copy_popup = NULL;
-}
-
-Evas_Object*
-_ivug_main_create_copy_popup_create(Ivug_MainView *pMainView, int x, int y)
-{
- ivug_retv_if(!pMainView, NULL);
-
- Evas_Object* ctx_popup = NULL;
- ctx_popup = elm_ctxpopup_add(pMainView->layout);
- elm_ctxpopup_item_append(ctx_popup, IDS_COPY, NULL, _ivug_main_copy_popup_selected_cb, pMainView);
- evas_object_smart_callback_add( ctx_popup, "hide", _ivug_main_copy_popup_response_cb, pMainView);
-
- //evas_object_smart_callback_add(ctxpopup, "dismissed", _dismissed_cb, ctxpopup);
- evas_object_move(ctx_popup, x, y);
-
- evas_object_show(ctx_popup);
-
- return ctx_popup;
-}
-
-static void
-_ivug_main_view_navibar_detail_close_cb(void *data, Evas_Object *obj, void *event_info)
-{
- IV_ASSERT(data != NULL);
-
- MSG_MAIN_HIGH("ENTER : Btn detail close clicked. obj=0x%08x data=0x%08x", obj, data);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- IV_ASSERT( pMainView->navi_bar != NULL);
-
- evas_object_smart_callback_del(obj, "clicked", _ivug_main_view_navibar_detail_close_cb);
-
- elm_object_item_part_content_unset(pMainView->navi_it, "elm.swallow.detail");
-
- MSG_MAIN_HIGH("Delete detail view");
- ivug_details_view_destroy(pMainView->pDetailsView); // Delete detail view.
- pMainView->pDetailsView = NULL;
-
-// Enable detail view button callback
- evas_object_smart_callback_add(pMainView->btn_detail, "clicked", _ivug_main_view_navibar_detail_cb, pMainView->btn_detail_data);
- elm_object_disabled_set(pMainView->btn_detail, EINA_FALSE);
-
- Evas_Object *btn_close = elm_object_item_part_content_unset(pMainView->navi_it, "title_right_btn");
- evas_object_del(btn_close);
-
- MSG_MAIN_HIGH("LEAVE : Btn detail close clicked. obj=0x%08x data=0x%08x", obj, data);
-}
-
-static void _update_title(Ivug_MainView *pMainView)
-{
- static char title[256];
-
- Slide_Item *sitem = ivug_slider_get_current_slide_item(pMainView->slider);
- Media_Data *mdata = ivug_data_get_data(sitem->mitem);
-
- if (mdata == NULL)
- {
- MSG_MAIN_ERROR("slider data is NULL");
- return;
- }
-
- if ( pMainView->mode == IVUG_MODE_NORMAL)
- {
- snprintf(title, sizeof(title), "%d/%d",
- ivug_slider_get_current_slide_count(pMainView->slider),
- ivug_slider_get_total_slide_count(pMainView->slider)); //get title.
- }
- else if(mdata->filepath != NULL)
- {
- const char* filename = ivug_get_filename(mdata->filepath);
- if(filename)
- {
- snprintf(title, sizeof(title), "%s", filename);
- }
- }
-
- IV_ASSERT(pMainView->navi_bar != NULL);
-
- MSG_MAIN_HIGH("Update title : %s", title);
-
- elm_object_item_text_set(pMainView->navi_it, title);
-
-}
-
-static void
-_ivug_main_view_navibar_detail_cb(void *data, Evas_Object *obj, void *event_info)
-{
- MSG_MAIN_HIGH("ENTER : Btn detail view clicked. obj=0x%08x data=0x%08x", obj, data);
- ivug_ret_if(!obj||!data);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- if(pMainView->pDetailsView)
- {
- MSG_MAIN_ERROR("details view already created");
- return;
- }
-
- pMainView->btn_detail_data = evas_object_smart_callback_del(obj, "clicked", _ivug_main_view_navibar_detail_cb);
- pMainView->btn_detail = obj;
-
- Slide_Item *sitem = ivug_slider_get_current_slide_item(pMainView->slider);
- Media_Data *mdata = ivug_data_get_data(sitem->mitem);
-
- if (mdata == NULL)
- {
- MSG_MAIN_ERROR("slider data is NULL");
- return;
- }
-
- pMainView->pDetailsView = ivug_details_view_screen_create(pMainView->navi_bar, mdata, pMainView->view_by);
-
- if(!pMainView->pDetailsView)
- {
- MSG_MAIN_ERROR("create details view failed");
- return;
- }
-
- elm_object_item_part_content_set(pMainView->navi_it, "elm.swallow.detail", ivug_details_view_object_get(pMainView->pDetailsView));
-
-// Transition effect does not comming ocassionally when instant mode is used.
-// evas_object_smart_callback_add(pMainView->navi_bar, "transition,finished", _ivug_main_view_details_transit_finished_cb, pMainView);
- PERF_CHECK_BEGIN(LVL1 "Update title");
-
- _update_title(pMainView);
-
- PERF_CHECK_END(LVL1 "Update title");
-
- _ctrl_bar_type ctrlbar_type;
- ctrlbar_type = _get_ctrl_bar_type(pMainView->mode, mdata->slide_type);
- if(ctrlbar_type == CTRL_BAR_TYPE_FILE || ctrlbar_type == CTRL_BAR_TYPE_CAMERA_IMAGE
- || ctrlbar_type == CTRL_BAR_TYPE_CAMERA_VIDEO)
- {
- MSG_MAIN_HIGH("Disable details button ");
-
- /* Disable details button in controlbar */
- if(pMainView->ctrl_bar_item[1])
- elm_object_item_disabled_set(pMainView->ctrl_bar_item[1], EINA_TRUE);
- }
- else if(ctrlbar_type == CTRL_BAR_TYPE_IMAGE || ctrlbar_type == CTRL_BAR_TYPE_VIDEO)
- {
- /* Disable details button in controlbar */
- if(pMainView->ctrl_bar_item[2])
- elm_object_item_disabled_set(pMainView->ctrl_bar_item[2], EINA_TRUE);
- }
-
- MSG_MAIN_HIGH("LEAVE : Btn detail view clicked. obj=0x%08x data=0x%08x", obj, data);
-}
-
-#define ZOOM_LEVEL_STEP (0.7)
-#define ZOOM_LEVEL_MAX (3)
-
-static void _show_zoom_icon(void *data)
-{
- ivug_ret_if(!data);
-
- MSG_MAIN_ERROR("_show_zoom_icon");
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- Slide_Item *sitem = ivug_slider_get_current_slide_item(pMainView->slider);
- if(!sitem)
- {
- MSG_MAIN_ERROR("sitem is NULL");
- return;
- }
-
- if(sitem->zoom_level == 0)
- {
- edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_out,disable","elm");
- edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_in,enable","elm");
- }
- else if(sitem->zoom_level == ZOOM_LEVEL_MAX)
- {
- edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_in,disable","elm");
- edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_out,enable","elm");
- }
- else
- {
- edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_out,enable","elm");
- edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_in,enable","elm");
- }
-}
-
-static void
-_ivug_main_view_zoom_out_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
-{
- ivug_ret_if(!obj);
- ivug_ret_if(!data);
-
- MSG_MAIN_ERROR("_ivug_main_view_zoom_out_cb");
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- Slide_Item *sitem = ivug_slider_get_current_slide_item(pMainView->slider);
- if(!sitem)
- {
- MSG_MAIN_ERROR("sitem is NULL");
- return;
- }
-
- if(sitem->zoom_level == 0)
- {
- MSG_MAIN_ERROR("zoom_level is 0");
- return;
- }
-
- double zoom = 0.0;
- Evas_Coord ix = 0, iy= 0, iw= 0, ih= 0;
-
- evas_object_geometry_get(sitem->photocam, &ix, &iy, &iw, &ih);
-
- zoom = ivug_slider_item_zoom_get(sitem);
- zoom /= ZOOM_LEVEL_STEP;
- ivug_slider_item_zoom_set(sitem, zoom, iw/2, ih/2);
-
- ivug_slider_item_hold_set(sitem, EINA_FALSE);
-
- sitem->zoom_level--;
-
- _show_zoom_icon(data);
-}
-
-static void
-_ivug_main_view_zoom_in_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
-{
- ivug_ret_if(!obj);
- ivug_ret_if(!data);
-
- MSG_MAIN_ERROR("_ivug_main_view_zoom_in_cb");
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- Slide_Item *sitem = ivug_slider_get_current_slide_item(pMainView->slider);
- if(!sitem)
- {
- MSG_MAIN_ERROR("sitem is NULL");
- return;
- }
-
- if(sitem->zoom_level > ZOOM_LEVEL_MAX)
- {
- MSG_MAIN_ERROR("zoom_level is %d", sitem->zoom_level);
- return;
- }
-
- double zoom = 0.0;
- Evas_Coord ix = 0, iy= 0, iw= 0, ih= 0;
-
- evas_object_geometry_get(sitem->photocam, &ix, &iy, &iw, &ih);
-
- zoom = ivug_slider_item_zoom_get(sitem);
- zoom *= ZOOM_LEVEL_STEP;
- ivug_slider_item_zoom_set(sitem, zoom, iw/2, ih/2);
-
- ivug_slider_item_hold_set(sitem, EINA_FALSE);
-
- sitem->zoom_level++;
-
- _show_zoom_icon(data);
-}
-
-static void
-_ivug_main_view_update_details_item(Ivug_MainView *pMainView)
-{
- ivug_retm_if(!pMainView, "pMainView is NULL");
- ivug_retm_if(!pMainView->slider, "pMainView->slider is NULL");
-
- Slide_Item *sitem = ivug_slider_get_current_slide_item(pMainView->slider);
- if(!sitem)
- {
- MSG_MAIN_ERROR("sitem is NULL");
- return;
- }
-
- Media_Data *mdata = ivug_data_get_data(sitem->mitem);
- if(!mdata)
- {
- MSG_MAIN_ERROR("mdata is NULL");
- return;
- }
-
- _ctrl_bar_type ctrlBarType;
- ctrlBarType = _get_ctrl_bar_type(pMainView->mode, mdata->slide_type);
- if(ctrlBarType == CTRL_BAR_TYPE_FILE || ctrlBarType == CTRL_BAR_TYPE_CAMERA_IMAGE ||
- ctrlBarType == CTRL_BAR_TYPE_CAMERA_VIDEO)
- {
- /* Enable details button in control bar*/
- if(pMainView->ctrl_bar_item[1])
- elm_object_item_disabled_set(pMainView->ctrl_bar_item[1], EINA_FALSE);
- }
- else if(ctrlBarType == CTRL_BAR_TYPE_IMAGE || ctrlBarType == CTRL_BAR_TYPE_VIDEO)
- {
- /* Enable details button in control bar*/
- if(pMainView->ctrl_bar_item[2])
- elm_object_item_disabled_set(pMainView->ctrl_bar_item[2], EINA_FALSE);
- }
-}
-
-static void
-_ivug_main_view_delete_photo_cb(void *data, Evas_Object *obj, void *event_info)
-{
- IVUG_FUNC_ENTER();
- ivug_ret_if(!obj||!data||!event_info);
-
- int response_id = (int)event_info;
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
- if ( response_id == POPUP_RESPONSE_OK )
- {
- MSG_MAIN_HIGH("Removing current slide.");
-
- if(pMainView->pDetailsView)
- {
- MSG_MAIN_HIGH("Exit details view");
- _ivug_main_view_navibar_detail_close_cb(pMainView, NULL, NULL);
-
- _ivug_main_view_update_details_item(pMainView);
- }
-
- ivug_slider_delete_current_slide(pMainView->slider);
- }
-
- evas_object_del(obj); //delete popup
-
-}
-
-static void
-_ivug_main_view_ctrlbar_delete_cb(void *data, Evas_Object *obj, void *event_info)
-{
- IVUG_FUNC_ENTER();
- ivug_ret_if(!obj||!data);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- ivug_popup_question(pMainView->layout, NULL,
- IDS_DELETE_MSG, _ivug_main_view_delete_photo_cb, pMainView);
-
- IVUG_FUNC_LEAVE();
- return;
-}
-
-static void
-_ivug_main_view_ctrlbar_slide_show_cb(void *data, Evas_Object *obj, void *event_info)
-{
- MSG_MAIN_HIGH("Start slide show");
-
- IV_ASSERT(data != NULL);
- ivug_ret_if(!event_info);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- Elm_Object_Item *ctrl_bar_item = (Elm_Object_Item *)event_info;
-
- if(elm_object_item_disabled_get(ctrl_bar_item) == EINA_TRUE)
- {
- MSG_MAIN_WARN("Slide show already started");
- return;
- }
-
- elm_object_item_disabled_set(ctrl_bar_item, EINA_TRUE);
-
- if(pMainView->pDetailsView) {
- MSG_MAIN_HIGH("Exit details view");
- _ivug_main_view_navibar_detail_close_cb(pMainView, NULL, NULL);
- }
-
- ivug_prohibit_lcd_off();
-
- _ivug_main_view_hide_menu_bar(pMainView);
-
- ivug_slider_start_slide_show(pMainView->slider, EINA_TRUE);
-
-}
-
-
-static void
-_ivug_main_view_back_cb(void *data, Evas_Object *obj, void *event_info)
-{
- ivug_ret_if(!obj||!data);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
- ivug_retm_if(!pMainView->navi_bar, "%s", "navigation value is NULL");
-
- MSG_MAIN_WARN("Back key pressed");
-
- if( pMainView->pDetailsView == NULL) // Detail view is not showed,.
- {
- evas_object_smart_callback_del(pMainView->back_btn, "clicked", _ivug_main_view_back_cb);
- IVUG_MAIN_DESTROY_ME(pMainView);
- return;
- }
-
- /* Back from details view */
-
- Slide_Item *sitem = ivug_slider_get_current_slide_item(pMainView->slider);
- ivug_retm_if(!sitem, "sitem is NULL");
-
- Media_Data *mdata = ivug_data_get_data(sitem->mitem);
- ivug_retm_if(!mdata, "mdata is NULL");
-
- _ctrl_bar_type ctrlBarType;
- ctrlBarType = _get_ctrl_bar_type(pMainView->mode, mdata->slide_type);
- if(ctrlBarType == CTRL_BAR_TYPE_FILE ||
- ctrlBarType == CTRL_BAR_TYPE_CAMERA_IMAGE ||
- ctrlBarType == CTRL_BAR_TYPE_CAMERA_VIDEO)
- {
- // In case that called by my file, camera, UG doest not removed.
- _ivug_main_view_navibar_detail_close_cb(pMainView, NULL, NULL);
-
- MSG_MAIN_HIGH("Enable details button");
- if(pMainView->ctrl_bar_item[1])
- elm_object_item_disabled_set(pMainView->ctrl_bar_item[1], EINA_FALSE);
-
- return;
- }
- else if(ctrlBarType == CTRL_BAR_TYPE_IMAGE || ctrlBarType == CTRL_BAR_TYPE_VIDEO)
- {
- // In case that called by my file, camera, UG doest not removed.
- _ivug_main_view_navibar_detail_close_cb(pMainView, NULL, NULL);
-
- MSG_MAIN_HIGH("Enable details button");
- if(pMainView->ctrl_bar_item[2])
- elm_object_item_disabled_set(pMainView->ctrl_bar_item[2], EINA_FALSE);
- }
- else // otherwise, from gallery, ug will be terminated
- {
- evas_object_smart_callback_del(pMainView->back_btn, "clicked", _ivug_main_view_back_cb);
- IVUG_MAIN_DESTROY_ME(pMainView);
- return;
- }
-}
-
-
-
-static void
-_send_result(struct ui_gadget *ug, bool selected)
-{
-//result bundle key
-#define IVUG_RESULT_BUNDLE_KEY_SELECTION_RESULT "Result"
-
-//result bundle value
-#define IVUG_RESULT_BUNDLE_VALUE_OK "Ok"
-#define IVUG_RESULT_BUNDLE_VALUE_CANCEL "Cancel"
-
- ivug_ret_if(!ug);
-
- bundle *b;
- b = bundle_create();
-
- if (selected)
- {
- bundle_add(b, IVUG_RESULT_BUNDLE_KEY_SELECTION_RESULT, IVUG_RESULT_BUNDLE_VALUE_OK);
- }
- else
- {
- bundle_add(b, IVUG_RESULT_BUNDLE_KEY_SELECTION_RESULT, IVUG_RESULT_BUNDLE_VALUE_CANCEL);
- }
-
- ug_send_result(ug, b);
-
- bundle_free(b);
-}
-
-
-//select button
-void
-_ivug_main_view_select_ok_cb(void *data, Evas_Object *obj, void *event_info)
-{
- MSG_MAIN_HIGH("Select OK");
- ivug_ret_if(!obj||!data);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- //send result.
- _send_result(pMainView->ugHandle, true);
-
- IVUG_MAIN_DESTROY_ME(pMainView);
-}
-
-void
-_ivug_main_view_select_cancel_cb(void *data, Evas_Object *obj, void *event_info)
-{
- MSG_MAIN_HIGH("Select Cancel");
-
- ivug_ret_if(!obj||!data);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- //send result.
- _send_result(pMainView->ugHandle, false);
-
- IVUG_MAIN_DESTROY_ME(pMainView);
-}
-
-
-static bool _is_mmc_inserted(void)
-{
- int noti_message;
- int ret = -1;
-
- ret = vconf_get_int(VCONFKEY_SYSMAN_MMC_STATUS, &noti_message);
-
- if ( ret != 0 ) // falied
- {
- MSG_NOTI_ERROR("Get %s is failed", VCONFKEY_SYSMAN_MMC_STATUS);
- return false;
- }
-
- if(noti_message==VCONFKEY_SYSMAN_MMC_MOUNTED)
- {
- return true;
- }
-
- return false;
-
-}
-
-static Eina_Bool _key_down_cb(void *user_data, int type, void *event)
-{
- if (!user_data) {
- MSG_IMAGEVIEW_ERROR("user data is NULL");
- return ECORE_CALLBACK_PASS_ON;
- }
-
- Ecore_Event_Key *key_event = (Ecore_Event_Key *) event;
-
- Ivug_MainView *main_view = (Ivug_MainView *)user_data;
-
- MSG_IMAGEVIEW_HIGH("Key down : %s", key_event->keyname);
-
- if (!strcmp(key_event->keyname, KEY_END))
- {
- MSG_IMAGEVIEW_HIGH("Bakc(End) key");
- }
- else if (!strcmp(key_event->keyname, KEY_SELECT))
- {
- MSG_IMAGEVIEW_HIGH("Home key");
- }
- else if (!strcmp(key_event->keyname, KEY_POWER))
- {
- MSG_IMAGEVIEW_HIGH("Power key");
- ivug_slider_stop_slide_show(main_view->slider);
- }
- return ECORE_CALLBACK_PASS_ON;
-}
-
-static Eina_Bool _on_exit_timer_expired(void *data)
-{
- ivug_retv_if(!data, ECORE_CALLBACK_CANCEL);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- pMainView->exit_timer = NULL;
-
- IVUG_MAIN_DESTROY_ME(pMainView);
-
- return ECORE_CALLBACK_CANCEL;
-}
-
-static void _on_mmc_state_changed(keynode_t* node, void *data)
-{
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- if(_is_mmc_inserted() == false )
- {
- MSG_IMAGEVIEW_WARN("MMC Removed!. Request destroy UG=0x%08x", gGetUGHandle());
-
- if ( pMainView->ext_ug )
- {
- MSG_IMAGEVIEW_HIGH("Extern UG is running");
- }
-
- ivug_show_popup(pMainView->layout, IDS_ERROR, IDS_SD_CARD_REMOVED, NULL, NULL);
- pMainView->exit_timer = ecore_timer_add(0.2, _on_exit_timer_expired, data);
- }
-}
-
-static enum NAVI_BAR_TYPE
-_get_tool_bar_type(ivug_mode mode, Media_Type slide_type )
-{
- enum NAVI_BAR_TYPE tool_bar_type = NAVI_BAR_TYPE_NONE;
-
- //calc navi bar style , temporary code.
- static const char *szType[] = {
- "[ INVALID ]",
- "[ ]",
- "[Set, Info]",
- "[Ok, Cancel]",
- };
-
-
- switch (mode)
- {
- case IVUG_MODE_NORMAL:
- tool_bar_type = NAVI_BAR_TYPE_EMPTY;
- if (slide_type == SLIDE_TYPE_IMAGE)
- {
- tool_bar_type = NAVI_BAR_TYPE_IMAGE;
- }
- else if (slide_type == SLIDE_TYPE_VIDEO)
- {
- tool_bar_type = NAVI_BAR_TYPE_VIDEO;
- }
- else
- {
- tool_bar_type = NAVI_BAR_TYPE_EMPTY;
- }
- break;
- case IVUG_MODE_SINGLE:
- case IVUG_MODE_FILE:
- tool_bar_type = NAVI_BAR_TYPE_EMPTY;
-
- break;
- case IVUG_MODE_DISPLAY:
- tool_bar_type = NAVI_BAR_TYPE_SELECT;
-
- break;
- case IVUG_MODE_CAMERA:
- tool_bar_type = NAVI_BAR_TYPE_EMPTY;
- break;
- default:
- MSG_MAIN_ERROR("Unhandled mode : %d", mode);
- tool_bar_type = NAVI_BAR_TYPE_EMPTY;
-
- break;
- }
-
- MSG_MAIN_MED("Mode=%d Slide=%d ToolBar=%s", mode, slide_type, szType[tool_bar_type]);
-
- return tool_bar_type;
-}
-
-
-static enum CTRL_BAR_TYPE
-_get_ctrl_bar_type(ivug_mode mode, Media_Type slide_type)
-{
- // this is temporary code.
- enum CTRL_BAR_TYPE type = CTRL_BAR_TYPE_FILE;
-
- static const char *szType[] = {
- "[ Invalid ]",
- "[ None ]",
- "[Delete,Info]",
- "[Delete,Info]",
- "[Delete,Info]",
- "[Delete,Slide show]",
- "[Delete,Slide show]",
- };
-
- switch (mode)
- {
- case IVUG_MODE_NORMAL:
- if (slide_type == SLIDE_TYPE_IMAGE)
- {
- type = CTRL_BAR_TYPE_IMAGE;
- }
- else if (slide_type == SLIDE_TYPE_VIDEO)
- {
- type = CTRL_BAR_TYPE_VIDEO;
- }
- else if (slide_type == SLIDE_TYPE_UNKNOWN)
- {
- type = CTRL_BAR_TYPE_IMAGE; // TODO : Need to check. when web image is invalid????
- }
- else
- {
- MSG_MAIN_ERROR("Unhandled slide type : %d", slide_type);
- type = CTRL_BAR_TYPE_FILE;
- }
- break;
- case IVUG_MODE_SINGLE:
- case IVUG_MODE_FILE:
- type = CTRL_BAR_TYPE_FILE;
- break;
- case IVUG_MODE_CAMERA:
- if (slide_type == SLIDE_TYPE_IMAGE)
- {
- type = CTRL_BAR_TYPE_CAMERA_IMAGE;
- }
- else if (slide_type == SLIDE_TYPE_VIDEO)
- {
- type = CTRL_BAR_TYPE_CAMERA_VIDEO;
- }
- else
- {
- MSG_MAIN_ERROR("Unhandled slide type : %d", slide_type);
- type = CTRL_BAR_TYPE_FILE;
- }
- break;
- case IVUG_MODE_DISPLAY:
- type = CTRL_BAR_TYPE_EMPTY;
- break;
- default:
- MSG_MAIN_ERROR("Unhandled mode : %d", mode);
- type = CTRL_BAR_TYPE_FILE;
- }
-
- MSG_MAIN_MED("Mode=%d Slide=%d CtrlBar=%s", mode, slide_type, szType[type]);
-
- return type;
-
-}
-
-Evas_Object *_create_ctrl_bar(Evas_Object *parent, Elm_Theme *th)
-{
- Evas_Object *toolbar = elm_toolbar_add(parent);
-
-//create control bar
- if (toolbar == NULL)
- {
- MSG_MAIN_ERROR("controlbar create failed");
- return NULL;
- }
-
- elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
-
-#ifdef USE_CUSTOM_STYLE
- elm_object_theme_set(toolbar, th);
-
- char *ctrlStyle = NULL;
-
- ctrlStyle = "ivug-toolbar/default";
-
- Eina_Bool bstyle = elm_object_style_set(toolbar, ctrlStyle);
- MSG_MAIN_HIGH("toolbar elm_object_style_set result = %d", bstyle);
-#endif
-
- MSG_MAIN_HIGH("Create ctrl_bar. Obj=0x%08x", toolbar);
-
- return toolbar;
-
-}
-
-void
-_update_tool_bar(Ivug_MainView *pMainView, enum NAVI_BAR_TYPE barType)
-{
-
-/*
- |-------------------|
- |naviframe(tool_bar)|
- |-------------------|
- | |
- | |
- | |
- | |
- |-------------------|
- | ctrl_bar |
- |-------------------|
-*/
-
- MSG_MAIN_HIGH("Update tool_bar. Type=%d", barType);
-//remove old control bar item.
- int i = 0;
-
- for ( i = 0 ; i < MAX_NAVI_ITEM_CNT ; i ++)
- {
- if (pMainView->tool_bar_item[i])
- {
- evas_object_del(pMainView->tool_bar_item[i]);
- pMainView->tool_bar_item[i] = NULL;
- }
- }
-
- if ( barType != NAVI_BAR_TYPE_SELECT )
- {
- /* other type don't need toolbar */
- return;
- }
-
- pMainView->tool_bar_item[0] = ivug_button_add(pMainView->navi_bar, "naviframe/title/default" , IDS_OK,
- NULL, _ivug_main_view_select_ok_cb, pMainView );
-
- pMainView->tool_bar_item[1] = ivug_button_add(pMainView->navi_bar, "naviframe/title/default" , IDS_CANCEL,
- NULL, _ivug_main_view_select_cancel_cb, pMainView );
-
- elm_object_item_part_content_set(pMainView->navi_it, "title_left_btn", pMainView->tool_bar_item[0]);
- elm_object_item_part_content_set(pMainView->navi_it, "title_right_btn", pMainView->tool_bar_item[1]);
-
- pMainView->option_show = EINA_TRUE;
-}
-
-
-
-void
-_update_ctrl_bar(Ivug_MainView *pMainView, enum CTRL_BAR_TYPE barType)
-{
- MSG_MAIN_HIGH("Update ctrl_bar. barType=%d", barType);
-
-//remove old control bar item.
- Evas_Object* ctrl_bar = pMainView->ctrl_bar;
-
- int i = 0;
-
- for ( i = 0 ; i < MAX_CTRL_ITEM_CNT ; i ++)
- {
- if (pMainView->ctrl_bar_item[i])
- {
- elm_object_item_del(pMainView->ctrl_bar_item[i]);
- pMainView->ctrl_bar_item[i] = NULL;
- }
- }
-
-/*
- IVUG_MODE_NORMAL =>
- Depends on content
- Image [Delete, Slide show, Detail] -> CTRL_BAR_TYPE_IMAGE
- Video [Delete, Slide show, Detail] -> CTRL_BAR_TYPE_VIDEO
-
- IVUG_MODE_SINGLE, IVUG_MODE_FILE, => CTRL_BAR_TYPE_FILE [Delete,Info]
- IVUG_MODE_DISPLAY => CTRL_BAR_TYPE_EMPTY
-
- if ((mode == IVUG_MODE_FILE) || (mode == IVUG_MODE_SINGLE))
- barType == CTRL_BAR_TYPE_FILE
-
-*/
- switch(barType)
- {
- case CTRL_BAR_TYPE_FILE:
- pMainView->ctrl_bar_item[0] = elm_toolbar_item_append(ctrl_bar,
- ICON_PATH_DELETE, NULL, _ivug_main_view_ctrlbar_delete_cb, pMainView);
- pMainView->ctrl_bar_item[1] = elm_toolbar_item_append(ctrl_bar,
- ICON_PATH_INFO, NULL, _ivug_main_view_navibar_detail_cb, pMainView);
- break;
-
- case CTRL_BAR_TYPE_CAMERA_IMAGE:
- pMainView->ctrl_bar_item[0] = elm_toolbar_item_append(ctrl_bar,
- ICON_PATH_DELETE, NULL, _ivug_main_view_ctrlbar_delete_cb, pMainView);
- pMainView->ctrl_bar_item[1] = elm_toolbar_item_append(ctrl_bar,
- ICON_PATH_INFO, NULL, _ivug_main_view_navibar_detail_cb, pMainView);
- break;
-
- case CTRL_BAR_TYPE_CAMERA_VIDEO:
- pMainView->ctrl_bar_item[0] = elm_toolbar_item_append(ctrl_bar,
- ICON_PATH_DELETE, NULL, _ivug_main_view_ctrlbar_delete_cb, pMainView);
- pMainView->ctrl_bar_item[1] = elm_toolbar_item_append(ctrl_bar,
- ICON_PATH_INFO, NULL, _ivug_main_view_navibar_detail_cb, pMainView);
- break;
-
- case CTRL_BAR_TYPE_IMAGE:
- pMainView->ctrl_bar_item[0] = elm_toolbar_item_append(ctrl_bar,
- ICON_PATH_DELETE, NULL, _ivug_main_view_ctrlbar_delete_cb, pMainView);
- pMainView->ctrl_bar_item[1] = elm_toolbar_item_append(ctrl_bar,
- ICON_PATH_SLIDESHOW, NULL, _ivug_main_view_ctrlbar_slide_show_cb, pMainView);
- pMainView->ctrl_bar_item[2] = elm_toolbar_item_append(ctrl_bar,
- ICON_PATH_INFO, NULL, _ivug_main_view_navibar_detail_cb, pMainView);
- break;
-
- case CTRL_BAR_TYPE_VIDEO:
- pMainView->ctrl_bar_item[0] = elm_toolbar_item_append(ctrl_bar,
- ICON_PATH_DELETE, NULL, _ivug_main_view_ctrlbar_delete_cb, pMainView);
- pMainView->ctrl_bar_item[1] = elm_toolbar_item_append(ctrl_bar,
- ICON_PATH_SLIDESHOW, NULL, _ivug_main_view_ctrlbar_slide_show_cb, pMainView);
- pMainView->ctrl_bar_item[2] = elm_toolbar_item_append(ctrl_bar,
- ICON_PATH_INFO, NULL, _ivug_main_view_navibar_detail_cb, pMainView);
- break;
-
- default:
- MSG_MAIN_ERROR("Unhandled ctrl bar type=%d", barType);
- break;
- }
-
-}
-
-static void _update_main_view(Ivug_MainView *pMainView, Slide_Item *sitem)
-{
- Media_Data *mdata = ivug_data_get_data(sitem->mitem);
- if(mdata == NULL)
- {
- MSG_MAIN_ERROR("mdata is NULL");
- return;
- }
-
- PERF_CHECK_BEGIN(LVL6 "Set menu title");
-
- _update_title(pMainView);
-
- PERF_CHECK_END(LVL6 "Set menu title");
-
- if(pMainView->pDetailsView)
- {
- MSG_MAIN_ERROR("In details view, skip update toolbar/controlbar");
- return;
- }
-
- enum CTRL_BAR_TYPE ctrlBarType;
- enum NAVI_BAR_TYPE toolBarType;
-
- ctrlBarType = _get_ctrl_bar_type(pMainView->mode, mdata->slide_type);
- toolBarType = _get_tool_bar_type(pMainView->mode, mdata->slide_type);
-
- if ( toolBarType != pMainView->tool_bar_type ) // when change toolbar Type
- {
- PERF_CHECK_BEGIN(LVL6 "add toolbar item");
-
- MSG_MAIN_HIGH("ToolBar update. Old=%d Cur=%d", toolBarType , pMainView->tool_bar_type);
- _update_tool_bar(pMainView, toolBarType);
- pMainView->tool_bar_type = toolBarType;
-
- PERF_CHECK_END(LVL6 "add toolbar item");
- }
-
- if ( ctrlBarType != pMainView->ctrl_bar_type ) // when change ctrlbar Type
- {
- PERF_CHECK_BEGIN(LVL6 "add contolbar item");
-
- MSG_MAIN_HIGH("CtrlBar update. Old=%d Cur=%d", ctrlBarType , pMainView->ctrl_bar_type);
- _update_ctrl_bar(pMainView, ctrlBarType);
- pMainView->ctrl_bar_type = ctrlBarType;
-
- PERF_CHECK_END(LVL6 "add contolbar item");
- }
-
-// If Inavalid image, disable all buttons.
-
- slide_state_t state = ivug_slider_item_get_state(sitem);
-
- Elm_Object_Item *item = NULL;
- if ( state == SLIDE_STATE_ERROR)
- {
- const char *item_label = NULL;
- Evas_Object *object = NULL;
-
- /* Disable all toolbar items */
- int i = 0;
- for(i=0; i<MAX_NAVI_ITEM_CNT; i++)
- {
- if(pMainView->tool_bar_item[i] && (item_label = elm_object_text_get(pMainView->tool_bar_item[i])) )
- {
- if(!strncmp(item_label, IDS_DETAILS, strlen(item_label)))
- {
- MSG_MAIN_HIGH("Skip %s", item_label);
- continue;
- }
- }
- elm_object_disabled_set(pMainView->tool_bar_item[i], EINA_TRUE);
- }
-
- /* Disable all controlbar items */
-#ifdef _USE_LABEL_
- item = elm_toolbar_first_item_get(pMainView->ctrl_bar);
- for(; item!=NULL; item=elm_toolbar_item_next_get(item)){
- item_label = elm_object_item_text_get(item);
- if(item_label && (!strncmp(item_label, IDS_DELETE, strlen(item_label)) ||
- !strncmp(item_label, IDS_DETAILS, strlen(item_label)) ||
- !strncmp(item_label, IDS_SLIDE_SHOW, strlen(item_label))))
- {
- MSG_MAIN_HIGH("Skip %s", item_label);
- continue;
- }
-
- elm_object_item_disabled_set(item, EINA_TRUE);
- }
-#else
- const char *icon_file = NULL;
- item = elm_toolbar_first_item_get(pMainView->ctrl_bar);
- for(; item!=NULL; item=elm_toolbar_item_next_get(item))
- {
- object = elm_toolbar_item_icon_object_get(item);
- if(!object)
- continue;
-
- elm_icon_file_get(object, &icon_file, NULL);
-
- if(icon_file && (!strncmp(icon_file, ICON_PATH_DELETE, strlen(icon_file)) ||
- !strncmp(icon_file, ICON_PATH_INFO, strlen(icon_file)) ||
- !strncmp(icon_file, ICON_PATH_SLIDESHOW, strlen(icon_file))))
- {
- MSG_MAIN_HIGH("Skip %s", icon_file);
- continue;
- }
-
- elm_object_item_disabled_set(item, EINA_TRUE);
- }
-#endif
- return ;
- }
- else
- {
- int i = 0;
- /* Enable all toolbar items */
- for(i=0; i<MAX_NAVI_ITEM_CNT; i++)
- {
- if(pMainView->tool_bar_item[i])
- {
- elm_object_disabled_set(pMainView->tool_bar_item[i], EINA_FALSE);
- }
- }
-
- /* Enable all controlbar items */
- item = elm_toolbar_first_item_get(pMainView->ctrl_bar);
- for(; item!=NULL; item=elm_toolbar_item_next_get(item))
- {
- elm_object_item_disabled_set(item, EINA_FALSE);
- }
- }
-
- if(mdata->slide_type == SLIDE_TYPE_IMAGE)
- {
- _show_zoom_icon(pMainView);
- }
- else
- {
- edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_out,hide","elm");
- edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_in,hide","elm");
- }
-}
-
-void
-_ivug_main_view_show_menu_bar(Ivug_MainView *pMainView)
-{
- MSG_MAIN_HIGH("Show Menu");
-
- pMainView->bShowMenu = EINA_TRUE;
- evas_object_show(pMainView->ctrl_bar);
- Slide_Item *sitem = ivug_slider_get_current_slide_item(pMainView->slider);
-
- _update_main_view(pMainView, sitem);
-
-#ifdef HIDE_INDICATOR
- elm_win_indicator_mode_set(ug_get_window(), ELM_WIN_INDICATOR_HIDE);
-#else
- elm_win_indicator_mode_set(ug_get_window(), ELM_WIN_INDICATOR_SHOW);
-#endif
-
- Media_Data *mdata = ivug_data_get_data(sitem->mitem);
- if(mdata == NULL)
- {
- MSG_MAIN_ERROR("mdata is NULL");
- return;
- }
-
- if(mdata->slide_type == SLIDE_TYPE_IMAGE)
- {
- _show_zoom_icon(pMainView);
- }
-
- elm_naviframe_item_title_visible_set(pMainView->navi_it, EINA_TRUE);
- elm_object_item_signal_emit(pMainView->navi_it, "elm,state,controlbar,open", "");
-
-#ifdef TEST_MOUSE_EVENT
- Eina_List *l = evas_object_clipees_get(pMainView->navi_bar);
-
- MSG_MAIN_HIGH("Clipper clips %i objects", eina_list_count(l));
-
- Evas_Object *obj;
- Eina_List *l1;
-
- EINA_LIST_FOREACH(l, l1, obj)
- {
-
- MSG_MAIN_HIGH("Object Type : %s", evas_object_name_get(obj));
-
- }
- Evas_Object *above;
- Evas_Object *below;
-
-
- above = evas_object_above_get(pMainView->navi_bar);
- MSG_MAIN_HIGH("Navi Above : 0x%08x %s %s", above, evas_object_name_get(above), evas_object_type_get(above));
-
- below = evas_object_below_get(pMainView->navi_bar);
- MSG_MAIN_HIGH("Navi Below : 0x%08x %s %s", below, evas_object_name_get(below), evas_object_type_get(below));
-
- above = evas_object_above_get(pMainView->slider);
- MSG_MAIN_HIGH("Slider Above : 0x%08x %s %s", above, evas_object_name_get(above), evas_object_type_get(above));
-
- below = evas_object_below_get(pMainView->slider);
- MSG_MAIN_HIGH("Slider Below : 0x%08x %s %s", below, evas_object_name_get(below), evas_object_type_get(below));
-#endif
-
-
-}
-
-
-void
-_ivug_main_view_hide_menu_bar(Ivug_MainView *pMainView)
-{
- MSG_MAIN_HIGH("Hide Menu");
-
- pMainView->bShowMenu = EINA_FALSE;
- elm_widget_disabled_set(pMainView->ctrl_bar, EINA_TRUE);
-
- elm_win_indicator_mode_set(ug_get_window(), ELM_WIN_INDICATOR_HIDE);
- edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_out,hide","elm");
- edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_in,hide","elm");
- elm_naviframe_item_title_visible_set(pMainView->navi_it, EINA_FALSE);
- elm_object_item_signal_emit(pMainView->navi_it, "elm,state,controlbar,close", "");
-}
-
-
-static void
-_ivug_main_view_clicked(void *data, Evas_Object *obj, void *event_info)
-{
- MSG_MAIN_HIGH("Main View Clicked");
- IV_ASSERT(data != NULL);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
-// TODO : Bug. menu bar is blinking when stopping slide show.
- if (pMainView->bShowMenu)
- {
- _ivug_main_view_hide_menu_bar(pMainView);
- }
- else
- {
- _ivug_main_view_show_menu_bar(pMainView);
- }
-
-}
-
-static void
-_ivug_main_view_icon_clicked(void *data, Evas_Object *obj, void *event_info)
-{
- MSG_MAIN_HIGH("Main View Video icon Clicked");
- IV_ASSERT(data != NULL);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- Slide_Item *sitem = ivug_slider_get_current_slide_item(pMainView->slider);
- Media_Data *mdata = ivug_data_get_data(sitem->mitem);
-
- if (mdata == NULL)
- {
- MSG_MAIN_ERROR("slide data is NULL");
- return;
- }
-
- if (pMainView->mode == IVUG_MODE_FILE || pMainView->mode == IVUG_MODE_DISPLAY || pMainView->mode == IVUG_MODE_SINGLE )
- {
- MSG_MAIN_HIGH("Launching simple video player. Mode=%d", pMainView->mode);
- ivug_ext_aul_launch(pMainView->layout, IVUG_EXT_AUL_SIMPLE_VIDEOPLAYER, mdata->filepath, NULL);
- }
- else
- {
- MSG_MAIN_HIGH("Launching normal video player");
- ivug_ext_aul_launch(pMainView->layout, IVUG_EXT_AUL_VIDEOPLAYER, mdata->filepath, NULL);
- }
-
-}
-
-static void
-_ivug_main_view_long_pressed(void *data, Evas_Object *obj, void *event_info)
-{
- Evas_Coord_Point* down_pose = (Evas_Coord_Point*)event_info;
- ivug_ret_if(!data||!down_pose);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
- MSG_MAIN_HIGH("LongPressed XY(%d,%d)", down_pose->x, down_pose->y);
-
- int x = down_pose->x;
- int y = down_pose->y;
-
- Slide_Item *si = ivug_slider_get_current_slide_item(pMainView->slider);
- IV_ASSERT(si != NULL);
-
- if ( ivug_slider_item_get_state(si) != SLIDE_STATE_LOADED)
- {
- MSG_MAIN_ERROR("Long pressed. but state is not ready");
- return;
- }
-
- pMainView->copy_popup = _ivug_main_create_copy_popup_create(pMainView, x, y);
- if (pMainView->copy_popup == NULL)
- {
- IVUG_DEBUG_WARNING("copy popup create failed");
- return ;
- }
-
-}
-
-
-static void
-_ivug_main_view_slider_changed_cb(void *data, Evas_Object *obj, void *event_info)
-{
- MSG_MAIN_HIGH("Image slider changed callback. ");
-
- ivug_ret_if(!data);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
- Slide_Item *sitem = (Slide_Item *)event_info;
-
- if ( sitem == NULL || sitem->mitem == NULL)
- {
- // There is no item existed. terminate UG
- MSG_MAIN_ERROR("No item is remained. exit UG. Sitem=0x%08x", sitem);
- IVUG_MAIN_DESTROY_ME(pMainView);
- return;
- }
-
- if(pMainView->selectioninfo != NULL)
- {
- MSG_MAIN_MED("Delete small noti");
- evas_object_del(pMainView->selectioninfo);
- pMainView->selectioninfo = NULL;
- }
- if (pMainView->copy_popup)
- {
- MSG_MAIN_MED("Delete copy popup");
- evas_object_del(pMainView->copy_popup);
- pMainView->copy_popup = NULL;
- }
-
-// Update Main View.
- if ( pMainView->bShowMenu == true )
- {
- PERF_CHECK_BEGIN(LVL5 "Update main view");
- _update_main_view(pMainView, sitem);
- PERF_CHECK_END(LVL5 "Update main view");
- }
-
-}
-
-
-static void
-_ivug_main_view_slider_item_state_changed_cb(void *data, Evas_Object *obj, void *event_info)
-{
- MSG_MAIN_HIGH("Image slider item state changed callback. ");
- ivug_ret_if(!data);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
- Slide_Item *sitem = (Slide_Item *)event_info;
-
- if ( sitem == NULL || sitem->mitem == NULL)
- {
- // There is no item existed. terminate UG
- MSG_MAIN_ERROR("No item is remained. exit UG");
- IVUG_MAIN_DESTROY_ME(pMainView);
- return;
- }
-
-// Update Main View.
- if ( pMainView->bShowMenu == true )
- {
- _update_main_view(pMainView, sitem);
- }
-}
-
-
-static void
-_ivug_main_view_slider_deleted_cb(void *data, Evas_Object *obj, void *event_info)
-{
- MSG_MAIN_HIGH("Image slider deleted callback. ");
- ivug_ret_if(!data);
-
- Ivug_MainView *pMainView = (Ivug_MainView *)data;
- Slide_Item *sitem = (Slide_Item *)event_info;
-
- if ( sitem == NULL || sitem->mitem == NULL )
- {
- // There is no item existed. terminate UG
- MSG_MAIN_ERROR("No item is remained. exit UG");
- IVUG_MAIN_DESTROY_ME(pMainView);
- return;
- }
-
- _main_view_create_selection_info(pMainView, IDS_DELETED);
-
- if ( pMainView->bShowMenu == true )
- {
- _update_main_view(pMainView, sitem);
- }
-
-}
-
-
-static void
-_ivug_main_view_slider_slideshow_finished_cb(void *data, Evas_Object *obj, void *event_info)
-{
- IV_A