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

Clip: Restore property choice names #681

Merged
merged 1 commit into from Jun 2, 2021

Conversation

ferdnyc
Copy link
Contributor

@ferdnyc ferdnyc commented Jun 2, 2021

2cf2c55 was a bit too ambitious, and swept away all of the property value choice labels that used to contain "None".

cc: @BrennoCaldato

@codecov
Copy link

codecov bot commented Jun 2, 2021

Codecov Report

Merging #681 (39b8e25) into develop (eb4e1a0) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #681   +/-   ##
========================================
  Coverage    50.41%   50.41%           
========================================
  Files          155      155           
  Lines        13317    13317           
========================================
  Hits          6714     6714           
  Misses        6603     6603           
Impacted Files Coverage Δ
src/Clip.cpp 43.09% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update eb4e1a0...39b8e25. Read the comment docs.

@BrennoCaldato
Copy link
Collaborator

Thanks for reviewing it @ferdnyc. I think you are right. This can probably be causing the inconvenient of having to click twice to select a parent clip

@ferdnyc
Copy link
Contributor Author

ferdnyc commented Jun 2, 2021

@BrennoCaldato :

It shouldn't affect setting the parent clip, those strings I didn't revert.

The ones reverted here were changes to the labels for certain multiple-choice properties that represent enum values — OpenShot displays the (translated) string labels, instead of the integer value. So, when e.g. scale is 3 (which is openshot::ScaleType::SCALE_NONE), we want it to display as "None", or the local translation of "None". It looked like the labels got caught up in a file-wide search&replace for "None".

@ferdnyc ferdnyc merged commit 0b783ee into OpenShot:develop Jun 2, 2021
@ferdnyc ferdnyc deleted the property-value-names branch June 2, 2021 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants