From f458b6351960f09e4da5ee081a7b4581eb9b2de3 Mon Sep 17 00:00:00 2001 From: Jason Herskowitz Date: Sun, 2 Dec 2012 17:05:02 -0500 Subject: [PATCH 1/3] Make track placeholder icon square --- data/images/track-placeholder.png | Bin 69076 -> 4687 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/images/track-placeholder.png b/data/images/track-placeholder.png index 333ea9101e75ba2d9edc10fbf10247b7289b9f1a..24b3ac9b1ef0ccbe9732bf3a117dcc61fc884353 100644 GIT binary patch delta 4651 zcmai#Wl+=&qs9NbbT>*ofUuMZOGpT;fPk<93#&BJAkrzZ#D4*il8_K_MN+y;VhI6J zq`N^n1nI8(e7Q4s?uYk1AJ2#1oH=u5&IpdM9~RF8lEdwlm35HH%3N+9t}pDJYym+1 zN7{QIUEOi!@ct$rOlGg>5DO+zL=<}{!u1a!`t}Rr+rNNzN-d{|d_@&HI*4j~1{RW? zsa_mmbw?oIf<~QI$4WFRKi}r@*pmQ1znztplOIj@s?e5~6rC@feBwSRk&&hdlQ18A6Z4l9jb8&F)&G7dSPn3ZMXDTEn z|6H!x5E1Mu&@__*qV2BlvA8>LWO18(G&V72{m7CUgwDTdIF;u8yUpE1emWx&0gj!7 zZKqPl94p805cihPAmK_+f z{)}ANeISok$$$B)4ljdl^m8i3g1EM9PrsXj$Q#iuZR1al?*xw00m)ya>a!Wp<+X>{ zELsS?pU%wD{KaZ04bdX*R<3M?%t<=Y)kUdW2z;z}YDl;nzZ6GX>g$P*ocO(mX} z5Pn4x87dKM_ix!cvcFgo3&OXdYZk(J;MG9xh@VntG*&I$Vs@ zs><%PH1v<^2bl9o?}pvYG|s0xXO<;0#g;xI7(l#a{1_4xHrGz78B$O#UQET-PB}q# z{3dik(vAHS@mlNIE~*X+mWIZC+ukKQl?@=_2u^RWB2|nar9vxH(h)C)oZg{Rzt^TF z#TBOh;Awa@m#I43gMvjV_nnUbWmHI3HYK`NKwFnID(s1}vm#UWU9=i{JD+1jctpT~ z_=rsFu}~(}fYeL);ax9wSq4+Ah?;c9^gzmh&%n~U^li#FZw9{^f|l}P3m*u3WHrTB zfm|j}4hbwvdyiFxpNVvpP3I#PC;lyIRR zk_&x{#O@4ret1SR3fIt+_Nu+fQ~CfzGX+SX5Sz}g&frDr{o3LY)KVfdWZ+Sqim$q_ zDvW+Ka;yX3PN|Co4VC0k_($x#%{*Q4he(ke^@RB9M6cIgpS|J^qcr&(6aVR=vw`^W z*S`yRclqH`KZM&7w!r)C{e%FTcThx3VDAwQjj?#n=G+!<6QB4&ie>9j;r(>8T zoP_zs`%8vNc{CG)X2@3^am~LPVKHKvw5`mnG^*6Aw6jrrNvefgRn^E!9zYGedAXA! z0CzWTGpe*kb|-w}_4J7Hi1lEve^jquFXyqdva#>7AGzPSBDc&bn8A3+1Z5OwqQ3k5 z=?DFsyHj^7K}HHDZGkz1kmSQ;X!4lgKl+=`KI-YCk9AObb7cW&KjX06#r%Yfr@0>b zwoj6?9Lj#_2|q*Roxc^)@X6vI6k10dvPkkuYD;Dsml(H9;TvKx5tz@IqH`Xq5MpH> z{cO!_6YIy%^o9*2462L{nwia_GnvY2w2KTJQ6_3~pr$|0JN!5&_ET&MDi&4Mr)*kT z8tU@VCGD>>;w^_V9KC~`(+V`4f23g6^5o_X#L2?GRZ_-6w4AYN1S9BbKRaZpoRFDl z`NpzpA)l`I=MRDY{Py**id^^CdoD|6OWJ(Qd`P|{J{nD1O@j}ssotsA4!N$K;zi<( z&L}A#PNoMe%Fyn=#ya-`glmnwOaiK_E0;}b4N*q+#;PWICR7snl;C5r zr6|d%sYy)sk^LVZsrOP)9D`KL1nU&vl++|jWZbCF$gCxx2Q?dOZ{R3xrTsOoR>4ML zF=MsWE8o+1F@NEwx0Bl^w;|6bZnCR~ZId0T;Lgmd{F>EL<=hHhXmNAFcztSzZ;5$P zf8%(5svoZz4VvFVvKNx_+@6 z*brbj&(!Q6z*#zC++{MkKyrz{JU&J2kMC(8+&lyresk(D?cN`_FDhLw9YN2?G{SfY z@=ZLbgPkfxxI~EN$mxpT7q1rc66ujFzVBp{yjOTsR2nYy+Ou7br<^X6j*70TXjXs6 z6v1InXGHs;`mvqX*vBGArZK(}1OqS2_qVbvF|pLqE>YL5ht^|acGh^SLhBcXBE^Bl zYfft3EdEi}KLl4aJEp$B??iP@e&3G7fl)pY@VNBV1~;L4IDov6KM;~RWu%A+bD8|~$~wSXq-n%J6BIRjxI&%f)KyrUYn3@R};utD0v zsb^lMxyyQZu=jQEzlnZIbP4tPH}N`Y7&Loa=U!HnaG2mIVC1Jn?bA+QN1fE1*Iahy zEt{=xVztAz+8kB+R993vql~_fH;Z2tE*6EQRmfdv+|!``+qSj1%{sMRe(|!v%O15c z!7-26wmqzDs~q>wJ~k6J*Eg#IuT3u$bUO{^3Oq_3O7sio&}l+~zTLjyXF{k~K9k-xfv$&F?}i=niu!(j7JQ%~g9E)6 zp7+&H9u%zQ!8=TE|B2lUa&sU3K8=7Nu2S%D)B3HTGpn*^JM}`|1}O8Iddw#4lJSpM z-G8jtYe(`YYsv}^PWGg%>4#U~_&=17a z#pBC&*-l;`T=dA{of2ax#Xw3ZGokQJ7gH|)kYplNlyrTkw$n@^U_LD0`%^V3sk6A* z_UuD51YQ>E%-jyxt9^|eZD;kS|9Y2=H!8lN(fo zMK#9zcSM2rka9|_El|u%ptzqvqo$#|hatu0)a+|;W`-q`SB(SIkO_8)&ks@2Y!^Ib zLeCJLL>8hoMiq-G?>Wg*w;FDf$WUjmYFy zK-1;?mCiiLt}ZLlxY`?#CSGM>S0OpqK<{iaCbtGcY>|RNB|y&sDKbQ=%D1sTGzSXp zh8rgqnLcduN~nKu4*6MxWW0218EGbU-~qUiNWUZs6WC{m?%@kEeVrgc0+GP=|V{+fm=z6vx80LQe|U0`Up3g?0*VZcda z8+OB+ul9QbMlR)i-bNt$+#rqQtOQ1WJ+q3LlLAyi=wrXQpH^mHS{Q#k*uBwW4Ts0= z)X(2d27R{dyol>wVR}oXf_^kz&;7Q9(1ge*s{}&~@5kWgw(W%IIe1<@Y3uU)Tw)FI z-ESIZW9L5uS&%du4bg-!?CYGfv~nxp*ih2zBJ|=;Dfu~LSF+W`?O*1j{6J6DSqaI% z%>*&G20}Tz`ez0Bi&pqOmeZN-a)&&owRVoHm=xnQ42fuC%u4jmf<2!vQYpHeujj%}ps`$jIY;i0hnQqXy1uf1XF`A~HWYxY-B859AA4C&ytvX*DvxX~_g42B|8S^dUBLl}5{o`X(G#WERqQ?5Ike5#JYf75J z`clEM$ZXKD5wf59q@1-l8-!w^wL>z`(^WS)Sp|Ze+H9qXkgfGDa5>WtGBtZ?LEip( zDOac=A2D{3sjW#BHGL?lyjamlx+~tMjOlPpP|9q7ST0lJU*_575^H$od7xhl%5_&y zT^iCpoC*N?pE+N?Yc5jZxROIBH+s5-w24=}Ul+gAm^vL2cs60CGj(T18CRGmAr?bfEt^{@Hy z?X_NZ>gJuk3ayZ@1hSCdgjj#_gPQIus#X=cDNcMz-?@V3)zwxgZQtnafV%7pe<1xb8d2+hC-O)T7H8yI1=M#ocU}rH5pE z^NqVtijGtn{G`K*pmSDBYYbS2hHH4_2|xPuf^6v89#k^t+ckTz(vJXI*AZAH4~kYI z01i2o+;`lVySG93&7Wwtg%k(Zddh$z%YMAmQw#k~Ay-4mDtY{6PYR61wF*k>-(R>Y z_WQ4Y!vYk&0MyeT&&sZRh6m5w6N!^1+(x7KYNcnMhg2JLqw5EapD%@*X&9Fr0{HvH xAvM1C={#kUbA%4PB>BQ*7RxpN_t=c{ZwR&!7D8dhM{j_Cg;YhUls>Wu`5!8r+1LO8 literal 69076 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 Y$^OJeeeOo~$4~|N_wn1&BWC9R0ql&a82|tP From 7ca3860ca8362e5909a5b1e445bdd05551180813 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Mon, 3 Dec 2012 14:54:12 +0100 Subject: [PATCH 2/3] * Fixed qt picking wrong translations. --- src/TomahawkApp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TomahawkApp.cpp b/src/TomahawkApp.cpp index ebc285bc0..a6b63b0f8 100644 --- a/src/TomahawkApp.cpp +++ b/src/TomahawkApp.cpp @@ -152,7 +152,7 @@ void TomahawkApp::installTranslator() { #if QT_VERSION >= 0x040800 - QString locale = QLocale::system().uiLanguages().first(); + QString locale = QLocale::system().uiLanguages().first().replace( "-", "_" ); #else QString locale = QLocale::system().name(); #endif From 03bf80352cbe954fd498896a4959a7bd624ef30f Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Mon, 3 Dec 2012 15:57:21 +0100 Subject: [PATCH 3/3] * Prevent crash in PlayableProxyModel. --- src/libtomahawk/playlist/PlayableProxyModel.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libtomahawk/playlist/PlayableProxyModel.cpp b/src/libtomahawk/playlist/PlayableProxyModel.cpp index 21f5ffbac..dd4dd7487 100644 --- a/src/libtomahawk/playlist/PlayableProxyModel.cpp +++ b/src/libtomahawk/playlist/PlayableProxyModel.cpp @@ -537,6 +537,8 @@ PlayableProxyModel::data( const QModelIndex& index, int role ) const return QVariant(); if ( !m_headerStyle.contains( m_style ) ) return QVariant(); + if ( index.column() < 0 ) + return QVariant(); PlayableModel::Columns col = m_headerStyle[ m_style ].at( index.column() ); QModelIndex sourceIdx = mapToSource( index );