projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrate the about dialog into the settings dialog
[pulseview.git]
/
pv
/
mainwindow.cpp
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index eaaea089964c9ba32c245e6d8641c6c592997a02..d8247825d47c9c01ae818760b63b75679644112d 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-43,7
+43,6
@@
#include "globalsettings.hpp"
#include "util.hpp"
#include "devices/hardwaredevice.hpp"
#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 "dialogs/settings.hpp"
#include "toolbars/mainbar.hpp"
#include "view/view.hpp"
@@
-78,7
+77,6
@@
MainWindow::MainWindow(DeviceManager &device_manager,
device_manager_(device_manager),
session_selector_(this),
session_state_mapper_(this),
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")
icon_red_(":/icons/status-red.svg"),
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg")
@@
-124,11
+122,6
@@
MainWindow::~MainWindow()
remove_session(sessions_.front());
}
remove_session(sessions_.front());
}
-QAction* MainWindow::action_about() const
-{
- return action_about_;
-}
-
shared_ptr<views::ViewBase> MainWindow::get_active_view() const
{
// If there's only one view, use it...
shared_ptr<views::ViewBase> MainWindow::get_active_view() const
{
// If there's only one view, use it...
@@
-354,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);
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",
// Set up the tab area
new_session_button_ = new QToolButton();
new_session_button_->setIcon(QIcon::fromTheme("document-new",
@@
-611,7
+601,7
@@
void MainWindow::on_run_stop_clicked()
void MainWindow::on_settings_clicked()
{
void MainWindow::on_settings_clicked()
{
- dialogs::Settings dlg;
+ dialogs::Settings dlg
(device_manager_)
;
dlg.exec();
}
dlg.exec();
}
@@
-759,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();
void MainWindow::on_close_current_tab()
{
int tab = session_selector_.currentIndex();