add up and down arrow for date button in sort ctxpopup

Change-Id: I1de1f169fc6e55c2ca95e218117aa51b75e53896
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

diff --git a/include/view/gallery-view/gallery_view.h b/include/view/gallery-view/gallery_view.h
index 81ec0ad..ed682e4 100644 (file)
--- a/include/view/gallery-view/gallery_view.h
+++ b/include/view/gallery-view/gallery_view.h
@@ -92,10 +92,6 @@ private:
        void m_DrawNotifyPopup(const char *text);
        void m_DestroyNotifyPopup(void);
 
-       void m_AddUpdownIcon(Evas_Object *btn, const char *icon_file);
-       void m_FocusUpdownArrow(void);
-       void m_UnfocusUpdownArrow(void);
-
        Evas_Object *m_GetHoverselObject(const char **text_arr,
                        int size_arr, const char *style);
 

diff --git a/res/edc/widgets/button.edc b/res/edc/widgets/button.edc
index 4fb35ef..833db49 100644 (file)
--- a/res/edc/widgets/button.edc
+++ b/res/edc/widgets/button.edc
@@ -1193,17 +1193,11 @@ group {
                        description {
                                state: "selected" 0.0;
                                inherit: "default" 0.0;
-                               text {
-                                       font: FONT_STYLE_SANS_MEDIUM;
-                               }
                                color: 255 255 255 255;
                        }
                        description {
                                state: "highlight" 0.0;
                                inherit: "default" 0.0;
-                               text {
-                                       font: FONT_STYLE_SANS_MEDIUM;
-                               }
                                color: 147 170 0 255;
                        }
                }

diff --git a/src/common/menudef.cpp b/src/common/menudef.cpp
index cc7a387..c7df2ba 100644 (file)
--- a/src/common/menudef.cpp
+++ b/src/common/menudef.cpp
@@ -7,8 +7,8 @@ const char *sourcetext[SOURCE_TEXT_SIZE] = {
 };
 
 const char *sorttext[SORT_TEXT_SIZE] = {
-       N_("Date"),
-       N_("Date"),
+       N_("Date ↓ "),
+       N_("Date ↑ "),
        N_("A-Z"),
        N_("Z-A")
 };

diff --git a/src/view/gallery-view/gallery_view.cpp b/src/view/gallery-view/gallery_view.cpp
index f6324ce..b63f321 100644 (file)
--- a/src/view/gallery-view/gallery_view.cpp
+++ b/src/view/gallery-view/gallery_view.cpp
@@ -41,9 +41,6 @@
 
 #define BTN_ICN "btn_icon"
 
-#define IMAGE_UP_ARR IMAGEDIR"/ico_dropdown_date_arrow_up.png"
-#define IMAGE_DOWN_ARR IMAGEDIR"/ico_dropdown_date_arrow_down.png"
-
 #define LOADING_ICON_X 48
 #define LOADING_ICON_Y 48
 #define MAX_TIME_LIMIT 10.0
@@ -187,65 +184,6 @@ void CGalleryView::m_DrawNotifyPopup(const char *text)
        m->transit = transit;
 }
 
