# HG changeset patch # User Chris Cannam # Date 1184342057 0 # Node ID ca825d1a4a6b7330089b1e88fc77afbda2ef805d # Parent aca2c23f0f09af1393d62040fd75c80103d4dd5b * Restore Scale setting which had mistakenly disappeared from spectrum * Some tweaks to spectrum peaks * Make spectrum default to 4096/75%... or is that overdoing it? * Show harmonic cursor even during playback if in measure mode and mouse in relevant pane * Avoid crash when trying to measure a non-layer * Various adjustments to some icons to make them look better in white-on-black schemes diff -r aca2c23f0f09 -r ca825d1a4a6b icons/draw.png Binary file icons/draw.png has changed diff -r aca2c23f0f09 -r ca825d1a4a6b icons/navigate.png Binary file icons/navigate.png has changed diff -r aca2c23f0f09 -r ca825d1a4a6b icons/waveform.png Binary file icons/waveform.png has changed diff -r aca2c23f0f09 -r ca825d1a4a6b main/MainWindow.cpp --- a/main/MainWindow.cpp Fri Jul 13 13:19:15 2007 +0000 +++ b/main/MainWindow.cpp Fri Jul 13 15:54:17 2007 +0000 @@ -1779,6 +1779,7 @@ action->setShortcut(tr("5")); action->setStatusTip(tr("Make measurements in layer")); connect(action, SIGNAL(triggered()), this, SLOT(toolMeasureSelected())); + connect(this, SIGNAL(canMeasureLayer(bool)), action, SLOT(setEnabled(bool))); group->addAction(action); m_keyReference->registerShortcut(action); m_toolActions[ViewManager::MeasureMode] = action; @@ -1847,6 +1848,7 @@ emit canDeleteCurrentLayer(haveCurrentLayer); emit canRenameLayer(haveCurrentLayer); emit canEditLayer(haveCurrentEditableLayer); + emit canMeasureLayer(haveCurrentLayer); emit canSelect(haveMainModel && haveCurrentPane); emit canPlay(havePlayTarget); emit canFfwd(true); diff -r aca2c23f0f09 -r ca825d1a4a6b main/MainWindow.h --- a/main/MainWindow.h Fri Jul 13 13:19:15 2007 +0000 +++ b/main/MainWindow.h Fri Jul 13 15:54:17 2007 +0000 @@ -97,6 +97,7 @@ void canExportImage(bool); void canRenameLayer(bool); void canEditLayer(bool); + void canMeasureLayer(bool); void canSelect(bool); void canClearSelection(bool); void canEditSelection(bool);