cabana: improve mainwin (#27053)

* open recent

* improve mainwin

* move to submenu

* new file & remind save before load

dd

tools/cabana/cabana.cc

@@ -12,6 +12,7 @@ int main(int argc, char *argv[]) {
   QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
   initApp(argc, argv);
   QApplication app(argc, argv);
+  app.setApplicationDisplayName("Cabana");
 
   QCommandLineParser cmd_parser;
   cmd_parser.addHelpOption();

tools/cabana/mainwin.cc

@@ -61,22 +61,33 @@ MainWindow::MainWindow() : QMainWindow() {
   QObject::connect(charts_widget, &ChartsWidget::dock, this, &MainWindow::dockCharts);
   QObject::connect(can, &AbstractStream::streamStarted, this, &MainWindow::loadDBCFromFingerprint);
   QObject::connect(dbc(), &DBCManager::DBCFileChanged, this, &MainWindow::DBCFileChanged);
-  QObject::connect(detail_widget->undo_stack, &QUndoStack::indexChanged, [this](int index) {
+  QObject::connect(detail_widget->undo_stack, &QUndoStack::cleanChanged, [this](bool clean) { setWindowModified(!clean); });
-    setWindowTitle(tr("%1%2 - Cabana").arg(index > 0 ? "* " : "").arg(dbc()->name()));
-  });
 }
 
 void MainWindow::createActions() {
   QMenu *file_menu = menuBar()->addMenu(tr("&File"));
-  file_menu->addAction(tr("Open DBC File..."), this, &MainWindow::loadDBCFromFile)->setShortcuts(QKeySequence::Open);
+  file_menu->addAction(tr("New DBC File"), this, &MainWindow::newFile)->setShortcuts(QKeySequence::New);
+  file_menu->addAction(tr("Open DBC File..."), this, &MainWindow::openFile)->setShortcuts(QKeySequence::Open);
   file_menu->addAction(tr("Load DBC From Clipboard"), this, &MainWindow::loadDBCFromClipboard);
+  open_recent_menu = file_menu->addMenu(tr("Open &Recent"));
+  for (int i = 0; i < MAX_RECENT_FILES; ++i) {
+    recent_files_acts[i] = new QAction(this);
+    recent_files_acts[i]->setVisible(false);
+    QObject::connect(recent_files_acts[i], &QAction::triggered, this, &MainWindow::openRecentFile);
+    open_recent_menu->addAction(recent_files_acts[i]);
+  }
+  updateRecentFileActions();
+
   file_menu->addSeparator();
-  file_menu->addAction(tr("Save DBC..."), this, &MainWindow::saveDBCToFile)->setShortcuts(QKeySequence::Save);
+  file_menu->addAction(tr("Save DBC..."), this, &MainWindow::save)->setShortcuts(QKeySequence::Save);
-  file_menu->addAction(tr("Save DBC As..."), this, &MainWindow::saveAsDBCToFile)->setShortcuts(QKeySequence::SaveAs);
+  file_menu->addAction(tr("Save DBC As..."), this, &MainWindow::saveAs)->setShortcuts(QKeySequence::SaveAs);
   file_menu->addAction(tr("Copy DBC To Clipboard"), this, &MainWindow::saveDBCToClipboard);
   file_menu->addSeparator();
   file_menu->addAction(tr("Settings..."), this, &MainWindow::setOption)->setShortcuts(QKeySequence::Preferences);
 
+  file_menu->addSeparator();
+  file_menu->addAction(tr("E&xit"), qApp, &QApplication::closeAllWindows)->setShortcuts(QKeySequence::Quit);
+
   QMenu *edit_menu = menuBar()->addMenu(tr("&Edit"));
   auto undo_act = detail_widget->undo_stack->createUndoAction(this, tr("&Undo"));
   undo_act->setShortcuts(QKeySequence::Undo);
@@ -181,34 +192,57 @@ void MainWindow::DBCFileChanged() {
   detail_widget->undo_stack->clear();
   int index = dbc_combo->findText(QFileInfo(dbc()->name()).baseName());
   dbc_combo->setCurrentIndex(index);
-  setWindowTitle(tr("%1 - Cabana").arg(dbc()->name()));
+  setWindowFilePath(QString("%1").arg(dbc()->name()));
 }
 
-void MainWindow::loadDBCFromName(const QString &name) {
+void MainWindow::newFile() {
-  if (name != dbc()->name()) {
+  remindSaveChanges();
-    dbc()->open(name);
+  dbc()->open("untitled.dbc", "");
+}
+
+void MainWindow::openFile() {
+  remindSaveChanges();
+  QString fn = QFileDialog::getOpenFileName(this, tr("Open File"), settings.last_dir, "DBC (*.dbc)");
+  if (!fn.isEmpty()) {
+    loadFile(fn);
   }
 }
 
-void MainWindow::loadDBCFromFile() {
+void MainWindow::loadFile(const QString &fn) {
-  file_name = QFileDialog::getOpenFileName(this, tr("Open File"), settings.last_dir, "DBC (*.dbc)");
+  if (!fn.isEmpty()) {
-  if (!file_name.isEmpty()) {
+    QFile file(fn);
-    settings.last_dir = QFileInfo(file_name).absolutePath();
-    QFile file(file_name);
     if (file.open(QIODevice::ReadOnly)) {
-      auto dbc_name = QFileInfo(file_name).baseName();
+      auto dbc_name = QFileInfo(fn).baseName();
       dbc()->open(dbc_name, file.readAll());
+      setCurrentFile(fn);
+      statusBar()->showMessage(tr("DBC File %1 loaded").arg(fn), 2000);
     }
   }
 }
 
+void MainWindow::openRecentFile() {
+  if (auto action = qobject_cast<QAction *>(sender())) {
+    remindSaveChanges();
+    loadFile(action->data().toString());
+  }
+}
+
+void MainWindow::loadDBCFromName(const QString &name) {
+  if (name != dbc()->name()) {
+    remindSaveChanges();
+    dbc()->open(name);
+  }
+}
+
 void MainWindow::loadDBCFromClipboard() {
+  remindSaveChanges();
   QString dbc_str = QGuiApplication::clipboard()->text();
-  dbc()->open("From Clipboard", dbc_str);
+  dbc()->open("from_clipboard.dbc", dbc_str);
   QMessageBox::information(this, tr("Load From Clipboard"), tr("DBC Successfully Loaded!"));
 }
 
 void MainWindow::loadDBCFromFingerprint() {
+  remindSaveChanges();
   auto fingerprint = can->carFingerprint();
   video_dock->setWindowTitle(tr("ROUTE: %1  FINGERPINT: %2").arg(can->routeName()).arg(fingerprint.isEmpty() ? tr("Unknown Car") : fingerprint));
   if (!fingerprint.isEmpty()) {
@@ -218,25 +252,31 @@ void MainWindow::loadDBCFromFingerprint() {
       return;
     }
   }
-  dbc()->open("New_DBC", "");
+  newFile();
 }
 
-void MainWindow::saveDBCToFile() {
+void MainWindow::save() {
-  if (file_name.isEmpty()) {
+  if (current_file.isEmpty()) {
-    saveAsDBCToFile();
+    saveAs();
   } else {
-    settings.last_dir = QFileInfo(file_name).absolutePath();
+    saveFile(current_file);
-    QFile file(file_name);
-    if (file.open(QIODevice::WriteOnly)) {
-      file.write(dbc()->generateDBC().toUtf8());
-    }
   }
 }
 
-void MainWindow::saveAsDBCToFile() {
+void MainWindow::saveFile(const QString &fn) {
-  file_name = QFileDialog::getSaveFileName(this, tr("Save File"), QDir::cleanPath(settings.last_dir + "/untitled.dbc"), tr("DBC (*.dbc)"));
+  QFile file(fn);
-  if (!file_name.isEmpty()) {
+  if (file.open(QIODevice::WriteOnly)) {
-    saveDBCToFile();
+    file.write(dbc()->generateDBC().toUtf8());
+    detail_widget->undo_stack->setClean();
+    setCurrentFile(fn);
+    statusBar()->showMessage(tr("File saved"), 2000);
+  }
+}
+
+void MainWindow::saveAs() {
+  QString fn = QFileDialog::getSaveFileName(this, tr("Save File"), QDir::cleanPath(settings.last_dir + "/untitled.dbc"), tr("DBC (*.dbc)"));
+  if (!fn.isEmpty()) {
+    saveFile(fn);
   }
 }
 
@@ -245,6 +285,49 @@ void MainWindow::saveDBCToClipboard() {
   QMessageBox::information(this, tr("Copy To Clipboard"), tr("DBC Successfully copied!"));
 }
 
+void MainWindow::setCurrentFile(const QString &fn) {
+  current_file = fn;
+  setWindowFilePath(QString("%1").arg(fn));
+  settings.recent_files.removeAll(fn);
+  settings.recent_files.prepend(fn);
+  while (settings.recent_files.size() > MAX_RECENT_FILES) {
+    settings.recent_files.removeLast();
+  }
+  settings.last_dir = QFileInfo(fn).absolutePath();
+  updateRecentFileActions();
+}
+
+void MainWindow::updateRecentFileActions() {
+  int num_recent_files = std::min<int>(settings.recent_files.size(), MAX_RECENT_FILES);
+
+  for (int i = 0; i < num_recent_files; ++i) {
+    QString text = tr("&%1 %2").arg(i + 1).arg(QFileInfo(settings.recent_files[i]).fileName());
+    recent_files_acts[i]->setText(text);
+    recent_files_acts[i]->setData(settings.recent_files[i]);
+    recent_files_acts[i]->setVisible(true);
+  }
+  for (int i = num_recent_files; i < MAX_RECENT_FILES; ++i) {
+    recent_files_acts[i]->setVisible(false);
+  }
+  open_recent_menu->setEnabled(num_recent_files > 0);
+}
+
+void MainWindow::remindSaveChanges() {
+  bool discard_changes = false;
+  while (!detail_widget->undo_stack->isClean() && !discard_changes) {
+    int ret = (QMessageBox::question(this, tr("Unsaved Changes"),
+                                     tr("You have unsaved changes. Press ok to save them, cancel to discard."),
+                                     QMessageBox::Ok | QMessageBox::Cancel));
+    if (ret == QMessageBox::Ok) {
+      save();
+    } else {
+      discard_changes = true;
+    }
+  }
+  detail_widget->undo_stack->clear();
+  current_file = "";
+}
+
 void MainWindow::updateDownloadProgress(uint64_t cur, uint64_t total, bool success) {
   if (success && cur < total) {
     progress_bar->setValue((cur / (double)total) * 100);
@@ -264,7 +347,7 @@ void MainWindow::dockCharts(bool dock) {
   } else if (!dock && !floating_window) {
     floating_window = new QWidget(this);
     floating_window->setWindowFlags(Qt::Window);
-    floating_window->setWindowTitle("Charts - Cabana");
+    floating_window->setWindowTitle("Charts");
     floating_window->setLayout(new QVBoxLayout());
     floating_window->layout()->addWidget(charts_widget);
     floating_window->installEventFilter(charts_widget);
@@ -273,15 +356,7 @@ void MainWindow::dockCharts(bool dock) {
 }
 
 void MainWindow::closeEvent(QCloseEvent *event) {
-  if (detail_widget->undo_stack->index() > 0) {
+  remindSaveChanges();
-    auto ret = QMessageBox::question(this, tr("Unsaved Changes"),
-                                     tr("Are you sure you want to exit without saving?\nAny unsaved changes will be lost."),
-                                     QMessageBox::Yes | QMessageBox::No);
-    if (ret == QMessageBox::No) {
-      event->ignore();
-      return;
-    }
-  }
 
   main_win = nullptr;
   if (floating_window)

tools/cabana/mainwin.h

@@ -23,12 +23,14 @@ public:
   void showStatusMessage(const QString &msg, int timeout = 0) { statusBar()->showMessage(msg, timeout); }
 
 public slots:
+  void newFile();
+  void openFile();
+  void openRecentFile();
   void loadDBCFromName(const QString &name);
   void loadDBCFromFingerprint();
-  void loadDBCFromFile();
   void loadDBCFromClipboard();
-  void saveDBCToFile();
+  void save();
-  void saveAsDBCToFile();
+  void saveAs();
   void saveDBCToClipboard();
 
 signals:
@@ -36,6 +38,11 @@ signals:
   void updateProgressBar(uint64_t cur, uint64_t total, bool success);
 
 protected:
+  void remindSaveChanges();
+  void saveFile(const QString &fn);
+  void loadFile(const QString &fn);
+  void setCurrentFile(const QString &fn);
+  void updateRecentFileActions();
   void createActions();
   void createDockWindows();
   QComboBox *createDBCSelector();
@@ -58,5 +65,8 @@ protected:
   QJsonDocument fingerprint_to_dbc;
   QComboBox *dbc_combo;
   QSplitter *video_splitter;;
-  QString file_name = "";
+  QString current_file = "";
+  enum { MAX_RECENT_FILES = 15 };
+  QAction *recent_files_acts[MAX_RECENT_FILES] = {};
+  QMenu *open_recent_menu = nullptr;
 };

tools/cabana/settings.cc

@@ -23,6 +23,7 @@ void Settings::save() {
   s.setValue("window_state", window_state);
   s.setValue("geometry", geometry);
   s.setValue("video_splitter_state", video_splitter_state);
+  s.setValue("recent_files", recent_files);
   s.setValue("message_header_state", message_header_state);
 }
 
@@ -37,6 +38,7 @@ void Settings::load() {
   window_state = s.value("window_state").toByteArray();
   geometry = s.value("geometry").toByteArray();
   video_splitter_state = s.value("video_splitter_state").toByteArray();
+  recent_files = s.value("recent_files").toStringList();
   message_header_state = s.value("message_header_state").toByteArray();
 }
 

tools/cabana/settings.h

@@ -22,6 +22,7 @@ public:
   QByteArray geometry;
   QByteArray video_splitter_state;
   QByteArray window_state;
+  QStringList recent_files;
   QByteArray message_header_state;
 
 signals: