[Sv1-commits] SF.net SVN: sv1: [437] sonic-visualiser/trunk
Brought to you by:
cannam
From: <ca...@us...> - 2006-11-14 16:06:22
|
Revision: 437 http://svn.sourceforge.net/sv1/?rev=437&view=rev Author: cannam Date: 2006-11-14 08:06:00 -0800 (Tue, 14 Nov 2006) Log Message: ----------- * Press X to toggle the property boxes Modified Paths: -------------- sonic-visualiser/trunk/README.OSC sonic-visualiser/trunk/sv/main/MainWindow.cpp sonic-visualiser/trunk/sv/main/MainWindow.h sonic-visualiser/trunk/view/PaneStack.cpp sonic-visualiser/trunk/view/PaneStack.h Modified: sonic-visualiser/trunk/README.OSC =================================================================== --- sonic-visualiser/trunk/README.OSC 2006-11-13 14:48:57 UTC (rev 436) +++ sonic-visualiser/trunk/README.OSC 2006-11-14 16:06:00 UTC (rev 437) @@ -142,19 +142,21 @@ whose values are linear multipliers (i.e. 1.0 == unity gain). speedup - which takes a value of a percentage increase in playback + takes a value of a percentage increase in playback speed, so 0 is the default playback speed, 100 sets double the default speed, and -100 sets half the default speed (yes, I know, it's nonsense, sorry). overlays - which controls the verbosity level of the text overlays on + controls the verbosity level of the text overlays on each pane, from 0 (everything off) to 2 (everything on). zoomwheels - which controls whether the zoom wheels are displayed (1) or - not (0). + controls whether the zoom wheels are displayed (1) or not (0). + propertyboxes + controls whether the property boxes are displayed (1) or not (0). + For pane and layer properties, the control name is the displayed name of the given property (though you may use "-" or "_" in place of any spaces in the name if it's easier for you). The value may Modified: sonic-visualiser/trunk/sv/main/MainWindow.cpp =================================================================== --- sonic-visualiser/trunk/sv/main/MainWindow.cpp 2006-11-13 14:48:57 UTC (rev 436) +++ sonic-visualiser/trunk/sv/main/MainWindow.cpp 2006-11-14 16:06:00 UTC (rev 437) @@ -595,6 +595,8 @@ connect(this, SIGNAL(canZoom(bool)), action, SLOT(setEnabled(bool))); menu->addAction(action); + menu->addSeparator(); + action = new QAction(tr("Show &Zoom Wheels"), this); action->setShortcut(tr("Z")); action->setStatusTip(tr("Show thumbwheels for zooming horizontally and vertically")); @@ -602,6 +604,14 @@ action->setCheckable(true); action->setChecked(m_viewManager->getZoomWheelsEnabled()); menu->addAction(action); + + action = new QAction(tr("Show Property Bo&xes"), this); + action->setShortcut(tr("X")); + action->setStatusTip(tr("Show the layer property boxes at the side of the main window")); + connect(action, SIGNAL(triggered()), this, SLOT(togglePropertyBoxes())); + action->setCheckable(true); + action->setChecked(true); + menu->addAction(action); /*!!! This one doesn't work properly yet */ @@ -2785,6 +2795,36 @@ } void +MainWindow::togglePropertyBoxes() +{ + if (m_paneStack->getLayoutStyle() == PaneStack::NoPropertyStacks) { + if (Preferences::getInstance()->getPropertyBoxLayout() == + Preferences::VerticallyStacked) { + m_paneStack->setLayoutStyle(PaneStack::PropertyStackPerPaneLayout); + } else { + m_paneStack->setLayoutStyle(PaneStack::SinglePropertyStackLayout); + } + } else { + m_paneStack->setLayoutStyle(PaneStack::NoPropertyStacks); + } +} + +void +MainWindow::preferenceChanged(PropertyContainer::PropertyName name) +{ + if (name == "Property Box Layout") { + if (m_paneStack->getLayoutStyle() != PaneStack::NoPropertyStacks) { + if (Preferences::getInstance()->getPropertyBoxLayout() == + Preferences::VerticallyStacked) { + m_paneStack->setLayoutStyle(PaneStack::PropertyStackPerPaneLayout); + } else { + m_paneStack->setLayoutStyle(PaneStack::SinglePropertyStackLayout); + } + } + } +} + +void MainWindow::play() { if (m_playSource->isPlaying()) { @@ -3707,6 +3747,10 @@ } } else if (property == "zoomwheels") { m_viewManager->setZoomWheelsEnabled(value > 0.5); + } else if (property == "propertyboxes") { + bool toggle = ((value < 0.5) != + (m_paneStack->getLayoutStyle() == PaneStack::NoPropertyStacks)); + if (toggle) togglePropertyBoxes(); } } else { @@ -3861,19 +3905,6 @@ } void -MainWindow::preferenceChanged(PropertyContainer::PropertyName name) -{ - if (name == "Property Box Layout") { - if (Preferences::getInstance()->getPropertyBoxLayout() == - Preferences::VerticallyStacked) { - m_paneStack->setLayoutStyle(PaneStack::PropertyStackPerPaneLayout); - } else { - m_paneStack->setLayoutStyle(PaneStack::SinglePropertyStackLayout); - } - } -} - -void MainWindow::preferences() { if (!m_preferencesDialog.isNull()) { Modified: sonic-visualiser/trunk/sv/main/MainWindow.h =================================================================== --- sonic-visualiser/trunk/sv/main/MainWindow.h 2006-11-13 14:48:57 UTC (rev 436) +++ sonic-visualiser/trunk/sv/main/MainWindow.h 2006-11-14 16:06:00 UTC (rev 437) @@ -128,6 +128,7 @@ void showAllTextOverlays(); void toggleZoomWheels(); + void togglePropertyBoxes(); void play(); void ffwd(); Modified: sonic-visualiser/trunk/view/PaneStack.cpp =================================================================== --- sonic-visualiser/trunk/view/PaneStack.cpp 2006-11-13 14:48:57 UTC (rev 436) +++ sonic-visualiser/trunk/view/PaneStack.cpp 2006-11-14 16:06:00 UTC (rev 437) @@ -126,6 +126,7 @@ switch (style) { + case NoPropertyStacks: case SinglePropertyStackLayout: for (i = m_panes.begin(); i != m_panes.end(); ++i) { @@ -133,7 +134,7 @@ i->propertyStack->setParent(m_propertyStackStack); m_propertyStackStack->addWidget(i->propertyStack); } - m_propertyStackStack->show(); + m_propertyStackStack->setVisible(style != NoPropertyStacks); break; case PropertyStackPerPaneLayout: @@ -288,7 +289,7 @@ while (i != m_panes.end()) { if (i->pane == pane) { i->currentIndicator->setPixmap(selectedMap); - if (m_layoutStyle == SinglePropertyStackLayout) { + if (m_layoutStyle != PropertyStackPerPaneLayout) { m_propertyStackStack->setCurrentWidget(i->propertyStack); } found = true; Modified: sonic-visualiser/trunk/view/PaneStack.h =================================================================== --- sonic-visualiser/trunk/view/PaneStack.h 2006-11-13 14:48:57 UTC (rev 436) +++ sonic-visualiser/trunk/view/PaneStack.h 2006-11-14 16:06:00 UTC (rev 437) @@ -55,6 +55,7 @@ Pane *getCurrentPane(); enum LayoutStyle { + NoPropertyStacks = 0, SinglePropertyStackLayout = 1, PropertyStackPerPaneLayout = 2 }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |