comparison framework/MainWindowBase.cpp @ 452:c651a736ebc4

Fixes to scaling of splash screen
author Chris Cannam
date Wed, 06 May 2015 13:00:57 +0100
parents ba789baf642b
children 549f77216048
comparison
equal deleted inserted replaced
451:dc1a360f2b69 452:c651a736ebc4
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 {