TIZENIOT- 1784 [Music] '# playlists' text is a little bigger'

TIZENIOT- 1756 [Music] [PO] update .po file
TIZENIOT- 1738 [Music] Apply animation (no item / no item in search)

Change-Id: I8f7e50fef4ddbbe02dc656d17f5c8cbfb25d536f

diff --git a/inc/mp-resource.h b/inc/mp-resource.h
index f13dc1ce3f3e1c14c1d7343a59a2e9a2dc92f047..6aac21780f42f73d7fad9620afe98ac65113995d 100755 (executable)
--- a/inc/mp-resource.h
+++ b/inc/mp-resource.h
@@ -65,6 +65,8 @@
 #define STR_MP_NO_ARTISTS                "IDS_MUSIC_BODY_NO_ARTISTS"
 #define STR_MP_NO_ALBUMS           "IDS_MUSIC_BODY_NO_ALBUMS"
 #define STR_MP_NO_RESULTS_FOUND           "IDS_MUSIC_BODY_NO_RESULTS_FOUND"
+#define STR_MP_NO_SEARCH_RESULTS_FOUND  "IDS_MUSIC_BODY_NO_SEARCH_RESULTS"
+#define STR_NO_ITEMS_AVAILABLE  "IDS_MUSIC_BODY_NO_ITEMS"
 #define STR_PLAYER_VIEW_VOLUME "IDS_MUSIC_OPT_VOLUME"
 #define STR_PLAYER_VIEW_QUEUE  "IDS_MUSIC_MBODY_QUEUE"
 #define STR_PLAYER_VIEW_REPEAT "IDS_MUSIC_OPT_REPEAT"

diff --git a/res/edje/mp-nocontents.edc b/res/edje/mp-nocontents.edc
index eaa637d693681362ed95338b2e94c66b9a087c10..f0d8dfdd22e8d80f29b5f077c03270498297aa0c 100755 (executable)
--- a/res/edje/mp-nocontents.edc
+++ b/res/edje/mp-nocontents.edc
@@ -47,10 +47,10 @@ group {
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               fixed: 1 1;
-                               align: 0.5 0.5;
-                               rel1 { relative : 0.5 0.42; to : "bg";}
-                               rel2 { relative : 0.5 0.42; to : "bg";}
+                               fixed: 0 0;
+                               align: 0.5 0.0;
+                               rel1 { relative : 0.5 0.0; to : "bg"; offset: 0 -5;}
+                               rel2 { relative : 0.5 0.0; to : "bg";}
                        }
                }
                part {
@@ -59,16 +59,17 @@ group {
                        scale: 1;
                        description {
                                state: "default" 0.0;
+                               min: 0 26;
+                               max: -1 26;
                                fixed: 0 1;
-                               align: 0.5 0.78;
-                               rel1 { relative: 0.0 0.0; to: "bg";}
-                               rel2 { relative: 1.0 1.0; to: "bg";}
+                               align: 0.5 0.0;
+                               rel1 { relative: 0.0 0.72; to: "bg";}
+                               rel2 { relative: 1.0 0.72; to: "bg";}
                                color: 6 1 74 255;
                                text {
-                                       style: "nocontent_style";
+                                       style: "nocontent_style1";
                                        align: 0.5 0.5;
-                                       min: 0 0;
-                                       max: 0 1;
+                                       min: 1 0;
                                }
                        }
                }
@@ -79,10 +80,10 @@ group {
                name: "search_no_result";
                styles {
                        style { name: "nocontent_style1";
-                               base: "font=Tizen:style=Roman text_class=tizen font_size=22 align=center color=#000000 wrap=word";
+                               base: "font=Tizen:style=Roman text_class=tizen font_size=20 align=center color=#000000 wrap=word";
                                tag:  "br" "\n";
-                               tag:  "hilight" "+ font=Tizen:style=Bold text_class=tizen";
-                               tag:  "b" "+ font=Tizen:style=Bold text_class=tizen";
+                               tag:  "hilight" "+ font=Tizen:style=Regular text_class=tizen";
+                               tag:  "b" "+ font=Tizen:style=Regular text_class=tizen";
                                tag:  "tab" "\t";
                        }
                }
@@ -118,8 +119,8 @@ group {
                                        max: -1 26;
                                        fixed: 0 1;
                                        align: 0.5 0.0;
-                                       rel1 { relative: 0.0 0.7; to: "bg";}
-                                       rel2 { relative: 1.0 0.7; to: "bg";}
+                                       rel1 { relative: 0.0 40/720; to: "bg";}
+                                       rel2 { relative: 1.0 40/720; to: "bg";}
                                        color: 6 1 74 255;
                                        text {
                                                style: "nocontent_style1";
@@ -566,4 +567,4 @@ group {
          }
       }
    }
-}
+}
\ No newline at end of file

