X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=a94871fa4ca2c6927f5dceb396957a33f6936e26;hp=3f338a12a09e1124cec927350878656c15828a8f;hb=362eea9688123140b0a8bce10e8e0575243ed5e4;hpb=6ac96c2e0ef986da9c9ebea50906cb717aa382ba

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 3f338a12..a94871fa 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -32,10 +32,10 @@ extern "C" {
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "about.h"
 #include "mainwindow.h"
 #include "samplingbar.h"
-#include "pv/view/view.h"
+#include "dialogs/about.h"
+#include "view/view.h"
 
 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_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_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);
@@ -95,7 +97,8 @@ void MainWindow::setup_ui()
 	_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
@@ -183,7 +186,7 @@ void MainWindow::on_actionViewShowCursors_triggered()
 
 void MainWindow::on_actionAbout_triggered()
 {
-	About dlg(this);
+	dialogs::About dlg(this);
 	dlg.exec();
 }