From c52422247c41a3adbd1eb8698f3e5373c898151b Mon Sep 17 00:00:00 2001
From: Matt Jenkins <matt@majenko.co.uk>
Date: Sat, 8 Feb 2020 19:36:35 +0000
Subject: [PATCH] Added merge book to book context menu

---
 .../uk/co/majenko/audiobookrecorder/config.txt    |  2 +-
 .../audiobookrecorder/AudiobookRecorder.java      | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/resources/uk/co/majenko/audiobookrecorder/config.txt b/resources/uk/co/majenko/audiobookrecorder/config.txt
index 12251dc..b31ef9a 100644
--- a/resources/uk/co/majenko/audiobookrecorder/config.txt
+++ b/resources/uk/co/majenko/audiobookrecorder/config.txt
@@ -1 +1 @@
-version=0.3.9
+version=0.4.0
diff --git a/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java b/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java
index 1d3b206..4845437 100644
--- a/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java
+++ b/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java
@@ -346,7 +346,7 @@ public class AudiobookRecorder extends JFrame implements DocumentListener {
         toolsMerge.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 Debug.trace();
-                mergeBook();
+                mergeBook(getBook());
             }
         });
         
@@ -1854,6 +1854,16 @@ public class AudiobookRecorder extends JFrame implements DocumentListener {
 
                 menu.add(resetBookGaps);
 
+                JMenuObject mergeBookMenu = new JMenuObject("Merge book...", book, new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        Debug.trace();
+                        JMenuObject src = (JMenuObject)(e.getSource());
+                        Book thisBook = (Book)(src.getObject());
+                        mergeBook(thisBook);
+                    }
+                });
+                menu.add(mergeBookMenu);
+
                 menu.addSeparator();
 
                 JMenuObject closeBookMenu = new JMenuObject("Close book", book, new ActionListener() {
@@ -2827,7 +2837,7 @@ public class AudiobookRecorder extends JFrame implements DocumentListener {
         }
     }
 
-    public void mergeBook() {
+    public void mergeBook(Book toBook) {
         Debug.trace();
         OpenBookPanel info = new OpenBookPanel();
         int r = JOptionPane.showConfirmDialog(this, info, "Merge Book", JOptionPane.OK_CANCEL_OPTION);
@@ -2849,7 +2859,6 @@ public class AudiobookRecorder extends JFrame implements DocumentListener {
             }
 
             try {
-                Book toBook = getBook();
                 Book fromBook = new Book(f);
                 mergeAllChapters(fromBook, toBook);
                 bookTreeModel.reload(toBook);