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

New version of splash screen and icon #2920

Merged
merged 15 commits into from
Jul 12, 2024

Conversation

wpotrzebowski
Copy link
Contributor

Description

A new version of the splash screen as discussed in #2878. I will also try to update icon in the same PR

Fixes # (issue/issues)

How Has This Been Tested?

Start sasview and how the splash screen and icon looks like

Review Checklist:

[if using the editor, use [x] in place of [ ] to check a box]

Documentation (check at least one)

  • There is nothing that needs documenting
  • Documentation changes are in this PR
  • There is an issue open for the documentation (link?)

Installers

  • There is a chance this will affect the installers, if so
    • Windows installer (GH artifact) has been tested (installed and worked)
    • MacOSX installer (GH artifact) has been tested (installed and worked)

Licencing (untick if necessary)

  • The introduced changes comply with SasView license (BSD 3-Clause)

@lucas-wilkins
Copy link
Contributor

closes #2907

This was linked to issues Jul 1, 2024
@lucas-wilkins lucas-wilkins added the SasView 6.0.0 Required for 6.0.0 release label Jul 1, 2024
@wpotrzebowski
Copy link
Contributor Author

I can see the splash screen when I run locally but not from the installer... This happens on Mac. Can someone else check if this is a reproducible behavior?

@smk78
Copy link
Contributor

smk78 commented Jul 2, 2024

After download on Windows:
image

@smk78
Copy link
Contributor

smk78 commented Jul 2, 2024

On launch on Windows:
image

@smk78
Copy link
Contributor

smk78 commented Jul 2, 2024

But I still have the old ball icon in the toolbar:
image

@smk78
Copy link
Contributor

smk78 commented Jul 2, 2024

Welcome:
image

@smk78
Copy link
Contributor

smk78 commented Jul 2, 2024

Interestingly, the icons in the installation folder are also the old ones:
image

But if I right click on the sasview app and do Properties it shows the new one!
image

@smk78
Copy link
Contributor

smk78 commented Jul 2, 2024

From what I'm reading there is no way to change the icon on an executable once it's installed (only the icon on a shortcut to an executable). So the old icon must be being associated with the sasview application somewhere in the installer build...

@lucas-wilkins
Copy link
Contributor

I think the icon is specified in the .spec file, so it needs updating there, it might link to a different copy of the images (we have too many copies of the same images still)

@lucas-wilkins
Copy link
Contributor

Problem reproduced on my mac and I've identified the cause!

@lucas-wilkins
Copy link
Contributor

@wpotrzebowski Should be fixed!

@wpotrzebowski
Copy link
Contributor Author

wpotrzebowski commented Jul 3, 2024

@lucas-wilkins Thanks for looking at it.
The installer seems to be crashing with

[96363] Failed to execute script 'sasview' due to unhandled exception: No module named 'sas.qtgui.images'
[96363] Traceback:
Traceback (most recent call last):
  File "sasview.py", line 15, in <module>
  File "sas/cli.py", line 161, in main
  File "sas/qtgui/MainWindow/MainWindow.py", line 92, in run_sasview
  File "sas/qtgui/MainWindow/MainWindow.py", line 63, in SplashScreen
  File "importlib/resources/_legacy.py", line 25, in wrapper
  File "importlib/resources/_legacy.py", line 46, in open_binary
  File "importlib/resources/_common.py", line 22, in files
  File "importlib/resources/_common.py", line 53, in get_package
  File "importlib/resources/_common.py", line 44, in resolve
  File "importlib/__init__.py", line 126, in import_module
  File "<frozen importlib._bootstrap>", line 1204, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1176, in _find_and_load
  File "<frozen importlib._bootstrap>", line 1140, in _find_and_load_unlocked
ModuleNotFoundError: No module named 'sas.qtgui.images'

@lucas-wilkins
Copy link
Contributor

@wpotrzebowski it might be because the installer has given it a different name (e.g. just images). I could change the path to images, but then the local dev will break. I'll see if I can add both paths "images" and "sas.qtgui.images" to the installer and have them point to the same place.

@wpotrzebowski
Copy link
Contributor Author

Thanks @lucas-wilkins. It works now

@wpotrzebowski
Copy link
Contributor Author

Interestingly, the icons in the installation folder are also the old ones: image

But if I right click on the sasview app and do Properties it shows the new one! image

I've checked that spec file refers to updated icon files.

@wpotrzebowski
Copy link
Contributor Author

I've replaced all possible icon files. Indeed, there are plenty. @smk78 can you please check if you still can see old ball in the installation folder?

@wpotrzebowski wpotrzebowski marked this pull request as ready for review July 4, 2024 09:36
@lucas-wilkins lucas-wilkins requested review from lucas-wilkins and removed request for lucas-wilkins July 4, 2024 16:12
@smk78
Copy link
Contributor

smk78 commented Jul 5, 2024

@wpotrzebowski I tried https://github.com/SasView/sasview/actions/runs/9789639783 on W10/x86.

The new logo appears on the installer file, and on the installation dialog box, but not :

  • on the shortcut that is created (if you check that option in the installation dialog)
  • in the taskbar when the application starts!
  • or on the sasview & unins00 applications in the installation folder

@lucas-wilkins
Copy link
Contributor

Looks good

image

@krzywon krzywon merged commit a412774 into release_6.0.0 Jul 12, 2024
28 checks passed
@krzywon krzywon deleted the release_6.0.0_splash_screen branch July 12, 2024 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
SasView 6.0.0 Required for 6.0.0 release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Splash Screen & Icon need updating Splash and Icon for 6.0.0
4 participants