diff --git a/res/po/en.po b/res/po/en.po
index dc3df2e29b7efb5ed8132c187aac889d0b5b9e7a..d1fb09cd8767df80799ad499e633c383f405b1f7 100755 (executable)
--- a/res/po/en.po
+++ b/res/po/en.po
@@ -152,7 +152,7 @@ msgid "IDS_MUSIC_OPT_LYRICS_ABB"
 msgstr "Lyrics"
 
 msgid "IDS_MUSIC_POP_AFTER_YOU_ADD_TRACKS_TO_MUSIC_ON_YOUR_MOBILE_DEVICE_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you add tracks to Music on your mobile device, they will be shown here."
+msgstr "When tracks are added to [Music], they will be shown here."
 
 msgid "IDS_MUSIC_BODY_SAMPLING_RATE"
 msgstr "Sampling rate"
@@ -671,16 +671,16 @@ msgid "IDS_MUSIC_SK3_ADD_TRACKS"
 msgstr "Add tracks"
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_DOWNLOAD_TRACKS_FROM_MUSIC_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you download tracks from Music, they will be shown here."
+msgstr "When tracks are downloaded from [Music], they will be shown here."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_ADD_TRACKS_TO_YOUR_FAVOURITES_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you add tracks to your favourites, they will be shown here."
+msgstr "When tracks are added to [Favorites], they will be shown here."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_PLAY_TRACKS_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you play tracks, they will be shown here."
+msgstr "When tracks are played, they will be shown here."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_ADD_TRACKS_TO_PS_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you add tracks to %s, they will be shown here."
+msgstr "When tracks are added to %s, they will be shown here."
 
 msgid "IDS_MUSIC_BODY_NO_PURCHASED_CONTENT"
 msgstr "No purchased content"
@@ -761,7 +761,7 @@ msgid "IDS_MUSIC_OPT_REMOVE_FROM_PERSONAL_STORAGE"
 msgstr "Remove from personal storage"
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_DOWNLOAD_TRACKS_FOLDERS_WILL_BE_SHOWN"
-msgstr "After you download tracks, folders will be shown."
+msgstr "When tracks are downloaded, they will be shown in the folder."
 
 msgid "IDS_MUSIC_BODY_SETTINGS_VOLUME"
 msgstr "Volume"
@@ -1181,7 +1181,7 @@ msgid "IDS_MF_HEADER_PD_SELECTED"
 msgstr "%d selected"
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_ADD_TRACKS_TO_THIS_DEVICE_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you add tracks to this device, they will be shown here."
+msgstr "When tracks are added, they will be shown here."
 
 msgid "IDS_MUSIC_TMBODY_LENGTH"
 msgstr "Length"
@@ -1343,7 +1343,7 @@ msgid "IDS_VIDEO_POP_THE_FILE_TYPE_IS_NOT_SUPPORTED"
 msgstr "The file type is not supported."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_CREATE_PLAYLISTS_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you create playlists, they will be shown here."
+msgstr "When playlists are created, they will be shown here."
 
 msgid "IDS_ST_HEADER_SELECT_AUDIO_DEVICE_ABB"
 msgstr "Select audio device"

diff --git a/res/po/en_PH.po b/res/po/en_PH.po
index 3b7e894be41602688c374bbbfc3fc607ac6c32e9..889a2a4e4c2207f93ff243d79d7bce8056f1d908 100755 (executable)
--- a/res/po/en_PH.po
+++ b/res/po/en_PH.po
@@ -152,7 +152,7 @@ msgid "IDS_MUSIC_OPT_LYRICS_ABB"
 msgstr "Lyrics"
 
 msgid "IDS_MUSIC_POP_AFTER_YOU_ADD_TRACKS_TO_MUSIC_ON_YOUR_MOBILE_DEVICE_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you add tracks to Music on your mobile device, they will be shown here."
+msgstr "When tracks are added to [Music], they will be shown here."
 
 msgid "IDS_MUSIC_BODY_SAMPLING_RATE"
 msgstr "Sampling rate"
