From 505a840574e8e0db8a1a6d25956a3c75a13aa1ea Mon Sep 17 00:00:00 2001
From: Filippo Scognamiglio <flscogna@gmail.com>
Date: Mon, 12 Jan 2015 21:51:27 +0100
Subject: [PATCH 1/2] Install icons.
---
app/app.pro | 17 +++++++++++++++++
.../cool-retro-term.png} | Bin
.../cool-retro-term.png} | Bin
.../{crt32.png => 32x32/cool-retro-term.png} | Bin
.../{crt64.png => 64x64/cool-retro-term.png} | Bin
cool-retro-term.desktop | 2 +-
6 files changed, 18 insertions(+), 1 deletion(-)
rename app/icons/{crt128.png => 128x128/cool-retro-term.png} (100%)
rename app/icons/{crt256.png => 256x256/cool-retro-term.png} (100%)
rename app/icons/{crt32.png => 32x32/cool-retro-term.png} (100%)
rename app/icons/{crt64.png => 64x64/cool-retro-term.png} (100%)
diff --git a/app/app.pro b/app/app.pro
index 33e1a9e..7472188 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -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
+}
diff --git a/app/icons/crt128.png b/app/icons/128x128/cool-retro-term.png
similarity index 100%
rename from app/icons/crt128.png
rename to app/icons/128x128/cool-retro-term.png
diff --git a/app/icons/crt256.png b/app/icons/256x256/cool-retro-term.png
similarity index 100%
rename from app/icons/crt256.png
rename to app/icons/256x256/cool-retro-term.png
diff --git a/app/icons/crt32.png b/app/icons/32x32/cool-retro-term.png
similarity index 100%
rename from app/icons/crt32.png
rename to app/icons/32x32/cool-retro-term.png
diff --git a/app/icons/crt64.png b/app/icons/64x64/cool-retro-term.png
similarity index 100%
rename from app/icons/crt64.png
rename to app/icons/64x64/cool-retro-term.png
diff --git a/cool-retro-term.desktop b/cool-retro-term.desktop
index 2d06c64..b1fbb74 100644
--- a/cool-retro-term.desktop
+++ b/cool-retro-term.desktop
@@ -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;
--
2.47.2
From 0c17ca115e56f7c35f0d2616f70d626787b3f6ee Mon Sep 17 00:00:00 2001
From: Filippo Scognamiglio <flscogna@gmail.com>
Date: Mon, 12 Jan 2015 22:35:49 +0100
Subject: [PATCH 2/2] Set window application icon.
---
app/main.cpp | 7 +++++++
app/qml/resources.qrc | 1 +
2 files changed, 8 insertions(+)
diff --git a/app/main.cpp b/app/main.cpp
index ad082c0..033b749 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -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")) {
diff --git a/app/qml/resources.qrc b/app/qml/resources.qrc
index ac03023..34d4312 100644
--- a/app/qml/resources.qrc
+++ b/app/qml/resources.qrc
@@ -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>
--
2.47.2