Deleted the unnecessary setting button.

Change-Id: I8b6385cd0c7e6469c45d617b5a8bb36201f4f707
Signed-off-by: Hyojung Jo <hj903.jo@samsung.com>

diff --git a/include/define.h b/include/define.h
index b11ad5c..1ce067a 100644 (file)
--- a/include/define.h
+++ b/include/define.h
@@ -81,9 +81,6 @@
 #define IMAGE_VIDEO_BTN_PAUSE_FOCUS "btn_video_pause_foc.png"
 #define IMAGE_VIDEO_BTN_PLAY_NORMAL "btn_video_play_nor.png"
 #define IMAGE_VIDEO_BTN_PLAY_FOCUS "btn_video_play_foc.png"
-#define IMAGE_VIDEO_BTN_SETTING_NORMAL "btn_video_setting_nor.png"
-#define IMAGE_VIDEO_BTN_SETTING_FOCUS "btn_video_setting_foc.png"
-#define IMAGE_VIDEO_BTN_SETTING_HIGHLIGHT "btn_video_setting_high.png"
 #define IMAGE_VIDEO_BTN_REPEATOFF_NORMAL "btn_video_offrepeat_nor.png"
 #define IMAGE_VIDEO_BTN_REPEATOFF_FOCUS "btn_video_offrepeat_foc.png"
 #define IMAGE_VIDEO_BTN_REPEATALL_NORMAL "btn_video_repeatall_nor.png"

diff --git a/res/edc/images/btn_video_setting_foc.png b/res/edc/images/btn_video_setting_foc.png
deleted file mode 100644 (file)
index 3cca0b6..0000000
Binary files a/res/edc/images/btn_video_setting_foc.png and /dev/null differ

diff --git a/res/edc/images/btn_video_setting_high.png b/res/edc/images/btn_video_setting_high.png
deleted file mode 100644 (file)
index 9c800ae..0000000
Binary files a/res/edc/images/btn_video_setting_high.png and /dev/null differ

diff --git a/res/edc/images/btn_video_setting_nor.png b/res/edc/images/btn_video_setting_nor.png
deleted file mode 100644 (file)
index db518fb..0000000
Binary files a/res/edc/images/btn_video_setting_nor.png and /dev/null differ

