Skip to content

Commit

Permalink
Merge pull request #3086 from ericfont/182546-RemoveMetronomeFromSynthUI
Browse files Browse the repository at this point in the history 
fix #182546 #182176 Move Metronome to PlayPanel
  • Loading branch information
@lasconic
lasconic committed Mar 20, 2017
2 parents efcd779 + 3d7b3f7 commit 0d76609
Show file tree
Hide file tree
Showing 7 changed files with 163 additions and 148 deletions.
1 change: 1 addition & 0 deletions mscore/musescore.cpp
View file
Expand Up @@ -2051,6 +2051,7 @@ void MuseScore::showPlayPanel(bool visible)
return;
playPanel = new PlayPanel(this);
connect(playPanel, SIGNAL(gainChange(float)), synti, SLOT(setGain(float)));
connect(playPanel, SIGNAL(metronomeGainChanged(float)), seq, SLOT(setMetronomeGain(float)));
connect(playPanel, SIGNAL(relTempoChanged(double)),seq, SLOT(setRelTempo(double)));
connect(playPanel, SIGNAL(posChange(int)), seq, SLOT(seek(int)));
connect(playPanel, SIGNAL(closed(bool)), playId, SLOT(setChecked(bool)));
Expand Down
12 changes: 12 additions & 0 deletions mscore/playpanel.cpp
View file
Expand Up @@ -61,7 +61,10 @@ PlayPanel::PlayPanel(QWidget* parent)
tempoSlider->setDclickValue2(100.0);
tempoSlider->setUseActualValue(true);

mgainSlider->setValue(seq->metronomeGain());

connect(volumeSlider, SIGNAL(valueChanged(double,int)), SLOT(volumeChanged(double,int)));
connect(mgainSlider, SIGNAL(valueChanged(double,int)), SLOT(metronomeGainChanged(double,int)));
connect(posSlider, SIGNAL(sliderMoved(int)), SLOT(setPos(int)));
connect(tempoSlider, SIGNAL(valueChanged(double,int)), SLOT(relTempoChanged(double,int)));
connect(tempoSlider, SIGNAL(sliderPressed(int)), SLOT(tempoSliderPressed(int)));
Expand Down Expand Up @@ -244,6 +247,15 @@ void PlayPanel::volumeChanged(double val, int)
emit gainChange(val);
}

//---------------------------------------------------------
// metronomeGainChanged
//---------------------------------------------------------

void PlayPanel::metronomeGainChanged(double val, int)
{
emit metronomeGainChanged(val);
}

