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

[PVR][guiinfo][Estuary] Recordings window: Introduce a content view filter #11704

Merged
merged 1 commit into from
Feb 23, 2017

Conversation

ksooo
Copy link
Member

@ksooo ksooo commented Feb 19, 2017

Recordings window: Introduce a content view filter (all|watched|unwatched), like already existing for videos and tv shows.

screenshot000
screenshot001

This was runtime tested on latest kodi master on macOS.

@Jalle19 for review, please?

@ksooo ksooo added Type: Feature non-breaking change which adds functionality Component: PVR v18 Leia labels Feb 19, 2017
@ksooo ksooo added this to the L 18.0-alpha1 milestone Feb 19, 2017
@ksooo ksooo requested a review from Jalle19 February 19, 2017 16:21
#. Label for filtered recordings view value: 'show only watched'
#: xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
msgctxt "#19299"
msgid "Watched"

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

@ksooo ksooo force-pushed the pvr-recordings-viewfilter branch 2 times, most recently from e3ac55a to e4c1960 Compare February 19, 2017 16:56
…ilter (all|watched|unwatched), like already existing for videos.
@ksooo ksooo changed the title [PVR] Recordings window: Introduce a content view filter [PVR][guiinfo][Estuary] Recordings window: Introduce a content view filter Feb 19, 2017
@ksooo
Copy link
Member Author

ksooo commented Feb 22, 2017

@ronie headsup: new infolabel: Container.NonFolderItems => https://github.com/xbmc/xbmc/pull/11704/files#diff-127e5f2786eb19ac8e0e2f04b3bf8306R2345

@phil65, @ronie are the skin changes okay?

@ronie
Copy link
Member

ronie commented Feb 22, 2017

thx for the headsup!
skin changes look sane to me.

@ksooo ksooo merged commit 6276b96 into xbmc:master Feb 23, 2017
@ksooo ksooo deleted the pvr-recordings-viewfilter branch February 23, 2017 06:48
{
unsigned int numItems = GetNumItems();
if (info == CONTAINER_NUM_ITEMS && numItems && m_items[0]->IsFileItem() && (std::static_pointer_cast<CFileItem>(m_items[0]))->IsParentFolder())
label = StringUtils::Format("%u", numItems-1);
else if (info == CONTAINER_NONFOLDER_ITEMS)

This comment was marked as spam.

This comment was marked as spam.

@@ -2400,6 +2407,7 @@ const infomap container_bools[] ={{ "onnext", CONTAINER_MOVE_NEXT },
{ "numpages", CONTAINER_NUM_PAGES },
{ "numitems", CONTAINER_NUM_ITEMS },
{ "actualitems", CONTAINER_ACTUAL_ITEMS },
{ "nonfolderitems", CONTAINER_NONFOLDER_ITEMS },
{ "currentpage", CONTAINER_CURRENT_PAGE },

This comment was marked as spam.

This comment was marked as spam.

@xhaggi
Copy link
Member

xhaggi commented Feb 23, 2017

A bit late but you are too fast in merging new stuff.

@xhaggi
Copy link
Member

xhaggi commented Feb 23, 2017

Next time it would be good to separate gui related changes from skin changes. It will make things a bit easier to spot.

@ksooo
Copy link
Member Author

ksooo commented Feb 24, 2017

I'm not too fast. If I'm not allowed to work with that speed I will stop working at all. The current speed is what keeps me happy with the project. ;-)

And honestly, what you are saying is not wrong, but as I always use the subject line to tag what is effected and I always use the respective tags I do not see a real benefit in splitting a few lines PR in separate commits - this is, well, bureaucracy.

@xhaggi
Copy link
Member

xhaggi commented Mar 13, 2017

Any intention to address my comments? If not I'll do it on my own.

@ksooo
Copy link
Member Author

ksooo commented Mar 13, 2017

Any intention to address my comments? If not I'll do it on my own.

Sorry, I simply overlooked your comments. Please beautify the logic in GUIBaseContainer if you feel like this, but imo it is not okay to change the name of the GUI label, because "numfileitems" does not describe precisely the semantics of the new label.

@xhaggi
Copy link
Member

xhaggi commented Mar 13, 2017

I'm currently working on it.

but imo it is not okay to change the name of the GUI label, because "numfileitems" does not describe precisely the semantics of the new label.

Agree, but I'll add the num to the GUI info label so it becomes NumNonFolderItems.

xhaggi added a commit that referenced this pull request Mar 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants