Mercurial > hg > tony
comparison src/MainWindow.cpp @ 365:fec4dafd9093
mergewq
author | matthiasm |
---|---|
date | Tue, 15 Jul 2014 15:42:46 +0100 |
parents | f5a4c4283b93 ca53880fa3ca |
children | 6439ca6e7de1 |
comparison
equal
deleted
inserted
replaced
364:f5a4c4283b93 | 365:fec4dafd9093 |
---|---|
187 connect(m_paneStack, SIGNAL(doubleClickSelectInvoked(int)), | 187 connect(m_paneStack, SIGNAL(doubleClickSelectInvoked(int)), |
188 this, SLOT(doubleClickSelectInvoked(int))); | 188 this, SLOT(doubleClickSelectInvoked(int))); |
189 scroll->setWidget(m_paneStack); | 189 scroll->setWidget(m_paneStack); |
190 | 190 |
191 m_overview = new Overview(frame); | 191 m_overview = new Overview(frame); |
192 m_overview->setPlaybackFollow(PlaybackScrollPage); | |
192 m_overview->setViewManager(m_viewManager); | 193 m_overview->setViewManager(m_viewManager); |
193 m_overview->setFixedHeight(40); | 194 m_overview->setFixedHeight(40); |
194 #ifndef _WIN32 | 195 #ifndef _WIN32 |
195 // For some reason, the contents of the overview never appear if we | 196 // For some reason, the contents of the overview never appear if we |
196 // make this setting on Windows. I have no inclination at the moment | 197 // make this setting on Windows. I have no inclination at the moment |
1567 closeSession(); | 1568 closeSession(); |
1568 createDocument(); | 1569 createDocument(); |
1569 m_document->setAutoAlignment(true); | 1570 m_document->setAutoAlignment(true); |
1570 | 1571 |
1571 Pane *pane = m_paneStack->addPane(); | 1572 Pane *pane = m_paneStack->addPane(); |
1573 pane->setPlaybackFollow(PlaybackScrollPage); | |
1572 | 1574 |
1573 connect(pane, SIGNAL(contextHelpChanged(const QString &)), | 1575 connect(pane, SIGNAL(contextHelpChanged(const QString &)), |
1574 this, SLOT(contextHelpChanged(const QString &))); | 1576 this, SLOT(contextHelpChanged(const QString &))); |
1575 | 1577 |
1576 // Layer *waveform = m_document->createMainModelLayer(LayerFactory::Waveform); | 1578 // Layer *waveform = m_document->createMainModelLayer(LayerFactory::Waveform); |
2934 } else { | 2936 } else { |
2935 m_myStatusMessage = tr("Visible: %1 to %2 (duration %3)") | 2937 m_myStatusMessage = tr("Visible: %1 to %2 (duration %3)") |
2936 .arg(startStr).arg(endStr).arg(durationStr); | 2938 .arg(startStr).arg(endStr).arg(durationStr); |
2937 } | 2939 } |
2938 | 2940 |
2939 statusBar()->showMessage(m_myStatusMessage); | 2941 getStatusLabel()->setText(m_myStatusMessage); |
2940 } | 2942 } |
2941 | 2943 |
2942 void | 2944 void |
2943 MainWindow::updatePositionStatusDisplays() const | 2945 MainWindow::updatePositionStatusDisplays() const |
2944 { | 2946 { |
3075 } else { | 3077 } else { |
3076 pane = m_paneStack->getPane(0); | 3078 pane = m_paneStack->getPane(0); |
3077 selectionStrip = m_paneStack->getPane(1); | 3079 selectionStrip = m_paneStack->getPane(1); |
3078 } | 3080 } |
3079 | 3081 |
3082 pane->setPlaybackFollow(PlaybackScrollPage); | |
3083 | |
3080 if (selectionStrip) { | 3084 if (selectionStrip) { |
3085 selectionStrip->setPlaybackFollow(PlaybackScrollPage); | |
3081 selectionStrip->setFixedHeight(26); | 3086 selectionStrip->setFixedHeight(26); |
3082 m_paneStack->sizePanesEqually(); | 3087 m_paneStack->sizePanesEqually(); |
3083 m_viewManager->clearToolModeOverrides(); | 3088 m_viewManager->clearToolModeOverrides(); |
3084 m_viewManager->setToolModeFor(selectionStrip, | 3089 m_viewManager->setToolModeFor(selectionStrip, |
3085 ViewManager::SelectMode); | 3090 ViewManager::SelectMode); |