Speed popup layout changes 03/239903/1
authoramitpatel <amit.patel@samsung.com>
Thu, 30 Jul 2020 11:01:34 +0000 (16:31 +0530)
committeramitpatel <amit.patel@samsung.com>
Thu, 30 Jul 2020 11:05:30 +0000 (16:35 +0530)
Change-Id: I414aac684befdc56a5160091c7de9070c9ac38d7
Signed-off-by: amitpatel <amit.patel@samsung.com>
16 files changed:
playview/res/edje/custom/pv-custom-button.edc
playview/res/edje/images/button/T01-2_play_popup_icon_minus.png
playview/res/edje/images/button/T01-2_play_popup_icon_minus_press.png
playview/res/edje/images/button/T01-2_play_popup_icon_plus.png
playview/res/edje/images/button/T01-2_play_popup_icon_plus_press.png
playview/res/edje/images/button/x.png [new file with mode: 0755]
playview/res/edje/pv-speed-popup.edc
playview/src/feature/vp-play-speed.c
playview/src/view/vp-play-normal-view.c
vp-main/res/edje/custom/pv-custom-button.edc
vp-main/res/edje/images/button/T01-2_play_popup_icon_minus.png
vp-main/res/edje/images/button/T01-2_play_popup_icon_minus_press.png
vp-main/res/edje/images/button/T01-2_play_popup_icon_plus.png
vp-main/res/edje/images/button/T01-2_play_popup_icon_plus_press.png
vp-main/res/edje/images/button/x.png [new file with mode: 0755]
vp-main/res/edje/pv-speed-popup.edc

index 86f2427707d54113067b371abd5c691ade6fbe6e..8426bb626e3a4e8f915a98d5760c7c32853f9562 100755 (executable)
@@ -4114,6 +4114,149 @@ group {
        }
 }
 
+group {
+       name: "elm/button/base/play_speed_decr";
+       images
+       {
+               image: "button/T01-2_play_popup_icon_minus.png" COMP;
+       }
+       parts {
+               part {
+                       name: "bg";
+                       type: RECT;
+      scale: 1;
+                       mouse_events: 1;
+                       description {
+                               state: "default" 0.0;
+                       min: 32 32;
+                       max: 32 32;
+                       align: 0.0 0.0;
+                       fixed: 1 1;
+                       }
+               }
+               part {
+                       name: "icon";
+                       type: IMAGE;
+                       mouse_events: 1;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               rel1 {
+                                       relative: 0.5 0.5;
+                                       to: "bg";
+                               }
+                               rel2 {
+                                       relative: 0.5 0.5;
+                                       to: "bg";
+                               }
+                               align: 0.5 0.5;
+                               min: 11 18;
+                               max: 11 18;
+                               fixed: 1 1;
+                               image {
+                                       normal: "button/T01-2_play_popup_icon_minus.png";
+                               }
+                       }
+               }
+       } /*parts*/
+       programs {
+               program {
+                       name:   "buttonclicked";
+                       signal: "mouse,clicked,1";
+                       source: "bg";
+                       action: SIGNAL_EMIT "elm,action,click" "";
+               }
+               program {
+                       name:   "buttontextclicked";
+                       signal: "mouse,clicked,1";
+                       source: "icon";
+                       action: SIGNAL_EMIT "elm,action,click" "";
+               }
+               program{
+                       name: "touch_snd";
+                       source: "bg";
+                       signal: "mouse,clicked,1";
+                       action: RUN_PLUGIN "touch_sound_plugin";
+                       }
+               program{
+                       name: "touch_snd1";
+                       source: "icon";
+                       signal: "mouse,clicked,1";
+                       action: RUN_PLUGIN "touch_sound_plugin";
+                       }
+       }
+}
+group {
+       name: "elm/button/base/play_speed_incr";
+       images
+       {
+               image: "button/T01-2_play_popup_icon_plus.png" COMP;
+       }
+       parts {
+               part {
+                       name: "bg";
+                       type: RECT;
+      scale: 1;
+                       mouse_events: 1;
+                       description {
+                               state: "default" 0.0;
+                       min: 32 32;
+        max: 32 32;
+        fixed: 1 1;
+        align: 0.0 0.0;
+                       }
+               }
+               part {
+                       name: "icon";
+                       type: IMAGE;
+                       mouse_events: 1;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               rel1 {
+                                       relative: 0.0 0.0;
+                                       to: "bg";
+                               }
+                               rel2 {
+                                       relative: 1.0 1.0;
+                                       to: "bg";
+                               }
+                               min: 11 18;
+                               max: 11 18;
+                               fixed: 1 1;
+                               image {
+                                       normal: "button/T01-2_play_popup_icon_plus.png";
+                               }
+                       }
+               }
+       } /*parts*/
+       programs {
+               program {
+                       name:   "buttonclicked";
+                       signal: "mouse,clicked,1";
+                       source: "bg";
+                       action: SIGNAL_EMIT "elm,action,click" "";
+               }
+               program {
+                       name:   "buttontextclicked";
+                       signal: "mouse,clicked,1";
+                       source: "icon";
+                       action: SIGNAL_EMIT "elm,action,click" "";
+               }
+               program{
+                       name: "touch_snd";
+                       source: "bg";
+                       signal: "mouse,clicked,1";
+                       action: RUN_PLUGIN "touch_sound_plugin";
+                       }
+               program{
+                       name: "touch_snd1";
+                       source: "icon";
+                       signal: "mouse,clicked,1";
+                       action: RUN_PLUGIN "touch_sound_plugin";
+                       }
+       }
+}
 group {
        name: "elm/button/base/more_menu";
        images
index eb7f6c2411cd408899dab79c8b83faa964834842..3b3cc24af72409fb19dd0cff60bbea9d37b6dfc9 100755 (executable)
Binary files a/playview/res/edje/images/button/T01-2_play_popup_icon_minus.png and b/playview/res/edje/images/button/T01-2_play_popup_icon_minus.png differ
index 099735af8ed2dd9de483146b3d6a4e9b9a893c02..3b3cc24af72409fb19dd0cff60bbea9d37b6dfc9 100755 (executable)
Binary files a/playview/res/edje/images/button/T01-2_play_popup_icon_minus_press.png and b/playview/res/edje/images/button/T01-2_play_popup_icon_minus_press.png differ
index 342d9eb2da13be84535b3a4f1e79f33607168f98..d0c3fd4fde8753f8c7f767303eae2a6aecd644b1 100755 (executable)
Binary files a/playview/res/edje/images/button/T01-2_play_popup_icon_plus.png and b/playview/res/edje/images/button/T01-2_play_popup_icon_plus.png differ
index db4ca27f09d399266706ee1d4d93de4a10fcf2c5..d0c3fd4fde8753f8c7f767303eae2a6aecd644b1 100755 (executable)
Binary files a/playview/res/edje/images/button/T01-2_play_popup_icon_plus_press.png and b/playview/res/edje/images/button/T01-2_play_popup_icon_plus_press.png differ
diff --git a/playview/res/edje/images/button/x.png b/playview/res/edje/images/button/x.png
new file mode 100755 (executable)
index 0000000..f7ed3e0
Binary files /dev/null and b/playview/res/edje/images/button/x.png differ
index ebce6515a9d44fe3e1bb061e5d98c58e6c0d0046..8a901ce9bc498383484a47c0d7625a8f09f694d5 100755 (executable)
  */
 
 #include "pv-image.edc"
+#include "custom/pv-custom-define.edc"
 
 
+#define SPEED_POPUP_WIDTH_HEIGHT_MIN           0 105
+#define SPEED_POPUP_CONTENT_MIN                                0 73
+#define SPEED_POPUP_BUTTON_MIN                         32 32
+
+
+#define PLAY_SPEED_X           "button/x.png"
 
-#define SPEED_POPUP_WIDTH_HEIGHT_MIN           0 100
-#define SPEED_POPUP_CONTENT_MIN                                0 50
-#define SPEED_POPUP_BUTTON_MIN                         40 40
 externals {
           external: "elm";
           external: "feedback";
        }
 collections {
+       base_scale : CURRENT_BASE_SCALE;
        plugins {
        plugin {
                name: "touch_sound_plugin";
@@ -35,6 +40,9 @@ collections {
        }
        group {
                name: "pv.play.speed.popup";
+               images {
+                       image: PLAY_SPEED_X COMP;
+               }
                parts {
                        part {
                                name:"bg";
@@ -43,51 +51,56 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        min: SPEED_POPUP_WIDTH_HEIGHT_MIN;
-                                       color: 0 0 0 0;
+                                       color: 255 0 0 50;
+                                       visible:0;
                                }
                        }
 
                        part {
                                name: "pad_l";
-                               type: SPACER;
+                               type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 10 0;
-                                       max: 10 0;
-                                       fixed: 1 0;
+                                       min: 144 32;
+                                       max: 144 32;
+                                       fixed: 1 1;
                                        align: 0.0 0.0;
                                        rel1 { relative: 0.0 0.0; to: "bg";}
-                                       rel2 { relative: 0.0 1.0; to: "bg";}
+                                       rel2 { relative: 0.0 0.0; to: "bg";}
+
                                }
                        }
 
                        part {
                                name: "pad_r";
-                               type: SPACER;
+                               type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 10 0;
-                                       max: 10 0;
-                                       fixed: 1 0;
-                                       align: 1.0 1.0;
+                                       min: 144 32;
+                                       max: 144 32;
+                                       fixed: 1 1;
+                                       align: 1.0 0.0;
                                        rel1 { relative: 1.0 0.0; to: "bg";}
-                                       rel2 { relative: 1.0 1.0; to: "bg";}
+                                       rel2 { relative: 1.0 0.0; to: "bg";}
+
                                }
                        }
 
                        part {
-                               name: "pad_t";
-                               type: SPACER;
+                               name: "pad_text_l";
+                               type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 0 10;
-                                       fixed: 0 1;
+                                       min: 176 32;
+                                       max: 176 32;
+                                       fixed: 1 1;
                                        align: 0.0 0.0;
-                                       rel1 { relative: 0.0 0.0; to: "bg";}
-                                       rel2 { relative: 0.0 0.0; to: "bg";}
+                                       rel1 { relative: 1.0 0.0; to: "pad_l";}
+                                       rel2 { relative: 1.0 0.0; to: "pad_l";}
+
                                }
                        }
 
@@ -99,20 +112,38 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible: 1;
-                                       min: 0 54;
+                                       min: 37 26;
+                                       max: 37 26;
                                        fixed: 0 1;
-                                       align: 0.5 0.0;
-                                       rel1 { relative: 0.0 1.0; to_y: "pad_t";}
-                                       rel2 { relative: 1.0 1.0; to_y: "pad_t";}
+                                       align: 0.0 0.0;
+                                       rel1 { relative: 1.0 0.0; to_x: pad_text_l; to_y: "bg";}
+                                       rel2 { relative: 1.0 0.0; to_x: pad_text_l; to_y: "bg";}
                                        color: 0 0 0 255;
                                        text {
-                                               font: "Tizen:style=Bold";
-                                               size: 25;
-                                               align: 0.5 0.5;
+                                               font: "Tizen:style=Regular";
+                                               size: 22;
+                                               align: 1.0 0.5;
                                        }
                                }
                        }
 
+                       part {
+                               name: "playspeed_x_image";
+                               type: IMAGE;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       visible: 1;
+                                       fixed: 1 1;
+                                       min: 11 26;
+                                       max: 11 26;
+                                       align: 0.0 0.0;
+                                       rel1 { relative: 1.0 0.0; to: "elm.text.title"; offset: 6 0;}
+                                       rel2 { relative: 1.0 0.0; to: "elm.text.title"; offset: 6 0;}
+                                       image{  normal: PLAY_SPEED_X; }
+                               }
+                       }
+
                        part {
                                name: "elm.swallow.icon.1";
                                type: SWALLOW;
@@ -120,55 +151,59 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        min: SPEED_POPUP_BUTTON_MIN;
+                                       max: SPEED_POPUP_BUTTON_MIN;
                                        fixed: 1 1;
                                        align: 0.0 0.0;
-                                       rel1 { relative: 1.0 0.2; to_x: "pad_l"; to_y: "elm.text.title"; }
-                                       rel2 { relative: 1.0 0.2; to_x: "pad_l"; to_y: "elm.text.title"; }
+                                       rel1 { relative: 1.0 0.0; to : "pad_l"; }
+                                       rel2 { relative: 1.0 1.0; to : "pad_l"; }
                                }
                        }
 
                        part {
-                               name: "elm.swallow.icon.left";
-                               type: RECT;
+                               name: "elm.swallow.icon.2";
+                               type: SWALLOW;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       visible: 0;
-                                       min: 6 0;
-                                       max: 6 0;
-                                       fixed: 1 0;
-                                       align: 0.0 0.5;
-                                       rel1 { relative: 1.0 1.0; to_x: "elm.swallow.icon.1"; to_y: "elm.text.title"; }
-                                       rel2 { relative: 1.0 1.0; to_x: "elm.swallow.icon.1"; to_y: "elm.text.title"; }
+                                       min: SPEED_POPUP_BUTTON_MIN;
+                                       max: SPEED_POPUP_BUTTON_MIN;
+                                       fixed: 1 1;
+                                       align: 1.0 0.0;
+                                       rel1 { relative: 0.0 0.0; to: "pad_r"; }
+                                       rel2 { relative: 0.0 1.0; to: "pad_r"; }
                                }
                        }
