diff --git a/addons/skin.confluence/720p/DialogVideoInfo.xml b/addons/skin.confluence/720p/DialogVideoInfo.xml index 279eb5a5bec7d..3110711850240 100644 --- a/addons/skin.confluence/720p/DialogVideoInfo.xml +++ b/addons/skin.confluence/720p/DialogVideoInfo.xml @@ -892,6 +892,7 @@ button-nofocus.png + Actor and Role 10 0 410 @@ -900,7 +901,7 @@ left center white - ListItem.Label + @@ -921,6 +922,7 @@ button-focus2.png + Actor and Role 10 0 410 @@ -929,7 +931,7 @@ left center white - ListItem.Label + diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp index 6abb95c15a847..433bd1d4fe0fa 100644 --- a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp +++ b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp @@ -177,12 +177,7 @@ bool CGUIDialogVideoInfo::OnMessage(CGUIMessage& message) if (iItem < 0 || iItem >= m_castList->Size()) break; std::string strItem = m_castList->Get(iItem)->GetLabel(); - std::string strFind = StringUtils::Format(" %s ",g_localizeStrings.Get(20347).c_str()); - size_t iPos = strItem.find(strFind); - if (iPos == std::string::npos) - iPos = strItem.size(); - std::string tmp = strItem.substr(0, iPos); - OnSearch(tmp); + OnSearch(strItem); } } } @@ -276,11 +271,6 @@ void CGUIDialogVideoInfo::SetMovie(const CFileItem *item) { // movie/show/episode for (CVideoInfoTag::iCast it = m_movieItem->GetVideoInfoTag()->m_cast.begin(); it != m_movieItem->GetVideoInfoTag()->m_cast.end(); ++it) { - std::string character; - if (it->strRole.empty()) - character = it->strName; - else - character = StringUtils::Format("%s %s %s", it->strName.c_str(), g_localizeStrings.Get(20347).c_str(), it->strRole.c_str()); CFileItemPtr item(new CFileItem(it->strName)); if (!it->thumb.empty()) item->SetArt("thumb", it->thumb); @@ -294,7 +284,8 @@ void CGUIDialogVideoInfo::SetMovie(const CFileItem *item) } } item->SetIconImage("DefaultActor.png"); - item->SetLabel(character); + item->SetLabel(it->strName); + item->SetLabel2(it->strRole); m_castList->Add(item); } // determine type: