From 61126158a6ce1b7072802a426278f82e46a533cb Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Wed, 4 May 2016 20:00:26 +0200
Subject: [PATCH] mkvinfo GUI: set window icon

---
 .gitignore                |  2 +-
 Rakefile                  |  3 ++-
 src/info/qt_resources.qrc | 14 ++++++++++++++
 src/info/qt_ui.cpp        |  8 ++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 src/info/qt_resources.qrc

diff --git a/.gitignore b/.gitignore
index 162ed5b65..8c9091b8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@
 /po/qt/*.qm
 /rake.d/dependency.d
 /share/icons/*/*.h
+/src/*/qt_resources.cpp
 /src/common/common.h.gch
 /src/common/common_pch.h.[gp]ch
 /src/common/common_pch.h.pch-????????
@@ -60,7 +61,6 @@
 /src/mkvtoolnix-gui/forms/**/*.h
 /src/mkvtoolnix-gui/mkvtoolnix-gui
 /src/mkvtoolnix-gui/mkvtoolnix-gui.pro.user*
-/src/mkvtoolnix-gui/qt_resources.cpp
 /src/tools/ac3parser
 /src/tools/base64tool
 /src/tools/checksum
diff --git a/Rakefile b/Rakefile
index ac8c22bfa..7da6a6b28 100755
--- a/Rakefile
+++ b/Rakefile
@@ -779,9 +779,9 @@ task :clean do
     doc/man/*.html
     doc/man/*/*.html
     doc/man/*/*.xml
+    src/*/qt_resources.cpp
     src/info/ui/*.h
     src/mkvtoolnix-gui/forms/**/*.h
-    src/mkvtoolnix-gui/qt_resources.cpp
     tests/unit/all
     tests/unit/merge/merge
     tests/unit/propedit/propedit
@@ -906,6 +906,7 @@ Application.new("src/mkvinfo").
   only_if(c?(:USE_QT)).
   sources("src/info/sys_windows.o", :if => c?(:MINGW)).
   sources("src/info/qt_ui.cpp", "src/info/qt_ui.moc", "src/info/rightclick_tree_widget.moc", $mkvinfo_ui_files).
+  sources('src/info/qt_resources.cpp').
   libraries(:qt).
   end_if.
   libraries($custom_libs).
diff --git a/src/info/qt_resources.qrc b/src/info/qt_resources.qrc
new file mode 100644
index 000000000..e31109725
--- /dev/null
+++ b/src/info/qt_resources.qrc
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE RCC>
+<RCC version='1.0'>
+ <qresource>
+  <file alias='icons/32x32/mkvinfo.png'>../../share/icons/32x32/mkvinfo.png</file>
+  <file alias='icons/64x64/mkvinfo.png'>../../share/icons/64x64/mkvinfo.png</file>
+  <file alias='icons/128x128/mkvinfo.png'>../../share/icons/128x128/mkvinfo.png</file>
+  <file alias='icons/256x256/mkvinfo.png'>../../share/icons/256x256/mkvinfo.png</file>
+  <file alias='icons/48x48/mkvinfo.png'>../../share/icons/48x48/mkvinfo.png</file>
+  <file alias='icons/16x16/mkvinfo.png'>../../share/icons/16x16/mkvinfo.png</file>
+  <file alias='icons/24x24/mkvinfo.png'>../../share/icons/24x24/mkvinfo.png</file>
+  <file alias='icons/96x96/mkvinfo.png'>../../share/icons/96x96/mkvinfo.png</file>
+ </qresource>
+</RCC>
diff --git a/src/info/qt_ui.cpp b/src/info/qt_ui.cpp
index 3bff0603a..9a8296c9f 100644
--- a/src/info/qt_ui.cpp
+++ b/src/info/qt_ui.cpp
@@ -26,6 +26,8 @@
 #include "info/qt_ui.h"
 #include "info/mkvinfo.h"
 
+#include <QIcon>
+#include <QList>
 #include <QMessageBox>
 #include <QMimeData>
 #include <QMouseEvent>
@@ -52,6 +54,12 @@ main_window_c::main_window_c():
 
   setupUi(this);
 
+  QIcon icon;
+  for (auto size : QList<int>{} << 32 << 48 << 64 << 128 << 256)
+    icon.addFile(QString{":/icons/%1x%1/mkvinfo.png"}.arg(size));
+
+  setWindowIcon(icon);
+
   connect(action_Open, SIGNAL(triggered()), this, SLOT(open()));
   connect(action_Save_text_file, SIGNAL(triggered()), this,
           SLOT(save_text_file()));