comparison widgets/PropertyBox.cpp @ 842:8432d2551fb2 tonioni

Update subrepos and merge from default branch
author Chris Cannam
date Tue, 02 Sep 2014 16:23:48 +0100
parents 57d943a61943
children 1986c9b0d9c3 4a578a360011
comparison
equal deleted inserted replaced
826:43256b925e15 842:8432d2551fb2
74 m_viewPlayFrame = 0; 74 m_viewPlayFrame = 0;
75 populateViewPlayFrame(); 75 populateViewPlayFrame();
76 76
77 m_layout = new QGridLayout; 77 m_layout = new QGridLayout;
78 m_layout->setMargin(0); 78 m_layout->setMargin(0);
79 m_layout->setHorizontalSpacing(2);
80 m_layout->setVerticalSpacing(1);
79 m_mainWidget->setLayout(m_layout); 81 m_mainWidget->setLayout(m_layout);
80 82
81 PropertyContainer::PropertyList properties = m_container->getProperties(); 83 PropertyContainer::PropertyList properties = m_container->getProperties();
82 84
83 blockSignals(true); 85 blockSignals(true);