Rename sigrok-logo-notext.png to pulseview.png.

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index e925bd63e8d8ee06a070debc1b7e013ea17211af..8b11d0822d53c8960583e742117fcc76abdc52cd 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -152,7 +152,7 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 
        if (type == views::ViewTypeTrace)
                // This view will be the main view if there's no main bar yet
-               v = make_shared<views::TraceView::View>(session,
+               v = make_shared<views::trace::View>(session,
                        (main_bar ? false : true), dock_main);
 
        if (!v)
@@ -180,8 +180,8 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
                SLOT(trigger_event(util::Timestamp)));
 
        if (type == views::ViewTypeTrace) {
-               views::TraceView::View *tv =
-                       qobject_cast<views::TraceView::View*>(v.get());
+               views::trace::View *tv =
+                       qobject_cast<views::trace::View*>(v.get());
 
                tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
                tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
@@ -403,7 +403,7 @@ void MainWindow::setup_ui()
 
        // Set the window icon
        QIcon icon;
-       icon.addFile(QString(":/icons/sigrok-logo-notext.png"));
+       icon.addFile(QString(":/icons/pulseview.png"));
        setWindowIcon(icon);
 
        view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));
@@ -799,8 +799,8 @@ void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
                shared_ptr<views::ViewBase> viewbase = entry.second;
 
                // Only trace views have this setting
-               views::TraceView::View* view =
-                               qobject_cast<views::TraceView::View*>(viewbase.get());
+               views::trace::View* view =
+                               qobject_cast<views::trace::View*>(viewbase.get());
                if (view)
                        view->enable_coloured_bg(state);
        }
@@ -814,8 +814,8 @@ void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_val
                shared_ptr<views::ViewBase> viewbase = entry.second;
 
                // Only trace views have this setting
-               views::TraceView::View* view =
-                               qobject_cast<views::TraceView::View*>(viewbase.get());
+               views::trace::View* view =
+                               qobject_cast<views::trace::View*>(viewbase.get());
                if (view)
                        view->enable_show_sampling_points(state);
        }
@@ -829,8 +829,8 @@ void MainWindow::on_settingViewShowAnalogMinorGrid_changed(const QVariant new_va
                shared_ptr<views::ViewBase> viewbase = entry.second;
 
                // Only trace views have this setting
-               views::TraceView::View* view =
-                               qobject_cast<views::TraceView::View*>(viewbase.get());
+               views::trace::View* view =
+                               qobject_cast<views::trace::View*>(viewbase.get());
                if (view)
                        view->enable_show_analog_minor_grid(state);
        }