projects / apps / osp / MusicPlayer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eb3f9d0)
[MusicPlayer] Fix search jira issue and change miniplayer, music player back, more...
authorMyunkyu <mk70.kang@partner.samsung.com>
Fri, 29 Mar 2013 06:11:12 +0000 (15:11 +0900)
committerMyunkyu <mk70.kang@partner.samsung.com>
Fri, 29 Mar 2013 06:11:12 +0000 (15:11 +0900)
Change-Id: I9c4d02d0739e13377bd392e4967cf3f36246b424

inc/MpAlbumListPresentationModel.h patch | blob | history
res/screen-size-normal/IDL_CONTENTS_LIBARY_PANEL.xml patch | blob | history
res/screen-size-normal/IDL_MINI_PLYAER_PANEL.xml patch | blob | history
res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml patch | blob | history
src/MpAlbumContentListForm.cpp patch | blob | history
src/MpAlbumListPresentationModel.cpp patch | blob | history
src/MpSearchForm.cpp patch | blob | history

diff --git a/inc/MpAlbumListPresentationModel.h b/inc/MpAlbumListPresentationModel.h
index e667100..7928a34 100644 (file)
--- a/inc/MpAlbumListPresentationModel.h
+++ b/inc/MpAlbumListPresentationModel.h
@@ -43,6 +43,7 @@ public:
 
        void AddContent(Tizen::Base::String path, int playlistIndex);
        result UpdateAlbumList(void);
+       int searchAlbumIndex(Tizen::Base::String& albumName);
 
 private:
        AlbumListPresentationModel(void);
diff --git a/res/screen-size-normal/IDL_CONTENTS_LIBARY_PANEL.xml b/res/screen-size-normal/IDL_CONTENTS_LIBARY_PANEL.xml
index bc9be29..0094460 100644 (file)
--- a/res/screen-size-normal/IDL_CONTENTS_LIBARY_PANEL.xml
+++ b/res/screen-size-normal/IDL_CONTENTS_LIBARY_PANEL.xml
@@ -3,7 +3,7 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.\r
 -->\r
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
-<ScenePanel Bversion="2.0.0.201302250944" Dversion="20120315">\r
+<ScenePanel Bversion="2.0.0.201303041025" Dversion="20120315">\r
     <Panel id="IDL_CONTENTS_LIBARY_PANEL">\r
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
         <layout height="456" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
@@ -11,8 +11,8 @@
     </Panel>\r
     <Panel id="IDC_MINI_PLAYER_REGISTER_BAR" parent="IDL_CONTENTS_LIBARY_PANEL">\r
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout bottomRelation="IDL_CONTENTS_LIBARY_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="456"/>\r
-        <layout bottomRelation="IDL_CONTENTS_LIBARY_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="800" x="0" y="600"/>\r
+        <layout bottomRelation="IDL_CONTENTS_LIBARY_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_CONTENTS_LIBARY_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="456"/>\r
+        <layout bottomRelation="IDL_CONTENTS_LIBARY_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_CONTENTS_LIBARY_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CONTENTS_LIBARY_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="800" x="0" y="600"/>\r
     </Panel>\r
     <TableView id="IDC_CONTENTS_TABLEVIEW" parent="IDL_CONTENTS_LIBARY_PANEL">\r
         <property backgroundColor="" backgroundColorOpacity="0" fastScrollIndex="ABCDEFGHIJKLMNOPQRSTUVWXYZ#0" itemDivider="true" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_FAST_SCROLL" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
diff --git a/res/screen-size-normal/IDL_MINI_PLYAER_PANEL.xml b/res/screen-size-normal/IDL_MINI_PLYAER_PANEL.xml
index 7218c10..501d931 100644 (file)
--- a/res/screen-size-normal/IDL_MINI_PLYAER_PANEL.xml
+++ b/res/screen-size-normal/IDL_MINI_PLYAER_PANEL.xml
@@ -9,20 +9,20 @@
         <layout height="236" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>\r
         <layout height="144" mode="Landscape" type="LAYOUT_RELATIVE" width="1280" x="0" y="0"/>\r
     </Panel>\r
+    <Button id="IDC_NEXT_CONTROL_BUTTON" parent="IDL_MINI_PLYAER_PANEL">\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_mini_control_circle_icon_next_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_mini_control_circle_button_01.png" normalBitmapPath="T02_mini_control_circle_icon_next.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_mini_control_circle_button_01_press.png" pressedBitmapPath="T02_mini_control_circle_icon_next_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="22" marginLeft="18" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="82" x="429" y="132"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="21" marginLeft="0" marginRight="138" marginTop="0" mode="Landscape" rightRelation="IDL_MINI_PLYAER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="82" x="1060" y="41"/>\r
+    </Button>\r
     <Button id="IDC_PALY_TOGGLE_CONTROL_BUTTON" parent="IDL_MINI_PLYAER_PANEL">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="T02_mini_control_circle_icon_play_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_mini_control_circle_button_02.png" normalBitmapPath="T02_mini_control_circle_icon_play.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_mini_control_circle_button_02_press.png" pressedBitmapPath="T02_mini_control_circle_icon_play_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_mini_control_circle_icon_play_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_mini_control_circle_button_02.png" normalBitmapPath="T02_mini_control_circle_icon_play.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_mini_control_circle_button_02_press.png" pressedBitmapPath="T02_mini_control_circle_icon_play_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
         <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="102" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="12" marginLeft="18" marginRight="18" marginTop="30" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="102" x="309" y="122"/>\r
-        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="102" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="11" marginLeft="0" marginRight="18" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="102" x="940" y="31"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="102" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="11" marginLeft="0" marginRight="18" marginTop="0" mode="Landscape" rightRelation="IDC_NEXT_CONTROL_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="102" x="940" y="31"/>\r
     </Button>\r
     <Button id="IDC_PREVIOUS_CONTROL_BUTTON" parent="IDL_MINI_PLYAER_PANEL">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_mini_control_circle_button_01.png" normalBitmapPath="T02_mini_control_circle_icon_previous.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_mini_control_circle_button_01_press.png" pressedBitmapPath="T02_mini_control_circle_icon_previous_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_mini_control_circle_button_01.png" normalBitmapPath="T02_mini_control_circle_icon_previous.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_mini_control_circle_button_01_press.png" pressedBitmapPath="T02_mini_control_circle_icon_previous_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
         <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MINI_PLYAER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="22" marginLeft="209" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="82" x="209" y="132"/>\r
-        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="21" marginLeft="0" marginRight="18" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="82" x="840" y="41"/>\r
-    </Button>\r
-    <Button id="IDC_NEXT_CONTROL_BUTTON" parent="IDL_MINI_PLYAER_PANEL">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="T02_mini_control_circle_icon_next_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_mini_control_circle_button_01.png" normalBitmapPath="T02_mini_control_circle_icon_next.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_mini_control_circle_button_01_press.png" pressedBitmapPath="T02_mini_control_circle_icon_next_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="22" marginLeft="18" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="82" x="429" y="132"/>\r
-        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="21" marginLeft="0" marginRight="138" marginTop="0" mode="Landscape" rightRelation="IDL_MINI_PLYAER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="82" x="1060" y="41"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="21" marginLeft="0" marginRight="18" marginTop="0" mode="Landscape" rightRelation="IDC_PALY_TOGGLE_CONTROL_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="82" x="840" y="41"/>\r
     </Button>\r
     <Label id="IDC_THUMBNAIL_INNER_STROKE" parent="IDL_MINI_PLYAER_PANEL">\r
         <property backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="10" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
@@ -46,8 +46,8 @@
     </Label>\r
     <Label id="IDC_CONTENTS_THUMBNAIL" parent="IDL_MINI_PLYAER_PANEL">\r
         <property backgroundBitmapPath="34_thumb_07.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="88" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MINI_PLYAER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="22" marginRight="0" marginTop="36" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_MINI_PLYAER_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="88" x="22" y="36"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="2" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="72" x="120" y="36"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="86" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MINI_PLYAER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="22" marginRight="0" marginTop="36" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_MINI_PLYAER_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="86" x="22" y="36"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="70" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="2" marginRight="0" marginTop="2" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_THUMBNAIL_INNER_STROKE" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="70" x="120" y="37"/>\r
     </Label>\r
     <Progress id="IDC_PROGRESS_BAR" parent="IDL_MINI_PLYAER_PANEL">\r
         <property backgroundColor="" barColor="" leftText="" max="100" min="0" rightText="" showValueState="true" value="0"/>\r
@@ -55,13 +55,13 @@
         <layout bottomRelation="IDC_THUMBNAIL_INNER_STROKE" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="45" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_THUMBNAIL_INNER_STROKE" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="14" marginRight="54" marginTop="0" mode="Landscape" rightRelation="IDC_PREVIOUS_CONTROL_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="PROGRESS_STYLE_NONE" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="580" x="206" y="64"/>\r
     </Progress>\r
     <Button id="IDC_BACK_BUTTON" parent="IDL_MINI_PLYAER_PANEL">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="music_btn_back_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="music_btn_back.png" normalBitmapPath="music_btn_back.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="music_btn_back_press.png" pressedBitmapPath="music_btn_back_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="23" marginLeft="0" marginRight="23" marginTop="0" mode="Portrait" rightRelation="IDL_MINI_PLYAER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="634" y="150"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="1195" y="45"/>\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_icon_Back_02_web.png" normalBitmapPath="00_icon_Back_02_web.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_icon_Back_02_press_web.png" pressedBitmapPath="00_icon_Back_02_press_web.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="17" marginLeft="0" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDL_MINI_PLYAER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="631" y="156"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="11" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_MINI_PLYAER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="1191" y="70"/>\r
     </Button>\r
     <Button id="IDC_MORE_CONTEXT_MENU_BUTTON" parent="IDL_MINI_PLYAER_PANEL">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_icon_more_ef.png" normalBitmapPath="00_icon_more_ef.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_icon_more_ef.png" pressedBitmapPath="00_icon_more_ef.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MINI_PLYAER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="25" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="25" y="153"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="15" y="44"/>\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="00_icon_more_dim_web.png" disabledBitmapPath="00_icon_more_dim_web.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_icon_more_web.png" normalBitmapPath="00_icon_more_web.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_icon_more_press_web.png" pressedBitmapPath="00_icon_more_press_web.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MINI_PLYAER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="17" marginLeft="26" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="156"/>\r
+        <layout bottomRelation="IDL_MINI_PLYAER_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MINI_PLYAER_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="11" marginLeft="26" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="70"/>\r
     </Button>\r
 </ScenePanel>\r
diff --git a/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml b/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml
index 9721c4f..c179fa5 100644 (file)
--- a/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml
+++ b/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml
@@ -22,7 +22,7 @@
     </Label>\r
     <Panel id="IDC_PLAYER_CONTROL_BAR" parent="IDL_MUSIC_PLAYER_FORM">\r
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout bottomRelation="IDL_MUSIC_PLAYER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="372" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="768"/>\r
+        <layout bottomRelation="IDL_MUSIC_PLAYER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="372" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="848"/>\r
         <layout bottomRelation="IDL_MUSIC_PLAYER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="367" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SPLIT_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="560" y="293"/>\r
     </Panel>\r
     <Button id="IDC_OPTION_VOLUMN" parent="IDC_PLAYER_CONTROL_BAR">\r
@@ -32,7 +32,7 @@
     </Button>\r
     <Button id="IDC_OPTION_SHUFFLE" parent="IDC_PLAYER_CONTROL_BAR">\r
         <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_option_shuffle_on_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_03.png" normalBitmapPath="T02_option_shuffle_on.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_03_press.png" pressedBitmapPath="T02_option_shuffle_on_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="28" marginRight="0" marginTop="18" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="144" y="18"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_OPTION_VOLUMN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="54" marginRight="0" marginTop="18" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="170" y="18"/>\r
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_OPTION_VOLUMN" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="54" marginRight="0" marginTop="18" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="170" y="18"/>\r
     </Button>\r
     <Button id="IDC_OPTION_PLAY_LIST_ADD" parent="IDC_PLAYER_CONTROL_BAR">\r
