X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReaderFrame.java;h=e0ef6d72f8a6b75805e3989a46591ae5e7abbbaf;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=9d536a25a3ded1118d5338c499d751c88e442652;hpb=8590da196b2eca1f6d69e157cf7b122f6d5c6ef7;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java index 9d536a2..e0ef6d7 100644 --- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java +++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java @@ -26,15 +26,19 @@ import javax.swing.filechooser.FileNameExtensionFilter; import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.bundles.Config; +import be.nikiroo.fanfix.bundles.StringIdGui; import be.nikiroo.fanfix.bundles.UiConfig; import be.nikiroo.fanfix.data.MetaData; import be.nikiroo.fanfix.data.Story; import be.nikiroo.fanfix.library.BasicLibrary; +import be.nikiroo.fanfix.library.BasicLibrary.Status; import be.nikiroo.fanfix.library.LocalLibrary; import be.nikiroo.fanfix.output.BasicOutput.OutputType; import be.nikiroo.fanfix.reader.BasicReader; import be.nikiroo.fanfix.reader.ui.GuiReaderMainPanel.FrameHelper; -import be.nikiroo.fanfix.reader.ui.GuiReaderMainPanel.StoryRunnable; +import be.nikiroo.fanfix.reader.ui.GuiReaderMainPanel.MetaDataRunnable; +import be.nikiroo.fanfix.searchable.BasicSearchable; +import be.nikiroo.fanfix.supported.SupportType; import be.nikiroo.utils.Progress; import be.nikiroo.utils.Version; import be.nikiroo.utils.ui.ConfigEditor; @@ -76,7 +80,7 @@ class GuiReaderFrame extends JFrame implements FrameHelper { * the type of {@link Story} to load, or NULL for all types */ public GuiReaderFrame(GuiReader reader, String type) { - super(String.format("Fanfix %s Library", Version.getCurrentVersion())); + super(getAppTitle(reader.getLibrary().getLibraryName())); this.reader = reader; @@ -84,25 +88,31 @@ class GuiReaderFrame extends JFrame implements FrameHelper { setSize(800, 600); setLayout(new BorderLayout()); - add(mainPanel); + add(mainPanel, BorderLayout.CENTER); } @Override public JPopupMenu createBookPopup() { + Status status = reader.getLibrary().getStatus(); JPopupMenu popup = new JPopupMenu(); popup.add(createMenuItemOpenBook()); popup.addSeparator(); popup.add(createMenuItemExport()); - popup.add(createMenuItemMoveTo(true)); - popup.add(createMenuItemSetCoverForSource()); - popup.add(createMenuItemSetCoverForAuthor()); + if (status.isWritable()) { + popup.add(createMenuItemMoveTo()); + popup.add(createMenuItemSetCoverForSource()); + popup.add(createMenuItemSetCoverForAuthor()); + } + popup.add(createMenuItemDownloadToCache()); popup.add(createMenuItemClearCache()); - popup.add(createMenuItemRedownload()); - popup.addSeparator(); - popup.add(createMenuItemRename(true)); - popup.add(createMenuItemSetAuthor(true)); - popup.addSeparator(); - popup.add(createMenuItemDelete()); + if (status.isWritable()) { + popup.add(createMenuItemRedownload()); + popup.addSeparator(); + popup.add(createMenuItemRename()); + popup.add(createMenuItemSetAuthor()); + popup.addSeparator(); + popup.add(createMenuItemDelete()); + } popup.addSeparator(); popup.add(createMenuItemProperties()); return popup; @@ -116,27 +126,34 @@ class GuiReaderFrame extends JFrame implements FrameHelper { } @Override - public void createMenu(boolean libOk) { + public void createMenu(Status status) { + invalidate(); + JMenuBar bar = new JMenuBar(); - JMenu file = new JMenu("File"); + JMenu file = new JMenu(GuiReader.trans(StringIdGui.MENU_FILE)); file.setMnemonic(KeyEvent.VK_F); - JMenuItem imprt = new JMenuItem("Import URL...", KeyEvent.VK_U); + JMenuItem imprt = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_FILE_IMPORT_URL), + KeyEvent.VK_U); imprt.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { mainPanel.imprt(true); } }); - JMenuItem imprtF = new JMenuItem("Import File...", KeyEvent.VK_F); + JMenuItem imprtF = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_FILE_IMPORT_FILE), + KeyEvent.VK_F); imprtF.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { mainPanel.imprt(false); } }); - JMenuItem exit = new JMenuItem("Exit", KeyEvent.VK_X); + JMenuItem exit = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_FILE_EXIT), KeyEvent.VK_X); exit.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -147,21 +164,28 @@ class GuiReaderFrame extends JFrame implements FrameHelper { file.add(createMenuItemOpenBook()); file.add(createMenuItemExport()); - file.add(createMenuItemMoveTo(libOk)); - file.addSeparator(); - file.add(imprt); - file.add(imprtF); + if (status.isWritable()) { + file.add(createMenuItemMoveTo()); + file.addSeparator(); + file.add(imprt); + file.add(imprtF); + file.addSeparator(); + file.add(createMenuItemRename()); + file.add(createMenuItemSetAuthor()); + } file.addSeparator(); - file.add(createMenuItemRename(libOk)); - file.add(createMenuItemSetAuthor(libOk)); + file.add(createMenuItemProperties()); file.addSeparator(); file.add(exit); bar.add(file); - JMenu edit = new JMenu("Edit"); + JMenu edit = new JMenu(GuiReader.trans(StringIdGui.MENU_EDIT)); edit.setMnemonic(KeyEvent.VK_E); + edit.add(createMenuItemSetCoverForSource()); + edit.add(createMenuItemSetCoverForAuthor()); + edit.add(createMenuItemDownloadToCache()); edit.add(createMenuItemClearCache()); edit.add(createMenuItemRedownload()); edit.addSeparator(); @@ -169,9 +193,28 @@ class GuiReaderFrame extends JFrame implements FrameHelper { bar.add(edit); - JMenu view = new JMenu("View"); + JMenu search = new JMenu(GuiReader.trans(StringIdGui.MENU_SEARCH)); + search.setMnemonic(KeyEvent.VK_H); + for (final SupportType type : SupportType.values()) { + BasicSearchable searchable = BasicSearchable.getSearchable(type); + if (searchable != null) { + JMenuItem searchItem = new JMenuItem(type.getSourceName()); + searchItem.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + reader.search(type, null, 1, 0, false); + } + }); + search.add(searchItem); + } + } + + bar.add(search); + + JMenu view = new JMenu(GuiReader.trans(StringIdGui.MENU_VIEW)); view.setMnemonic(KeyEvent.VK_V); - JMenuItem vauthors = new JMenuItem("Author"); + JMenuItem vauthors = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_VIEW_AUTHOR)); vauthors.setMnemonic(KeyEvent.VK_A); vauthors.addActionListener(new ActionListener() { @Override @@ -181,7 +224,8 @@ class GuiReaderFrame extends JFrame implements FrameHelper { } }); view.add(vauthors); - JMenuItem vwords = new JMenuItem("Word count"); + JMenuItem vwords = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_VIEW_WCOUNT)); vwords.setMnemonic(KeyEvent.VK_W); vwords.addActionListener(new ActionListener() { @Override @@ -194,24 +238,32 @@ class GuiReaderFrame extends JFrame implements FrameHelper { bar.add(view); Map> groupedSources = new HashMap>(); - if (libOk) { - groupedSources = reader.getLibrary().getSourcesGrouped(); + if (status.isReady()) { + try { + groupedSources = reader.getLibrary().getSourcesGrouped(); + } catch (IOException e) { + error(e.getLocalizedMessage(), "IOException", e); + } } - JMenu sources = new JMenu("Sources"); + JMenu sources = new JMenu(GuiReader.trans(StringIdGui.MENU_SOURCES)); sources.setMnemonic(KeyEvent.VK_S); populateMenuSA(sources, groupedSources, true); bar.add(sources); Map> goupedAuthors = new HashMap>(); - if (libOk) { - goupedAuthors = reader.getLibrary().getAuthorsGrouped(); + if (status.isReady()) { + try { + goupedAuthors = reader.getLibrary().getAuthorsGrouped(); + } catch (IOException e) { + error(e.getLocalizedMessage(), "IOException", e); + } } - JMenu authors = new JMenu("Authors"); + JMenu authors = new JMenu(GuiReader.trans(StringIdGui.MENU_AUTHORS)); authors.setMnemonic(KeyEvent.VK_A); populateMenuSA(authors, goupedAuthors, false); bar.add(authors); - JMenu options = new JMenu("Options"); + JMenu options = new JMenu(GuiReader.trans(StringIdGui.MENU_OPTIONS)); options.setMnemonic(KeyEvent.VK_O); options.add(createMenuItemConfig()); options.add(createMenuItemUiConfig()); @@ -224,20 +276,25 @@ class GuiReaderFrame extends JFrame implements FrameHelper { private void populateMenuSA(JMenu menu, Map> groupedValues, boolean type) { - // "All" and "Listing" special items - JMenuItem item = new JMenuItem("All"); + // "All" and "Listing" special items first + JMenuItem item = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_XXX_ALL_GROUPED)); item.addActionListener(getActionOpenList(type, false)); menu.add(item); - item = new JMenuItem("Listing"); + item = new JMenuItem(GuiReader.trans(StringIdGui.MENU_XXX_ALL_LISTING)); item.addActionListener(getActionOpenList(type, true)); menu.add(item); + menu.addSeparator(); for (final String value : groupedValues.keySet()) { List list = groupedValues.get(value); if (type && list.size() == 1 && list.get(0).isEmpty()) { // leaf item source/type - item = new JMenuItem(value.isEmpty() ? "[unknown]" : value); + item = new JMenuItem( + value.isEmpty() ? GuiReader + .trans(StringIdGui.MENU_AUTHORS_UNKNOWN) + : value); item.addActionListener(getActionOpen(value, type)); menu.add(item); } else { @@ -246,14 +303,18 @@ class GuiReaderFrame extends JFrame implements FrameHelper { // only one group of authors dir = menu; } else { - dir = new JMenu(value.isEmpty() ? "[unknown]" : value); + dir = new JMenu( + value.isEmpty() ? GuiReader + .trans(StringIdGui.MENU_AUTHORS_UNKNOWN) + : value); } for (String sub : list) { // " " instead of "" for the visual height String itemName = sub; if (itemName.isEmpty()) { - itemName = type ? " " : "[unknown]"; + itemName = type ? " " : GuiReader + .trans(StringIdGui.MENU_AUTHORS_UNKNOWN); } String actualValue = value; @@ -301,9 +362,13 @@ class GuiReaderFrame extends JFrame implements FrameHelper { final boolean listMode) { return new ActionListener() { @Override - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent ae) { mainPanel.removeBookPanes(); - mainPanel.addBookPane(type, listMode); + try { + mainPanel.addBookPane(type, listMode); + } catch (IOException e) { + error(e.getLocalizedMessage(), "IOException", e); + } mainPanel.refreshBooks(); } }; @@ -315,7 +380,7 @@ class GuiReaderFrame extends JFrame implements FrameHelper { * @return the item */ private JMenuItem createMenuItemConfig() { - final String title = "Fanfix Configuration"; + final String title = GuiReader.trans(StringIdGui.TITLE_CONFIG); JMenuItem item = new JMenuItem(title); item.setMnemonic(KeyEvent.VK_F); @@ -323,11 +388,10 @@ class GuiReaderFrame extends JFrame implements FrameHelper { @Override public void actionPerformed(ActionEvent e) { ConfigEditor ed = new ConfigEditor( - Config.class, Instance.getConfig(), - "This is where you configure the options of the program."); + Config.class, Instance.getInstance().getConfig(), GuiReader.trans(StringIdGui.SUBTITLE_CONFIG)); JFrame frame = new JFrame(title); frame.add(ed); - frame.setSize(800, 600); + frame.setSize(850, 600); frame.setVisible(true); } }); @@ -341,7 +405,7 @@ class GuiReaderFrame extends JFrame implements FrameHelper { * @return the item */ private JMenuItem createMenuItemUiConfig() { - final String title = "UI Configuration"; + final String title = GuiReader.trans(StringIdGui.TITLE_CONFIG_UI); JMenuItem item = new JMenuItem(title); item.setMnemonic(KeyEvent.VK_U); @@ -349,8 +413,8 @@ class GuiReaderFrame extends JFrame implements FrameHelper { @Override public void actionPerformed(ActionEvent e) { ConfigEditor ed = new ConfigEditor( - UiConfig.class, Instance.getUiConfig(), - "This is where you configure the graphical appearence of the program."); + UiConfig.class, Instance.getInstance().getUiConfig(), + GuiReader.trans(StringIdGui.SUBTITLE_CONFIG_UI)); JFrame frame = new JFrame(title); frame.add(ed); frame.setSize(800, 600); @@ -370,45 +434,41 @@ class GuiReaderFrame extends JFrame implements FrameHelper { final JFileChooser fc = new JFileChooser(); fc.setAcceptAllFileFilterUsed(false); - final Map filters = new HashMap(); + // Add the "ALL" filters first, then the others + final Map otherFilters = new HashMap(); for (OutputType type : OutputType.values()) { String ext = type.getDefaultExtension(false); String desc = type.getDesc(false); if (ext == null || ext.isEmpty()) { - filters.put(createAllFilter(desc), type); + fc.addChoosableFileFilter(createAllFilter(desc)); } else { - filters.put(new FileNameExtensionFilter(desc, ext), type); + otherFilters.put(new FileNameExtensionFilter(desc, ext), type); } } - // First the "ALL" filters, then, the extension filters - for (Entry entry : filters.entrySet()) { - if (!(entry.getKey() instanceof FileNameExtensionFilter)) { - fc.addChoosableFileFilter(entry.getKey()); - } - } - for (Entry entry : filters.entrySet()) { - if (entry.getKey() instanceof FileNameExtensionFilter) { - fc.addChoosableFileFilter(entry.getKey()); - } + for (Entry entry : otherFilters.entrySet()) { + fc.addChoosableFileFilter(entry.getKey()); } // - JMenuItem export = new JMenuItem("Save as...", KeyEvent.VK_S); + JMenuItem export = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_FILE_EXPORT), KeyEvent.VK_S); export.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { final GuiReaderBook selectedBook = mainPanel.getSelectedBook(); if (selectedBook != null) { - fc.showDialog(GuiReaderFrame.this, "Save"); + fc.showDialog(GuiReaderFrame.this, + GuiReader.trans(StringIdGui.TITLE_SAVE)); if (fc.getSelectedFile() != null) { - final OutputType type = filters.get(fc.getFileFilter()); + final OutputType type = otherFilters.get(fc + .getFileFilter()); final String path = fc.getSelectedFile() .getAbsolutePath() + type.getDefaultExtension(false); final Progress pg = new Progress(); - mainPanel.outOfUi(pg, new Runnable() { + mainPanel.outOfUi(pg, false, new Runnable() { @Override public void run() { try { @@ -416,7 +476,7 @@ class GuiReaderFrame extends JFrame implements FrameHelper { selectedBook.getInfo().getMeta() .getLuid(), type, path, pg); } catch (IOException e) { - Instance.getTraceHandler().error(e); + Instance.getInstance().getTraceHandler().error(e); } } }); @@ -457,13 +517,15 @@ class GuiReaderFrame extends JFrame implements FrameHelper { * @return the item */ private JMenuItem createMenuItemClearCache() { - JMenuItem refresh = new JMenuItem("Clear cache", KeyEvent.VK_C); + JMenuItem refresh = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_EDIT_CLEAR_CACHE), + KeyEvent.VK_C); refresh.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { final GuiReaderBook selectedBook = mainPanel.getSelectedBook(); if (selectedBook != null) { - mainPanel.outOfUi(null, new Runnable() { + mainPanel.outOfUi(null, false, new Runnable() { @Override public void run() { reader.clearLocalReaderCache(selectedBook.getInfo() @@ -489,21 +551,22 @@ class GuiReaderFrame extends JFrame implements FrameHelper { /** * Create the "move to" menu item. * - * @param libOk - * the library can be queried - * * @return the item */ - private JMenuItem createMenuItemMoveTo(boolean libOk) { - JMenu changeTo = new JMenu("Move to"); + private JMenuItem createMenuItemMoveTo() { + JMenu changeTo = new JMenu( + GuiReader.trans(StringIdGui.MENU_FILE_MOVE_TO)); changeTo.setMnemonic(KeyEvent.VK_M); Map> groupedSources = new HashMap>(); - if (libOk) { + try { groupedSources = reader.getLibrary().getSourcesGrouped(); + } catch (IOException e) { + error(e.getLocalizedMessage(), "IOException", e); } - JMenuItem item = new JMenuItem("New type..."); + JMenuItem item = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_FILE_MOVE_TO_NEW_TYPE)); item.addActionListener(createMoveAction(ChangeAction.SOURCE, null)); changeTo.add(item); changeTo.addSeparator(); @@ -540,46 +603,54 @@ class GuiReaderFrame extends JFrame implements FrameHelper { /** * Create the "set author" menu item. * - * @param libOk - * the library can be queried - * * @return the item */ - private JMenuItem createMenuItemSetAuthor(boolean libOk) { - JMenu changeTo = new JMenu("Set author"); + private JMenuItem createMenuItemSetAuthor() { + JMenu changeTo = new JMenu( + GuiReader.trans(StringIdGui.MENU_FILE_SET_AUTHOR)); changeTo.setMnemonic(KeyEvent.VK_A); // New author - JMenuItem newItem = new JMenuItem("New author..."); + JMenuItem newItem = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_FILE_MOVE_TO_NEW_AUTHOR)); changeTo.add(newItem); changeTo.addSeparator(); newItem.addActionListener(createMoveAction(ChangeAction.AUTHOR, null)); // Existing authors - if (libOk) { - Map> groupedAuthors = reader.getLibrary() - .getAuthorsGrouped(); - - if (groupedAuthors.size() > 1) { - for (String key : groupedAuthors.keySet()) { - JMenu group = new JMenu(key); - for (String value : groupedAuthors.get(key)) { - JMenuItem item = new JMenuItem( - value.isEmpty() ? "[unknown]" : value); - item.addActionListener(createMoveAction( - ChangeAction.AUTHOR, value)); - group.add(item); - } - changeTo.add(group); - } - } else if (groupedAuthors.size() == 1) { - for (String value : groupedAuthors.values().iterator().next()) { + Map> groupedAuthors; + + try { + groupedAuthors = reader.getLibrary().getAuthorsGrouped(); + } catch (IOException e) { + error(e.getLocalizedMessage(), "IOException", e); + groupedAuthors = new HashMap>(); + + } + + if (groupedAuthors.size() > 1) { + for (String key : groupedAuthors.keySet()) { + JMenu group = new JMenu(key); + for (String value : groupedAuthors.get(key)) { JMenuItem item = new JMenuItem( - value.isEmpty() ? "[unknown]" : value); + value.isEmpty() ? GuiReader + .trans(StringIdGui.MENU_AUTHORS_UNKNOWN) + : value); item.addActionListener(createMoveAction( ChangeAction.AUTHOR, value)); - changeTo.add(item); + group.add(item); } + changeTo.add(group); + } + } else if (groupedAuthors.size() == 1) { + for (String value : groupedAuthors.values().iterator().next()) { + JMenuItem item = new JMenuItem( + value.isEmpty() ? GuiReader + .trans(StringIdGui.MENU_AUTHORS_UNKNOWN) + : value); + item.addActionListener(createMoveAction(ChangeAction.AUTHOR, + value)); + changeTo.add(item); } } @@ -589,14 +660,11 @@ class GuiReaderFrame extends JFrame implements FrameHelper { /** * Create the "rename" menu item. * - * @param libOk - * the library can be queried - * * @return the item */ - private JMenuItem createMenuItemRename( - @SuppressWarnings("unused") boolean libOk) { - JMenuItem changeTo = new JMenuItem("Rename..."); + private JMenuItem createMenuItemRename() { + JMenuItem changeTo = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_FILE_RENAME)); changeTo.setMnemonic(KeyEvent.VK_R); changeTo.addActionListener(createMoveAction(ChangeAction.TITLE, null)); return changeTo; @@ -609,6 +677,16 @@ class GuiReaderFrame extends JFrame implements FrameHelper { public void actionPerformed(ActionEvent e) { final GuiReaderBook selectedBook = mainPanel.getSelectedBook(); if (selectedBook != null) { + boolean refreshRequired = false; + + if (what == ChangeAction.SOURCE) { + refreshRequired = mainPanel.getCurrentType(); + } else if (what == ChangeAction.TITLE) { + refreshRequired = false; + } else if (what == ChangeAction.AUTHOR) { + refreshRequired = !mainPanel.getCurrentType(); + } + String changeTo = type; if (type == null) { MetaData meta = selectedBook.getInfo().getMeta(); @@ -622,9 +700,10 @@ class GuiReaderFrame extends JFrame implements FrameHelper { } Object rep = JOptionPane.showInputDialog( - GuiReaderFrame.this, "Move to:", - "Moving story", JOptionPane.QUESTION_MESSAGE, - null, null, init); + GuiReaderFrame.this, + GuiReader.trans(StringIdGui.SUBTITLE_MOVE_TO), + GuiReader.trans(StringIdGui.TITLE_MOVE_TO), + JOptionPane.QUESTION_MESSAGE, null, null, init); if (rep == null) { return; @@ -634,7 +713,7 @@ class GuiReaderFrame extends JFrame implements FrameHelper { } final String fChangeTo = changeTo; - mainPanel.outOfUi(null, new Runnable() { + mainPanel.outOfUi(null, refreshRequired, new Runnable() { @Override public void run() { String luid = selectedBook.getInfo().getMeta() @@ -647,12 +726,13 @@ class GuiReaderFrame extends JFrame implements FrameHelper { reader.changeAuthor(luid, fChangeTo); } + mainPanel.getSelectedBook().repaint(); mainPanel.unsetSelectedBook(); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - createMenu(true); + createMenu(reader.getLibrary().getStatus()); } }); } @@ -668,31 +748,53 @@ class GuiReaderFrame extends JFrame implements FrameHelper { * @return the item */ private JMenuItem createMenuItemRedownload() { - JMenuItem refresh = new JMenuItem("Redownload", KeyEvent.VK_R); + JMenuItem refresh = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_EDIT_REDOWNLOAD), + KeyEvent.VK_R); refresh.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { final GuiReaderBook selectedBook = mainPanel.getSelectedBook(); if (selectedBook != null) { final MetaData meta = selectedBook.getInfo().getMeta(); - mainPanel.imprt(meta.getUrl(), new StoryRunnable() { + mainPanel.imprt(meta.getUrl(), new MetaDataRunnable() { @Override - public void run(Story story) { - reader.delete(meta.getLuid()); - mainPanel.unsetSelectedBook(); - MetaData newMeta = story.getMeta(); + public void run(MetaData newMeta) { if (!newMeta.getSource().equals(meta.getSource())) { reader.changeSource(newMeta.getLuid(), meta.getSource()); } } - }, "Removing old copy"); + }, GuiReader.trans(StringIdGui.PROGRESS_CHANGE_SOURCE)); } } }); return refresh; } + + /** + * Create the download to cache menu item. + * + * @return the item + */ + private JMenuItem createMenuItemDownloadToCache() { + JMenuItem refresh = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_EDIT_DOWNLOAD_TO_CACHE), + KeyEvent.VK_T); + refresh.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + final GuiReaderBook selectedBook = mainPanel.getSelectedBook(); + if (selectedBook != null) { + mainPanel.prefetchBook(selectedBook); + } + } + }); + + return refresh; + } + /** * Create the delete menu item. @@ -700,20 +802,32 @@ class GuiReaderFrame extends JFrame implements FrameHelper { * @return the item */ private JMenuItem createMenuItemDelete() { - JMenuItem delete = new JMenuItem("Delete", KeyEvent.VK_D); + JMenuItem delete = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_EDIT_DELETE), KeyEvent.VK_D); delete.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { final GuiReaderBook selectedBook = mainPanel.getSelectedBook(); - if (selectedBook != null) { - mainPanel.outOfUi(null, new Runnable() { - @Override - public void run() { - reader.delete(selectedBook.getInfo().getMeta() - .getLuid()); - mainPanel.unsetSelectedBook(); - } - }); + if (selectedBook != null + && selectedBook.getInfo().getMeta() != null) { + + final MetaData meta = selectedBook.getInfo().getMeta(); + int rep = JOptionPane.showConfirmDialog( + GuiReaderFrame.this, + GuiReader.trans(StringIdGui.SUBTITLE_DELETE, + meta.getLuid(), meta.getTitle()), + GuiReader.trans(StringIdGui.TITLE_DELETE), + JOptionPane.OK_CANCEL_OPTION); + + if (rep == JOptionPane.OK_OPTION) { + mainPanel.outOfUi(null, true, new Runnable() { + @Override + public void run() { + reader.delete(meta.getLuid()); + mainPanel.unsetSelectedBook(); + } + }); + } } } }); @@ -727,17 +841,20 @@ class GuiReaderFrame extends JFrame implements FrameHelper { * @return the item */ private JMenuItem createMenuItemProperties() { - JMenuItem delete = new JMenuItem("Properties", KeyEvent.VK_P); + JMenuItem delete = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_FILE_PROPERTIES), + KeyEvent.VK_P); delete.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { final GuiReaderBook selectedBook = mainPanel.getSelectedBook(); if (selectedBook != null) { - mainPanel.outOfUi(null, new Runnable() { + mainPanel.outOfUi(null, false, new Runnable() { @Override public void run() { - new GuiReaderPropertiesFrame(reader, selectedBook - .getInfo()).setVisible(true); + new GuiReaderPropertiesFrame(reader.getLibrary(), + selectedBook.getInfo().getMeta()) + .setVisible(true); } }); } @@ -748,12 +865,13 @@ class GuiReaderFrame extends JFrame implements FrameHelper { } /** - * Create the open menu item for a book or a source/type (no LUID). + * Create the open menu item for a book, a source/type or an author. * * @return the item */ public JMenuItem createMenuItemOpenBook() { - JMenuItem open = new JMenuItem("Open", KeyEvent.VK_O); + JMenuItem open = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_FILE_OPEN), KeyEvent.VK_O); open.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -761,8 +879,8 @@ class GuiReaderFrame extends JFrame implements FrameHelper { if (selectedBook != null) { if (selectedBook.getInfo().getMeta() == null) { mainPanel.removeBookPanes(); - mainPanel.addBookPane(selectedBook.getInfo().getMeta() - .getSource(), mainPanel.getCurrentType()); + mainPanel.addBookPane(selectedBook.getInfo() + .getMainInfo(), mainPanel.getCurrentType()); mainPanel.refreshBooks(); } else { mainPanel.openBook(selectedBook); @@ -781,10 +899,12 @@ class GuiReaderFrame extends JFrame implements FrameHelper { * @return the item */ private JMenuItem createMenuItemSetCoverForSource() { - JMenuItem open = new JMenuItem("Set as cover for source", KeyEvent.VK_C); + JMenuItem open = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_EDIT_SET_COVER_FOR_SOURCE), + KeyEvent.VK_C); open.addActionListener(new ActionListener() { @Override - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent ae) { final GuiReaderBook selectedBook = mainPanel.getSelectedBook(); if (selectedBook != null) { BasicLibrary lib = reader.getLibrary(); @@ -792,7 +912,11 @@ class GuiReaderFrame extends JFrame implements FrameHelper { String source = selectedBook.getInfo().getMeta() .getSource(); - lib.setSourceCover(source, luid); + try { + lib.setSourceCover(source, luid); + } catch (IOException e) { + error(e.getLocalizedMessage(), "IOException", e); + } GuiReaderBookInfo sourceInfo = GuiReaderBookInfo .fromSource(lib, source); @@ -811,10 +935,12 @@ class GuiReaderFrame extends JFrame implements FrameHelper { * @return the item */ private JMenuItem createMenuItemSetCoverForAuthor() { - JMenuItem open = new JMenuItem("Set as cover for author", KeyEvent.VK_A); + JMenuItem open = new JMenuItem( + GuiReader.trans(StringIdGui.MENU_EDIT_SET_COVER_FOR_AUTHOR), + KeyEvent.VK_A); open.addActionListener(new ActionListener() { @Override - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent ae) { final GuiReaderBook selectedBook = mainPanel.getSelectedBook(); if (selectedBook != null) { BasicLibrary lib = reader.getLibrary(); @@ -822,7 +948,11 @@ class GuiReaderFrame extends JFrame implements FrameHelper { String author = selectedBook.getInfo().getMeta() .getAuthor(); - lib.setAuthorCover(author, luid); + try { + lib.setAuthorCover(author, luid); + } catch (IOException e) { + error(e.getLocalizedMessage(), "IOException", e); + } GuiReaderBookInfo authorInfo = GuiReaderBookInfo .fromAuthor(lib, author); @@ -845,9 +975,9 @@ class GuiReaderFrame extends JFrame implements FrameHelper { * the exception to log if any */ public void error(final String message, final String title, Exception e) { - Instance.getTraceHandler().error(title + ": " + message); + Instance.getInstance().getTraceHandler().error(title + ": " + message); if (e != null) { - Instance.getTraceHandler().error(e); + Instance.getInstance().getTraceHandler().error(e); } SwingUtilities.invokeLater(new Runnable() { @@ -863,4 +993,23 @@ class GuiReaderFrame extends JFrame implements FrameHelper { public GuiReader getReader() { return reader; } + + /** + * Return the title of the application. + * + * @param libraryName + * the name of the associated {@link BasicLibrary}, which can be + * EMPTY + * + * @return the title + */ + static private String getAppTitle(String libraryName) { + if (!libraryName.isEmpty()) { + return GuiReader.trans(StringIdGui.TITLE_LIBRARY_WITH_NAME, Version + .getCurrentVersion().toString(), libraryName); + } + + return GuiReader.trans(StringIdGui.TITLE_LIBRARY, Version + .getCurrentVersion().toString()); + } }