[TSAM-9271][TSAM-9311]Ratio text added and folder view timestamp text removed

Change-Id: I89b0256f2fcb3bf0b13d0093db32fb5f976d4664
Signed-off-by: Alka Sethi <alka.sethi@samsung.com>

diff --git a/playview/src/include/vp-play-string-define.h b/playview/src/include/vp-play-string-define.h
index faa545f..b7e08de 100644 (file)
--- a/playview/src/include/vp-play-string-define.h
+++ b/playview/src/include/vp-play-string-define.h
@@ -626,6 +626,8 @@
 #define VP_PLAY_STRING_COM_PAUSE                               (dgettext(VP_LOCAL_STR_PREFIX, "IDS_MUSIC_OPT_PAUSE"))
 #define VP_PLAY_STRING_COM_PREVIOUS                            (dgettext(VP_LOCAL_STR_PREFIX, "IDS_BR_SK_PREVIOUS"))
 #define VP_PLAY_STRING_COM_NEXT                                        (dgettext(VP_LOCAL_STR_PREFIX, "IDS_BR_SK_NEXT"))
+#define VP_PLAY_STRING_COM_FULL                                        ("Full")
+#define VP_PLAY_STRING_COM_KEEP_RATIO                  ("Keep Ratio")
 #define VP_PLAY_STRING_COM_VOLUME                              (dgettext(VP_LOCAL_STR_PREFIX, "IDS_VPL_POP_VOLUME_M_SOUND"))
 #define VP_PLAY_STRING_COM_ROTATE                              (dgettext(VP_LOCAL_STR_PREFIX, "IDS_VPL_POP_ROTATE"))//this id has been reomved from po file
 #define VP_PLAY_STRING_COM_ON                                  (dgettext(VP_SYS_STR_PREFIX, "IDS_COM_BODY_ON"))

diff --git a/playview/src/view/vp-play-normal-view.c b/playview/src/view/vp-play-normal-view.c
index dd003d8..ebe2215 100644 (file)
--- a/playview/src/view/vp-play-normal-view.c
+++ b/playview/src/view/vp-play-normal-view.c
@@ -5527,6 +5527,7 @@ static void __vp_normal_function_btn_clicked_cb(void *pUserData, Evas_Object *pO
 
                        pIcon = vp_button_create_icon(pNormalView->pScreenSizeBtn, edj_path, VP_PLAY_NORMAL_RES_SCREEN_1_MODE);
                        elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_PRESS_ICON, pIcon);
+                       elm_object_text_set(pNormalView->pScreenSizeBtn, VP_PLAY_STRING_COM_FULL);
 
                        //pIcon = vp_button_create_icon(pNormalView->pScreenSizeBtn, edj_path, VP_PLAY_NORMAL_RES_SCREEN_1_MODE_DIM);
                        //elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_DIM_ICON, pIcon);
@@ -5561,6 +5562,7 @@ static void __vp_normal_function_btn_clicked_cb(void *pUserData, Evas_Object *pO
 
                        pIcon = vp_button_create_icon(pNormalView->pScreenSizeBtn, edj_path, VP_PLAY_NORMAL_RES_SCREEN_2_MODE_PRESS);
                        elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_PRESS_ICON, pIcon);
+                       elm_object_text_set(pNormalView->pScreenSizeBtn, VP_PLAY_STRING_COM_KEEP_RATIO);
 
                        //pIcon = vp_button_create_icon(pNormalView->pScreenSizeBtn, edj_path, VP_PLAY_NORMAL_RES_SCREEN_2_MODE_DIM);
                        //elm_object_part_content_set(pNormalView->pScreenSizeBtn, VP_PLAY_SWALLOW_BUTTON_DIM_ICON, pIcon);
@@ -11086,7 +11088,7 @@ static bool _vp_play_normal_view_create_main_control(NormalView *pNormalView)
        }
 
        pNormalView->pScreenSizeBtn = vp_button_create(
-                                         pParent, "custom/flat_56_56/default", NULL,
+                                         pParent, "custom/flat_56_56/default", VP_PLAY_STRING_COM_FULL,
                                          (Evas_Smart_Cb)__vp_normal_function_btn_clicked_cb,
                                          (Evas_Smart_Cb)__vp_normal_control_btn_press_cb,
                                          (Evas_Smart_Cb)__vp_normal_control_btn_unpress_cb,

diff --git a/src/view/mp-video-list-view-item-of-folder.c b/src/view/mp-video-list-view-item-of-folder.c
index c8a88f5..8867a37 100644 (file)
--- a/src/view/mp-video-list-view-item-of-folder.c
+++ b/src/view/mp-video-list-view-item-of-folder.c
@@ -320,15 +320,15 @@ static char *__mp_folder_item_view_get_guration_time(int nVideoItemIndex)
        unsigned int nVideoInfoLastTime = mp_util_svc_get_video_last_played_pos(nVideoItemIndex);
 
        mp_util_convert_time(nVideoInfoDuration, szTmpStrDurationTime, FALSE);
-       if (nVideoInfoLastTime > 0)
+/*     if (nVideoInfoLastTime > 0)
        {
                mp_util_convert_time(nVideoInfoLastTime, szTmpStrLastPlayedPos, TRUE);
                snprintf(szTmpStr, STR_LEN_MAX, "<match>%s</match>/%s", szTmpStrLastPlayedPos, szTmpStrDurationTime);
        }
        else
-       {
+       {*/
                snprintf(szTmpStr, STR_LEN_MAX, "%s", szTmpStrDurationTime);
-       }
+//     }
 
        return strdup(szTmpStr);
 }