X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=985f698f8127f1e6efb2cf5f31ed067ec318c132;hp=4a98e4081b68e9999a2f07b3f17d78fdd9276951;hb=143d322d0c92ea5c2cc51facc37b68787362c244;hpb=e0ba4f6fb263b4cc1dae96df2a0ff1e1ef8984ce
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 4a98e408..985f698f 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -35,13 +34,16 @@
#include
#include
#include
+#include
#include "mainwindow.hpp"
#include "devicemanager.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 "views/trace/standardbar.hpp"
@@ -65,6 +67,9 @@ class ViewItem;
using toolbars::MainBar;
+using std::bind;
+using std::placeholders::_1;
+
const QString MainWindow::WindowTitle = tr("PulseView");
MainWindow::MainWindow(DeviceManager &device_manager,
@@ -74,14 +79,16 @@ MainWindow::MainWindow(DeviceManager &device_manager,
device_manager_(device_manager),
session_selector_(this),
session_state_mapper_(this),
- action_view_sticky_scrolling_(new QAction(this)),
- action_view_coloured_bg_(new QAction(this)),
action_about_(new QAction(this)),
icon_red_(":/icons/status-red.svg"),
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg")
{
qRegisterMetaType("util::Timestamp");
+ qRegisterMetaType("uint64_t");
+
+ GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG,
+ bind(&MainWindow::on_settingViewColouredBg_changed, this, _1));
setup_ui();
restore_ui_settings();
@@ -118,16 +125,6 @@ MainWindow::~MainWindow()
remove_session(sessions_.front());
}
-QAction* MainWindow::action_view_sticky_scrolling() const
-{
- return action_view_sticky_scrolling_;
-}
-
-QAction* MainWindow::action_view_coloured_bg() const
-{
- return action_view_coloured_bg_;
-}
-
QAction* MainWindow::action_about() const
{
return action_about_;
@@ -161,78 +158,122 @@ shared_ptr MainWindow::get_active_view() const
shared_ptr MainWindow::add_view(const QString &title,
views::ViewType type, Session &session)
{
- QMainWindow *main_window;
+ GlobalSettings settings;
+ shared_ptr v;
+
+ QMainWindow *main_window = nullptr;
for (auto entry : session_windows_)
if (entry.first.get() == &session)
main_window = entry.second;
assert(main_window);
- if (type == views::ViewTypeTrace) {
- QDockWidget* dock = new QDockWidget(title, main_window);
- dock->setObjectName(title);
- main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
+ shared_ptr main_bar = session.main_bar();
- // Insert a QMainWindow into the dock widget to allow for a tool bar
- QMainWindow *dock_main = new QMainWindow(dock);
- dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
+ QDockWidget* dock = new QDockWidget(title, main_window);
+ dock->setObjectName(title);
+ main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
- shared_ptr v =
- make_shared(session, dock_main);
- view_docks_[dock] = v;
- session.register_view(v);
+ // Insert a QMainWindow into the dock widget to allow for a tool bar
+ QMainWindow *dock_main = new QMainWindow(dock);
+ dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
- dock_main->setCentralWidget(v.get());
- dock->setWidget(dock_main);
+ if (type == views::ViewTypeTrace)
+ // This view will be the main view if there's no main bar yet
+ v = make_shared(session,
+ (main_bar ? false : true), dock_main);
- dock->setFeatures(QDockWidget::DockWidgetMovable |
- QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
+ if (!v)
+ return nullptr;
- QAbstractButton *close_btn =
- dock->findChildren
- ("qt_dockwidget_closebutton").front();
+ view_docks_[dock] = v;
+ session.register_view(v);
- connect(close_btn, SIGNAL(clicked(bool)),
- this, SLOT(on_view_close_clicked()));
+ dock_main->setCentralWidget(v.get());
+ dock->setWidget(dock_main);
- if (type == views::ViewTypeTrace) {
- connect(&session, SIGNAL(trigger_event(util::Timestamp)),
- qobject_cast(v.get()),
- SLOT(trigger_event(util::Timestamp)));
+ dock->setFeatures(QDockWidget::DockWidgetMovable |
+ QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
- v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
- v->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+ QAbstractButton *close_btn =
+ dock->findChildren
+ ("qt_dockwidget_closebutton").front();
- shared_ptr main_bar = session.main_bar();
- if (!main_bar) {
- /* Initial view, create the main bar */
- main_bar = make_shared(session, this, v.get());
- dock_main->addToolBar(main_bar.get());
- session.set_main_bar(main_bar);
+ connect(close_btn, SIGNAL(clicked(bool)),
+ this, SLOT(on_view_close_clicked()));
- connect(main_bar.get(), SIGNAL(new_view(Session*)),
- this, SLOT(on_new_view(Session*)));
- } else {
- /* Additional view, create a standard bar */
- dock_main->addToolBar(
- new pv::views::trace::StandardBar(session, this, v.get()));
- }
- main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
+ connect(&session, SIGNAL(trigger_event(util::Timestamp)),
+ qobject_cast(v.get()),
+ SLOT(trigger_event(util::Timestamp)));
- connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)),
- main_bar.get(), SLOT(on_always_zoom_to_fit_changed(bool)));
+ if (type == views::ViewTypeTrace) {
+ views::TraceView::View *tv =
+ qobject_cast(v.get());
+
+ tv->enable_sticky_scrolling(true);
+ tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
+
+ if (!main_bar) {
+ /* Initial view, create the main bar */
+ main_bar = make_shared(session, this, tv);
+ dock_main->addToolBar(main_bar.get());
+ session.set_main_bar(main_bar);
+
+ connect(main_bar.get(), SIGNAL(new_view(Session*)),
+ this, SLOT(on_new_view(Session*)));
+
+ main_bar->action_view_show_cursors()->setChecked(tv->cursors_shown());
+
+ /* For the main view we need to prevent the dock widget from
+ * closing itself when its close button is clicked. This is
+ * so we can confirm with the user first. Regular views don't
+ * need this */
+ close_btn->disconnect(SIGNAL(clicked()), dock, SLOT(close()));
+ } else {
+ /* Additional view, create a standard bar */
+ pv::views::trace::StandardBar *standard_bar =
+ new pv::views::trace::StandardBar(session, this, tv);
+ dock_main->addToolBar(standard_bar);
+
+ standard_bar->action_view_show_cursors()->setChecked(tv->cursors_shown());
}
-
- return v;
}
- return nullptr;
+ return v;
+}
+
+void MainWindow::remove_view(shared_ptr view)
+{
+ for (shared_ptr session : sessions_) {
+ if (!session->has_view(view))
+ continue;
+
+ // Find the dock the view is contained in and remove it
+ for (auto entry : view_docks_)
+ if (entry.second == view) {
+ // Remove the view from the session
+ session->deregister_view(view);
+
+ // Remove the view from its parent; otherwise, Qt will
+ // call deleteLater() on it, which causes a double free
+ // since the shared_ptr in view_docks_ doesn't know
+ // that Qt keeps a pointer to the view around
+ view->setParent(0);
+
+ // Delete the view's dock widget and all widgets inside it
+ entry.first->deleteLater();
+
+ // Remove the dock widget from the list and stop iterating
+ view_docks_.erase(entry.first);
+ break;
+ }
+ }
}
shared_ptr MainWindow::add_session()
{
static int last_session_id = 1;
- QString name = tr("Untitled-%1").arg(last_session_id++);
+ QString name = tr("Session %1").arg(last_session_id++);
shared_ptr session = make_shared(device_manager_, name);
@@ -266,23 +307,8 @@ void MainWindow::remove_session(shared_ptr session)
{
int h = new_session_button_->height();
- for (shared_ptr view : session->views()) {
- // Find the dock the view is contained in and remove it
- for (auto entry : view_docks_)
- if (entry.second == view) {
- // Remove the view from the session
- session->deregister_view(view);
-
- // Remove the view from its parent; otherwise, Qt will
- // call deleteLater() on it, which causes a double free
- // since the shared_ptr in view_docks_ doesn't know
- // that Qt keeps a pointer to the view around
- entry.second->setParent(0);
-
- // Remove this entry from the container
- view_docks_.erase(entry.first);
- }
- }
+ for (shared_ptr view : session->views())
+ remove_view(view);
QMainWindow *window = session_windows_.at(session);
session_selector_.removeTab(session_selector_.indexOf(window));
@@ -323,37 +349,34 @@ void MainWindow::setup_ui()
icon.addFile(QString(":/icons/sigrok-logo-notext.png"));
setWindowIcon(icon);
- action_view_sticky_scrolling_->setCheckable(true);
- action_view_sticky_scrolling_->setChecked(true);
- action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_S));
- action_view_sticky_scrolling_->setObjectName(
- QString::fromUtf8("actionViewStickyScrolling"));
- action_view_sticky_scrolling_->setText(tr("&Sticky Scrolling"));
+ view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));
+ view_sticky_scrolling_shortcut_->setAutoRepeat(false);
- action_view_coloured_bg_->setCheckable(true);
- action_view_coloured_bg_->setChecked(true);
- action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_B));
- action_view_coloured_bg_->setObjectName(
- QString::fromUtf8("actionViewColouredBg"));
- action_view_coloured_bg_->setText(tr("Use &coloured backgrounds"));
+ 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_->setText(tr("&About..."));
+ action_about_->setToolTip(tr("&About..."));
// Set up the tab area
new_session_button_ = new QToolButton();
new_session_button_->setIcon(QIcon::fromTheme("document-new",
QIcon(":/icons/document-new.png")));
+ new_session_button_->setToolTip(tr("Create New Session"));
new_session_button_->setAutoRaise(true);
run_stop_button_ = new QToolButton();
run_stop_button_->setAutoRaise(true);
run_stop_button_->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- run_stop_button_->setShortcut(QKeySequence(Qt::Key_Space));
+ run_stop_button_->setToolTip(tr("Start/Stop Acquisition"));
+
+ run_stop_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Space), run_stop_button_, SLOT(click()));
+ run_stop_shortcut_->setAutoRepeat(false);
settings_button_ = new QToolButton();
settings_button_->setIcon(QIcon::fromTheme("configure",
QIcon(":/icons/configure.png")));
+ settings_button_->setToolTip(tr("Settings"));
settings_button_->setAutoRaise(true);
QFrame *separator1 = new QFrame();
@@ -375,12 +398,19 @@ void MainWindow::setup_ui()
session_selector_.setCornerWidget(static_tab_widget_, Qt::TopLeftCorner);
session_selector_.setTabsClosable(true);
+ close_application_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this, SLOT(close()));
+ close_application_shortcut_->setAutoRepeat(false);
+
+ close_current_tab_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this, SLOT(on_close_current_tab()));
+
connect(new_session_button_, SIGNAL(clicked(bool)),
this, SLOT(on_new_session_clicked()));
connect(run_stop_button_, SIGNAL(clicked(bool)),
this, SLOT(on_run_stop_clicked()));
connect(&session_state_mapper_, SIGNAL(mapped(QObject*)),
this, SLOT(on_capture_state_changed(QObject*)));
+ connect(settings_button_, SIGNAL(clicked(bool)),
+ this, SLOT(on_settings_clicked()));
connect(&session_selector_, SIGNAL(tabCloseRequested(int)),
this, SLOT(on_tab_close_requested(int)));
@@ -461,8 +491,20 @@ std::shared_ptr MainWindow::get_tab_session(int index) const
void MainWindow::closeEvent(QCloseEvent *event)
{
- save_ui_settings();
- event->accept();
+ bool data_saved = true;
+
+ for (auto entry : session_windows_)
+ if (!entry.first->data_saved())
+ data_saved = false;
+
+ if (!data_saved && (QMessageBox::question(this, tr("Confirmation"),
+ tr("There is unsaved data. Close anyway?"),
+ QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)) {
+ event->ignore();
+ } else {
+ save_ui_settings();
+ event->accept();
+ }
}
QMenu* MainWindow::createPopupMenu()
@@ -568,6 +610,12 @@ void MainWindow::on_run_stop_clicked()
}
}
+void MainWindow::on_settings_clicked()
+{
+ dialogs::Settings dlg;
+ dlg.exec();
+}
+
void MainWindow::on_session_name_changed()
{
// Update the corresponding dock widget's name(s)
@@ -646,12 +694,17 @@ void MainWindow::on_view_close_clicked()
if (!session->has_view(view))
continue;
- // Also destroy the entire session if its main view is closing
+ // Also destroy the entire session if its main view is closing...
if (view == session->main_view()) {
- remove_session(session);
+ // ...but only if data is saved or the user confirms closing
+ if (session->data_saved() || (QMessageBox::question(this, tr("Confirmation"),
+ tr("This session contains unsaved data. Close it anyway?"),
+ QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes))
+ remove_session(session);
break;
} else
- session->deregister_view(view);
+ // All other views can be closed at any time as no data will be lost
+ remove_view(view);
}
}
@@ -665,30 +718,46 @@ void MainWindow::on_tab_changed(int index)
void MainWindow::on_tab_close_requested(int index)
{
- // TODO Ask user if this is intended in case data is unsaved
-
shared_ptr session = get_tab_session(index);
- if (session)
+ assert(session);
+
+ if (session->data_saved() || (QMessageBox::question(this, tr("Confirmation"),
+ tr("This session contains unsaved data. Close it anyway?"),
+ QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes))
remove_session(session);
}
-void MainWindow::on_actionViewStickyScrolling_triggered()
+void MainWindow::on_view_sticky_scrolling_shortcut()
{
shared_ptr viewbase = get_active_view();
views::TraceView::View* view =
qobject_cast(viewbase.get());
if (view)
- view->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+ view->toggle_sticky_scrolling();
}
-void MainWindow::on_actionViewColouredBg_triggered()
+void MainWindow::on_view_coloured_bg_shortcut()
{
- shared_ptr viewbase = get_active_view();
- views::TraceView::View* view =
- qobject_cast(viewbase.get());
- if (view)
- view->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+ GlobalSettings settings;
+
+ bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+ settings.setValue(GlobalSettings::Key_View_ColouredBG, !state);
+}
+
+void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
+{
+ bool state = new_value.toBool();
+
+ for (auto entry : view_docks_) {
+ shared_ptr viewbase = entry.second;
+
+ // Only trace views have this setting
+ views::TraceView::View* view =
+ qobject_cast(viewbase.get());
+ if (view)
+ view->enable_coloured_bg(state);
+ }
}
void MainWindow::on_actionAbout_triggered()
@@ -697,4 +766,11 @@ void MainWindow::on_actionAbout_triggered()
dlg.exec();
}
+void MainWindow::on_close_current_tab()
+{
+ int tab = session_selector_.currentIndex();
+
+ on_tab_close_requested(tab);
+}
+
} // namespace pv