+
                        part {
-                               name: "elm.swallow.icon.right";
-                               type: RECT;
+                               name: "slider.pad.l";
+                               type: RECT;   
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       visible: 0;
-                                       min: 6 0;
-                                       max: 6 0;
-                                       fixed: 1 0;
-                                       align: 1.0 0.5;
-                                       rel1 { relative: 0.0 1.0; to_x: "elm.swallow.icon.2"; to_y: "elm.text.title"; }
-                                       rel2 { relative: 0.0 1.0; to_x: "elm.swallow.icon.2"; to_y: "elm.text.title"; }
+                                       min: 40 40;
+                                       max: 40 40;
+                                       fixed: 1 1;
+                                       align: 0.0 0.0;
+                                       rel1 { relative: 0.0 0.0; to : "bg"; }
+                                       rel2 { relative: 0.0 1.0; to : "bg"; }
+
                                }
                        }
 
                        part {
-                               name: "elm.swallow.icon.2";
-                               type: SWALLOW;
+                               name: "slider.pad.r";
+                               type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: SPEED_POPUP_BUTTON_MIN;
+                                       min: 40 40;
+          max: 40 40;
                                        fixed: 1 1;
                                        align: 1.0 0.0;
-                                       rel1 { relative: 0.0 0.2; to_x: "pad_r"; to_y: "elm.text.title"; }
-                                       rel2 { relative: 0.0 0.2; to_x: "pad_r"; to_y: "elm.text.title"; }
+                                       rel1 { relative: 1.0 0.0; to : "bg"; }
+                                       rel2 { relative: 1.0 1.0; to : "bg"; }
+                                       visible: 0;
+                                       color: 0 255 0 200;
                                }
                        }
 
@@ -181,8 +216,8 @@ collections {
                                        min: SPEED_POPUP_CONTENT_MIN;
                                        fixed: 0 1;
                                        align: 0.5 0.0;
-                                       rel1 { relative: 1.0 1.0; to_x: "pad_l"; to_y: "elm.swallow.icon.1"; }
-                                       rel2 { relative: 0.0 1.0; to_x: "pad_r"; to_y: "elm.swallow.icon.1"; }
+                                       rel1 { relative: 1.0 1.0; to_x: "slider.pad.l"; to_y: "pad_l"; }
+                                       rel2 { relative: 0.0 1.0; to_x: "slider.pad.r"; to_y: "pad_l"; }
                                }
                        }
                } /* parts */
index cf6c87e83de9c1034808b6acbbf79bb9597cea30..6022f7f8bedcb916473edb184dba732bb0cce9c8 100755 (executable)
@@ -293,9 +293,9 @@ static void _vp_play_speed_update_text(PlaySpeedPopup * pPlaySpeedPopup)
                return;
        }
 
-       char szValue[6] = { 0, };
+       char szValue[4] = { 0, };
 
-       snprintf(szValue, 6, "%0.1f X", (double) pPlaySpeedPopup->fSpeedVal);
+       snprintf(szValue, 4, "%0.1f", (double) pPlaySpeedPopup->fSpeedVal);
        elm_object_part_text_set(pPlaySpeedPopup->pLayout, "elm.text.title",
                                                         szValue);
 
@@ -411,64 +411,24 @@ static bool _vp_play_speed_popup_create_button(Evas_Object * pParent,
        free(path);
        PlaySpeedPopup *pPlaySpeedPopup = (PlaySpeedPopup *) pUserData;
 
-       pPlaySpeedPopup->pDelButton =
-               vp_button_create(pParent, "custom/flat_63_78/default",
-                                                NULL,
-                                                (Evas_Smart_Cb) __vp_play_speed_btn_clicked_cb,
-                                                (Evas_Smart_Cb) NULL, (Evas_Smart_Cb) NULL,
-                                                (void *) pPlaySpeedPopup);
-
-
-
-       pPlaySpeedPopup->pAddButton =
-               vp_button_create(pParent, "custom/flat_63_78/default",
-                                                NULL,
-                                                (Evas_Smart_Cb) __vp_play_speed_btn_clicked_cb,
-                                                (Evas_Smart_Cb) NULL, (Evas_Smart_Cb) NULL,
-                                                (void *) pPlaySpeedPopup);
-
-       Evas_Object *pIcon = NULL;
-
-       pIcon =
-               vp_button_create_icon(pPlaySpeedPopup->pDelButton,
-                                                         edj_path, VP_PLAY_RES_BUTTON_DEL);
-       elm_object_part_content_set(pPlaySpeedPopup->pDelButton,
-                                                               VP_PLAY_SWALLOW_BUTTON_ICON, pIcon);
-
-       pIcon =
-               vp_button_create_icon(pPlaySpeedPopup->pDelButton,
-                                                         edj_path, VP_PLAY_RES_BUTTON_DEL_PRESS);
-       elm_object_part_content_set(pPlaySpeedPopup->pDelButton,
-                                                               VP_PLAY_SWALLOW_BUTTON_PRESS_ICON, pIcon);
-
-       pIcon =
-               vp_button_create_icon(pPlaySpeedPopup->pDelButton,
-                                                         edj_path, VP_PLAY_RES_BUTTON_DEL);
-       elm_object_part_content_set(pPlaySpeedPopup->pDelButton,
-                                                               VP_PLAY_SWALLOW_BUTTON_DIM_ICON, pIcon);
-
-       pIcon =
-               vp_button_create_icon(pPlaySpeedPopup->pAddButton,
-                                                         edj_path, VP_PLAY_RES_BUTTON_ADD);
-       elm_object_part_content_set(pPlaySpeedPopup->pAddButton,
-                                                               VP_PLAY_SWALLOW_BUTTON_ICON, pIcon);
-
-       pIcon =
-               vp_button_create_icon(pPlaySpeedPopup->pAddButton,
-                                                         edj_path, VP_PLAY_RES_BUTTON_ADD_PRESS);
-       elm_object_part_content_set(pPlaySpeedPopup->pAddButton,
-                                                               VP_PLAY_SWALLOW_BUTTON_PRESS_ICON, pIcon);
-
-       pIcon =
-               vp_button_create_icon(pPlaySpeedPopup->pAddButton,
-                                                         edj_path, VP_PLAY_RES_BUTTON_ADD);
-       elm_object_part_content_set(pPlaySpeedPopup->pAddButton,
-                                                               VP_PLAY_SWALLOW_BUTTON_DIM_ICON, pIcon);
-
-       elm_object_part_content_set(pParent, "elm.swallow.icon.1",
-                                                               pPlaySpeedPopup->pDelButton);
-       elm_object_part_content_set(pParent, "elm.swallow.icon.2",
-                                                               pPlaySpeedPopup->pAddButton);
+
+       pPlaySpeedPopup->pDelButton = elm_button_add(pParent);
+       elm_object_style_set(pPlaySpeedPopup->pDelButton, "play_speed_decr");
+       evas_object_smart_callback_add(pPlaySpeedPopup->pDelButton, "clicked",
+                                                                  __vp_play_speed_btn_clicked_cb,
+                                                                  (void *) pPlaySpeedPopup);
+        elm_object_part_content_set(pParent, "elm.swallow.icon.1",
+                                                                pPlaySpeedPopup->pDelButton);
+
+       pPlaySpeedPopup->pAddButton = elm_button_add(pParent);
+       elm_object_style_set(pPlaySpeedPopup->pAddButton, "play_speed_incr");
+       evas_object_smart_callback_add(pPlaySpeedPopup->pAddButton, "clicked",
+                                                                  __vp_play_speed_btn_clicked_cb,
+                                                                  (void *) pPlaySpeedPopup);
+        elm_object_part_content_set(pParent, "elm.swallow.icon.2",
+                                                                pPlaySpeedPopup->pAddButton);
+
+
 
        return TRUE;
 }
index f09f185c0b6fac5b57f381a9bfa077416242e071..e46cf12e9f516055001bb1936d7b39596adb6096 100755 (executable)
@@ -5867,7 +5867,8 @@ static void __vp_normal_more_btn_clicked_cb(void *pUserData,
                nH = rect.w;
        }
 */
-       evas_object_resize(pNormalView->pCtxPopup, 320, 300);
+
+       evas_object_size_hint_max_set(pNormalView->pCtxPopup, 320, 350);
        evas_object_move(pNormalView->pCtxPopup, 1280, 64);
 
        evas_object_show(pNormalView->pCtxPopup);
