From 5381d55e942bb08ce6ff870626a0e10bfaa2358c Mon Sep 17 00:00:00 2001 From: Diadlo Date: Mon, 29 Aug 2016 16:42:56 +0300 Subject: [PATCH] feat(chatform): Changed mic and vol buttons --- res.qrc | 10 +--- src/widget/form/chatform.cpp | 5 ++ ui/micButton/micButton.css | 48 ++++++++++++++-- ui/micButton/micButton.png | Bin 593 -> 0 bytes ui/micButton/micButton.svg | 89 +++++++++++++++++++++++++++++ ui/micButton/micButtonDisabled.png | Bin 533 -> 0 bytes ui/micButton/micButtonHover.png | Bin 504 -> 0 bytes ui/micButton/micButtonPressed.png | Bin 521 -> 0 bytes ui/volButton/volButton.css | 48 ++++++++++++++-- ui/volButton/volButton.png | Bin 624 -> 0 bytes ui/volButton/volButton.svg | 79 +++++++++++++++++++++++++ ui/volButton/volButtonDisabled.png | Bin 582 -> 0 bytes ui/volButton/volButtonHover.png | Bin 590 -> 0 bytes ui/volButton/volButtonPressed.png | Bin 617 -> 0 bytes 14 files changed, 259 insertions(+), 20 deletions(-) delete mode 100644 ui/micButton/micButton.png create mode 100644 ui/micButton/micButton.svg delete mode 100644 ui/micButton/micButtonDisabled.png delete mode 100644 ui/micButton/micButtonHover.png delete mode 100644 ui/micButton/micButtonPressed.png delete mode 100644 ui/volButton/volButton.png create mode 100644 ui/volButton/volButton.svg delete mode 100644 ui/volButton/volButtonDisabled.png delete mode 100644 ui/volButton/volButtonHover.png delete mode 100644 ui/volButton/volButtonPressed.png diff --git a/res.qrc b/res.qrc index d156fb9f2..ff43f881c 100644 --- a/res.qrc +++ b/res.qrc @@ -65,10 +65,7 @@ ui/fileTransferWidget/fileTransferWidget.css ui/friendList/friendList.css ui/micButton/micButton.css - ui/micButton/micButton.png - ui/micButton/micButtonDisabled.png - ui/micButton/micButtonHover.png - ui/micButton/micButtonPressed.png + ui/micButton/micButton.svg ui/msgEdit/msgEdit.css ui/sendButton/sendButton.css ui/sendButton/sendButton.svg @@ -78,10 +75,8 @@ ui/statusButton/menu_indicator.svg ui/videoButton/videoButton.css ui/videoButton/videoButton.svg - ui/volButton/volButton.png - ui/volButton/volButtonHover.png - ui/volButton/volButtonPressed.png ui/volButton/volButton.css + ui/volButton/volButton.svg ui/window/statusPanel.css ui/window/window.css ui/chatArea/info.svg @@ -97,7 +92,6 @@ ui/fileTransferInstance/filetransferWidget.css ui/acceptCall/acceptCall.svg ui/rejectCall/rejectCall.svg - ui/volButton/volButtonDisabled.png img/login_logo.svg ui/notificationEdge/notificationEdge.css ui/loginScreen/loginScreen.css diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp index 55d9de4d1..1bb2836e0 100644 --- a/src/widget/form/chatform.cpp +++ b/src/widget/form/chatform.cpp @@ -951,6 +951,11 @@ void ChatForm::updateMuteVolButton() volButton->setToolTip(tr("Mute call")); } } + else + { + volButton->setObjectName(""); + volButton->setToolTip(tr("Sound can be disabled only during a call")); + } volButton->setStyleSheet(Style::getStylesheet(QStringLiteral(":/ui/volButton/volButton.css"))); } diff --git a/ui/micButton/micButton.css b/ui/micButton/micButton.css index 0a01aae39..099208095 100644 --- a/ui/micButton/micButton.css +++ b/ui/micButton/micButton.css @@ -1,14 +1,15 @@ QAbstractButton { - background-color: transparent; - background-image: url(":/ui/micButton/micButton.png"); - background-repeat: none; + border-radius: 5px; border: none; + background-image: url(":/ui/micButton/micButton.svg"); + background-repeat: none; + background-position: center; } QAbstractButton:disabled { - background-image: url(":/ui/micButton/micButtonDisabled.png"); + background-color: #919191; } QAbstractButton:focus @@ -16,12 +17,47 @@ QAbstractButton:focus outline: none; } +QAbstractButton#green +{ + background-color: #6bc260; +} + QAbstractButton#green:hover { - background-image: url(":/ui/micButton/micButtonHover.png"); + background-color: #79c76f; +} + +QAbstractButton#green:pressed +{ + background-color: #51b244; } QAbstractButton#red { - background-image: url(":/ui/micButton/micButtonPressed.png"); + background-color: #c84e4e; +} + +QAbstractButton#red:hover +{ + background-color: #e87474; +} + +QAbstractButton#red:pressed +{ + background-color: #df3b3b; +} + +QAbstractButton#yellow +{ + background-color: #e6e465; +} + +QAbstractButton#yellow:hover +{ + background-color: #e8e774; +} + +QAbstractButton#yellow:pressed +{ + background-color: #e3e155; } diff --git a/ui/micButton/micButton.png b/ui/micButton/micButton.png deleted file mode 100644 index 04965b6f0b3a1a0d9187570a3d660778e4fb062e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 593 zcmV-X0xOSJe)pjk~MT??E&_5UB zLd~6P5z1C!t|n|z3>YG945|sWjYYycEv7g4?z=Mz(SZy1oqNxBfA{gbN2b;$GQd1= z6-e=K@e6nXOnN{S7%AGgRJm@F%L-F zD}e?WF|9e!`aYU#&J`nKBhtpLG#;vos=8KC;(6n~O%!d!{4G}}){$-pK6wb@ykiX9 zpBdoZ&?AQP5~H-0ip!X#pAo}D-h4gn~n z3o)12@NiF9(@}Bb=T`uFyNU?HMx)k(hvVJ%8iLTRcZMr;}rPNbl@#Aa@ z4zSUv@qBZZQcndxnT^y$e%;jCM9eIuLYeWi*8#Zu_BP)vMW;{YxpV0O083kotbciZ zGBCh-e~{@5w<531_V&z&hivZG-8O6o4&(BfYxHG`4CXEZP~UyerytwA`n=N7iXL!a z_lxFhQbY`^J1ejQ&qn3|sMen}6$z*YAmXy(fd?!DSB`c#K~RCGrMZ}r@Bo0D>o;7` fec+}1uSWj|zf7z$dECGJ00000NkvXXu0mjfQBnc8 diff --git a/ui/micButton/micButton.svg b/ui/micButton/micButton.svg new file mode 100644 index 000000000..f89b0e514 --- /dev/null +++ b/ui/micButton/micButton.svg @@ -0,0 +1,89 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/ui/micButton/micButtonDisabled.png b/ui/micButton/micButtonDisabled.png deleted file mode 100644 index 5b94ddae7a705aa2e0e4687c9a5b0288352d50f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 533 zcmV+w0_y#VP)QE4ezd1>kpyG!r%X1eT1OZ8s5QgDhXc&ehNkR|=_rb2~qP52J zyt`n}^Uzx3y6%PTV&`}~0?=-^Yjte;+|s9vxtZ~PzX!ngeME#T%W6N#TFYj$K}7I< zzZP>7d^j8c&{`8k5owxMaDXh!ST2`DQH0jI7IU){0ISuC!C*if$K-iVnx>>_TG?Bz z7I7R`zKz{7nM@kHzT53G91gEu3K3yGpOfeL_rRt4{XU&ehhDD-z;?T3x7)E^uWxpY zYs7qAn-?Nd0Y;+{0E@-qZnqdQU#_9}WtAPCPdE{&V5d6Wo6Tky_CghVYt3B#*P#Cg XO-0CI^Qt=?00000NkvXXu0mjfpCs&d diff --git a/ui/micButton/micButtonHover.png b/ui/micButton/micButtonHover.png deleted file mode 100644 index bc92ceecd0f108c2db78bae6da3748a3322c65f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 504 zcmVfSBggT*4jt)*HPLenn!^Fx+ zV$~WKKjL80kZ4p&91O9~K}%?$A5pwbhj)9=ukFn}mlPWLFn|MDh^=4*(duX?0M>i} z_T8Wx^V^p5*2TJQtt`ZrTOI9#RL;xH4QepMlB0w=!U4eN_G>1T5;~A`3hK3Yj4?3A zJonlYm=X&1bBz@In-~CxXc)yz3GqP6RU8kbP|TDNqG5M1M>&YRgorW#{DVDAo0VpY z^@#PvUJ!JlQt_;-xm@4a@w$^!!u&AKmX>rFs3Anlrd6fb*@bu8I=LB=dy=05=B*I439J zzyO1bi_C6r_C2$P5M1o+@OFCI`+Ja9jIOLOoK9nAG5|QW8n1VEG|OfG8yf`f6r&*V zX@QTo*A6Eyo#ilc*=hYYxt}qQA}?cX7|I;zrO9Ed>lFHzF*d#cM}?gRr6jG|00000 LNkvXXu0mjfbm8K= diff --git a/ui/volButton/volButton.css b/ui/volButton/volButton.css index b537ee217..5203d998d 100644 --- a/ui/volButton/volButton.css +++ b/ui/volButton/volButton.css @@ -1,14 +1,15 @@ QAbstractButton { - background-color: transparent; - background-image: url(":/ui/volButton/volButton.png"); - background-repeat: none; + border-radius: 5px; border: none; + background-image: url(":/ui/volButton/volButton.svg"); + background-repeat: none; + background-position: center; } QAbstractButton:disabled { - background-image: url(":/ui/volButton/volButtonDisabled.png"); + background-color: #919191; } QAbstractButton:focus @@ -16,12 +17,47 @@ QAbstractButton:focus outline: none; } +QAbstractButton#green +{ + background-color: #6bc260; +} + QAbstractButton#green:hover { - background-image: url(":/ui/volButton/volButtonHover.png"); + background-color: #79c76f; +} + +QAbstractButton#green:pressed +{ + background-color: #51b244; } QAbstractButton#red { - background-image: url(":/ui/volButton/volButtonPressed.png"); + background-color: #c84e4e; +} + +QAbstractButton#red:hover +{ + background-color: #e87474; +} + +QAbstractButton#red:pressed +{ + background-color: #df3b3b; +} + +QAbstractButton#yellow +{ + background-color: #e6e465; +} + +QAbstractButton#yellow:hover +{ + background-color: #e8e774; +} + +QAbstractButton#yellow:pressed +{ + background-color: #e3e155; } diff --git a/ui/volButton/volButton.png b/ui/volButton/volButton.png deleted file mode 100644 index b07c132092c6c6428e93eb83a269d22e0e1858eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmV-$0+0QPP)Tl;2B}Q5eTR@4GWL-fcEB z3*6eKtSHwC>LMZtCAFMrX<|1K;Y}BTm;E_G;YG-d=!cXo^2fz4iZm}0;Vl!}%GP3O zwbOq(5_s6VwO zD8Q%e3MvA>s}X>=t2#bspiJ}6?>1k|(Nwb!fb`E4wf4I00fT{11PThOqEa;0w+C#q z*jZfDF)(mgU1SScIXIr0+A?&PeK+}Hj)lxT08KSP7FYE$P3cvP=)+~-wY8yx^Nj;i z@Im(>7BcgE%dY_t+_9g@WK8b3GM**Jx%VzAt$7??X45YKXs!*DE&L$yeOc~U7Ecq8 zP*92Z&S6nYKcCxgZk5(8o^~cG+-^87U8iga#S&wTzkgWu@c74RW>U{9)9V6=0vAC( zga95d-$$qd&8nGdGoMXRfT#cl`90yP4tfKF2TOOVx~_;(VDK0InUT_o7<#n;0000< KMNUMnLSTZRrxv0B diff --git a/ui/volButton/volButton.svg b/ui/volButton/volButton.svg new file mode 100644 index 000000000..ff68bade9 --- /dev/null +++ b/ui/volButton/volButton.svg @@ -0,0 +1,79 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/ui/volButton/volButtonDisabled.png b/ui/volButton/volButtonDisabled.png deleted file mode 100644 index 78862daab8bbaf4072adc444f2a31a5de074e02a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmV-M0=fN(P)eB@0n${bCRm_%p1gq&6Vv-g^{*T32S7HYNH2jCm<5fJ%*dwg_Fr7#bVJm7Yc<)r_%tm zS}kI+7*9`6XB@}rP%f7(J-mkDa7eXUWiS}9*=(54=R~7X#^bToaXcP>c%D|P6{0BO z_xk}b3FT&G77Mo9EdYT)fWct!SS$Md zK8;4hHs|qpn9XJYgu`KWyB*8r(%!Khdc7WkAdt`J5yd|qE^l_}_T>2O))MM=yL398 ztHnp75!31PGW_NMUV+comJmR@-A0lmWLdW4PA$2>s{?rXwc&0q`ew8FFN^-=2N4pC Ut0cNYFaQ7m07*qoM6N<$f)nKd&j0`b diff --git a/ui/volButton/volButtonHover.png b/ui/volButton/volButtonHover.png deleted file mode 100644 index 4a5e47d97d2e12527fe14c7ee6a99c768011a4b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 590 zcmV-U0Tl_Dy1E2Blz`{0NXL4vAiHH! z#bncYAtiiQ)75<;q=e_4q@(^Zru%1@2u_*$ez6;=F4@WF1t)3TH_FY(tS$419v+Q6 zwPj7kBfd-Aids_&xK9I6tZC%RS*`_dv@VV*ab}})w(NrcBIAJx0Mc7YF87XG<`@A@ z2CrK(Y*gveTb{(8@v;0KfX~}G2IR98cE4KR_-gNDOVU3JCC+pN0r*zQ6FC+Ai~naG z)N2g-h5;z=mFVsav_}lbNUq;W3NC^A@lkuk9NPg^ zHUJp(4N<7%P2Bh^QpKd{xW<$?cLwg;N{7AY`LeTSJP&o91v15ot)YJ&Px# diff --git a/ui/volButton/volButtonPressed.png b/ui/volButton/volButtonPressed.png deleted file mode 100644 index c2379c1c96bde716382e3dc2c3a96af96735a28f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 617 zcmV-v0+#)WP)Tls!*cVHk!l4p<2lF??tn zk&i?TMp#@-2bIM%E*OY0#5mBz!HLnoQN!e5IvK-YqKlJEy42K|qsv*)6e(&-p;S_- zAke{j3~~gTa8FOp{k+$Ezh6hS_Az8IU-QW-WdpQ9sS)FL`VAj6rthq^0)4x*M2Akt zMI_R&uV2dgD}wP(_1WjEHiPzsLfCvh0KNpCGUz5IDCP5%M6qs+&T$G{DrS9xx zG#sXCxBnm5vao<7P`^uEUN04!jm+^e8BxUU_qPr<2ZK1~<`lgij|c0_3;>Cp9W3MH zR0alWdNhxPEgYuL>ut0ESy!^B=1R4!` zrxSpic$_YWqo$|n;k~3vu}JsO5CDJDX|yI&d%#qys5B2dsS*UL<#Kz#YOR)hJPtsI zUeA4@pbSp$@3#yUTrMibA~{I{pnGtTn}3r$O1>2rkx0#RH3x$@=jRo{J#IHSNkWxK z0ALs%<}wyjPW)UyqEWtXZ7F)MtyVHeM-TPX6!*8cluk~R6Dujbxe0=RZFUwxt(Lzh zS6Ah_e|owuZNtPed}D)eySp#?*9QmW6nypjz&n>AU2r#o{}x56dOd|yieHC^HQwFX zSzUi})EL!ddRbOgjIWygldsm-8`-i_BgXAaFUx-cdIzfIV0;`R00000NkvXXu0mjf Dyg3GZ