X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=0dd9a09f194ea3cb7da233d90008798be845043f;hb=7d80a6514b8a43c8035b718a6077106c825a7a44;hp=2652d50be777ecd6dc22b6042bd30766ac5b1866;hpb=fe3a1c218407f6b8a0d7ac7c454593809212ea9e;p=pulseview.git diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 2652d50..0dd9a09 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -196,8 +196,7 @@ void MainWindow::setup_ui() // Set the window icon QIcon icon; - icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"), - QSize(), QIcon::Normal, QIcon::Off); + icon.addFile(QString(":/icons/sigrok-logo-notext.svg")); setWindowIcon(icon); // Setup the central widget @@ -327,7 +326,7 @@ void MainWindow::setup_ui() setMenuBar(menu_bar); QMetaObject::connectSlotsByName(this); - // Setup the sampling bar + // Setup the toolbar main_bar_ = new toolbars::MainBar(session_, *this); // Populate the device list and select the initially selected device @@ -464,7 +463,7 @@ void MainWindow::load_file(QString file_name) const QString infoMessage; try { - session_.set_file(file_name.toStdString()); + session_.set_session_file(file_name.toStdString()); } catch(Error e) { show_session_error(tr("Failed to load ") + file_name, e.what()); session_.set_default_device();