@@ -7719,8 +7720,14 @@ static void _vp_play_normal_view_show_audio_only_popup(NormalView *
        VideoLogInfo
                ("Show toast popup: Only audio data supported by this file. Now playing video.");
        _vp_normal_set_audio_only_image(pNormalView, TRUE);
-       vp_play_util_status_noti_show
-               (VP_PLAY_STRING_ERROR_ONLY_AUDIO_DATA_SUPPORTED);
+       
+       PlayView * pPlayView = pNormalView->pPlayView;
+       if (!pPlayView) {
+               VideoLogError("pPlayView is NULL");
+               return;
+       }
+       vp_play_util_popup_toast_show(pPlayView->pWin, VP_PLAY_STRING_ERROR_ONLY_AUDIO_DATA_SUPPORTED);
+
 }
 
 /**
index fde2d1311e5254c1bd15b79bb3cc9b7f18d76781..4581cebf0e5cc8800311f24de59376177bd717d3 100755 (executable)
@@ -4115,6 +4115,149 @@ group {
        }
 }
 
+group {
+       name: "elm/button/base/play_speed_decr";
+       images
+       {
+               image: "button/T01-2_play_popup_icon_minus.png" COMP;
+       }
+       parts {
+               part {
+                       name: "bg";
+                       type: RECT;
+      scale: 1;
+                       mouse_events: 1;
+                       description {
+                               state: "default" 0.0;
+                       min: 32 32;
+                       max: 32 32;
+                       align: 0.0 0.0;
+                       fixed: 1 1;
+                       }
+               }
+               part {
+                       name: "icon";
+                       type: IMAGE;
+                       mouse_events: 1;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               rel1 {
+                                       relative: 0.5 0.5;
+                                       to: "bg";
+                               }
+                               rel2 {
+                                       relative: 0.5 0.5;
+                                       to: "bg";
+                               }
+                               align: 0.5 0.5;
+                               min: 11 18;
+                               max: 11 18;
+                               fixed: 1 1;
+                               image {
+                                       normal: "button/T01-2_play_popup_icon_minus.png";
+                               }
+                       }
+               }
+       } /*parts*/
+       programs {
+               program {
+                       name:   "buttonclicked";
+                       signal: "mouse,clicked,1";
+                       source: "bg";
+                       action: SIGNAL_EMIT "elm,action,click" "";
+               }
+               program {
+                       name:   "buttontextclicked";
+                       signal: "mouse,clicked,1";
+                       source: "icon";
+                       action: SIGNAL_EMIT "elm,action,click" "";
+               }
+               program{
+                       name: "touch_snd";
+                       source: "bg";
+                       signal: "mouse,clicked,1";
+                       action: RUN_PLUGIN "touch_sound_plugin";
+                       }
+               program{
+                       name: "touch_snd1";
+                       source: "icon";
+                       signal: "mouse,clicked,1";
+                       action: RUN_PLUGIN "touch_sound_plugin";
+                       }
+       }
+}
+group {
+       name: "elm/button/base/play_speed_incr";
+       images
+       {
+               image: "button/T01-2_play_popup_icon_plus.png" COMP;
+       }
+       parts {
+               part {
+                       name: "bg";
+                       type: RECT;
+      scale: 1;
+                       mouse_events: 1;
+                       description {
+                               state: "default" 0.0;
+                       min: 32 32;
+        max: 32 32;
+        fixed: 1 1;
+        align: 0.0 0.0;
+                       }
+               }
+               part {
+                       name: "icon";
+                       type: IMAGE;
+                       mouse_events: 1;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               rel1 {
+                                       relative: 0.0 0.0;
+                                       to: "bg";
+                               }
+                               rel2 {
+                                       relative: 1.0 1.0;
+                                       to: "bg";
+                               }
+                               min: 11 18;
+                               max: 11 18;
+                               fixed: 1 1;
+                               image {
+                                       normal: "button/T01-2_play_popup_icon_plus.png";
+                               }
+                       }
+               }
+       } /*parts*/
+       programs {
+               program {
+                       name:   "buttonclicked";
+                       signal: "mouse,clicked,1";
+                       source: "bg";
+                       action: SIGNAL_EMIT "elm,action,click" "";
+               }
+               program {
+                       name:   "buttontextclicked";
+                       signal: "mouse,clicked,1";
+                       source: "icon";
+                       action: SIGNAL_EMIT "elm,action,click" "";
+               }
+               program{
+                       name: "touch_snd";
+                       source: "bg";
+                       signal: "mouse,clicked,1";
+                       action: RUN_PLUGIN "touch_sound_plugin";
+                       }
+               program{
+                       name: "touch_snd1";
+                       source: "icon";
+                       signal: "mouse,clicked,1";
+                       action: RUN_PLUGIN "touch_sound_plugin";
+                       }
+       }
+}
 group {
        name: "elm/button/base/more_menu";
        images
index eb7f6c2411cd408899dab79c8b83faa964834842..3b3cc24af72409fb19dd0cff60bbea9d37b6dfc9 100755 (executable)
Binary files a/vp-main/res/edje/images/button/T01-2_play_popup_icon_minus.png and b/vp-main/res/edje/images/button/T01-2_play_popup_icon_minus.png differ
index 099735af8ed2dd9de483146b3d6a4e9b9a893c02..3b3cc24af72409fb19dd0cff60bbea9d37b6dfc9 100755 (executable)
Binary files a/vp-main/res/edje/images/button/T01-2_play_popup_icon_minus_press.png and b/vp-main/res/edje/images/button/T01-2_play_popup_icon_minus_press.png differ
index 342d9eb2da13be84535b3a4f1e79f33607168f98..d0c3fd4fde8753f8c7f767303eae2a6aecd644b1 100755 (executable)
Binary files a/vp-main/res/edje/images/button/T01-2_play_popup_icon_plus.png and b/vp-main/res/edje/images/button/T01-2_play_popup_icon_plus.png differ
index db4ca27f09d399266706ee1d4d93de4a10fcf2c5..d0c3fd4fde8753f8c7f767303eae2a6aecd644b1 100755 (executable)
Binary files a/vp-main/res/edje/images/button/T01-2_play_popup_icon_plus_press.png and b/vp-main/res/edje/images/button/T01-2_play_popup_icon_plus_press.png differ
diff --git a/vp-main/res/edje/images/button/x.png b/vp-main/res/edje/images/button/x.png
new file mode 100755 (executable)
index 0000000..f7ed3e0
Binary files /dev/null and b/vp-main/res/edje/images/button/x.png differ
index ebce6515a9d44fe3e1bb061e5d98c58e6c0d0046..8a901ce9bc498383484a47c0d7625a8f09f694d5 100755 (executable)
  */
 
 #include "pv-image.edc"
+#include "custom/pv-custom-define.edc"
 
 
+#define SPEED_POPUP_WIDTH_HEIGHT_MIN           0 105
+#define SPEED_POPUP_CONTENT_MIN                                0 73
+#define SPEED_POPUP_BUTTON_MIN                         32 32
+
+
+#define PLAY_SPEED_X           "button/x.png"
 
-#define SPEED_POPUP_WIDTH_HEIGHT_MIN           0 100
-#define SPEED_POPUP_CONTENT_MIN                                0 50
-#define SPEED_POPUP_BUTTON_MIN                         40 40
 externals {
           external: "elm";
           external: "feedback";
        }
 collections {
+       base_scale : CURRENT_BASE_SCALE;
        plugins {
        plugin {
                name: "touch_sound_plugin";
@@ -35,6 +40,9 @@ collections {
        }
        group {
                name: "pv.play.speed.popup";
+               images {
+                       image: PLAY_SPEED_X COMP;
+               }
                parts {
                        part {
                                name:"bg";
@@ -43,51 +51,56 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        min: SPEED_POPUP_WIDTH_HEIGHT_MIN;
-                                       color: 0 0 0 0;
+                                       color: 255 0 0 50;
+                                       visible:0;
                                }
                        }
 
                        part {
                                name: "pad_l";
-                               type: SPACER;
+                               type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 10 0;
-                                       max: 10 0;
-                                       fixed: 1 0;
+                                       min: 144 32;
+                                       max: 144 32;
+                                       fixed: 1 1;
                                        align: 0.0 0.0;
                                        rel1 { relative: 0.0 0.0; to: "bg";}
-                                       rel2 { relative: 0.0 1.0; to: "bg";}
+                                       rel2 { relative: 0.0 0.0; to: "bg";}
+
                                }
                        }
 
                        part {
                                name: "pad_r";
-                               type: SPACER;
+                               type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 10 0;
-                                       max: 10 0;
-                                       fixed: 1 0;
-                                       align: 1.0 1.0;
+                                       min: 144 32;
+                                       max: 144 32;
+                                       fixed: 1 1;
+                                       align: 1.0 0.0;
                                        rel1 { relative: 1.0 0.0; to: "bg";}
-                                       rel2 { relative: 1.0 1.0; to: "bg";}
+                                       rel2 { relative: 1.0 0.0; to: "bg";}
+
                                }
                        }
 
                        part {
-                               name: "pad_t";
-                               type: SPACER;
+                               name: "pad_text_l";
+                               type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: 0 10;
-                                       fixed: 0 1;
+                                       min: 176 32;
+                                       max: 176 32;
+                                       fixed: 1 1;
                                        align: 0.0 0.0;
-                                       rel1 { relative: 0.0 0.0; to: "bg";}
-                                       rel2 { relative: 0.0 0.0; to: "bg";}
+                                       rel1 { relative: 1.0 0.0; to: "pad_l";}
+                                       rel2 { relative: 1.0 0.0; to: "pad_l";}
+
                                }
                        }
 
@@ -99,20 +112,38 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        visible: 1;
-                                       min: 0 54;
+                                       min: 37 26;
+                                       max: 37 26;
                                        fixed: 0 1;
-                                       align: 0.5 0.0;
-                                       rel1 { relative: 0.0 1.0; to_y: "pad_t";}
-                                       rel2 { relative: 1.0 1.0; to_y: "pad_t";}
+                                       align: 0.0 0.0;
+                                       rel1 { relative: 1.0 0.0; to_x: pad_text_l; to_y: "bg";}
+                                       rel2 { relative: 1.0 0.0; to_x: pad_text_l; to_y: "bg";}
                                        color: 0 0 0 255;
                                        text {
-                                               font: "Tizen:style=Bold";
-                                               size: 25;
-                                               align: 0.5 0.5;
+                                               font: "Tizen:style=Regular";
+                                               size: 22;
+                                               align: 1.0 0.5;
                                        }
                                }
                        }
 
