# HG changeset patch # User Chris Cannam # Date 1430913657 -3600 # Node ID c651a736ebc497cf4104fe2db6a8f97efc412de1 # Parent dc1a360f2b694d73d4bc858b708db44249e2cddc Fixes to scaling of splash screen diff -r dc1a360f2b69 -r c651a736ebc4 framework/MainWindowBase.cpp --- a/framework/MainWindowBase.cpp Mon Apr 20 10:10:26 2015 +0100 +++ b/framework/MainWindowBase.cpp Wed May 06 13:00:57 2015 +0100 @@ -164,6 +164,8 @@ XSetErrorHandler(handle_x11_error); #endif + connect(this, SIGNAL(hideSplash()), this, SLOT(emitHideSplash())); + connect(CommandHistory::getInstance(), SIGNAL(commandExecuted()), this, SLOT(documentModified())); connect(CommandHistory::getInstance(), SIGNAL(documentRestored()), @@ -259,6 +261,8 @@ if (withMIDIInput) { m_midiInput = new MIDIInput(QApplication::applicationName(), this); } + + QTimer::singleShot(1500, this, SIGNAL(hideSplash())); } MainWindowBase::~MainWindowBase() @@ -275,6 +279,12 @@ } void +MainWindowBase::emitHideSplash() +{ + emit hideSplash(this); +} + +void MainWindowBase::finaliseMenus() { delete m_menuShortcutMapper; diff -r dc1a360f2b69 -r c651a736ebc4 framework/MainWindowBase.h --- a/framework/MainWindowBase.h Mon Apr 20 10:10:26 2015 +0100 +++ b/framework/MainWindowBase.h Wed May 06 13:00:57 2015 +0100 @@ -159,6 +159,7 @@ void canSave(bool); void canSaveAs(bool); void hideSplash(); + void hideSplash(QWidget *); void sessionLoaded(); void audioFileLoaded(); void replacedDocument(); @@ -288,6 +289,8 @@ virtual void closeSession() = 0; + virtual void emitHideSplash(); + virtual void newerVersionAvailable(QString) { } virtual void menuActionMapperInvoked(QObject *);