From 639e1b21e27148348bbb300c01d0ecdfb673effe Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Fri, 18 May 2018 20:12:48 +0200
Subject: [PATCH] moved icons to qrc file

---
 source/CMakeLists.txt              |   5 +++++
 source/images/document-open.png    | Bin 0 -> 612 bytes
 source/images/document-save-as.png | Bin 0 -> 1206 bytes
 source/mainwindow.cpp              |   7 +------
 source/mainwindow.qrc              |   6 ++++++
 source/mainwindow.ui               |  26 +++++++++++++++++++++-----
 6 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 source/images/document-open.png
 create mode 100644 source/images/document-save-as.png
 create mode 100644 source/mainwindow.qrc

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 890ac1e..dd0e16f 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -5,11 +5,15 @@ project(LogoTest LANGUAGES CXX)
 find_package(Qt5Widgets REQUIRED)
 
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
 
 qt5_wrap_ui(UI_HEADERS 
 	mainwindow.ui
 	MetaDataWidget.ui
 )
+ qt5_add_resources(UI_RESOURCES
+	 mainwindow.qrc
+)
 
 add_executable(${PROJECT_NAME}
 	LogoTest.cpp
@@ -18,6 +22,7 @@ add_executable(${PROJECT_NAME}
 	mainwindow.cpp
 	MetaDataWidget.cpp
 	${UI_HEADERS}
+	${UI_RESOURCES}
 )
 
 set_target_properties(${PROJECT_NAME}
diff --git a/source/images/document-open.png b/source/images/document-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..312e1187f2f7e1443e6b876ab72b4c45718f7705
GIT binary patch
literal 612
zcmV-q0-ODbP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS0006TNkl<ZNQv!~&1(}u7>9o|JHzI~l(wc+X|X62@sgVbK}7Ih5cH;AiwYh@
zK@r+2QuJcIl!6u!Jk^6DcozHz{5TmbjWkIULz|H8W@mPG##1$$O&c~?y!f2v@bY`!
zdFKQ8PY=k>;`ZIkXD!NJs~{NeEMlD1q)_J{JzV|}SHN}_oZCwmFI*ZP$&N;fHY)4c
zm6cbE08aERkkUVvJvf3=<twxfeiu;6Fq%CMA^pj?;UNKFEJA1~900Uduq+17xpnK#
z6|+|uA=GEon!7){G}lG2J58sG>sN20?Z~<k1Ob2Ybp9TI?gC@FH`r*F(P)-?HZpc7
z2V-<7Ga?8A-7{!6x-}RP2v6;=K#F}702-d`UjRhM8xm*@Y}U3=EUg1DAY|`b(@FkY
z9;tK^GY_U$RS>+l^x<of5v>*0aOU(m<Z>q=gcExYjM-4i9DTODFum!1pNWph^DuE_
z60Tc^+iJuXB$ESBK854d>yKw&Rzm`3+rfc!2Ap%Wyc&Gv#TKN<AS#s-jKLS6;|vmZ
z3R6?3KrM=vXh7@uZ-NqzQu&86T7PO6WB`Ctg7L9&NVyFu-PqxrC7=U?LSdD*S|Z;r
z7$Sryr6jZMBq+5pI55$NAPwmYRDW*JVzF9i7r=GAh3798ZzOCx-ra125Ex&nrV!rS
ycW*v^2L61H83027XushdXaHLPntv(pAMy)>9_W>j`woQw0000<MNUMnLSTX?{{YGW

literal 0
HcmV?d00001

diff --git a/source/images/document-save-as.png b/source/images/document-save-as.png
new file mode 100644
index 0000000000000000000000000000000000000000..5da8a02dc2f33b8dbcca60f746117bd185fa825d
GIT binary patch
literal 1206
zcmV;n1WEgeP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11T#rQK~zYIrIl@HR%IN<fA@W!*K_vFspS+h8^oX`3i%-@_M%q!
z0u}@z5kh6zCxbA9Ao4?m5a@?qGy;``V6h;fd`Zciqnaz7Ei<?IlDX#gJoD_uJ$vSP
z?)%?|=j_?0)6_0F+#k+4*Y&@y>%PxXA_73g%FR*0;eX=oj(0vQ>6X=jYj>>avFntG
z@ZhQsK2pd!rImVj&&InJ3FatD?Mxnj=@nWU>bWfEH$(sg`{K*1pNPa_QC7C^yesmv
zGX^>LNExYS&6W0c%5nkyS9w1Ipi!}i<8ZvAkGj*R@0dLOfFfAFloiXLMwXsp|C(J~
z8_todRG$_c2v`BF6pO-6ZWkTR4Rkl|WN}RmiA*DXqa$Q$G_AeWY;SH{9~pa4L{RF^
zChu(dnm-$Nu(-O0<iH7f`-W&Z&_w>J%^dnJ3qVo8iZD^(;P?A(Nj`M(82a*$EUl{}
zIdqclbRXXyK1S!fP0XEL2kgCG045rEa>??Wl3zG^fVN+nsjaQW9cts!KfUZf`YS8m
z*hBL^2bmDFE(%!TcG4HIG=9FG>grm&;nQ6B`x5(`j<agxUglQS0g$)jOhpIAN}=r#
zH;bsd{U>}Wr&M}5)7in{V}EepviF!%`B*qWVb~i5j70>7vH>YKdeeyB{9+5O7d7dg
zJygyTp4-&KJ@+pFU}z*jL?#IoBQjPH5$b<9$6z*?k~}x;^ZVHz7F8s9{`C)8v-Rva
zc{bq7Bj*tj^2Xliz*@nIaOAgcnojlLXpMGMVO0vH6;9Ak<uhBk8cp$Wiy+NEV?{95
zVokW(!a7Mn5CUVc)-p6a!eH+OW(RFZE;FT*iHMfWrpu{9;<K1Jy@X^UMm~)Dh7PP1
z(pLtUmv3WP-J{HZcs^R|@DM6o*Cm-u7S}`~!NEfZ+1>CB-H9a(3}%VNqL`^73i1|X
zEyf7s`dGMNA)}+C?ApDX!NGpY%4YD^h7Gu`i|2W`u8Z&cR6SIM&F;i0)quhp%eDNt
zK(XY!8E;=Hh2s>y+WwVZr1Ay&GM7oEJW{C?u~>{uCPOBZVPIgOK%^B~t8mCE9OR9`
zSc_5$r4(9g5{X1X(20j6g?TcW48HH<`#yH;o$#KqmcW?nONM;jV67BMJkOhS<i{|P
z-1mJv&kKhd?=lD`M5L6`2wfMudQ2)AA>_yN3UN%EHUrbP4bLkDAe~MZuWU9;Br+C)
z0tp2|2TCa?0wmL|^=rjGTW^gmizi$yBE?;@{gZ8Evspke#-Oz(9*<LAUS4!4B9wVC
zP!MqxBiT^|F+eH;M6Y(8AQ<l3f~?)Bbkx1KEFO9FwY9~#ZUt*Cd5Lnor8Q5Ow}86V
z|JPSQLIFvj0;te2ce)cRiT@|-ts!E9k^G3?37k<BwrV^SiZJ=Na909=1#-a1zm~To
UvYBA7UjP6A07*qoM6N<$g8qgxwEzGB

literal 0
HcmV?d00001

diff --git a/source/mainwindow.cpp b/source/mainwindow.cpp
index 603eee6..c7b709c 100644
--- a/source/mainwindow.cpp
+++ b/source/mainwindow.cpp
@@ -17,13 +17,8 @@ MainWindow::MainWindow(QWidget *parent)
 {
 	ui->setupUi(this);
 
-	ui->actionSave_as->setIcon(QIcon::fromTheme("document-save-as",
-		QIcon("/usr/share/gtk-doc/html/gtk2/document-save-as.png")));
-	ui->actionLoad->setIcon(QIcon::fromTheme("document-open",
-		QIcon("/usr/share/gtk-doc/html/gtk2/document-open.png")));
-
 	connect(ui->actionSave_as, SIGNAL(triggered()), this, SLOT(saveAs()));
-	connect(ui->actionLoad, SIGNAL(triggered()), this, SLOT(load()));
+	connect(ui->actionOpen, SIGNAL(triggered()), this, SLOT(load()));
 
 	ui->metaDataWidget->setModel(&m_dataModel->m_metaData);
 }
diff --git a/source/mainwindow.qrc b/source/mainwindow.qrc
new file mode 100644
index 0000000..5459d85
--- /dev/null
+++ b/source/mainwindow.qrc
@@ -0,0 +1,6 @@
+<RCC>
+  <qresource>
+    <file>images/document-open.png</file>
+    <file>images/document-save-as.png</file>
+  </qresource>
+</RCC>
diff --git a/source/mainwindow.ui b/source/mainwindow.ui
index f06bd14..b36a315 100644
--- a/source/mainwindow.ui
+++ b/source/mainwindow.ui
@@ -52,8 +52,8 @@
     <property name="title">
      <string>&amp;File</string>
     </property>
+    <addaction name="actionOpen"/>
     <addaction name="actionSave_as"/>
-    <addaction name="actionLoad"/>
    </widget>
    <addaction name="menuFile"/>
   </widget>
@@ -68,20 +68,34 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
+   <addaction name="actionOpen"/>
    <addaction name="actionSave_as"/>
-   <addaction name="actionLoad"/>
   </widget>
   <action name="actionSave_as">
+   <property name="icon">
+    <iconset resource="mainwindow.qrc">
+     <normaloff>:/images/document-save-as.png</normaloff>:/images/document-save-as.png</iconset>
+   </property>
    <property name="text">
     <string>Save as...</string>
    </property>
    <property name="toolTip">
     <string>Save as...</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
   </action>
-  <action name="actionLoad">
+  <action name="actionOpen">
+   <property name="icon">
+    <iconset resource="mainwindow.qrc">
+     <normaloff>:/images/document-open.png</normaloff>:/images/document-open.png</iconset>
+   </property>
    <property name="text">
-    <string>Load</string>
+    <string>Open</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
    </property>
   </action>
  </widget>
@@ -93,6 +107,8 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="mainwindow.qrc"/>
+ </resources>
  <connections/>
 </ui>