+                       part {
+                               name: "playspeed_x_image";
+                               type: IMAGE;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       visible: 1;
+                                       fixed: 1 1;
+                                       min: 11 26;
+                                       max: 11 26;
+                                       align: 0.0 0.0;
+                                       rel1 { relative: 1.0 0.0; to: "elm.text.title"; offset: 6 0;}
+                                       rel2 { relative: 1.0 0.0; to: "elm.text.title"; offset: 6 0;}
+                                       image{  normal: PLAY_SPEED_X; }
+                               }
+                       }
+
                        part {
                                name: "elm.swallow.icon.1";
                                type: SWALLOW;
@@ -120,55 +151,59 @@ collections {
                                description {
                                        state: "default" 0.0;
                                        min: SPEED_POPUP_BUTTON_MIN;
+                                       max: SPEED_POPUP_BUTTON_MIN;
                                        fixed: 1 1;
                                        align: 0.0 0.0;
-                                       rel1 { relative: 1.0 0.2; to_x: "pad_l"; to_y: "elm.text.title"; }
-                                       rel2 { relative: 1.0 0.2; to_x: "pad_l"; to_y: "elm.text.title"; }
+                                       rel1 { relative: 1.0 0.0; to : "pad_l"; }
+                                       rel2 { relative: 1.0 1.0; to : "pad_l"; }
                                }
                        }
 
                        part {
-                               name: "elm.swallow.icon.left";
-                               type: RECT;
+                               name: "elm.swallow.icon.2";
+                               type: SWALLOW;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       visible: 0;
-                                       min: 6 0;
-                                       max: 6 0;
-                                       fixed: 1 0;
-                                       align: 0.0 0.5;
-                                       rel1 { relative: 1.0 1.0; to_x: "elm.swallow.icon.1"; to_y: "elm.text.title"; }
-                                       rel2 { relative: 1.0 1.0; to_x: "elm.swallow.icon.1"; to_y: "elm.text.title"; }
+                                       min: SPEED_POPUP_BUTTON_MIN;
+                                       max: SPEED_POPUP_BUTTON_MIN;
+                                       fixed: 1 1;
+                                       align: 1.0 0.0;
+                                       rel1 { relative: 0.0 0.0; to: "pad_r"; }
+                                       rel2 { relative: 0.0 1.0; to: "pad_r"; }
                                }
                        }
