From 9243d94484125a3e97bc57d2bcd7e5c1a926c04b Mon Sep 17 00:00:00 2001 From: Vesa Date: Fri, 27 Jun 2014 23:17:21 +0300 Subject: [PATCH] Fix qstring arg --- data/themes/default/mixer_send_off.png | Bin 1022 -> 817 bytes data/themes/default/mixer_send_on.png | Bin 1675 -> 1476 bytes include/FxLine.h | 3 ++- src/core/FxMixer.cpp | 2 +- src/gui/widgets/FxLine.cpp | 17 ++++++++++++++--- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/data/themes/default/mixer_send_off.png b/data/themes/default/mixer_send_off.png index 1be1ad54f20a570b743b38e04939c58705777d5d..3033c4962ac871abc3d18064610d04fa93c9a224 100644 GIT binary patch delta 752 zcmV8?PLTPJ@4nMp)JR7l6|mCH*TQ5431lMERRD)=B97m3;UfJ|a`f}kL} z5H~^##ck-S{dZbuH+3i7b<<^ns3?kYp)i7pAh)BizruCh&*gIYgA|>Z znD`33Z#J9Qw*Bma&%mc@wfZptpeV|lX0u7F)p}G=(==&{qM)iOp-@QrRaHe*RTM=* z(=?B-2k!vXKcd67Z38eqKF-R@3PVFf7>2>Y!2y{}MrLhoZ80@9MIw=4b8{2RvRGVP z#C2WH&d%7_*Z_aPvMdUP0y{f9vJoM~s1)r!vxS8POw%Nv&(qh}C&dmA4>3)Xdc7{Y zo1L9yZ*R}n&i?*BBO@cEQYmh4Z!rwR<5xSw(Lp#IrdTX;dU^`Lz`y_i#bS|ixh&%v zjRuKCf}^7&pQvFNSe8XN9A` zb*`_kiAH~;G#U-b&&pOa3faU4g+>bg#=)gqhCQYw`m{|rVVkzeh0 zd!$?ZCDC?8R<0D?3CcXxL``}_MNLWnpJ?j5d|=u`;t itzNHZ{{LfN9lrsB8gN&s`5a^b0000(-2L1<-Dlq^60002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2i^t~3K=EzpCYG`TPJ@5W=TXrR7l6=l;2NVWf;dl@2{SgZfb}ytTYuOT>z6!r1wU) zB}+^+F1p?AZ}2bi&P(q|%)D}jq!<>>NFbzuS%B39yC$uz&?*Fv14_?1uNSA3)=@6z z<(}l^JkN8^`+VQ;^9x=T5uL{EPw##8_x_)wQ6~~bNTd)ny(WK7G>X^sh{xjuzK?G$ zf#;#L!S|XN6CoOnA|&{pPqZ(Fk_v4MhtHp*oxZ2D-+cY$DUR+0{j2uJsMg9p`|a2F zP8yAbR1(p;my|7C0G6{iHq?Ev1c1aR02^AL-@E_46N`;@;>a%EHi+(2N*T{;|`oH=1nkR|t z*RGRDBp4eTd+EAuZ*NnrR(Z1VBmrz*2&$AKnM{&Sr~g;8jE|3_wPs^u0~^-i{PbEZ zNXg{nB#lOc*>7ig^z$Q(F)S}Hlbz3!ozLR?K1)kW936ihVT_?tsbGxZ!FLbH&Sxo= zN*o^_GchrNP>LX+H)s$9C?U{V^KkAVw{F~G=EE7Z*6i)?k(thL^Ttga$Dv-YQz#UW zQnIkHfYur(;xKe&h)ShGxm-qTjS>PSyN0AYy^)B6>$>Fgd1|{g78e(pdVdOlot+(O zwHmJL0$*fD<^ra^-_|o9WGIzO zEG;j!eUBF(lgs5eJUj$o?ANHdTN@rU)IhpGM%Bn zzrSs#QYnNGY;A3w+eoK!blm98v{TCEGHdH=TupypZToVoxi-_&G!G9CbJ9Ekz;#_# zS69j9atsU(bd=5XW-5fhS|}EajEszsOeWjkWdjPXbDVr9oioO%o(8p@O=bhEwPDa!(^)K*pyi_l94>roEw?}Z zBo}ca$32<$4-7r~=U{I%J$Y^O%3E)5Ub_4`N_TI{m=ifSoyLU!IT1rF8X+Ew0)lwF hFIKMBp7Kh{zn$S?DU}6j-~a#s07*qoM6LruV1k0Z$EW}R diff --git a/data/themes/default/mixer_send_on.png b/data/themes/default/mixer_send_on.png index 5982ea3f69d31aca2dadd375bf160bec493251c1..776398e9fc3ed65e2164aadc2d6407229b7f325d 100644 GIT binary patch delta 1415 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 O0000m_channelIndex, m_to->m_channelIndex ); // create send amount model m_amount = new FloatModel( amount, 0, 1, 0.001, NULL, - tr( "Amount to send from channel %1 to channel %2" ).arg( m_from->m_channelIndex, m_to->m_channelIndex ) ); + tr( "Amount to send from channel %1 to channel %2" ).arg( m_from->m_channelIndex ).arg( m_to->m_channelIndex ) ); } diff --git a/src/gui/widgets/FxLine.cpp b/src/gui/widgets/FxLine.cpp index ce696cc10..ea8f6353d 100644 --- a/src/gui/widgets/FxLine.cpp +++ b/src/gui/widgets/FxLine.cpp @@ -41,6 +41,7 @@ const int FxLine::FxLineHeight = 287; QPixmap * FxLine::s_sendBgArrow = NULL; +QPixmap * FxLine::s_receiveBgArrow = NULL; FxLine::FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex) : QWidget( _parent ), @@ -51,6 +52,10 @@ FxLine::FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex) : { s_sendBgArrow = new QPixmap( embed::getIconPixmap( "send_bg_arrow", 29, 56 ) ); } + if( ! s_receiveBgArrow ) + { + s_receiveBgArrow = new QPixmap( embed::getIconPixmap( "receive_bg_arrow", 29, 56 ) ); + } setFixedSize( 33, FxLineHeight ); setAttribute( Qt::WA_OpaquePaintEvent, true ); @@ -103,7 +108,7 @@ void FxLine::setChannelIndex(int index) { } -void FxLine::drawFxLine( QPainter* p, const FxLine *fxLine, const QString& name, bool isActive, bool sendToThis ) +void FxLine::drawFxLine( QPainter* p, const FxLine *fxLine, const QString& name, bool isActive, bool sendToThis, bool receiveFromThis ) { int width = fxLine->rect().width(); int height = fxLine->rect().height(); @@ -126,7 +131,11 @@ void FxLine::drawFxLine( QPainter* p, const FxLine *fxLine, const QString& name, // draw the mixer send background if( sendToThis ) { - p->drawPixmap( 2, 0, 29, 56, *FxLine::s_sendBgArrow ); + p->drawPixmap( 2, 0, 29, 56, *s_sendBgArrow ); + } + else if( receiveFromThis ) + { + p->drawPixmap( 2, 0, 29, 56, *s_receiveBgArrow ); } // draw the channel name @@ -148,11 +157,13 @@ void FxLine::paintEvent( QPaintEvent * ) FxMixer * mix = engine::fxMixer(); bool sendToThis = mix->channelSendModel( m_mv->currentFxLine()->m_channelIndex, m_channelIndex ) != NULL; + bool receiveFromThis = mix->channelSendModel( + m_channelIndex, m_mv->currentFxLine()->m_channelIndex ) != NULL; QPainter painter; painter.begin( this ); drawFxLine( &painter, this, mix->effectChannel( m_channelIndex )->m_name, - m_mv->currentFxLine() == this, sendToThis ); + m_mv->currentFxLine() == this, sendToThis, receiveFromThis ); painter.end(); }