X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FLocalReaderFrame.java;h=a7c743cf82858e6af475f25cda6e4b1f244880c2;hp=dd9a8f2e4651ccf83c5fa10de6c09dcf660d5fe1;hb=b4dc6ab518ded2dd92e4cbb02ac615b1d57e8e6d;hpb=3d247bc3bb955a9b85686f0db431157cb9dc4a10 diff --git a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java index dd9a8f2..a7c743c 100644 --- a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java +++ b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java @@ -1,6 +1,7 @@ package be.nikiroo.fanfix.reader; import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Desktop; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -21,8 +22,10 @@ import javax.swing.JScrollPane; import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.Main; +import be.nikiroo.fanfix.bundles.UiConfig; import be.nikiroo.fanfix.data.MetaData; import be.nikiroo.fanfix.reader.LocalReaderBook.BookActionListner; +import be.nikiroo.utils.WrapLayout; class LocalReaderFrame extends JFrame { private static final long serialVersionUID = 1L; @@ -31,9 +34,10 @@ class LocalReaderFrame extends JFrame { private List books; private JPanel bookPane; private String type; + private Color color; public LocalReaderFrame(LocalReader reader, String type) { - super("HTML reader"); + super("Fanfix Library"); this.reader = reader; @@ -42,9 +46,29 @@ class LocalReaderFrame extends JFrame { setLayout(new BorderLayout()); books = new ArrayList(); - bookPane = new JPanel(new WrapLayout(WrapLayout.LEADING)); + bookPane = new JPanel(new WrapLayout(WrapLayout.LEADING, 5, 5)); + + color = null; + String bg = Instance.getUiConfig().getString(UiConfig.BACKGROUND_COLOR); + if (bg.startsWith("#") && bg.length() == 7) { + try { + color = new Color(Integer.parseInt(bg.substring(1, 3), 16), + Integer.parseInt(bg.substring(3, 5), 16), + Integer.parseInt(bg.substring(5, 7), 16)); + } catch (NumberFormatException e) { + color = null; // no changes + e.printStackTrace(); + } + } + + if (color != null) { + setBackground(color); + bookPane.setBackground(color); + } - add(new JScrollPane(bookPane), BorderLayout.CENTER); + JScrollPane scroll = new JScrollPane(bookPane); + scroll.getVerticalScrollBar().setUnitIncrement(16); + add(scroll, BorderLayout.CENTER); refreshBooks(type); setJMenuBar(createMenu()); @@ -59,6 +83,10 @@ class LocalReaderFrame extends JFrame { bookPane.removeAll(); for (MetaData meta : stories) { LocalReaderBook book = new LocalReaderBook(meta); + if (color != null) { + book.setBackground(color); + } + books.add(book); final String luid = meta.getLuid(); book.addActionListener(new BookActionListner() { @@ -95,13 +123,18 @@ class LocalReaderFrame extends JFrame { imprt.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { String url = JOptionPane.showInputDialog(LocalReaderFrame.this, - "url?"); - if (Main.imprt(url) != 0) { - JOptionPane.showMessageDialog(LocalReaderFrame.this, - "Cannot import", "Imort error", - JOptionPane.ERROR_MESSAGE); - } else { - refreshBooks(type); + "url of the story to import?\n" + "\n" + + "Note: it will currently make the UI \n" + + "unresponsive until it is downloaded...", + "Importing from URL", JOptionPane.QUESTION_MESSAGE); + if (url != null && !url.isEmpty()) { + if (Main.imprt(url) != 0) { + JOptionPane.showMessageDialog(LocalReaderFrame.this, + "Cannot import: " + url, "Imort error", + JOptionPane.ERROR_MESSAGE); + } else { + refreshBooks(type); + } } } });