//---------------------------------------------------------
// setPos
//---------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions mscore/playpanel.h
View file
Expand Up @@ -49,6 +49,7 @@ class PlayPanel : public QWidget, private Ui::PlayPanelBase {

private slots:
void volumeChanged(double,int);
void metronomeGainChanged(double val, int);
void relTempoChanged(double,int);
void relTempoChanged();
void tempoSliderReleased(int);
Expand All @@ -60,6 +61,7 @@ class PlayPanel : public QWidget, private Ui::PlayPanelBase {

signals:
void relTempoChanged(double);
void metronomeGainChanged(float);
void posChange(int);
void gainChange(float);
void closed(bool);
Expand Down
240 changes: 143 additions & 97 deletions mscore/playpanel.ui
View file
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>380</width>
<width>389</width>
<height>293</height>
</rect>
</property>
Expand Down Expand Up @@ -153,7 +153,7 @@
</widget>
</item>
<item>
<layout class="QHBoxLayout" stretch="0,0,0,0,0">
<layout class="QHBoxLayout" stretch="0,0,0,0">
<property name="spacing">
<number>1</number>
</property>
Expand Down Expand Up @@ -219,32 +219,6 @@
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QToolButton" name="countInButton">
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="musescore.qrc">
<normaloff>:/data/icons/media-playback-countin.svg</normaloff>:/data/icons/media-playback-countin.svg</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="metronomeButton">
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="musescore.qrc">
<normaloff>:/data/icons/media-playback-metronome.svg</normaloff>:/data/icons/media-playback-metronome.svg</iconset>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation">
Expand Down Expand Up @@ -351,7 +325,41 @@
<property name="spacing">
<number>6</number>
</property>
<item row="2" column="0">
<item row="0" column="1">
<widget class="QLabel" name="tempoLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font/>
</property>
<property name="toolTip">
<string>Actual tempo in quarter notes per minute</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="lineWidth">
<number>2</number>
</property>
<property name="midLineWidth">
<number>2</number>
</property>
<property name="text">
<string notr="true">120 BPM</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Awl::Slider" name="tempoSlider" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
Expand Down Expand Up @@ -391,29 +399,7 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Awl::VolSlider" name="volumeSlider" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="toolTip">
<string>Master volume</string>
</property>
<property name="accessibleName">
<string>Master Volume</string>
</property>
<property name="accessibleDescription">
<string>Use up and down arrows to change value</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="3" column="2">
<widget class="QLabel" name="label">
<property name="text">
<string extracomment="short text for volume slider">Volume</string>
Expand All @@ -423,51 +409,59 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="tempoLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font/>
</property>
<property name="toolTip">
<string>Actual tempo in quarter notes per minute</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="lineWidth">
<number>2</number>
</property>
<property name="midLineWidth">
<number>2</number>
</property>
<property name="text">
<string notr="true">120 BPM</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string extracomment="short text for tempo slider">Tempo</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="metronomeButton">
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="musescore.qrc">
<normaloff>:/data/icons/media-playback-metronome.svg</normaloff>:/data/icons/media-playback-metronome.svg</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="countInButton">
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="musescore.qrc">
<normaloff>:/data/icons/media-playback-countin.svg</normaloff>:/data/icons/media-playback-countin.svg</iconset>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="0">
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="relTempoBox">
<property name="accessibleName">
<string>Relative tempo to 120 beats per minute</string>
Expand Down Expand Up @@ -501,6 +495,60 @@
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string extracomment="short text for tempo slider">Tempo</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="Awl::VolSlider" name="mgainSlider" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="toolTip">
<string>Metronome volume</string>
</property>
<property name="accessibleName">
<string>Metronome Volume</string>
</property>
<property name="accessibleDescription">
<string>Use up and down arrows to change value</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="Awl::VolSlider" name="volumeSlider" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="toolTip">
<string>Master volume</string>
</property>
<property name="accessibleName">
<string>Master Volume</string>
</property>
<property name="accessibleDescription">
<string>Use up and down arrows to change value</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
Expand All @@ -521,8 +569,6 @@
<tabstop>posSlider</tabstop>
<tabstop>rewindButton</tabstop>
<tabstop>playButton</tabstop>
<tabstop>countInButton</tabstop>
<tabstop>metronomeButton</tabstop>
<tabstop>loopInButton</tabstop>
<tabstop>loopButton</tabstop>
<tabstop>loopOutButton</tabstop>
Expand Down
13 changes: 0 additions & 13 deletions mscore/synthcontrol.cpp
View file
Expand Up @@ -76,8 +76,6 @@ SynthControl::SynthControl(QWidget* parent)
}
}
readSettings();
metronome->setDefaultAction(getAction("metronome"));
mgain->setValue(seq->metronomeGain());

updateGui();

Expand All @@ -89,7 +87,6 @@ SynthControl::SynthControl(QWidget* parent)
connect(effectA, SIGNAL(currentIndexChanged(int)), SLOT(effectAChanged(int)));
connect(effectB, SIGNAL(currentIndexChanged(int)), SLOT(effectBChanged(int)));
connect(gain, SIGNAL(valueChanged(double,int)), SLOT(gainChanged(double,int)));
connect(mgain, SIGNAL(valueChanged(double,int)), SLOT(metronomeGainChanged(double,int)));
connect(masterTuning, SIGNAL(valueChanged(double)), SLOT(masterTuningChanged(double)));
connect(changeTuningButton, SIGNAL(clicked()), SLOT(changeMasterTuning()));
connect(loadButton, SIGNAL(clicked()), SLOT(loadButtonClicked()));
Expand Down Expand Up @@ -165,7 +162,6 @@ void MuseScore::showSynthControl(bool val)
connect(synthControl, SIGNAL(closed(bool)), a, SLOT(setChecked(bool)));
if (mixer)
connect(synthControl, SIGNAL(soundFontChanged()), mixer, SLOT(patchListChanged()));
connect(synthControl, SIGNAL(metronomeGainChanged(float)), seq, SLOT(setMetronomeGain(float)));
}
synthControl->setVisible(val);
}
Expand All @@ -179,15 +175,6 @@ void SynthControl::gainChanged(double val, int)
emit gainChanged(val);
}

//---------------------------------------------------------
// metronomeGainChanged
//---------------------------------------------------------

void SynthControl::metronomeGainChanged(double val, int)
{
emit metronomeGainChanged(val);
}

//---------------------------------------------------------
// masterTuningChanged
//---------------------------------------------------------
Expand Down

0 comments on commit 0d76609

Please sign in to comment.