comparison view/ViewManager.cpp @ 827:ea098f7565eb

Merge from branch tonioni
author Chris Cannam
date Fri, 18 Jul 2014 15:38:21 +0100
parents d974ed657176
children 8bb9320f78a4
comparison
equal deleted inserted replaced
823:2d4af227fd32 827:ea098f7565eb
46 m_overlayMode(StandardOverlays), 46 m_overlayMode(StandardOverlays),
47 m_zoomWheelsEnabled(true), 47 m_zoomWheelsEnabled(true),
48 m_showCentreLine(true), 48 m_showCentreLine(true),
49 m_illuminateLocalFeatures(true), 49 m_illuminateLocalFeatures(true),
50 m_showWorkTitle(false), 50 m_showWorkTitle(false),
51 m_showDuration(true),
51 m_lightPalette(QApplication::palette()), 52 m_lightPalette(QApplication::palette()),
52 m_darkPalette(QApplication::palette()) 53 m_darkPalette(QApplication::palette())
53 { 54 {
54 QSettings settings; 55 QSettings settings;
55 settings.beginGroup("MainWindow"); 56 settings.beginGroup("MainWindow");