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

Refactoring: Move images to src/res (Windows and Mac) #2834

Merged
merged 1 commit into from
Sep 5, 2022

Conversation

ann0see
Copy link
Member

@ann0see ann0see commented Sep 2, 2022

Short description of changes

Moves images from their OS folders to src/res. Note: Android and Linux will follow since they seem to be more complicated.

CHANGELOG: Refactoring: Moved around files to clean up the repository

Context: Fixes an issue?

Related to: #2601

Does this change need documentation? What needs to be documented and how?

No.

Status of this Pull Request

Ready review. Unfortunately due to #1841 I can't test it locally on macOS, but I tested the CI version.

  • macOS: Server and Client show correct icons
  • Windows Installer: Installer icon shows up
  • Windows Installer: Installer banner and welcome page with ASIO compatible shows up on ASIO build, and Installer banner only shows up on JACK build.
  • Start menu installer, uninstaller, ... and task-bar all show the correct server/client icons (ASIO and JACK)

What is missing until this pull request can be merged?

Nothing

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I tested my code and it does what I want
  • My code follows the style guide
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
  • I've filled all the content above

@ann0see ann0see marked this pull request as ready for review September 2, 2022 20:19
@ann0see ann0see changed the title Refactoring: Move images to src/res Refactoring: Move images to src/res (Windows and Mac) Sep 2, 2022
@pljones
Copy link
Collaborator

pljones commented Sep 4, 2022

= src/res/...

Part of me still wants to be able to glance at the resources and know what they're for (i.e. used in Jamulus on platform X, used in the installer on platform Y, etc). So it might be good to take this opportunity to improve the naming for clarity, as well as moving them.

@ann0see
Copy link
Member Author

ann0see commented Sep 4, 2022

Ok. Once this is finished, we need to re-test macOS and Windows icons.

Copy link
Collaborator

@pljones pljones left a comment

Choose a reason for hiding this comment

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

Approving. Not sure why the ARMHF build wasn't happy.

@ann0see
Copy link
Member Author

ann0see commented Sep 4, 2022

I've opened #2837

@ann0see
Copy link
Member Author

ann0see commented Sep 4, 2022

Ok. Once this is finished, we need to re-test macOS and Windows icons.

Done and they still show up correctly.

Copy link
Member

@hoffie hoffie left a comment

Choose a reason for hiding this comment

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

Looks sane, grep didn't find any more mentions of the old file names.

@ann0see ann0see merged commit aa5fe5f into jamulussoftware:master Sep 5, 2022
@ann0see ann0see deleted the move/moveImages branch September 5, 2022 07:23
@pljones pljones added this to the Release 3.9.1 milestone Oct 5, 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