Mercurial > hg > svapp
comparison framework/MainWindowBase.cpp @ 455:1ab4ac6b2fcb
Merge
author | Chris Cannam |
---|---|
date | Thu, 21 May 2015 15:32:18 +0100 |
parents | 549f77216048 |
children | ea30a8c4cb93 56acd9368532 |
comparison
equal
deleted
inserted
replaced
454:3e2a2ca24d90 | 455:1ab4ac6b2fcb |
---|---|
162 | 162 |
163 #ifdef Q_WS_X11 | 163 #ifdef Q_WS_X11 |
164 XSetErrorHandler(handle_x11_error); | 164 XSetErrorHandler(handle_x11_error); |
165 #endif | 165 #endif |
166 | 166 |
167 connect(this, SIGNAL(hideSplash()), this, SLOT(emitHideSplash())); | |
168 | |
167 connect(CommandHistory::getInstance(), SIGNAL(commandExecuted()), | 169 connect(CommandHistory::getInstance(), SIGNAL(commandExecuted()), |
168 this, SLOT(documentModified())); | 170 this, SLOT(documentModified())); |
169 connect(CommandHistory::getInstance(), SIGNAL(documentRestored()), | 171 connect(CommandHistory::getInstance(), SIGNAL(documentRestored()), |
170 this, SLOT(documentRestored())); | 172 this, SLOT(documentRestored())); |
171 | 173 |
257 m_labeller->setCounterCycleSize(cycle); | 259 m_labeller->setCounterCycleSize(cycle); |
258 | 260 |
259 if (withMIDIInput) { | 261 if (withMIDIInput) { |
260 m_midiInput = new MIDIInput(QApplication::applicationName(), this); | 262 m_midiInput = new MIDIInput(QApplication::applicationName(), this); |
261 } | 263 } |
264 | |
265 QTimer::singleShot(1500, this, SIGNAL(hideSplash())); | |
262 } | 266 } |
263 | 267 |
264 MainWindowBase::~MainWindowBase() | 268 MainWindowBase::~MainWindowBase() |
265 { | 269 { |
266 SVDEBUG << "MainWindowBase::~MainWindowBase" << endl; | 270 SVDEBUG << "MainWindowBase::~MainWindowBase" << endl; |
270 delete m_viewManager; | 274 delete m_viewManager; |
271 delete m_oscQueue; | 275 delete m_oscQueue; |
272 delete m_oscQueueStarter; | 276 delete m_oscQueueStarter; |
273 delete m_midiInput; | 277 delete m_midiInput; |
274 Profiles::getInstance()->dump(); | 278 Profiles::getInstance()->dump(); |
279 } | |
280 | |
281 void | |
282 MainWindowBase::emitHideSplash() | |
283 { | |
284 emit hideSplash(this); | |
275 } | 285 } |
276 | 286 |
277 void | 287 void |
278 MainWindowBase::finaliseMenus() | 288 MainWindowBase::finaliseMenus() |
279 { | 289 { |
585 emit canEditLayer(haveCurrentEditableLayer); | 595 emit canEditLayer(haveCurrentEditableLayer); |
586 emit canEditLayerTabular(haveCurrentEditableLayer || haveTabularLayer); | 596 emit canEditLayerTabular(haveCurrentEditableLayer || haveTabularLayer); |
587 emit canMeasureLayer(haveCurrentLayer); | 597 emit canMeasureLayer(haveCurrentLayer); |
588 emit canSelect(haveMainModel && haveCurrentPane); | 598 emit canSelect(haveMainModel && haveCurrentPane); |
589 emit canPlay(haveMainModel && havePlayTarget); | 599 emit canPlay(haveMainModel && havePlayTarget); |
590 emit canFfwd(true); | 600 emit canFfwd(haveMainModel); |
591 emit canRewind(true); | 601 emit canRewind(haveMainModel); |
592 emit canPaste(haveClipboardContents); | 602 emit canPaste(haveClipboardContents); |
593 emit canInsertInstant(haveCurrentPane); | 603 emit canInsertInstant(haveCurrentPane); |
594 emit canInsertInstantsAtBoundaries(haveCurrentPane && haveSelection); | 604 emit canInsertInstantsAtBoundaries(haveCurrentPane && haveSelection); |
595 emit canInsertItemAtSelection(haveCurrentPane && haveSelection && haveCurrentDurationLayer); | 605 emit canInsertItemAtSelection(haveCurrentPane && haveSelection && haveCurrentDurationLayer); |
596 emit canRenumberInstants(haveCurrentTimeInstantsLayer && haveSelection); | 606 emit canRenumberInstants(haveCurrentTimeInstantsLayer && haveSelection); |