X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=039f4aeb7b3c9871f66cd8ebddf78ca69cc0d5c8;hp=9fa4eee6baa2735281a4c3e4dbfda21cc7a3bb62;hb=7a01bd3654ed046216308fa64edfd79be7cd525f;hpb=26e3af6b15f083239981729b2c3c109ed1d87ba8 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 9fa4eee6..039f4aeb 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -46,18 +46,19 @@ #include "dialogs/about.hpp" #include "dialogs/connect.hpp" #include "dialogs/storeprogress.hpp" -#include "toolbars/samplingbar.hpp" +#include "toolbars/mainbar.hpp" #include "view/logicsignal.hpp" #include "view/view.hpp" #ifdef ENABLE_DECODE #include "widgets/decodermenu.hpp" #endif +#include "widgets/hidingmenubar.hpp" #include #include #include #include -#include +#include using std::list; using std::map; @@ -82,7 +83,18 @@ MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) : QMainWindow(parent), device_manager_(device_manager), - session_(device_manager) + session_(device_manager), + action_open_(new QAction(this)), + action_save_as_(new QAction(this)), + action_connect_(new QAction(this)), + action_quit_(new QAction(this)), + action_view_zoom_in_(new QAction(this)), + action_view_zoom_out_(new QAction(this)), + action_view_zoom_fit_(new QAction(this)), + action_view_zoom_one_to_one_(new QAction(this)), + action_view_show_cursors_(new QAction(this)), + action_about_(new QAction(this)), + menu_decoders_add_(new pv::widgets::DecoderMenu(this, true)) { setup_ui(); restore_ui_settings(); @@ -94,6 +106,61 @@ MainWindow::MainWindow(DeviceManager &device_manager, } } +QAction* MainWindow::action_open() const +{ + return action_open_; +} + +QAction* MainWindow::action_save_as() const +{ + return action_save_as_; +} + +QAction* MainWindow::action_connect() const +{ + return action_connect_; +} + +QAction* MainWindow::action_quit() const +{ + return action_quit_; +} + +QAction* MainWindow::action_view_zoom_in() const +{ + return action_view_zoom_in_; +} + +QAction* MainWindow::action_view_zoom_out() const +{ + return action_view_zoom_out_; +} + +QAction* MainWindow::action_view_zoom_fit() const +{ + return action_view_zoom_fit_; +} + +QAction* MainWindow::action_view_zoom_one_to_one() const +{ + return action_view_zoom_one_to_one_; +} + +QAction* MainWindow::action_view_show_cursors() const +{ + return action_view_show_cursors_; +} + +QAction* MainWindow::action_about() const +{ + return action_about_; +} + +QMenu* MainWindow::menu_decoder_add() const +{ + return menu_decoders_add_; +} + void MainWindow::run_stop() { switch(session_.get_capture_state()) { @@ -129,8 +196,7 @@ void MainWindow::setup_ui() // Set the window icon QIcon icon; - icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"), - QSize(), QIcon::Normal, QIcon::Off); + icon.addFile(QString(":/icons/sigrok-logo-notext.svg")); setWindowIcon(icon); // Setup the central widget @@ -145,120 +211,110 @@ void MainWindow::setup_ui() vertical_layout_->addWidget(view_); // Setup the menu bar - QMenuBar *const menu_bar = new QMenuBar(this); - menu_bar->setGeometry(QRect(0, 0, 400, 25)); + pv::widgets::HidingMenuBar *const menu_bar = + new pv::widgets::HidingMenuBar(this); // File Menu QMenu *const menu_file = new QMenu; menu_file->setTitle(tr("&File")); - QAction *const action_open = new QAction(this); - action_open->setText(tr("&Open...")); - action_open->setIcon(QIcon::fromTheme("document-open", + action_open_->setText(tr("&Open...")); + action_open_->setIcon(QIcon::fromTheme("document-open", QIcon(":/icons/document-open.png"))); - action_open->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_O)); - action_open->setObjectName(QString::fromUtf8("actionOpen")); - menu_file->addAction(action_open); + action_open_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_O)); + action_open_->setObjectName(QString::fromUtf8("actionOpen")); + menu_file->addAction(action_open_); - QAction *const action_save_as = new QAction(this); - action_save_as->setText(tr("&Save As...")); - action_save_as->setIcon(QIcon::fromTheme("document-save-as", + action_save_as_->setText(tr("&Save As...")); + action_save_as_->setIcon(QIcon::fromTheme("document-save-as", QIcon(":/icons/document-save-as.png"))); - action_save_as->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S)); - action_save_as->setObjectName(QString::fromUtf8("actionSaveAs")); - menu_file->addAction(action_save_as); + action_save_as_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S)); + action_save_as_->setObjectName(QString::fromUtf8("actionSaveAs")); + menu_file->addAction(action_save_as_); menu_file->addSeparator(); - QAction *const action_connect = new QAction(this); - action_connect->setText(tr("&Connect to Device...")); - action_connect->setObjectName(QString::fromUtf8("actionConnect")); - menu_file->addAction(action_connect); + action_connect_->setText(tr("&Connect to Device...")); + action_connect_->setObjectName(QString::fromUtf8("actionConnect")); + menu_file->addAction(action_connect_); menu_file->addSeparator(); - QAction *action_quit = new QAction(this); - action_quit->setText(tr("&Quit")); - action_quit->setIcon(QIcon::fromTheme("application-exit", + action_quit_->setText(tr("&Quit")); + action_quit_->setIcon(QIcon::fromTheme("application-exit", QIcon(":/icons/application-exit.png"))); - action_quit->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); - action_quit->setObjectName(QString::fromUtf8("actionQuit")); - menu_file->addAction(action_quit); + action_quit_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); + action_quit_->setObjectName(QString::fromUtf8("actionQuit")); + menu_file->addAction(action_quit_); // View Menu QMenu *menu_view = new QMenu; menu_view->setTitle(tr("&View")); - QAction *const action_view_zoom_in = new QAction(this); - action_view_zoom_in->setText(tr("Zoom &In")); - action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in", + action_view_zoom_in_->setText(tr("Zoom &In")); + action_view_zoom_in_->setIcon(QIcon::fromTheme("zoom-in", QIcon(":/icons/zoom-in.png"))); // simply using Qt::Key_Plus shows no + in the menu - action_view_zoom_in->setShortcut(QKeySequence::ZoomIn); - action_view_zoom_in->setObjectName( + action_view_zoom_in_->setShortcut(QKeySequence::ZoomIn); + action_view_zoom_in_->setObjectName( QString::fromUtf8("actionViewZoomIn")); - menu_view->addAction(action_view_zoom_in); + menu_view->addAction(action_view_zoom_in_); - QAction *const action_view_zoom_out = new QAction(this); - action_view_zoom_out->setText(tr("Zoom &Out")); - action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out", + action_view_zoom_out_->setText(tr("Zoom &Out")); + action_view_zoom_out_->setIcon(QIcon::fromTheme("zoom-out", QIcon(":/icons/zoom-out.png"))); - action_view_zoom_out->setShortcut(QKeySequence::ZoomOut); - action_view_zoom_out->setObjectName( + action_view_zoom_out_->setShortcut(QKeySequence::ZoomOut); + action_view_zoom_out_->setObjectName( QString::fromUtf8("actionViewZoomOut")); - menu_view->addAction(action_view_zoom_out); + menu_view->addAction(action_view_zoom_out_); - QAction *const action_view_zoom_fit = new QAction(this); - action_view_zoom_fit->setText(tr("Zoom to &Fit")); - action_view_zoom_fit->setIcon(QIcon::fromTheme("zoom-fit", + action_view_zoom_fit_->setText(tr("Zoom to &Fit")); + action_view_zoom_fit_->setIcon(QIcon::fromTheme("zoom-fit", QIcon(":/icons/zoom-fit.png"))); - action_view_zoom_fit->setShortcut(QKeySequence(Qt::Key_F)); - action_view_zoom_fit->setObjectName( + action_view_zoom_fit_->setShortcut(QKeySequence(Qt::Key_F)); + action_view_zoom_fit_->setObjectName( QString::fromUtf8("actionViewZoomFit")); - menu_view->addAction(action_view_zoom_fit); + menu_view->addAction(action_view_zoom_fit_); - QAction *const action_view_zoom_one_to_one = new QAction(this); - action_view_zoom_one_to_one->setText(tr("Zoom to &One-to-One")); - action_view_zoom_one_to_one->setIcon(QIcon::fromTheme("zoom-original", + action_view_zoom_one_to_one_->setText(tr("Zoom to O&ne-to-One")); + action_view_zoom_one_to_one_->setIcon(QIcon::fromTheme("zoom-original", QIcon(":/icons/zoom-original.png"))); - action_view_zoom_one_to_one->setShortcut(QKeySequence(Qt::Key_O)); - action_view_zoom_one_to_one->setObjectName( + action_view_zoom_one_to_one_->setShortcut(QKeySequence(Qt::Key_O)); + action_view_zoom_one_to_one_->setObjectName( QString::fromUtf8("actionViewZoomOneToOne")); - menu_view->addAction(action_view_zoom_one_to_one); + menu_view->addAction(action_view_zoom_one_to_one_); menu_view->addSeparator(); - QAction *action_view_show_cursors = new QAction(this); - action_view_show_cursors->setCheckable(true); - action_view_show_cursors->setChecked(view_->cursors_shown()); - action_view_show_cursors->setShortcut(QKeySequence(Qt::Key_C)); - action_view_show_cursors->setObjectName( + action_view_show_cursors_->setCheckable(true); + action_view_show_cursors_->setChecked(view_->cursors_shown()); + action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors", + QIcon(":/icons/show-cursors.svg"))); + action_view_show_cursors_->setShortcut(QKeySequence(Qt::Key_C)); + action_view_show_cursors_->setObjectName( QString::fromUtf8("actionViewShowCursors")); - action_view_show_cursors->setText(tr("Show &Cursors")); - menu_view->addAction(action_view_show_cursors); + action_view_show_cursors_->setText(tr("Show &Cursors")); + menu_view->addAction(action_view_show_cursors_); // Decoders Menu #ifdef ENABLE_DECODE QMenu *const menu_decoders = new QMenu; menu_decoders->setTitle(tr("&Decoders")); - pv::widgets::DecoderMenu *const menu_decoders_add = - new pv::widgets::DecoderMenu(menu_decoders, true); - menu_decoders_add->setTitle(tr("&Add")); - connect(menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)), + menu_decoders_add_->setTitle(tr("&Add")); + connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)), this, SLOT(add_decoder(srd_decoder*))); - menu_decoders->addMenu(menu_decoders_add); + menu_decoders->addMenu(menu_decoders_add_); #endif // Help Menu QMenu *const menu_help = new QMenu; menu_help->setTitle(tr("&Help")); - QAction *const action_about = new QAction(this); - action_about->setObjectName(QString::fromUtf8("actionAbout")); - action_about->setText(tr("&About...")); - menu_help->addAction(action_about); + action_about_->setObjectName(QString::fromUtf8("actionAbout")); + action_about_->setText(tr("&About...")); + menu_help->addAction(action_about_); menu_bar->addAction(menu_file->menuAction()); menu_bar->addAction(menu_view->menuAction()); @@ -271,24 +327,12 @@ void MainWindow::setup_ui() QMetaObject::connectSlotsByName(this); // Setup the toolbar - QToolBar *const toolbar = new QToolBar(tr("Main Toolbar"), this); - toolbar->setObjectName(QString::fromUtf8("MainToolbar")); - toolbar->addAction(action_open); - toolbar->addAction(action_save_as); - toolbar->addSeparator(); - toolbar->addAction(action_view_zoom_in); - toolbar->addAction(action_view_zoom_out); - toolbar->addAction(action_view_zoom_fit); - toolbar->addAction(action_view_zoom_one_to_one); - addToolBar(toolbar); - - // Setup the sampling bar - sampling_bar_ = new toolbars::SamplingBar(session_, *this); + main_bar_ = new toolbars::MainBar(session_, *this); // Populate the device list and select the initially selected device update_device_list(); - addToolBar(sampling_bar_); + addToolBar(main_bar_); // Set the title setWindowTitle(tr("PulseView")); @@ -394,23 +438,7 @@ void MainWindow::session_error( void MainWindow::update_device_list() { - assert(sampling_bar_); - - shared_ptr selected_device = session_.device(); - list< shared_ptr > devices; - - if (device_manager_.devices().size() == 0) - return; - - std::copy(device_manager_.devices().begin(), - device_manager_.devices().end(), std::back_inserter(devices)); - - if (std::find(devices.begin(), devices.end(), selected_device) == - devices.end()) - devices.push_back(selected_device); - assert(selected_device); - - sampling_bar_->set_device_list(devices, selected_device); + main_bar_->update_device_list(); } void MainWindow::closeEvent(QCloseEvent *event) @@ -419,6 +447,15 @@ void MainWindow::closeEvent(QCloseEvent *event) event->accept(); } +void MainWindow::keyReleaseEvent(QKeyEvent *event) +{ + if (event->key() == Qt::Key_Alt) { + menuBar()->setHidden(!menuBar()->isHidden()); + menuBar()->setFocus(); + } + QMainWindow::keyReleaseEvent(event); +} + void MainWindow::load_file(QString file_name) { const QString errorMessage( @@ -426,7 +463,7 @@ void MainWindow::load_file(QString file_name) const QString infoMessage; try { - session_.set_file(file_name.toStdString()); + session_.set_session_file(file_name.toStdString()); } catch(Error e) { show_session_error(tr("Failed to load ") + file_name, e.what()); session_.set_default_device(); @@ -490,7 +527,9 @@ void MainWindow::on_actionSaveAs_triggered() const QString abs_path = QFileInfo(file_name).absolutePath(); settings.setValue(SettingSaveDirectory, abs_path); - StoreProgress *dlg = new StoreProgress(file_name, session_, this); + StoreProgress *dlg = new StoreProgress(file_name, + device_manager_.context()->output_formats()["srzip"], + session_, this); dlg->run(); } @@ -563,7 +602,7 @@ void MainWindow::add_decoder(srd_decoder *decoder) void MainWindow::capture_state_changed(int state) { - sampling_bar_->set_capture_state((pv::Session::capture_state)state); + main_bar_->set_capture_state((pv::Session::capture_state)state); } void MainWindow::device_selected()