changeset 452:c651a736ebc4

Fixes to scaling of splash screen
author Chris Cannam
date Wed, 06 May 2015 13:00:57 +0100
parents dc1a360f2b69
children 549f77216048
files framework/MainWindowBase.cpp framework/MainWindowBase.h
diffstat 2 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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 *);