@@ -671,16 +671,16 @@ msgid "IDS_MUSIC_SK3_ADD_TRACKS"
 msgstr "Add tracks"
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_DOWNLOAD_TRACKS_FROM_MUSIC_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you download tracks from Music, they will be shown here."
+msgstr "When tracks are downloaded from [Music], they will be shown here."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_ADD_TRACKS_TO_YOUR_FAVOURITES_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you add tracks to your favorites, they will be shown here."
+msgstr "When tracks are added to [Favorites], they will be shown here."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_PLAY_TRACKS_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you play tracks, they will be shown here."
+msgstr "When tracks are played, they will be shown here."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_ADD_TRACKS_TO_PS_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you add tracks to %s, they will be shown here."
+msgstr "When tracks are added to %s, they will be shown here."
 
 msgid "IDS_MUSIC_BODY_NO_PURCHASED_CONTENT"
 msgstr "No purchased content"
@@ -761,7 +761,7 @@ msgid "IDS_MUSIC_OPT_REMOVE_FROM_PERSONAL_STORAGE"
 msgstr "Remove from personal storage"
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_DOWNLOAD_TRACKS_FOLDERS_WILL_BE_SHOWN"
-msgstr "After you download tracks, folders will be shown"
+msgstr "When tracks are downloaded, they will be shown in the folder."
 
 msgid "IDS_MUSIC_BODY_SETTINGS_VOLUME"
 msgstr "Volume"
@@ -1181,7 +1181,7 @@ msgid "IDS_MF_HEADER_PD_SELECTED"
 msgstr "%d selected"
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_ADD_TRACKS_TO_THIS_DEVICE_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you add tracks to this device, they will be shown here."
+msgstr "When tracks are added, they will be shown here."
 
 msgid "IDS_MUSIC_TMBODY_LENGTH"
 msgstr "Length"
@@ -1343,7 +1343,7 @@ msgid "IDS_VIDEO_POP_THE_FILE_TYPE_IS_NOT_SUPPORTED"
 msgstr "The file type is not supported."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_CREATE_PLAYLISTS_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you create playlists, they will be shown here."
+msgstr "When playlists are created, they will be shown here."
 
 msgid "IDS_ST_HEADER_SELECT_AUDIO_DEVICE_ABB"
 msgstr "Select audio device"

diff --git a/res/po/en_US.po b/res/po/en_US.po
index eb9763c7ea77ead573e2a72e876c6c7c7c56092d..03bad50ca5f723c7c5955e88e5fece161543f097 100755 (executable)
--- a/res/po/en_US.po
+++ b/res/po/en_US.po
@@ -74,7 +74,7 @@ msgid "IDS_MUSIC_SK_DONE"
 msgstr "Done"
 
 msgid "IDS_MUSIC_BODY_NO_ITEMS"
-msgstr "No items"
+msgstr "No Items Available"
 
 msgid "IDS_BR_OPT_ADD_TO_HOME"
 msgstr "Add to home"
@@ -125,7 +125,7 @@ msgid "IDS_MUSIC_BUTTON_DONT_ASK_AGAIN"
 msgstr "Don't ask again"
 
 msgid "IDS_MUSIC_BODY_NO_RESULTS_FOUND"
-msgstr "No results found."
+msgstr "No results found"
 
 msgid "IDS_VPL_OPT_HDMI"
 msgstr "HDMI"
@@ -152,7 +152,7 @@ msgid "IDS_MUSIC_OPT_LYRICS_ABB"
 msgstr "Lyrics"
 
 msgid "IDS_MUSIC_POP_AFTER_YOU_ADD_TRACKS_TO_MUSIC_ON_YOUR_MOBILE_DEVICE_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you add tracks to Music on your mobile device, they will be shown here."
+msgstr "When tracks are added to [Music], they will be shown here."
 
 msgid "IDS_MUSIC_BODY_SAMPLING_RATE"
 msgstr "Sampling rate"
