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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/qnapi.desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Desktop Entry]
Exec=qnapi
Name=QNapi
Icon=qnapi-48
Icon=qnapi
Type=Application
Categories=AudioVideo;
Comment=Program do pobierania napisów do filmów
Expand Down
22 changes: 15 additions & 7 deletions qnapi.pro
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ macx {

unix {
INSTALL_PREFIX = /usr
DATADIR=$${INSTALL_PREFIX}/share
target.path = $${INSTALL_PREFIX}/bin
doc.path = $${INSTALL_PREFIX}/share/doc/$${TARGET}
doc.files = doc/ChangeLog \
Expand All @@ -154,17 +155,24 @@ unix {
doc/qnapi-scan.schemas
man.path = $${INSTALL_PREFIX}/share/man/man1
man.files = doc/$${TARGET}.1.gz
icons.path = $${INSTALL_PREFIX}/share/icons
icons.files = res/qnapi.png \
res/qnapi-48.png \
res/qnapi-128.png \
res/qnapi-512.png
icons16.files = res/icons/16x16/apps/qnapi.png
icons16.path = $${DATADIR}/icons/hicolor/16x16/apps/
icons22.files = res/icons/22x/apps/qnapi.png
icons22.path = $${DATADIR}/icons/hicolor/22x22/apps/
icons32.files = res/icons/32x32/apps/qnapi.png
icons32.path = $${DATADIR}/icons/hicolor/32x32/apps/
icons48.files = res/icons/48x48/apps/qnapi.png
icons48.path = $${DATADIR}/icons/hicolor/48x48/apps/
icons128.files = res/icons/128x128/apps/qnapi.png
icons128.path = $${DATADIR}/icons/hicolor/128x128/apps/
icons512.files = res/icons/512x512/apps/qnapi.png
icons512.path = $${DATADIR}/icons/hicolor/512x512/apps/
INSTALLS += icons16 icons22 icons32 icons48 icons128 icons512
desktop.path = $${INSTALL_PREFIX}/share/applications
desktop.files = doc/$${TARGET}.desktop
INSTALLS = target \
INSTALLS += target \
doc \
man \
icons \
desktop
}

Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
3 changes: 1 addition & 2 deletions res/resources.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
<file>opensubtitles.gif</file>
<file>qnapi-22-mono.png</file>
<file>qnapi-48-icon.png</file>
<file>qnapi-48.png</file>
<file>qnapi.png</file>
<file>napisy24.gif</file>
<file>napiprojekt.jpg</file>
<file alias="qnapi.png">icons/48x48/apps/qnapi.png</file>
</qresource>
<qresource prefix="/languages">
<file>el.gif</file>
Expand Down
2 changes: 1 addition & 1 deletion ui/frmabout.ui
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../res/resources.qrc">:/icon/qnapi-48.png</pixmap>
<pixmap resource="../res/resources.qrc">:/icon/qnapi.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Expand Down