X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwindow.cpp;h=15ffb0324d32000b4685b7e125b1718c254949db;hb=41d81ccd8f85da838b4ba41c7a5d2f55157ef349;hp=203fff93533c6d4776810b91e3b0b6614b7f493d;hpb=e67c0435557d48b79e05fca9d71cf75de4ef3b43;p=fstl diff --git a/src/window.cpp b/src/window.cpp index 203fff9..15ffb03 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -69,6 +69,16 @@ void Window::on_about() " style=\"color: #93a1a1;\">matt.j.keeter@gmail.com

"); } +void Window::enable_open() +{ + open_action->setEnabled(true); +} + +void Window::disable_open() +{ + open_action->setEnabled(false); +} + bool Window::load_stl(const QString& filename) { if (!open_action->isEnabled()) return false; @@ -77,7 +87,7 @@ bool Window::load_stl(const QString& filename) Loader* loader = new Loader(this, filename); connect(loader, &Loader::started, - [=](){ open_action->setEnabled(false); }); + this, &Window::disable_open); connect(loader, &Loader::got_mesh, canvas, &Canvas::load_mesh); @@ -85,14 +95,14 @@ bool Window::load_stl(const QString& filename) connect(loader, &Loader::finished, loader, &Loader::deleteLater); connect(loader, &Loader::finished, - [=](){ open_action->setEnabled(true); }); + this, &Window::enable_open); connect(loader, &Loader::finished, - [=](){ canvas->set_status(""); }); + canvas, &Canvas::clear_status); if (filename[0] != ':') { connect(loader, &Loader::loaded_file, - this, &Window::setWindowTitle); + this, &Window::setWindowTitle); } loader->start();