X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=33ebdd648e84e09fd6c6614eeb6a6511ce413047;hb=9eae6de4dd0a3c628026eca6ca55cef8b70bfa86;hp=7fe09fb732e9789ca8be26a958a4057a50e5a0fe;hpb=8d466c03419819b02bbbcd591ff6c2847f507d6f;p=pulseview.git diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 7fe09fb..33ebdd6 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" @@ -74,14 +74,13 @@ 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"); setup_ui(); restore_ui_settings(); @@ -118,16 +117,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_; @@ -200,8 +189,8 @@ shared_ptr MainWindow::add_view(const QString &title, qobject_cast(v.get()), SLOT(trigger_event(util::Timestamp))); - v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked()); - v->enable_coloured_bg(action_view_coloured_bg_->isChecked()); + v->enable_sticky_scrolling(true); + v->enable_coloured_bg(true); shared_ptr main_bar = session.main_bar(); if (!main_bar) { @@ -214,6 +203,12 @@ shared_ptr MainWindow::add_view(const QString &title, this, SLOT(on_new_view(Session*))); 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 = @@ -230,10 +225,38 @@ 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; - 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); @@ -267,23 +290,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)); @@ -324,37 +332,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(); @@ -376,6 +381,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)), @@ -462,8 +472,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() @@ -647,12 +669,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); } } @@ -666,30 +693,32 @@ 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()); + view->toggle_coloured_bg(); } void MainWindow::on_actionAbout_triggered() @@ -698,4 +727,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