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

[Linux] Place icons in proper dirs, according to icon size. #24

Merged
merged 1 commit into from
Sep 9, 2015

Conversation

Fisiu
Copy link
Contributor

@Fisiu Fisiu commented Sep 5, 2015

Signed-off-by: Mariusz Fik mariusz@fidano.pl

@krzemin
Copy link
Member

krzemin commented Sep 6, 2015

I wonder if target icon files should have size suffixes when they are copied to size-specific directories.

I mean $${DATADIR}/icons/hicolor/16x16/apps/qnapi.png instead of $${DATADIR}/icons/hicolor/16x16/apps/qnapi-16.png, analogously for other sizes.

What do you think?

@Fisiu
Copy link
Contributor Author

Fisiu commented Sep 6, 2015

Yes, You're right. I'll update pull rq when get back home.

@Fisiu
Copy link
Contributor Author

Fisiu commented Sep 7, 2015

It seems files{size}.extra (in qnapi.pro) doesn't work well with multiple items. Maybe just rename files res/qnapi-{size}.png → res/icons/{sizexsize}/apps/qnapi.png?

@krzemin
Copy link
Member

krzemin commented Sep 8, 2015

Did you try setting full target path of the file? I mean this instead of only providing directory in path:

icons32.files = res/qnapi-32.png
icons32.path = $${DATADIR}/icons/hicolor/32x32/apps/qnapi.png

@Fisiu
Copy link
Contributor Author

Fisiu commented Sep 8, 2015

Then qnapi.png dir is created, and qnapi-{size}.png inside it.

@krzemin
Copy link
Member

krzemin commented Sep 8, 2015

Generally, it's OK to change directory structure in way you've proposed (res/icons/size/qnapi.png), but you have to be careful since current icon paths are referred to in several places (e.g. in res/resources.qrc, maybe also in some .ui files).

Signed-off-by: Mariusz Fik <mariusz@fidano.pl>
@Fisiu
Copy link
Contributor Author

Fisiu commented Sep 8, 2015

Pull request updated ;-)

krzemin added a commit that referenced this pull request Sep 9, 2015
[Linux] Place icons in proper dirs, according to icon size.
@krzemin krzemin merged commit 29f0775 into QNapi:master Sep 9, 2015
@Fisiu Fisiu deleted the fix-icons branch September 17, 2015 17:12
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.

2 participants