# HG changeset patch
# User Chris Cannam
# Date 1481798201 0
# Node ID f013210eeceb12941828ccd1cf6ec391db7bdbd8
# Parent  3e2dee09c10c0baa9fd5e44f160214b708a5c470# Parent  ae5c314ac557d6a5f54581f1aab85a9f64f51f06
Moving around some UI bits

diff -r 3e2dee09c10c -r f013210eeceb .hgsubstate
--- a/.hgsubstate	Wed Dec 14 14:28:41 2016 +0000
+++ b/.hgsubstate	Thu Dec 15 10:36:41 2016 +0000
@@ -1,13 +1,13 @@
-18f41ae033e2b838a0d7982e8f4b2954a53037ed bqaudioio
+5cbf061fe8b19e1fba1665e8104230a389816843 bqaudioio
 ff3a7ebe6081a1740a5057ae77b796a595338806 bqfft
-416b184b2bc85952cbce9241b2a0e7f09fa61e49 bqresample
+020a2ab1387a21897c5f4aa5cf32506e9907bf01 bqresample
 dca061781357caf0500b89ccf73d8801de5d2636 bqvec
 1eefc20919cd080b684b2bbbc0af7270b8facb54 checker
 3768bdde6fdf866aa63fff5bde8d9fa64a8979ef dataquay
 9b913ebff56264e6a10bef85a3f36a271ccab40a icons/scalable
 3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp
 5f67a29f0fc7f1b908f7cde4866173a7af337862 sv-dependency-builds
-07e111dd590227a6fc27ead995859a7770acc2e3 svapp
-ccc8658914efbad80831fb518b72bdcd46571841 svcore
-8665e0ffa0d8fac26fa49b7b31dd8032d9d3ea56 svgui
+be83e81d915603712fb32b434f19945b7694811b svapp
+491a992f856ead12337fa66012590d335eed0140 svcore
+306c24eeab1099fee3fd887ffd8dbeb7081cfad8 svgui
 0eebd22a081a824067bf3d5de65326696feab653 vamp-plugin-sdk
diff -r 3e2dee09c10c -r f013210eeceb main/MainWindow.cpp
--- a/main/MainWindow.cpp	Wed Dec 14 14:28:41 2016 +0000
+++ b/main/MainWindow.cpp	Thu Dec 15 10:36:41 2016 +0000
@@ -42,12 +42,12 @@
 #include "layer/SliceableLayer.h"
 #include "layer/ImageLayer.h"
 #include "layer/RegionLayer.h"
-#include "widgets/Fader.h"
 #include "view/Overview.h"
 #include "widgets/PropertyBox.h"
 #include "widgets/PropertyStack.h"
 #include "widgets/AudioDial.h"
 #include "widgets/LevelPanWidget.h"
+#include "widgets/LevelPanToolButton.h"
 #include "widgets/IconLoader.h"
 #include "widgets/LayerTreeDialog.h"
 #include "widgets/ListInputDialog.h"
@@ -211,7 +211,9 @@
 
     m_overview = new Overview(frame);
     m_overview->setViewManager(m_viewManager);
-    m_overview->setFixedHeight(m_viewManager->scalePixelSize(40));
+    int overviewHeight = m_viewManager->scalePixelSize(35);
+    if (overviewHeight < 40) overviewHeight = 40;
+    m_overview->setFixedHeight(overviewHeight);
 #ifndef _WIN32
     // For some reason, the contents of the overview never appear if we
     // make this setting on Windows.  I have no inclination at the moment
@@ -238,8 +240,8 @@
     m_playSpeed->setMinimum(0);
     m_playSpeed->setMaximum(120);
     m_playSpeed->setValue(60);
-    m_playSpeed->setFixedWidth(m_viewManager->scalePixelSize(32));
-    m_playSpeed->setFixedHeight(m_viewManager->scalePixelSize(32));
+    m_playSpeed->setFixedWidth(overviewHeight);
+    m_playSpeed->setFixedHeight(overviewHeight);
     m_playSpeed->setNotchesVisible(true);
     m_playSpeed->setPageStep(10);
     m_playSpeed->setObjectName(tr("Playback Speed"));
@@ -251,24 +253,21 @@
     connect(m_playSpeed, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget()));
     connect(m_playSpeed, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget()));
 
-    m_mainLevelPan = new LevelPanWidget(frame);
+    m_mainLevelPan = new LevelPanToolButton(frame);
     connect(m_mainLevelPan, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget()));
     connect(m_mainLevelPan, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget()));
-    
-/*!!!
-    m_fader = new Fader(frame, false);
-    connect(m_fader, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget()));
-    connect(m_fader, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget()));
-*/
+    m_mainLevelPan->setFixedHeight(overviewHeight);
+    m_mainLevelPan->setFixedWidth(overviewHeight);
+    m_mainLevelPan->setImageSize((overviewHeight * 3) / 4);
+    m_mainLevelPan->setBigImageSize(overviewHeight * 3);
 
     m_playControlsSpacer = new QFrame;
 
     layout->setSpacing(m_viewManager->scalePixelSize(4));
     layout->addWidget(m_mainScroll, 0, 0, 1, 4);
     layout->addWidget(m_overview, 1, 0);
-    layout->addWidget(m_playControlsSpacer, 1, 1);
-    layout->addWidget(m_playSpeed, 1, 2);
-//    layout->addWidget(m_fader, 1, 3);
+    layout->addWidget(m_playSpeed, 1, 1);
+    layout->addWidget(m_playControlsSpacer, 1, 2);
     layout->addWidget(m_mainLevelPan, 1, 3);
 
     m_playControlsWidth = 
diff -r 3e2dee09c10c -r f013210eeceb main/MainWindow.h
--- a/main/MainWindow.h	Wed Dec 14 14:28:41 2016 +0000
+++ b/main/MainWindow.h	Thu Dec 15 10:36:41 2016 +0000
@@ -166,7 +166,7 @@
 protected:
     Overview                *m_overview;
 //!!!    Fader                   *m_fader;
-    LevelPanWidget          *m_mainLevelPan;
+    LevelPanToolButton      *m_mainLevelPan;
     AudioDial               *m_playSpeed;
     WaveformLayer           *m_panLayer;
     
diff -r 3e2dee09c10c -r f013210eeceb main/OSCHandler.cpp
--- a/main/OSCHandler.cpp	Wed Dec 14 14:28:41 2016 +0000
+++ b/main/OSCHandler.cpp	Thu Dec 15 10:36:41 2016 +0000
@@ -27,6 +27,7 @@
 #include "data/fileio/WavFileWriter.h"
 #include "transform/TransformFactory.h"
 #include "widgets/LevelPanWidget.h"
+#include "widgets/LevelPanToolButton.h"
 #include "widgets/AudioDial.h"
 
 #include <bqaudioio/SystemPlaybackTarget.h>