summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xcommon/src/vp-util.c5
-rwxr-xr-xplayview/src/feature/vp-detail.c43
-rwxr-xr-xplayview/src/view/vp-play-normal-view.c8
-rwxr-xr-xvp-main/res/edje/custom/pv-custom-layout.edc44
-rwxr-xr-xvp-main/res/po/en.po4
-rwxr-xr-xvp-main/res/po/en_PH.po4
-rwxr-xr-xvp-main/res/po/en_US.po4
7 files changed, 76 insertions, 36 deletions
diff --git a/common/src/vp-util.c b/common/src/vp-util.c
index aa8f99c..aa343ad 100755
--- a/common/src/vp-util.c
+++ b/common/src/vp-util.c
@@ -22,7 +22,7 @@
#define CLOUD_FOLDER "/opt/usr/media/.cloud"
-#define OTG_FOLDER "/opt/storage/usb"
+#define OTG_FOLDER "/opt/media/USBDrive" // as usb are mount to /opt/media/USBDriveXX
#define PERSONAL_PAGE_FOLDER "/opt/storage/PersonalStorage"
#define PKGNAME "videos"
@@ -146,7 +146,8 @@ static char *__vp_util_get_logic_path(const char *full_path)
root_len = strlen(MEMORY_FOLDER);
break;
case VP_STORAGE_OTG:
- root_len = strlen(OTG_FOLDER);
+ // as usb is mount on /opt/media/USBDriveXX ..we need to increase size by 2 to compensate for Drive letter like A1, B1 etc
+ root_len = strlen(OTG_FOLDER)+2;
break;
case VP_STORAGE_PERSONAL_PAGE:
root_len = strlen(PERSONAL_PAGE_FOLDER);
diff --git a/playview/src/feature/vp-detail.c b/playview/src/feature/vp-detail.c
index 51bd13e..a388048 100755
--- a/playview/src/feature/vp-detail.c
+++ b/playview/src/feature/vp-detail.c
@@ -74,7 +74,16 @@ static void _vp_detail_destroy_handle();
static void __vp_detail_genlist_realized(void *data, Evas_Object * obj,
void *event_info)
{
- VP_GENLIST_HIDE_BOTTOMLINE(data, obj, event_info);
+ Elm_Widget_Item *item = (Elm_Widget_Item *)event_info;
+ if(elm_genlist_first_item_get(obj) == item)
+ {
+ elm_object_item_signal_emit(item, "elm,state,group,top", "elm");
+ }
+ else if(elm_genlist_last_item_get(obj) == item)
+ {
+ elm_object_item_signal_emit(item, "elm,state,group,bottom", "elm");
+ elm_object_item_signal_emit(item, "elm,state,bottomline,hide", "elm");
+ }
}
/**
@@ -84,9 +93,7 @@ static void __vp_detail_genlist_realized(void *data, Evas_Object * obj,
* @param pPart
* @return
*/
-static char *__vp_detail_genlist_text_get_cb(const void *pUserData,
- Evas_Object * pObj,
- const char *pPart)
+static char *__vp_detail_genlist_text_get_cb(void *pUserData, Evas_Object * pObj, const char *pPart)
{
if (pUserData == NULL) {
VideoLogError("pUserData is NULL");
@@ -97,9 +104,9 @@ static char *__vp_detail_genlist_text_get_cb(const void *pUserData,
VideoLogWarning("%s : %s", pPart, szTxt);
- if (!strcmp(pPart, "elm.text")) {
+ if (!strcmp(pPart, "elm.text.sub")) {
return strdup(szTxt);
- } else if (!strcmp(pPart, "elm.text.sub")) {
+ } else if (!strcmp(pPart, "elm.text")) {
DetailView *pDetailPopup =
(DetailView *) evas_object_data_get(pObj,
@@ -259,9 +266,8 @@ static bool _vp_detail_add_genlist_item(Evas_Object * pObj,
}
pDetailPopup->st_Detail_Itc->version = ELM_GENLIST_ITEM_CLASS_VERSION;
- pDetailPopup->st_Detail_Itc->item_style = "type1";
- pDetailPopup->st_Detail_Itc->func.text_get =
- (void *) __vp_detail_genlist_text_get_cb;
+ pDetailPopup->st_Detail_Itc->item_style = "2line_reversed";
+ pDetailPopup->st_Detail_Itc->func.text_get = __vp_detail_genlist_text_get_cb;
pDetailPopup->st_Detail_Itc->func.content_get = NULL;
pDetailPopup->st_Detail_Itc->func.state_get = NULL;
pDetailPopup->st_Detail_Itc->func.del = NULL;
@@ -273,8 +279,7 @@ static bool _vp_detail_add_genlist_item(Evas_Object * pObj,
(void *) VP_PLAY_STRING_DETAIL_TITLE,
NULL, ELM_GENLIST_ITEM_NONE, NULL,
(void *) pDetailPopup);
- elm_genlist_item_select_mode_set(pItem,
- ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ elm_genlist_item_select_mode_set(pItem, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
item_cnt++;
pItem =
@@ -282,11 +287,10 @@ static bool _vp_detail_add_genlist_item(Evas_Object * pObj,
(void *) VP_PLAY_STRING_DETAIL_SIZE, NULL,
ELM_GENLIST_ITEM_NONE, NULL,
(void *) pDetailPopup);
- elm_genlist_item_select_mode_set(pItem,
- ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ elm_genlist_item_select_mode_set(pItem, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
item_cnt++;
- if (pDetailPopup->pDetailInfo->bPlayready == FALSE) {
+ /* if (pDetailPopup->pDetailInfo->bPlayready == FALSE) {
pItem =
elm_genlist_item_append(pObj, pDetailPopup->st_Detail_Itc,
(void *) VP_PLAY_STRING_DETAIL_FORMAT,
@@ -295,7 +299,7 @@ static bool _vp_detail_add_genlist_item(Evas_Object * pObj,
elm_genlist_item_select_mode_set(pItem,
ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
item_cnt++;
- }
+ } */
if (pDetailPopup->pDetailInfo->bPlayready == FALSE) {
@@ -305,8 +309,7 @@ static bool _vp_detail_add_genlist_item(Evas_Object * pObj,
VP_PLAY_STRING_DETAIL_RESOLUTION,
NULL, ELM_GENLIST_ITEM_NONE, NULL,
(void *) pDetailPopup);
- elm_genlist_item_select_mode_set(pItem,
- ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ elm_genlist_item_select_mode_set(pItem, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
item_cnt++;
}
@@ -315,8 +318,7 @@ static bool _vp_detail_add_genlist_item(Evas_Object * pObj,
VP_PLAY_STRING_DETAIL_LAST_MODIFIED, NULL,
ELM_GENLIST_ITEM_NONE, NULL,
(void *) pDetailPopup);
- elm_genlist_item_select_mode_set(pItem,
- ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ elm_genlist_item_select_mode_set(pItem, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
item_cnt++;
if (pDetailPopup->pDetailInfo->bPlayready == FALSE) {
@@ -326,8 +328,7 @@ static bool _vp_detail_add_genlist_item(Evas_Object * pObj,
VP_PLAY_STRING_DETAIL_LOCATION, NULL,
ELM_GENLIST_ITEM_NONE, NULL,
(void *) pDetailPopup);
- elm_genlist_item_select_mode_set(pItem,
- ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+ elm_genlist_item_select_mode_set(pItem, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
item_cnt++;
}
diff --git a/playview/src/view/vp-play-normal-view.c b/playview/src/view/vp-play-normal-view.c
index c05f515..6435f2e 100755
--- a/playview/src/view/vp-play-normal-view.c
+++ b/playview/src/view/vp-play-normal-view.c
@@ -10929,18 +10929,17 @@ static void _vp_play_normal_view_on_detail_popup(NormalView * pNormalView)
&dLongitude, &szModifiedTime);
if (szTitle) {
pDetailInfo->szTitle =
- vp_play_util_get_title_from_path(szTitle);
+ vp_play_util_get_filename_from_path(szTitle);
} else {
pDetailInfo->szTitle =
- vp_play_util_get_title_from_path(pNormalView->szMediaURL);
+ vp_play_util_get_filename_from_path(pNormalView->szMediaURL);
}
if (nWidth == 0) {
vp_media_metadata_get_width(pNormalView->szMediaURL, &nWidth);
}
if (nHeight == 0) {
- vp_media_metadata_get_height(pNormalView->szMediaURL,
- &nHeight);
+ vp_media_metadata_get_height(pNormalView->szMediaURL, &nHeight);
}
} else {
pDetailInfo->szTitle =
@@ -10986,7 +10985,6 @@ static void _vp_play_normal_view_on_detail_popup(NormalView * pNormalView)
VP_FREE(pDetailInfo->szLatitude);
VP_FREE(pDetailInfo->szLongitude);
VP_FREE(pDetailInfo->szLocation);
- VP_FREE(pDetailInfo->szLastModified);
VP_FREE(pDetailInfo);
return;
}
diff --git a/vp-main/res/edje/custom/pv-custom-layout.edc b/vp-main/res/edje/custom/pv-custom-layout.edc
index 6622704..5dc4030 100755
--- a/vp-main/res/edje/custom/pv-custom-layout.edc
+++ b/vp-main/res/edje/custom/pv-custom-layout.edc
@@ -76,6 +76,12 @@
group {
name: "elm/layout/application/detail_view";
parts {
+ part { name: "base";
+ type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ }
+ }
part {
name: "elm.swallow.bg";
type: SWALLOW;
@@ -85,6 +91,38 @@ group {
color: 0 0 0 255;
}
}
+ part { name: "left_padding";
+ type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 40 0;
+ max: 40 -1;
+ fixed: 1 0;
+ align: 0.0 0.0;
+ rel1 {
+ to: "base"; relative: 0.0 0.0;
+ }
+ rel2 {
+ to: "base"; relative: 0.0 1.0;
+ }
+ }
+ }
+ part { name: "right_padding";
+ type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 40 0;
+ max: 40 -1;
+ fixed: 1 0;
+ align: 1.0 0.0;
+ rel1 {
+ to: "base"; relative: 1.0 0.0;
+ }
+ rel2 {
+ to: "base"; relative: 1.0 1.0;
+ }
+ }
+ }
part {
name: "elm.swallow.event";
type: SWALLOW;
@@ -92,8 +130,8 @@ group {
scale: 1;
description {
state: "default" 0.0;
- rel1 { relative: 0.0 0.0; }
- rel2 { relative: 1.0 1.0; }
+ rel1 { to: "left_padding"; relative: 1.0 0.0; }
+ rel2 { to: "right_padding"; relative: 0.0 1.0; }
}
}
part {
@@ -103,6 +141,8 @@ group {
scale: 1;
description {
state: "default" 0.0;
+ rel1 { to: "left_padding"; relative: 1.0 0.0; }
+ rel2 { to: "right_padding"; relative: 0.0 1.0; }
}
}
} /* parts */
diff --git a/vp-main/res/po/en.po b/vp-main/res/po/en.po
index fd491f8..79bd999 100755
--- a/vp-main/res/po/en.po
+++ b/vp-main/res/po/en.po
@@ -17,7 +17,7 @@ msgid "IDS_VIDEO_BODY_KB"
msgstr "KB"
msgid "IDS_VIDEO_BODY_LOCATION"
-msgstr "Location"
+msgstr "Path"
msgid "IDS_VIDEO_BODY_MB"
msgstr "MB"
@@ -47,7 +47,7 @@ msgid "IDS_VIDEO_OPT_DETAILS"
msgstr "Details"
msgid "IDS_VIDEO_OPT_TITLE"
-msgstr "Title"
+msgstr "File Name"
msgid "IDS_VIDEO_POP_THIS_VIDEO_WILL_BE_DELETED"
msgstr "This video will be deleted."
diff --git a/vp-main/res/po/en_PH.po b/vp-main/res/po/en_PH.po
index f7ba7db..54780f1 100755
--- a/vp-main/res/po/en_PH.po
+++ b/vp-main/res/po/en_PH.po
@@ -17,7 +17,7 @@ msgid "IDS_VIDEO_BODY_KB"
msgstr "KB"
msgid "IDS_VIDEO_BODY_LOCATION"
-msgstr "Location"
+msgstr "Path"
msgid "IDS_VIDEO_BODY_MB"
msgstr "MB"
@@ -47,7 +47,7 @@ msgid "IDS_VIDEO_OPT_DETAILS"
msgstr "Details"
msgid "IDS_VIDEO_OPT_TITLE"
-msgstr "Title"
+msgstr "File Name"
msgid "IDS_VIDEO_POP_THIS_VIDEO_WILL_BE_DELETED"
msgstr "This video will be deleted."
diff --git a/vp-main/res/po/en_US.po b/vp-main/res/po/en_US.po
index 57605da..df1516e 100755
--- a/vp-main/res/po/en_US.po
+++ b/vp-main/res/po/en_US.po
@@ -17,7 +17,7 @@ msgid "IDS_VIDEO_BODY_KB"
msgstr "KB"
msgid "IDS_VIDEO_BODY_LOCATION"
-msgstr "Location"
+msgstr "Path"
msgid "IDS_VIDEO_BODY_MB"
msgstr "MB"
@@ -47,7 +47,7 @@ msgid "IDS_VIDEO_OPT_DETAILS"
msgstr "Details"
msgid "IDS_VIDEO_OPT_TITLE"
-msgstr "Title"
+msgstr "File Name"
msgid "IDS_VIDEO_POP_THIS_VIDEO_WILL_BE_DELETED"
msgstr "This video will be deleted."
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 18:02:17 +0000