Mercurial > hg > svapp
comparison framework/MainWindowBase.cpp @ 337:1e3af7f4fa86 tony_integration
Merge from branch tonioni
author | Chris Cannam |
---|---|
date | Tue, 11 Mar 2014 17:34:53 +0000 |
parents | 28c17ce7a6e9 40bcaf772d78 |
children | b3609adae921 |
comparison
equal
deleted
inserted
replaced
328:28c17ce7a6e9 | 337:1e3af7f4fa86 |
---|---|
2315 } | 2315 } |
2316 | 2316 |
2317 void | 2317 void |
2318 MainWindowBase::showMinimalOverlays() | 2318 MainWindowBase::showMinimalOverlays() |
2319 { | 2319 { |
2320 m_viewManager->setOverlayMode(ViewManager::MinimalOverlays); | 2320 m_viewManager->setOverlayMode(ViewManager::StandardOverlays); |
2321 } | 2321 } |
2322 | 2322 |
2323 void | 2323 void |
2324 MainWindowBase::showAllOverlays() | 2324 MainWindowBase::showAllOverlays() |
2325 { | 2325 { |
3205 void | 3205 void |
3206 MainWindowBase::inProgressSelectionChanged() | 3206 MainWindowBase::inProgressSelectionChanged() |
3207 { | 3207 { |
3208 Pane *currentPane = 0; | 3208 Pane *currentPane = 0; |
3209 if (m_paneStack) currentPane = m_paneStack->getCurrentPane(); | 3209 if (m_paneStack) currentPane = m_paneStack->getCurrentPane(); |
3210 if (currentPane) updateVisibleRangeDisplay(currentPane); | 3210 if (currentPane) { |
3211 //cerr << "JTEST: mouse event on selection pane" << endl; | |
3212 updateVisibleRangeDisplay(currentPane); | |
3213 } | |
3211 } | 3214 } |
3212 | 3215 |
3213 void | 3216 void |
3214 MainWindowBase::contextHelpChanged(const QString &s) | 3217 MainWindowBase::contextHelpChanged(const QString &s) |
3215 { | 3218 { |