From ea0415be3acbfc25370a54a30b7d5ef88dc94e02 Mon Sep 17 00:00:00 2001 From: "aman.jeph" Date: Tue, 9 Feb 2021 10:30:18 +0530 Subject: [PATCH] Fixed playspeed background and language translation for tabs Change-Id: I37762605ece6ed4b29da71659e05b54247c62a11 Signed-off-by: aman.jeph --- playview/src/vp-play-view.c | 2 +- src/view/mp-video-list-view-main.c | 12 ++++++++++-- vp-main/res/edje/images/play_speed_bg.png | Bin 0 -> 1976 bytes vp-main/res/edje/pv-normal-main.edc | 19 +++++++++++++------ 4 files changed, 24 insertions(+), 9 deletions(-) create mode 100755 vp-main/res/edje/images/play_speed_bg.png diff --git a/playview/src/vp-play-view.c b/playview/src/vp-play-view.c index 52fe757..a7e7806 100755 --- a/playview/src/vp-play-view.c +++ b/playview/src/vp-play-view.c @@ -1992,7 +1992,7 @@ bool vp_play_view_realize(play_view_handle pViewHandle) if(pPlayView->stream_info == NULL) { vp_sound_init_session(pViewHandle); } - + // Only capture the audio stream on resume when player was in play state before pause. if (!vp_play_normal_view_is_audio_only(pPlayView) && manual_paused == FALSE) { sound_stream_focus_state_e state_for_playback; sound_stream_focus_state_e state_for_recording; diff --git a/src/view/mp-video-list-view-main.c b/src/view/mp-video-list-view-main.c index 9788d12..dac1c64 100755 --- a/src/view/mp-video-list-view-main.c +++ b/src/view/mp-video-list-view-main.c @@ -65,8 +65,8 @@ -#define TOOLBAR_BUTTON_VIDEOS "Videos" -#define TOOLBAR_BUTTOn_FOLDERS "Folders" +#define TOOLBAR_BUTTON_VIDEOS VIDEOS_VIEWASOPT_OPT_THUMBNAIL +#define TOOLBAR_BUTTOn_FOLDERS VIDEOS_TITLE_OPT_FOLDER static st_VideoListViewMainViewHandle *g_pMainViewHandle = NULL; static st_VideoListViewMainViewWidget *g_pMainViewWidget = NULL; @@ -1277,6 +1277,12 @@ toolbar_folders_item_cb(void *data, Evas_Object *obj, void *event_info) LIST_UPDATE_TYPE_ALL, __mp_list_view_result_user_cb); } +static void _tolbar_language_changed(void *data, Evas_Object *obj, void *event_info) +{ + elm_object_item_part_text_set(g_pToolbarItemData.videos_item, "elm.text", TOOLBAR_BUTTON_VIDEOS); + elm_object_item_part_text_set(g_pToolbarItemData.folders_item, "elm.text", TOOLBAR_BUTTOn_FOLDERS); +} + Evas_Object* mp_list_view_create_toolbar(Evas_Object* naviframe) { Evas_Object *toolbar; @@ -1288,6 +1294,8 @@ Evas_Object* mp_list_view_create_toolbar(Evas_Object* naviframe) elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE); elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_ALWAYS); + evas_object_smart_callback_add(toolbar, "language,changed", _tolbar_language_changed, NULL); + g_pToolbarItemData.videos_item = elm_toolbar_item_append(toolbar, NULL, TOOLBAR_BUTTON_VIDEOS, toolbar_videos_item_cb, NULL); g_pToolbarItemData.folders_item = elm_toolbar_item_append(toolbar, NULL, TOOLBAR_BUTTOn_FOLDERS, toolbar_folders_item_cb, NULL); diff --git a/vp-main/res/edje/images/play_speed_bg.png b/vp-main/res/edje/images/play_speed_bg.png new file mode 100755 index 0000000000000000000000000000000000000000..dcb9d3611a2cf82623196f736a6b44557f2df0bc GIT binary patch literal 1976 zcmV;p2S@mcP))ce(xjJ4Kkr&)KuL@`{#>76VrbImZH(c%j7P0w7)hgoVVQ zK!k@Jh5%_0kcL!FLlUw4^c6R3iLKA*Cme=l9gst{Tvzr`0y?0Gpee*@i9KOC*M608om6i?jx*r9A=l6TwYR z)YEqEbZ>KWGuL9TwQbq}5)oeTc2-&>wviC#YYohZ_C)+Kfc&Sudi6C#BqKDR*GLOM z&*fklseBV4Tau2TwQ3T=KR8C`?RIOAR@+4F4F%}*1&bwuMr2T&$nmuNov3#-qO>;H zt9p&{ZwNq_>*_0%hYbu^sZoKYS?4BG;Cx+Oo~ ze&4Xp+M&m<9)Q@^9&|8(dOZP5x2;Olwz0-~0RU2Z$)p7E)TvX_(q*MP8N;`x8-OwX zv0EAL|Ha{OC|dP20}KQLb4C<-7a*2sbvBdR6XKnbNA%;CEtO#{acTnSc6Tk{7W$YW zEYRX4W7;ANgq84##@gDXXER9y6!X@CMdAJFo=HqMYy^B58SX#ka5zSji6tq3Vpid9 z4}OG*%aak!^friit8QKS56R44k^<JNsH?m_Rc=!PY;gxlX6MPD=v{KkV7L*GX0BDhgsQ+YCJfbKwd38>0m6Xb4K z3d-=<5r<>_{pST^jzE{cYY!5=VVHLl2ocfk`WowrgaDnFI^K{O+hc;94NpPg{J7(t zHFusBeqjWmr)MQsH3RL2}kYQwH7ZKh2(4T&MJGq&pTKop?M*SR}e7E6s{IWaTA=u-W{@E3^sPDvRR zSf=O@k*bb7`WnS?3>jfxrUX8d;#3HZVQ%)3dY4ElowonHcBe)eL} zkvY<64xkQxAOPkb;nWF=gGjlTNb3AR?2(|$7u<;mt99sPttk;)N4G!N2n01*OF>WK z2tLd$rvoJM>APnYzCW$s0ynIBBrRB{Fai)GbvK)X!VTF^jb@X&UfZG2l( zd~#E|I2*4rB+qPe%UDM{a=UZM(~NnzNF3{M`#KK-Vqx-9+1FC6z}TuQ z4o_r0>3m@BOLgJ_G35cv=y$^00rR*N6CUx6zD#mg9O44x$iCUIzWna94Psw&$X&8| z0b;z%HZcLV`g}`gLH?(iR!Ac8f3VbAhyoRoibrBq`G|kjE4ShP3~dV7tF32Z;g1XO zTrfCy_9%%P>P4ybn>nlqFf{U*j>fB{Fy(buS0L~js?uHnW-$j2%~?cfEb?uAebwLb zEE8V1Zu54PGl|~U?Aindx-VQ$Fv!YzvQbz51w>JF;-dfBhXj-}2m9OKuxlKCWji99bdeyV@?J+qYq z;J|yr{RKa3EoiG5;Qv6y(cn#HsU^dSyc=q)EvZy+OBG<0qsw=t0zeYA19es6P3BQa zQ=5pQ!0AM_VW#q}3!o5g^Iu!WxZ0F)3$aLpO8DRJV-=Fn(pkCz3TLOh-q}mp96JJ3 z&-BqKHpBtJe_tJTHPzORXo00^E}V+6v!i3aG{zcd=nF=$>sIry)v;#H<5coXJHQDC zqGVLQMQQ|OuNxJpE*;|cP@yw6+uD1&bYd7A@(9NX3O)YLmBeu~Ojp51f=5h(^L6Vg zyHk0?CIdU20HgjzDfms>J}5?omjO~)y027Bl!8}Oe$(CZ+ue*U1s|{X#E%h-vB*k> zSjNUn4Cv}av04m_^^&6YSYXx-)BPC1RF8qE23%acswg5UMGVw=9OWWXsYsS^9sv~* zhv;H1G6*4HNKxqtN*Ll1^$C+%$fC-jzP|2IQ&W?g%;T1hHva)FB?peE(BPK<0000< KMNUMnLSTY@C9C-W literal 0 HcmV?d00001 diff --git a/vp-main/res/edje/pv-normal-main.edc b/vp-main/res/edje/pv-normal-main.edc index 4ab6311..735464a 100755 --- a/vp-main/res/edje/pv-normal-main.edc +++ b/vp-main/res/edje/pv-normal-main.edc @@ -39,6 +39,10 @@ externals { external: "feedback"; } +images { + image: "play_speed_bg.png" COMP; +} + collections { base_scale: CURRENT_BASE_SCALE; plugins { @@ -639,19 +643,22 @@ collections { part { name: "pv.normal.main.playingspeed.rect"; - type: RECT; + type: IMAGE; mouse_events: 1; repeat_events : 1; scale: 1; description { state: "default" 0.0; visible: 0; - min: 100 25; + min: 80 80; + max: 80 80; fixed: 1 1; align: 0.5 1.0; - rel1 { relative: 0.4 0.0; to_y : "pv.normal.main.control"; offset : 0 -20; } - rel2 { relative: 0.6 0.0; to_y : "pv.normal.main.control"; offset : 0 -20; } - color: 0 0 0 102; + rel1 { to: "pv.normal.main.control"; relative: 0.0 0.0; } + rel2 { to: "pv.normal.main.control"; relative: 1.0 0.0; offset: 0 -10; } + image { + normal: "play_speed_bg.png"; + } } description { state: "show" 0.0; @@ -668,7 +675,7 @@ collections { description { state: "default" 0.0; visible: 0; - align: 0.0 0.0; + align: 0.5 0.5; rel1 { relative: 0.0 0.0; to : "pv.normal.main.playingspeed.rect";} rel2 { relative: 1.0 1.0; to : "pv.normal.main.playingspeed.rect";} color: FONT_COLOR; -- 2.34.1