+
                        part {
-                               name: "elm.swallow.icon.right";
-                               type: RECT;
+                               name: "slider.pad.l";
+                               type: RECT;   
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       visible: 0;
-                                       min: 6 0;
-                                       max: 6 0;
-                                       fixed: 1 0;
-                                       align: 1.0 0.5;
-                                       rel1 { relative: 0.0 1.0; to_x: "elm.swallow.icon.2"; to_y: "elm.text.title"; }
-                                       rel2 { relative: 0.0 1.0; to_x: "elm.swallow.icon.2"; to_y: "elm.text.title"; }
+                                       min: 40 40;
+                                       max: 40 40;
+                                       fixed: 1 1;
+                                       align: 0.0 0.0;
+                                       rel1 { relative: 0.0 0.0; to : "bg"; }
+                                       rel2 { relative: 0.0 1.0; to : "bg"; }
+
                                }
                        }
 
                        part {
-                               name: "elm.swallow.icon.2";
-                               type: SWALLOW;
+                               name: "slider.pad.r";
+                               type: RECT;
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       min: SPEED_POPUP_BUTTON_MIN;
+                                       min: 40 40;
+          max: 40 40;
                                        fixed: 1 1;
                                        align: 1.0 0.0;
-                                       rel1 { relative: 0.0 0.2; to_x: "pad_r"; to_y: "elm.text.title"; }
-                                       rel2 { relative: 0.0 0.2; to_x: "pad_r"; to_y: "elm.text.title"; }
+                                       rel1 { relative: 1.0 0.0; to : "bg"; }
+                                       rel2 { relative: 1.0 1.0; to : "bg"; }
+                                       visible: 0;
+                                       color: 0 255 0 200;
                                }
                        }
 
@@ -181,8 +216,8 @@ collections {
                                        min: SPEED_POPUP_CONTENT_MIN;
                                        fixed: 0 1;
                                        align: 0.5 0.0;
-                                       rel1 { relative: 1.0 1.0; to_x: "pad_l"; to_y: "elm.swallow.icon.1"; }
-                                       rel2 { relative: 0.0 1.0; to_x: "pad_r"; to_y: "elm.swallow.icon.1"; }
+                                       rel1 { relative: 1.0 1.0; to_x: "slider.pad.l"; to_y: "pad_l"; }
+                                       rel2 { relative: 0.0 1.0; to_x: "slider.pad.r"; to_y: "pad_l"; }
                                }
                        }
                } /* parts */