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

macos: Add a sidebar icon #5928

Merged
merged 1 commit into from
Jul 31, 2017
Merged

Conversation

jturcotte
Copy link
Member

In the process, use an iconset to generate the icns using iconutil.
Also add some missing icon resolutions according to the guidelines.

Issue #296

In the process, use an iconset to generate the icns using iconutil.
Also add some missing icon resolutions according to the guidelines.

Issue owncloud#296
@jturcotte jturcotte added this to the 2.4.0 milestone Jul 31, 2017
@jturcotte jturcotte requested a review from guruz July 31, 2017 08:51
@SamuAlfageme
Copy link
Contributor

@jturcotte this is dope! 😎

Will try it later, can you post a screenshot to see how does it look for reference?

@jturcotte
Copy link
Member Author

jturcotte commented Jul 31, 2017

I just picked the same icon we have and put it there, and this is the result:

screen shot 2017-07-31 at 11 22 01

It would be better if a graphics designer would do it but I think it's not too bad already.

@@ -232,7 +232,7 @@ if (NOT DEFINED APPLICATION_ICON_NAME)
set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME})
endif()

kde4_add_app_icon( ownCloud "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon*.png")
kde4_add_app_icon( ownCloud "${theme_dir}/colored/${APPLICATION_ICON_NAME}-*.png")
Copy link
Contributor

Choose a reason for hiding this comment

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

The files in theme/colored still have the "-icon" in their name, any reason to change this kde4_add_app_icon thingy?

Copy link
Contributor

Choose a reason for hiding this comment

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

^^

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes that's to be able to also get files like owncloud-sidebar-36.png in the glob. -icon is for the application icon.

Copy link
Contributor

Choose a reason for hiding this comment

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

Aaah it's because of macro (KDE4_ADD_APP_ICON appsources pattern) and has nothing to do with kd4...

Copy link
Contributor

@guruz guruz left a comment

Choose a reason for hiding this comment

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

your cmake-magic looks good.
Please only merge after @SamuAlfageme confirmed it builds and works from rotor.

@michaelstingl ownbrander should supply a -128 icon and also all the -sidebar- icons. (It will however not fail if those are not supplied, right @jturcotte ?)

@guruz guruz added the ReadyToTest QA, please validate the fix/enhancement label Jul 31, 2017
@SamuAlfageme
Copy link
Contributor

@guruz @jturcotte can any of you guys change the PR's target so I can build the installers with rotor (remember the limitations to build fork's PR with it 😕) while keeping master clean 'till I do some good ol' testin'?

@guruz
Copy link
Contributor

guruz commented Jul 31, 2017

ACK, @jturcotte please push to this repo, not your own

@jturcotte
Copy link
Member Author

I've been under the impression that QA is happening in master, and I think that it's not worth doing custom rotor builds on feature branches to test once, and then test again for any possible merge issue in master, but this is for the QA team to decide. It seems to be the consensus for that reason that the team should make pull request from the main repo only and I'll do it if you really think that this kind of consistency is worth the proliferating amount of stale branches, the main reason why I've been avoiding it personally.

I can't retarget the pull request, so for this time I think it should be fine.

I tested the build on my machine and I'm pretty confident it's going to pass on rotor as well. Even if I does break the build, that I add a commit here or on master afterwards won't change anything as long as I push the fix shortly after the merge.

@jturcotte jturcotte merged commit 9e36cab into owncloud:master Jul 31, 2017
@jturcotte jturcotte deleted the macos-sidebar-icon branch July 31, 2017 16:44
@guruz
Copy link
Contributor

guruz commented Jul 31, 2017

@jturcotte i've deleted like 10-15 branches now from that list

@guruz
Copy link
Contributor

guruz commented Jul 31, 2017

@guruz
Copy link
Contributor

guruz commented Aug 1, 2017

@jturcotte great work, it works for me on 10.12.5
However I need to move the Folder manually to sidebar, I'll work on a patch to change this.
#455 (comment)

@SamuAlfageme
Copy link
Contributor

@jturcotte is there a way to override the icon to be the default's (i.e. the old one) in case of a branding client with no alternative choice?

@guruz
Copy link
Contributor

guruz commented Aug 2, 2017 via email

@jturcotte
Copy link
Member Author

@michaelstingl Is there any theming documentation I could update to list needed and optional icon sizes with their name?

@SamuAlfageme
Copy link
Contributor

@jturcotte we can probably ease @jvillafanez's job updating ownBrander by posting it on https://github.com/owncloud/ownbrander/issues/748 - I think there's no theming docs available

@SamuAlfageme
Copy link
Contributor

@jturcotte also, would it be hard to consider a migration path for existing local sync folders to be "updated" in the finder sidebar with the new icon when upgrading the client?

@guruz
Copy link
Contributor

guruz commented Aug 2, 2017

a migration path for existing local sync folders

I'm working on that, there is a bug -> #5928 (comment)

@jancborchardt
Copy link
Member

So cool, nice work @jturcotte!

@guruz
Copy link
Contributor

guruz commented Aug 3, 2017

See the linked PR which is related for depending on which wizard you use.

There is no need for a migration path, the Finder will automatically pick up the sidebar icon :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ReadyToTest QA, please validate the fix/enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants