Convert common-ui module to CCommonUI class

Change-Id: I899fbf0f21affaf1e177a05b8f74d217ab338d0c
Signed-off-by: Kim Tae Soo <taesoo46.kim@samsung.com>

diff --git a/include/common-ui.h b/include/common-ui.h
index 79b7a22..2e0b2f1 100644 (file)
--- a/include/common-ui.h
+++ b/include/common-ui.h
@@ -20,21 +20,19 @@
 #include <Elementary.h>
 
 enum EAddType;
-struct view_mgr;
 
-char *_get_timestr_from_milseconds(int mseconds);
-void _set_object_text(Evas_Object *lbl, char *text, int size,
-       const char *style);
-Evas_Object *_add_box(Evas_Object *base);
-Evas_Object *_add_base(Evas_Object *win, const char *layout);
-void _object_mouse_moved(void *dt, Evas *e, Evas_Object *obj, void *ei);
-void _genlist_mouse_moved(void *dt, Evas *e, Evas_Object *obj, void *ei);
-void _gengrid_mouse_moved(void *dt, Evas *e,
-               Evas_Object *obj, void *event_info);
-void _update_playback_view(enum EAddType type,
+class CCommonUI {
+private:
+       static Eina_Bool sm_CbMsgBoxTimer(void *dt);
+
+public:
+       static char *TimeStrFromMilSeconds(int mseconds);
+       static void SetObjectText(Evas_Object *lbl, char *txt, int size, const char *style);
+       static Evas_Object *AddBox(Evas_Object *base);
+       static Evas_Object *AddBase(Evas_Object *win, const char *layout);
+       static void CreateMsgBox(Evas_Object *base, const char *msg);
+       static void UpdatePlaybackView(EAddType type,
                Evas_Object *layout, Elm_Object_Item *focused_item);
-void _create_message_box(Evas_Object *base, const char *msg);
-Evas_Object *_create_remove_popup(Evas_Object *base, const char *msg,
-               Evas_Object_Event_Cb _close_cb, Evas_Smart_Cb _remove_cb,
-               Evas_Smart_Cb _cancel_cb, void *dt);
+};
+
 #endif /*__COMMON_UI_H__*/

diff --git a/src/views/HandleVolume.cpp b/src/views/HandleVolume.cpp
index d6d275c..8db38e3 100644 (file)
--- a/src/views/HandleVolume.cpp
+++ b/src/views/HandleVolume.cpp
@@ -139,7 +139,7 @@ bool CHandleVolume::Create(Evas_Object *eoBase)
 
        _CREATE_BEGIN{
                _CHECK(m = new SHandleVolume)
-               _CHECK(m->eoVolLayout = _add_base(eoBase, MUSIC_VOLUME_LAYOUT))
+               _CHECK(m->eoVolLayout = CCommonUI::AddBase(eoBase, MUSIC_VOLUME_LAYOUT))
                _COMMAND{ evas_object_hide(m->eoVolLayout); }
                _CHECK(m->eoVolBar = elm_progressbar_add(m->eoVolLayout))
 

diff --git a/src/views/album-layout.cpp b/src/views/album-layout.cpp
index 7e721c7..234ae1f 100644 (file)
--- a/src/views/album-layout.cpp
+++ b/src/views/album-layout.cpp
@@ -178,7 +178,7 @@ void CAlbumLayout::m_OnCtxtUpdate(EActionType type, int lid)
                if (!m->mhandle->MediaAddsongsPlaylist(lid, list))
                        _ERR(" Adding songs to playlist failed ");
                else
-                       _create_message_box(m->base, MUSIC_TEXT_ADDTO_MSG);
+                       CCommonUI::CreateMsgBox(m->base, MUSIC_TEXT_ADDTO_MSG);
 
                return;
        }
@@ -192,7 +192,7 @@ void CAlbumLayout::m_OnCtxtUpdate(EActionType type, int lid)
                m->mhandle->SetCurrentSong(sinfo->Id());
        }
 
-       _update_playback_view((EAddType)type, Layout(), m->focused_item);
+       CCommonUI::UpdatePlaybackView((EAddType)type, Layout(), m->focused_item);
 }
 
 
