X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=1f683f19ecd2a8efc2d7f022776568c4aac47194;hp=145d7d997db6cfe089d1fc18b4bafd3874e9e22c;hb=bb3030b34e44733036acdfe5b4d4ec0705146831;hpb=6db7315814ee9d2f92d4b326be7c5b9e6e4b789b diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 145d7d99..1f683f19 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #ifdef ENABLE_DECODE #include #endif @@ -32,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -67,6 +70,9 @@ namespace view { class SelectableItem; } +const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory"; +const char *MainWindow::SettingSaveDirectory = "MainWindow/SaveDirectory"; + MainWindow::MainWindow(DeviceManager &device_manager, const char *open_file_name, QWidget *parent) : @@ -112,12 +118,10 @@ void MainWindow::setup_ui() // File Menu QMenu *const menu_file = new QMenu; - menu_file->setTitle(QApplication::translate( - "MainWindow", "&File", 0, QApplication::UnicodeUTF8)); + menu_file->setTitle(tr("&File")); QAction *const action_open = new QAction(this); - action_open->setText(QApplication::translate( - "MainWindow", "&Open...", 0, QApplication::UnicodeUTF8)); + 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)); @@ -125,8 +129,7 @@ void MainWindow::setup_ui() menu_file->addAction(action_open); QAction *const action_save_as = new QAction(this); - action_save_as->setText(QApplication::translate( - "MainWindow", "&Save As...", 0, QApplication::UnicodeUTF8)); + 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)); @@ -136,17 +139,14 @@ void MainWindow::setup_ui() menu_file->addSeparator(); QAction *const action_connect = new QAction(this); - action_connect->setText(QApplication::translate( - "MainWindow", "&Connect to Device...", 0, - QApplication::UnicodeUTF8)); + 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(QApplication::translate( - "MainWindow", "&Quit", 0, QApplication::UnicodeUTF8)); + 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)); @@ -155,12 +155,10 @@ void MainWindow::setup_ui() // View Menu QMenu *menu_view = new QMenu; - menu_view->setTitle(QApplication::translate( - "MainWindow", "&View", 0, QApplication::UnicodeUTF8)); + menu_view->setTitle(tr("&View")); QAction *const action_view_zoom_in = new QAction(this); - action_view_zoom_in->setText(QApplication::translate( - "MainWindow", "Zoom &In", 0, QApplication::UnicodeUTF8)); + 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 @@ -170,8 +168,7 @@ void MainWindow::setup_ui() menu_view->addAction(action_view_zoom_in); QAction *const action_view_zoom_out = new QAction(this); - action_view_zoom_out->setText(QApplication::translate( - "MainWindow", "Zoom &Out", 0, QApplication::UnicodeUTF8)); + 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); @@ -180,8 +177,7 @@ void MainWindow::setup_ui() menu_view->addAction(action_view_zoom_out); QAction *const action_view_zoom_fit = new QAction(this); - action_view_zoom_fit->setText(QApplication::translate( - "MainWindow", "Zoom to &Fit", 0, QApplication::UnicodeUTF8)); + 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)); @@ -190,9 +186,7 @@ void MainWindow::setup_ui() 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(QApplication::translate( - "MainWindow", "Zoom to &One-to-One", 0, - QApplication::UnicodeUTF8)); + action_view_zoom_one_to_one->setText(tr("Zoom to &One-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)); @@ -208,20 +202,17 @@ void MainWindow::setup_ui() action_view_show_cursors->setShortcut(QKeySequence(Qt::Key_C)); action_view_show_cursors->setObjectName( QString::fromUtf8("actionViewShowCursors")); - action_view_show_cursors->setText(QApplication::translate( - "MainWindow", "Show &Cursors", 0, QApplication::UnicodeUTF8)); + 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(QApplication::translate( - "MainWindow", "&Decoders", 0, QApplication::UnicodeUTF8)); + menu_decoders->setTitle(tr("&Decoders")); pv::widgets::DecoderMenu *const menu_decoders_add = new pv::widgets::DecoderMenu(menu_decoders, true); - menu_decoders_add->setTitle(QApplication::translate( - "MainWindow", "&Add", 0, QApplication::UnicodeUTF8)); + menu_decoders_add->setTitle(tr("&Add")); connect(menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)), this, SLOT(add_decoder(srd_decoder*))); @@ -230,13 +221,11 @@ void MainWindow::setup_ui() // Help Menu QMenu *const menu_help = new QMenu; - menu_help->setTitle(QApplication::translate( - "MainWindow", "&Help", 0, QApplication::UnicodeUTF8)); + menu_help->setTitle(tr("&Help")); QAction *const action_about = new QAction(this); action_about->setObjectName(QString::fromUtf8("actionAbout")); - action_about->setText(QApplication::translate( - "MainWindow", "&About...", 0, QApplication::UnicodeUTF8)); + action_about->setText(tr("&About...")); menu_help->addAction(action_about); menu_bar->addAction(menu_file->menuAction()); @@ -271,8 +260,7 @@ void MainWindow::setup_ui() addToolBar(_sampling_bar); // Set the title - setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0, - QApplication::UnicodeUTF8)); + setWindowTitle(tr("PulseView")); // Setup _session events connect(&_session, SIGNAL(capture_state_changed(int)), this, @@ -339,13 +327,21 @@ void MainWindow::show_session_error( void MainWindow::on_actionOpen_triggered() { + QSettings settings; + const QString dir = settings.value(SettingOpenDirectory).toString(); + // Show the dialog const QString file_name = QFileDialog::getOpenFileName( - this, tr("Open File"), "", tr( + this, tr("Open File"), dir, tr( "Sigrok Sessions (*.sr);;" "All Files (*.*)")); - if (!file_name.isEmpty()) + + if (!file_name.isEmpty()) { load_file(file_name); + + const QString abs_path = QFileInfo(file_name).absolutePath(); + settings.setValue(SettingOpenDirectory, abs_path); + } } void MainWindow::on_actionSaveAs_triggered() @@ -355,13 +351,19 @@ void MainWindow::on_actionSaveAs_triggered() // Stop any currently running capture session _session.stop_capture(); + QSettings settings; + const QString dir = settings.value(SettingSaveDirectory).toString(); + // Show the dialog const QString file_name = QFileDialog::getSaveFileName( - this, tr("Save File"), "", tr("Sigrok Sessions (*.sr)")); + this, tr("Save File"), dir, tr("Sigrok Sessions (*.sr)")); if (file_name.isEmpty()) return; + const QString abs_path = QFileInfo(file_name).absolutePath(); + settings.setValue(SettingSaveDirectory, abs_path); + StoreProgress *dlg = new StoreProgress(file_name, _session, this); dlg->run(); }