diff options
| -rw-r--r-- | muse/ChangeLog | 4 | ||||
| -rw-r--r-- | muse/muse/widgets/metronome.cpp | 10 | ||||
| -rw-r--r-- | muse/muse/widgets/metronomebase.ui | 13 |
3 files changed, 24 insertions, 3 deletions
diff --git a/muse/ChangeLog b/muse/ChangeLog index cfa92489..7cc6eff4 100644 --- a/muse/ChangeLog +++ b/muse/ChangeLog @@ -1,4 +1,5 @@ -27.09.2010 +08.10.2010 + * Disabled: Precount does not work, disabled function in gui (rj) ======================================= * 1.1 tagged (rj) ======================================= @@ -40,6 +41,7 @@ * Renamed: Soft synth configuration changed to Synth configuration, as per patch from Geoff King (rj) * Fixed: Shortcuts with modifier keys wasn't working for global shortcuts, should be now (rj) * Added: Shortcuts for changing len of events, default Ctrl+Shift+Left/Right (rj) +>>>>>>> .r459 10.08.2010 * Fixed/Changed: Grid reacts to midi resolution change (rj) 01.08.2010 diff --git a/muse/muse/widgets/metronome.cpp b/muse/muse/widgets/metronome.cpp index 5de57ee3..9ccf05e7 100644 --- a/muse/muse/widgets/metronome.cpp +++ b/muse/muse/widgets/metronome.cpp @@ -38,6 +38,8 @@ MetronomeConfig::MetronomeConfig(QWidget* parent, const char* name) beatVelocity->setValue(beatClickVelo); midiChannel->setValue(clickChan+1); midiPort->setValue(clickPort+1); + + /* precountBars->setValue(preMeasures); precountEnable->setChecked(precountEnableFlag); precountFromMastertrack->setChecked(precountFromMastertrackFlag); @@ -45,6 +47,8 @@ MetronomeConfig::MetronomeConfig(QWidget* parent, const char* name) precountSigN->setValue(::precountSigN); precountPrerecord->setChecked(::precountPrerecord); precountPreroll->setChecked(::precountPreroll); + */ + midiClick->setChecked(midiClickFlag); audioBeep->setChecked(audioClickFlag); } @@ -119,12 +123,14 @@ void MetronomeConfig::apply() clickChan = midiChannel->value() - 1; clickPort = midiPort->value() - 1; preMeasures = precountBars->value(); + /* precountEnableFlag = precountEnable->isChecked(); precountFromMastertrackFlag = precountFromMastertrack->isChecked(); ::precountSigZ = precountSigZ->value(); ::precountSigN = precountSigN->value(); ::precountPrerecord = precountPrerecord->isChecked(); ::precountPreroll = precountPreroll->isChecked(); + */ midiClickFlag = midiClick->isChecked(); audioClickFlag = audioBeep->isChecked(); //audioVolumeChanged = volumeSlider->value(); @@ -155,16 +161,20 @@ void MetronomeConfig::midiClickChanged(bool flag) void MetronomeConfig::precountEnableChanged(bool flag) { + /* precountBars->setEnabled(flag); precountFromMastertrack->setEnabled(flag); precountSigZ->setEnabled(flag && !precountFromMastertrack->isChecked()); precountSigN->setEnabled(flag && !precountFromMastertrack->isChecked()); + */ } void MetronomeConfig::precountFromMastertrackChanged(bool flag) { + /* precountSigZ->setEnabled(!flag); precountSigN->setEnabled(!flag); + */ } void MetronomeConfig::beepVolumeChanged(int volume) diff --git a/muse/muse/widgets/metronomebase.ui b/muse/muse/widgets/metronomebase.ui index 31e6597a..c30f5bf1 100644 --- a/muse/muse/widgets/metronomebase.ui +++ b/muse/muse/widgets/metronomebase.ui @@ -8,7 +8,7 @@ <rect> <x>0</x> <y>0</y> - <width>517</width> + <width>557</width> <height>347</height> </rect> </property> @@ -320,11 +320,14 @@ <property name="name"> <cstring>precountEnable</cstring> </property> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>enable</string> </property> <property name="checked"> - <bool>true</bool> + <bool>false</bool> </property> </widget> <widget class="QLayoutWidget"> @@ -345,6 +348,9 @@ <property name="name"> <cstring>precountBars</cstring> </property> + <property name="enabled"> + <bool>false</bool> + </property> <property name="maxValue"> <number>10</number> </property> @@ -369,6 +375,9 @@ <property name="name"> <cstring>precountFromMastertrack</cstring> </property> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> <string>From Mastertrack</string> </property> |