@@ -457,7 +457,7 @@ bool CAlbumLayout::Create(CLayoutMgr *mgr, const char *albumId)
                return false;
        }
 
-       layout = _add_base(base, MUSIC_ALBUM_LAYOUT);
+       layout = CCommonUI::AddBase(base, MUSIC_ALBUM_LAYOUT);
        if (!layout) {
                _ERR(" get layout failed ");
                delete m;

diff --git a/src/views/album-songs-layout.cpp b/src/views/album-songs-layout.cpp
index 59ac2f5..80537ee 100644 (file)
--- a/src/views/album-songs-layout.cpp
+++ b/src/views/album-songs-layout.cpp
@@ -123,7 +123,7 @@ char *CAlbumSongsLayout::sm_CbGetListItemText(void *data, Evas_Object *obj, cons
                snprintf(buf, sizeof(buf), "%s", sinfo->Artist());
        else if (!strcmp(part, "elm.text3")) {
                duration = sinfo->Duration();
-               timestr = _get_timestr_from_milseconds(duration);
+               timestr = CCommonUI::TimeStrFromMilSeconds(duration);
                if (timestr) {
                        snprintf(buf, sizeof(buf), "%s", timestr);
                        free(timestr);
@@ -169,7 +169,7 @@ void CAlbumSongsLayout::m_OnCtxtUpdate(EActionType type, int lid)
                if (!m->mhandle->MediaAddsongsPlaylist(lid, list))
                        _ERR(" Adding songs to playlist failed ");
                else
-                       _create_message_box(m->base, MUSIC_TEXT_ADDTO_MSG);
+                       CCommonUI::CreateMsgBox(m->base, MUSIC_TEXT_ADDTO_MSG);
 
                return;
        }
@@ -182,7 +182,7 @@ void CAlbumSongsLayout::m_OnCtxtUpdate(EActionType type, int lid)
                m->mhandle->SetCurrentSong(((CSongInfo *)m->ctxtinfo->context)->Id());
        }
 
-       _update_playback_view((EAddType)type, Layout(), m->focused_item);
+       CCommonUI::UpdatePlaybackView((EAddType)type, Layout(), m->focused_item);
 }
 
 void CAlbumSongsLayout::sm_CbCtxtClose(void *dt)
@@ -333,7 +333,7 @@ void CAlbumSongsLayout::m_GotoPlayback(int mode, char *id)
                        m->mhandle->SetCurrentSong(id);
        }
 
-       _update_playback_view((EAddType)mode, Layout(), NULL);
+       CCommonUI::UpdatePlaybackView((EAddType)mode, Layout(), NULL);
 }
 
 
@@ -528,7 +528,7 @@ bool CAlbumSongsLayout::Create(CLayoutMgr *mgr)
                return false;
        }
 
-       layout = _add_base(base, MUSIC_ALBUM_SONGS_LAYOUT);
+       layout = CCommonUI::AddBase(base, MUSIC_ALBUM_SONGS_LAYOUT);
        if (!layout) {
                _ERR(" get layout failed ");
                delete m;

diff --git a/src/views/base-view.cpp b/src/views/base-view.cpp
index b729090..ededc04 100644 (file)
--- a/src/views/base-view.cpp
+++ b/src/views/base-view.cpp
@@ -489,12 +489,12 @@ void CMusicBaseView::m_UpdatePlaysongLabel(void)
 
                snprintf(buf, sizeof(buf), "%s - %s", sinfo->Name(), sinfo->Artist());
 
-               _set_object_text(m->plsonglbl, buf, PLAYSONG_FONT_SIZE,
+               CCommonUI::SetObjectText(m->plsonglbl, buf, PLAYSONG_FONT_SIZE,
                        FONT_STYLE_REGULAR);
                elm_label_slide_go(m->plsonglbl);
        }
        else {
-               _set_object_text(m->plsonglbl, (char *)MUSIC_STR_EMPTY,
+               CCommonUI::SetObjectText(m->plsonglbl, (char *)MUSIC_STR_EMPTY,
                        PLAYSONG_FONT_SIZE, (const char *)FONT_STYLE_REGULAR);
        }
 }
@@ -604,7 +604,7 @@ void CMusicBaseView::m_CreateLeftSection(void)
        btninfo[GROUP_BTN_PLAYLIST].icon_path = MUSIC_IMAGE_GRPBTN_PLAYLISTS;
        btninfo[GROUP_BTN_PLAYLIST].type = BASE_VIEW_GROUP_PLAYLIST;
 
-       box = _add_box(m->base);
+       box = CCommonUI::AddBox(m->base);
        if (!box)
                return;
 
@@ -694,7 +694,7 @@ bool CMusicBaseView::Create(void *data)
                return false;
        }
 
-       m->base = _add_base(win, MUSIC_BASE_VIEW);
+       m->base = CCommonUI::AddBase(win, MUSIC_BASE_VIEW);
        if (!m->base) {
                _ERR(" add base failed ");
                delete m;

diff --git a/src/views/category-layout.cpp b/src/views/category-layout.cpp
index 2b188de..a53a798 100644 (file)
--- a/src/views/category-layout.cpp
+++ b/src/views/category-layout.cpp
@@ -164,13 +164,13 @@ void CCategoryLayout::m_OnEntrynameSet(const char *name)
        t.epopup->Destroy();
 
        if (!strcmp(str, MUSIC_STR_EMPTY)) {
-               _create_message_box(Layout(), MUSIC_TEXT_EMPTY_NAME);
+               CCommonUI::CreateMsgBox(Layout(), MUSIC_TEXT_EMPTY_NAME);
                free(str);
                return;
        }
 
        if (m->pMusicController->MediaExistPlaylist(str)) {
-               _create_message_box(Layout(), MUSIC_TEXT_INUSE_MSG);
+               CCommonUI::CreateMsgBox(Layout(), MUSIC_TEXT_INUSE_MSG);
                free(str);
                return;
        }
@@ -246,7 +246,7 @@ void CCategoryLayout::t_OnCtxtUpdate(enum EActionType type, int lid)
                if (!m->pMusicController->MediaAddsongsPlaylist(lid, list))
                        _ERR(" Adding songs to playlist failed ");
                else
-                       _create_message_box(t.base, MUSIC_TEXT_ADDTO_MSG);
+                       CCommonUI::CreateMsgBox(t.base, MUSIC_TEXT_ADDTO_MSG);
 
                if (t.depth == E_DEPTH_CATEGORY) {
                        EINA_LIST_FREE(list, obj) {
@@ -276,7 +276,7 @@ void CCategoryLayout::t_OnCtxtUpdate(enum EActionType type, int lid)
                eina_list_free(list);
        }
 
-       _update_playback_view((EAddType)type, Layout(), t.focused_item);
+       CCommonUI::UpdatePlaybackView((EAddType)type, Layout(), t.focused_item);
 }
 
 
@@ -574,7 +574,7 @@ CCategoryLayout::SCatItemInfo *CCategoryLayout::m_FindItemInfo(Eina_List *list,
 void CCategoryLayout::m_GotoPlayback(int mode, char *id)
 {
        if (!m->it_infolist || eina_list_count(m->it_infolist) == 0) {
-               _create_message_box(Layout(), MUSIC_TEXT_NO_SONGS);
+               CCommonUI::CreateMsgBox(Layout(), MUSIC_TEXT_NO_SONGS);
                _ERR(" No songs for playback ");
                return;
        }
@@ -593,7 +593,7 @@ void CCategoryLayout::m_GotoPlayback(int mode, char *id)
                        m->pMusicController->SetCurrentSong(id);
        }
 
-       _update_playback_view((EAddType)mode, Layout(), NULL);
+       CCommonUI::UpdatePlaybackView((EAddType)mode, Layout(), NULL);
 }
 
 

diff --git a/src/views/category-songs-layout.cpp b/src/views/category-songs-layout.cpp
index a110318..00576bc 100644 (file)
--- a/src/views/category-songs-layout.cpp
+++ b/src/views/category-songs-layout.cpp
@@ -214,7 +214,7 @@ char *CCategorySongsLayout::sm_CbGetListItemText(void *data, Evas_Object *obj, c
                snprintf(buf, sizeof(buf), "%s", sinfo->Artist());
        else if (!strcmp(part, "elm.text3")) {
                duration = sinfo->Duration();
-               timestr = _get_timestr_from_milseconds(duration);
+               timestr = CCommonUI::TimeStrFromMilSeconds(duration);
                if (timestr) {
                        snprintf(buf, sizeof(buf), "%s", timestr);
                        free(timestr);
@@ -261,7 +261,7 @@ void CCategorySongsLayout::m_OnCtxtUpdate(EActionType type, int lid)
                if (!m->mhandle->MediaAddsongsPlaylist(lid, list))
                        _ERR(" Adding songs to playlist failed ");
                else
-                       _create_message_box(m->base, MUSIC_TEXT_ADDTO_MSG);
+                       CCommonUI::CreateMsgBox(m->base, MUSIC_TEXT_ADDTO_MSG);
 
                return;
        }
@@ -274,7 +274,7 @@ void CCategorySongsLayout::m_OnCtxtUpdate(EActionType type, int lid)
                m->mhandle->SetCurrentSong(((CSongInfo *)m->ctxtinfo->context)->Id());
        }
 
-       _update_playback_view((EAddType)type, Layout(), m->focused_item);
+       CCommonUI::UpdatePlaybackView((EAddType)type, Layout(), m->focused_item);
 }
 
 
@@ -513,7 +513,7 @@ void CCategorySongsLayout::m_GotoPlayback(int mode, char *id)
                        m->mhandle->SetCurrentSong(id);
        }
 
-       _update_playback_view((EAddType)mode, Layout(), NULL);
+       CCommonUI::UpdatePlaybackView((EAddType)mode, Layout(), NULL);
 }
 
 
@@ -896,7 +896,7 @@ bool CCategorySongsLayout::Create(CLayoutMgr *mgr, CCategoryLayout *parent)
                return false;
        }
 
-       layout = _add_base(base, MUSIC_CATEGORY_SONGS_LAYOUT);
+       layout = CCommonUI::AddBase(base, MUSIC_CATEGORY_SONGS_LAYOUT);
        if (!layout) {
                _ERR(" get layout failed ");
                delete m;

diff --git a/src/views/common-ui.cpp b/src/views/common-ui.cpp
index 2098c6e..a0dc8bf 100644 (file)
--- a/src/views/common-ui.cpp
+++ b/src/views/common-ui.cpp
@@ -24,16 +24,34 @@
 #include "BaseView.h"
 #include "ViewMgr.h"
 #include "song_info.h"
-//#include "playback-view.h"
+
 
 #define MESSAGE_SHOW_TIME 2
 
-struct msg_box {
+struct SMsgBox {
        Evas_Object *ly;
        Ecore_Timer *timer;
 };
 
-char *_get_timestr_from_milseconds(int mseconds)
+
+Eina_Bool CCommonUI::sm_CbMsgBoxTimer(void *dt)
+{
+       SMsgBox *mbox;
+
+       if (!dt)
+               return ECORE_CALLBACK_CANCEL;
+
+       mbox = (SMsgBox *)dt;
+
+       mbox->timer = NULL;
+       evas_object_del(mbox->ly);
+       delete mbox;
+
+       return ECORE_CALLBACK_CANCEL;
+}
+
+
+char *CCommonUI::TimeStrFromMilSeconds(int mseconds)
 {
        int sec;
        char buf[MAX_LENGTH];
@@ -44,7 +62,7 @@ char *_get_timestr_from_milseconds(int mseconds)
        return strdup(buf);
 }
 
-void _set_object_text(Evas_Object *lbl, char *text, int size, const char *style)
+void CCommonUI::SetObjectText(Evas_Object *lbl, char *text, int size, const char *style)
 {
        char buf[MAX_LENGTH];
 
@@ -60,7 +78,7 @@ void _set_object_text(Evas_Object *lbl, char *text, int size, const char *style)
        elm_object_text_set(lbl, buf);
 }
 
-Evas_Object *_add_box(Evas_Object *base)
+Evas_Object *CCommonUI::AddBox(Evas_Object *base)
 {
        Evas_Object *box;
        if (!base)
@@ -78,7 +96,7 @@ Evas_Object *_add_box(Evas_Object *base)
        return box;
 }
 
-Evas_Object *_add_base(Evas_Object *win, const char *layout)
+Evas_Object *CCommonUI::AddBase(Evas_Object *win, const char *layout)
 {
        Evas_Object *base;
        if (!win)
@@ -99,84 +117,23 @@ Evas_Object *_add_base(Evas_Object *win, const char *layout)
        return base;
 }
 
-void _object_mouse_moved(void *dt, Evas *e, Evas_Object *obj, void *ei)
-{
-       if (!obj)
-               return;
-
-       if (!elm_object_focus_get(obj))
-               elm_object_focus_set(obj, EINA_TRUE);
-}
-
-void _genlist_mouse_moved(void *dt, Evas *e, Evas_Object *obj, void *ei)
-{
-       Elm_Object_Item *item;
-       Evas_Event_Mouse_Move *ev;
-
-       if (!obj || !ei)
-               return;
-
-       ev = (Evas_Event_Mouse_Move *)ei;
-
-       item = elm_genlist_at_xy_item_get(obj, ev->cur.canvas.x,
-                       ev->cur.canvas.y, NULL);
-
-       if (!elm_object_item_focus_get(item))
-               elm_object_item_focus_set(item, EINA_TRUE);
-}
-
-void _gengrid_mouse_moved(void *dt, Evas *e,
-               Evas_Object *obj, void *ei)
-{
-       Elm_Object_Item *item;
-       Evas_Event_Mouse_Move *ev;
-
-       if (!obj || !ei)
-               return;
-
-       ev = (Evas_Event_Mouse_Move *)ei;
-
-       item = elm_gengrid_at_xy_item_get(obj, ev->cur.canvas.x,
-                       ev->cur.canvas.y, NULL, NULL);
-       if (!item)
-               return;
-
-       if (!elm_object_item_focus_get(item))
-               elm_object_item_focus_set(item, EINA_TRUE);
-}
-
-static Eina_Bool _timer_cb(void *dt)
-{
-       struct msg_box *mbox;
-
-       if (!dt)
-               return ECORE_CALLBACK_CANCEL;
-
-       mbox = (msg_box *)dt;
 
-       mbox->timer = NULL;
-       evas_object_del(mbox->ly);
-       free(mbox);
-
-       return ECORE_CALLBACK_CANCEL;
-}
-
-void _create_message_box(Evas_Object *base, const char *msg)
+void CCommonUI::CreateMsgBox(Evas_Object *base, const char *msg)
 {
        Evas_Object *ly;
-       struct msg_box *mbox;
+       SMsgBox *mbox;
 
        if (!base || !msg)
                return;
 
-       mbox = (msg_box *)calloc(1, sizeof(*mbox));
+       mbox = new SMsgBox;
        if (!mbox)
                return;
 
-       ly = _add_base(base, MUSIC_MESSAGE_LAYOUT);
+       ly = AddBase(base, MUSIC_MESSAGE_LAYOUT);
        if (!ly) {
                _ERR(" Failed to add layout ");
-               free(mbox);
+               delete mbox;
                return;
        }
 
@@ -184,71 +141,11 @@ void _create_message_box(Evas_Object *base, const char *msg)
 
        evas_object_show(ly);
        mbox->ly = ly;
-       mbox->timer = ecore_timer_add(MESSAGE_SHOW_TIME, _timer_cb, mbox);
+       mbox->timer = ecore_timer_add(MESSAGE_SHOW_TIME, sm_CbMsgBoxTimer, mbox);
 }
 
-Evas_Object *_create_remove_popup(Evas_Object *base, const char *msg,
-               Evas_Object_Event_Cb _close_cb, Evas_Smart_Cb _remove_cb,
-               Evas_Smart_Cb _cancel_cb, void *dt)
-{
-       Evas_Object *popup, *yesbtn, *nobtn, *lbl;
-
-       if (!base || !_remove_cb || !_cancel_cb || !dt) {
-               _ERR("Invalid argument.");
-               return NULL;
-       }
-
-       popup = elm_popup_add(base);
-       if (!popup) {
-               _ERR("elm_popup_add failed.");
-               return NULL;
-       }
-
-       elm_object_style_set(popup, MUSIC_STYLE_REMOVE_POPUP);
-       elm_object_part_text_set(popup, MUSIC_PART_RPOPUP_TITLE,
-                       _(MUSIC_TEXT_REMOVE));
-       elm_popup_orient_set(popup, ELM_POPUP_ORIENT_CENTER);
-       evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN,
-                       _close_cb, dt);
-       evas_object_show(popup);
-
-       lbl = elm_label_add(popup);
-       if (!lbl)
-               goto err;
-
-       elm_object_style_set(lbl, MUSIC_STYLE_REMOVE_LABEL);
-       elm_object_text_set(lbl, _(msg));
-       elm_object_content_set(popup, lbl);
-
-       yesbtn = elm_button_add(popup);
-       if (!yesbtn)
-               goto err;
-
-       elm_object_text_set(yesbtn, _(MUSIC_TEXT_REMOVE));
-       elm_object_part_content_set(popup, MUSIC_PART_RPOPUP_BTN1, yesbtn);
-       evas_object_smart_callback_add(yesbtn, MUSIC_SIGNAL_CLICKED,
-                       _remove_cb, dt);
-
-       nobtn = elm_button_add(popup);
-       if (!nobtn)
-               goto err;
-
-       elm_object_text_set(nobtn, _(MUSIC_TEXT_CANCEL));
-       elm_object_part_content_set(popup, MUSIC_PART_RPOPUP_BTN2, nobtn);
-       evas_object_smart_callback_add(nobtn, MUSIC_SIGNAL_CLICKED,
-                       _cancel_cb, dt);
-       elm_object_focus_set(nobtn, EINA_TRUE);
-
-       return popup;
-
-err:
-       _ERR("Add Evas_Object failed.");
-       evas_object_del(popup);
-
-       return NULL;
-}
 
-void _update_playback_view(enum EAddType type,
+void CCommonUI::UpdatePlaybackView(EAddType type,
                Evas_Object *layout, Elm_Object_Item *focused_item)
 {
        Evas_Object *obj;
@@ -292,7 +189,7 @@ void _update_playback_view(enum EAddType type,
        }
 
        if (type == ADD_TYPE_NEXT)
-               _create_message_box(layout, MUSIC_TEXT_NEXT_MSG);
+               CreateMsgBox(layout, MUSIC_TEXT_NEXT_MSG);
        else
-               _create_message_box(layout, MUSIC_TEXT_LAST_MSG);
+               CreateMsgBox(layout, MUSIC_TEXT_LAST_MSG);
 }

diff --git a/src/views/context-view.cpp b/src/views/context-view.cpp
index 514a1c8..3c9c0a9 100644 (file)
--- a/src/views/context-view.cpp
+++ b/src/views/context-view.cpp
@@ -1253,7 +1253,7 @@ void CContextView::m_HandleBtnSelected(int btnType)
        case CONTEXT_VIEW_BUTTON_ADDTO:
                m->ctxpopup = (CPlayListCtxPopup *)m_CreatePlaylistPopup();
                if (!m->ctxpopup)
-                       _create_message_box(m->base, MUSIC_TEXT_NOLIST_MSG);
+                       CCommonUI::CreateMsgBox(m->base, MUSIC_TEXT_NOLIST_MSG);
                break;
 
        case CONTEXT_VIEW_BUTTON_DEL:
@@ -1356,7 +1356,7 @@ bool CContextView::Create(void *data)
                return false;
        }
 
-       base = _add_base(win, MUSIC_CONTEXT_VIEW);
+       base = CCommonUI::AddBase(win, MUSIC_CONTEXT_VIEW);
        if (!base) {
                _ERR(" add base failed ");
                delete m;

diff --git a/src/views/folder-layout.cpp b/src/views/folder-layout.cpp
index 9190b38..3966db6 100644 (file)
--- a/src/views/folder-layout.cpp
+++ b/src/views/folder-layout.cpp
@@ -297,7 +297,7 @@ void CFolderLayout::m_OnCtxtUpdate(EActionType type, int lid)
                if (!m->mhandle->MediaAddsongsPlaylist(lid, list))
                        _ERR(" Adding songs to playlist failed ");
                else
-                       _create_message_box(m->base, MUSIC_TEXT_ADDTO_MSG);
+                       CCommonUI::CreateMsgBox(m->base, MUSIC_TEXT_ADDTO_MSG);
 
                return;
        }
@@ -310,7 +310,7 @@ void CFolderLayout::m_OnCtxtUpdate(EActionType type, int lid)
                m->mhandle->SetCurrentSong(sinfo->Id());
        }
 
