Merge pull request #920 from isanae/double-click-previews

Double click previews

10 files changed, 186 insertions, 32 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c365fb6b..01f683a7 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -198,6 +198,55 @@ QString UnmanagedModName()
 
 bool runLoot(QWidget* parent, OrganizerCore& core, bool didUpdateMasterList);
 
+void setDefaultActivationActionForFile(QAction* open, QAction* preview)
+{
+  if (!open && !preview) {
+    return;
+  }
+
+  QFont bold, notBold;
+
+  if (open) {
+    bold = open->font();
+    notBold = open->font();
+  } else {
+    bold = preview->font();
+    notBold = preview->font();
+  }
+
+  notBold.setBold(false);
+  bold.setBold(true);
+
+
+  const auto& s = Settings::instance();
+  const auto openEnabled = (open && open->isEnabled());
+  const auto previewEnabled = (preview && preview->isEnabled());
+
+  bool doPreview = false;
+
+  // preview is bold if the file is previewable and [the preview on double-click
+  // option is enabled or the file can't be opened]; open is bold if the file
+  // can be opened and cannot be previewed
+  if (previewEnabled && s.interface().doubleClicksOpenPreviews()) {
+    doPreview = true;
+  } else if (openEnabled) {
+    doPreview = false;
+  } else if (previewEnabled) {
+    doPreview = true;
+  } else {
+    // shouldn't happen, checked above
+    return;
+  }
+
+  if (open) {
+    open->setFont(doPreview ? notBold : bold);
+  }
+
+  if (preview) {
+    preview->setFont(doPreview ? bold : notBold);
+  }
+}
+
 
 MainWindow::MainWindow(Settings &settings
                        , OrganizerCore &organizerCore
@@ -1770,7 +1819,23 @@ void MainWindow::expandDataTreeItem(QTreeWidgetItem *item)
 
 void MainWindow::activateDataTreeItem(QTreeWidgetItem *item, int column)
 {
-  openDataFile(item);
+  const auto isArchive = item->data(0, Qt::UserRole + 1).toBool();
+  const auto isDirectory = item->data(0, Qt::UserRole + 3).toBool();
+
+  if (isArchive || isDirectory) {
+    return;
+  }
+
+  const QString path = item->data(0, Qt::UserRole).toString();
+  const QFileInfo targetInfo(path);
+
+  const auto tryPreview = m_OrganizerCore.settings().interface().doubleClicksOpenPreviews();
+
+  if (tryPreview && m_PluginContainer.previewGenerator().previewSupported(targetInfo.suffix())) {
+    previewDataFile(item);
+  } else {
+    openDataFile(item);
+  }
 }
 
 bool MainWindow::refreshProfiles(bool selectProfile)
@@ -5287,7 +5352,16 @@ void MainWindow::disableSelectedMods_clicked()
 
 void MainWindow::previewDataFile()
 {
-  QString fileName = QDir::fromNativeSeparators(m_ContextItem->data(0, Qt::UserRole).toString());
+  if (m_ContextItem == nullptr) {
+    return;
+  }
+
+  previewDataFile(m_ContextItem);
+}
+
+void MainWindow::previewDataFile(QTreeWidgetItem* item)
+{
+  QString fileName = QDir::fromNativeSeparators(item->data(0, Qt::UserRole).toString());
   m_OrganizerCore.previewFileWithAlternatives(this, fileName);
 }
 
@@ -5413,6 +5487,7 @@ void MainWindow::on_dataTree_customContextMenuRequested(const QPoint &pos)
     const auto isDirectory = m_ContextItem->data(0, Qt::UserRole + 3).toBool();
 
     QAction* open = nullptr;
+    QAction* preview = nullptr;
 
     if (canRunFile(isArchive, fileName)) {
       open = menu.addAction(tr("&Execute"), this, SLOT(openDataFile()));
@@ -5421,16 +5496,10 @@ void MainWindow::on_dataTree_customContextMenuRequested(const QPoint &pos)
       menu.addAction(tr("Open with &VFS"), this, SLOT(runDataFileHooked()));
     }
 
-    if (open) {
-      auto bold = open->font();
-      bold.setBold(true);
-      open->setFont(bold);
-    }
-
     menu.addAction(tr("&Add as Executable"), this, SLOT(addAsExecutable()));
 
     if (m_PluginContainer.previewGenerator().previewSupported(QFileInfo(fileName).suffix())) {
-      menu.addAction(tr("Preview"), this, SLOT(previewDataFile()));
+      preview = menu.addAction(tr("Preview"), this, SLOT(previewDataFile()));
     }
 
     if (!isArchive && !isDirectory) {
@@ -5449,7 +5518,10 @@ void MainWindow::on_dataTree_customContextMenuRequested(const QPoint &pos)
         menu.addAction(tr("Hide"), this, SLOT(hideFile()));
       }
     }
+
+    setDefaultActivationActionForFile(open, preview);
   }
+
   menu.addAction(tr("Write To File..."), this, SLOT(writeDataToFile()));
   menu.addAction(tr("Refresh"), this, SLOT(on_btnRefreshData_clicked()));
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index f5bab586..98573423 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -444,6 +444,7 @@ private slots:
   void runDataFileHooked();
   void addAsExecutable();
   void previewDataFile();
+  void previewDataFile(QTreeWidgetItem* item);
   void hideFile();
   void unhideFile();
   void openDataOriginExplorer_clicked();
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index daa40cb3..9c7ccc8c 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -12,6 +12,9 @@ using namespace MOBase;
 // checking whether menu items apply to them, just show all of them
 const std::size_t max_small_selection = 50;
 
+// in mainwindow.cpp
+void setDefaultActivationActionForFile(QAction* open, QAction* preview);
+
 
 class ConflictItem
 {
@@ -527,20 +530,43 @@ void ConflictsTab::changeItemsVisibility(QTreeView* tree, bool visible)
   }
 }
 
-void ConflictsTab::openItems(QTreeView* tree)
+void ConflictsTab::activateItems(QTreeView* tree)
 {
+  const auto tryPreview = core().settings().interface().doubleClicksOpenPreviews();
+
   // the menu item is only shown for a single selection, but handle all of them
   // in case this changes
   for_each_in_selection(tree, [&](const ConflictItem* item) {
-    core().processRunner()
-      .setFromFile(parentWidget(), item->fileName())
-      .setWaitForCompletion()
-      .run();
+    const auto path = item->fileName();
+
+    if (tryPreview && canPreviewFile(plugin(), item->isArchive(), path)) {
+      previewItem(item);
+    } else {
+      openItem(item);
+    }
+
+    return true;
+  });
+}
 
+void ConflictsTab::openItems(QTreeView* tree)
+{
+  // the menu item is only shown for a single selection, but handle all of them
+  // in case this changes
+  for_each_in_selection(tree, [&](const ConflictItem* item) {
+    openItem(item);
     return true;
   });
 }
 
+void ConflictsTab::openItem(const ConflictItem* item)
+{
+  core().processRunner()
+    .setFromFile(parentWidget(), item->fileName())
+    .setWaitForCompletion()
+    .run();
+}
+
 void ConflictsTab::runItemsHooked(QTreeView* tree)
 {
   // the menu item is only shown for a single selection, but handle all of them
@@ -560,11 +586,16 @@ void ConflictsTab::previewItems(QTreeView* tree)
   // the menu item is only shown for a single selection, but handle all of them
   // in case this changes
   for_each_in_selection(tree, [&](const ConflictItem* item) {
-    core().previewFileWithAlternatives(parentWidget(), item->fileName());
+    previewItem(item);
     return true;
   });
 }
 
+void ConflictsTab::previewItem(const ConflictItem* item)
+{
+  core().previewFileWithAlternatives(parentWidget(), item->fileName());
+}
+
 void ConflictsTab::exploreItems(QTreeView* tree)
 {
   // the menu item is only shown for a single selection, but handle all of them
@@ -587,10 +618,6 @@ void ConflictsTab::showContextMenu(const QPoint &pos, QTreeView* tree)
       openItems(tree);
     });
 
-    auto bold = actions.open->font();
-    bold.setBold(true);
-    actions.open->setFont(bold);
-
     menu.addAction(actions.open);
   }
 
@@ -654,6 +681,8 @@ void ConflictsTab::showContextMenu(const QPoint &pos, QTreeView* tree)
     menu.addAction(actions.unhide);
   }
 
+  setDefaultActivationActionForFile(actions.open, actions.preview);
+
   if (!menu.isEmpty()) {
     menu.exec(tree->viewport()->mapToGlobal(pos));
   }
