Fixed jira issue

Change-Id: I41991d01611091f4c404382a962b8bfdbe3e347d

diff --git a/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml b/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml
index 7c797e1..6fae110 100644 (file)
--- a/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml
+++ b/res/screen-size-normal/IDL_MUSIC_PLAYER_FORM.xml
@@ -3,7 +3,7 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.\r
 -->\r
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">\r
-<Scene Bversion="2.0.0.201304241225" Dversion="20120315">\r
+<Scene Bversion="2.0.0.201304261606" Dversion="20120315">\r
     <LogicalCoordinate>720</LogicalCoordinate>\r
     <Form id="IDL_MUSIC_PLAYER_FORM">\r
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>\r
@@ -80,6 +80,16 @@
         <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="17.0" marginLeft="0.0" marginRight="26.0" marginTop="375.0" mode="Portrait" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="631.0" y="292.0"/>\r
         <layout bottomRelation="IDC_PLAYER_CONTROL_BAR" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="11.0" marginLeft="0.0" marginRight="26.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PLAYER_CONTROL_BAR" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="644.0" y="293.0"/>\r
     </Button>\r
+    <Label id="IDC_CONTENTS_TITLE_NAME" parent="IDL_MUSIC_PLAYER_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#3B73B6" textSize="56.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="32.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="594.0" x="16.0" y="32.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="560.0" marginRight="16.0" marginTop="32.0" mode="Landscape" rightRelation="IDC_CONTENTS_VIEW_TOGGLE_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="615.0" x="560.0" y="32.0"/>\r
+    </Label>\r
+    <Label id="IDC_CONTENTS_ARTIST_NAME" parent="IDL_MUSIC_PLAYER_FORM">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#4A4947" textSize="37.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="44.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_CONTENTS_TITLE_NAME" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_CONTENTS_TITLE_NAME" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="594.0" x="16.0" y="100.0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="40.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_CONTENTS_TITLE_NAME" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_CONTENTS_TITLE_NAME" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="615.0" x="560.0" y="100.0"/>\r
+    </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="IDL_MUSIC_PLAYER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="679.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="372.0" marginLeft="0.0" marginRight="0.0" marginTop="25.0" 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.0" x="0.0" y="169.0"/>\r
@@ -90,14 +100,4 @@
         <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="13.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="755.0"/>\r
         <layout bottomRelation="IDL_MUSIC_PLAYER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="699.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL_REGISTER_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="13.0" x="547.0" y="0.0"/>\r
     </Label>\r
-    <Label id="IDC_CONTENTS_TITLE_NAME" parent="IDL_MUSIC_PLAYER_FORM">\r
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#3B73B6" textSize="56.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MUSIC_PLAYER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="32.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="594.0" x="16.0" y="32.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SPLIT_BAR" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="26.0" marginRight="16.0" marginTop="32.0" mode="Landscape" rightRelation="IDC_CONTENTS_VIEW_TOGGLE_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_MUSIC_PLAYER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="602.0" x="573.0" y="32.0"/>\r
-    </Label>\r
-    <Label id="IDC_CONTENTS_ARTIST_NAME" parent="IDL_MUSIC_PLAYER_FORM">\r
-        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#4A4947" textSize="37.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="44.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_CONTENTS_TITLE_NAME" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="110.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="594.0" x="16.0" y="100.0"/>\r
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="40.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_CONTENTS_TITLE_NAME" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="106.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_MUSIC_PLAYER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="601.0" x="573.0" y="100.0"/>\r
-    </Label>\r
 </Scene>\r

diff --git a/src/MpFolderContentListForm.cpp b/src/MpFolderContentListForm.cpp
index a6c9006..9b0a449 100644 (file)
--- a/src/MpFolderContentListForm.cpp
+++ b/src/MpFolderContentListForm.cpp
@@ -559,7 +559,7 @@ FolderContentListForm::CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& p
        phonePath.Remove(IDS_STORAGE_PHONE_PATH.GetLength() - 1, 1);
 
        String sdCardPath = IDS_STORAGE_SDCARD_PATH;
-       phonePath.Remove(IDS_STORAGE_SDCARD_PATH.GetLength() - 1, 1);
+       sdCardPath.Remove(IDS_STORAGE_SDCARD_PATH.GetLength() - 1, 1);
 
        if (filePath.Contains(phonePath))
        {

diff --git a/src/MpFolderListEditorPanel.cpp b/src/MpFolderListEditorPanel.cpp
index d28c20e..97056bc 100644 (file)
--- a/src/MpFolderListEditorPanel.cpp
+++ b/src/MpFolderListEditorPanel.cpp
@@ -335,7 +335,7 @@ FolderListEditorPanel::CreateTableViewItem(Tizen::Ui::Container& parent, const T
        phonePath.Remove(IDS_STORAGE_PHONE_PATH.GetLength() - 1, 1);
 
        String sdCardPath = IDS_STORAGE_SDCARD_PATH;
-       phonePath.Remove(IDS_STORAGE_SDCARD_PATH.GetLength() - 1, 1);
+       sdCardPath.Remove(IDS_STORAGE_SDCARD_PATH.GetLength() - 1, 1);
 
        if (contentPath.Contains(phonePath))
        {

diff --git a/src/MpFolderListPanel.cpp b/src/MpFolderListPanel.cpp
index 67c828f..59f8a93 100644 (file)
--- a/src/MpFolderListPanel.cpp
+++ b/src/MpFolderListPanel.cpp
@@ -342,7 +342,7 @@ FolderListPanel::CreateTableViewItem(Tizen::Ui::Container& parent, const Tizen::
        phonePath.Remove(IDS_STORAGE_PHONE_PATH.GetLength() - 1, 1);
 
        String sdCardPath = IDS_STORAGE_SDCARD_PATH;
-       phonePath.Remove(IDS_STORAGE_SDCARD_PATH.GetLength() - 1, 1);
+       sdCardPath.Remove(IDS_STORAGE_SDCARD_PATH.GetLength() - 1, 1);
 
        if (contentPath.Contains(phonePath))
        {