-       _update_playback_view((EAddType)type, Layout(), m->focused_item);
+       CCommonUI::UpdatePlaybackView((EAddType)type, Layout(), m->focused_item);
 }
 
 void CFolderLayout::sm_CbCtxtClose(void *dt)
@@ -457,7 +457,7 @@ void CFolderLayout::m_GotoPlayback(int mode, char *id)
                        m->mhandle->SetCurrentSong(id);
        }
 
-       _update_playback_view((EAddType)mode, Layout(), NULL);
+       CCommonUI::UpdatePlaybackView((EAddType)mode, Layout(), NULL);
 }
 
 
@@ -764,7 +764,7 @@ bool CFolderLayout::Create(CLayoutMgr *mgr)
                return false;
        }
 
-       layout = _add_base(base, MUSIC_FOLDER_LAYOUT);
+       layout = CCommonUI::AddBase(base, MUSIC_FOLDER_LAYOUT);
        if (!layout) {
                _ERR(" get layout failed ");
                delete m;

diff --git a/src/views/playback-view.cpp b/src/views/playback-view.cpp
index f3cea5f..538fc67 100644 (file)
--- a/src/views/playback-view.cpp
+++ b/src/views/playback-view.cpp
@@ -188,7 +188,7 @@ Eina_Bool CPlaybackView::sm_CbUpdateSlider(void *dt)
        }
 
        elm_slider_value_set(m->eoSlider, value);
