Misc bugfixes and cleanup

[fstl] / src / window.cpp

diff --git a/src/window.cpp b/src/window.cpp
index 5c5e1c3332bb02f556361746b88d98f53ef22250..1e389f616aaea9c58652e33a64c371047cf967d4 100644 (file)
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1,4 +1,5 @@
 #include <QMenuBar>
+#include <QMessageBox>
 #include <QFileDialog>
 
 #include "window.h"
@@ -10,6 +11,10 @@ Window::Window(QWidget *parent) :
 {
     setWindowTitle("fstl");
 
+    QFile styleFile(":/qt/style.qss");
+    styleFile.open( QFile::ReadOnly );
+    setStyleSheet(styleFile.readAll());
+
     QGLFormat format;
     format.setVersion(2, 1);
     format.setSampleBuffers(true);
@@ -19,18 +24,25 @@ Window::Window(QWidget *parent) :
 
     open_action = new QAction("Open", this);
     open_action->setShortcut(QKeySequence::Open);
-    QObject::connect(open_action, SIGNAL(triggered()),
-                     this, SLOT(on_open()));
+    QObject::connect(open_action, &QAction::triggered,
+                     this, &Window::on_open);
 
     quit_action = new QAction("Quit", this);
     quit_action->setShortcut(QKeySequence::Quit);
-    QObject::connect(quit_action, SIGNAL(triggered()),
-                     this, SLOT(close()));
+    QObject::connect(quit_action, &QAction::triggered,
+                     this, &Window::close);
+
+    about_action = new QAction("About", this);
+    QObject::connect(about_action, &QAction::triggered,
+                     this, &Window::on_about);
 
     auto file_menu = menuBar()->addMenu("File");
     file_menu->addAction(open_action);
     file_menu->addAction(quit_action);
 
+    auto help_menu = menuBar()->addMenu("Help");
+    help_menu->addAction(about_action);
+
     resize(600, 400);
 }
 
@@ -44,29 +56,38 @@ void Window::on_open()
     }
 }
 
-
-void Window::enable_open_action()
+void Window::on_about()
 {
-    open_action->setEnabled(true);
+    QMessageBox::about(this, "",
+        "<p align=\"center\"><b>fstl</b></p>"
+        "<p>A fast viewer for <code>.stl</code> files.<br>"
+        "<a href=\"https://github.com/mkeeter/fstl\""
+        "   style=\"color: #93a1a1;\">https://github.com/mkeeter/fstl</a></p>"
+        "<p>© 2014 Matthew Keeter<br>"
+        "<a href=\"mailto:matt.j.keeter@gmail.com\""
+        "   style=\"color: #93a1a1;\">matt.j.keeter@gmail.com</a></p>");
 }
 
-
-void Window::disable_open_action()
+void Window::load_stl(const QString &filename)
 {
+    canvas->set_status("Loading " + filename);
 
-    open_action->setEnabled(false);
-}
+    Loader* loader = new Loader(this, filename);
+    connect(loader, &Loader::started,
+            [=](){ open_action->setEnabled(false); });
 
+    connect(loader, &Loader::got_mesh,
+            canvas, &Canvas::load_mesh);
+
+    connect(loader, &Loader::finished,
+            loader, &Loader::deleteLater);
+    connect(loader, &Loader::finished,
+            [=](){ open_action->setEnabled(true); });
+    connect(loader, &Loader::finished,
+            [=](){ canvas->set_status(""); });
+
+    connect(loader, &Loader::loaded_file,
+            this, &Window::setWindowTitle);
 
-void Window::load_stl(const QString &filename)
-{
-    disable_open_action();
-    Loader* loader = new Loader(this, filename);
-    connect(loader, SIGNAL(got_mesh(Mesh*)),
-            canvas, SLOT(load_mesh(Mesh*)));
-    connect(loader, SIGNAL(finished()),
-            loader, SLOT(deleteLater()));
-    connect(loader, SIGNAL(finished()),
-            this, SLOT(enable_open_action()));
     loader->start();
 }