From 248f2e64fa79314d6d02a80caf4a179a89a6518f Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Fri, 9 Jun 2006 21:20:18 +0000 Subject: [PATCH] added PM buttons, hid FM ones git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@151 0778d3d1-df1d-0410-868b-ea421aaaa00d --- plugins/triple_oscillator/pm_active.png | Bin 0 -> 615 bytes plugins/triple_oscillator/pm_inactive.png | Bin 0 -> 647 bytes .../triple_oscillator/triple_oscillator.cpp | 62 +++++++++++++----- 3 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 plugins/triple_oscillator/pm_active.png create mode 100644 plugins/triple_oscillator/pm_inactive.png diff --git a/plugins/triple_oscillator/pm_active.png b/plugins/triple_oscillator/pm_active.png new file mode 100644 index 0000000000000000000000000000000000000000..c44622ab6fd35e3f60440df03500d2e4b0a7ae87 GIT binary patch literal 615 zcmV-t0+{`YP)Rfg1oV9zGqDtAS zuvJ1V1q2xwTnuI)G1y@Hwcie|EfV6W67bbYclthe&-b3Y=eY~`1!SC2r^*Q#eOE<9 zff7^X2@r!mjVRhF7OPQI4}$X{c}0Xwrs-j$@kOsUPmwStqY*`amrDCfOLN8Iy&!OX z2;RPJuC47M~wEeYO3~HlF|Vd?bb>i7J)Pj*qt*jhMxlBet@v-fDebulFx1jgY)aD!)~*{%n13 zYH#J|m67T7!t2>zXR%w^9Wb?8?Y$6Nt&@KLkeHd6e>h0f=F!p7>FMcZF=z^Y58&B5 z9&?Ae^wV^6eiOQK$GP@&`;wlsv-31?MCD zwQp-kR+ILF_IoptWm%`w>2^D`IKdMN1cT%L0QN4lHRdkxFPR&f=6K28*u>!z9>w&B zsh^F_vMN7-Lw4Ua?ef=f@G<=7JSHL>ZefgMi?#8tzW-l^K}Zx*AU~A6IRs2nh$(T0 z2In6RadwP{%lzYyh~>CTDP)QTrkNNO>2*go!88j@MSMqrm{ZQ_U7zaU&Jt$0&sT%< z3@Eb5Ew-r9y1w^1&m9&hQzVFohTDA2%uWAC{{kfq%&trTVA}uy002ovPDHLkV1nm~ BET;ef literal 0 HcmV?d00001 diff --git a/plugins/triple_oscillator/pm_inactive.png b/plugins/triple_oscillator/pm_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..9a3dc975c1a2f6b043cbddaf1b2b54c6b3e5acaf GIT binary patch literal 647 zcmV;20(kw2P)1v7oPbdhWE2RMGFECy6E9s@E9hADFTlc{pTNx2m5Ggwu~HYxz>)zW5F#l} zJw#4Q6EKhv&bbn&gBuG$s45ZO>C>I>d%p9%_nm-G0Q5mZ0~}~WAAFvw2qYi_(=Y)7 z&;jtF6^(wMnQ6vit`Od!f+tFVp;W8Um{IB_Btg@m53OkQIG?{+TKbqyr-Trr<8gZ0 z+}QYhbabp#7AAGLfwF1-SXg);j~m^tcW;qpSz+wDZmm}9_xs_v>$;BP0GUi?YHA8N zJUqO+JRUa|7cIy6(r9Rq*P#g|-#@>)ax0a}!<|`{C8az#H~{A7=Y8Mb-rf#*$z-xp zsR$vm*=+EAxm>=t%gf7i-~RMr%H8g+dexx8~PhNozCv=Zos>n@#5mbFpROW zF(Jh5?QOf=Hcj&Zk5;R#)HVDDM~4=4JWrjRoEXNqrfEZuVsCFRj7z0bSVyr~%;j>x z&dyFQmorT>oDJmrzLe7QB=n#i_ywg@wOW15BdJtsb8{1rQm(A5*tQ*vce~y7_4Tc- zEuc^+tgWrxt>%Gubm-~e53bsyhOF1?tE;O(v)K$`fo$8}-`@{{e|q(AavdU|4N4e} zlu{Op#m6!&FE9V!-OwPSK>{WQ$mf#)0}=uX@D;wnsM^X<*f_j`cN$E?9Hb!@Hic2c zVvvS8n2x{)NPrI4;6ZP6)Zommove( 80, 50 ); - fm_osc1_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( - "fm_active" ) ); - fm_osc1_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( - "fm_inactive" ) ); - fm_osc1_btn->setMask( QBitmap( PLUGIN_NAME::getIconPixmap( "btn_mask" ). + pixmapButton * pm_osc1_btn = new pixmapButton( this, eng() ); + pm_osc1_btn->move( 80, 50 ); + pm_osc1_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( + "pm_active" ) ); + pm_osc1_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( + "pm_inactive" ) ); + pm_osc1_btn->setMask( QBitmap( PLUGIN_NAME::getIconPixmap( "btn_mask" ). createHeuristicMask() ) ); - toolTip::add( fm_osc1_btn, tr( "use frequency modulation for " + toolTip::add( pm_osc1_btn, tr( "use phase modulation for " "modulating oscillator 2 with " "oscillator 1" ) ); @@ -146,26 +146,39 @@ tripleOscillator::tripleOscillator( instrumentTrack * _channel_track ) : toolTip::add( sync_osc1_btn, tr( "synchronize oscillator 1 with " "oscillator 2" ) ); + pixmapButton * fm_osc1_btn = new pixmapButton( this, eng() ); + fm_osc1_btn->move( 330, 50 ); + fm_osc1_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( + "fm_active" ) ); + fm_osc1_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( + "fm_inactive" ) ); + fm_osc1_btn->setMask( QBitmap( PLUGIN_NAME::getIconPixmap( "btn_mask" ). + createHeuristicMask() ) ); + toolTip::add( fm_osc1_btn, tr( "use frequency modulation for " + "modulating oscillator 2 with " + "oscillator 1" ) ); + m_mod1BtnGrp = new automatableButtonGroup( this, eng() ); - m_mod1BtnGrp->addButton( fm_osc1_btn ); + m_mod1BtnGrp->addButton( pm_osc1_btn ); m_mod1BtnGrp->addButton( am_osc1_btn ); m_mod1BtnGrp->addButton( mix_osc1_btn ); m_mod1BtnGrp->addButton( sync_osc1_btn ); + m_mod1BtnGrp->addButton( fm_osc1_btn ); m_mod1BtnGrp->setInitValue( m_modulationAlgo1 ); connect( m_mod1BtnGrp, SIGNAL( valueChanged( int ) ), this, SLOT( mod1Ch( int ) ) ); - pixmapButton * fm_osc2_btn = new pixmapButton( this, eng() ); - fm_osc2_btn->move( 80, 70 ); - fm_osc2_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( - "fm_active" ) ); - fm_osc2_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( - "fm_inactive" ) ); - fm_osc2_btn->setMask( QBitmap( PLUGIN_NAME::getIconPixmap( "btn_mask" ). + pixmapButton * pm_osc2_btn = new pixmapButton( this, eng() ); + pm_osc2_btn->move( 80, 70 ); + pm_osc2_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( + "pm_active" ) ); + pm_osc2_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( + "pm_inactive" ) ); + pm_osc2_btn->setMask( QBitmap( PLUGIN_NAME::getIconPixmap( "btn_mask" ). createHeuristicMask() ) ); - toolTip::add( fm_osc2_btn, tr( "use frequency modulation for " + toolTip::add( pm_osc2_btn, tr( "use phase modulation for " "modulating oscillator 3 with " "oscillator 2" ) ); @@ -202,11 +215,24 @@ tripleOscillator::tripleOscillator( instrumentTrack * _channel_track ) : toolTip::add( sync_osc2_btn, tr( "synchronize oscillator 2 with " "oscillator 3" ) ); + pixmapButton * fm_osc2_btn = new pixmapButton( this, eng() ); + fm_osc2_btn->move( 330, 70 ); + fm_osc2_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( + "fm_active" ) ); + fm_osc2_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( + "fm_inactive" ) ); + fm_osc2_btn->setMask( QBitmap( PLUGIN_NAME::getIconPixmap( "btn_mask" ). + createHeuristicMask() ) ); + toolTip::add( fm_osc2_btn, tr( "use frequency modulation for " + "modulating oscillator 3 with " + "oscillator 2" ) ); + m_mod2BtnGrp = new automatableButtonGroup( this, eng() ); - m_mod2BtnGrp->addButton( fm_osc2_btn ); + m_mod2BtnGrp->addButton( pm_osc2_btn ); m_mod2BtnGrp->addButton( am_osc2_btn ); m_mod2BtnGrp->addButton( mix_osc2_btn ); m_mod2BtnGrp->addButton( sync_osc2_btn ); + m_mod2BtnGrp->addButton( fm_osc2_btn ); m_mod2BtnGrp->setInitValue( m_modulationAlgo2 ); connect( m_mod2BtnGrp, SIGNAL( valueChanged( int ) ),