-       timestr = _get_timestr_from_milseconds(value);
+       timestr = CCommonUI::TimeStrFromMilSeconds(value);
        if (timestr) {
                elm_object_part_text_set(m->eoBase, MUSIC_PART_PROGRESSTIME,
                        timestr);
@@ -528,7 +528,7 @@ void CPlaybackView::m_UpdateCurrentSongProgressbar(void)
                        sm_CbUpdateSlider, m);
 
                elm_slider_min_max_set(m->eoSlider, 0, duration);
-               timestr = _get_timestr_from_milseconds(duration);
+               timestr = CCommonUI::TimeStrFromMilSeconds(duration);
                if (timestr) {
                        elm_object_part_text_set(m->eoBase,
                                MUSIC_PART_FULLTIME, timestr);
@@ -898,7 +898,7 @@ void CPlaybackView::m_HandleOnRepeated(void)
 
        m->hMusicController->SetPosition(value);
        elm_slider_value_set(m->eoSlider, value);
-       timestr = _get_timestr_from_milseconds(value);
+       timestr = CCommonUI::TimeStrFromMilSeconds(value);
        if (timestr) {
                elm_object_part_text_set(m->eoBase, MUSIC_PART_PROGRESSTIME,
                        timestr);
@@ -1145,7 +1145,7 @@ void CPlaybackView::m_AddEditPlaylistButtons(void)
        btninfo[BTN_DELETE].txt = MUSIC_TEXT_DELETE;
        btninfo[BTN_DELETE].type = EO_DELETE;
 
-       box = _add_box(m->eoBase);
+       box = CCommonUI::AddBox(m->eoBase);
        if (!box)
                return;
 
@@ -1322,7 +1322,7 @@ public:
                        sinfo->Album());
                else if (!strcmp(part, "elm.text3")) {
                        duration = sinfo->Duration();
-                       timestr = _get_timestr_from_milseconds(duration);
+                       timestr = CCommonUI::TimeStrFromMilSeconds(duration);
                        if (timestr) {
                                snprintf(buf, sizeof(buf), "%s", timestr);
                                free(timestr);
@@ -1620,7 +1620,7 @@ bool CPlaybackView::Create(void *data)
                _CHECK(m->mgr = CViewMgr::GetInstance())
                _CHECK(m->eoWin = m->mgr->Window())
                _CHECK(m->hMusicController = CMusicController::GetInstance())
-               _CHECK(m->eoBase = _add_base(m->eoWin, MUSIC_PLAYBACK_VIEW))
+               _CHECK(m->eoBase = CCommonUI::AddBase(m->eoWin, MUSIC_PLAYBACK_VIEW))
                _CHECK(CBaseView::Create(data))
                _WHEN_SUCCESS{}
                _CHECK_FAIL{ CBaseView::Destroy(); }
@@ -2060,7 +2060,7 @@ void CPlaybackView::OnChanged(int id, Evas_Object *obj)
 
                        value = elm_slider_value_get(obj);
                        m->hMusicController->SetPosition(value);
-                       timestr = _get_timestr_from_milseconds(value);
+                       timestr = CCommonUI::TimeStrFromMilSeconds(value);
                        if (timestr) {
                                elm_object_part_text_set(m->eoBase, MUSIC_PART_PROGRESSTIME,
                                        timestr);

diff --git a/src/views/playlist-layout.cpp b/src/views/playlist-layout.cpp
index bd24f2b..ca56347 100644 (file)
--- a/src/views/playlist-layout.cpp
+++ b/src/views/playlist-layout.cpp
@@ -66,7 +66,7 @@ void CPlaylistLayout::m_OnEntryRename(const char *name)
        t.epopup->Destroy();
 
        if (CMusicController::GetInstance()->MediaExistPlaylist(str)) {
-               _create_message_box(Layout(), MUSIC_TEXT_INUSE_MSG);
+               CCommonUI::CreateMsgBox(Layout(), MUSIC_TEXT_INUSE_MSG);
                elm_object_item_focus_set(t.focused_item, EINA_TRUE);
                free(str);
                return;
@@ -130,7 +130,7 @@ void CPlaylistLayout::m_PlaylistCtxtAction(EActionType type)
        else if (type == ACTION_TYPE_REMOVESONG) {
                if (catinfo->SongCount() == 0) {
                        elm_object_item_focus_set(t.focused_item, EINA_TRUE);
-                       _create_message_box(Layout(), MUSIC_TEXT_NO_SONGS);
+                       CCommonUI::CreateMsgBox(Layout(), MUSIC_TEXT_NO_SONGS);
                        return;
                }
                t.depth = E_DEPTH_SELECT_LIST;

diff --git a/src/views/song-layout.cpp b/src/views/song-layout.cpp
index c92a24c..9c97e52 100644 (file)
--- a/src/views/song-layout.cpp
+++ b/src/views/song-layout.cpp
@@ -105,7 +105,7 @@ char *CSongLayout::sm_CbGetListItemText(void *data, Evas_Object *obj, const char
                snprintf(buf, sizeof(buf), "%s", sinfo->Album());
        else if (!strcmp(part, "elm.text3")) {
                duration = sinfo->Duration();
-               timestr = _get_timestr_from_milseconds(duration);
+               timestr = CCommonUI::TimeStrFromMilSeconds(duration);
                if (timestr) {
                        snprintf(buf, sizeof(buf), "%s", timestr);
                        free(timestr);
@@ -185,7 +185,7 @@ void CSongLayout::m_OnCtxtUpdate(EActionType type, int lid)
                if (!m->mhandle->MediaAddsongsPlaylist(lid, list))
                        _ERR(" Adding songs to playlist failed ");
                else
-                       _create_message_box(m->base, MUSIC_TEXT_ADDTO_MSG);
+                       CCommonUI::CreateMsgBox(m->base, MUSIC_TEXT_ADDTO_MSG);
 
                return;
        }
@@ -198,7 +198,7 @@ void CSongLayout::m_OnCtxtUpdate(EActionType type, int lid)
                m->mhandle->SetCurrentSong(((CSongInfo *)m->ctxtinfo->context)->Id());
        }
 
-       _update_playback_view((EAddType)type, Layout(), m->focused_item);
+       CCommonUI::UpdatePlaybackView((EAddType)type, Layout(), m->focused_item);
 }
 
 
@@ -531,7 +531,7 @@ bool CSongLayout::Create(CLayoutMgr *mgr, const char *uri)
                return false;
        }
 
-       layout = _add_base(base, MUSIC_SONG_LAYOUT);
+       layout = CCommonUI::AddBase(base, MUSIC_SONG_LAYOUT);
        if (!layout) {
                _ERR(" get layout failed ");
                delete m;