X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=d8247825d47c9c01ae818760b63b75679644112d;hb=4e4d72b22a81d1f2d8daee1093ac45264a0a1e2d;hp=2e08d6a471476d9785702c794816b908a89983b3;hpb=13e475e412663ee904b94a6510b5628bdb8b84fa;p=pulseview.git
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 2e08d6a..d824782 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -17,14 +17,15 @@
* along with this program; if not, see .
*/
-#include
-
#ifdef ENABLE_DECODE
#include
#endif
+#include
#include
#include
+#include
+#include
#include
#include
@@ -42,14 +43,11 @@
#include "globalsettings.hpp"
#include "util.hpp"
#include "devices/hardwaredevice.hpp"
-#include "dialogs/about.hpp"
#include "dialogs/settings.hpp"
#include "toolbars/mainbar.hpp"
#include "view/view.hpp"
#include "views/trace/standardbar.hpp"
-#include
-#include
#include
using std::dynamic_pointer_cast;
@@ -79,7 +77,6 @@ MainWindow::MainWindow(DeviceManager &device_manager,
device_manager_(device_manager),
session_selector_(this),
session_state_mapper_(this),
- action_about_(new QAction(this)),
icon_red_(":/icons/status-red.svg"),
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg")
@@ -125,11 +122,6 @@ MainWindow::~MainWindow()
remove_session(sessions_.front());
}
-QAction* MainWindow::action_about() const
-{
- return action_about_;
-}
-
shared_ptr MainWindow::get_active_view() const
{
// If there's only one view, use it...
@@ -355,9 +347,6 @@ void MainWindow::setup_ui()
view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
view_coloured_bg_shortcut_->setAutoRepeat(false);
- action_about_->setObjectName(QString::fromUtf8("actionAbout"));
- action_about_->setToolTip(tr("&About..."));
-
// Set up the tab area
new_session_button_ = new QToolButton();
new_session_button_->setIcon(QIcon::fromTheme("document-new",
@@ -612,7 +601,7 @@ void MainWindow::on_run_stop_clicked()
void MainWindow::on_settings_clicked()
{
- dialogs::Settings dlg;
+ dialogs::Settings dlg(device_manager_);
dlg.exec();
}
@@ -760,12 +749,6 @@ void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
}
}
-void MainWindow::on_actionAbout_triggered()
-{
- dialogs::About dlg(device_manager_.context(), this);
- dlg.exec();
-}
-
void MainWindow::on_close_current_tab()
{
int tab = session_selector_.currentIndex();