Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix description label in select dialog #9610

Merged
merged 1 commit into from Apr 14, 2016
Merged

fix description label in select dialog #9610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions addons/skin.estuary/1080i/DialogSelect.xml
View file
Open in desktop
Expand Up @@ -83,7 +83,7 @@
<height>60</height>
<font>font12</font>
<textcolor>grey</textcolor>
<label>$INFO[ListItem.AddonSummary]</label>
<label>$INFO[ListItem.Label2]</label>
</control>
</itemlayout>
<focusedlayout height="125" width="880">
Expand Down Expand Up @@ -128,7 +128,7 @@
<height>60</height>
<font>font12</font>
<textcolor>grey</textcolor>
<label>$INFO[ListItem.AddonSummary]</label>
<label>$INFO[ListItem.Label2]</label>
</control>
</focusedlayout>
</control>
Expand Down
4 changes: 2 additions & 2 deletions xbmc/addons/GUIDialogAddonInfo.cpp
View file
Open in desktop
Expand Up @@ -283,13 +283,13 @@ void CGUIDialogAddonInfo::OnUpdate()
AddonPtr repo;
if (versionInfo.second == LOCAL_CACHE)
{
item.SetProperty("Addon.Summary", g_localizeStrings.Get(24095));
item.SetLabel2(g_localizeStrings.Get(24095));
item.SetIconImage("DefaultAddonRepository.png");
dialog->Add(item);
}
else if (CAddonMgr::GetInstance().GetAddon(versionInfo.second, repo, ADDON_REPOSITORY))
{
item.SetProperty("Addon.Summary", repo->Name());
item.SetLabel2(repo->Name());
item.SetIconImage(repo->Icon());
dialog->Add(item);
}
Expand Down
1 change: 1 addition & 0 deletions xbmc/addons/GUIWindowAddonBrowser.cpp
View file
Open in desktop
Expand Up @@ -431,6 +431,7 @@ int CGUIWindowAddonBrowser::SelectAddonID(const std::vector<ADDON::TYPE> &types,
for (ADDON::IVECADDONS addon = addons.begin(); addon != addons.end(); ++addon)
{
CFileItemPtr item(CAddonsDirectory::FileItemFromAddon(*addon, (*addon)->ID()));
item->SetLabel2((*addon)->Summary());
if (!items.Contains(item->GetPath()))
{
items.Add(item);
Expand Down
2 changes: 0 additions & 2 deletions xbmc/filesystem/AddonsDirectory.cpp
View file
Open in desktop
Expand Up @@ -656,8 +656,6 @@ CFileItemPtr CAddonsDirectory::FileItemFromAddon(const AddonPtr &addon,
//TODO: fix hacks that depends on these
item->SetProperty("Addon.ID", addon->ID());
item->SetProperty("Addon.Name", addon->Name());
item->SetProperty("Addon.Version", addon->Version().asString());
item->SetProperty("Addon.Summary", addon->Summary());
const auto it = addon->ExtraInfo().find("language");
if (it != addon->ExtraInfo().end())

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

item->SetProperty("Addon.Language", it->second);
Expand Down
2 changes: 1 addition & 1 deletion xbmc/filesystem/BlurayDirectory.cpp
View file
Open in desktop
Expand Up @@ -74,7 +74,7 @@ CFileItemPtr CBlurayDirectory::GetTitle(const BLURAY_TITLE_INFO* title, const st
item->m_strTitle = buf;
item->SetLabel(buf);
chap = StringUtils::Format(g_localizeStrings.Get(25007).c_str(), title->chapter_count, StringUtils::SecondsToTimeString(duration).c_str());
item->SetProperty("Addon.Summary", chap);
item->SetProperty("Description", chap);

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

item->m_dwSize = 0;
item->SetIconImage("DefaultVideo.png");
for(unsigned int i = 0; i < title->clip_count; ++i)
Expand Down
2 changes: 1 addition & 1 deletion xbmc/peripherals/bus/PeripheralBus.cpp
View file
Open in desktop
Expand Up @@ -301,7 +301,7 @@ void CPeripheralBus::GetDirectory(const std::string &strPath, CFileItemList &ite
strDetails = StringUtils::Format("%s: %s", g_localizeStrings.Get(126).c_str(), g_localizeStrings.Get(13106).c_str());

peripheralFile->SetProperty("version", strVersion);
peripheralFile->SetProperty("Addon.Summary", strDetails);
peripheralFile->SetLabel2(strDetails);
peripheralFile->SetIconImage("DefaultAddon.png");
items.Add(peripheralFile);
}
Expand Down
3 changes: 2 additions & 1 deletion xbmc/profiles/windows/GUIWindowSettingsProfile.cpp
View file
Open in desktop
Expand Up @@ -251,7 +251,7 @@ bool CGUIWindowSettingsProfile::GetAutoLoginProfileChoice(int &iProfile)
const CProfile *profile = CProfilesManager::GetInstance().GetProfile(i);
std::string locked = g_localizeStrings.Get(profile->getLockMode() > 0 ? 20166 : 20165);
CFileItemPtr item(new CFileItem(profile->getName()));
item->SetProperty("Addon.Summary", locked); // lock setting
item->SetLabel2(locked); // lock setting
std::string thumb = profile->getThumb();
if (thumb.empty())
thumb = "DefaultUser.png";
Expand All @@ -261,6 +261,7 @@ bool CGUIWindowSettingsProfile::GetAutoLoginProfileChoice(int &iProfile)

dialog->SetHeading(CVariant{20093}); // Profile name
dialog->Reset();
dialog->SetUseDetails(true);
dialog->SetItems(items);
dialog->SetSelected(autoLoginProfileId);
dialog->Open();
Expand Down