Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix gray splash screen on Linux #100

Merged
merged 2 commits into from
Dec 10, 2014
Merged

Fix gray splash screen on Linux #100

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2570e59
Force a repaint of the splash screen.
martyngigg Dec 10, 2014
7d1e914
Remove the forced 1 second sleep statement from main.
martyngigg Dec 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 10 additions & 22 deletions Code/Mantid/MantidPlot/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
***************************************************************************/
#include <iostream>
#include <QApplication>
#include <QBitmap>
#include <QSplashScreen>
#include <QMessageBox>
#include <QDir>
Expand Down Expand Up @@ -129,15 +130,6 @@ If you want to contribute code, please read the notes on \ref style "coding styl
- For indentations, tabs are preferred because they allow everyone to choose the indentation depth for him/herself.
*/

class WaitThread:public QThread
{
public:
void run()
{
sleep(1);
}
};

int main( int argc, char ** argv )
{
// First, look for command-line arguments that we want to deal with before launching anything
Expand Down Expand Up @@ -189,27 +181,27 @@ int main( int argc, char ** argv )
QStringList args = app.arguments();
args.removeFirst(); // remove application name

WaitThread t;
try
{
t.start();
// Splash
QPixmap pixmap;
if (!pixmap.load(":/MantidSplashScreen.png")) QMessageBox::warning(0,"","Couldn't load splashscreen");
QSplashScreen splash(pixmap);
if (!pixmap.load(":/MantidSplashScreen.png")) std::cerr << "Couldn't load splashscreen\n";
QSplashScreen splash(pixmap, Qt::WindowStaysOnTopHint);
const QString releaseDateTime(Mantid::Kernel::MantidVersion::releaseDate());
const QString versionInfo(Mantid::Kernel::MantidVersion::version());
splash.showMessage("Release: " + releaseDateTime + " (Version " + versionInfo + ")", Qt::AlignLeft | Qt::AlignBottom);
splash.setMask(pixmap.createMaskFromColor(QColor(Qt::transparent)));
splash.show();
// If we take too long to get to the event loop then box starts out gray so ensure
// it is painted before doing any heavy lifting like the ApplicationWindow init
splash.repaint();
app.processEvents();

bool factorySettings = false;
if (args.contains("-d") || args.contains("--default-settings"))
factorySettings = true;

const bool factorySettings = (args.contains("-d") || args.contains("--default-settings"));
ApplicationWindow *mw = new ApplicationWindow(factorySettings, args);
mw->restoreApplicationGeometry();
mw->parseCommandLineArguments(args);
t.wait();
app.processEvents();
splash.finish(mw);

app.connect( &app, SIGNAL(lastWindowClosed()), mw, SLOT(exitWithPresetCode()) );
Expand All @@ -218,15 +210,11 @@ int main( int argc, char ** argv )
}
catch(std::exception& e)
{
if (t.isRunning()) t.quit();

QMessageBox::critical(0,"Mantid - Error",
QString("An unhandled exception has been caught. MantidPlot will have to close. Details:\n\n")+e.what());
}
catch(...)
{
if (t.isRunning()) t.quit();

QMessageBox::critical(0,"Mantid - Error",
"An unhandled exception has been caught. MantidPlot will have to close.");
}
Expand Down