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

PAINTROID-323: Overwrite adds suffix after filetype, it should be before .png #1038

Merged
merged 1 commit into from
Jul 31, 2022

Conversation

AneiMakovec
Copy link
Contributor

@AneiMakovec AneiMakovec commented Feb 3, 2022

Overwrite adding (1) suffix to file names has been fixed for all file formats. I also implemented tests for it.

Additional changes:

  • changed the file info parsing after loading an image and save image dialogue file format selection to use the new FileType values in FileIO.kt.
  • removed the now obsolete variable isCatrobatImage in FileIO.kt to avoid confusion with new FileType vlaues.
  • the "save image" option now displays the name and format of the currently loaded image

Ticket: https://jira.catrob.at/browse/PAINTROID-323

Your checklist for this pull request

Please review the contributing guidelines and wiki pages of this repository.

  • Include the name of the Jira ticket in the PR’s title
  • Include a summary of the changes plus the relevant context
  • Choose the proper base branch (develop)
  • Confirm that the changes follow the project’s coding guidelines
  • Verify that the changes generate no compiler or linter warnings
  • Perform a self-review of the changes
  • Verify to commit no other files than the intentionally changed ones
  • Include reasonable and readable tests verifying the added or changed behavior
  • Confirm that new and existing unit tests pass locally
  • Check that the commits’ message style matches the project’s guideline
  • Stick to the project’s gitflow workflow
  • Verify that your changes do not have any conflicts with the base branch
  • After the PR, verify that all CI checks have passed
  • Post a message in the #paintroid Slack channel and ask for a code reviewer

@AneiMakovec AneiMakovec force-pushed the PAINTROID-323 branch 2 times, most recently from 4d4c413 to 92f7367 Compare June 15, 2022 21:07
@AneiMakovec AneiMakovec changed the title PAINTROID-323 When image is loaded and then saved, the program detect… PAINTROID-323: Overwrite adds suffix after filetype, it should be before .png Jun 15, 2022
Copy link
Contributor

@FromG FromG left a comment

Choose a reason for hiding this comment

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

looks good to me. refactoring needed

@AneiMakovec AneiMakovec force-pushed the PAINTROID-323 branch 4 times, most recently from 2852353 to 999664a Compare June 28, 2022 14:25
@AneiMakovec AneiMakovec requested a review from FromG June 28, 2022 14:53
Copy link
Contributor

@FromG FromG left a comment

Choose a reason for hiding this comment

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

ok

@AneiMakovec AneiMakovec force-pushed the PAINTROID-323 branch 6 times, most recently from 72072d6 to 2b2cb67 Compare July 15, 2022 22:39
@FromG
Copy link
Contributor

FromG commented Jul 25, 2022

pls rebase

Copy link
Contributor

@FromG FromG left a comment

Choose a reason for hiding this comment

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

ok

Copy link
Contributor

@ThorstenBandel ThorstenBandel left a comment

Choose a reason for hiding this comment

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

LGTM Thanks!

@ThorstenBandel ThorstenBandel merged commit f47f7d3 into Catrobat:develop Jul 31, 2022
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.

3 participants