Merge pull request #242 from yermak/development

OGG Conversion fix and chapter edit

src/main/java/uk/yermak/audiobookconverter/MetadataBuilder.java

@@ -94,8 +94,11 @@ public class MetadataBuilder {
             }
 
             metaData.add("track=" + bookInfo.bookNumber() + "/" + bookInfo.totalTracks());
-            FlacPicture picture = FlacPicture.load(getArtWorkFile());
-            metaData.add("metadata_block_picture="+picture.write());
+
+            if (!posters.isEmpty()){
+                FlacPicture picture = FlacPicture.load(posters.get(0).getFileName());
+                metaData.add("metadata_block_picture="+picture.write());
+            }
             metaData.addAll(convertable.getMetaData(bookInfo));
             logger.debug("Saving metadata:" + String.join("\n", metaData));
             FileUtils.writeLines(metaFile, "UTF-8", metaData);

src/main/java/uk/yermak/audiobookconverter/fx/FilesController.java

@@ -323,6 +323,12 @@ public class FilesController {
         }
     }
 
+    public void editChapter(ActionEvent event){
+        if (chaptersMode.get()) {
+            bookStructure.editChapter(event);
+        }
+    }
+
     private void launch(ConversionGroup conversionGroup, Book book, ObservableList<MediaInfo> mediaInfos, ProgressComponent progressComponent, String outputDestination) {
 
         if (book == null) {

src/main/resources/uk/yermak/audiobookconverter/fx/fxml_converter.fxml

@@ -71,6 +71,12 @@
                 </accelerator>
             </MenuItem>
 
+            <MenuItem text="Edit" onAction="#editChapter">
+                <accelerator>
+                    <KeyCodeCombination alt="UP" code="F2" control="DOWN" meta="UP" shift="UP" shortcut="UP"/>
+                </accelerator>
+            </MenuItem>
+            <SeparatorMenuItem/>
             <MenuItem text="Combine" onAction="#combine">
                 <accelerator>
                     <KeyCodeCombination alt="UP" code="PLUS" control="DOWN" meta="UP" shift="UP" shortcut="UP"/>