MajenkoProjects/AudiobookRecorder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added merge book to book context menu

Browse Source
This commit is contained in:
Matt Jenkins
2020-02-08 19:36:35 +00:00
parent c9b65cb315
commit c52422247c
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/uk/co/majenko/audiobookrecorder/config.txt
View File

@@ -1 +1 @@
version=0.3.9 version=0.4.0

15
src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java
View File

@@ -346,7 +346,7 @@ public class AudiobookRecorder extends JFrame implements DocumentListener {
toolsMerge.addActionListener(new ActionListener() { toolsMerge.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
Debug.trace(); Debug.trace();
mergeBook(); mergeBook(getBook());
} }
}); });
@@ -1854,6 +1854,16 @@ public class AudiobookRecorder extends JFrame implements DocumentListener {
menu.add(resetBookGaps); 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(); menu.addSeparator();
JMenuObject closeBookMenu = new JMenuObject("Close book", book, new ActionListener() { 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(); Debug.trace();
OpenBookPanel info = new OpenBookPanel(); OpenBookPanel info = new OpenBookPanel();
int r = JOptionPane.showConfirmDialog(this, info, "Merge Book", JOptionPane.OK_CANCEL_OPTION); int r = JOptionPane.showConfirmDialog(this, info, "Merge Book", JOptionPane.OK_CANCEL_OPTION);
@@ -2849,7 +2859,6 @@ public class AudiobookRecorder extends JFrame implements DocumentListener {
} }
try { try {
Book toBook = getBook();
Book fromBook = new Book(f); Book fromBook = new Book(f);
mergeAllChapters(fromBook, toBook); mergeAllChapters(fromBook, toBook);
bookTreeModel.reload(toBook); bookTreeModel.reload(toBook);