X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=662d68af2f29bdba5ceff5f68931855d18708026;hp=22e4e80e10f6a2ad3b803abcedfd4a88f5500bec;hb=763945bb95fb3f5871d8b8241c8d9db2f0f66d4c;hpb=3231fbf9374113d07d3d544a4822ae46032062a2 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 22e4e80e..662d68af 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,6 +34,7 @@ #include #include #include +#include #include "mainwindow.hpp" @@ -44,6 +44,7 @@ #include "dialogs/about.hpp" #include "toolbars/mainbar.hpp" #include "view/view.hpp" +#include "views/trace/standardbar.hpp" #include #include @@ -81,13 +82,14 @@ MainWindow::MainWindow(DeviceManager &device_manager, icon_grey_(":/icons/status-grey.svg") { qRegisterMetaType("util::Timestamp"); + qRegisterMetaType("uint64_t"); setup_ui(); restore_ui_settings(); if (!open_file_name.empty()) { shared_ptr session = add_session(); - session->main_bar()->load_init_file(open_file_name, open_file_format); + session->load_init_file(open_file_name, open_file_format); } // Add empty default session if there aren't any sessions @@ -107,8 +109,7 @@ MainWindow::MainWindow(DeviceManager &device_manager, } // ...and if there isn't any, just use demo then - session->main_bar()->select_device(other_device ? - other_device : demo_device); + session->select_device(other_device ? other_device : demo_device); } } @@ -161,7 +162,7 @@ shared_ptr MainWindow::get_active_view() const shared_ptr MainWindow::add_view(const QString &title, views::ViewType type, Session &session) { - QMainWindow *main_window; + QMainWindow *main_window = nullptr; for (auto entry : session_windows_) if (entry.first.get() == &session) main_window = entry.second; @@ -205,17 +206,29 @@ shared_ptr MainWindow::add_view(const QString &title, shared_ptr main_bar = session.main_bar(); if (!main_bar) { - main_bar = make_shared(session, *this); + /* 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(main_bar.get(), SIGNAL(new_view(Session*)), this, SLOT(on_new_view(Session*))); - } - main_bar->action_view_show_cursors()->setChecked(v->cursors_shown()); - connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)), - main_bar.get(), SLOT(on_always_zoom_to_fit_changed(bool))); + main_bar->action_view_show_cursors()->setChecked(v->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, v.get()); + dock_main->addToolBar(standard_bar); + + standard_bar->action_view_show_cursors()->setChecked(v->cursors_shown()); + } } return v; @@ -224,6 +237,34 @@ shared_ptr MainWindow::add_view(const QString &title, return nullptr; } +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; @@ -247,6 +288,7 @@ shared_ptr MainWindow::add_session() int index = session_selector_.addTab(window, name); session_selector_.setCurrentIndex(index); + last_focused_session_ = session; window->setDockNestingEnabled(true); @@ -260,29 +302,17 @@ 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)); session_windows_.erase(session); + if (last_focused_session_ == session) + last_focused_session_.reset(); + sessions_.remove_if([&](shared_ptr s) { return s == session; }); @@ -326,26 +356,44 @@ void MainWindow::setup_ui() 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")); + action_view_coloured_bg_->setText(tr("Use &Coloured Backgrounds")); 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(); + separator1->setFrameStyle(QFrame::VLine | QFrame::Raised); + QFrame *separator2 = new QFrame(); + separator2->setFrameStyle(QFrame::VLine | QFrame::Raised); QHBoxLayout* layout = new QHBoxLayout(); layout->setContentsMargins(2, 2, 2, 2); layout->addWidget(new_session_button_); + layout->addWidget(separator1); layout->addWidget(run_stop_button_); + layout->addWidget(separator2); + layout->addWidget(settings_button_); static_tab_widget_ = new QWidget(); static_tab_widget_->setLayout(layout); @@ -353,6 +401,11 @@ 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)), @@ -439,8 +492,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() @@ -487,14 +552,12 @@ void MainWindow::on_add_view(const QString &title, views::ViewType type, void MainWindow::on_focus_changed() { - static shared_ptr prev_session; - shared_ptr view = get_active_view(); if (view) { for (shared_ptr session : sessions_) { if (session->has_view(view)) { - if (session != prev_session) { + if (session != last_focused_session_) { // Activate correct tab if necessary shared_ptr tab_session = get_tab_session( session_selector_.currentIndex()); @@ -505,7 +568,6 @@ void MainWindow::on_focus_changed() on_focused_session_changed(session); } - prev_session = session; break; } } @@ -517,6 +579,8 @@ void MainWindow::on_focus_changed() void MainWindow::on_focused_session_changed(shared_ptr session) { + last_focused_session_ = session; + setWindowTitle(session->name() + " - " + WindowTitle); // Update the state of the run/stop button, too @@ -530,16 +594,19 @@ void MainWindow::on_new_session_clicked() void MainWindow::on_run_stop_clicked() { - Session &session = get_active_view()->session(); + shared_ptr session = last_focused_session_; + + if (!session) + return; - switch (session.get_capture_state()) { + switch (session->get_capture_state()) { case Session::Stopped: - session.start_capture([&](QString message) { + session->start_capture([&](QString message) { session_error("Capture failed", message); }); break; case Session::AwaitingTrigger: case Session::Running: - session.stop_capture(); + session->stop_capture(); break; } } @@ -559,10 +626,16 @@ void MainWindow::on_session_name_changed() } } - // Refresh window title if the affected session has focus - shared_ptr view = get_active_view(); + // Update the tab widget by finding the main window and the tab from that + for (auto entry : session_windows_) + if (entry.first.get() == session) { + QMainWindow *window = entry.second; + const int index = session_selector_.indexOf(window); + session_selector_.setTabText(index, session->name()); + } - if (view && session->has_view(view)) + // Refresh window title if the affected session has focus + if (session == last_focused_session_.get()) setWindowTitle(session->name() + " - " + WindowTitle); } @@ -572,12 +645,8 @@ void MainWindow::on_capture_state_changed(QObject *obj) // Ignore if caller is not the currently focused session // unless there is only one session - if (sessions_.size() > 1) { - Session &focused_session = get_active_view()->session(); - - if (caller != &focused_session) - return; - } + if ((sessions_.size() > 1) && (caller != last_focused_session_.get())) + return; int state = caller->get_capture_state(); @@ -620,12 +689,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); } } @@ -639,11 +713,13 @@ 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); } @@ -671,4 +747,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