@@ -671,16 +671,16 @@ msgid "IDS_MUSIC_SK3_ADD_TRACKS"
 msgstr "Add tracks"
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_DOWNLOAD_TRACKS_FROM_MUSIC_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you download tracks from Music, they will be shown here."
+msgstr "When tracks are downloaded from [Music], they will be shown here."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_ADD_TRACKS_TO_YOUR_FAVOURITES_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you add tracks to your favorites, they will be shown here."
+msgstr "When tracks are added to [Favorites], they will be shown here."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_PLAY_TRACKS_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you play tracks, they will be shown here."
+msgstr "When tracks are played, they will be shown here."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_ADD_TRACKS_TO_PS_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you add tracks to %s, they will be shown here."
+msgstr "When tracks are added to %s, they will be shown here."
 
 msgid "IDS_MUSIC_BODY_NO_PURCHASED_CONTENT"
 msgstr "No purchased content"
@@ -761,7 +761,7 @@ msgid "IDS_MUSIC_OPT_REMOVE_FROM_PERSONAL_STORAGE"
 msgstr "Remove from personal storage"
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_DOWNLOAD_TRACKS_FOLDERS_WILL_BE_SHOWN"
-msgstr "After you download tracks, folders will be shown."
+msgstr "When tracks are downloaded, they will be shown in the folder."
 
 msgid "IDS_MUSIC_BODY_SETTINGS_VOLUME"
 msgstr "Volume"
@@ -1181,7 +1181,7 @@ msgid "IDS_MF_HEADER_PD_SELECTED"
 msgstr "%d selected"
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_ADD_TRACKS_TO_THIS_DEVICE_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you add tracks to this device, they will be shown here."
+msgstr "When tracks are added, they will be shown here."
 
 msgid "IDS_MUSIC_TMBODY_LENGTH"
 msgstr "Length"
@@ -1343,7 +1343,7 @@ msgid "IDS_VIDEO_POP_THE_FILE_TYPE_IS_NOT_SUPPORTED"
 msgstr "The file type is not supported."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_CREATE_PLAYLISTS_THEY_WILL_BE_SHOWN_HERE"
-msgstr "After you create playlists, they will be shown here."
+msgstr "When playlists are created, they will be shown here."
 
 msgid "IDS_ST_HEADER_SELECT_AUDIO_DEVICE_ABB"
 msgstr "Select audio device"
@@ -1679,5 +1679,4 @@ msgid "IDS_IM_POP_MAXIMUM_SIZE_OF_FILES_EXCEEDED"
 msgstr "Maximum size of files exceeded."
 
 msgid "IDS_CAM_TPOP_UNABLE_TO_PLAY_MUSIC_WHILE_RECORDING_AUDIO_OR_VIDEO"
-msgstr "Unable to play music while recording audio or video."
-
+msgstr "Unable to play music while recording audio or video."
\ No newline at end of file

diff --git a/res/po/ko_KR.po b/res/po/ko_KR.po
index d7acf77588661a21442de58b67400942bb508875..e7f780b67afdcce9c95534ef30b313d16e71a534 100755 (executable)
--- a/res/po/ko_KR.po
+++ b/res/po/ko_KR.po
@@ -152,7 +152,7 @@ msgid "IDS_MUSIC_OPT_LYRICS_ABB"
 msgstr "가사"
 
 msgid "IDS_MUSIC_POP_AFTER_YOU_ADD_TRACKS_TO_MUSIC_ON_YOUR_MOBILE_DEVICE_THEY_WILL_BE_SHOWN_HERE"
-msgstr "모바일 디바이스에서 [뮤직]에 곡을 추가하면 여기에 표시됩니다."
+msgstr " [뮤직]에 곡을 추가하면 여기에 표시됩니다."
 
 msgid "IDS_MUSIC_BODY_SAMPLING_RATE"
 msgstr "샘플링 주파수"
@@ -671,7 +671,7 @@ msgid "IDS_MUSIC_SK3_ADD_TRACKS"
 msgstr "곡 추가"
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_DOWNLOAD_TRACKS_FROM_MUSIC_THEY_WILL_BE_SHOWN_HERE"
-msgstr "[뮤직]에서 다운로드한 곡은 여기에 표시됩니다."
+msgstr "[뮤직]에서 곡을 다운로드하면 여기에 표시됩니다."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_ADD_TRACKS_TO_YOUR_FAVOURITES_THEY_WILL_BE_SHOWN_HERE"
 msgstr "곡을 [즐겨찾기]에 추가하면 여기에 표시됩니다."
@@ -680,7 +680,7 @@ msgid "IDS_MUSIC_BODY_AFTER_YOU_PLAY_TRACKS_THEY_WILL_BE_SHOWN_HERE"
 msgstr "곡을 재생하면 여기에 표시됩니다."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_ADD_TRACKS_TO_PS_THEY_WILL_BE_SHOWN_HERE"
-msgstr "%s에 ì¶\94ê°\80í\95\9c 곡ì\9d\80 ì\97¬ê¸°ì\97\90 í\91\9cì\8b\9cí\95©ë\8b\88ë\8b¤."
+msgstr "%s에 곡ì\9d\84 ì¶\94ê°\80í\95\98ë©´ ì\97¬ê¸°ì\97\90 í\91\9cì\8b\9cë\90©ë\8b\88ë\8b¤."
 
 msgid "IDS_MUSIC_BODY_NO_PURCHASED_CONTENT"
 msgstr "구매한 컨텐츠가 없습니다"
@@ -761,7 +761,7 @@ msgid "IDS_MUSIC_OPT_REMOVE_FROM_PERSONAL_STORAGE"
 msgstr "퍼스널 저장공간에서 제거"
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_DOWNLOAD_TRACKS_FOLDERS_WILL_BE_SHOWN"
-msgstr "곡을 다운로드하면 폴더에 표시합니다."
+msgstr "곡을 다운로드 하면 폴더에 표시됩니다"
 
 msgid "IDS_MUSIC_BODY_SETTINGS_VOLUME"
 msgstr "음량"
@@ -1181,7 +1181,7 @@ msgid "IDS_MF_HEADER_PD_SELECTED"
 msgstr "%d개 선택"
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_ADD_TRACKS_TO_THIS_DEVICE_THEY_WILL_BE_SHOWN_HERE"
-msgstr "디바이스에 곡을 추가하면 여기에 표시됩니다."
+msgstr "곡을 추가하면 여기에 표시됩니다."
 
 msgid "IDS_MUSIC_TMBODY_LENGTH"
 msgstr "길이"
@@ -1343,7 +1343,7 @@ msgid "IDS_VIDEO_POP_THE_FILE_TYPE_IS_NOT_SUPPORTED"
 msgstr "지원되지 않는 파일 형식입니다."
 
 msgid "IDS_MUSIC_BODY_AFTER_YOU_CREATE_PLAYLISTS_THEY_WILL_BE_SHOWN_HERE"
-msgstr "ì\83\88 ì\9e¬ì\83\9d 목ë¡\9dì\9d\84 ì¶\94ê°\80í\95\98ë©´ ì\97¬ê¸°ì\97\90 í\91\9cì\8b\9cí\95©ë\8b\88ë\8b¤."
+msgstr "ì\9e¬ì\83\9d 목ë¡\9dì\9d\84 ì¶\94ê°\80í\95\98ë©´ ì\97¬ê¸°ì\97\90 í\91\9cì\8b\9cë\90©ë\8b\88ë\8b¤"
 
 msgid "IDS_ST_HEADER_SELECT_AUDIO_DEVICE_ABB"
 msgstr "오디오 디바이스 선택"

diff --git a/shared/res/org.tizen.music-player.png b/shared/res/org.tizen.music-player.png
index af9a3e15446f0e53895f27ff95dfde2aae2683c3..4c5603a14a7d188c8e94d112b66e2c910a10c1b3 100755 (executable)
Binary files a/shared/res/org.tizen.music-player.png and b/shared/res/org.tizen.music-player.png differ

diff --git a/src/common/mp-widget.c b/src/common/mp-widget.c
index 6ff6b532544703940a1b83df74f43b98e4e48ded..ddce7c0ec67a09fd9aa1a88ca1383f607f4fcdaa 100755 (executable)
--- a/src/common/mp-widget.c
+++ b/src/common/mp-widget.c
@@ -685,16 +685,16 @@ Evas_Object *mp_widget_create_no_contents(Evas_Object * parent,
                evas_object_show(content);
        } else {
                elm_layout_file_set(content, edje_path, "elm/layout/nocontents");
+               evas_object_size_hint_weight_set(content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_size_hint_align_set(content, EVAS_HINT_FILL, EVAS_HINT_FILL);
                Elm_Animation_View *anim_view = elm_animation_view_add(content);
-               evas_object_size_hint_min_set(anim_view, ELM_SCALE_SIZE(450), ELM_SCALE_SIZE(350)); // actual size : 810 630
+               evas_object_size_hint_min_set(anim_view, ELM_SCALE_SIZE(207), ELM_SCALE_SIZE(161)); // actual size : 810 630
                elm_animation_view_auto_play_set(anim_view, true);
                elm_animation_view_auto_repeat_set(anim_view, true);
                elm_animation_view_file_set(anim_view, json_path, NULL);
 
                elm_layout_content_set(content, "nocontents.anim.swallow", anim_view);
-
-               char *text = (type == MP_NOCONTENT_ARTISTS) ? STR_MP_NO_ARTISTS : STR_MP_NO_ALBUMS;
-               mp_util_domain_translatable_part_text_set(content, "elm.text", text);
+               mp_util_domain_translatable_part_text_set(content, "elm.text", STR_MP_NO_TRACKS);
                evas_object_show(content);
        }
 
@@ -967,4 +967,4 @@ bool mp_widget_create_select_all_layout(Evas_Object * pParent,
        SAFE_FREE(mtitle);
        return TRUE;
 
-}
+}
\ No newline at end of file

