From 47a38a971866e205457d89c0cbca7ee8a73b67c2 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Tue, 14 Aug 2012 11:46:13 +0200 Subject: [PATCH] Added "add-contact" icon and removed tweet sending from accounts widget. --- data/images/add-contact.png | Bin 0 -> 2250 bytes resources.qrc | 1 + src/widgets/AccountWidget.cpp | 53 ++++++++++-------------------- src/widgets/AccountWidget.h | 3 +- src/widgets/SlideSwitchButton.cpp | 1 - 5 files changed, 20 insertions(+), 38 deletions(-) create mode 100644 data/images/add-contact.png diff --git a/data/images/add-contact.png b/data/images/add-contact.png new file mode 100644 index 0000000000000000000000000000000000000000..96341f292a651f8b82ca5c573a4f060aea321355 GIT binary patch literal 2250 zcmV;*2sQVKP)AyqBv8;zn6qyK<) z{XMj8PiX5_{ONnNUB79LR@|z+q1?mI2C^ol;f+&ft<=l-ig#P(l-()~%KH>N2+34u zkLbE4H`2OBQhrkv&{sks7@24DMY+h+G*7E2y2gvEtSpmq9%p!&<2V_)m7@EWOE+@a zKkjUjI~d`E&5d~FY-v;rjtdhpttFY(^1)@(TFxiA$csT=zIiNp?+oF|v_3i6o=fj_ z<4yez{;%=dp?I>g000JYNklwsfuJBhqDXuu5|u9+6(y1Qih*FF7NgOKNvVlE#2`gY)T%rbqitHHDnd)8h2DaF z-|@qmo1QsyX6DT7bLL*?KUv9~bM{_)t$og3d+oK>j2J$ifkk*0j>7@`7yrgTn!ksJ zks*$CJkG&cSc((yG&HaioAFoNf!p!W5M`?sOYki`B9tvd+we^+o&tF*!wg)BCzMw_ zPdo8>%p0=o$#^z?WpKswbbeie)?ouq!7akj72%IqgZr?xdG9!!h81{OrtKf_LEKZo zXA}#XG*{>{jtB5h>`u^OV4Q#rir?aDoLPd$a@>j=aAd*r7vgIC8M_L`*)MjJ@8ETV ztI|IX6V^K~&~{u@0slq#0rnP*(T&#NRTYfi6PFhZ{t#YT0q;x1&M>GAIUo#jZQK5d zcr-WY<9I~{ygzMl#q;zdu{%|cs|yDEa0PrnUcfh%zE^=5_*kFqCvkWm{oalFsS|LN@WirMo5*t+PVb}r zpj+EqoRc~Mb1^4(@BT!duh!p}IhOg|uRdpu^={J@v$cPAI}&-G*5%n|;csy8&2Py( z9~V2qBpO1-g&p`U89=@kEXE$K#wFG5yj8K$`XP=H+iRAxOJJnn`D~q?sryrxz)mp% zS&4qYkfTPXO{3uX|3pA$ZvoF4sT1(1i1cKU`dRJjaQ`w9Pn?;fybZ`d ze>y&**ahB`Y6Es*Bc7AFw>**OgB|W)Ada^?9Q^D@@MT=rynYQ&xhc4XI1uG7-(mVv}~e&<}pCbzS$ufz0oT zKF7K9D(=Z=mZ}79bD68+fQO&AN_7nLGGa_ z4$#0VY0;Ni_)7=gdHQLl-hs`wu0` z)`GLe)|DM#FP>ik?~f{{P(SqT3gl|Ti?qAM7gogk3e_q9UFngkLX3+2J3H9-E9C!n zJZx~q_lWaAt+*~X=r-*>LJAg$WJgglq#ONAYqqI2oLw;Zr)n7IR1y2zR50EoJuEU& zJx``pCJJT>CnlTH-Yo3H*1{gWajZB3Z!CCrBu*Bt?>uoRdQ9X6H;A2R=(tq-+xT$; zzg1$-zFheE(;hQ~JDi_{&kexqvpF7r7b&u7k24iJFjpzRwEW z-6EgSY*WXxY(d%W4UQ;kuj7-pd)q13r}y)bxlgwo@pAZiV65?kI- zFzgA);+Q58pZjA|D9fRXTF%CzW@xd95vIP`g<|Q9NzXghhGTIazAo1CxPu05wK&h8 z)Ca$lntfI`c{D^C?)S|x&J&sGWTe=DIie!te7shqt-4{SIHj$}zeHL5=DR%#BDc8hp_YJRc>r;E?5 zi~#FJD*7FGCBA@rl@D)cX`iSEzDk@hFKY76#~wS;Pn0ON>1G3t$7k>Xttsd{){6X!;gq{{bEu5ak5zNM~f&D@#c1jP}W9~8oRg2JD=}6T+|T08E?}){Jvj=!LQU> zNzxOSh;`LzcK6^$yh&_zgQBR)qaPe0Vgxs856friKX_LehBJj9-tE&`rDkI@AeIW* zy2*aM&J`$@=w6+9hd8fKcdQWAqn-3vix=cOy+!9gHEj}=n@=`etaIpm8{RtE@IsxF ziYuiTJxwL%3muAdn-IHIVU_h3HU3d)3UGnq)Y@8NtI6K{tqLotrx8xnZsYDA)4tEH z6WNwihbmtE*p0tw{TIu`Nb}}XP1&-zYgBhH@2QT%Mn!D?P{rmE;S{VCXYfM_8}YvX Y1B^0rRmJNImH+?%07*qoM6N<$f-0~>h5!Hn literal 0 HcmV?d00001 diff --git a/resources.qrc b/resources.qrc index 31c2acd60..f2d25998b 100644 --- a/resources.qrc +++ b/resources.qrc @@ -150,5 +150,6 @@ data/images/scrollbar-horizontal-handle.png data/images/subscribe-on.png data/images/subscribe-off.png + data/images/add-contact.png diff --git a/src/widgets/AccountWidget.cpp b/src/widgets/AccountWidget.cpp index 05afef7af..7108990ca 100644 --- a/src/widgets/AccountWidget.cpp +++ b/src/widgets/AccountWidget.cpp @@ -87,54 +87,42 @@ AccountWidget::AccountWidget( QWidget* parent ) m_statusToggle = new SlideSwitchButton( this ); m_statusToggle->setContentsMargins( 0, 0, 0, 0 ); m_statusToggle->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding ); - m_statusToggle->setFixedWidth( m_statusToggle->sizeHint().width() ); + m_statusToggle->setFixedSize( m_statusToggle->sizeHint() ); QHBoxLayout *statusToggleLayout = new QHBoxLayout( this ); vLayout->addLayout( statusToggleLayout, 0, 1, 1, 1 ); statusToggleLayout->addStretch(); statusToggleLayout->addWidget( m_statusToggle ); //vLayout->addWidget( m_statusToggle, 0, 1 ); - UnstyledFrame* inviteContainer = new UnstyledFrame( this ); - vLayout->addWidget( inviteContainer, 1, 0 ); - inviteContainer->setFrameColor( QColor( 0x8c, 0x8c, 0x8c ) ); //from ProxyStyle - inviteContainer->setFixedWidth( inviteContainer->logicalDpiX() * 2 ); - inviteContainer->setContentsMargins( 1, 1, 1, 2 ); - inviteContainer->setAttribute( Qt::WA_TranslucentBackground, false ); - inviteContainer->setStyleSheet( "background: white" ); + m_inviteContainer = new UnstyledFrame( this ); + vLayout->addWidget( m_inviteContainer, 1, 0 ); + m_inviteContainer->setFrameColor( QColor( 0x8c, 0x8c, 0x8c ) ); //from ProxyStyle + m_inviteContainer->setFixedWidth( m_inviteContainer->logicalDpiX() * 2 ); + m_inviteContainer->setContentsMargins( 1, 1, 1, 2 ); + m_inviteContainer->setAttribute( Qt::WA_TranslucentBackground, false ); + m_inviteContainer->setStyleSheet( "background: white" ); - QHBoxLayout* containerLayout = new QHBoxLayout( inviteContainer ); - inviteContainer->setLayout( containerLayout ); + QHBoxLayout* containerLayout = new QHBoxLayout( m_inviteContainer ); + m_inviteContainer->setLayout( containerLayout ); TomahawkUtils::unmarginLayout( containerLayout ); containerLayout->setContentsMargins( 1, 1, 0, 0 ); - m_addAccountIcon = new QLabel( inviteContainer ); + m_addAccountIcon = new QLabel( m_inviteContainer ); m_addAccountIcon->setContentsMargins( 1, 0, 0, 0 ); - m_addAccountIcon->setPixmap( QIcon( RESPATH "images/user-avatar.png" ).pixmap( 16 ) ); + m_addAccountIcon->setPixmap( QIcon( RESPATH "images/add-contact.png" ).pixmap( 16 ) ); m_addAccountIcon->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ); m_addAccountIcon->setAlignment( Qt::AlignCenter ); containerLayout->addWidget( m_addAccountIcon ); - m_tweetMenuButton = new QToolButton( inviteContainer ); - m_tweetMenuButton->setContentsMargins( 1, 0, 0, 0 ); - m_tweetMenuButton->setIcon( QIcon( RESPATH "images/jump-link.png" ) ); - m_tweetMenuButton->setToolButtonStyle( Qt::ToolButtonIconOnly ); - m_tweetMenuButton->setPopupMode( QToolButton::InstantPopup ); - m_tweetMenuButton->setMenu( new QMenu() ); - m_tweetMenuButton->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding ); - m_tweetMenuButton->setFixedWidth( m_tweetMenuButton->sizeHint().height() ); //accommodate the menu indicator - QString tweetMenuButtonSheet( - "QToolButton { border: none; backgroud: white; }" - "QToolButton::menu-indicator { left: 3px; }" ); - m_tweetMenuButton->setStyleSheet( tweetMenuButtonSheet ); - containerLayout->addWidget( m_tweetMenuButton ); - - m_inviteEdit = new QLineEdit( inviteContainer ); + m_inviteEdit = new QLineEdit( m_inviteContainer ); m_inviteEdit->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); containerLayout->addWidget( m_inviteEdit ); m_inviteEdit->setFrame( false ); + idContainer->setFixedWidth( m_inviteContainer->width() ); m_inviteButton = new QPushButton( this ); m_inviteButton->setFixedWidth( m_inviteButton->logicalDpiX() * 0.8 ); + m_inviteButton->setText( tr( "Invite" ) ); vLayout->addWidget( m_inviteButton, 1, 1 ); } @@ -171,15 +159,8 @@ AccountWidget::update( const QPersistentModelIndex& idx, int accountIdx ) .value< QObject* >() ); if ( fac->factoryId() == "twitteraccount" ) { - m_inviteButton->setText( tr( "Tweet" ) ); - m_addAccountIcon->setVisible( false ); - m_tweetMenuButton->setVisible( true ); - } - else - { - m_inviteButton->setText( tr( "Invite" ) ); - m_tweetMenuButton->setVisible( false ); - m_addAccountIcon->setVisible( true ); + m_inviteContainer->setVisible( false ); + m_inviteButton->setVisible( false ); } switch ( account->connectionState() ) diff --git a/src/widgets/AccountWidget.h b/src/widgets/AccountWidget.h index 42194eb17..ff9177438 100644 --- a/src/widgets/AccountWidget.h +++ b/src/widgets/AccountWidget.h @@ -25,6 +25,7 @@ class AnimatedSpinner; class ElidedLabel; class SlideSwitchButton; +class UnstyledFrame; class QLabel; class QLineEdit; class QPushButton; @@ -52,8 +53,8 @@ private: SlideSwitchButton* m_statusToggle; QLineEdit* m_inviteEdit; QPushButton* m_inviteButton; + UnstyledFrame* m_inviteContainer; QLabel* m_addAccountIcon; - QToolButton* m_tweetMenuButton; QPersistentModelIndex m_myFactoryIdx; int m_myAccountIdx; diff --git a/src/widgets/SlideSwitchButton.cpp b/src/widgets/SlideSwitchButton.cpp index 8d6f66841..580755999 100644 --- a/src/widgets/SlideSwitchButton.cpp +++ b/src/widgets/SlideSwitchButton.cpp @@ -67,7 +67,6 @@ QSize SlideSwitchButton::sizeHint() { QSize size = QPushButton::sizeHint(); - size.rheight() += 6; //margins QFontMetrics fm( m_textFont ); int maxTextLength = qMax( fm.boundingRect( m_checkedText ).width(), fm.boundingRect( m_uncheckedText ).width() );