Last minute bug fixes and changes

LaurensWeyn · LaurensWeyn · commit 49fc07cbcbe4 · 2017-03-25T21:46:01.000+02:00
diff --git a/preferences/settings.txt b/preferences/settings.txt
@@ -92,4 +92,5 @@ edictSourcePriority = 0
 epwingSourcePriority = -1
 epwingBlacklistMinLines = 10
 epwingStartBlacklist = ・
-resetDefScroll = true
+resetDefScroll = true
+exportDisplay = external
diff --git a/src/options/OptionsUI.java b/src/options/OptionsUI.java
@@ -135,7 +135,7 @@ public OptionsUI() throws HeadlessException
 
         root.add(defs);
         OptionPage xport = new OptionPage("Export");
-            xport.add(new RadioOption("exportDisplay", exportDisplayConfig, "Export counter mode", null));
+            xport.add(new RadioOption("exportDisplay", exportDisplayConfig, "Export counter mode", "Requires restart to apply."));
             xport.add(new OptionLabel("Words:", null));
             xport.add(new ToggleOption("commentOnExport", "Ask for comment when exporting words", "<html>If ticked, you will be prompted for extra information when exporting a word."
                                                    + "<br>If unticked, this field is always left blank"));
diff --git a/src/options/option/RadioOption.java b/src/options/option/RadioOption.java
@@ -30,8 +30,6 @@ public class RadioOption extends UIOption
     JPanel mainPanel;
     ArrayList<ValueHandler> radioButtons;
 
-    static final int height = 150;
-
     public RadioOption(String tag, String configText, String name, String tip)
     {
         super(tag, name, tip);
@@ -64,7 +62,7 @@ public RadioOption(String tag, String configText, String name, String tip)
         //mainPanel.add(colPanel, BorderLayout.WEST);
 
 
-        mainPanel.setMaximumSize(new Dimension(Integer.MAX_VALUE, height));
+        mainPanel.setMaximumSize(new Dimension(Integer.MAX_VALUE, mainPanel.getMinimumSize().height));
     }
     @Override
     public void update()
@@ -105,6 +103,7 @@ public void actionPerformed(ActionEvent e)
                 }
             });
             button.setText(name);
+            button.setToolTipText(tip);
         }
 
         public Component getComponent()
diff --git a/src/options/page/UserDefPage.java b/src/options/page/UserDefPage.java
@@ -129,6 +129,6 @@ public void update()
     @Override
     public String toString()
     {
-        return "edit " + source.getName().toLowerCase() + " dictionary";
+        return /*"edit " + */source.getName().toLowerCase() + " dictionary";
     }
 }
diff --git a/src/ui/TextBlockRenderer.java b/src/ui/TextBlockRenderer.java
@@ -59,7 +59,7 @@ public void render(Graphics g, int x, int y)
         defLines = 0;//will be recounted
         capture = "";//will be recaptured
         g.setColor(new Color(0,0,0,1));
-        g.fillRect(x, y - g.getFontMetrics().getAscent(), width, 1);//let mouse move through 1 pixel space
+        g.fillRect(x, y - g.getFontMetrics().getAscent() + (options.getOptionBool("defsShowUpwards")?1:0), width, 1);//let mouse move through 1 pixel space
         y++;//slight spacer
         if(!options.getOptionBool("defsShowUpwards"))y -= g.getFontMetrics().getHeight();
 
@@ -103,27 +103,27 @@ private int renderLine(TextBlock text, Graphics g, int x, int y)
         int startY = y;
         FontMetrics font = g.getFontMetrics();
         TextStream stream = new TextStream(text.getText());
-        String line = "";
+        StringBuilder line = new StringBuilder();
         Deque<String> lines = new LinkedList<>();
         while(!stream.isDone())
         {
             String nextBit = stream.nextWord();
             if(font.stringWidth(line + nextBit) > width)//too much for this line, wrap over
             {
-                lines.add(line);//add line for rendering
-                line = nextBit.trim();//put word on new line
+                lines.add(line.toString());//add line for rendering
+                line = new StringBuilder(nextBit.trim());//put word on new line
             }
             else
             {
-                line += nextBit;
+                line.append(nextBit);
             }
         }
