From 836cb053162f589afa3fbff57d464fd17c852422 Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Mon, 26 May 2008 09:25:49 +0000 Subject: [PATCH] Enough controller stuff for tonight git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1025 0778d3d1-df1d-0410-868b-ea421aaaa00d --- data/themes/default/controller_bg.png | Bin 2785 -> 4594 bytes data/themes/default/style.css | 2 +- include/controller_view.h | 1 + src/core/controller.cpp | 6 +++++- src/gui/lfo_controller_dialog.cpp | 6 +++++- src/gui/widgets/controller_rack_view.cpp | 4 ++-- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/data/themes/default/controller_bg.png b/data/themes/default/controller_bg.png index cfb6e729a88a417be17ce314ad8985c6cba5185e..dc9c9f011a5c2d442985e3b0bdf3fdf006dc8224 100644 GIT binary patch literal 4594 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 delta 2774 zcmV;{3MuvSBjFX07YY;z1^@s6_$XuRks%a+3YJMkK~#9!?ORQc9Y+;C_dVkvWKa+Y zw)}$Zkyx>0P52RP_yrMvAqyY~Ckg}-2WyxB!US(3PmmFdAOu7clvqdsVk^UZyssJ0 zypMZWbXV2A)z$raW}b1P@D?+DyX&i~@2PX^RF#nY+-tY)JbgBwf0N`>0G@yd00Izy z5kd76Ku{UgW2x^|4@FEW30dki=^@~+E6bFVuFJM0qrMf3xbTnhf^_$pp3?tucDQC; zhAA(WO|niyS2n93R2gij5`==vDjf+0K~<1dsZ@oMfL3La-d1W=KM5s3W0Q#WR%NlO zqqb3}XWbr0PFtr@;~W8;5!`iusAf)5X0VqA5X9h?wJkYnEDr4> z-_#69EFvp*qy<3yFy>iss+7qvih`8*LDYRzZP>I96ImyLLc<4BP0r;;$+}KW4iW$p z!K@))Vuu(Jm}hpxhH)hOp4HHi4J;M_1=hBG8U88NeHdonq}!$+;7WFXq0Uy@RmJW$ z_}HZ87XnZ&mh+#z{>z)+0dN%k@THr-ymtft9!&?gNzPys}wPUS!cGnyz& zkmm}QIw5o0T&KUN>k91B1f zL;zXFbD^MNAk?g5ogoK*L4bfJ+G2Hw0`UYph(+!bPN^8X9K9Spe^UW}X>c4c$>%sx5HJkm7|W@G7DV+sL`F0{ z)CHmlR<38G7IwM_8}$ax2HB`La56RmiTT0->1_Z%kQZNn`87w=364fbX5?op8#%ie zej%qX6A4NT+bnR{65mY&ZqN%<DW2glN zA3j+-IAqR<7DQDYxfBUCtJKBYM z^b&;?4vKRXqaf2UOi6Ao+i@;r)}8WouBNEaWIVezLD`pQtB?iMw=BC z*36Y!*eI{F2&5mq^b1aAQ;a8*3^)=yTC#b(*p7}wRL_OdrU*ATT1z@$#U{+ux5nhE z-0_`%AiH2k+xd>|SgW*okpU*$@@-(3ZNoM*S88QC_%$j2o;JkG)j4L-?W1L*KI=@6 znvE_S#+BwuXNxn;av=Ti$6K7vrWntrv4g~RKv-a9a~{&z8DKXUMF`8t+o%W ztlq4{ceEIgZFExV2*!my9Rg>gi#%#Oz%NYA}^lhfG@lj*duJ%9!l89S{5S(r<)x#K_zI}ikk zjgnH=xk%JNTQe-kJ2odLZD*s#=#{B)*%p#q(sn|+)6vZ?2GXtX6i0TW-1)Vt1e6?q zL@4Y)=q+&MY7OYm51E(~np%Ey6 ze8)pAG8jQ35}thzF|s=icqRW3=a9JBGB)JPvjtG4@jeF*o1n_WJhY1rZpT0#nz0bp z^$p|T_s5l#xzyYq3$Ev3qf2h%`#1r@ zdt&DBM#8p&AG0+lTMz+-4eMz4B4o;))#>v6ahnwtdd-zK#YU~{^a$DLlIuu+v*R(& z=BJCd{;>01Qb!ddJ^#u#Rx7=AIzPi?HjDAQ592l@06M0&I5}N3U}iWbJ(a+&U)c$41sq z9t#^?a#zEJ*a*bKhsSt$dW^$={k=Et{r&CR0LB15kUMwoT>10v`_G8r84_5mR-~%f za~W1%jggHxM^#9nTrX=kBs1Co=3P_^>rhnMb3;HnFxUowb)YB%<&psTnEvKxXZz#P;d>AM{r)b1 zC4dtEhXC#i$>H_u*9Ti$TUYPhyLav69?9E|*^<`B{>GR|kW^l{#*UvD08M zaBH)J!2p>ZpAUz_)@P->r8I5#)|J!ur#`kTJ!j8*t!Y-PRcHRLyrvBHZF?zyTU&be z(I*o@O^#XtSOA#SjP#+99PaGw$oBU3@b2BapWfTsyLNnh{3OXISF6=El1~5_l9b_a z*l^_hUQ3$JJSBiZl*%cU)dDElq;s@6U5it*D^01aLK^mILn&R?{mX!8U74RiAkAw= c8Uq;p7wI<>oRdwYV*mgE07*qoM6N<$f?EDZcmMzZ diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 134a76a2c..7a365ea9f 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -38,7 +38,7 @@ QMenu::item { QMenu::item:selected { color: white; font-weight:bold; - background-color: rgba(0, 0, 0, 160); + background-color: rgb(54,57,66); margin:3px; } diff --git a/include/controller_view.h b/include/controller_view.h index 68e6e227f..512f8c6e2 100644 --- a/include/controller_view.h +++ b/include/controller_view.h @@ -77,6 +77,7 @@ signals: protected: virtual void contextMenuEvent( QContextMenuEvent * _me ); virtual void paintEvent( QPaintEvent * _pe ); + virtual void mouseDoubleClickEvent( QMouseEvent * event ); virtual void modelChanged( void ); diff --git a/src/core/controller.cpp b/src/core/controller.cpp index dbe6099ee..a5383d5f7 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -49,7 +49,11 @@ controller::controller( ControllerTypes _type, model * _parent ) : m_type( _type ) { if( _type != DummyController ) + { s_controllers.append( this ); + m_name = QString( tr( "Controller %1" ) ) + .arg( s_controllers.size() ); + } } @@ -186,7 +190,7 @@ void controller::loadSettings( const QDomElement & _this ) "settings-node!\n" ); } - setName( _this.attribute( "muted" ) ); + setName( _this.attribute( "name" ) ); } diff --git a/src/gui/lfo_controller_dialog.cpp b/src/gui/lfo_controller_dialog.cpp index 113b28a03..6af042b5d 100644 --- a/src/gui/lfo_controller_dialog.cpp +++ b/src/gui/lfo_controller_dialog.cpp @@ -65,8 +65,12 @@ const int LFO_PHASE_KNOB_X = LFO_AMOUNT_KNOB_X+KNOB_X_SPACING; lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent ) : controllerDialog( _model, _parent ) { - setWindowIcon( embed::getIconPixmap( "controller" ) ); + QString title = tr( "LFO" ); + title.append( " (" ); + title.append( _model->name() ); + title.append( ")" ); setWindowTitle( tr( "LFO (name)" ) ); + setWindowIcon( embed::getIconPixmap( "controller" ) ); setFixedSize( 256, 64 ); toolTip::add( this, tr( "LFO Controller" ) ); diff --git a/src/gui/widgets/controller_rack_view.cpp b/src/gui/widgets/controller_rack_view.cpp index 6f657d3ec..8f1f0266d 100644 --- a/src/gui/widgets/controller_rack_view.cpp +++ b/src/gui/widgets/controller_rack_view.cpp @@ -182,11 +182,11 @@ void controllerRackView::update( void ) { controllerView * v = new controllerView( s->m_controllers[i], w ); m_controllerViews.append( v ); - v->move( 0, i*20 ); + v->move( 0, i*32 ); v->show(); } - w->setFixedSize( 210, i*20 ); + w->setFixedSize( 210, i*32 ); /* for( QVector::iterator it = fxChain()->m_effects.begin();