Move trace view files

[pulseview.git] / pv / toolbars / mainbar.cpp

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 838fefcaaa101f5612f6d57ee1170a0f6d5b5f2d..76cd8ea17632d689a675d1d089d26549e30a0028 100644 (file)
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -43,10 +43,10 @@
 #include <pv/dialogs/inputoutputoptions.hpp>
 #include <pv/dialogs/storeprogress.hpp>
 #include <pv/mainwindow.hpp>
-#include <pv/popups/deviceoptions.hpp>
 #include <pv/popups/channels.hpp>
+#include <pv/popups/deviceoptions.hpp>
 #include <pv/util.hpp>
-#include <pv/view/view.hpp>
+#include <pv/views/trace/view.hpp>
 #include <pv/widgets/exportmenu.hpp>
 #include <pv/widgets/importmenu.hpp>
 #ifdef ENABLE_DECODE
@@ -114,6 +114,8 @@ MainBar::MainBar(Session &session, QWidget *parent,
 {
        setObjectName(QString::fromUtf8("MainBar"));
 
+       setContextMenuPolicy(Qt::PreventContextMenu);
+
        // Actions
        action_new_view_->setText(tr("New &View"));
        action_new_view_->setIcon(QIcon::fromTheme("window-new",
@@ -199,10 +201,10 @@ MainBar::MainBar(Session &session, QWidget *parent,
        connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)),
                this, SLOT(add_decoder(srd_decoder*)));
 
-       add_decoder_button_->setIcon(QIcon::fromTheme("add-decoder",
-               QIcon(":/icons/add-decoder.svg")));
+       add_decoder_button_->setIcon(QIcon(":/icons/add-decoder.svg"));
        add_decoder_button_->setPopupMode(QToolButton::InstantPopup);
        add_decoder_button_->setMenu(menu_decoders_add_);
+       add_decoder_button_->setToolTip(tr("Add low-level, non-stacked protocol decoder"));
 #endif
 
        connect(&sample_count_, SIGNAL(value_changed()),
@@ -215,12 +217,11 @@ MainBar::MainBar(Session &session, QWidget *parent,
        set_capture_state(pv::Session::Stopped);
 
        configure_button_.setToolTip(tr("Configure Device"));
-       configure_button_.setIcon(QIcon::fromTheme("configure",
-               QIcon(":/icons/configure.png")));
+       configure_button_.setIcon(QIcon::fromTheme("preferences-system",
+               QIcon(":/icons/preferences-system.png")));
 
        channels_button_.setToolTip(tr("Configure Channels"));
-       channels_button_.setIcon(QIcon::fromTheme("channels",
-               QIcon(":/icons/channels.svg")));
+       channels_button_.setIcon(QIcon(":/icons/channels.svg"));
 
        add_toolbar_widgets();
 
@@ -600,7 +601,7 @@ void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only)
                if (!trace_view->cursors()->enabled()) {
                        show_session_error(tr("Missing Cursors"), tr("You need to set the " \
                                        "cursors before you can save the data enclosed by them " \
-                                       "to a session file (e.g. using ALT-V - Show Cursors)."));
+                                       "to a session file (e.g. using the Show Cursors button)."));
                        return;
                }
 
@@ -625,9 +626,9 @@ void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only)
                QString::fromStdString(format->description()));
 
        if (exts.empty())
-               filter += "(*.*)";
+               filter += "(*)";
        else
-               filter += QString("(*.%1);;%2 (*.*)").arg(
+               filter += QString("(*.%1);;%2 (*)").arg(
                        QString::fromStdString(join(exts, ", *.")),
                        tr("All Files"));
 
@@ -678,7 +679,7 @@ void MainBar::import_file(shared_ptr<InputFormat> format)
        // Show the file dialog
        const QString file_name = QFileDialog::getOpenFileName(
                this, tr("Import File"), dir, tr(
-                       "%1 files (*.*);;All Files (*.*)").arg(
+                       "%1 files (*);;All Files (*)").arg(
                        QString::fromStdString(format->description())));
 
        if (file_name.isEmpty())
@@ -755,8 +756,8 @@ void MainBar::on_actionOpen_triggered()
        // Show the dialog
        const QString file_name = QFileDialog::getOpenFileName(
                this, tr("Open File"), dir, tr(
-                       "Sigrok Sessions (*.sr);;"
-                       "All Files (*.*)"));
+                       "sigrok Sessions (*.sr);;"
+                       "All Files (*)"));
 
        if (!file_name.isEmpty()) {
                session_.load_file(file_name);