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

fix macOS statusBar icons #3113

Merged
merged 13 commits into from May 27, 2022

Conversation

sweetppro
Copy link
Collaborator

make macOS status icons consistent across all versions of macOS
Screen Shot 2022-05-19 at 3 47 10 pm

#3103 #3100 #3112

make macOS status icons consistent accross all versions of macOS
@GaryElshaw
Copy link
Contributor

We have conflicting PR's :-( #3114

@ckerr
Copy link
Member

ckerr commented May 23, 2022

@sweetppro and @GaryElshaw can the two of you figure out which PR should be used? 🙂

@GaryElshaw
Copy link
Contributor

GaryElshaw commented May 23, 2022

@ckerr, @sweetppro's then mine.

In other words: #3113 then #3114

@sweetppro
Copy link
Collaborator Author

sweetppro commented May 23, 2022

@ckerr They both do different things. mine fixes the icon sizes and makes them consistent across macOS versions.

@GaryElshaw
Copy link
Contributor

@ckerr They both do different things. mine fixes the icon sizes and makes them consistent across macOS versions.

Yep. And mine #3103 is an interim fix, and might as well be merged until this PR is ready.

@ckerr
Copy link
Member

ckerr commented May 23, 2022

@Coeur ping

Copy link
Member

@ckerr ckerr left a comment

Choose a reason for hiding this comment

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

FTBFS

CMake Error at macosx/CMakeLists.txt:423 (add_executable):
19:10:31     Cannot find source file:
19:10:31   
19:10:31       Images/Images.xcassets/TurtleTemplate.imageset/TurtleTemplate.png
19:10:31   
19:10:31     Tried extensions .c .C .c++ .cc .cpp .cxx .cu .mpp .m .M .mm .ixx .cppm .h
19:10:31     .hh .h++ .hm .hpp .hxx .in .txx .f .F .for .f77 .f90 .f95 .f03 .hip .ispc
19:10:31   
19:10:31   
19:10:31   CMake Error at macosx/CMakeLists.txt:423 (add_executable):
[19:10:31 ](https://trtc.mikedld.com/buildConfiguration/Transmission_Sanity_MacOSX8664/213420?hideProblemsFromDependencies=false&hideTestsFromDependencies=false&expandchucktcpluginBuild=false&expandBuildProblemsSection=true&showLog=213420_598_598&logView=flowAware)    No SOURCES given to target: transmission-mac

@sweetppro
Copy link
Collaborator Author

CMake Error at macosx/CMakeLists.txt:423 (add_executable):
19:10:31 Cannot find source file:
19:10:31
19:10:31 Images/Images.xcassets/TurtleTemplate.imageset/TurtleTemplate.png

@ckerr this is now fixed

@sweetppro sweetppro requested a review from ckerr May 24, 2022 04:32
@ckerr ckerr merged commit 182e514 into transmission:main May 27, 2022
@sweetppro sweetppro deleted the macOS-statusBar-icon-cleanup branch May 27, 2022 12:32
@GaryElshaw
Copy link
Contributor

@sweetppro Something has happened to the tortoise's head :-(
TortoiseTemplate
TortoiseTemplate@2x

@maxz
Copy link
Contributor

maxz commented Jun 10, 2022

It is highly irregular that you removed someone else from the AUTHORS file. You could have removed the Tortoise comment to make it clear that the current Tortoise is not created by Dean Ostetto, but he still deserves to be credited for his contribution.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants