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.

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

fix description label in select dialog #9610

Merged
merged 1 commit into from Apr 14, 2016

Conversation

Projects
None yet
5 participants
@tamland
Copy link
Member

commented Apr 12, 2016

Removes the 'addon.summary' properties abused by non-addon items in the select dialog which (surprise!) broke in a recent skin refactor. @phil65 fyi.

@tamland tamland added the Type: Fix label Apr 12, 2016

@@ -83,7 +83,7 @@
<height>60</height>
<font>font12</font>
<textcolor>grey</textcolor>
<label>$INFO[ListItem.AddonSummary]</label>
<label>$INFO[ListItem.Property(Description)]</label>

This comment has been minimized.

Copy link
@Razzeee

Razzeee Apr 12, 2016

Member

This also needs to be PRed against the estuary repo

This comment has been minimized.

Copy link
@phil65

phil65 Apr 12, 2016

Member

Not needed, will take care of this.

@phil65

This comment has been minimized.

Copy link
Member

commented Apr 12, 2016

+1. Alternative would be to use "listitem.label2" for that sublabel, that is perhaps more in line with the rest of the skinning world.

@ronie

This comment has been minimized.

Copy link
Member

commented Apr 12, 2016

+1 and what @phil65 said :-)

@tamland tamland force-pushed the tamland:fix_select_dialog branch from acfe7b4 to 3e8d302 Apr 13, 2016

@tamland tamland force-pushed the tamland:fix_select_dialog branch from 3e8d302 to e0386c1 Apr 13, 2016

@tamland

This comment has been minimized.

Copy link
Member Author

commented Apr 13, 2016

ok, changed it to use label2
jenkins build this please

@phil65

This comment has been minimized.

Copy link
Member

commented Apr 13, 2016

For reference: xbmc/skin.estuary@8db76d4

@tamland tamland merged commit f5f85d7 into xbmc:master Apr 14, 2016

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
default Merged build finished.
Details

@tamland tamland deleted the tamland:fix_select_dialog branch Apr 14, 2016

@@ -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 has been minimized.

Copy link
@phil65

phil65 Apr 14, 2016

Member

you missed this one here.

This comment has been minimized.

Copy link
@tamland

tamland Apr 14, 2016

Author Member

thanks! i've pushed a fix to master

@@ -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());

This comment has been minimized.

Copy link
@phil65

phil65 Apr 14, 2016

Member

...and here, too? or is there already a label2?

This comment has been minimized.

Copy link
@tamland

tamland Apr 14, 2016

Author Member

That one should be correct. this was the last thing using those properties.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.