@@ -42,7 +42,7 @@
     </Button>\r
     <Button id="IDC_OPTION_REPEAT" parent="IDC_PLAYER_CONTROL_BAR">\r
         <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_option_rep_A_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_03.png" normalBitmapPath="T02_option_rep_A.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_03_press.png" pressedBitmapPath="T02_option_rep_A_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="28" marginRight="28" marginTop="18" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="486" y="18"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="28" marginRight="54" marginTop="18" mode="Portrait" rightRelation="IDC_OPTION_PLAY_LIST_ADD" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="460" y="18"/>\r
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="54" marginTop="18" mode="Landscape" rightRelation="IDC_OPTION_PLAY_LIST_ADD" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_PLAYER_CONTROL_BAR" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="90" x="460" y="18"/>\r
     </Button>\r
     <Label id="IDC_CURRENT_PLAYING_TIME" parent="IDC_PLAYER_CONTROL_BAR">\r
@@ -61,9 +61,9 @@
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_CURRENT_PLAYING_TIME" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDC_CONTENT_TOTAL_TIME" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_OPTION_VOLUMN" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="476" x="122" y="108"/>\r
     </Slider>\r
     <Button id="IDC_MORE_CONTEXT_MENU_BUTTON" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="00_icon_more_ef.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_icon_more_ef.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_icon_more_ef.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="26" marginRight="0" marginTop="375" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="289"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="16" marginLeft="26" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="288"/>\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_icon_more_web.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_icon_more_press_web.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="17" marginLeft="26" marginRight="0" marginTop="375" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="292"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PLAYER_CONTROL_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="11" marginLeft="26" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="26" y="293"/>\r
     </Button>\r
     <Button id="IDC_PALY_TOGGLE_CONTROL_BUTTON" parent="IDC_PLAYER_CONTROL_BAR">\r
         <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="T02_control_circle_icon_play_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T02_control_circle_button_01.png" normalBitmapPath="T02_control_circle_icon_play.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T02_control_circle_button_01_press.png" pressedBitmapPath="T02_control_circle_icon_play_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
@@ -81,9 +81,9 @@
         <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="122" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="32" marginLeft="0" marginRight="28" marginTop="0" mode="Landscape" rightRelation="IDC_PALY_TOGGLE_CONTROL_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="122" x="133" y="213"/>\r
     </Button>\r
     <Button id="IDC_BACK_BUTTON" parent="IDC_PLAYER_CONTROL_BAR">\r
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="music_btn_back_dim.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="music_btn_back.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="music_btn_back_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20" marginLeft="0" marginRight="26" marginTop="375" mode="Portrait" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="631" y="289"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="16" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="631" y="288"/>\r
+        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="00_icon_Back_02_web.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="00_icon_Back_02_press_web.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="17" marginLeft="0" marginRight="26" marginTop="375" mode="Portrait" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="631" y="292"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="11" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="631" y="293"/>\r
     </Button>\r
     <Label id="IDC_CONTENTS_ARTIST_NAME" parent="IDL_MUSIC_PLAYER_FORM">\r
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Artist Name" textColor="#4A4947" textSize="37" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
@@ -92,7 +92,7 @@
     </Label>\r
     <Panel id="IDC_PANEL_REGISTER_BAR" parent="IDL_MUSIC_PLAYER_FORM">\r
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
-        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="603" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="25" mode="Portrait" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_ARTIST_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="165"/>\r
+        <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="683" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="25" mode="Portrait" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONTENTS_ARTIST_NAME" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="165"/>\r
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="660" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="547" x="0" y="0"/>\r
     </Panel>\r
     <Label id="IDC_CONTENTS_TITLE_NAME" parent="IDL_MUSIC_PLAYER_FORM">\r
diff --git a/src/MpAlbumContentListForm.cpp b/src/MpAlbumContentListForm.cpp
index 597068e..8f42350 100644 (file)
--- a/src/MpAlbumContentListForm.cpp
+++ b/src/MpAlbumContentListForm.cpp
@@ -186,11 +186,19 @@ AlbumContentListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previo
        if (pArgs != null)
        {
                __prevSceneId.Append(*static_cast<String*>(pArgs->GetAt(DATA_ITEM_SCENE_NAME)));
-//             String* pStrContentName = static_cast<String*>(pArgs->GetAt(DATA_ITEM_CONTENT_NAME));
-               __currentAlbumIndex = static_cast<Integer*>(pArgs->GetAt(DATA_ITEM_CONTENT_TYPE))->ToInt();
-
                __pPresentationModel = AlbumListPresentationModel::GetInstance();
                __pPresentationModel->UpdateAlbumList();
+
+               if (__prevSceneId.Equals(IDSCN_SEARCH, false))
+               {
+                       String* pStrAlbumName = static_cast<String*>(pArgs->GetAt(DATA_ITEM_CONTENT_NAME));
+                       __currentAlbumIndex = __pPresentationModel->searchAlbumIndex(*pStrAlbumName);
+               }
+               else
+               {
+                       __currentAlbumIndex = static_cast<Integer*>(pArgs->GetAt(DATA_ITEM_CONTENT_TYPE))->ToInt();
+               }
+
                __pPresentationModel->InitializeContentList(__currentAlbumIndex);
 
                __headerTitle.Format(255, __pPresentationModel->GetAlbumName(__currentAlbumIndex)->GetPointer());
diff --git a/src/MpAlbumListPresentationModel.cpp b/src/MpAlbumListPresentationModel.cpp
index 4204e9e..df12f30 100644 (file)
--- a/src/MpAlbumListPresentationModel.cpp
+++ b/src/MpAlbumListPresentationModel.cpp
@@ -346,4 +346,22 @@ AlbumListPresentationModel::UpdateAlbumList(void)
 
 CATCH:
        return r;
+}
+
+int
+AlbumListPresentationModel::searchAlbumIndex(Tizen::Base::String& albumName)
+{
+       AppLogDebug("ENTER");
+       int albumIndex = 0;
+       String* ptemp = null;
+       for (int i = 0; i < __pAlbumList->GetCount(); i++)
+       {
+               ptemp = static_cast<String*>(__pAlbumList->GetAt(i));
+               if (albumName.Equals(*ptemp,true))
+               {
+                       return i;
+               }
+       }
+       AppLogDebug("EXIT");
+       return albumIndex;
 }
\ No newline at end of file
diff --git a/src/MpSearchForm.cpp b/src/MpSearchForm.cpp
index a7c8d5d..aa38b3a 100644 (file)
--- a/src/MpSearchForm.cpp
+++ b/src/MpSearchForm.cpp
@@ -379,14 +379,10 @@ SearchForm::OnTableViewItemStateChanged(Tizen::Ui::Controls::TableView& tableVie
        {
                pContentInfo = __pPresentationModel->GetContentInfoN(itemIndex);
 
-               String temp;
-               temp = CommonUtil::SpecialReplaceChange(pContentInfo->AlbumName);
-               temp = CommonUtil::MakeQuery(STRING_SORT_ALBUM, temp);
-
                ArrayList* pData = new (std::nothrow) ArrayList();
                pData->Construct();
                pData->Add(*(new (std::nothrow) String(IDSCN_SEARCH)));
-               pData->Add(*(new (std::nothrow) String(temp)));
+               pData->Add(*(new (std::nothrow) String(pContentInfo->AlbumName)));
                pData->Add(*(new (std::nothrow) Integer(itemIndex)));
 
                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_CONTENT_LIST), pData);
Domain: Applications / Uncategorized;