From e8eeea0a321493d270c35f594a8bf392cc95f4df Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Wed, 8 Mar 2017 20:28:13 +0100 Subject: [PATCH] Update nikiroo-utils, add new UI Options menu - nikiroo-utils updated to 1.4.0 (with new R/W bundles and UI configuration controls) - new Options menu in UI to configure the program (minimalist UI for now) --- changelog.md | 4 ++ ...es.jar => nikiroo-utils-1.4.0-sources.jar} | Bin 51339 -> 55389 bytes src/be/nikiroo/fanfix/output/InfoText.java | 8 +-- src/be/nikiroo/fanfix/output/LaTeX.java | 8 +-- .../fanfix/reader/LocalReaderFrame.java | 58 ++++++++++++++++++ .../fanfix/supported/BasicSupport.java | 8 +-- .../nikiroo/fanfix/test/BasicSupportTest.java | 16 ++--- 7 files changed, 82 insertions(+), 20 deletions(-) rename libs/{nikiroo-utils-1.3.6-sources.jar => nikiroo-utils-1.4.0-sources.jar} (63%) diff --git a/changelog.md b/changelog.md index 4fc10590..1aa90a1e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Fanfix +## Version (wip) + +- New Options menu in UI to configure the program (minimalist for now) + ## Version 1.4.1 - Fix UpdateChecker which showed the changes of ALL versions instead of the newer ones only diff --git a/libs/nikiroo-utils-1.3.6-sources.jar b/libs/nikiroo-utils-1.4.0-sources.jar similarity index 63% rename from libs/nikiroo-utils-1.3.6-sources.jar rename to libs/nikiroo-utils-1.4.0-sources.jar index e3d3c8f1f37a5f50e0e4055f076e833098384866..afb2819a856244fcc6d3e1799fe0c0503dc0593b 100644 GIT binary patch delta 16035 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 ed = new ConfigEditor( + Config.class, Instance.getConfig(), + "This is where you configure the options of the program."); + JFrame frame = new JFrame(title); + frame.add(ed); + frame.setSize(800, 600); + frame.setVisible(true); + } + }); + + return item; + } + + /** + * Create the UI Configuration menu item. + * + * @return the item + */ + private JMenuItem createMenuItemUiConfig() { + final String title = "UI Configuration"; + JMenuItem item = new JMenuItem(title); + item.setMnemonic(KeyEvent.VK_U); + + item.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + ConfigEditor ed = new ConfigEditor( + UiConfig.class, Instance.getUiConfig(), + "This is where you configure the graphical appearence of the program."); + JFrame frame = new JFrame(title); + frame.add(ed); + frame.setSize(800, 600); + frame.setVisible(true); + } + }); + + return item; + } + /** * Create the export menu item. * diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java index 97338ba4..0ee12fec 100644 --- a/src/be/nikiroo/fanfix/supported/BasicSupport.java +++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java @@ -156,13 +156,13 @@ public abstract class BasicSupport { private URL currentReferer; // with only one 'r', as in 'HTTP'... // quote chars - private char openQuote = Instance.getTrans().getChar( + private char openQuote = Instance.getTrans().getCharacter( StringId.OPEN_SINGLE_QUOTE); - private char closeQuote = Instance.getTrans().getChar( + private char closeQuote = Instance.getTrans().getCharacter( StringId.CLOSE_SINGLE_QUOTE); - private char openDoubleQuote = Instance.getTrans().getChar( + private char openDoubleQuote = Instance.getTrans().getCharacter( StringId.OPEN_DOUBLE_QUOTE); - private char closeDoubleQuote = Instance.getTrans().getChar( + private char closeDoubleQuote = Instance.getTrans().getCharacter( StringId.CLOSE_DOUBLE_QUOTE); /** diff --git a/src/be/nikiroo/fanfix/test/BasicSupportTest.java b/src/be/nikiroo/fanfix/test/BasicSupportTest.java index 645d042e..40da442c 100644 --- a/src/be/nikiroo/fanfix/test/BasicSupportTest.java +++ b/src/be/nikiroo/fanfix/test/BasicSupportTest.java @@ -23,13 +23,13 @@ import be.nikiroo.utils.test.TestLauncher; public class BasicSupportTest extends TestLauncher { // quote chars - private char openQuote = Instance.getTrans().getChar( + private char openQuote = Instance.getTrans().getCharacter( StringId.OPEN_SINGLE_QUOTE); - private char closeQuote = Instance.getTrans().getChar( + private char closeQuote = Instance.getTrans().getCharacter( StringId.CLOSE_SINGLE_QUOTE); - private char openDoubleQuote = Instance.getTrans().getChar( + private char openDoubleQuote = Instance.getTrans().getCharacter( StringId.OPEN_DOUBLE_QUOTE); - private char closeDoubleQuote = Instance.getTrans().getChar( + private char closeDoubleQuote = Instance.getTrans().getCharacter( StringId.CLOSE_DOUBLE_QUOTE); public BasicSupportTest(String[] args) { @@ -255,10 +255,10 @@ public class BasicSupportTest extends TestLauncher { public void test() throws Exception { BasicSupportEmpty support = new BasicSupportEmpty(); - char openDoubleQuote = Instance.getTrans().getChar( - StringId.OPEN_DOUBLE_QUOTE); - char closeDoubleQuote = Instance.getTrans().getChar( - StringId.CLOSE_DOUBLE_QUOTE); + char openDoubleQuote = Instance.getTrans() + .getCharacter(StringId.OPEN_DOUBLE_QUOTE); + char closeDoubleQuote = Instance.getTrans() + .getCharacter(StringId.CLOSE_DOUBLE_QUOTE); String content = null; Paragraph para = null; -- 2.27.0