-        if(!line.equals(""))lines.add(line);//add last line
+        if(!line.toString().equals(""))lines.add(line.toString());//add last line
         //draw lines
         while(!lines.isEmpty())
         {
-            if(displayUpwards)line = lines.pollLast();
-            else line = lines.pollFirst();
+            if(displayUpwards) line = new StringBuilder(lines.pollLast());
+            else line = new StringBuilder(lines.pollFirst());
             //draw line
             defLines++;
             if(startLine <= defLines)
@@ -137,7 +137,7 @@ private int renderLine(TextBlock text, Graphics g, int x, int y)
 
                 //print text
                 g.setColor(text.getTextCol());
-                g.drawString(line, x, y);
+                g.drawString(line.toString(), x, y);
 
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ public class RadioOption extends UIOption`
`30`	`30`	`JPanel mainPanel;`
`31`	`31`	`ArrayList<ValueHandler> radioButtons;`
`32`	`32`
`33`		`- static final int height = 150;`
`34`		`-`
`35`	`33`	`public RadioOption(String tag, String configText, String name, String tip)`
`36`	`34`	`{`
`37`	`35`	`super(tag, name, tip);`
`@@ -64,7 +62,7 @@ public RadioOption(String tag, String configText, String name, String tip)`
`64`	`62`	`//mainPanel.add(colPanel, BorderLayout.WEST);`
`65`	`63`
`66`	`64`
`67`		`- mainPanel.setMaximumSize(new Dimension(Integer.MAX_VALUE, height));`
	`65`	`+ mainPanel.setMaximumSize(new Dimension(Integer.MAX_VALUE, mainPanel.getMinimumSize().height));`
`68`	`66`	`}`
`69`	`67`	`@Override`
`70`	`68`	`public void update()`
`@@ -105,6 +103,7 @@ public void actionPerformed(ActionEvent e)`
`105`	`103`	`}`
`106`	`104`	`});`
`107`	`105`	`button.setText(name);`
	`106`	`+ button.setToolTipText(tip);`
`108`	`107`	`}`
`109`	`108`
`110`	`109`	`public Component getComponent()`
Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,6 @@ public void update()`
`129`	`129`	`@Override`
`130`	`130`	`public String toString()`
`131`	`131`	`{`
`132`		`- return "edit " + source.getName().toLowerCase() + " dictionary";`
	`132`	`+ return /"edit " + /source.getName().toLowerCase() + " dictionary";`
`133`	`133`	`}`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public void render(Graphics g, int x, int y)`
`59`	`59`	`defLines = 0;//will be recounted`
`60`	`60`	`capture = "";//will be recaptured`
`61`	`61`	`g.setColor(new Color(0,0,0,1));`
`62`		`- g.fillRect(x, y - g.getFontMetrics().getAscent(), width, 1);//let mouse move through 1 pixel space`
	`62`	`+ g.fillRect(x, y - g.getFontMetrics().getAscent() + (options.getOptionBool("defsShowUpwards")?1:0), width, 1);//let mouse move through 1 pixel space`
`63`	`63`	`y++;//slight spacer`
`64`	`64`	`if(!options.getOptionBool("defsShowUpwards"))y -= g.getFontMetrics().getHeight();`
`65`	`65`
`@@ -103,27 +103,27 @@ private int renderLine(TextBlock text, Graphics g, int x, int y)`
`103`	`103`	`int startY = y;`
`104`	`104`	`FontMetrics font = g.getFontMetrics();`
`105`	`105`	`TextStream stream = new TextStream(text.getText());`
`106`		`- String line = "";`
	`106`	`+ StringBuilder line = new StringBuilder();`
`107`	`107`	`Deque<String> lines = new LinkedList<>();`
`108`	`108`	`while(!stream.isDone())`
`109`	`109`	`{`
`110`	`110`	`String nextBit = stream.nextWord();`
`111`	`111`	`if(font.stringWidth(line + nextBit) > width)//too much for this line, wrap over`
`112`	`112`	`{`
`113`		`- lines.add(line);//add line for rendering`
`114`		`- line = nextBit.trim();//put word on new line`
	`113`	`+ lines.add(line.toString());//add line for rendering`
	`114`	`+ line = new StringBuilder(nextBit.trim());//put word on new line`
`115`	`115`	`}`
`116`	`116`	`else`
`117`	`117`	`{`
`118`		`- line += nextBit;`
	`118`	`+ line.append(nextBit);`
`119`	`119`	`}`
`120`	`120`	`}`
`121`		`- if(!line.equals(""))lines.add(line);//add last line`
	`121`	`+ if(!line.toString().equals(""))lines.add(line.toString());//add last line`
`122`	`122`	`//draw lines`
`123`	`123`	`while(!lines.isEmpty())`
`124`	`124`	`{`
`125`		`- if(displayUpwards)line = lines.pollLast();`
`126`		`- else line = lines.pollFirst();`
	`125`	`+ if(displayUpwards) line = new StringBuilder(lines.pollLast());`
	`126`	`+ else line = new StringBuilder(lines.pollFirst());`
`127`	`127`	`//draw line`
`128`	`128`	`defLines++;`
`129`	`129`	`if(startLine <= defLines)`
`@@ -137,7 +137,7 @@ private int renderLine(TextBlock text, Graphics g, int x, int y)`
`137`	`137`
`138`	`138`	`//print text`
`139`	`139`	`g.setColor(text.getTextCol());`
`140`		`- g.drawString(line, x, y);`
	`140`	`+ g.drawString(line.toString(), x, y);`
`141`	`141`
`142`	`142`	`}`
`143`	`143`	`}`