From f774ae4731d9019b125dc03ae2e8cd2c14dc8a47 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Tue, 3 May 2011 23:21:00 -0400 Subject: [PATCH] icon update add zeroconf config too --- data/images/account-settings.png | Bin 6181 -> 4531 bytes data/images/advanced-settings.png | Bin 5897 -> 1733 bytes data/images/music-settings.png | Bin 5679 -> 4044 bytes data/images/sipplugin-add.png | Bin 0 -> 771 bytes data/images/sipplugin-offline.png | Bin 489 -> 1468 bytes data/images/sipplugin-online.png | Bin 757 -> 1973 bytes data/images/sipplugin-remove.png | Bin 0 -> 325 bytes resources.qrc | 210 ++++++++++++------------ src/sip/jreen/jabber-icon.png | Bin 3574 -> 10452 bytes src/sip/twitter/twitterconfigwidget.cpp | 1 + src/sip/twitter/twitterconfigwidget.ui | 2 +- src/sip/zeroconf/CMakeLists.txt | 3 +- src/sip/zeroconf/zeroconf-icon.png | Bin 2497 -> 8462 bytes src/sip/zeroconf/zeroconf.cpp | 36 +++- src/sip/zeroconf/zeroconf.h | 19 ++- src/sipconfigdelegate.cpp | 6 +- src/stackedsettingsdialog.ui | 6 +- 17 files changed, 163 insertions(+), 120 deletions(-) create mode 100644 data/images/sipplugin-add.png create mode 100644 data/images/sipplugin-remove.png diff --git a/data/images/account-settings.png b/data/images/account-settings.png index 19fddebe8cbf659db93b139afadf0f28b80de77c..32a451b9c399e8647d825a6a7d3e7eb9f07aa980 100644 GIT binary patch delta 4501 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 delta 6168 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 diff --git a/data/images/sipplugin-add.png b/data/images/sipplugin-add.png new file mode 100644 index 0000000000000000000000000000000000000000..306278fa62813b7496f8c7f4f86bf94024292560 GIT binary patch literal 771 zcmV+e1N{7nP)e5S;0=@Fc5XBmW4&Yve%XP8}`VJJ%P9(wa2~j1>8B% z!-@lf6Nobs;=-3Ks)U4u5G^GtZAr2-i5)^xT2DM+jMl1aH+i0!ml@j=*NdV^xLhhO z8;`a-PoSFhz|Y21_NP{Vb!|f&AMWo0xUMze8Pxo>zR@^3*nhr4=$-8jV)P3Fgz+g< z&Y}9|?}nILoKCNg>-e3%*xUJ22jjN@*BOVMbdP~R80)ybz86@v3)A9ZOdt%CRZO+o z1ek!v1fnSMfNGiS(iUS(Ks|ZYYHMZ!8WV^@=>gd?*`+PUm_R5ESFNsQuKnK{0bQb# za0~>3SVtHp?IeZV_ZbKzbATE`f+>dV5ny7#K*0473S9fPkG8Xcd$ zdasr-gt%6A8g(WD5#%S-w19^&3jy4dsQ=I~?PG;ph~~cxn(l$jV1ur)2WnH*&T#P5 z9Q23eKf2{u1M}hC(WRG{QB3oPyQ454`kM0u{sD|jK2A@DlNJB~002ovPDHLkV1gY% BUta(K literal 0 HcmV?d00001 diff --git a/data/images/sipplugin-offline.png b/data/images/sipplugin-offline.png index fd50901be0b9f24bda2f601ba74875ccc2d961be..129e1a4a0e4f66603589cac4a87eecbc8836a674 100644 GIT binary patch literal 1468 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 - -./data/images/add-friend-button-pressed.png -./data/images/add-friend-button-rest.png -./data/images/avatar-dude-plus.png -./data/images/avatar-dude.png -./data/images/back-pressed.png -./data/images/back-rest.png -./data/images/cover-shadow.png -./data/images/magnifying-glass.png -./data/images/no-album-art-placeholder.png -./data/images/now-playing-panel.png -./data/images/now-playing-speaker.png -./data/images/pause-pressed.png -./data/images/pause-rest.png -./data/images/play-pressed.png -./data/images/play-rest.png -./data/images/playlist-icon.png -./data/images/repeat-1-on-pressed.png -./data/images/repeat-1-on-rest.png -./data/images/repeat-all-on-pressed.png -./data/images/repeat-all-on-rest.png -./data/images/repeat-off-pressed.png -./data/images/repeat-off-rest.png -./data/images/search-box-dismiss-x.png -./data/images/search-box.png -./data/images/seek-and-volume-knob-pressed.png -./data/images/seek-and-volume-knob-rest.png -./data/images/seek-slider-bkg.png -./data/images/seek-slider-level.png -./data/images/shuffle-off-pressed.png -./data/images/shuffle-off-rest.png -./data/images/shuffle-on-pressed.png -./data/images/shuffle-on-rest.png -./data/images/skip-pressed.png -./data/images/skip-rest.png -./data/images/source-info.png -./data/images/source-off-pressed.png -./data/images/source-off-rest.png -./data/images/source-on-pressed.png -./data/images/source-on-rest.png -./data/images/status-alert-icon.png -./data/images/status-bar-bkg.png -./data/images/status-dismiss-x.png -./data/images/user-avatar.png -./data/images/view-toggle-active-centre.png -./data/images/view-toggle-active-left.png -./data/images/view-toggle-active-right.png -./data/images/view-toggle-icon-artist-active.png -./data/images/view-toggle-icon-artist-inactive.png -./data/images/view-toggle-icon-cloud-active.png -./data/images/view-toggle-icon-cloud-inactive.png -./data/images/view-toggle-icon-list-active.png -./data/images/view-toggle-icon-list-inactive.png -./data/images/view-toggle-inactive-centre.png -./data/images/view-toggle-inactive-left.png -./data/images/view-toggle-inactive-right.png -./data/images/view-toggle-pressed-centre.png -./data/images/view-toggle-pressed-left.png -./data/images/view-toggle-pressed-right.png -./data/images/list-add.png -./data/images/list-remove.png -./data/images/arrow-up-double.png -./data/images/arrow-down-double.png -./data/images/volume-icon-full.png -./data/images/arrow-right-double.png -./data/images/view-refresh.png -./data/images/volume-icon-muted.png -./data/images/volume-slider-bkg.png -./data/images/volume-slider-level.png -./data/images/echonest_logo.png -./data/images/loading-animation.gif -./data/images/home.png -./data/images/back.png -./data/images/forward.png -./data/images/music-icon.png -./data/images/configure.png -./data/images/create-playlist.png -./data/images/add.png -./data/images/recently-played.png -./data/images/supercollection.png -./data/images/sipplugin-online.png -./data/images/sipplugin-offline.png -./data/images/advanced-settings.png -./data/images/account-settings.png -./data/images/music-settings.png -./data/images/resolvers-settings.png -./data/images/lastfm-settings.png -./data/topbar-radiobuttons.css -./data/icons/tomahawk-icon-16x16.png -./data/icons/tomahawk-icon-32x32.png -./data/icons/tomahawk-icon-64x64.png -./data/icons/tomahawk-icon-128x128.png -./data/icons/tomahawk-icon-256x256.png -./data/icons/tomahawk-icon-512x512.png -./data/icons/audio-x-generic-22x22.png -./data/icons/audio-x-generic-32x32.png -./data/icons/audio-x-generic-16x16.png -./data/www/auth.html -./data/www/auth.na.html -./data/www/tomahawk_banner_small.png -./data/sql/dbmigrate-22_to_23.sql - + + + ./data/images/add-friend-button-pressed.png + ./data/images/add-friend-button-rest.png + ./data/images/avatar-dude-plus.png + ./data/images/avatar-dude.png + ./data/images/back-pressed.png + ./data/images/back-rest.png + ./data/images/cover-shadow.png + ./data/images/magnifying-glass.png + ./data/images/no-album-art-placeholder.png + ./data/images/now-playing-panel.png + ./data/images/now-playing-speaker.png + ./data/images/pause-pressed.png + ./data/images/pause-rest.png + ./data/images/play-pressed.png + ./data/images/play-rest.png + data/images/sipplugin-add.png + data/images/seek-slider-level.png + data/images/shuffle-off-rest.png + data/images/sipplugin-remove.png + ./data/images/playlist-icon.png + ./data/images/repeat-1-on-pressed.png + ./data/images/repeat-1-on-rest.png + ./data/images/repeat-all-on-pressed.png + ./data/images/repeat-all-on-rest.png + ./data/images/repeat-off-pressed.png + ./data/images/repeat-off-rest.png + ./data/images/search-box-dismiss-x.png + ./data/images/search-box.png + ./data/images/seek-and-volume-knob-pressed.png + ./data/images/seek-and-volume-knob-rest.png + ./data/images/seek-slider-bkg.png + ./data/images/seek-slider-level.png + ./data/images/shuffle-off-pressed.png + ./data/images/shuffle-off-rest.png + ./data/images/shuffle-on-pressed.png + ./data/images/shuffle-on-rest.png + ./data/images/skip-pressed.png + ./data/images/skip-rest.png + ./data/images/source-info.png + ./data/images/source-off-pressed.png + ./data/images/source-off-rest.png + ./data/images/source-on-pressed.png + ./data/images/source-on-rest.png + ./data/images/status-alert-icon.png + ./data/images/status-bar-bkg.png + ./data/images/status-dismiss-x.png + ./data/images/user-avatar.png + ./data/images/view-toggle-active-centre.png + ./data/images/view-toggle-active-left.png + ./data/images/view-toggle-active-right.png + ./data/images/view-toggle-icon-artist-active.png + ./data/images/view-toggle-icon-artist-inactive.png + ./data/images/view-toggle-icon-cloud-active.png + ./data/images/view-toggle-icon-cloud-inactive.png + ./data/images/view-toggle-icon-list-active.png + ./data/images/view-toggle-icon-list-inactive.png + ./data/images/view-toggle-inactive-centre.png + ./data/images/view-toggle-inactive-left.png + ./data/images/view-toggle-inactive-right.png + ./data/images/view-toggle-pressed-centre.png + ./data/images/view-toggle-pressed-left.png + ./data/images/view-toggle-pressed-right.png + ./data/images/list-add.png + ./data/images/list-remove.png + ./data/images/arrow-up-double.png + ./data/images/arrow-down-double.png + ./data/images/volume-icon-full.png + ./data/images/arrow-right-double.png + ./data/images/view-refresh.png + ./data/images/volume-icon-muted.png + ./data/images/volume-slider-bkg.png + ./data/images/volume-slider-level.png + ./data/images/echonest_logo.png + ./data/images/loading-animation.gif + ./data/images/home.png + ./data/images/back.png + ./data/images/forward.png + ./data/images/music-icon.png + ./data/images/configure.png + ./data/images/create-playlist.png + ./data/images/add.png + ./data/images/recently-played.png + ./data/images/supercollection.png + ./data/images/sipplugin-online.png + ./data/images/sipplugin-offline.png + ./data/images/advanced-settings.png + ./data/images/account-settings.png + ./data/images/music-settings.png + ./data/images/resolvers-settings.png + ./data/images/lastfm-settings.png + ./data/topbar-radiobuttons.css + ./data/icons/tomahawk-icon-16x16.png + ./data/icons/tomahawk-icon-32x32.png + ./data/icons/tomahawk-icon-64x64.png + ./data/icons/tomahawk-icon-128x128.png + ./data/icons/tomahawk-icon-256x256.png + ./data/icons/tomahawk-icon-512x512.png + ./data/icons/audio-x-generic-22x22.png + ./data/icons/audio-x-generic-32x32.png + ./data/icons/audio-x-generic-16x16.png + ./data/www/auth.html + ./data/www/auth.na.html + ./data/www/tomahawk_banner_small.png + ./data/sql/dbmigrate-22_to_23.sql + diff --git a/src/sip/jreen/jabber-icon.png b/src/sip/jreen/jabber-icon.png index 1b5f78b2fdd62f95bdbd9f676459c66ca08bc839..d7425523d4a01cfeac61624df464de283766a42a 100644 GIT binary patch literal 10452 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 KMNUMnLSTXhj(-dQ literal 3574 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 0 ); ui->twitterUserTweetLineEdit->setReadOnly( true ); ui->twitterUserTweetLineEdit->setEnabled( false ); + ui->autoConnectCheckbox->setChecked( m_plugin->twitterAutoConnect() ); if ( m_plugin->twitterOAuthToken().isEmpty() || m_plugin->twitterOAuthTokenSecret().isEmpty() || m_plugin->twitterScreenName().isEmpty() ) { diff --git a/src/sip/twitter/twitterconfigwidget.ui b/src/sip/twitter/twitterconfigwidget.ui index d9662243a..f707e9189 100644 --- a/src/sip/twitter/twitterconfigwidget.ui +++ b/src/sip/twitter/twitterconfigwidget.ui @@ -7,7 +7,7 @@ 0 0 515 - 323 + 385 diff --git a/src/sip/zeroconf/CMakeLists.txt b/src/sip/zeroconf/CMakeLists.txt index 730678e3c..fe23431a3 100644 --- a/src/sip/zeroconf/CMakeLists.txt +++ b/src/sip/zeroconf/CMakeLists.txt @@ -19,9 +19,10 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} .. ${QT_INCLUDE_DIR} ) +qt4_wrap_ui( UI_SRCS configwidget.ui ) qt4_add_resources( RC_SRCS "resources.qrc" ) qt4_wrap_cpp( zeroconfMoc ${zeroconfHeaders} ) -add_library( tomahawk_sipzeroconf SHARED ${zeroconfSources} ${zeroconfMoc} ${RC_SRCS} ) +add_library( tomahawk_sipzeroconf SHARED ${zeroconfSources} ${zeroconfMoc} ${RC_SRCS} ${UI_SRCS} ) IF( WIN32 ) SET( OS_SPECIFIC_LINK_LIBRARIES diff --git a/src/sip/zeroconf/zeroconf-icon.png b/src/sip/zeroconf/zeroconf-icon.png index 7371f8eae85792a84b0bffd3977e904e1e47e6ab..9364bf24fd4cb7afad51e395d68a48a7836cff0f 100644 GIT binary patch literal 8462 zcmV+pA@SacP)4Tx0C)j~RL^S@K@|QrZmG~B2wH0nvUrdpNm;9CMbtL^5n^i$+aIn^?(HA4aZWV5ov6ELTdbo0FI&wK{O>*+w4vx20?>!`FrQsdJlnHR>OPy zcd~b_n$otK2Za4V;76L-DzNVtaSB-y0*E}{p()372;bw_^6ZZ}PI-92wGS&j#91PI zKs7DSe@(bk%_Y-7gGe}(^>I=@oY#w#*Bu9GZf3^F5WP>3rn}7Ut74&?PWBFvy`A)a zPP5)V!Xd&78LdA?xQ(9mjMYElVd13a#D+Z_7&Y|xU=_C-srWU*6kiZcC!$nw*)9$7 zn6CX+@=AhmkT}X@VSsa5NKe;HZuq)~1$`#h6R+ZTR#D-3j}vF!)ZOnz+5)dI4jl{{ z44Mr{P!L4~VVJN`K!!XTF*LGrKO?IK8z<8w`3e3jI8lUGNUta*C8 zn(P`s>{pjD=7Kek#B;Fw@hxAK%$F&Q6vg9J^Xf~4by_hu-=A!MJ3Znq&n~srbFGPs zH&&aMXZ>nO`|hf|ljc?VPhR!${AbO?W8x_>CU%PFA&Hm8F7cAsOREdwU~R_;ot1_u z(ruCYB-LPGn!NQdT|ZlRy+(fw^-+`=%+gee_kY4FWHg<*4sZI8+sFJD270UUORdLHO0nA4V) z%{fwsET5CQ>B?eK%uw4yQc~9?*JVo2}ze(;aRcp*ceL#HUJSllrgm5wQKR zQu+C;QrUh^8rFfA`ftFz{YAidi-`aL010qNS#tmY79{`x79{~mQY7#I03F6jL_t(| z0qtGuQ(Vb)Kl9`bBhXty40=nu(jwc5Q%+g2?Puv7+@YZzhB?EaG4o~8D{1V zGjOQk_Pw`nKh8OQ`t<43-8N0rWF6Kn2JCCM>gzQp2G$v1jq|}e1FUfdaF$a2KmPdR zy0Wse7U(rz)XR%&3$7miY&ILiX#>9PLgWB{_?BTmuKt%_e)+Ss6Dfj-wqjNSKmYvm z<0yYCel22?7Ms|-R^VI{%`cjCkumV=EM}%CDhBxU(@$Rl!dpS)vmiLH3E-*oNO^g= z`av25E&!0;;9G1Yi{ygDZO*--H5}2{`l~-Q5 zk??+%K3Me(5F>gU@JFJ1&3LS;tP&Eoy1H8ZYHDiCuk#k3oSak)L8c(1OifQM&Px+N z9*`M)tDPBEB?GW8cRHPIKw=w3JFW_x4yQCUG$^8P+_+H?M<5Z5*Nd(|{-XPAZ&Kw$ z$?)viGsO%eBO?-ygcq_ySAiQJ;`m;F{q^yM7po(*su&>F+S@_&HUm8*dVPJpY~8w5 zHf-3CK=51>+Q>KEYdmAHJYSf!u zZNiqG49V#d$jW%h%1LGz92}IKe}oQ&Uso_xojNXvp})k3gGM`hg`3(AnAfK8V}S8j|39_Uuubz0psu z1;VrLW-v1X>(3Fx{rmTY3_$>HF0{6`{=ocAKEior01oS*+52ENRbzSf@y*T6;&3=r zU0Cr*q`3R|Y>DD#nuT=jHCw! zBe0=x$jEMi04DH361gA@a^%QS*$|t4jYK1&6^jWkJ^EM{ z%LbF8!>%jLW0-a9?!GCJFqi#zSd&L#LdwoFRDo!Vu>P*qJJG$jsfZf zN*W-Ev9U3^+5M$NG24jeIbnjV7{E+?nsC4Q&2P>td+WqsInm?4G&2E}!$1A$PePM& zE|?%Ir%()CXwOH>x2ry%o;ZYc;>VLPyL+<&O&n9dBF+`=L4#~kU$F$hgwFdA?(H;W z9C`7Gvh1-SR8-c*el{do`ddl@D%b>C4!ghXMq`UoF}#3@q!n2WSHu9HeDcXVP*Hs> z$O|tVR#UhPhoPXX6Q7vKA1Ee(qD|n`@~vC9W0`4fuf6u##n?^Smy8*J=3Q9vI+26N z>-7qMv|`aMDj&q3nHZPhdp+{>W|vG3^oj-vvzoz%7FyHTEL)DY$fkWTfYsLJytq0O zIF&V(6G{950-!@{rrt&wuL}V2eaOs1_pGL-CPn;w_4&_-hveyv|C7KMpGd8}Pd3&K zBkR>ZcVL&fk$W=qNsr8py(U{;`j%90+Kh7N4%pC$bB+#31DcL8Lh!_Bb1ajbGGYMq z`#(nFE!6lA9z3WDK$|{)`GCN~ei{8Eh(Go_+0|a$w1|xiT1X@41Mj6oXu*g)9}i0eMy1uv01g;$%H1}pt8vOO%04~v1}60K1H?Un zYad9HTbMwCbm#!BF8xiKYZKCD07oRMh8tV9ZdT45%s9f{pegsW}iQknQ*1d zqOPlz@Wh1yk%%TCc!jg9EPDiX$XB@)>OlkQV05r~h6eNW$&kco^@>rZRM)f^K-c=U zR*L>TyZ6lZ`_a5BWN7W^T_WK;a#Anc{qy@X<%F0SbBfccfNV`Q5 zliZ{u0otK#cxizm127~0ECV#4Xt8#6@I#|I6q>0Pu3P7t{w{DR{*)hPce)Y*aNYhhZQ7)UX zLWe-b&ypH3GhmKgK(R7_(gCdEfEaCPDkiNcv1fua9@6m5H`>q9{R~;!D&Q!f$R&Vfoq$dg(uiF(S6b0TjBdzFTE6kd8=obk+L8=_$Zh;! zgJ*-dTrSo64Z{PUTLr~E473VM3;B>nlmHyEb75_4!ATopWXu3(nJl$RLKO1M%C^ru znV(VuL&ezzuRW)MxGYF3;*GQ;4e3Tknj%_y3;^OYvTWMKp&t{Y2)3AwSpepZtc#WbRL@1cS&uu? z%myhy8V+Mx-Jq#LtLa~Y1fcm4#cg36O!}*+6e-qMK`&)-j{;(K&@Yz$H`CnbSUD}u1xKpK&7Hkz^pmLR*ax&wt^Mgpc!dMT24<-vs)l-7mWszF+i&Z z;}4f{+o1=rFELoC5VcVZP^`0o1_Km`f0Z5p8j_Y%Q_~=y*19YMAcB$r)m7C9;*$cl zej|U*1QsJ$KX6`*CDM+{JZU*3@KVxj-o-JnOH2F%eB@!1udLK}*tFjIXD$&HP~8?_ zep)PHO-;6wc?-k9q#Z{Bik3=|7jHc75*Pq1(?ZVS_)!%d;ldPOM;jTyqRGd2++=;v z9zfwR>y%cO0O`p5-DPF!3TdFEyE(N42GAvd=u5nifT2v7Ke9B88WlKY|z$Rqyz>?Xzr*4TVWxB3xk&xwOSV@L9hfD0(4~b=G9SVg%vFS_5QYrF_7{KEx z?=wpZBWzq(f{bjwsok+tysy0}HtZz&=;Nz0JJ<_JV2v~Cipvd=U$(7TcD#N{nvTCJ zwcBf&~`zfzCmJZegd5pZxHj zq;f-ps><}(i2TF9{F@xc&L&v{G=Cd*^>9~Iio3cB;bk4Kv(9p<1PoLe*JSY$8NeLd z2piXADdhQ?9pbc{r-0y>D{v1!m9Ah^w$$pxd5W-W;})zyYRpv@3+WUPcd8IZ{>F8o zWGa-%07eA$0Yu0W9~#k$^-AGr=s6rOmm=uZLfukSFNu7z1&EC4*fA)a4=70>UVx!e zB|d3p(9WPGIwwV2Gd+_?fM^$R)5?RA6yqpsRtgp}r&c6kwtf=cECJNBR86Hw>b9tu zF-xRQOHT2rqwp3*NnilYX7f|-Pht9yz{!L{0tv;r?Fh7g-6EJiGb&>YlrZ|r+o71n z*TrCf`1+|lVMk}andZr~>~O^3);aXfjn6YauYBGcc~9bSD}thJT!sk@0E3I4adT<;Fd~j8D&`T@e?E-m-6(y!@@Ba`ezX*-%%T_P4o? zNCqGc)ehvWn|_+vqHGcvz-H4r)kn{#um}V$#;8!CVDRZ9`J(%Ga%~C$v zuqyr1ghQGHhVIFK{k}&66X)gFi{FNuyFT<|DrACq7#SOvKX!j5SGw*?^w?3Udi@Ql zcI%EY@o|&hLvlQPJS_j&eM^SMr{p^?9h4ndQeOz5OBiW51zHkFTNN<RL*%}wd8Hc88!uaOY|G3+R~(`A=hPmSET({K`G_wRSo=@R$ryGw) zrK)+e%uYrmID&6zf=)9}8i5>TmEr`$-W{8fv55(lqfsoYuA~_o3Tdc^q$}PZkY!0= z06qj_I?;c$3}chx?N}C8C~Fqiy$5F|u;GD6LRcJPCK$_^4$RH!Zf#S+XHe)CRy8jr z0l4qp=u}Y3=io|>-8gl5la9<;C`|;dj^9lLXVlht3va9o88jme38bkC#QjUk03bdi zw~u3k;U1P>g2_T5KB~D{)5Um$YIRMB2sjCM}b~k_-^V=@fRH{4ok8f(TP?;$#Ayqmm|; z`-i#_Xf8(*;P3zT9cgYnkg}L}`yR_re%k{Hpc}$cMqcKn-UW~Z*0F#wY$we~I|6B` z0!jWY$pELm_r1@qfAo4xl|A!-!a{c~zPIQ3zQ9vpR zXG9`1WX%Vf4d zMeo#!vvTx>Z>3D?i|#ve?fw7AX%}FH1aLZGv4jRVjn+?EDWL<}rK~JoF3SMrZuf=Y z>}*>k681jmeSq@;UQmZVhr<-h`F7PsUkuTm3kJ~lHy~P;D>L+GFiS4%0Lq0;kz%<# zmm|}1?=j;EzexgV1X?jye}%g&dj_ES@cQ-Z9Z1kOJUooC<%l%kFi4lnp{#Su6)oHM zlmMZ*1q!2ZkW4&Nd(|sA!Df6cN&h0C~`n%=8W%wU*L9?No`fL%*^$}lC|<&D1z&255g}13Lu3*3ZNp@SDG=T$oA?oDRa4(%`-)DmVL!z`W*0ipt4Nb=#ox4Pn=BM_ZtakFuAIq{{0+N zi~arm>U$T&&PwrP6d=`gQ^Qs{)chTc0>apVJF4^!>K>W=LLnHE@cpsFaM7+=cI#a6 z)K<&ONB2pX+p2`-R`#2ll`t%de+j>U%^NW-m?t3aNdp3DLfYt{(<*k8^5W>|=tvpC zcnLee)35G+&D++A@d>HMikEUYSkU{0R<>mtmXS28J`(+<=VAB zBl8ySI`Pucqr#KH={6P0z*8sP!ZF^&;!vx4XMrc&sdxKpr#Sdh+DS8=2HM106t5mKkW8y`75HD7Q9k<8y6rnH+!YAahG}>h66{zH9+PzhzCh# zV0>9=4c5SS^zL=J^xM)?oVd>}^%aZ)l4bb82OreA-DRD4*FtARFHW=M ziIxOT!l(nLz$NRD0S0WCsDVv_b{0ZkU!VB#i@>&a58hNPnvGMfu+*M}+=9>7#W6l`BAj;*-R1CE?-q*oS zaNxiJIFew?IY@vADzmN}8kkCcrLyNh%g056a4YY@P|xt}1-X1@&a7PFOO|8K8GxBw zxpL*lAb1DE<=CQZ-`+h^-=Hta;-m$A@7Ey_1IB_T0p-ZaE|LJ|fOYTm57bQ_|5?HSEdPgBuO7GQU4obQ zoK56$bX&J>=dA*+-OFU=&G@dEu8Q!nl{+l=lP8ar3pZCK#lVlV|Ju%-I`x_HAfH#u z7{I8+B`ApK{5y<$b_+Bi*Viws+b1JXKPZ*1fuf%Mys>19bsrrafjz(9EbgfcbezqD zqG#Yb+0}9eU?G0-i(fQB{BbhrtWhW)ZnO(#eLr5xhsY#Jzz_^R=K1U=-xT z53e2dl`0J`-0Hbi6S8%z? z+OR~U4bPMf!FWdp%UUo2r9%z;?Tl`MQo$-FAn}dXPVqiD`CPT~2@rn&iZy$GJv^OAAb1ZOW1e`%n+r*=rzBi9f7A|96o$VF#?@a&D+43e5$cVrr-+9YcL{m}U@Xxym~q>8yGNFjrddBJ5;@Ry6qe5k#G* zPL8~IL`9_wcit>Ykm1gl@v8gFZcNfF%*LYozk~vGV$^b}5Zb&MPnm>^iUHy)cInck ze?+6dz~@a(jj$&)#YPHhWo&%(tnNX3Wx1p19~gjRM&E!+55l1R?Af#bo>k%n{J5xH zb`;`m;v@e0`yZ+;(MTX0%+0w5rpdIq?Hcn^fV_*D_^d-wGXN_P35D7*YUrX8$kj2_ zyba46-{%5Ic&5p;)e0Qs#XOmJF48Y#8b!|l)U2^3QX7yMpkl_^G%5j{ThA5fX=y5L z<^c#W&()~aXIkgnVJXv`a~PkRHde*9Lje#D#gx}9EQi$A`7E0s)1Y@V(`4FAi+Qbf z?LJ-fmIMQ^vggmAy9m5VLlq3VN zc9;{u5_TMt1cEF3fH6q}>e4Aa*-ud(?^M4Jn*zUO8cd66mLila15h8p_`MB83#ipK zUwx$-v);a!A|;1>B0Y#3o4*e*jZzrzFID4`WdK%KAFJ!$$aJ~x^Y<-!?-$> z&Uk;mf^mV8W&qap{Q2`2aq%%cIQSUOn4`+9%X>4>)XR5_69e@7>RaQ!B(EjU0Hm6( z5AZ-tP43e^5IYNiCL-NTgnl2-_>OU4`77yu-^|Htf&tivM;wkeR6Ia`0WP>C=;Vi1 z2;ej2OMp0xTgv^us&MSznqUCd_3toW08%S$o{KQPzK7Nxb1Y@pSeU^$jB7?xDTj;N zA!H?l`QYb2|0#&v#&37;-mQ{&@Zf>EVgTTK`~3NL)y*3Dr!UT1Bb8Ovj7HmG5o+Pj zj~Tvs&}{}KJKmqKXIx;-NdVUWXK*yNN1~kwdUy{AL>>0lwIurWYQrj`X1R>JB-i)e zd(Yl<{J48dFzCk0RX3a--Qlp)rMaVSXC&g%G?&|M4?8u@;f~s)E-h+z*|n$(_H<{| zhI`G9FwZ53B90!02zFw<7dF7r9GYfxLi9S+Gh9&wN+n+DgGC*M@3=Ffo$-w4C^+u% z-loAf1G(u}-rMjTw|I|jGk^a5$U~vD|DUZy5$+*Cec21|YRvPIuRuq`IlnYi1Z| ws`Gl#gaPz$YgPD}u&{=M>k?oM6Q5Q8f9j)AW+{tNKL7v#07*qoM6N<$f_*SZVE_OC literal 2497 zcmV;y2|o6TP){{7VTjv!&+9i-BLBYX}ZHYa2>>yem+{B(CEzKl&36svW=`@1@+k|$e6JGOV z`#+%5nYO{T&Ge;dCUpSY*f_YwZ;(lXWG4nwjM+B}kPrgxx94{eE;gGmMj$0ebLQSF z-Fx-@&Ud!&e23@<`hJsSGhbfu!S9WHC}1`%I-1satT)6h3&)y||J)Zf0$|YZ@Szxh zwOXwy@kfc2oSaNA?|zw7DitO1`D$c){Fpo*4-E|u(PKWJoS3AUnVAKF)Uhz?x19ja zRQwJzT?$T2Of+R>Wl?HcD(UqGl1e3Hv)RbuaFEaEV^FqL-<6!4L<)t1pVd=RQW6D& z0zWfOLxV%q)zw9llamleE%-vsU;4IG0H-S|0sNd&p(x#FG*bRg@=0&dlY7ohBcmfU zGBPTH-v~hnyLP3}u9RJ*)~Ly0chFZ~e?|R$edP7|Ac%8+tNCkRLJVJ-sRRs@Ll%EiH{wQc}q8^V8kCR=VHOVfT8y)%W7WeGgYdUo35NYGJ^ytwe>S6Z#eG&28a=C)iQd23FdB!zEt*xyz zI5+^)D86{1#=4$&$<}jo`RR(YY@eSTK77QGpPx??wh3zc@=MW1gTX+=LKpsPVq$`N z*$nhLJ(wTTCXC`N)wYqBn1EZzrGMzpWA)gM?A0w63#(vo+hueZ)6me6 z=#z5x=g{=DBgNsczm=Ew<4-K@-*{H^C#$_wAfbBSKBM`kuf4`0ZG`UMzrXEM+i$=7 zmV!c%Fy^2jnEU(t5FyIetpO*?%FpU_`l>ey-k`Cuv8VvQK*%7~YBgnNWmEsafH`OX zezIEH?}Y6GN=nOf*`_Q%FDw*qu~^!pa-n19hyXpl-P{bHW&V5Zr6nO!x`OW4n%SYm zY2w)1-^F!QGR6)JzyeHRnLtTN*@p><38lHYxzySDfLt@Ks9oy9G0x7;QaWdkoTa8@ zXT4&#S}kp>Y5+UFb4V=g9PVrrHe5&b2N;0mz<~oIwpBIY{gRU>larF)%gD%JZ~7gl zwtk8QLhgdpnX^ZAMrLO3U8~i)yaotD)tB}SD> zWqxVrOEf+{&i4s1#lQq?zzD2M1i-Q?*69sm5-~Y76|IhcMFu8d14d!KV)cv(2tq+Z zLV{Ruh_%^YU|<7AU|pID3xY`-A5SiqYuoO%Vq1Wkjnz1Dnt9bzS6R)@6JEwKyF1;+;Ep#;gfobCxlRSeHqK zscw4ONnW3qG#X8;ECio0FaaAd0_ze1eD>L=ee57C*p5a<7;EbQU;;K^1lAQQLPGWU z_!!A#a#j~*%p?H70!+XLjH_0K-+lL&Q+xOBGsJ7-H@vmIT?kw3sBI1m^xLmo`B%c4 zHNmm*QIbfcqSJ_W)dvP(0j4!;f}qZhj<$@2{D(sT3QRqKS6w z*dc1};NSo}e^q_m=k;L=0Q8`<^G;@FmdWFGi`k(}E+?poiP-ZlFJPMmnBU9HiWckkXU?h}Y5vu#ZA@$sDU%0=+*xj9QiLw(+=eji1d~@ci6n2Zu@#7~h%jB}sq@-kui;ELAA+Sw$ zj$odcc|awO6k;gw-Mwc9T?B*MoWvk9G$B7B(Hxi6N6o=W7UC73L%oV)G=W zLP=9oQ)15&kFDz3)rOD4eaE`n610t-Ve z?#Fq&p0L*x&>)pkB|0`YgXia9-zZ|#H8wWhd7=JfGo97jZx^AjxP{YFgXk=M;q?-u zT^_3LbUI<*1vhRqS~qKqvdt7gclUqCGBPqoy+eZyFIK0tsEBL)PC{Bt@Du_lawM(LKOqHaEN=dl*Ku|3nfz#B?)Z-6&4nX`2nvV z47m1qJYu|WZf>?ldMvW75I|2)&sb_|>L@RsibLI~mA7x-ZrX~mEYX1Gf45-6R2$-W z=D0;i%_3HZSha|iA;votA(n-%Wg(MWV9BTd{D)Ys`qi(0(@y{2%0Z?S2p#>Qb6@Bj zNADu`gxDS8xkWs?h*8Ibhn*?>S;14)UHMj4au~RUexR+T{|PVv0jMyRD~`3J00000 LNkvXXu0mjfzB{xx diff --git a/src/sip/zeroconf/zeroconf.cpp b/src/sip/zeroconf/zeroconf.cpp index d169ba41f..35818beb6 100644 --- a/src/sip/zeroconf/zeroconf.cpp +++ b/src/sip/zeroconf/zeroconf.cpp @@ -18,6 +18,9 @@ #include "zeroconf.h" +#include "tomahawksettings.h" +#include "ui_configwidget.h" + #include SipPlugin* @@ -26,6 +29,21 @@ ZeroconfFactory::createPlugin( const QString& pluginId ) return new ZeroconfPlugin( pluginId.isEmpty() ? generateId() : pluginId ); } +ZeroconfPlugin::ZeroconfPlugin ( const QString& pluginId ) + : SipPlugin( pluginId ) + , m_zeroconf( 0 ) + , m_state( Disconnected ) + , m_cachedNodes() +{ + qDebug() << Q_FUNC_INFO; + + m_configWidget = QWeakPointer< QWidget >( new QWidget ); + m_ui = new Ui_ZeroconfConfig; + m_ui->setupUi( m_configWidget.data() ); + m_ui->autoConnectCheckbox->setChecked( autoConnect() ); + m_configWidget.data()->setVisible( false ); +} + const QString ZeroconfPlugin::name() const { @@ -58,8 +76,11 @@ ZeroconfFactory::icon() const bool -ZeroconfPlugin::connectPlugin( bool /*startup*/ ) +ZeroconfPlugin::connectPlugin( bool startup ) { + if( startup && !autoConnect() ) + return false; + delete m_zeroconf; m_zeroconf = new TomahawkZeroconf( Servent::instance()->port(), this ); QObject::connect( m_zeroconf, SIGNAL( tomahawkHostFound( QString, int, QString, QString ) ), @@ -116,4 +137,17 @@ ZeroconfPlugin::lanHostFound( const QString& host, int port, const QString& name qDebug() << "Already connected to" << host; } +void +ZeroconfPlugin::saveConfig() +{ + TomahawkSettings::instance()->setValue( pluginId() + "/autoconnect", m_ui->autoConnectCheckbox->isChecked() ); +} + +bool +ZeroconfPlugin::autoConnect() const +{ + return TomahawkSettings::instance()->value( pluginId() + "/autoconnect", true ).toBool(); +} + + Q_EXPORT_PLUGIN2( sipfactory, ZeroconfFactory ) diff --git a/src/sip/zeroconf/zeroconf.h b/src/sip/zeroconf/zeroconf.h index 6457e319e..9e6edca97 100644 --- a/src/sip/zeroconf/zeroconf.h +++ b/src/sip/zeroconf/zeroconf.h @@ -26,6 +26,8 @@ #define MYNAME "Local Network" +class Ui_ZeroconfConfig; + class SIPDLLEXPORT ZeroconfFactory : public SipPluginFactory { Q_OBJECT @@ -39,6 +41,7 @@ public: virtual bool isUnique() const { return true; } virtual QIcon icon() const; + virtual SipPlugin* createPlugin ( const QString& pluginId = QString() ); }; @@ -47,14 +50,7 @@ class SIPDLLEXPORT ZeroconfPlugin : public SipPlugin Q_OBJECT public: - ZeroconfPlugin( const QString& pluginId ) - : SipPlugin( pluginId ) - , m_zeroconf( 0 ) - , m_state( Disconnected ) - , m_cachedNodes() - { - qDebug() << Q_FUNC_INFO; - } + ZeroconfPlugin( const QString& pluginId ); virtual ~ZeroconfPlugin() { @@ -67,6 +63,8 @@ public: virtual ConnectionState connectionState() const; virtual bool isValid() const { return true; }; virtual QIcon icon() const; + virtual QWidget* configWidget() { return m_configWidget.data(); } + virtual void saveConfig(); public slots: virtual bool connectPlugin( bool startup ); @@ -94,9 +92,14 @@ private slots: void lanHostFound( const QString& host, int port, const QString& name, const QString& nodeid ); private: + bool autoConnect() const; + TomahawkZeroconf* m_zeroconf; ConnectionState m_state; QVector m_cachedNodes; + + Ui_ZeroconfConfig* m_ui; // so the google wrapper can change the config dialog a bit + QWeakPointer< QWidget > m_configWidget; }; #endif diff --git a/src/sipconfigdelegate.cpp b/src/sipconfigdelegate.cpp index 4223f3a59..9cc8fdc31 100644 --- a/src/sipconfigdelegate.cpp +++ b/src/sipconfigdelegate.cpp @@ -164,7 +164,7 @@ SipConfigDelegate::paint ( QPainter* painter, const QStyleOptionViewItem& option } // draw the online/offline status - int statusIconSize = 10; + int statusIconSize = 18; int statusX = confRect.left() - 2*PADDING - statusIconSize; QFont statusF = opt.font; statusF.setPointSize( statusF.pointSize() - 2 ); @@ -198,7 +198,7 @@ SipConfigDelegate::paint ( QPainter* painter, const QStyleOptionViewItem& option width = itemRect.width() - textLeftEdge; if( !index.data( SipModel::ErrorString ).toString().isEmpty() ) { // error, show that too - QRect errorRect( textLeftEdge, mid + top, width, mid - PADDING ); + QRect errorRect( textLeftEdge, mid + top, width, mid - PADDING + 1 ); QFontMetrics errorFm( error ); QString str = errorFm.elidedText( index.data( SipModel::ErrorString ).toString(), Qt::ElideRight, errorRect.width() ); @@ -209,7 +209,7 @@ SipConfigDelegate::paint ( QPainter* painter, const QStyleOptionViewItem& option } QString nameStr = namefm.elidedText( index.data( Qt::DisplayRole ).toString(), Qt::ElideRight, width ); painter->setFont( name ); - painter->drawText( QRect( textLeftEdge, pos + top, width, nameHeight ), nameStr ); + painter->drawText( QRect( textLeftEdge, pos + top, width, nameHeight + 1 ), nameStr ); painter->restore(); } } diff --git a/src/stackedsettingsdialog.ui b/src/stackedsettingsdialog.ui index 015d2859a..91abc1c48 100644 --- a/src/stackedsettingsdialog.ui +++ b/src/stackedsettingsdialog.ui @@ -100,7 +100,7 @@ - 3 + 0 @@ -153,7 +153,7 @@ - :/data/images/list-add.png:/data/images/list-add.png + :/data/images/sipplugin-add.png:/data/images/sipplugin-add.png QToolButton::InstantPopup @@ -167,7 +167,7 @@ - :/data/images/list-remove.png:/data/images/list-remove.png + :/data/images/sipplugin-remove.png:/data/images/sipplugin-remove.png QToolButton::DelayedPopup