Merge pull request #209 from Swordfish90/install-icons

Install icons
This commit is contained in:
Filippo Scognamiglio 2015-01-13 21:37:39 +00:00
commit b8fd9d6c45
8 changed files with 26 additions and 1 deletions

View File

@ -20,3 +20,20 @@ RESOURCES += qml/resources.qrc
target.path += /usr/bin/
INSTALLS += target
# Install icons
unix {
icon32.files = icons/32x32/cool-retro-term.png
icon32.path = /usr/share/icons/hicolor/32x32/apps
icon64.files = icons/64x64/cool-retro-term.png
icon64.path = /usr/share/icons/hicolor/64x64/apps
icon128.files = icons/128x128/cool-retro-term.png
icon128.path = /usr/share/icons/hicolor/128x128/apps
icon256.files = icons/256x256/cool-retro-term.png
icon256.path = /usr/share/icons/hicolor/256x256/apps
pixmap.files = icons/128x128/cool-retro-term.png
pixmap.path = /usr/share/pixmaps
INSTALLS += icon32 icon64 icon128 icon256 pixmap
}

View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

View File

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

View File

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -5,6 +5,7 @@
#include <QStringList>
#include <QtWidgets/QApplication>
#include <QIcon>
#include <QDebug>
#include <stdlib.h>
@ -38,6 +39,12 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine;
FileIO fileIO;
#if !defined(Q_OS_MAC)
app.setWindowIcon(QIcon::fromTheme("cool-retro-term", QIcon(":../icons/32x32/cool-retro-term.png")));
#else
app.setWindowIcon(QIcon(":../icons/32x32/cool-retro-term.png"));
#endif
// Manage command line arguments from the cpp side
QStringList args = app.arguments();
if (args.contains("-h") || args.contains("--help")) {

View File

@ -51,5 +51,6 @@
<file>fonts/modern-inconsolata/Inconsolata.otf</file>
<file>SettingsScreenTab.qml</file>
<file>fonts/modern-fixedsys-excelsior/FSEX301-L2.ttf</file>
<file>../icons/32x32/cool-retro-term.png</file>
</qresource>
</RCC>

View File

@ -2,7 +2,7 @@
Comment=Use the command line the old way
Exec=cool-retro-term
GenericName=Terminal emulator
Icon=utilities-terminal
Icon=cool-retro-term
MimeType=
Name=Cool Retro Term
Categories=Qt;System;Utility;TerminalEmulator;