From 18c7fae4630b0a846c7efba42cdfea0d98137064 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Thu, 3 May 2012 00:09:34 +0200
Subject: [PATCH] Add icons used by KMessageWidget.
---
COPYING | 11 +++++++++++
share/CMakeLists.txt | 8 ++++----
.../application/22x22/action/dialog-close.png | Bin 0 -> 1212 bytes
.../icons/application/22x22/action/dialog-ok.png | Bin 0 -> 723 bytes
.../application/22x22/status/dialog-error.png | Bin 0 -> 972 bytes
.../22x22/status/dialog-information.png | Bin 0 -> 1103 bytes
.../application/22x22/status/dialog-warning.png | Bin 0 -> 791 bytes
src/core/DataPath.cpp | 2 +-
8 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 share/icons/application/22x22/action/dialog-close.png
create mode 100644 share/icons/application/22x22/action/dialog-ok.png
create mode 100644 share/icons/application/22x22/status/dialog-error.png
create mode 100644 share/icons/application/22x22/status/dialog-information.png
create mode 100644 share/icons/application/22x22/status/dialog-warning.png
diff --git a/COPYING b/COPYING
index c24e6d37f..d4662eacf 100644
--- a/COPYING
+++ b/COPYING
@@ -32,6 +32,17 @@ Copyright: 2006, Otto Salminen
2011, Felix Geyer <debfx@fobos.de>
License: GPL-2
+Files: share/icons/application/22x22/action/dialog-close.png, share/icons/application/22x22/action/dialog-ok.png,
+ share/icons/application/22x22/status/dialog-error.png, share/icons/application/22x22/status/dialog-information.png,
+ share/icons/application/22x22/status/dialog-warning.png
+Copyright: 2007, Nuno Pinheiro <nuno@oxygen-icons.org>
+ 2007, David Vignoni <david@icon-king.com>
+ 2007, David Miller <miller@oxygen-icons.org>
+ 2007, Johann Ollivier Lapeyre <johann@oxygen-icons.org>
+ 2007, Kenneth Wimer <kwwii@bootsplash.org>
+ 2007, Riccardo Iaconelli <riccardo@oxygen-icons.org>
+License: LGPL-3+
+
Files: src/crypto/salsa20/*
Copyright: is in public domain
License: -
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index ccf07c3ef..0ce3e0146 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -19,8 +19,8 @@ install(FILES ${DATABASE_ICONS} DESTINATION ${DATA_INSTALL_DIR}/icons/database)
if(UNIX AND NOT APPLE)
install(DIRECTORY icons/application/ DESTINATION share/icons/hicolor
- FILES_MATCHING PATTERN "*.png" PATTERN "*.svgz")
-else(UNIX AND NOT APPLE)
- install(DIRECTORY icons/application/ DESTINATION ${DATA_INSTALL_DIR}/icons/application
- FILES_MATCHING PATTERN "*.png" PATTERN "*.svgz")
+ FILES_MATCHING PATTERN "keepassx.png" PATTERN "keepassx.svgz")
endif(UNIX AND NOT APPLE)
+
+install(DIRECTORY icons/application/ DESTINATION ${DATA_INSTALL_DIR}/icons/application
+ FILES_MATCHING PATTERN "*.png" PATTERN "*.svgz")
diff --git a/share/icons/application/22x22/action/dialog-close.png b/share/icons/application/22x22/action/dialog-close.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef0b6bdc66ba494c52dc5a7bfeb68d1030a3720d
GIT binary patch
literal 1212
zcmV;t1Vj6YP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX000DoNkl<Zc-ozm
ze@xVM9LAr6^FR%b*sOH3T#fvrEj54eOATvFO&5|sC=AM0It_DxtF-AvEla=<O;P6$
z5E<$~>^u>UpBsmQ5Fi3tAgD9U6lu-UM4q1crHe_^*0Vjk-S@uV*XMaZ@4LgJv>Nb8
z2436(%#cG<fZ$DlFaD=YUjd^MfW3m=*amQyyE}JVEKCI`_?;x6<ZEEwa=?uLqBvmC
zMqsmmchh}*SRN6<mTlX3)n?;WyPcN~9AHgsEVKRmxD}udcdiGXe-zZJ8;iFC%pX6V
z?Ww8k$js!`2izfF$;e=3R227`%~UnNYyblAZ<+=SP|~A206IpGW?SM$Ui>D3my#2B
zIXRJ+HpxkHVj?ff?Fk9@T@x9}G?R&f|GW-(wqK_jXR$`(QLB~bVwbXMWi&5m?Pb%N
zWo%s+!?v|?ys$csEh}Q#@NqOR?A*zERni<2!?H1BxZ9|uFbHsWQNsamE#pcCz>`4}
zc>2RxY|Tz1dwO`izLJ&8!uZ3=aJGE*wmu7G<Bk;e+`Grl#zvORnZugUP-d%=EkKU~
zzV1pJ56su*nX8fNLW5Wo?$3_eQ~X;$oi3$gfj`UM8^`LDctN{K>GrQ(w9gLXsmYV*
z@b%>$BXte{H%RX4Hf<lkJTv(HBrn!Qj9^ZfA1~LGyWnlk0+u9x>Vp2>b(4p~r?PPD
z2s(#9L5D(R8DGVlA;3ULmd!x*0f2>%fwdFC##ttwiL@|%x-VNR%lM#fb#-#zoM09N
zSy(m7jm}|Uu?19ArmBw5fsugd+kw_Y084zpx|hMG*<i~;@XQkMiwWMma=zIGRkuu<
z6++u|1<-wUAz;-DV405=4{*1vo&zBb+66RaLtt+u4%P!<;Q0^06Z4c})gs;#tgjjz
zHm1KekPVUG**8>QAXq*Wv;j<)*8pQ7c?w*pG3c=9^p})k8kjE^tQWMqcTvA}vZMK*
zh5lG-W6sQhte>m<Usd8E1~?P=b3QN((tu=OgA&tj0!v4L$H(e5ei3_mp?3r=TIEms
z5-(nBDs{oz%WbsJ@MM+1`Gdh+fEhpodY9+600=q)+*L=k4FV62wD9`bY8SM8MF8uU
zLq8PI8SBj(%?7;t_AQny9!G~d{?258cK~bA=a0#n1{^yE@Q7~6eq4(P7{Y5+C3Hsn
zv*Imv`4M<7PK%W*mwL0aK999)r?MzS&v*)q`@RtdJO{vpUYT_vFc0VyoQF-a;JG6;
zVu1Ra3Rb+S{v*KZcl8>j_u*jCWQFiDk`@3xTY(q=9(X{5R{#r&fj^D|JS1m&>VRQN
zuTk^-^{~<vz5<>IRLW<-EVGfc*jU;g&F|w%>ymN7`U&uUDR8|QMv^S0-*1*ZWi2Sf
zLl8G5g{G06K=*#&TPyG+v@f{SAMP~;n54wH6~OH>D4}eFk<Km`$tN{>AyB6&-vQv;
z7y2-`MIJg4n34c|nXbhi1gdpdtwt_N1-35)=8E(*0MGv8Kl*?HvKNdohxhs^*(!TH
aEahL~%m6_xa*MD40000<MNUMnLSTZ{#XVdA
literal 0
HcmV?d00001
diff --git a/share/icons/application/22x22/action/dialog-ok.png b/share/icons/application/22x22/action/dialog-ok.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b12d79a4b2f31102ea12b7fe2957a06ca75a739
GIT binary patch
literal 723
zcmV;^0xbQBP)<h;3K|Lk000e1NJLTq000&M000&U0{{R3^J<(40004iP)t-s|Ns90
z|Nj60KmY(U04pm198~}sO#l~001`I`BS#b=NC_xN3@A(sEJ_h5N);+Z6C*(sBRdc$
zI}ao`3?(%$NoyN5UmP?}9XD1JElwUcUlS@x6e~m%C_Wi9ToETZ95-POBQ*~xIUzxF
zBt29qKwv9JY%54~C`ooDMt2@TbY6L!AT~)nT!<t}fFC$LKV5<-OnWj>dNopcHc)IO
zK1nuEVI@68CqP0jM@lzTYdBP2IaYK!RA4(+W<XtMLtSx5W`;><b4q4|PivJ>Y<^O0
zk5h7$RB?+{a+_6jfmd^hS96(Ibdgzipjvj5UV4*WdYN8(onCvMUw4pSd7xi<m|%RF
zVSA!sf2(ACn`D5VWPqS$f1qW6nq`BXW`dk%gs^6Wv1Wy$XoH<-gQ9GPplpYtZHK0A
zhn{bUpm3A6agn}rjjeQ$r*x30b&#ockg0Z(u6L8Gd6lnuna6*fwt$?rf~3fWqPd2n
zx{0Q~i>JVqv&o*g%%#NHtgabl0000tbW%=J00IOB1_=ra4kRZzKt)VeUT1K4eSwdh
zo}i(uw7$Q_#?8*&;o{=t=jrb5@$~lj`uqF*{r>(cIwUUu007HLL_t(|+P%)#TY&)>
z1@ISHMUhoTipr*vne2?TjIuu@(y*0`kAL06=R(~3-JIu~s{?C9k*YRf1z9m1X{oS;
zB=3&L10`U%94v{l7K)<38mt{gv;1jpoWA#az0Ud8Y(4O|Yo0v-!pT#!(Wqb0VCF23
zAa70{{y0?5BcFOYVD@c+$9V2qeN#%md|Yk=%n7Xb;Y{(iT1mx>I}5*rcHiA|BItD)
z7_dlm^^klmL`+QhPwe>q`7-aqGKu@o!h#jJBOM#oV*+x$BR`z`3+4a-002ovPDHLk
FV1l{gE}#Ga
literal 0
HcmV?d00001
diff --git a/share/icons/application/22x22/status/dialog-error.png b/share/icons/application/22x22/status/dialog-error.png
new file mode 100644
index 0000000000000000000000000000000000000000..86a92a4ee9748f94dbd3f9ad7b9f66c46e748dfa
GIT binary patch
literal 972
zcmV;-12g=IP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX000A%Nkl<Zc-p;{
zT}+c#9LCE>`?i|V3B(JDGf_hva&Nra4JH<4Bv#X^iOOcPfS6Rn1sVZwj1tY}g~S*z
zntc&kRD!rIj+C!bDZYiZ@};$9pePK(q7bI%efvK9pUyUI`g);>JIOC6=Q+>+>HnN2
z=hXoCD5MCdHJXfT8jbFK;5F|IZd$jl(7AoPueqp*Id<+;T1!in8@qNXH}~vOZdoi!
zo7Jkc?cK{~zUDgLkNR3nCaEz$-_u|;7Ni7s96IzM<aA<|c;3>I#H_=SLef6fj9tBo
zzPh?#QZPTtPbL$aY-&=TUAlx1fojoQS}O6Zcrd@GZ`ZGnjGaHPJU(|0F~S!vAWSo7
zGJ)XPvk2GMBb4Cfwcl;r7~xq-!POc~WT>_#GIHt^Mu|scmX?<ALKHE6@+2PB)I=Gn
zuEz50ES9FGFkV}W@wfhAs-=w7;3^Wm$L*0}yB(txz!nz~8_(Qs1S%`xD=){=%uHN=
z6%HeC>=^u1BUT-cRH+5qN%YvhlJ6fr95qVI%Sas4E*D-+PbX=Mv=+%fWV2zg;v3nn
z7JQV%UaMIiuvj2ktr#dP1EZ^W*LXQO39s3VVe)dn_uxMHs9JD2iCx7-^1YH0h=iZ;
z?B0zxD&c>JLb$(e8z#u}fIQyfVsw77RVr5twvqUA?kB8$^=i1*u7$W^1H79y;YoKl
zBuRoS%W-@cFJiQy0HgW&aA#%Vj$V(JEP>h7g3Cy3&eE~lf`BeEx>u~gSYsm=78X=-
zA31^md56f${cT2pm8k_EAkq1$j{Qcao|P*xe&q`0=jY=L(vO6Cdy_P8MFsvK|2^W)
zDuEqP3*Jv+>na_)OD50e&3GORVs36Oig@`lMzmVo&do*8<%;W5{rwP)MtBVd{F*JW
z{c6D$9-RGO#{<ORmMwTXF@Zos10K?m<%|p{M0ZXOLY<xXv#$@nygW?AI;LQYTCkZ!
zN4A!Akg1pO6C(Y24{2VcZvV;5#2bRoe(K!6W(~rE5WR{n>bN~eVCGnG;v-~EOMCre
zwpMN>Gw-^e2oSt@hWJaT!wZ7XeEpdAhKU~H7s8pNlX*tcBgFYytL?7OOGlGl8~I)k
zm{YH39mMYh6-)gI@bz8N+YJWhp!vEW$UhXOqtck^NqLV?7!04+eU|C_GCl3JiH;Pb
uIDs9>>$s<cI<274Gr9W0|K-#4QTP`}gMY*rB2O0p0000<MNUMnLSTYc?AUJr
literal 0
HcmV?d00001
diff --git a/share/icons/application/22x22/status/dialog-information.png b/share/icons/application/22x22/status/dialog-information.png
new file mode 100644
index 0000000000000000000000000000000000000000..0222fcd7266cd47f5ee4ff955273ade43cb56adb
GIT binary patch
literal 1103
zcmV-V1hD&wP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX000CQNkl<Zc-oDX
z4NR1E9LIkr@#b=^Rcx6p7Ok~0tbqboqL3hnI>gl=XuKq(ymT)C@+w>;1OzqE0AF~?
z5YGdpR0Qte;DD4tLTNE->KIV1K{VGGh~T&1bI<U&!8M-kv*&-m-}m=<{`>FtJOscJ
z>ll0HX=WqyGULQ-VxD2v3mHrEmZUaQGczy9%XP}wQr)*PW%_#w6^2>asouGSO2e4!
zq@g9fwl{5hcJ?Izwrdef82gOVUB26s)pw87+(5nIF0S;CLpSs%v`q8B1k^qEkgFa<
z(6Osyg%|qw0eF&;SQL+skK1oPc&h02_^%&SwvM3AFpA=)5#(ux&G`J%2+nnl;*9P$
z_^YnW??^gdIys3A%jITg>af2+B~_|Xt-HfJ`WabuxBeF)Q{8?CfuA(v)yR_t0IXMt
zpYq9ZS--n*Hdp-<lB#c-kz8{VBNO+H@OnkR@ZxPe8&Wy<TEq!AGcl3Iine9`5LTo^
zLS;YVE6hpd;iW63dSFFgn29;j4T)d=px`oz-DJU=Ldp<d-iPSY?^h7{WjCr?hjFIm
z7esu~vuZ|=J4IE2q?rdyVs~Y+b8Ia_i@H{)uoEEy1)aj$V$M^k0d3DHSuQrXCaU@G
z)4qa`&-8e>uwZ2F!9(m-X@&Z#_@rG1d1ZB*#GZ;tX;Kq*9c?owTg$YeP%{MKT72{f
zKABus>9H%PL+C%w`tv$4=NgMMCzp$-+~iI0O1)|#y%k=WI(QxJKp3CvlGr1a>)D;y
zk*!ByUY9YqIk6GXM|=YctN^{0_V==*Q1ovIF2{4>XR$G|4vw*ncqQ>NoRhS8Bclre
z#|)UCpU1y5vvB;V8BR$Za8zhv71juP=NxE%4QOvAX!miD=f?vk@m6^a`4))HpeivO
z%0ut-nMJk2;qWy~Pfug?k4aEC*ABJ|b+I36l#6rzC16*rN$e_*Bkx>p@{<po1%+tD
zq3AYHY$qHN+fCw#7SQ2dp)U40$9b05gM2;(xys^9VrP{Nc_=0*=rrhE4uo9-MY15K
zlhNZv`I2}FwvjCQ&;W|NZtQbT%m>$k9lr~%$71oEWjpE3BMTJTAnxJ=E$C1WY!B%L
z>2kQn!o&fgFXqC(14&aBXsg0^)wdhD$?IunJ}9D@&#}X}D@j5hTylrtl6M;}`NMp_
z1&MqRBpVWU9j$|LW{dp1#n&d0_Y)jw;GHj$`$bTEA4vWqDCJjB#uzB)FXNqmi*;!e
zjM*)+24U8s*tBy+;5w=D9||Z2?I{DjcY$};%MZE%3g-vz`wA3L0_$zb_pRKOd)EGG
zV#qPd&c-8IW$&HVZReLUW#yB)D0w?|(b_+2+RiWix~*4Au8>*dH_tMBNd(rK{||ny
V$8947J6`|*002ovPDHLkV1lv?80-K5
literal 0
HcmV?d00001
diff --git a/share/icons/application/22x22/status/dialog-warning.png b/share/icons/application/22x22/status/dialog-warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3228493060998da43f8495709568fedf6c02451
GIT binary patch
literal 791
zcmV+y1L*vTP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX0008sNkl<Zc-qC4
zOGs2v7{|}tTe?VE_$VwjGa=1|w5&}M6oq8e%CZuqAkZEdF4~3mBHFYFeDxrt$q|VO
za>VhGIzGxr=xC$qIFpX~7<8JMMx8tN-hUs?9YQMcRV{v;dp^$h`~IA>xD3Ew;s1-J
zrl35$Pt4v>vDCo5keV_ewO^5?dai6^#GNc$sEYQ&+6WNBn@BIHwr;Up$Ja=P>%fQ}
z7=8<}F$X?9U$Z`OGmG=-clj`=hO1ixS4SCOEQFwo@}Zr@u30SB@&>8>GUS0`ShXcE
zS3ZW^dk>P~EJQtTSev+w?H6ixi|Bg*nC`+{b{|8}^C|HSpzA8Ux)=#9EP2&pLC1B9
zAI<@NH-S&N7<rlpbMZBxH<QHa5L=EysOCCWCw|8cFI30L=+7qcC7}NTtWUCFDas&m
zD)8|L(4B$>U9?PR53N}2)$)B}=SfO>hNP#6RM?)SVXX8R4LU&e6ky;u#GW*GwVZK9
zVo}dddtPs)L=iwwEJ+gpQ!*xB9wbOQm_++X8W02+d3dxT5bM~9<;9GtJR06Cw2;`y
zNJ^N9K?Y}aFuoBmv!4tz2wkD@sM!#x_m5(sie<Sg!b#+Bf`#}(*cc>>3i2rRPBK3e
z#8<+`!Ce^!LC4PjUaVoft2B6A=nnPE#ub5`q~j`#WJJJvF$}VU<W8zPh#6v<!DreI
zSE0&A8txbITm{Q@s-u80CCM}~OSnjE=P;VS4P%)RkmpG}Pj$B<w-Xa8IA86+oQCBr
z71JcgqY%5VCmgT^k}8cZ;ycM_ILNaq(6>MFY(Pp-7@u(`W*+iWxaChBxP~BSNsI^!
zuiUB9Fr_572T=Bt%2kaL7UexY2f?jL6w$yoElKQAZ)sj=-UIs`73>8J_S?%)ppfs!
zQ4|kXd6MiY-)vZ#I6y0lhk+$6Qm?E{Y~LcaL>o&)qe25qKr2Bjo!v`o>_7SE{Q$N`
VV5*ZCeck{7002ovPDHLkV1fetXj}jQ
literal 0
HcmV?d00001
diff --git a/src/core/DataPath.cpp b/src/core/DataPath.cpp
index 2b934bf6b..31bf35f81 100644
--- a/src/core/DataPath.cpp
+++ b/src/core/DataPath.cpp
@@ -38,7 +38,7 @@ QIcon DataPath::icon(const QString& category, const QString& name)
if (icon.isNull()) {
QStringList pngSizes;
- pngSizes << "16" << "24" << "32" << "48" << "64" << "128";
+ pngSizes << "16" << "22" << "24" << "32" << "48" << "64" << "128";
QString filename;
Q_FOREACH (const QString& size, pngSizes) {
filename = QString("%1/icons/application/%2x%2/%3/%4.png").arg(m_basePath, size, category, name);