hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #290 from M374LX/stable-0.4

Browse Source 
Better way to update play button icons
This commit is contained in:
Tobias Doerffel
2014-02-09 22:38:39 +01:00
parent ab44ef221e def1154971
commit c6a6feb588
9 changed files with 50 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/AutomationEditor.h
View File

@@ -73,7 +73,7 @@ public:
return( "automationeditor" );
}
void updatePlayPauseIcon();
void setPauseIcon( bool pause );
public slots:

2
include/bb_editor.h
View File

@@ -48,7 +48,7 @@ public:
void removeBBView( int _bb );
void updatePlayPauseIcon();
void setPauseIcon( bool pause );
public slots:

2
include/piano_roll.h
View File

@@ -89,7 +89,7 @@ public:
return "pianoroll";
}
void updatePlayPauseIcon();
void setPauseIcon( bool pause );
protected:

4
include/song_editor.h
View File

@@ -59,12 +59,12 @@ public:
songEditor( song * _song );
virtual ~songEditor();
void setPauseIcon( bool pause );
public slots:
void scrolled( int _new_pos );
void updatePlayPauseIcon();
private slots:
void setHighQuality( bool );

33
src/core/engine.cpp
View File

@@ -148,10 +148,35 @@ void engine::destroy()
void engine::updatePlayPauseIcons()
{
s_songEditor->updatePlayPauseIcon();
s_automationEditor->updatePlayPauseIcon();
s_bbEditor->updatePlayPauseIcon();
s_pianoRoll->updatePlayPauseIcon();
s_songEditor->setPauseIcon( false );
s_automationEditor->setPauseIcon( false );
s_bbEditor->setPauseIcon( false );
s_pianoRoll->setPauseIcon( false );
if( s_song->isPlaying() )
{
switch( s_song->playMode() )
{
case song::Mode_PlaySong:
s_songEditor->setPauseIcon( true );
break;
case song::Mode_PlayAutomationPattern:
s_automationEditor->setPauseIcon( true );
break;
case song::Mode_PlayBB:
s_bbEditor->setPauseIcon( true );
break;
case song::Mode_PlayPattern:
s_pianoRoll->setPauseIcon( true );
break;
default:
break;
}
}
}

15
src/gui/AutomationEditor.cpp
View File

@@ -489,22 +489,15 @@ void AutomationEditor::loadSettings( const QDomElement & _this )
void AutomationEditor::updatePlayPauseIcon()
void AutomationEditor::setPauseIcon( bool pause )
{
if( engine::getSong()->playMode() != song::Mode_PlayPattern )
if( pause == true )
{
m_playButton->setIcon( embed::getIconPixmap( "play" ) );
m_playButton->setIcon( embed::getIconPixmap( "pause" ) );
}
else
{
if( engine::getSong()->isPlaying() )
{
m_playButton->setIcon( embed::getIconPixmap( "pause" ) );
}
else
{
m_playButton->setIcon( embed::getIconPixmap( "play" ) );
}
m_playButton->setIcon( embed::getIconPixmap( "play" ) );
}
}

15
src/gui/bb_editor.cpp
View File

@@ -171,22 +171,15 @@ void bbEditor::removeBBView( int _bb )
void bbEditor::updatePlayPauseIcon()
void bbEditor::setPauseIcon( bool pause )
{
if( engine::getSong()->playMode() != song::Mode_PlayBB )
if( pause == true )
{
m_playButton->setIcon( embed::getIconPixmap( "play" ) );
m_playButton->setIcon( embed::getIconPixmap( "pause" ) );
}
else
{
if( engine::getSong()->isPlaying() )
{
m_playButton->setIcon( embed::getIconPixmap( "pause" ) );
}
else
{
m_playButton->setIcon( embed::getIconPixmap( "play" ) );
}
m_playButton->setIcon( embed::getIconPixmap( "play" ) );
}
}

15
src/gui/piano_roll.cpp
View File

@@ -798,22 +798,15 @@ void pianoRoll::loadSettings( const QDomElement & _this )
void pianoRoll::updatePlayPauseIcon()
void pianoRoll::setPauseIcon( bool pause )
{
if( engine::getSong()->playMode() != song::Mode_PlayPattern )
if( pause == true )
{
m_playButton->setIcon( embed::getIconPixmap( "play" ) );
m_playButton->setIcon( embed::getIconPixmap( "pause" ) );
}
else
{
if( engine::getSong()->isPlaying() )
{
m_playButton->setIcon( embed::getIconPixmap( "pause" ) );
}
else
{
m_playButton->setIcon( embed::getIconPixmap( "play" ) );
}
m_playButton->setIcon( embed::getIconPixmap( "play" ) );
}
}

15
src/gui/song_editor.cpp
View File

@@ -427,22 +427,15 @@ void songEditor::scrolled( int _new_pos )
void songEditor::updatePlayPauseIcon()
void songEditor::setPauseIcon( bool pause )
{
if( engine::getSong()->playMode() != song::Mode_PlaySong )
if( pause == true )
{
m_playButton->setIcon( embed::getIconPixmap( "play" ) );
m_playButton->setIcon( embed::getIconPixmap( "pause" ) );
}
else
{
if( engine::getSong()->isPlaying() )
{
m_playButton->setIcon( embed::getIconPixmap( "pause" ) );
}
else
{
m_playButton->setIcon( embed::getIconPixmap( "play" ) );
}
m_playButton->setIcon( embed::getIconPixmap( "play" ) );
}
}