Added fallback toolbar icons

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index d8083b5f636ce14ce9d90a7ebfcc5aeb718ec9b6..a94871fa4ca2c6927f5dceb396957a33f6936e26 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -35,7 +35,7 @@ extern "C" {
 #include "mainwindow.h"
 #include "samplingbar.h"
 #include "dialogs/about.h"
 #include "mainwindow.h"
 #include "samplingbar.h"
 #include "dialogs/about.h"

-#include "pv/view/view.h"
+#include "view/view.h"

 
 extern "C" {
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 
 extern "C" {
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */


@@ -82,11 +82,13 @@ void MainWindow::setup_ui()
        _action_about->setObjectName(QString::fromUtf8("actionAbout"));
 
        _action_view_zoom_in = new QAction(this);
        _action_about->setObjectName(QString::fromUtf8("actionAbout"));
 
        _action_view_zoom_in = new QAction(this);

-       _action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in"));
+       _action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in",
+               QIcon(":/icons/zoom-in.png")));

        _action_view_zoom_in->setObjectName(QString::fromUtf8("actionViewZoomIn"));
 
        _action_view_zoom_out = new QAction(this);
        _action_view_zoom_in->setObjectName(QString::fromUtf8("actionViewZoomIn"));
 
        _action_view_zoom_out = new QAction(this);

-       _action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out"));
+       _action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out",
+               QIcon(":/icons/zoom-out.png")));

        _action_view_zoom_out->setObjectName(QString::fromUtf8("actionViewZoomOut"));
 
        _action_view_show_cursors = new QAction(this);
        _action_view_zoom_out->setObjectName(QString::fromUtf8("actionViewZoomOut"));
 
        _action_view_show_cursors = new QAction(this);


@@ -95,7 +97,8 @@ void MainWindow::setup_ui()
        _action_view_show_cursors->setObjectName(QString::fromUtf8("actionViewShowCursors"));
 
        _action_open = new QAction(this);
        _action_view_show_cursors->setObjectName(QString::fromUtf8("actionViewShowCursors"));
 
        _action_open = new QAction(this);

-       _action_open->setIcon(QIcon::fromTheme("document-open"));
+       _action_open->setIcon(QIcon::fromTheme("document-open",
+               QIcon(":/icons/document-open.png")));

        _action_open->setObjectName(QString::fromUtf8("actionOpen"));
 
        // Setup the menu bar
        _action_open->setObjectName(QString::fromUtf8("actionOpen"));
 
        // Setup the menu bar