-
-void CGalleryView::m_FocusUpdownArrow(void)
-{
-       if (!m->hover_updown)
-               return;
-
-       if (m->sort_type == E_SORT_DATE_DESC) {
-               /* date desc */
-               elm_image_file_set(m->hover_updown, IMAGE_DOWN_ARR, NULL);
-               evas_object_color_set(m->hover_updown, 255, 255, 255, 255);
-               elm_object_part_content_unset(m->sortbtn, PART_ELM_SWALLOWICON);
-
-               evas_object_show(m->hover_updown);
-               elm_object_part_content_set(m->sortbtn,
-                       PART_ELM_SWALLOWICON, m->hover_updown);
-       } else if (m->sort_type == E_SORT_DATE_ASC) {
-               /* date asc */
-               elm_image_file_set(m->hover_updown, IMAGE_UP_ARR, NULL);
-               evas_object_color_set(m->hover_updown, 255, 255, 255, 255);
-               elm_object_part_content_unset(m->sortbtn, PART_ELM_SWALLOWICON);
-
-               evas_object_show(m->hover_updown);
-               elm_object_part_content_set(m->sortbtn,
-                       PART_ELM_SWALLOWICON, m->hover_updown);
-       } else {
-               elm_object_part_content_unset(m->sortbtn, PART_ELM_SWALLOWICON);
-               evas_object_hide(m->hover_updown);
-       }
-}
-
-void CGalleryView::m_UnfocusUpdownArrow(void)
-{
-       if (!m->hover_updown)
-               return;
-
-       if (m->sort_type == E_SORT_DATE_DESC) {
-               /* date desc */
-               elm_image_file_set(m->hover_updown, IMAGE_DOWN_ARR, NULL);
-               evas_object_color_set(m->hover_updown, 175, 175, 175, 255);
-               elm_object_part_content_unset(m->sortbtn, PART_ELM_SWALLOWICON);
-
-               evas_object_show(m->hover_updown);
-               elm_object_part_content_set(m->sortbtn,
-                       PART_ELM_SWALLOWICON, m->hover_updown);
-
-       } else if (m->sort_type == E_SORT_DATE_ASC) {
-               /* date asc */
-               elm_image_file_set(m->hover_updown, IMAGE_UP_ARR, NULL);
-               evas_object_color_set(m->hover_updown, 175, 175, 175, 255);
-               elm_object_part_content_unset(m->sortbtn, PART_ELM_SWALLOWICON);
-
-               evas_object_show(m->hover_updown);
-               elm_object_part_content_set(m->sortbtn, PART_ELM_SWALLOWICON, m->hover_updown);
-       } else {
-               elm_object_part_content_unset(m->sortbtn, PART_ELM_SWALLOWICON);
-               evas_object_hide(m->hover_updown);
-       }
-}
-
 void CGalleryView::sm_CbCtxPopupSelected(void *cookie, CCtxPopup *instance, const char *text)
 {
        CGalleryView *root = (CGalleryView *)cookie;
@@ -301,22 +239,6 @@ void CGalleryView::m_SourceChange(void)
        m_DrawContentArea(m->current_layout);
 }
 
-void CGalleryView::m_AddUpdownIcon(Evas_Object *btn, const char *icon_file)
-{
-       Evas_Object *ic;
-
-       if (!btn)
-               return;
-
-       ic = elm_image_add(btn);
-       if (!ic)
-               return;
-
-       elm_image_file_set(ic, icon_file, NULL);
-       elm_object_part_content_set(btn, PART_ELM_SWALLOWICON2, ic);
-       evas_object_data_set(btn, BTN_ICN, ic);
-}
-
 Evas_Object *CGalleryView::m_GetHoverselObject(const char **text_arr,
                int size_arr, const char *style)
 {
@@ -888,11 +810,6 @@ void CGalleryView::OnFocused(int id, Evas_Object *obj, Elm_Object_Item *item)
        case GALLERY_SOURCEBTN:
                elm_object_signal_emit(m->focused_btn, "highlight", "");
 
-#if 0
-               if (m->sortbtn == obj)
-                       m_FocusUpdownArrow();
-#endif
-
                m->hover_btn = obj;
                m->focus_area = FOCUS_HOVER_BTN;
 

diff --git a/src/view/photo-viewer/photoviewer_view.cpp b/src/view/photo-viewer/photoviewer_view.cpp
index 6c8a92b..b8f9ecd 100644 (file)
--- a/src/view/photo-viewer/photoviewer_view.cpp
+++ b/src/view/photo-viewer/photoviewer_view.cpp
@@ -245,12 +245,6 @@ void CPhotoViewerView::m_OnSettingBtnClicked(Evas_Object *obj, const char *emiss
        pCtxPopup->RegisterSetCallback(sm_CbSetSlideshowSpeed, m);
        m->pCtxPopup = pCtxPopup;
        pCtxPopup->Create(m->base, &cb);
-
-#if 0
-       m_DrawCtxpopup(speed_text, MAX_SPEED_BTNS, STYLE_BTN_SHORTTEXT, m->slideshow_speed, POSITION_SETTING_POPUP_X, POSITION_SETTING_POPUP_Y);
-
-       m->cur_ctxpopup = CTXPOPUP_SPEED;
-#endif
 }
 
 
@@ -276,12 +270,6 @@ void CPhotoViewerView::m_OnZoomBtnClicked(Evas_Object *obj, const char *emission
        pCtxPopup->RegisterSetCallback(sm_CbSetZoomLevel, m);
        m->pCtxPopup = pCtxPopup;
        pCtxPopup->Create(m->base, &cb);
-
-#if 0
-       m_DrawCtxpopup(zoom_text, MAX_ZOOM_BTNS, STYLE_BTN_SHORTTEXT, E_ZOOM_ORIGINAL, POSITION_ZOOM_POPUP_X, POSITION_ZOOM_POPUP_Y);
-
-       m->cur_ctxpopup = CTXPOPUP_ZOOM;
-#endif
 }