diff --git a/src/widget/mp-list.c b/src/widget/mp-list.c
index 38c9d06391188ff6d243b68feeaa6e49ad836218..68eefcdd559fadd320d85812692727a4116633b6 100755 (executable)
--- a/src/widget/mp-list.c
+++ b/src/widget/mp-list.c
@@ -513,7 +513,7 @@ void mp_list_init(MpList_t * list, Evas_Object * parent,
        if (list_type == MP_LIST_TYPE_TRACK || list_type == MP_LIST_TYPE_GROUP || list_type == MP_LIST_TYPE_ARTIST_DETAIL) {
           elm_object_part_content_set(list->layout, "track_list_content", list->box);
        } else if (list_type == MP_LIST_TYPE_PLAYLIST) {
-               elm_object_part_content_set(list->layout, "track_list_content", list->box);
+               elm_object_part_content_set(list->layout, "playlist_list_content", list->box);
        } else {
                elm_object_part_content_set(list->layout, "list_content", list->box);
        }
@@ -1043,4 +1043,4 @@ void mp_list_item_reorder_moved_cb(void *data, Evas_Object * obj,
                cur_sequence++;
        }
        mp_view_mgr_post_event(GET_VIEW_MGR, MP_REORDER_DISABLE);
-}
+}
\ No newline at end of file

diff --git a/src/widget/mp-playlist-list.c b/src/widget/mp-playlist-list.c
index 1db705236216e8506d0c6cc939330434c001557c..8f5a93b120f64b8e9578d6476d26246d9abc73e0 100755 (executable)
--- a/src/widget/mp-playlist-list.c
+++ b/src/widget/mp-playlist-list.c
@@ -1198,7 +1198,10 @@ static void _mp_playlist_list_update(void *thiz)
        evas_object_data_set(list->genlist, "list_handle", list);
        /* load list */
        _mp_playlist_list_load_list(thiz, count_auto, count_user);
+
        char *text = NULL;
+       int font_size = 22;
+       char result[DEF_STR_LEN + 1] = { 0, };
        unsigned int count = mp_list_get_editable_count((MpList_t *) list,
                                                                           mp_list_get_edit_type((MpList_t *)
                                                                                                                         list));
@@ -1209,7 +1212,13 @@ static void _mp_playlist_list_update(void *thiz)
        } else {
                text = g_strdup_printf(GET_STR(STR_MP_PD_PLAYLISTS), count);
        }
-       elm_object_text_set(list->playlist_count_label, text);
+       memset(result, 0x00, DEF_STR_LEN + 1);
+       snprintf(result, DEF_STR_LEN,
+                       "<align=left><font=BreezeSans:style=Regular font_size=%d><color=#000C2B>%s</color></font></align>",
+                       font_size ,text);
+       IF_FREE(text);
+       elm_object_text_set(list->playlist_count_label, result);
+
        MpAllView_t *view = (MpAllView_t *) thiz;
        MP_CHECK(view);
        mp_evas_object_del(view->more_btn_ctxpopup);
@@ -1315,7 +1324,7 @@ MpPlaylistList_t *mp_playlist_list_create(Evas_Object * parent)
        MP_CHECK_NULL(list);
 
        mp_list_init((MpList_t *) list, parent, MP_LIST_TYPE_PLAYLIST);
