Compare commits
11 Commits
editor_ref
...
main
| Author | SHA1 | Date |
|---|---|---|
 Andrew Lalis
|
5450f69c3b | |
|
Andrew Lalis
|
7735602a2c | |
|
Andrew Lalis
|
cfb70b14e8 | |
|
Andrew Lalis
|
9ae48ec944 | |
|
Andrew Lalis
|
2a9edf125e | |
|
Andrew Lalis
|
605d050783 | |
|
Andrew Lalis
|
e32976fb8b | |
|
Andrew Lalis
|
deb10b1099 | |
|
Andrew Lalis
|
8793202622 | |
|
Andrew Lalis
|
c748662760 | |
|
Andrew Lalis
|
392114e3e6 |
|
|
@ -5,6 +5,11 @@ This application was developed in order to make the production of written books
|
||||||
|
|
||||||
## Using Block Book Binder
|
## Using Block Book Binder
|
||||||
|
|
||||||
To get started, look for the **Releases** section on this page, and find the latest release. Download the executable JAR file and you're ready to go. Simply paste some plain text into the _Source_ panel on the right-hand side, and press the button _Convert to Book_ to process that text into a series of pages which will appear on the left-hand side.
|
To get started, look for the [**Releases**](https://github.com/andrewlalis/BlockBookBinder/releases) section on this page, and find the latest release. Download the executable JAR file, and make sure you have Java version 17 or higher installed to run it.
|
||||||
|
|
||||||
Once you're happy with how the pages are formatted, you can click the _Export_ button to begin exporting pages to your clipboard. Once you give an affirmative response to the confirmation popup that appears, the first page will be loaded into your clipboard. You can then use `CTRL + V` to paste the page into your book. Each time you do, the program will take about a second to load the next page into your clipboard, so that you can paste it without even having to leave your game.
|
Start the program, and you'll be greeted with a window that has **Book Preview** and **Source Text** panels. Enter the text you'd like to work with into the **Source Text** panel. In the top menu under **Book**, you'll find a **Clean Source** button, which will remove extra whitespace from the text to make it more friendly for Minecraft's cramped style. You'll also find **Compile from Source**, which will compile your source text into a book in the **Book Preview** panel.
|
||||||
|
|
||||||
|
Once you're happy with how the pages are formatted, you can click the **Export to Minecraft** button to begin exporting pages to your clipboard.
|
||||||
|
|
||||||
|
## Demo Video on YouTube
|
||||||
|
https://youtu.be/Mu7Hv1na7Sw
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,80 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="32"
|
||||||
|
height="32"
|
||||||
|
viewBox="0 0 8.4666667 8.4666667"
|
||||||
|
version="1.1"
|
||||||
|
id="svg8"
|
||||||
|
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
|
||||||
|
sodipodi:docname="page_first.svg"
|
||||||
|
inkscape:export-filename="D:\Programming\Projects\BlockBookBinder\src\main\resources\images\page_first.png"
|
||||||
|
inkscape:export-xdpi="96"
|
||||||
|
inkscape:export-ydpi="96">
|
||||||
|
<defs
|
||||||
|
id="defs2" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="22.4"
|
||||||
|
inkscape:cx="7.7529167"
|
||||||
|
inkscape:cy="13.546332"
|
||||||
|
inkscape:document-units="mm"
|
||||||
|
inkscape:current-layer="layer1"
|
||||||
|
showgrid="false"
|
||||||
|
units="px"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
inkscape:window-height="1017"
|
||||||
|
inkscape:window-x="-8"
|
||||||
|
inkscape:window-y="-8"
|
||||||
|
inkscape:window-maximized="1" />
|
||||||
|
<metadata
|
||||||
|
id="metadata5">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
inkscape:label="Layer 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"
|
||||||
|
transform="translate(0,-288.53333)">
|
||||||
|
<g
|
||||||
|
id="g823"
|
||||||
|
transform="translate(0.82682292,0.09982333)">
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path815"
|
||||||
|
d="m 6.7794176,289.72688 -5.0921685,2.93996"
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.05833328;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.05833328;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 6.7794176,295.6068 1.6872491,292.66684"
|
||||||
|
id="path817"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
</g>
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path819"
|
||||||
|
d="m 1.1316191,295.70662 4.3e-6,-5.87992"
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.05833328;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.7 KiB |
|
|
@ -0,0 +1,80 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="32"
|
||||||
|
height="32"
|
||||||
|
viewBox="0 0 8.4666667 8.4666667"
|
||||||
|
version="1.1"
|
||||||
|
id="svg8"
|
||||||
|
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
|
||||||
|
sodipodi:docname="page_last.svg"
|
||||||
|
inkscape:export-filename="D:\Programming\Projects\BlockBookBinder\src\main\resources\images\page_last.png"
|
||||||
|
inkscape:export-xdpi="96"
|
||||||
|
inkscape:export-ydpi="96">
|
||||||
|
<defs
|
||||||
|
id="defs2" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="22.4"
|
||||||
|
inkscape:cx="15.007381"
|
||||||
|
inkscape:cy="13.546332"
|
||||||
|
inkscape:document-units="mm"
|
||||||
|
inkscape:current-layer="layer1"
|
||||||
|
showgrid="false"
|
||||||
|
units="px"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
inkscape:window-height="1017"
|
||||||
|
inkscape:window-x="-8"
|
||||||
|
inkscape:window-y="-8"
|
||||||
|
inkscape:window-maximized="1" />
|
||||||
|
<metadata
|
||||||
|
id="metadata5">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title></dc:title>
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
inkscape:label="Layer 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"
|
||||||
|
transform="translate(0,-288.53333)">
|
||||||
|
<g
|
||||||
|
id="g823"
|
||||||
|
transform="matrix(-1,0,0,1,7.9175178,0.09982333)">
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path815"
|
||||||
|
d="m 6.7794176,289.72688 -5.0921685,2.93996"
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.05833328;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.05833328;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="M 6.7794176,295.6068 1.6872491,292.66684"
|
||||||
|
id="path817"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
</g>
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path819"
|
||||||
|
d="m 7.6127216,295.70662 -4.3e-6,-5.87992"
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.05833328;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.7 KiB |
|
|
@ -0,0 +1,71 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="32"
|
||||||
|
height="32"
|
||||||
|
viewBox="0 0 8.4666667 8.4666667"
|
||||||
|
version="1.1"
|
||||||
|
id="svg8"
|
||||||
|
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
|
||||||
|
sodipodi:docname="page_left.svg"
|
||||||
|
inkscape:export-filename="D:\Programming\Projects\BlockBookBinder\src\main\resources\images\page_left.png"
|
||||||
|
inkscape:export-xdpi="96"
|
||||||
|
inkscape:export-ydpi="96">
|
||||||
|
<defs
|
||||||
|
id="defs2" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="22.4"
|
||||||
|
inkscape:cx="7.5743453"
|
||||||
|
inkscape:cy="13.546332"
|
||||||
|
inkscape:document-units="mm"
|
||||||
|
inkscape:current-layer="layer1"
|
||||||
|
showgrid="false"
|
||||||
|
units="px"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
inkscape:window-height="1017"
|
||||||
|
inkscape:window-x="-8"
|
||||||
|
inkscape:window-y="-8"
|
||||||
|
inkscape:window-maximized="1" />
|
||||||
|
<metadata
|
||||||
|
id="metadata5">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
inkscape:label="Layer 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"
|
||||||
|
transform="translate(0,-288.53333)">
|
||||||
|
<path
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.05833328;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="m 6.7794176,289.72688 -5.0921685,2.93996"
|
||||||
|
id="path815"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path817"
|
||||||
|
d="M 6.7794176,295.6068 1.6872491,292.66684"
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.05833328;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.3 KiB |
|
|
@ -0,0 +1,71 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="32"
|
||||||
|
height="32"
|
||||||
|
viewBox="0 0 8.4666667 8.4666667"
|
||||||
|
version="1.1"
|
||||||
|
id="svg8"
|
||||||
|
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
|
||||||
|
sodipodi:docname="page_right.svg"
|
||||||
|
inkscape:export-filename="D:\Programming\Projects\BlockBookBinder\src\main\resources\images\page_right.png"
|
||||||
|
inkscape:export-xdpi="96"
|
||||||
|
inkscape:export-ydpi="96">
|
||||||
|
<defs
|
||||||
|
id="defs2" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="22.4"
|
||||||
|
inkscape:cx="7.5743453"
|
||||||
|
inkscape:cy="13.546332"
|
||||||
|
inkscape:document-units="mm"
|
||||||
|
inkscape:current-layer="layer1"
|
||||||
|
showgrid="false"
|
||||||
|
units="px"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
inkscape:window-height="1017"
|
||||||
|
inkscape:window-x="-8"
|
||||||
|
inkscape:window-y="-8"
|
||||||
|
inkscape:window-maximized="1" />
|
||||||
|
<metadata
|
||||||
|
id="metadata5">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
inkscape:label="Layer 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"
|
||||||
|
transform="translate(0,-288.53333)">
|
||||||
|
<path
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.05833328;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="m 1.6872491,289.72688 5.0921685,2.93996"
|
||||||
|
id="path815"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path817"
|
||||||
|
d="m 1.6872491,295.6068 5.0921685,-2.93996"
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.05833328;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.3 KiB |
17
pom.xml
17
pom.xml
|
|
@ -6,11 +6,12 @@
|
||||||
|
|
||||||
<groupId>nl.andrewlalis</groupId>
|
<groupId>nl.andrewlalis</groupId>
|
||||||
<artifactId>BlockBookBinder</artifactId>
|
<artifactId>BlockBookBinder</artifactId>
|
||||||
<version>1.1.0</version>
|
<version>1.3.1</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.source>12</maven.compiler.source>
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
<maven.compiler.target>12</maven.compiler.target>
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
@ -46,7 +47,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
<artifactId>lombok</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
<version>1.18.14</version>
|
<version>1.18.28</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
@ -60,7 +61,13 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.formdev</groupId>
|
<groupId>com.formdev</groupId>
|
||||||
<artifactId>flatlaf</artifactId>
|
<artifactId>flatlaf</artifactId>
|
||||||
<version>1.0-rc3</version>
|
<version>3.1.1</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.maven</groupId>
|
||||||
|
<artifactId>maven-model</artifactId>
|
||||||
|
<version>3.9.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -11,7 +11,7 @@ import javax.swing.*;
|
||||||
public class BlockBookBinder {
|
public class BlockBookBinder {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
SwingUtilities.invokeLater(() -> {
|
SwingUtilities.invokeLater(() -> {
|
||||||
FlatDarkLaf.install();
|
FlatDarkLaf.setup();
|
||||||
var mainFrame = new MainFrame();
|
var mainFrame = new MainFrame();
|
||||||
mainFrame.setupAndShow();
|
mainFrame.setupAndShow();
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
package nl.andrewlalis.blockbookbinder.control;
|
|
||||||
|
|
||||||
import nl.andrewlalis.blockbookbinder.model.build.BookBuilder;
|
|
||||||
import nl.andrewlalis.blockbookbinder.view.book.BookPreviewPanel;
|
|
||||||
import nl.andrewlalis.blockbookbinder.view.SourceTextPanel;
|
|
||||||
|
|
||||||
import java.awt.event.ActionEvent;
|
|
||||||
import java.awt.event.ActionListener;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Action listener that, when activated, converts the text from the source panel
|
|
||||||
* into a formatted book.
|
|
||||||
*/
|
|
||||||
public class ConvertToBookActionListener implements ActionListener {
|
|
||||||
private final SourceTextPanel sourceTextPanel;
|
|
||||||
private final BookPreviewPanel bookPreviewPanel;
|
|
||||||
|
|
||||||
public ConvertToBookActionListener(SourceTextPanel sourceTextPanel, BookPreviewPanel bookPreviewPanel) {
|
|
||||||
this.sourceTextPanel = sourceTextPanel;
|
|
||||||
this.bookPreviewPanel = bookPreviewPanel;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void actionPerformed(ActionEvent e) {
|
|
||||||
this.bookPreviewPanel.setBook(
|
|
||||||
new BookBuilder().build(this.sourceTextPanel.getSourceText())
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
package nl.andrewlalis.blockbookbinder.control;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
|
||||||
import java.awt.event.ActionEvent;
|
|
||||||
|
|
||||||
public class ImportAction extends AbstractAction {
|
|
||||||
public ImportAction(String name) {
|
|
||||||
super(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ImportAction(String name, Icon icon) {
|
|
||||||
super(name, icon);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void actionPerformed(ActionEvent e) {
|
|
||||||
System.out.println("Import!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
package nl.andrewlalis.blockbookbinder.control.export;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
import nl.andrewlalis.blockbookbinder.model.Book;
|
||||||
|
import nl.andrewlalis.blockbookbinder.view.book.BookPreviewPanel;
|
||||||
|
import nl.andrewlalis.blockbookbinder.view.export.ExportToBookDialog;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
import java.awt.event.ActionEvent;
|
||||||
|
|
||||||
|
public class ExportBookToMinecraftAction extends AbstractAction {
|
||||||
|
@Getter
|
||||||
|
private static final ExportBookToMinecraftAction instance = new ExportBookToMinecraftAction();
|
||||||
|
|
||||||
|
public ExportBookToMinecraftAction() {
|
||||||
|
super("Export to Minecraft");
|
||||||
|
this.putValue(SHORT_DESCRIPTION, "Export the current book to Minecraft.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Setter
|
||||||
|
private BookPreviewPanel bookPreviewPanel;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
final Book book = bookPreviewPanel.getBook();
|
||||||
|
if (book == null || book.getPageCount() == 0) {
|
||||||
|
JOptionPane.showMessageDialog(
|
||||||
|
this.bookPreviewPanel.getRootPane(),
|
||||||
|
"Cannot export an empty book.\nChoose \"Compile to Source\" first, and then export.",
|
||||||
|
"Empty Book",
|
||||||
|
JOptionPane.WARNING_MESSAGE
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ExportToBookDialog dialog = new ExportToBookDialog(SwingUtilities.getWindowAncestor(this.bookPreviewPanel), bookPreviewPanel.getBook());
|
||||||
|
dialog.setupAndShow();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -5,7 +5,7 @@ import org.jnativehook.keyboard.NativeKeyListener;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Native key listener that's used during the export process, to detect when the
|
* Native key listener that's used during the export process, to detect when the
|
||||||
* user performs certain key actions outside of the focus of this program.
|
* user performs certain key actions outside the focus of this program.
|
||||||
*/
|
*/
|
||||||
public class ExporterKeyListener implements NativeKeyListener {
|
public class ExporterKeyListener implements NativeKeyListener {
|
||||||
private final BookExporter exporterRunnable;
|
private final BookExporter exporterRunnable;
|
||||||
|
|
|
||||||
|
|
@ -1,19 +1,22 @@
|
||||||
package nl.andrewlalis.blockbookbinder.control;
|
package nl.andrewlalis.blockbookbinder.control.source;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
import nl.andrewlalis.blockbookbinder.view.SourceTextPanel;
|
import nl.andrewlalis.blockbookbinder.view.SourceTextPanel;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
import java.awt.event.ActionListener;
|
|
||||||
|
|
||||||
/**
|
public class CleanSourceAction extends AbstractAction {
|
||||||
* Listener for an action where the source text is 'cleaned' by removing any
|
@Getter
|
||||||
* trailing whitespace, and removing unnecessary newlines.
|
private final static CleanSourceAction instance = new CleanSourceAction();
|
||||||
*/
|
|
||||||
public class CleanSourceActionListener implements ActionListener {
|
|
||||||
private final SourceTextPanel sourceTextPanel;
|
|
||||||
|
|
||||||
public CleanSourceActionListener(SourceTextPanel sourceTextPanel) {
|
@Setter
|
||||||
this.sourceTextPanel = sourceTextPanel;
|
private SourceTextPanel sourceTextPanel;
|
||||||
|
|
||||||
|
public CleanSourceAction() {
|
||||||
|
super("Clean Source");
|
||||||
|
this.putValue(SHORT_DESCRIPTION, "Clean up the source text.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -21,7 +24,8 @@ public class CleanSourceActionListener implements ActionListener {
|
||||||
final String source = this.sourceTextPanel.getSourceText();
|
final String source = this.sourceTextPanel.getSourceText();
|
||||||
String updated = source.trim()
|
String updated = source.trim()
|
||||||
.replaceAll("(?>\\v)+(\\v)", "\n\n") // Replace large chunks of newline with just two.
|
.replaceAll("(?>\\v)+(\\v)", "\n\n") // Replace large chunks of newline with just two.
|
||||||
.replace(" ", " "); // Remove any double spaces.
|
.replaceAll("\\t", " ") // Replace tabs with single-spaces, for space savings.
|
||||||
|
.replaceAll(" +", " "); // Remove any double spaces.
|
||||||
updated = this.removeNewlineWrapping(updated);
|
updated = this.removeNewlineWrapping(updated);
|
||||||
this.sourceTextPanel.setSourceText(updated);
|
this.sourceTextPanel.setSourceText(updated);
|
||||||
}
|
}
|
||||||
|
|
@ -0,0 +1,48 @@
|
||||||
|
package nl.andrewlalis.blockbookbinder.control.source;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
import nl.andrewlalis.blockbookbinder.model.build.BookBuilder;
|
||||||
|
import nl.andrewlalis.blockbookbinder.util.ApplicationProperties;
|
||||||
|
import nl.andrewlalis.blockbookbinder.view.SourceTextPanel;
|
||||||
|
import nl.andrewlalis.blockbookbinder.view.book.BookPreviewPanel;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.awt.event.ActionEvent;
|
||||||
|
|
||||||
|
public class CompileFromSourceAction extends AbstractAction {
|
||||||
|
@Getter
|
||||||
|
private static final CompileFromSourceAction instance = new CompileFromSourceAction();
|
||||||
|
|
||||||
|
@Setter
|
||||||
|
private SourceTextPanel sourceTextPanel;
|
||||||
|
@Setter
|
||||||
|
private BookPreviewPanel bookPreviewPanel;
|
||||||
|
|
||||||
|
public CompileFromSourceAction() {
|
||||||
|
super("Compile From Source");
|
||||||
|
this.putValue(SHORT_DESCRIPTION, "Compile the current source text into a book.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
String text = this.sourceTextPanel.getSourceText();
|
||||||
|
if (text.isBlank()) {
|
||||||
|
JOptionPane.showMessageDialog(
|
||||||
|
SwingUtilities.getWindowAncestor((Component) e.getSource()),
|
||||||
|
"No source text to compile.\nEnter some text into the \"Source Text\" panel first.",
|
||||||
|
"No Source Text",
|
||||||
|
JOptionPane.WARNING_MESSAGE
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
this.bookPreviewPanel.setBook(
|
||||||
|
new BookBuilder(
|
||||||
|
ApplicationProperties.getIntProp("book.page_max_lines"),
|
||||||
|
ApplicationProperties.getIntProp("book.page_max_chars"),
|
||||||
|
ApplicationProperties.getIntProp("book.page_max_width")
|
||||||
|
).addText(this.sourceTextPanel.getSourceText()).build()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,52 @@
|
||||||
|
package nl.andrewlalis.blockbookbinder.control.source;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
import nl.andrewlalis.blockbookbinder.BlockBookBinder;
|
||||||
|
import nl.andrewlalis.blockbookbinder.view.SourceTextPanel;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
import javax.swing.filechooser.FileNameExtensionFilter;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.awt.event.ActionEvent;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.prefs.Preferences;
|
||||||
|
|
||||||
|
public class ImportSourceAction extends AbstractAction {
|
||||||
|
@Getter
|
||||||
|
private static final ImportSourceAction instance = new ImportSourceAction();
|
||||||
|
|
||||||
|
@Setter
|
||||||
|
private SourceTextPanel sourceTextPanel;
|
||||||
|
|
||||||
|
public ImportSourceAction() {
|
||||||
|
super("Import Source");
|
||||||
|
this.putValue(SHORT_DESCRIPTION, "Import source text from a file.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
Preferences prefs = Preferences.userNodeForPackage(BlockBookBinder.class);
|
||||||
|
String dir = prefs.get("source-import-dir", ".");
|
||||||
|
JFileChooser fileChooser = new JFileChooser(dir);
|
||||||
|
fileChooser.setFileFilter(new FileNameExtensionFilter("Text files", ".txt"));
|
||||||
|
fileChooser.setAcceptAllFileFilterUsed(true);
|
||||||
|
fileChooser.setMultiSelectionEnabled(false);
|
||||||
|
final Component parent = SwingUtilities.getWindowAncestor((Component) e.getSource());
|
||||||
|
int result = fileChooser.showOpenDialog(parent);
|
||||||
|
if (result == JFileChooser.APPROVE_OPTION) {
|
||||||
|
File file = fileChooser.getSelectedFile();
|
||||||
|
try {
|
||||||
|
Path filePath = file.toPath();
|
||||||
|
sourceTextPanel.setSourceText(Files.readString(filePath));
|
||||||
|
prefs.put("source-import-dir", filePath.getParent().toAbsolutePath().toString());
|
||||||
|
} catch (IOException exc) {
|
||||||
|
exc.printStackTrace();
|
||||||
|
JOptionPane.showMessageDialog(parent, "Failed to read file:\n" + exc.getMessage(), "Read Failed", JOptionPane.ERROR_MESSAGE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -17,8 +17,20 @@ public class CharWidthMapper {
|
||||||
this.initCharWidthMap();
|
this.initCharWidthMap();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getWidth(char c) {
|
public static int getWidth(char c) {
|
||||||
return this.charWidthMap.getOrDefault(c, 6);
|
return instance.charWidthMap.getOrDefault(c, 6);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int getWidth(String s) {
|
||||||
|
if (s.length() == 0) return 0;
|
||||||
|
int width = 0;
|
||||||
|
for (int i = 0; i < s.length(); i++) {
|
||||||
|
width += getWidth(s.charAt(i));
|
||||||
|
if (i < s.length() - 1) {
|
||||||
|
width++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return width;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void initCharWidthMap() {
|
private void initCharWidthMap() {
|
||||||
|
|
|
||||||
|
|
@ -3,112 +3,123 @@ package nl.andrewlalis.blockbookbinder.model.build;
|
||||||
import nl.andrewlalis.blockbookbinder.model.Book;
|
import nl.andrewlalis.blockbookbinder.model.Book;
|
||||||
import nl.andrewlalis.blockbookbinder.model.BookPage;
|
import nl.andrewlalis.blockbookbinder.model.BookPage;
|
||||||
import nl.andrewlalis.blockbookbinder.model.CharWidthMapper;
|
import nl.andrewlalis.blockbookbinder.model.CharWidthMapper;
|
||||||
import nl.andrewlalis.blockbookbinder.util.ApplicationProperties;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class BookBuilder {
|
public class BookBuilder {
|
||||||
/**
|
private final int MAX_LINES_PER_PAGE;
|
||||||
* Builds a full book of pages from the given source text.
|
private final int MAX_CHARS_PER_PAGE;
|
||||||
* @param source The source text to convert.
|
private final int MAX_LINE_PIXEL_WIDTH;
|
||||||
* @return A book containing the source text formatted for a minecraft book.
|
|
||||||
*/
|
|
||||||
public Book build(String source) {
|
|
||||||
final int maxLines = ApplicationProperties.getIntProp("book.page_max_lines");
|
|
||||||
List<String> lines = this.convertSourceToLines(source);
|
|
||||||
Book book = new Book();
|
|
||||||
BookPage page = new BookPage();
|
|
||||||
int currentPageLineCount = 0;
|
|
||||||
|
|
||||||
for (String line : lines) {
|
private final List<String> lines;
|
||||||
page.addLine(line);
|
|
||||||
currentPageLineCount++;
|
|
||||||
if (currentPageLineCount == maxLines) {
|
|
||||||
book.addPage(page);
|
|
||||||
page = new BookPage();
|
|
||||||
currentPageLineCount = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (page.hasContent()) {
|
private final StringBuilder lineBuilder;
|
||||||
book.addPage(page);
|
private final StringBuilder wordBuilder;
|
||||||
}
|
|
||||||
|
|
||||||
return book;
|
public BookBuilder(int maxLinesPerPage, int maxCharsPerPage, int maxLinePixelWidth) {
|
||||||
}
|
this.MAX_LINES_PER_PAGE = maxLinesPerPage;
|
||||||
|
this.MAX_CHARS_PER_PAGE = maxCharsPerPage;
|
||||||
|
this.MAX_LINE_PIXEL_WIDTH = maxLinePixelWidth;
|
||||||
|
this.lines = new ArrayList<>();
|
||||||
|
this.lineBuilder = new StringBuilder(64);
|
||||||
|
this.wordBuilder = new StringBuilder(64);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
public BookBuilder addText(String text) {
|
||||||
* Converts the given source string into a formatted list of lines that can
|
int idx = 0;
|
||||||
* be copied to a minecraft book.
|
while (idx < text.length()) {
|
||||||
* @param source The source string.
|
final char c = text.charAt(idx++);
|
||||||
* @return A list of lines.
|
if (c == '\n') {
|
||||||
*/
|
appendLine();
|
||||||
private List<String> convertSourceToLines(String source) {
|
} else if (c == ' ' && lineBuilder.length() == 0) {
|
||||||
List<String> lines = new ArrayList<>();
|
continue; // Skip spaces at the start of lines.
|
||||||
final char[] sourceChars = source.toCharArray();
|
} else if (Character.isWhitespace(c)) {
|
||||||
final int maxLinePixelWidth = ApplicationProperties.getIntProp("book.page_max_width");
|
if (CharWidthMapper.getWidth(lineBuilder.toString() + c) > MAX_LINE_PIXEL_WIDTH) {
|
||||||
int sourceIndex = 0;
|
appendLine();
|
||||||
StringBuilder lineBuilder = new StringBuilder(64);
|
if (c != ' ') {
|
||||||
int linePixelWidth = 0;
|
lineBuilder.append(c);
|
||||||
StringBuilder symbolBuilder = new StringBuilder(64);
|
}
|
||||||
|
} else {
|
||||||
|
lineBuilder.append(c);
|
||||||
|
}
|
||||||
|
} else { // Read a continuous word.
|
||||||
|
String word = readWord(text, idx - 1);
|
||||||
|
idx += word.length() - 1;
|
||||||
|
if (CharWidthMapper.getWidth(lineBuilder + word) <= MAX_LINE_PIXEL_WIDTH) {
|
||||||
|
// Append the word if it'll fit completely.
|
||||||
|
lineBuilder.append(word);
|
||||||
|
} else if (CharWidthMapper.getWidth(word) <= MAX_LINE_PIXEL_WIDTH) {
|
||||||
|
// Go to the next line and put the word there, since it'll fit.
|
||||||
|
appendLine();
|
||||||
|
lineBuilder.append(word);
|
||||||
|
} else {
|
||||||
|
// The word is so large that it doesn't fit on a line on its own.
|
||||||
|
// Find the largest substring of the word that'll fit with a hyphen.
|
||||||
|
int subStringSize = word.length() - 2;
|
||||||
|
while (CharWidthMapper.getWidth(word.substring(0, subStringSize) + "-") > MAX_LINE_PIXEL_WIDTH) {
|
||||||
|
subStringSize--;
|
||||||
|
}
|
||||||
|
appendLine();
|
||||||
|
lineBuilder.append(word, 0, subStringSize).append('-');
|
||||||
|
appendLine();
|
||||||
|
lineBuilder.append(word.substring(subStringSize));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
while (sourceIndex < sourceChars.length) {
|
public Book build() {
|
||||||
final char c = sourceChars[sourceIndex];
|
Book book = new Book();
|
||||||
sourceIndex++;
|
BookPage page = new BookPage();
|
||||||
symbolBuilder.setLength(0);
|
int currentPageLineCount = 0;
|
||||||
symbolBuilder.append(c);
|
int currentPageCharCount = 0;
|
||||||
int symbolWidth = CharWidthMapper.getInstance().getWidth(c);
|
|
||||||
|
|
||||||
// Since there's a 1-pixel gap between characters, add it to the width if this isn't the first char.
|
// Flush anything remaining in lineBuilder to a final line.
|
||||||
if (lineBuilder.length() > 0) {
|
if (lineBuilder.length() > 0) {
|
||||||
symbolWidth++;
|
appendLine();
|
||||||
}
|
}
|
||||||
|
|
||||||
// If we encounter a non-newline whitespace at the beginning of the line, skip it.
|
for (String line : lines) {
|
||||||
if (c == ' ' && lineBuilder.length() == 0) {
|
if (currentPageCharCount + line.length() > MAX_CHARS_PER_PAGE) {
|
||||||
continue;
|
book.addPage(page);
|
||||||
}
|
page = new BookPage();
|
||||||
|
currentPageLineCount = 0;
|
||||||
|
currentPageCharCount = 0;
|
||||||
|
}
|
||||||
|
page.addLine(line);
|
||||||
|
currentPageLineCount++;
|
||||||
|
currentPageCharCount += line.length();
|
||||||
|
if (currentPageLineCount == MAX_LINES_PER_PAGE) {
|
||||||
|
book.addPage(page);
|
||||||
|
page = new BookPage();
|
||||||
|
currentPageLineCount = 0;
|
||||||
|
currentPageCharCount = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (page.hasContent()) {
|
||||||
|
book.addPage(page);
|
||||||
|
}
|
||||||
|
return book;
|
||||||
|
}
|
||||||
|
|
||||||
// If we encounter a newline, immediately skip to a new line.
|
private String readWord(String text, int firstCharIdx) {
|
||||||
if (c == '\n') {
|
wordBuilder.setLength(0);
|
||||||
lines.add(lineBuilder.toString());
|
int idx = firstCharIdx;
|
||||||
lineBuilder.setLength(0);
|
while (idx < text.length()) {
|
||||||
linePixelWidth = 0;
|
char c = text.charAt(idx++);
|
||||||
continue;
|
if (!Character.isWhitespace(c)) {
|
||||||
}
|
wordBuilder.append(c);
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return wordBuilder.toString();
|
||||||
|
}
|
||||||
|
|
||||||
// If we encounter a word, keep accepting characters until we reach the end.
|
private void appendLine() {
|
||||||
if (Character.isLetterOrDigit(c)) {
|
this.lines.add(this.lineBuilder.toString());
|
||||||
while (
|
this.lineBuilder.setLength(0);
|
||||||
sourceIndex < sourceChars.length
|
}
|
||||||
&& Character.isLetterOrDigit(sourceChars[sourceIndex])
|
|
||||||
) {
|
|
||||||
char nextChar = sourceChars[sourceIndex];
|
|
||||||
symbolBuilder.append(nextChar);
|
|
||||||
symbolWidth += 1 + CharWidthMapper.getInstance().getWidth(nextChar);
|
|
||||||
sourceIndex++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final String symbol = symbolBuilder.toString();
|
|
||||||
// Check if we need to go to the next line to fit the symbol.
|
|
||||||
if (linePixelWidth + symbolWidth > maxLinePixelWidth) {
|
|
||||||
lines.add(lineBuilder.toString());
|
|
||||||
lineBuilder.setLength(0);
|
|
||||||
linePixelWidth = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finally, append the symbol.
|
|
||||||
lineBuilder.append(symbol);
|
|
||||||
linePixelWidth += symbolWidth;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Append any remaining text.
|
|
||||||
if (lineBuilder.length() > 0) {
|
|
||||||
lines.add(lineBuilder.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
return lines;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
package nl.andrewlalis.blockbookbinder.util;
|
||||||
|
|
||||||
|
import javax.imageio.ImageIO;
|
||||||
|
import javax.swing.*;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
|
||||||
|
public class IconLoader {
|
||||||
|
|
||||||
|
public static Icon load(String resourceName, int width, int height) {
|
||||||
|
try {
|
||||||
|
InputStream is = IconLoader.class.getClassLoader().getResourceAsStream(resourceName);
|
||||||
|
if (is == null) {
|
||||||
|
throw new IOException("Could not open resource: " + resourceName);
|
||||||
|
}
|
||||||
|
Image img = ImageIO.read(is).getScaledInstance(width, height, Image.SCALE_SMOOTH);
|
||||||
|
return new ImageIcon(img);
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,10 +1,12 @@
|
||||||
package nl.andrewlalis.blockbookbinder.view;
|
package nl.andrewlalis.blockbookbinder.view;
|
||||||
|
|
||||||
import nl.andrewlalis.blockbookbinder.model.Book;
|
import nl.andrewlalis.blockbookbinder.control.export.ExportBookToMinecraftAction;
|
||||||
|
import nl.andrewlalis.blockbookbinder.control.source.CleanSourceAction;
|
||||||
|
import nl.andrewlalis.blockbookbinder.control.source.CompileFromSourceAction;
|
||||||
|
import nl.andrewlalis.blockbookbinder.control.source.ImportSourceAction;
|
||||||
import nl.andrewlalis.blockbookbinder.util.ApplicationProperties;
|
import nl.andrewlalis.blockbookbinder.util.ApplicationProperties;
|
||||||
import nl.andrewlalis.blockbookbinder.view.about.AboutDialog;
|
import nl.andrewlalis.blockbookbinder.view.about.AboutDialog;
|
||||||
import nl.andrewlalis.blockbookbinder.view.book.BookPreviewPanel;
|
import nl.andrewlalis.blockbookbinder.view.book.BookPreviewPanel;
|
||||||
import nl.andrewlalis.blockbookbinder.view.export.ExportToBookDialog;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
|
|
@ -19,7 +21,7 @@ public class MainFrame extends JFrame {
|
||||||
ApplicationProperties.getIntProp("frame.default_width"),
|
ApplicationProperties.getIntProp("frame.default_width"),
|
||||||
ApplicationProperties.getIntProp("frame.default_height")
|
ApplicationProperties.getIntProp("frame.default_height")
|
||||||
));
|
));
|
||||||
this.setTitle(ApplicationProperties.getProp("frame.title"));
|
this.setTitle(ApplicationProperties.getProp("frame.title") + " Version " + ApplicationProperties.getProp("version"));
|
||||||
this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
|
this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
|
||||||
final URL iconUrl = this.getClass().getClassLoader().getResource("images/book_and_quill.png");
|
final URL iconUrl = this.getClass().getClassLoader().getResource("images/book_and_quill.png");
|
||||||
if (iconUrl != null) {
|
if (iconUrl != null) {
|
||||||
|
|
@ -34,15 +36,42 @@ public class MainFrame extends JFrame {
|
||||||
this.setVisible(true);
|
this.setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Container buildContentPane() {
|
||||||
|
JPanel mainPanel = new JPanel(new BorderLayout());
|
||||||
|
JPanel doublePanel = new JPanel(new GridLayout(1, 2));
|
||||||
|
|
||||||
|
BookPreviewPanel bookPreviewPanel = new BookPreviewPanel();
|
||||||
|
doublePanel.add(bookPreviewPanel);
|
||||||
|
CompileFromSourceAction.getInstance().setBookPreviewPanel(bookPreviewPanel);
|
||||||
|
ExportBookToMinecraftAction.getInstance().setBookPreviewPanel(bookPreviewPanel);
|
||||||
|
|
||||||
|
SourceTextPanel sourceTextPanel = new SourceTextPanel();
|
||||||
|
doublePanel.add(sourceTextPanel);
|
||||||
|
CompileFromSourceAction.getInstance().setSourceTextPanel(sourceTextPanel);
|
||||||
|
CleanSourceAction.getInstance().setSourceTextPanel(sourceTextPanel);
|
||||||
|
ImportSourceAction.getInstance().setSourceTextPanel(sourceTextPanel);
|
||||||
|
|
||||||
|
mainPanel.add(doublePanel, BorderLayout.CENTER);
|
||||||
|
|
||||||
|
return mainPanel;
|
||||||
|
}
|
||||||
|
|
||||||
private JMenuBar buildMenuBar() {
|
private JMenuBar buildMenuBar() {
|
||||||
JMenuBar menuBar = new JMenuBar();
|
JMenuBar menuBar = new JMenuBar();
|
||||||
|
|
||||||
JMenu fileMenu = new JMenu("File");
|
JMenu fileMenu = new JMenu("File");
|
||||||
|
fileMenu.add(ImportSourceAction.getInstance());
|
||||||
JMenuItem exitItem = new JMenuItem("Exit");
|
JMenuItem exitItem = new JMenuItem("Exit");
|
||||||
exitItem.addActionListener(e -> this.dispose());
|
exitItem.addActionListener(e -> this.dispose());
|
||||||
fileMenu.add(exitItem);
|
fileMenu.add(exitItem);
|
||||||
menuBar.add(fileMenu);
|
menuBar.add(fileMenu);
|
||||||
|
|
||||||
|
JMenu bookMenu = new JMenu("Book");
|
||||||
|
bookMenu.add(CompileFromSourceAction.getInstance());
|
||||||
|
bookMenu.add(CleanSourceAction.getInstance());
|
||||||
|
bookMenu.add(ExportBookToMinecraftAction.getInstance());
|
||||||
|
menuBar.add(bookMenu);
|
||||||
|
|
||||||
JMenu helpMenu = new JMenu("Help");
|
JMenu helpMenu = new JMenu("Help");
|
||||||
JMenuItem aboutItem = new JMenuItem("About");
|
JMenuItem aboutItem = new JMenuItem("About");
|
||||||
aboutItem.addActionListener(e -> {
|
aboutItem.addActionListener(e -> {
|
||||||
|
|
@ -55,36 +84,6 @@ public class MainFrame extends JFrame {
|
||||||
return menuBar;
|
return menuBar;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Container buildContentPane() {
|
|
||||||
JPanel mainPanel = new JPanel(new BorderLayout());
|
|
||||||
|
|
||||||
JPanel doublePanel = new JPanel(new GridLayout(1, 2));
|
|
||||||
BookPreviewPanel bookPreviewPanel = new BookPreviewPanel();
|
|
||||||
doublePanel.add(bookPreviewPanel);
|
|
||||||
SourceTextPanel sourceTextPanel = new SourceTextPanel(bookPreviewPanel);
|
|
||||||
doublePanel.add(sourceTextPanel);
|
|
||||||
mainPanel.add(doublePanel, BorderLayout.CENTER);
|
|
||||||
|
|
||||||
JPanel bottomPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
|
|
||||||
JButton exportButton = new JButton("Export to Book");
|
|
||||||
JButton cancelExportButton = new JButton("Cancel Export");
|
|
||||||
cancelExportButton.setEnabled(false);
|
|
||||||
exportButton.addActionListener(e -> {
|
|
||||||
final Book book = bookPreviewPanel.getBook();
|
|
||||||
if (book == null || book.getPageCount() == 0) {
|
|
||||||
JOptionPane.showMessageDialog(this, "Cannot export an empty book.", "Empty Book", JOptionPane.WARNING_MESSAGE);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
ExportToBookDialog dialog = new ExportToBookDialog(this, bookPreviewPanel.getBook());
|
|
||||||
dialog.setupAndShow();
|
|
||||||
});
|
|
||||||
bottomPanel.add(exportButton);
|
|
||||||
bottomPanel.add(cancelExportButton);
|
|
||||||
mainPanel.add(bottomPanel, BorderLayout.SOUTH);
|
|
||||||
|
|
||||||
return mainPanel;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void dispose() {
|
public void dispose() {
|
||||||
super.dispose();
|
super.dispose();
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,5 @@
|
||||||
package nl.andrewlalis.blockbookbinder.view;
|
package nl.andrewlalis.blockbookbinder.view;
|
||||||
|
|
||||||
import nl.andrewlalis.blockbookbinder.control.CleanSourceActionListener;
|
|
||||||
import nl.andrewlalis.blockbookbinder.control.ConvertToBookActionListener;
|
|
||||||
import nl.andrewlalis.blockbookbinder.view.book.BookPreviewPanel;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import javax.swing.border.EmptyBorder;
|
import javax.swing.border.EmptyBorder;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
|
|
@ -15,7 +11,7 @@ import java.awt.*;
|
||||||
public class SourceTextPanel extends JPanel {
|
public class SourceTextPanel extends JPanel {
|
||||||
private final JTextArea textArea;
|
private final JTextArea textArea;
|
||||||
|
|
||||||
public SourceTextPanel(BookPreviewPanel bookPreviewPanel) {
|
public SourceTextPanel() {
|
||||||
super(new BorderLayout());
|
super(new BorderLayout());
|
||||||
|
|
||||||
this.add(new JLabel("Source Text"), BorderLayout.NORTH);
|
this.add(new JLabel("Source Text"), BorderLayout.NORTH);
|
||||||
|
|
@ -26,17 +22,6 @@ public class SourceTextPanel extends JPanel {
|
||||||
this.textArea.setLineWrap(true);
|
this.textArea.setLineWrap(true);
|
||||||
JScrollPane scrollWrappedMainTextArea = new JScrollPane(this.textArea, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
|
JScrollPane scrollWrappedMainTextArea = new JScrollPane(this.textArea, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
|
||||||
this.add(scrollWrappedMainTextArea, BorderLayout.CENTER);
|
this.add(scrollWrappedMainTextArea, BorderLayout.CENTER);
|
||||||
|
|
||||||
JPanel rightPanelButtonPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
|
|
||||||
this.add(rightPanelButtonPanel, BorderLayout.SOUTH);
|
|
||||||
|
|
||||||
JButton convertButton = new JButton("Convert to Book");
|
|
||||||
convertButton.addActionListener(new ConvertToBookActionListener(this, bookPreviewPanel));
|
|
||||||
rightPanelButtonPanel.add(convertButton);
|
|
||||||
|
|
||||||
JButton cleanButton = new JButton("Clean");
|
|
||||||
cleanButton.addActionListener(new CleanSourceActionListener(this));
|
|
||||||
rightPanelButtonPanel.add(cleanButton);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getSourceText() {
|
public String getSourceText() {
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ package nl.andrewlalis.blockbookbinder.view.book;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import nl.andrewlalis.blockbookbinder.model.Book;
|
import nl.andrewlalis.blockbookbinder.model.Book;
|
||||||
import nl.andrewlalis.blockbookbinder.model.BookPage;
|
import nl.andrewlalis.blockbookbinder.model.BookPage;
|
||||||
|
import nl.andrewlalis.blockbookbinder.util.IconLoader;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import javax.swing.border.EmptyBorder;
|
import javax.swing.border.EmptyBorder;
|
||||||
|
|
@ -50,13 +51,15 @@ public class BookPreviewPanel extends JPanel {
|
||||||
this.add(previewPageScrollPane, BorderLayout.CENTER);
|
this.add(previewPageScrollPane, BorderLayout.CENTER);
|
||||||
|
|
||||||
JPanel previewButtonPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
|
JPanel previewButtonPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
|
||||||
this.firstPageButton = new JButton("First");
|
this.firstPageButton = new JButton();
|
||||||
|
this.firstPageButton.setIcon(IconLoader.load("images/page_first.png", 16, 16));
|
||||||
this.firstPageButton.addActionListener(e -> {
|
this.firstPageButton.addActionListener(e -> {
|
||||||
this.currentPage = 0;
|
this.currentPage = 0;
|
||||||
displayCurrentPage();
|
displayCurrentPage();
|
||||||
});
|
});
|
||||||
|
|
||||||
this.previousPageButton = new JButton("Previous Page");
|
this.previousPageButton = new JButton();
|
||||||
|
this.previousPageButton.setIcon(IconLoader.load("images/page_left.png", 16, 16));
|
||||||
this.previousPageButton.addActionListener(e -> {
|
this.previousPageButton.addActionListener(e -> {
|
||||||
if (currentPage > 0) {
|
if (currentPage > 0) {
|
||||||
currentPage--;
|
currentPage--;
|
||||||
|
|
@ -64,15 +67,16 @@ public class BookPreviewPanel extends JPanel {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
this.nextPageButton = new JButton("Next Page");
|
this.nextPageButton = new JButton();
|
||||||
|
this.nextPageButton.setIcon(IconLoader.load("images/page_right.png", 16, 16));
|
||||||
this.nextPageButton.addActionListener(e -> {
|
this.nextPageButton.addActionListener(e -> {
|
||||||
if (currentPage < book.getPageCount() - 1) {
|
if (currentPage < book.getPageCount() - 1) {
|
||||||
currentPage++;
|
currentPage++;
|
||||||
displayCurrentPage();
|
displayCurrentPage();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
this.lastPageButton = new JButton();
|
||||||
this.lastPageButton = new JButton("Last");
|
this.lastPageButton.setIcon(IconLoader.load("images/page_last.png", 16, 16));
|
||||||
this.lastPageButton.addActionListener(e -> {
|
this.lastPageButton.addActionListener(e -> {
|
||||||
this.currentPage = Math.max(this.book.getPageCount() - 1, 0);
|
this.currentPage = Math.max(this.book.getPageCount() - 1, 0);
|
||||||
displayCurrentPage();
|
displayCurrentPage();
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ public class ExportToBookDialog extends JDialog {
|
||||||
private Thread exporterThread;
|
private Thread exporterThread;
|
||||||
private BookExporter exporterRunnable;
|
private BookExporter exporterRunnable;
|
||||||
|
|
||||||
public ExportToBookDialog(Frame owner, Book book) {
|
public ExportToBookDialog(Window owner, Book book) {
|
||||||
super(owner, "Export to Book", true);
|
super(owner, "Export to Book");
|
||||||
this.book = book;
|
this.book = book;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -51,25 +51,32 @@ public class ExportToBookDialog extends JDialog {
|
||||||
private Container buildContentPane() {
|
private Container buildContentPane() {
|
||||||
JPanel mainPanel = new JPanel(new BorderLayout());
|
JPanel mainPanel = new JPanel(new BorderLayout());
|
||||||
|
|
||||||
JPanel setupPanel = new JPanel();
|
JPanel setupPanel = new JPanel(new GridBagLayout());
|
||||||
setupPanel.setLayout(new BoxLayout(setupPanel, BoxLayout.PAGE_AXIS));
|
String[] labels = {"", "First Page", "Last Page", "Auto-Paste Delay (Seconds)"};
|
||||||
this.autoCheckbox = new JCheckBox("Auto-paste", true);
|
this.autoCheckbox = new JCheckBox("Auto-paste", true);
|
||||||
this.firstPageSpinner = new JSpinner(new SpinnerNumberModel(1, 1, this.book.getPageCount(), 1));
|
this.firstPageSpinner = new JSpinner(new SpinnerNumberModel(1, 1, this.book.getPageCount(), 1));
|
||||||
JPanel firstPageSpinnerPanel = new JPanel(new BorderLayout());
|
|
||||||
firstPageSpinnerPanel.add(new JLabel("First Page:"), BorderLayout.WEST);
|
|
||||||
firstPageSpinnerPanel.add(this.firstPageSpinner, BorderLayout.CENTER);
|
|
||||||
this.lastPageSpinner = new JSpinner(new SpinnerNumberModel(this.book.getPageCount(), 1, this.book.getPageCount(), 1));
|
this.lastPageSpinner = new JSpinner(new SpinnerNumberModel(this.book.getPageCount(), 1, this.book.getPageCount(), 1));
|
||||||
JPanel lastPageSpinnerPanel = new JPanel(new BorderLayout());
|
|
||||||
lastPageSpinnerPanel.add(new JLabel("Last Page:"), BorderLayout.WEST);
|
|
||||||
lastPageSpinnerPanel.add(this.lastPageSpinner, BorderLayout.CENTER);
|
|
||||||
this.autoPasteDelaySpinner = new JSpinner(new SpinnerNumberModel(0.2, 0.1, 5.0, 0.1));
|
this.autoPasteDelaySpinner = new JSpinner(new SpinnerNumberModel(0.2, 0.1, 5.0, 0.1));
|
||||||
JPanel autoPasteDelaySpinnerPanel = new JPanel(new BorderLayout());
|
|
||||||
autoPasteDelaySpinnerPanel.add(new JLabel("Auto-Paste Delay (s):"), BorderLayout.WEST);
|
JComponent[] fields = {autoCheckbox, firstPageSpinner, lastPageSpinner, autoPasteDelaySpinner};
|
||||||
autoPasteDelaySpinnerPanel.add(this.autoPasteDelaySpinner, BorderLayout.CENTER);
|
GridBagConstraints c = new GridBagConstraints();
|
||||||
setupPanel.add(this.autoCheckbox);
|
c.gridx = 0;
|
||||||
setupPanel.add(firstPageSpinnerPanel);
|
c.gridy = 0;
|
||||||
setupPanel.add(lastPageSpinnerPanel);
|
c.anchor = GridBagConstraints.LINE_START;
|
||||||
setupPanel.add(autoPasteDelaySpinnerPanel);
|
c.weightx = 0.5;
|
||||||
|
c.fill = GridBagConstraints.NONE;
|
||||||
|
c.insets = new Insets(5, 5, 5, 5);
|
||||||
|
for (String label : labels) {
|
||||||
|
setupPanel.add(new JLabel(label), c);
|
||||||
|
c.gridy++;
|
||||||
|
}
|
||||||
|
c.gridx = 1;
|
||||||
|
c.gridy = 0;
|
||||||
|
c.fill = GridBagConstraints.HORIZONTAL;
|
||||||
|
for (JComponent field : fields) {
|
||||||
|
setupPanel.add(field, c);
|
||||||
|
c.gridy++;
|
||||||
|
}
|
||||||
|
|
||||||
this.exportStatusPanel = new ExportStatusPanel();
|
this.exportStatusPanel = new ExportStatusPanel();
|
||||||
|
|
||||||
|
|
@ -191,9 +198,11 @@ public class ExportToBookDialog extends JDialog {
|
||||||
) {
|
) {
|
||||||
JOptionPane.showMessageDialog(
|
JOptionPane.showMessageDialog(
|
||||||
this,
|
this,
|
||||||
"Invalid page range. Please follow the rules below:\n" +
|
"""
|
||||||
"1. First page must be lower or equal to the last page.\n" +
|
Invalid page range. Please follow the rules below:
|
||||||
"2. Number of pages to export cannot exceed 100.\n",
|
1. First page must be lower or equal to the last page.
|
||||||
|
2. Number of pages to export cannot exceed 100.
|
||||||
|
""",
|
||||||
"Invalid Page Range",
|
"Invalid Page Range",
|
||||||
JOptionPane.WARNING_MESSAGE
|
JOptionPane.WARNING_MESSAGE
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
|
version=1.3.1
|
||||||
|
|
||||||
# Settings for the application's GUI.
|
# Settings for the application's GUI.
|
||||||
frame.title=Block Book Binder
|
frame.title=Block Book Binder
|
||||||
frame.default_width=800
|
frame.default_width=800
|
||||||
|
|
@ -17,5 +19,5 @@ about_dialog.source=html/about.html
|
||||||
book.max_pages=100
|
book.max_pages=100
|
||||||
book.page_max_lines=14
|
book.page_max_lines=14
|
||||||
book.page_max_width=113
|
book.page_max_width=113
|
||||||
book.page_max_chars=255
|
book.page_max_chars=700
|
||||||
book.default_char_width=5
|
book.default_char_width=5
|
||||||
|
|
|
||||||
|
|
@ -9,15 +9,15 @@
|
||||||
<h1>About BlockBookBinder</h1>
|
<h1>About BlockBookBinder</h1>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
The <em>BlockBookBinder</em> is a simple application that gives you the power to write books faster than ever before! All you need to do is copy and paste some text into the <em>Source</em> panel on the right-hand side of the application, and click <strong>Convert to Book</strong>. Your text will be transformed so that it can fit onto written books in Minecraft, and you can preview the book in the <em>Book Preview</em> panel on the left-hand side of the application, using the navigation buttons below.
|
The <em>BlockBookBinder</em> is a simple application that gives you the power to write books faster than ever before! All you need to do is copy and paste some text into the <em>Source</em> panel on the right-hand side of the application, and click <strong>Compile from Source</strong>. Your text will be transformed so that it can fit onto written books in Minecraft, and you can preview the book in the <em>Book Preview</em> panel on the left-hand side of the application, using the navigation buttons below.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p><em>
|
<p><em>
|
||||||
Note that your text might benefit from the <strong>Clean</strong> functionality, where extra new-line and other unnecessary whitespace characters are removed so that the text can be better compressed into Minecraft's limited format.
|
Note that your text might benefit from the <strong>Clean Source</strong> functionality, where extra new-line and other unnecessary whitespace characters are removed so that the text can be better compressed into Minecraft's limited format.
|
||||||
</em></p>
|
</em></p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
Once you've prepared a book and you want to actually copy it into Minecraft, click on <strong>Export to Book</strong>. This will open up a popup with a few different buttons:
|
Once you've prepared a book and you want to actually copy it into Minecraft, click on <strong>Export to Minecraft</strong>. This will open up a popup with a few different buttons:
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
|
|
@ -38,6 +38,17 @@
|
||||||
When all pages have been exported, you'll be prompted with a little popup, after which the export popup closes and you have the option to export again, or simply close the application if you're done.
|
When all pages have been exported, you'll be prompted with a little popup, after which the export popup closes and you have the option to export again, or simply close the application if you're done.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<h3>Troubleshooting</h3>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
This program works by hijacking your PC's input system to automatically transfer text to the system's clipboard, and then paste it by pressing <em>CTRL+V</em> for you. Because of the nature of such applications, there's no guarantee that this process will work on every computer. Here are some tips to try and get things working.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<ul>
|
||||||
|
<li>Try to increase the auto-paste delay to 1 second or more, if you notice some pages being skipped during the export process.</li>
|
||||||
|
<li>If the automated approach fails, you can always select and copy each page from the book preview.</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 505 B |
Binary file not shown.
|
After Width: | Height: | Size: 494 B |
Binary file not shown.
|
After Width: | Height: | Size: 515 B |
Binary file not shown.
|
After Width: | Height: | Size: 504 B |
Loading…
Reference in New Issue