Add save diff correctly and format

Murmele · Nov 12, 2023 · e179402 · e179402
1 parent c961a2d
commit e179402
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 24 deletions.
diff --git a/src/dialogs/PatchDialog.cpp b/src/dialogs/PatchDialog.cpp
@@ -21,7 +21,8 @@
 namespace {
 
 QString lastDir() {
-  QString dir = Settings::instance()->value(Setting::Id::PatchLastDir).toString();
+  QString dir =
+      Settings::instance()->value(Setting::Id::PatchLastDir).toString();
 
   if (dir.isEmpty() || !QDir(dir).exists())
     dir = QDir::homePath();
@@ -34,8 +35,9 @@ void saveLastDir(const QString &path) {
     return;
 
   QFileInfo fileInfo(path);
-  Settings::instance()->setValue(
-      Setting::Id::PatchLastDir, fileInfo.isDir() ? path : fileInfo.absolutePath());
+  Settings::instance()->setValue(Setting::Id::PatchLastDir,
+                                 fileInfo.isDir() ? path
+                                                  : fileInfo.absolutePath());
 }
 
 } // namespace
@@ -152,8 +154,8 @@ void SavePatchDialog::setupUI(bool patch) {
   });
 
   if (patch) {
-    Format format =
-        static_cast<Format>(Settings::instance()->value(Setting::Id::PatchFormat).toInt());
+    Format format = static_cast<Format>(
+        Settings::instance()->value(Setting::Id::PatchFormat).toInt());
     switch (format) {
       case Format::Diff:
         diff->setChecked(true);
@@ -199,7 +201,8 @@ SavePatchDialog::SavePatchDialog(const QByteArray &buffer,
 }
 
 void SavePatchDialog::save() const {
-  Settings::instance()->setValue(Setting::Id::PatchFormat, static_cast<int>(mFormat));
+  Settings::instance()->setValue(Setting::Id::PatchFormat,
+                                 static_cast<int>(mFormat));
   saveLastDir(mDir->text());
 
   if (mFormat == Format::Mailbox)

diff --git a/src/ui/FileContextMenu.cpp b/src/ui/FileContextMenu.cpp
@@ -158,24 +158,6 @@ FileContextMenu::FileContextMenu(RepoView *view, const QStringList &files,
     handleUncommittedChanges(index, files);
   } else {
     handleCommits(commits, files);
-
-    // Save Diff
-    QAction *save = addAction(tr("Save Diff"), view, [view, files, diff] {
-      SavePatchDialog *dialog =
-          new SavePatchDialog(diff.toBuffer(files), files, view);
-      dialog->open();
-    });
-    save->setEnabled(false);
-    foreach (const QString &file, files) {
-      int index = diff.indexOf(file);
-      if (index < 0)
-        continue;
-
-      if (diff.status(index) != GIT_DELTA_UNTRACKED) {
-        save->setEnabled(true);
-        break;
-      }
-    }
   }
 
   // TODO: moving this into handleWorkingDirChanges()? Because
@@ -392,6 +374,24 @@ void FileContextMenu::handleUncommittedChanges(const git::Index &index,
       break;
     }
   }
+
+  // Save Diff
+  QAction *save = addAction(tr("Save Diff"), view, [view, files, diff] {
+    SavePatchDialog *dialog =
+        new SavePatchDialog(diff.toBuffer(files), files, view);
+    dialog->open();
+  });
+  save->setEnabled(false);
+  foreach (const QString &file, files) {
+    int index = diff.indexOf(file);
+    if (index < 0)
+      continue;
+
+    if (diff.status(index) != GIT_DELTA_UNTRACKED) {
+      save->setEnabled(true);
+      break;
+    }
+  }
 }
 
 void FileContextMenu::handleCommits(const QList<git::Commit> &commits,
@@ -489,6 +489,14 @@ void FileContextMenu::handleCommits(const QList<git::Commit> &commits,
       break;
     }
   }
+
+  // Save Diff
+  QAction *save = addAction(tr("Save Diff"), view, [view, files, diff] {
+    SavePatchDialog *dialog =
+        new SavePatchDialog(diff.toBuffer(files), files, view);
+    dialog->open();
+  });
+  save->setEnabled(!files.isEmpty());
 }
 
 void FileContextMenu::ignoreFile() {