Fix #814 by using PNG application logo instead of SVG

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index ca2abae9779c3b1dbe2ad6e501b0334db82829c1..41c748b75d2908e732e410251f3c5d8a65a14779 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -243,6 +243,9 @@ shared_ptr<pv::view::View> MainWindow::add_view(const QString &title,
                addDockWidget(Qt::TopDockWidgetArea, dock.get());
                view_docks_[dock] = v;
 
                addDockWidget(Qt::TopDockWidgetArea, dock.get());
                view_docks_[dock] = v;
 

+               dock->setFeatures(QDockWidget::DockWidgetMovable |
+                       QDockWidget::DockWidgetFloatable);
+

                if (type == view::TraceView) {
                        connect(&session, SIGNAL(trigger_event(util::Timestamp)), v.get(),
                                SLOT(trigger_event(util::Timestamp)));
                if (type == view::TraceView) {
                        connect(&session, SIGNAL(trigger_event(util::Timestamp)), v.get(),
                                SLOT(trigger_event(util::Timestamp)));


@@ -421,7 +424,7 @@ void MainWindow::setup_ui()
 
        // Set the window icon
        QIcon icon;
 
        // Set the window icon
        QIcon icon;

-       icon.addFile(QString(":/icons/sigrok-logo-notext.svg"));
+       icon.addFile(QString(":/icons/sigrok-logo-notext.png"));

        setWindowIcon(icon);
 
        // Setup the menu bar
        setWindowIcon(icon);
 
        // Setup the menu bar