X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=19caab32e2d8d63265758eee8b0bc0b28d2168ed;hb=b887c4d87ee9e5fdf4363c1d46e337485ed83539;hp=6eabdb6737e0a5b3a8e6641392480c8ea271bff4;hpb=d0c0573b3ee694827a747727f862c5f91736ca05;p=pulseview.git diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 6eabdb6..19caab3 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -50,10 +51,8 @@ #include -using std::bind; using std::dynamic_pointer_cast; using std::make_shared; -using std::placeholders::_1; using std::shared_ptr; using std::string; @@ -81,9 +80,6 @@ MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) : GlobalSettings::add_change_handler(this); - GlobalSettings settings; - settings.set_defaults_where_needed(); - setup_ui(); restore_ui_settings(); } @@ -567,6 +563,8 @@ bool MainWindow::restoreState(const QByteArray &state, int version) void MainWindow::session_error(const QString text, const QString info_text) { + qDebug().noquote() << "Notifying user of session error:" << info_text; + QMetaObject::invokeMethod(this, "show_session_error", Qt::QueuedConnection, Q_ARG(QString, text), Q_ARG(QString, info_text));