Mercurial > hg > tony

changeset 419:dfde9c7637cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes to enabled/disabled state in level-pan tool button
author Chris Cannam
date Wed, 25 Mar 2015 11:41:17 +0000
parents f041a5a66b35
children cddb369fa8d8
files .hgsubstate src/MainWindow.cpp
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed Mar 25 11:27:46 2015 +0000
+++ b/.hgsubstate	Wed Mar 25 11:41:17 2015 +0000
@@ -1,7 +1,7 @@
 e32a354434aa5fa7440efa17b716aacd761049fa chp
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
-992e31b263779fc85282f2433c57e231fb61ec93 pyin
+1629209f5bf21fc926bb6abd5ab786e78c5d7677 pyin
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 345d41a3567f44ff4febf5ef4c4022e79d31eba4 svapp
 c49d52386cde0844cef30d8904a4fe409cec3d5c svcore
-37bb4b416c52ff6276a29a0c9ba22f0b9c1d7574 svgui
+9022635c615a2b74653ffcb3ca809fae389a3f35 svgui
--- a/src/MainWindow.cpp	Wed Mar 25 11:27:46 2015 +0000
+++ b/src/MainWindow.cpp	Wed Mar 25 11:41:17 2015 +0000
@@ -1075,11 +1075,12 @@
     connect(m_showAudio, SIGNAL(triggered()), this, SLOT(showAudioToggled()));
     connect(this, SIGNAL(canPlay(bool)), m_showAudio, SLOT(setEnabled(bool)));
 
+    m_audioLPW->setImageSize(m_viewManager->scalePixelSize(26));
     toolbar->addWidget(m_audioLPW);
 
     // Pitch (f0)
     QLabel *spacer = new QLabel; // blank
-    spacer->setFixedWidth(40);
+    spacer->setFixedWidth(m_viewManager->scalePixelSize(30));
     toolbar->addWidget(spacer);
 
     m_showPitch = toolbar->addAction(il.load("values"), tr("Show Pitch Track"));
@@ -1088,12 +1089,13 @@
     connect(this, SIGNAL(canPlay(bool)), m_showPitch, SLOT(setEnabled(bool)));
 
     if (m_withSonification) {
+        m_pitchLPW->setImageSize(m_viewManager->scalePixelSize(26));
         toolbar->addWidget(m_pitchLPW);
     }
 
     // Notes
     spacer = new QLabel;
-    spacer->setFixedWidth(40);
+    spacer->setFixedWidth(m_viewManager->scalePixelSize(30));
     toolbar->addWidget(spacer);
 
     m_showNotes = toolbar->addAction(il.load("notes"), tr("Show Notes"));
@@ -1102,12 +1104,13 @@
     connect(this, SIGNAL(canPlay(bool)), m_showNotes, SLOT(setEnabled(bool)));
 
     if (m_withSonification) {
+        m_notesLPW->setImageSize(m_viewManager->scalePixelSize(26));
         toolbar->addWidget(m_notesLPW);
     }
 
     // Spectrogram
     spacer = new QLabel;
-    spacer->setFixedWidth(40);
+    spacer->setFixedWidth(m_viewManager->scalePixelSize(30));
     toolbar->addWidget(spacer);
 
     if (!m_withSpectrogram)
@@ -2848,6 +2851,8 @@
         m_analyser->setAudible(Analyser::PitchTrack, false);
         m_analyser->setAudible(Analyser::Notes, false);
     }
+   
+    updateLayerStatuses();
 }
 
 void