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

[VideoVersion] Added VideoVersionPlay dialog #24132

Merged
merged 1 commit into from Nov 23, 2023
Merged

[VideoVersion] Added VideoVersionPlay dialog #24132

merged 1 commit into from Nov 23, 2023

Conversation

xodidox
Copy link
Contributor

@xodidox xodidox commented Nov 23, 2023

Description

Added VideoVersionPlay dialog to give more flexibility to skinner
Added description for string to help translator

Motivation and context

Based on feedback

How has this been tested?

Runtime tested on MacBook

What is the effect on users?

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Clean up (non-breaking change which removes non-working, unmaintained functionality)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that will cause existing functionality to change)
  • Cosmetic change (non-breaking change that doesn't touch code)
  • Student submission (PR was done for educational purposes and will be treated as such)
  • None of the above (please explain below)

Checklist:

  • My code follows the Code Guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the Contributing document
  • I have added tests to cover my change
  • All new and existing tests passed

@ksooo
Copy link
Member

ksooo commented Nov 23, 2023

Hi, @xodidox

Added description for string to help translator

That's not going to work like you want. Weblate does not support a group comment for multiple strings (As far as I know). Translaters never look at the strings.po directly, they are using Weblate. The string you've added will be displayed in Weblate along with string #40400. You need to add a descriptive text (.# ) for every single string.

Added VideoVersionPlay dialog to give more flexibility to skinner

This dialog seems to be a dummy, without any functionality. What exactly can skinners make out of that? My skinning skills are really limited, so I'm just asking.

EDIT: nvm, overlooked that this is not a new dialog class.

@ksooo ksooo added Type: Improvement non-breaking change which improves existing functionality Component: Video v21 Omega labels Nov 23, 2023
@ksooo ksooo added this to the Omega 21.0 Beta 2 milestone Nov 23, 2023
@@ -23918,7 +23918,7 @@ msgctxt "#40207"
msgid "When enabled, video with multiple versions will be shown as folder in library, this folder can then be opened to display the individual video versions. When disabled, a video version dialog will be opened for the video."
msgstr ""

# Video versions
#. System defined video version (for example, "Director's Cut") list
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not going to work. See my other comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll update this. The discussion for VideoVersionPlay
is from https://forum.kodi.tv/showthread.php?tid=337992&pid=3172621#pid3172621

@da-anda
Copy link
Member

da-anda commented Nov 23, 2023

in order for your PRs to be easer to review it would be good if you could split up the changes into logical commits. Like in this PR one commit for the dialog and a second commit for the label descriptions. Since this PR is rather small, it might be a good exercise on the workflow for this, in case you are not that familiar with GIT yet.

@ksooo
Copy link
Member

ksooo commented Nov 23, 2023

Yes, that would indeed be helpful, to back what @da-anda said.

@jjd-uk
Copy link
Member

jjd-uk commented Nov 23, 2023

I've done a functional test, and it does exactly what me and @HitcherUK asked for. Thanks @xodidox

@Hitcher Hitcher self-requested a review November 23, 2023 16:13
Copy link
Contributor

@Hitcher Hitcher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested videoversion and videoversionplay windows and everything works as excepted.

I guess you can drop the label (id1) now as skins can use Window.IsActive(videoversion) or Window.IsActive(videoversionplay) for conditions.

Thanks.

@ksooo ksooo merged commit 6058e9f into xbmc:master Nov 23, 2023
2 checks passed
@xodidox
Copy link
Contributor Author

xodidox commented Nov 25, 2023

in order for your PRs to be easer to review it would be good if you could split up the changes into logical commits. Like in this PR one commit for the dialog and a second commit for the label descriptions. Since this PR is rather small, it might be a good exercise on the workflow for this, in case you are not that familiar with GIT yet.

Thanks for this tip. I'm not sure when and how, but I got the impression that each PR should only have one commit for Kodi repo. Maybe I was asked to squash commits? Don't remember. I'll adopt this in future PRs.

@jjd-uk
Copy link
Member

jjd-uk commented Nov 26, 2023

For review it's easier for the changes to be in logical chunks. Once review is complete and PR is ready to be merged then it can be squashed down to one commit.

@ksooo
Copy link
Member

ksooo commented Nov 26, 2023

The point is one commit per logical change , not one commit per PR. A PR can contain multiple logical changes, for example fix A and cleanup B. We want to have separate commits for those changes, one for the fix one for the cleanup.

@jurialmunkey
Copy link

Thanks for this tip. I'm not sure when and how, but I got the impression that each PR should only have one commit for Kodi repo. Maybe I was asked to squash commits? Don't remember. I'll adopt this in future PRs.

Possibly the confusion stems from the plugins and scripts addon repos having this requirement to squash first. If you've ever submitted an addon update then you would've been asked to squash
https://github.com/xbmc/repo-plugins/blob/master/CONTRIBUTING.md#general-guidelines-for-creating-pull-requests
https://github.com/xbmc/repo-scripts/blob/master/CONTRIBUTING.md#general-guidelines-for-creating-pull-requests

I have a feeling this is a relic from before github introduced the "squash and merge" button.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Video Feature: Video Versions/Extras Type: Improvement non-breaking change which improves existing functionality v21 Omega
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants