From 3f96632302a0a2d817b16874c027d58539e59ae7 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Sat, 13 Oct 2012 21:51:10 +0200
Subject: [PATCH] Added nice icons to SourceTreePopupDialog, and layout fix.

---
 data/images/cancel.png                            | Bin 0 -> 798 bytes
 data/images/delete.png                            | Bin 0 -> 960 bytes
 resources.qrc                                     |   2 ++
 src/libtomahawk/widgets/SourceTreePopupDialog.cpp |   8 +++++---
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 data/images/cancel.png
 create mode 100644 data/images/delete.png

diff --git a/data/images/cancel.png b/data/images/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..f990ba8bd4230d19975f6837ba9d621616f4f232
GIT binary patch
literal 798
zcmV+(1L6FMP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000h6000i00p9kUR{#J4z)3_wR9J=0*H4I7RTKyC&u@fGH}=mE
zav&_BNQ9uET=-|uT&ODt3^Afb1hXiR5NZ)+8(X;0jY10-ZWRX6{vf(>B@PKSrZ_q?
z6vRx(%(xuq&#%ROkKcW__w)DOE2sk(e!p|i_k7R2=iGDe<3E;G4cisiirshv8}M{C
zH-mB9z>m0w<$o*4)i{FR(XKcqaTu%qDfwRfRzk3hDU4=gI@6_g6T*(wmKKgBP8V<<
zgLtk4vla(1jKv7IgrjPtyM;5!N-khyjRm|a)I#jzbXD*-5ojJC)gX?g4?iVAeANrI
zM`zpTv9BR{3*Y*CO)OzoH_&RuN^iPyIF%5`e#h}-8R&>&&YQ}~g#0?zDAvTsDQHC$
z<pN%ANPavaAHh@E+-pJ#+PE({6$26ITto6>3HePtlh|B}=C{NXapey-Apbfc|5<sj
zI273wPQ(?R4)<(L@-GtdTX?>U?F*6JrFdc@Q%=<+|4gx4-od&an7PdMcA4^*8swiQ
z<YU4Ld&!uR#m;8R(Te1sB;@1huZS%TU_4V!S8y<tkWb>pisbMx!~Gg7FY6TH+Q)!D
z)H%y}hkL08`T7WZk#J!UUNVH{u%iq31K~!?F@FgC<9>|*2BP0L;)!ihWWy!ELyC9&
z6ke%8oXZc9kGJB9J|UOwj3{>guF#%y;GaTUtt*>#(sx(M1Lbf;@_nY;k4KUILFTBg
zv~V@@GgM}@N@o|^I4isf^8Yh<y#YDJn|2IObTfQMvC8u?hc_FNAJnOzMQrZ{IGT_@
z!rKjqTf)lY;{CiT@N^QyWo)WJzF9HnZJelq2VW|tV+r5kJ>@;WAMXoCEygXXxbiaD
zDKwh2Ci1$tmyL&AZ0@R%^Io!2c*AuIq#N;&$5eYRbv{m8LNUf4r}=wtHVbe>czj;Z
c0{Q>TU%s0#!QSz$3;+NC07*qoM6N<$f-zZgcmMzZ

literal 0
HcmV?d00001

diff --git a/data/images/delete.png b/data/images/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1a9b64f22182415fd2f8dec69313ee15f099b19
GIT binary patch
literal 960
zcmV;x13&zUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000h6000i00p9kUR{#J5Vo5|nR9J<r*Gp&~RTKyCU%n74Xh^kc
zr7E=+Ti>F@gc?C?6+zIQU{UEt7ouoIkW$nN73@ach&%DIQBhZJ3MOd98hk}?CkUyE
zT9r1BVyiXgb8+u<Zl?E}nPC6$k<2}h|CxKwoO5oU_E?EKu?5%RVhl#v5lrJ7OyC2|
zEyH&$F2!p&hHlH>QM`)vP0ssjWGk>6+cA)=AH*cS!{NBL3LCKrs}tShcoDne|E;lB
z*v{gOj^p)6P#1I`#_%ToN$kJEMQzD1!_SHF1U4)u`oz!2iJzZ@<E+I6QL&3fJgfeV
zo6x~?(N`A-aDFf4e(X=kAO0W2RXmmiu`dR85}s6U*Pc^IUf_kq|KnBRxtNc_FNEEw
zq913rAi6~OBB~g`ROFb&*{N{1a_dJj#)J4&C@weFkdH>^M{#RLKBhd1XNtuReu;~F
zGe&**M7e!)!sl4U4VX#v{=_vIy@@FQG5U5>Vsv-LU<D3YTIpuv+ZGtEkavYTkPCEc
zqB9Cl$A`c5KI4%{S`A_Z*9#Rfl`Y`j9=?W@MQR7U7azXvVNjqr-;`*^$-A?F`x|_H
z8+G4;FXO}84Mv15ovRR5$+xxe^M2Hy><Dd^va!@*5_bsgw~9qPh&NjJITZg6Wh+tx
z=J8i%{fN-O+TcWa?+E8gXsJ!O65~SQs$vKq%71!Q6kM|%p+V5x@vacQ;q#KUMPX1W
za83;H>IPp$S3Ceal|6s3hr#9e)zXAp#6!46C_1U^H(b@j*GeH-yF&l5DKWe!W3Wb9
zDO2)C5}hrXAP(ZJjKBL5onb;A6f?kh#$Xu#R>&XC=-nptfI{zgm4*|sFUqGS$+#<V
zK9(_hAO^80%!s{kyO0xq$S32?%4W1P6|7QLxhYGB&;obK_lhbu;KI!MY03(CSXqBg
zV7qerUTQ(KT)dq4&rVw%e55>zCr%;xj)Z(%&78SfNRA?iJ@V60Tl5Q~SaI&(%NMaF
zSdSl)i1%wQEIC{&^p3*MG}g5>UW3mQ;|08f&FXigU#JQ1DvM1QpXo7<*UkI`cuJ^N
zrzh((F}U2-Y}C^1K8EMxZ=r^(7Hjc}(Cyk@PUnTJZ@i8z=hkzEFbixJuIKBNZ#yG2
imMNiO?G;LMBmM(U4lA%Soo;Rb0000<MNUMnLSTZ{smDS9

literal 0
HcmV?d00001

diff --git a/resources.qrc b/resources.qrc
index b464ae6c3..599a9f556 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -160,5 +160,7 @@
         <file>data/images/spotify-sourceicon.png</file>
         <file>data/images/account-offline.png</file>
         <file>data/images/account-online.png</file>
+        <file>data/images/cancel.png</file>
+        <file>data/images/delete.png</file>
     </qresource>
 </RCC>
diff --git a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
index 5869c50d5..81224190b 100644
--- a/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
+++ b/src/libtomahawk/widgets/SourceTreePopupDialog.cpp
@@ -62,16 +62,18 @@ SourceTreePopupDialog::SourceTreePopupDialog()
 
     m_label = new QLabel( this );
     m_buttons = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this );
-    //TODO: get some nice icons for this
-    m_buttons->button( QDialogButtonBox::Ok )->setIcon( QIcon() );
-    m_buttons->button( QDialogButtonBox::Cancel )->setIcon( QIcon() );
+
+    m_buttons->button( QDialogButtonBox::Ok )->setIcon( QIcon( RESPATH "images/delete.png" ) );
+    m_buttons->button( QDialogButtonBox::Cancel )->setIcon( QIcon( RESPATH "images/cancel.png" ) );
 
     connect( m_buttons, SIGNAL( accepted() ), this, SLOT( onAccepted() ) );
     connect( m_buttons, SIGNAL( rejected() ), this, SLOT( onRejected() ) );
 
     m_layout = new QVBoxLayout;
+    TomahawkUtils::unmarginLayout( m_layout );
     setLayout( m_layout );
     m_layout->setSpacing( 8 );
+    m_layout->setMargin( 6 );
 
     m_layout->addWidget( m_title );