@@ -828,15 +857,15 @@ GeneralConflictsTab::GeneralConflictsTab(
 
   QObject::connect(
     ui->overwriteTree, &QTreeView::doubleClicked,
-    [&](auto&&){ m_tab->openItems(ui->overwriteTree); });
+    [&](auto&&){ m_tab->activateItems(ui->overwriteTree); });
 
   QObject::connect(
     ui->overwrittenTree, &QTreeView::doubleClicked,
-    [&](auto&& item){ m_tab->openItems(ui->overwrittenTree); });
+    [&](auto&& item){ m_tab->activateItems(ui->overwrittenTree); });
 
   QObject::connect(
     ui->noConflictTree, &QTreeView::doubleClicked,
-    [&](auto&& item){ m_tab->openItems(ui->noConflictTree); });
+    [&](auto&& item){ m_tab->activateItems(ui->noConflictTree); });
 
   QObject::connect(
     ui->overwriteTree, &QTreeView::customContextMenuRequested,
@@ -1049,7 +1078,7 @@ AdvancedConflictsTab::AdvancedConflictsTab(
 
   QObject::connect(
     ui->conflictsAdvancedList, &QTreeView::activated,
-    [&]{ m_tab->openItems(ui->conflictsAdvancedList); });
+    [&]{ m_tab->activateItems(ui->conflictsAdvancedList); });
 
   QObject::connect(
     ui->conflictsAdvancedList, &QTreeView::customContextMenuRequested,
diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index 8baa62b6..3ac8de23 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -107,11 +107,14 @@ public:
   void restoreState(const Settings& s) override;
   bool canHandleUnmanaged() const override;
 
+  void activateItems(QTreeView* tree);
   void openItems(QTreeView* tree);
   void runItemsHooked(QTreeView* tree);
   void previewItems(QTreeView* tree);
   void exploreItems(QTreeView* tree);
 
+  void openItem(const ConflictItem* item);
+  void previewItem(const ConflictItem* item);
   void changeItemsVisibility(QTreeView* tree, bool visible);
 
   void showContextMenu(const QPoint &pos, QTreeView* tree);
diff --git a/src/modinfodialogfiletree.cpp b/src/modinfodialogfiletree.cpp
index e94b0a4f..d1ae3823 100644
--- a/src/modinfodialogfiletree.cpp
+++ b/src/modinfodialogfiletree.cpp
@@ -14,6 +14,9 @@ namespace shell = MOBase::shell;
 // checking whether menu items apply to them, just show all of them
 const int max_scan_for_context_menu = 50;
 
+// in mainwindow.cpp
+void setDefaultActivationActionForFile(QAction* open, QAction* preview);
+
 FileTreeTab::FileTreeTab(ModInfoDialogTabContext cx)
   : ModInfoDialogTab(std::move(cx)), m_fs(nullptr)
 {
@@ -32,10 +35,6 @@ FileTreeTab::FileTreeTab(ModInfoDialogTabContext cx)
   m_actions.hide = new QAction(tr("&Hide"), ui->filetree);
   m_actions.unhide = new QAction(tr("&Unhide"), ui->filetree);
 
-  auto bold = m_actions.open->font();
-  bold.setBold(true);
-  m_actions.open->setFont(bold);
-
   connect(m_actions.newFolder, &QAction::triggered, [&]{ onCreateDirectory(); });
   connect(m_actions.open, &QAction::triggered, [&]{ onOpen(); });
   connect(m_actions.runHooked, &QAction::triggered, [&]{ onRunHooked(); });
@@ -56,7 +55,7 @@ FileTreeTab::FileTreeTab(ModInfoDialogTabContext cx)
   ui->filetree->setEditTriggers(
     ui->filetree->editTriggers() & (~QAbstractItemView::DoubleClicked));
 
-  connect(ui->filetree, &QTreeView::activated, [&](auto&&){ onOpen(); });
+  connect(ui->filetree, &QTreeView::activated, [&](auto&&){ onActivated(); });
 }
 
 void FileTreeTab::clear()
@@ -145,6 +144,23 @@ void FileTreeTab::onCreateDirectory()
   ui->filetree->edit(newIndex);
 }
 
+void FileTreeTab::onActivated()
+{
+  auto selection = singleSelection();
+  if (!selection.isValid()) {
+    return;
+  }
+
+  const auto path = m_fs->filePath(selection);
+  const auto tryPreview = core().settings().interface().doubleClicksOpenPreviews();
+
+  if (tryPreview && canPreviewFile(plugin(), false, path)) {
+    onPreview();
+  } else {
+    onOpen();
+  }
+}
+
 void FileTreeTab::onOpen()
 {
   auto selection = singleSelection();
@@ -152,8 +168,9 @@ void FileTreeTab::onOpen()
     return;
   }
 
+  const auto path = m_fs->filePath(selection);
   core().processRunner()
-    .setFromFile(parentWidget(), m_fs->filePath(selection))
+    .setFromFile(parentWidget(), path)
     .setWaitForCompletion()
     .run();
 }
@@ -408,7 +425,6 @@ void FileTreeTab::onContextMenu(const QPoint &pos)
     // this is a multiple selection, don't show open or explore actions so users
     // don't open a thousand files
     enableNewFolder = true;
-    enablePreview = true;
     enableDelete = true;
 
     if (selection.size() < max_scan_for_context_menu) {
@@ -446,6 +462,8 @@ void FileTreeTab::onContextMenu(const QPoint &pos)
   menu.addAction(m_actions.preview);
   m_actions.preview->setEnabled(enablePreview);
 
+  setDefaultActivationActionForFile(m_actions.open, m_actions.preview);
+
   menu.addAction(m_actions.explore);
   m_actions.explore->setEnabled(enableExplore);
 
diff --git a/src/modinfodialogfiletree.h b/src/modinfodialogfiletree.h
index 2f2e501c..c3c84ed4 100644
--- a/src/modinfodialogfiletree.h
+++ b/src/modinfodialogfiletree.h
@@ -35,6 +35,7 @@ private:
   Actions m_actions;
 
   void onCreateDirectory();
+  void onActivated();
   void onOpen();
   void onRunHooked();
   void onPreview();
diff --git a/src/settings.cpp b/src/settings.cpp
index e1e5c2da..68dc19d9 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1966,11 +1966,21 @@ bool InterfaceSettings::showChangeGameConfirmation() const
   return get<bool>(m_Settings, "Settings", "show_change_game_confirmation", true);
 }
 
-void InterfaceSettings::setShowChangeGameConfirmation(bool b) const
+void InterfaceSettings::setShowChangeGameConfirmation(bool b)
 {
   set(m_Settings, "Settings", "show_change_game_confirmation", b);
 }
 
+bool InterfaceSettings::doubleClicksOpenPreviews() const
+{
+  return get<bool>(m_Settings, "Settings", "double_click_previews", false);
+}
+
+void InterfaceSettings::setDoubleClicksOpenPreviews(bool b)
+{
+  set(m_Settings, "Settings", "double_click_previews", b);
+}
+
 
 DiagnosticsSettings::DiagnosticsSettings(QSettings& settings)
   : m_Settings(settings)
diff --git a/src/settings.h b/src/settings.h
index 870e0fc4..0e5238b1 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -608,7 +608,12 @@ public:
   // whether to show the confirmation when switching instances
   //
   bool showChangeGameConfirmation() const;
-  void setShowChangeGameConfirmation(bool b) const;
+  void setShowChangeGameConfirmation(bool b);
+
+  // whether double-clicks on files should try to open previews first
+  //
+  bool doubleClicksOpenPreviews() const;
+  void setDoubleClicksOpenPreviews(bool b);
 
 private:
   QSettings& m_Settings;
diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index bc59d635..84ca5731 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -101,6 +101,9 @@
              </item>
              <item row="1" column="1" colspan="2">
               <widget class="LinkLabel" name="label_33">
+               <property name="toolTip">
+                <string>https://www.transifex.com/tannin/mod-organizer/</string>
+               </property>
                <property name="text">
                 <string>&lt;a href=&quot;https://www.transifex.com/tannin/mod-organizer/&quot;&gt;Help translate Mod Organizer&lt;/a&gt;</string>
                </property>
@@ -133,6 +136,16 @@
            </widget>
           </item>
           <item>
+           <widget class="QCheckBox" name="doubleClickPreviews">
+            <property name="toolTip">
+             <string>Whether double-clicking on a file opens the preview window or launches the program associated with it. This applies to the Data tab as well as the Conflicts and Filetree tabs in the mod info window.</string>
+            </property>
+            <property name="text">
+             <string>Open previews on double-click</string>
+            </property>
+           </widget>
+          </item>
+          <item>
            <widget class="QPushButton" name="resetDialogsButton">
             <property name="maximumSize">
              <size>
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index dca4410b..58871cee 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -21,6 +21,7 @@ GeneralSettingsTab::GeneralSettingsTab(Settings& s, SettingsDialog& d)
 
   ui->centerDialogs->setChecked(settings().geometry().centerDialogs());
   ui->changeGameConfirmation->setChecked(settings().interface().showChangeGameConfirmation());
+  ui->doubleClickPreviews->setChecked(settings().interface().doubleClicksOpenPreviews());
   ui->compactBox->setChecked(settings().interface().compactDownloads());
   ui->showMetaBox->setChecked(settings().interface().metaDownloads());
   ui->checkForUpdates->setChecked(settings().checkForUpdates());
@@ -63,6 +64,7 @@ void GeneralSettingsTab::update()
 
   settings().geometry().setCenterDialogs(ui->centerDialogs->isChecked());
   settings().interface().setShowChangeGameConfirmation(ui->changeGameConfirmation->isChecked());
+  settings().interface().setDoubleClicksOpenPreviews(ui->doubleClickPreviews->isChecked());
   settings().interface().setCompactDownloads(ui->compactBox->isChecked());
   settings().interface().setMetaDownloads(ui->showMetaBox->isChecked());
   settings().setCheckForUpdates(ui->checkForUpdates->isChecked());