From 5861c6daa56eca4870f83c34badd22a59ba72db5 Mon Sep 17 00:00:00 2001 From: agilob Date: Wed, 17 Dec 2014 12:36:34 +0100 Subject: [PATCH] removing fixed size from mic/volume buttons so they align nicely --- src/widget/form/genericchatform.cpp | 30 +++++++++++++++------------- ui/volButton/volButton.css | 4 ++-- ui/volButton/volButton.png | Bin 637 -> 624 bytes ui/volButton/volButtonHover.png | Bin 597 -> 590 bytes ui/volButton/volButtonPressed.png | Bin 629 -> 617 bytes 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp index 4f3572409..30dadae74 100644 --- a/src/widget/form/genericchatform.cpp +++ b/src/widget/form/genericchatform.cpp @@ -52,10 +52,13 @@ GenericChatForm::GenericChatForm(QWidget *parent) : nameLabel->setEditable(true); avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png"); - QHBoxLayout *headLayout = new QHBoxLayout(), *mainFootLayout = new QHBoxLayout(); - headTextLayout = new QVBoxLayout(); - QVBoxLayout *mainLayout = new QVBoxLayout(); - QVBoxLayout *footButtonsSmall = new QVBoxLayout(), *volMicLayout = new QVBoxLayout(); + QHBoxLayout *headLayout = new QHBoxLayout(), + *mainFootLayout = new QHBoxLayout(); + + QVBoxLayout *mainLayout = new QVBoxLayout(), + *footButtonsSmall = new QVBoxLayout(), + *volMicLayout = new QVBoxLayout(); + headTextLayout = new QVBoxLayout(); chatWidget = new ChatAreaWidget(); @@ -76,10 +79,10 @@ GenericChatForm::GenericChatForm(QWidget *parent) : videoButton->setFixedSize(50,40); videoButton->setToolTip(tr("Video call: RED means you're on a call")); volButton = new QPushButton(); - volButton->setFixedSize(25,20); + //volButton->setFixedSize(25,20); volButton->setToolTip(tr("Toggle speakers volume: RED is OFF")); micButton = new QPushButton(); - micButton->setFixedSize(25,20); + // micButton->setFixedSize(25,20); micButton->setToolTip(tr("Toggle microphone: RED is OFF")); footButtonsSmall->setSpacing(2); @@ -119,6 +122,13 @@ GenericChatForm::GenericChatForm(QWidget *parent) : mainFootLayout->addSpacing(5); mainFootLayout->addWidget(sendButton); mainFootLayout->setSpacing(0); + + headTextLayout->addStretch(); + headTextLayout->addWidget(nameLabel); + + volMicLayout->addWidget(micButton, Qt::AlignTop); + volMicLayout->addSpacing(2); + volMicLayout->addWidget(volButton, Qt::AlignBottom); headWidget->setLayout(headLayout); headLayout->addWidget(avatar); @@ -130,14 +140,6 @@ GenericChatForm::GenericChatForm(QWidget *parent) : headLayout->addWidget(videoButton); headLayout->setSpacing(0); - volMicLayout->addStretch(); - volMicLayout->addWidget(micButton); - volMicLayout->addWidget(volButton); - volMicLayout->addStretch(); - - headTextLayout->addStretch(); - headTextLayout->addWidget(nameLabel); - //Fix for incorrect layouts on OS X as per //https://bugreports.qt-project.org/browse/QTBUG-14591 sendButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); diff --git a/ui/volButton/volButton.css b/ui/volButton/volButton.css index 3bf4d64a8..8210f4819 100644 --- a/ui/volButton/volButton.css +++ b/ui/volButton/volButton.css @@ -5,7 +5,7 @@ QPushButton#green background-repeat: none; border: none; width: 25px; - height: 20px; + height: 18px; } QPushButton#green:hover @@ -20,7 +20,7 @@ QPushButton#red background-repeat: none; border: none; width: 25px; - height: 20px; + height: 18px; } QPushButton:focus { diff --git a/ui/volButton/volButton.png b/ui/volButton/volButton.png index a1c474eab843e1cc93d58278740492626de1dcab..b07c132092c6c6428e93eb83a269d22e0e1858eb 100644 GIT binary patch delta 599 zcmV-d0;v7{1n>lqB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01m_e01m_fl`9S#0006K zNklFyE8W4Z8kFt+}ftBDAx+=A|ePSwVY^aVmA@tO&5We{W(G5 zMaYckhmQILBXviKuS}aApQt~zB`CnB>1H9;0v^)gNARgCDvW#6^6p@Z{{15)ro_aPQC^L)#%0TA4=pUGrQ?zl3ZCC9n< zE-I~g9A0MAF92w+4U;YWAn|=!?pPL26OT|(iTKW8QAX>jH=Z7ePLR03I*jN2mhLs+nptpG{DJr~n4}J>jYj ldIN(8OLwZeu82`!@E87>kCwccBtpET53Q0skR5;76l-)~{VHn1L@5k79x7o}raBG{gqFO7c zgNPuM)N-PwiJe4*CmjSH_U8nJ2O%q>4=G#Z$H5MaG!GJCWq)E@=~^tU7W;ZTC`a4- zY%cOXdbscFxt@!Q`?;j+Q&%H=VF`98-R zPoSyR5{$Ze81!8>cvz_>KZY3&++ZU9jIWs#Z@$cPwBZ<$)oG*RlZ~fq-lw(nDl#e_ zdouv<)}y#>-rB6#s}IBm|Eal zb^`$4j{Qu=!?juQB0kQ8_aWiTX>~D|eEEB)>jR{7KZt!_5i1te^Vkz4WP1kMDIB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01FcU01FcV0GgZ_0005- zNkl_Dy1E2Blz`{0NXL4vAiHH!#bncYAtiiQ)75<;q=e_4q@(^Zru%1@2u_*$ zez6;=F4@WF1t)3TH_FY(tS$419v+Q6wPj7kBfd-Aids_&xK9I6tZC%RS*`_dv@VV* zab}})w(NrcB7ft72>{YtNiO$}Tjm%6O$M)9GHg`o(p#Ryp7F8#9)Qo=IR@mj6n4K_ z-}q|pWJ}UN3nk8U1OfO~$rCvh{fqx+9n@sF{9R_(ftU&f;nUBK|fKSDmh&1 z0yB}@h=OSJm$wqec&cxjWi?@0>$rKVl`L;IUN__`TACl#@0Px#>FT1>4VT@?APEw( zTeh&D`!1W7o~Emd60o4@YKPOEoZ0@+44;%P0SmtXL9&o@w^K0F00000NkvXXu0mjf DmQN9Y delta 553 zcmV+^0@nS`1l0tPBo78+OGiWiYXHIkV8}S$Rgp0le*gz`Nliru-V6j0Dlc~|m7f3r z0pdwSK~y-)t(4zOQ(+j#KYP!ale5m8F58$grfIZXAtYD`CXp8j*$*VVtgD2goBo-u zy7nRnf^K3g+XxGGF@`0=j=hob9Ns1S;ox`~dtcWeJ@Lx9@SY_**?@)H4o1@vuODudh2`I7M~*cTzY6)zeCM zz%HeioRtN@?bIosl;z;{LZV|Ub`G}z81;;iD`n+fk;upE#xF^%IMBqwiP67N!{lH( z8N*T$G{DrS9xxG#sXCxBnm5vao<7P`^uEUN04!jm+^e8BxUU z_qPr<2ZK1~=6@8u9*+m>%nSgDogFOW<5UI)YI-z}g)JPW&+Bcp09jYD7@n0CF8B7} z{G9CRDWEXSkO0h`y&=3HB(rL6N zQ+vQvtEe;&JE;-`s^xNfz-q0Qd^`?7hhEQpp`Z*-?|<*N3>921D#ao>NdlmIaFCmS zlRQek6&I06&2u#egE;5s6~R4jH#tc{l}G?!7#`*_7E@0ATtA{wzHV(PdatckGDk-b z_0$yix3`o|PLvZXDZRM~f`Dyy7D26+zb98$<+^`*x-MzigKxXLFZ$O92jmod z_4~j(mq{UAa5sYg7DcLhJ%v@d>kSG00001oZ@vBo78+OGiWiYXHIkV8}S$Rgp0le*gz`Nliru-V6j0DjB$z00sa6 z0s=`yK~y-)t(3h_T45B2pL@Yds7S+ywkh(FsG$)S7t=vyF^vlbVhk}3G;wfZ^xvpq zaxk5YVKAwSlT5nQ)R?QwUC<(dMjveG>S7A z1mH{fE(hc2D3xN7iX=7N5nDm+b91-Q`=;ycWGEJ+?s7d1Y@eOQ9d52tS0F&m=_I$m zPfn6>g+kiFwnzl`^t7t>!tcj1ISD{|V*~rhe+ad{zJ?h6f5#b%(HjV8>ik(UiGOjC z)2%HyJ|=&7h;?|FpP5W^#`du>%_CKnWzg#}c{~7Iq*8Rb-A`-YLsl!7=^hvW;E$qU zuv*&#rd~(T-&9f%Me5aRd%!w_fnq8JK!?f1b*ZEdR<^e_Lq)HbTDeR?mI3JQ@8{y* zeb9ON{a)K-cgi3DHQ*HyLW4hOlty&Hdg zoa@U=DhCJZ8LOGHwg#ezb7~4vr@KAREG^wFor#I2Y&A7cSzYDZ=H`R?`OXdn6kqIuEhdRX`i XdIzfIRs)|900000NkvXXu0mjfO_>uB