From 01d075606867400a2aab3d0f13a935e52753a29e Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Sun, 17 Sep 2006 20:23:22 +0000 Subject: [PATCH] update loop points state button when loading a project git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@400 0778d3d1-df1d-0410-868b-ea421aaaa00d --- include/timeline.h | 1 + src/core/timeline.cpp | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/include/timeline.h b/include/timeline.h index e7bdf7247..9088b54f1 100644 --- a/include/timeline.h +++ b/include/timeline.h @@ -185,6 +185,7 @@ private: signals: void positionChanged( const midiTime & _t ); + void loopPointStateLoaded( int _n ); } ; diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp index 874198427..d068a9540 100644 --- a/src/core/timeline.cpp +++ b/src/core/timeline.cpp @@ -137,40 +137,39 @@ timeLine::~timeLine() void timeLine::addToolButtons( QWidget * _tool_bar ) { - nStateButton * m_autoScroll = new nStateButton( _tool_bar ); - m_autoScroll->setGeneralToolTip( tr( "Enable/disable " - "auto-scrolling" ) ); - m_autoScroll->addState( embed::getIconPixmap( "autoscroll_on" ) ); - m_autoScroll->addState( embed::getIconPixmap( "autoscroll_off" ) ); - connect( m_autoScroll, SIGNAL( changedState( int ) ), this, + nStateButton * autoScroll = new nStateButton( _tool_bar ); + autoScroll->setGeneralToolTip( tr( "Enable/disable auto-scrolling" ) ); + autoScroll->addState( embed::getIconPixmap( "autoscroll_on" ) ); + autoScroll->addState( embed::getIconPixmap( "autoscroll_off" ) ); + connect( autoScroll, SIGNAL( changedState( int ) ), this, SLOT( toggleAutoScroll( int ) ) ); - nStateButton * m_loopPoints = new nStateButton( _tool_bar ); - m_loopPoints->setGeneralToolTip( tr( "Enable/disable loop-points" ) ); - m_loopPoints->addState( embed::getIconPixmap( "loop_points_off" ) ); - m_loopPoints->addState( embed::getIconPixmap( "loop_points_on" ) ); - connect( m_loopPoints, SIGNAL( changedState( int ) ), this, + nStateButton * loopPoints = new nStateButton( _tool_bar ); + loopPoints->setGeneralToolTip( tr( "Enable/disable loop-points" ) ); + loopPoints->addState( embed::getIconPixmap( "loop_points_off" ) ); + loopPoints->addState( embed::getIconPixmap( "loop_points_on" ) ); + connect( loopPoints, SIGNAL( changedState( int ) ), this, SLOT( toggleLoopPoints( int ) ) ); + connect( this, SIGNAL( loopPointStateLoaded( int ) ), loopPoints, + SLOT( changeState( int ) ) ); - nStateButton * m_behaviourAtStop = new nStateButton( _tool_bar ); - m_behaviourAtStop ->addState( embed::getIconPixmap( "back_to_zero" ), + nStateButton * behaviourAtStop = new nStateButton( _tool_bar ); + behaviourAtStop->addState( embed::getIconPixmap( "back_to_zero" ), tr( "After stopping go back to begin" ) ); - m_behaviourAtStop ->addState( embed::getIconPixmap( - "back_to_start" ), + behaviourAtStop->addState( embed::getIconPixmap( "back_to_start" ), tr( "After stopping go back to " "position at which playing was " "started" ) ); - m_behaviourAtStop ->addState( embed::getIconPixmap( - "keep_stop_position" ), + behaviourAtStop->addState( embed::getIconPixmap( "keep_stop_position" ), tr( "After stopping keep position" ) ); - connect( m_behaviourAtStop, SIGNAL( changedState( int ) ), this, + connect( behaviourAtStop, SIGNAL( changedState( int ) ), this, SLOT( toggleBehaviourAtStop( int ) ) ); QBoxLayout * layout = dynamic_cast( _tool_bar->layout() ); - layout->addWidget( m_autoScroll ); - layout->addWidget( m_loopPoints ); - layout->addWidget( m_behaviourAtStop ); + layout->addWidget( autoScroll ); + layout->addWidget( loopPoints ); + layout->addWidget( behaviourAtStop ); } @@ -193,6 +192,7 @@ void timeLine::loadSettings( const QDomElement & _this ) m_loopPoints = static_cast( _this.attribute( "lpstate" ).toInt() ); update(); + emit loopPointStateLoaded( m_loopPoints ); }