From 328f75ac6db3b793de6ea0a43f5ec43785b42bc8 Mon Sep 17 00:00:00 2001 From: "Tux3 / Mlkj / !Lev.uXFMLA" Date: Sun, 25 Jan 2015 19:12:36 +0100 Subject: [PATCH] Add real buttons for CallConfirmWidget Still sort of placeholders, those are just upscaled buttons extracted from a screeshot, but those will work in the meantime --- res.qrc | 2 ++ src/widget/callconfirmwidget.cpp | 12 ++++++++++-- ui/acceptCall/acceptCall.png | Bin 0 -> 2708 bytes ui/rejectCall/rejectCall.png | Bin 0 -> 2717 bytes 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 ui/acceptCall/acceptCall.png create mode 100644 ui/rejectCall/rejectCall.png diff --git a/res.qrc b/res.qrc index a62fa5697..196a3b2e2 100644 --- a/res.qrc +++ b/res.qrc @@ -227,5 +227,7 @@ ui/window/applicationIcon.png ui/window/statusPanel.css ui/window/window.css + ui/acceptCall/acceptCall.png + ui/rejectCall/rejectCall.png diff --git a/src/widget/callconfirmwidget.cpp b/src/widget/callconfirmwidget.cpp index c1b7bcff2..2953cd30b 100644 --- a/src/widget/callconfirmwidget.cpp +++ b/src/widget/callconfirmwidget.cpp @@ -12,7 +12,7 @@ CallConfirmWidget::CallConfirmWidget(const QWidget *Anchor) : QWidget(Widget::getInstance()), anchor(Anchor), - rectW{130}, rectH{90}, + rectW{120}, rectH{85}, spikeW{30}, spikeH{15}, roundedFactor{15} { @@ -26,7 +26,15 @@ CallConfirmWidget::CallConfirmWidget(const QWidget *Anchor) : QLabel *callLabel = new QLabel(tr("Incoming call..."), this); callLabel->setAlignment(Qt::AlignHCenter); QDialogButtonBox *buttonBox = new QDialogButtonBox(Qt::Horizontal, this); - QPushButton *accept = new QPushButton("Accept", this), *reject = new QPushButton("Reject", this); + QPushButton *accept = new QPushButton(this), *reject = new QPushButton(this); + accept->setFlat(true); + reject->setFlat(true); + accept->setStyleSheet("QPushButton{border:none;}"); + reject->setStyleSheet("QPushButton{border:none;}"); + accept->setIcon(QIcon(":/ui/acceptCall/acceptCall.png")); + reject->setIcon(QIcon(":/ui/rejectCall/rejectCall.png")); + accept->setIconSize(accept->size()); + reject->setIconSize(reject->size()); buttonBox->addButton(accept, QDialogButtonBox::AcceptRole); buttonBox->addButton(reject, QDialogButtonBox::RejectRole); diff --git a/ui/acceptCall/acceptCall.png b/ui/acceptCall/acceptCall.png new file mode 100644 index 0000000000000000000000000000000000000000..c892aba9b58a0ab958e89a631d0cc06be75f173d GIT binary patch literal 2708 zcmV;F3TyR=P)(edpZ0clYjYvdQK_2m~kw#1sTnkcV0c(Z*`+_&~90bW~=nqcfcj z`j69&j-6KMjIH80Q>iV|DPVn#T9K-0bx=VO93G+aHX?>3o9AZl?%sRO=^wj$vw1-_ zguwU5&d%<6e6Qd4edjxekOM7WeG@jUe0`|D`OnwfTI(zKK4*}BvQGwJ2cocjF_0pF z04PB80K&qN`1kR9*FUuB;}PyPfM_^_R=iaQ0QBddu2Y%cZvXu)Wr0d_q2{LoZo(0k z@Jkz2q_Jh1(!(BQKo|)~Jqf7ZZDbNqHd+S28q_fZ8m;c9$DM1T@FmS{@;;>#5W|MOMXj`#?c z7`|!m+f+A;8TchLRET*{3`L8G1EdXDNdbzoEs?dOazFddP)ex(0*H`CQ4pSa{)%vW4(KDc?;N5`<=8H(2-nW?T_VwNlkRfT5z zpI}~AJ7OS@0!drF*|9VF*k>#EAITPG7_JraOunbIIyBq=1k>5#e%cximEc!{bC$lcj$;caGH?s=2}L_y52<$v?%o15cwZn|I0v z&3&8dW@$m(tOc+V1RvCpp>eFKmj^-|3adbPEt6-KufC}-gAcq}_gALj9_~*kIfe6? z{`UNp>+T%@_UrGj2{S{5m=7T4hS>9sT%MGp0<-fj^|}>nrT`313tX*-`PJM@73Tpi zPM`NAPL?bQo%mt(jP~9CYOpi_2vnL2iD4BKRjBjZoq8qW^dn=OKE)WP{|dnC8USd1 zDgaPHd~Ct3prDk3P$CsVNdplLZz_R^VKRWQ8-BS7r_Ycv^AiFQfe{;-i>18B&IrPV zCH&mvW0t!W6dY;8;9e9MVN4IrfQRY$qWLqlC)%KM9W+dR%7pX)0Kaq1vY&YJ_#$So z%f`YMnP8|h1Esz)Ob=CIe(54qxT(C zn=ZwPW4u|8nc+FOtat(Pjgb3)Tf7w?pQy)y&ITk!VmQ&O&j3xSGXXe3C}vf2jnSisI~EwR)8iw}Gt*P$l*Y77e$QRQ zQVDpu7p4(LLd1~}i9VH0=DU}BT}#X?oQ-0$)Wyq5s|jB;e~O(gpTm)M?yB^pOvAKb zs*#XO=p_)OlCYc@%FJ@qOt=n}`Kb_^5>UE~a^jc}n1s2-^Rck>Dir%l-F1$19m3nk zUd8_Qy(u9GBgrW#*OE@ENTeLB;wT$F&BV0O49qUN6jcQmqtIJ~pq`ICZMzVOw}2GE z$9*XGSKyMOd8jJ9*u{i`!okk3@ny?)9P0cUF{cLv0z>XXC_B{%(L@wr29QgW%@#I_ zyg^(!z8V*Xs^HfGDE5_Ng1-V?$xg)V9th=Nyng~_hUZ{j=^_L@dG7r7cm(ywx46I_ z7A6LRx=M8}Wuo_lm{a&=j3X%%INW&@tf)@Y)3XDS3OuP;k`aWS|gA6nTZi4RX4xr zis^?vc`TVri9*DnkOF&`-G$C%dkQ0I_u<45@C0FSugmChs}Wn8-p0|`LBxfXvh2vM z;ff(Gu`c#);#t1?-F=5ItD7~6>Fm1P3qJ>OVIgXFgEI{QPY^**9*78>I0%Heh~seA z0qkhmhK7#ah}zv}E<`pTLalr0jtv_%0D}8?Pp(OkK+u>5p#&oF7HmJc6;Znj*G{~_ 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