Made def IDs optional, settings UI tweaks

Author: LaurensWeyn

.idea/kotlinc.xml

@@ -53,15 +53,16 @@ private void generateText(int width)
         defText.addText(foundDef.getSource().getName(), options.getColor("defReadingCol"), options.getColor("defBackCol"));
 
         //output original form if processed
-        if(!foundForm.getProcessText().equals(""))
+        if(foundForm.getProcess().size() != 0)
         {
             defText.addText(foundForm.toString(), options.getColor("defReadingCol"), options.getColor("defBackCol"));
         }
 
         //output tags
         defText.addText(foundDef.getTagLine(), options.getColor("defTagCol"), options.getColor("defBackCol"));
-
-        defText.addText(String.valueOf(foundDef.getID()), options.getColor("defTagCol"), options.getColor("defBackCol"));
+        //output ID (debug)
+        if(options.getOptionBool("showDefID"))
+            defText.addText(String.valueOf(foundDef.getID()), options.getColor("defTagCol"), options.getColor("defBackCol"));
 
         String[] readings = foundDef.getSpellings();
         for(String reading:readings)

src/language/splitter/FoundDef.java

@@ -113,7 +113,9 @@ public Options()
         options.put("splitterMode", "full");
         options.put("deconMode", "recursive");
         options.put("furiMode", "original");
+
         options.put("hookKeyboard", "false");
+        options.put("showDefID", "false");
 
     }
     public Options(File file)throws IOException

src/options/Options.java

@@ -27,6 +27,7 @@
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
+import javax.swing.border.EmptyBorder;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ComponentAdapter;
@@ -121,6 +122,7 @@ public OptionsUI() throws HeadlessException
             defWindow.add(new NumberOption("defWidth", "Definition popup width", "Determines how wide the definition popup window is."));
             defWindow.add(new ToggleOption("hideDefOnMouseLeave", "Hide definition when mouse leaves the screen", "If unticked, the definition popup will remain visible until you manually close it."));
             defWindow.add(new ToggleOption("showAllKanji", "Show all possible Kanji for a word", "If unticked, only kana readings are shown."));
+            defWindow.add(new ToggleOption("showDefID", "Show definition ID", "Shows the ID code of definitions. Mainly for debug purposes."));
             defWindow.add(new OptionLabel("Theme:", null));
             defWindow.add(new ColourOption("defBackCol", "Background colour", "Colour for overlay background."));
             defWindow.add(new FontOption("defFont", "Font", "Used for definition popup text."));
@@ -168,10 +170,11 @@ public OptionsUI() throws HeadlessException
         }
         menuScroll = new JScrollPane(leftMenu);
         rightOptions = new JPanel();
+        rightOptions.setBorder(new EmptyBorder(3, 3, 3, 3));
         optionScroll = new JScrollPane(rightOptions);
         lowerButtons = new JPanel(new FlowLayout(FlowLayout.RIGHT));
-        optionScroll.getVerticalScrollBar().setUnitIncrement(8);
-        menuScroll.getVerticalScrollBar().setUnitIncrement(8);
+        optionScroll.getVerticalScrollBar().setUnitIncrement(12);
+        menuScroll.getVerticalScrollBar().setUnitIncrement(12);
 
         lowerButtons.add(new JButton(new AbstractAction("Revert changes")
         {

src/options/OptionsUI.java

@@ -19,6 +19,7 @@
 import options.option.UIOption;
 
 import javax.swing.*;
+import javax.swing.border.EmptyBorder;
 import java.util.ArrayList;
 
 /**
@@ -36,6 +37,7 @@ public OptionPage(String name)
         options = new ArrayList<>();
         frame = new JPanel();
         frame.setLayout(new BoxLayout(frame, BoxLayout.Y_AXIS));
+        frame.setBorder(new EmptyBorder(3, 3, 3, 3));
         //frame.setLayout(new FlowLayout(FlowLayout.LEFT));
         frame.add(new JLabel(name));
         this.name = name;