-       list->playlist_control_layout = mp_common_load_edj(((MpList_t *) list)->layout, MP_EDJ_NAME, "playlist_control_layout");
+       list->playlist_control_layout = mp_common_load_edj(((MpList_t *) list)->layout, MP_EDJ_NAME, "list_control_layout");
        elm_object_part_content_set(((MpList_t *) list)->layout, "control_part", list->playlist_control_layout);
        evas_object_show(list->playlist_control_layout);
 
@@ -1334,7 +1343,7 @@ MpPlaylistList_t *mp_playlist_list_create(Evas_Object * parent)
                _mp_playlist_list_bottom_counter_text_get_cb;
 
        list->playlist_count_label = elm_label_add(list->playlist_control_layout);
-       elm_object_text_set(list->playlist_count_label, "check");
+       elm_object_text_set(list->playlist_count_label, "");
        elm_object_part_content_set(list->playlist_control_layout, "label_part_swallow", list->playlist_count_label);
        evas_object_show(list->playlist_count_label);
 
@@ -1351,7 +1360,7 @@ MpPlaylistList_t *mp_playlist_list_create(Evas_Object * parent)
        elm_object_part_content_set(list->create_playlist_btn, "icon", img_play_all);
 
        elm_object_style_set(list->create_playlist_btn, "focus");
-       elm_object_part_content_set(list->playlist_control_layout, "create_playlist_part_swallow", list->create_playlist_btn);
+       elm_object_part_content_set(list->playlist_control_layout, "play_all_part_swallow", list->create_playlist_btn);
        evas_object_show(list->create_playlist_btn);
        evas_object_show(list->playlist_control_layout);
 
@@ -1441,4 +1450,4 @@ void mp_playlist_list_copy_data(MpPlaylistList_t * src,
        SAFE_FREE(dest->filter_str);
        dest->filter_str = g_strdup(src->filter_str);
        dest->display_mode = src->display_mode;
-}
+}
\ No newline at end of file

diff --git a/src/widget/mp-search-list.c b/src/widget/mp-search-list.c
index f3235197cf21d0e6be6744254632bcc515611202..3063725ed70fbd2a9a72f1f48465a8da958e6e79 100755 (executable)
--- a/src/widget/mp-search-list.c
+++ b/src/widget/mp-search-list.c
@@ -50,14 +50,14 @@ static Evas_Object *_mp_search_list_no_content_add(void *data)
        free(path);
 
        Elm_Animation_View *anim_view = elm_animation_view_add(no_contents);
-       evas_object_size_hint_min_set(anim_view, ELM_SCALE_SIZE(450), ELM_SCALE_SIZE(350)); // actual size : 810 630
+       evas_object_size_hint_min_set(anim_view, ELM_SCALE_SIZE(405), ELM_SCALE_SIZE(315)); // actual size : 810 630
        elm_animation_view_auto_play_set(anim_view, true);
        elm_animation_view_auto_repeat_set(anim_view, true);
        elm_animation_view_file_set(anim_view, json_path, NULL);
 
        evas_object_size_hint_weight_set(anim_view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_layout_content_set(no_contents, "nocontents.anim.swallow", anim_view);
-       // mp_util_domain_translatable_part_text_set(no_contents, "elm.text", STR_MP_NO_RESULTS_FOUND);
+       mp_util_domain_translatable_part_text_set(no_contents, "elm.text", STR_MP_NO_RESULTS_FOUND);
 
        if (list->genlist) {
                elm_box_unpack(list->box, list->genlist);
@@ -1166,4 +1166,4 @@ void mp_search_list_set_data(MpSearchList_t * list, ...)
        } while (field >= 0);
 
        va_end(var_args);
-}
+}
\ No newline at end of file

diff --git a/src/widget/mp-track-list.c b/src/widget/mp-track-list.c
index 2058ca1d670978e181f9de94b4931be08160deb4..7b5c53a9d72f41a8ea6114761b9305d801c8a11c 100755 (executable)
--- a/src/widget/mp-track-list.c
+++ b/src/widget/mp-track-list.c
@@ -1485,7 +1485,8 @@ static void _mp_track_list_update(void *thiz)
        PROFILE_OUT("mp_media_info_list_count");
        MP_CHECK(res == 0);
        list->track_count = count;
-       elm_object_text_set(list->tracks_count_label, _mp_track_list_shuffle_label_text_get(list));
+       if(count)
+               elm_object_text_set(list->tracks_count_label, _mp_track_list_shuffle_label_text_get(list));
 
        if (list->get_by_view == false) {
                mp_list_free_checked_path_list(list->checked_path_list);