diff --git a/res/edc/widgets/button.edc b/res/edc/widgets/button.edc
index 641d42b..65489a9 100644 (file)
--- a/res/edc/widgets/button.edc
+++ b/res/edc/widgets/button.edc
@@ -574,125 +574,6 @@ group {
 }
 
 group {
-       name: "elm/button/base/video_btn_settings";
-       data.item, "focus_highlight" "on";
-       images {
-               image: IMAGE_VIDEO_BTN_SETTING_NORMAL COMP;
-               image: IMAGE_VIDEO_BTN_SETTING_FOCUS COMP;
-               image: IMAGE_VIDEO_BTN_SETTING_HIGHLIGHT COMP;
-       }
-       script {
-               public cur_state;
-       }
-       parts {
-               part {
-                       name: "bg";
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: 110 110;
-                               image.normal: IMAGE_VIDEO_BTN_SETTING_NORMAL;
-                       }
-                       description {
-                               state: "selected" 0.0;
-                               inherit: "default" 0.0;
-                               image.normal: IMAGE_VIDEO_BTN_SETTING_FOCUS;
-                       }
-                       description {
-                               state: "selected_in" 0.0;
-                               inherit: "selected" 0.0;
-                               min: 60 60;
-                               max: 60 60;
-                       }
-                       description {
-                               state: "highlight" 0.0;
-                               inherit: "default" 0.0;
-                               image.normal: IMAGE_VIDEO_BTN_SETTING_HIGHLIGHT;
-                       }
-               }
-       }
-       programs {
-               program {
-                       name: "load";
-                       signal: "load";
-                       source: "";
-                       script {
-                               set_int(cur_state, STATE_NORMAL);
-                       }
-               }
-               program {
-                       name: "button_down";
-                       signal: "mouse,down,1";
-                       source: "bg";
-                       action: SIGNAL_EMIT "elm,action,press" "";
-               }
-               program {
-                       name: "button_mouseup";
-                       signal: "mouse,up,1";
-                       source: "bg";
-                       action: SIGNAL_EMIT "elm,action,unpress" "";
-               }
-               program {
-                       name: "button_clicked";
-                       signal: "mouse,clicked,1";
-                       source: "bg";
-                       action: SIGNAL_EMIT "elm,action,click" "";
-               }
-               program {
-                       name: "focused";
-                       signal: "elm,action,focus";
-                       source: "elm";
-                       script {
-                               set_int(cur_state, STATE_NORMAL);
-                               set_state(PART:"bg", "selected", 0.0);
-                       }
-               }
-               program {
-                       name: "unfocused";
-                       signal: "elm,action,unfocus";
-                       source: "elm";
-                       script {
-                               new state;
-                               state = get_int(cur_state);
-                               if (state == STATE_HIGHLIGHT)
-                                       set_state(PART:"bg", "highlight", 0.0);
-                               else
-                                       set_state(PART:"bg", "default", 0.0);
-                       }
-               }
-               program {
-                       name: "mouse,anim,start";
-                       signal: "mouse,anim,start";
-                       source: "";
-                       action: STATE_SET "selected_in" 0.0;
-                       target: "bg";
-                       transition: LINEAR 0.1;
-                       after: "mouse,anim,end";
-               }
-               program {
-                       name: "mouse,anim,end";
-                       action: STATE_SET "highlight" 0.0;
-                       target: "bg";
-                       transition: LINEAR 0.1;
-                       after: "emit,signal";
-               }
-               program {
-                       name: "emit,signal";
-                       action: SIGNAL_EMIT "btn,anim,finish" "settings";
-               }
-               program {
-                       name: "highlight";
-                       signal: "elm,action,highlight";
-                       source: "elm";
-                       script {
-                               set_int(cur_state, STATE_HIGHLIGHT);
-                               set_state(PART:"bg", "highlight", 0.0);
-                       }
-               }
-       }
-}
-
-group {
        name: "elm/button/base/shorttext";
        images {
                image: IMAGE_ICON_CHECK_HIGH COMP;

diff --git a/src/control.cpp b/src/control.cpp
index 010fac2..c87ce16 100644 (file)
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -25,7 +25,7 @@
 #include "i18n.h"
 #include "control.h"
 
-#define MAX_CONTROL_BTNS 7
+#define MAX_CONTROL_BTNS 6
 
 struct SControlData;
 
@@ -113,12 +113,6 @@ int CVideoController::m_AddControls(const char **btns, int count)
                elm_object_part_content_set(m->base,
                                buf, m->btn[i]);
 
-               /* FIXME: disable setting button temporary */
-               if (i == count - 1) {
-                       elm_object_focus_allow_set(m->btn[i], EINA_FALSE);
-                       break;
-               }
-
                Connect(m->btn[i], -1, TYPE_MOUSE_MOVE | TYPE_CLICKED);
 
                elm_object_signal_callback_add(m->btn[i],

diff --git a/src/view_player.cpp b/src/view_player.cpp
index d75bc1a..a21a077 100644 (file)
--- a/src/view_player.cpp
+++ b/src/view_player.cpp
@@ -42,7 +42,7 @@
 #define SOURCE_TV N_("TV")
 #define SOURCE_USB N_("USB")
 
-#define CONTROL_BTNS 7
+#define CONTROL_BTNS 6
 
 /* Workaround */
 #define KEY_VOLUMEUP_REMOTE "XF86AudioRaiseVolume"
@@ -55,7 +55,6 @@ static const char *_control_name[] = {
        "ff",
        "next",
        "repeat",
-       "settings"
 };
 
 typedef void (*btn_event_cb)(void *dt);
@@ -88,7 +87,6 @@ enum _control_btn {
        E_FF_BTN,
        E_NEXT_BTN,
        E_REPEAT_BTN,
-       E_SETTINGS_BTN
 };
 
 enum _repeat_option {