comparison main/MainWindow.cpp @ 144:56c00f977cac

* Merge last-minute Windows fix across from tagged area!
author Chris Cannam
date Fri, 11 May 2007 11:22:06 +0000
parents 834ff910e3d2
children 140ea2569bcc
comparison
equal deleted inserted replaced
143:c9fa92615948 144:56c00f977cac
11 published by the Free Software Foundation; either version 2 of the 11 published by the Free Software Foundation; either version 2 of the
12 License, or (at your option) any later version. See the file 12 License, or (at your option) any later version. See the file
13 COPYING included with this distribution for more information. 13 COPYING included with this distribution for more information.
14 */ 14 */
15 15
16 #include "version.h" 16 #include "../version.h"
17 17
18 #include "MainWindow.h" 18 #include "MainWindow.h"
19 #include "document/Document.h" 19 #include "document/Document.h"
20 #include "PreferencesDialog.h" 20 #include "PreferencesDialog.h"
21 21
165 this, SLOT(contextHelpChanged(const QString &))); 165 this, SLOT(contextHelpChanged(const QString &)));
166 166
167 m_overview = new Overview(frame); 167 m_overview = new Overview(frame);
168 m_overview->setViewManager(m_viewManager); 168 m_overview->setViewManager(m_viewManager);
169 m_overview->setFixedHeight(40); 169 m_overview->setFixedHeight(40);
170 #ifndef _WIN32
171 // For some reason, the contents of the overview never appear if we
172 // make this setting on Windows. I have no inclination at the moment
173 // to track down the reason why.
170 m_overview->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); 174 m_overview->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
175 #endif
171 connect(m_overview, SIGNAL(contextHelpChanged(const QString &)), 176 connect(m_overview, SIGNAL(contextHelpChanged(const QString &)),
172 this, SLOT(contextHelpChanged(const QString &))); 177 this, SLOT(contextHelpChanged(const QString &)));
173 178
174 m_panLayer = new WaveformLayer; 179 m_panLayer = new WaveformLayer;
175 m_panLayer->setChannelMode(WaveformLayer::MergeChannels); 180 m_panLayer->setChannelMode(WaveformLayer::MergeChannels);