Martchus/pianobooster
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #145 from admsasha/master

Browse Source 
Save and restore skill from SidePanel in config
This commit is contained in:
glixx 2019-07-01 05:22:19 +03:00 committed by GitHub
commit cede8af59a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/GuiSidePanel.cpp
View File

@ -31,6 +31,7 @@
#include "GuiSidePanel.h"
#include "GuiTopBar.h"
#include "TrackList.h"
#include "Conductor.h"
GuiSidePanel::GuiSidePanel(QWidget *parent, CSettings* settings)
@ -42,6 +43,8 @@ GuiSidePanel::GuiSidePanel(QWidget *parent, CSettings* settings)
m_topBar = 0;
m_settings = settings;
setupUi(this);
}
void GuiSidePanel::init(CSong* songObj, CTrackList* trackList, GuiTopBar* topBar)
@ -51,7 +54,29 @@ void GuiSidePanel::init(CSong* songObj, CTrackList* trackList, GuiTopBar* topBar
m_topBar = topBar;
m_trackList->init(songObj, m_settings);
followYouRadio->setChecked(true);
// set skill from config
playMode_t skill = m_settings->value("SidePanel/skill",PB_PLAY_MODE_followYou).toInt();
switch (skill) {
case PB_PLAY_MODE_listen:
listenRadio->setChecked(true);
on_listenRadio_toggled(true);
break;
case PB_PLAY_MODE_rhythmTapping:
rhythmTapRadio->setChecked(true);
on_rhythmTapRadio_toggled(true);
break;
case PB_PLAY_MODE_followYou:
followYouRadio->setChecked(true);
on_followYouRadio_toggled(true);
break;
case PB_PLAY_MODE_playAlong:
playAlongRadio->setChecked(true);
on_playAlongRadio_toggled(true);
break;
default:
break;
}
bothHandsRadio->setChecked(true);
rhythmTappingCombo->addItem(tr("Drums"));
@ -81,6 +106,9 @@ void GuiSidePanel::init(CSong* songObj, CTrackList* trackList, GuiTopBar* topBar
connect(act, SIGNAL(triggered()), this, SLOT(clearTrackPart()));
trackListWidget->setContextMenuPolicy(Qt::ActionsContextMenu);
}
void GuiSidePanel::refresh() {

4
src/GuiSidePanel.h
View File

@ -111,6 +111,7 @@ private slots:
void on_listenRadio_toggled (bool checked)
{
if (!m_song || !checked) return;
m_settings->setValue("SidePanel/skill",PB_PLAY_MODE_listen);
m_song->setPlayMode(PB_PLAY_MODE_listen);
autoSetMuteYourPart();
}
@ -118,6 +119,7 @@ private slots:
void on_rhythmTapRadio_toggled (bool checked)
{
if (!m_song || !checked) return;
m_settings->setValue("SidePanel/skill",PB_PLAY_MODE_rhythmTapping);
m_song->setPlayMode(PB_PLAY_MODE_rhythmTapping);
autoSetMuteYourPart();
}
@ -125,6 +127,7 @@ private slots:
void on_followYouRadio_toggled (bool checked)
{
if (!m_song || !checked) return;
m_settings->setValue("SidePanel/skill",PB_PLAY_MODE_followYou);
m_song->setPlayMode(PB_PLAY_MODE_followYou);
autoSetMuteYourPart();
}
@ -132,6 +135,7 @@ private slots:
void on_playAlongRadio_toggled (bool checked)
{
if (!m_song || !checked) return;
m_settings->setValue("SidePanel/skill",PB_PLAY_MODE_playAlong);
m_song->setPlayMode(PB_PLAY_MODE_playAlong);
autoSetMuteYourPart();
}