diff options
author | sowgro <tpoke.ferrari@gmail.com> | 2024-08-28 21:39:42 -0400 |
---|---|---|
committer | sowgro <tpoke.ferrari@gmail.com> | 2024-08-28 21:39:42 -0400 |
commit | ef00dc1104a15cc33a54a05bc752f9add14f3397 (patch) | |
tree | e709385249315ab198f089abeb54f51756740e69 | |
parent | c3554cb31774afc8bf335b761649b7aacf7128c5 (diff) | |
download | NPEhero-ef00dc1104a15cc33a54a05bc752f9add14f3397.tar.gz NPEhero-ef00dc1104a15cc33a54a05bc752f9add14f3397.tar.bz2 NPEhero-ef00dc1104a15cc33a54a05bc752f9add14f3397.zip |
Various tweaks
- resize logo
- add icon images to repo
- add open folder button in level editor
- add description back to level details
-rwxr-xr-x | README.md | 11 | ||||
-rw-r--r-- | icon.png | bin | 0 -> 7478 bytes | |||
-rw-r--r-- | icon.svg | 83 | ||||
-rwxr-xr-x | src/main/java/net/sowgro/npehero/editor/LevelList.java | 16 | ||||
-rwxr-xr-x | src/main/java/net/sowgro/npehero/gui/LevelDetails.java | 11 | ||||
-rwxr-xr-x | src/main/java/net/sowgro/npehero/levelapi/Levels.java | 2 | ||||
-rwxr-xr-x | src/main/resources/net/sowgro/npehero/style.css | 5 |
7 files changed, 114 insertions, 14 deletions
@@ -11,16 +11,19 @@ Goals: Todo: - [ ] fix reliance on local font -- [ ] Redesign level editor menus - - [ ] remove sidebar new dialog -- [ ] Make scaling of the center box consistent across pages + +bugs to squash + - [ ] Improve errorList and controlEditor - [ ] Click sounds on all buttons in editor - [ ] Fix notesEditor note preview being too small with no notes - [ ] Properly center background image +features to add - [ ] Tweak design of songPlayer -- [ ] Level sharing file format, import and export + - [ ] Redesign level editor menus +- [ ] remove sidebar new dialog +- [ ] Make scaling of the center box consistent across pages # Installation Coming soon. diff --git a/icon.png b/icon.png Binary files differnew file mode 100644 index 0000000..c15f069 --- /dev/null +++ b/icon.png diff --git a/icon.svg b/icon.svg new file mode 100644 index 0000000..7c4e981 --- /dev/null +++ b/icon.svg @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="31.341402mm" + height="31.341402mm" + viewBox="0 0 31.341402 31.341402" + version="1.1" + id="svg1" + inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)" + sodipodi:docname="icon.svg" + inkscape:export-filename="icon.png" + inkscape:export-xdpi="207.46997" + inkscape:export-ydpi="207.46997" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview1" + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="0.25" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="true" + inkscape:deskcolor="#d1d1d1" + inkscape:document-units="mm" + inkscape:zoom="5.7007558" + inkscape:cx="64.114306" + inkscape:cy="59.378092" + inkscape:window-width="1920" + inkscape:window-height="1011" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" /> + <defs + id="defs1" /> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-52.54315,-138.06167)"> + <rect + style="mix-blend-mode:normal;fill:#752f00;fill-opacity:1;stroke:#d45500;stroke-width:2.3;stroke-dasharray:none;stroke-opacity:1" + id="rect4-6-8" + width="29.041403" + height="29.041403" + x="53.69315" + y="139.21167" + ry="4.6385064" /> + <text + xml:space="preserve" + style="font-size:11.2681px;font-family:'RIT Meera New';-inkscape-font-specification:'RIT Meera New';fill:#d45500;stroke-width:0.0939012" + x="-77.942932" + y="-148.06358" + id="text1-0-7-1" + transform="scale(-0.94027392,-1.0635199)"><tspan + sodipodi:role="line" + id="tspan1-6-1-2" + style="font-size:11.2681px;fill:#d45500;stroke-width:0.0939012" + x="-77.942932" + y="-148.06358"><</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.2681px;font-family:'RIT Meera New';-inkscape-font-specification:'RIT Meera New';fill:#d45500;stroke-width:0.0939012" + x="-71.884995" + y="-148.06358" + id="text2-8-15-9" + transform="scale(-0.94027392,-1.0635199)"><tspan + sodipodi:role="line" + id="tspan2-9-9-3" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.2681px;font-family:'RIT Meera New';-inkscape-font-specification:'RIT Meera New';fill:#d45500;stroke-width:0.0939012" + x="-71.884995" + y="-148.06358">></tspan></text> + <path + style="font-size:12.7px;font-family:'Space Mono';-inkscape-font-specification:'Space Mono';fill:#ffffff;stroke-width:0.203;stroke-opacity:0.686275" + d="m 62.333745,153.48656 h 0.1524 v -8.4328 h 1.0668 v 8.89 h -2.1336 l -2.5654,-8.4328 h -0.1524 v 8.4328 h -1.0668 v -8.89 h 2.1336 z m 4.292594,-3.2004 v 3.6576 h -1.0668 v -8.89 h 3.175 q 0.6858,0 1.1938,0.2032 0.508,0.1905 0.8382,0.5207 0.3429,0.3302 0.508,0.7747 0.1778,0.4318 0.1778,0.9144 v 0.381 q 0,0.4826 -0.1778,0.9271 -0.1651,0.4445 -0.508,0.7874 -0.3429,0.3302 -0.8509,0.5334 -0.508,0.1905 -1.1811,0.1905 z m 0,-0.9906 h 1.9812 q 1.778,0 1.778,-1.524 v -0.2286 q 0,-0.6731 -0.4445,-1.0795 -0.4318,-0.4191 -1.3335,-0.4191 h -1.9812 z m 6.819894,-4.2418 h 5.3848 v 0.9906 h -4.318 v 2.9464 h 4.2418 v 0.9906 h -4.2418 v 2.9718 h 4.3942 v 0.9906 h -5.461 z" + id="text3-2-7-9" + aria-label="NPE" /> + </g> +</svg> diff --git a/src/main/java/net/sowgro/npehero/editor/LevelList.java b/src/main/java/net/sowgro/npehero/editor/LevelList.java index 41c824e..d22438e 100755 --- a/src/main/java/net/sowgro/npehero/editor/LevelList.java +++ b/src/main/java/net/sowgro/npehero/editor/LevelList.java @@ -4,6 +4,9 @@ import javafx.beans.property.ReadOnlyStringWrapper; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.*; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.TextField; import javafx.scene.layout.Pane; import net.sowgro.npehero.Driver; import javafx.scene.layout.HBox; @@ -14,7 +17,7 @@ import net.sowgro.npehero.levelapi.Levels; import net.sowgro.npehero.main.Page; import net.sowgro.npehero.main.Sound; -import java.io.FileNotFoundException; +import java.awt.*; import java.io.IOException; import java.nio.file.FileAlreadyExistsException; @@ -110,8 +113,17 @@ public class LevelList extends Page ToggleButton create = new ToggleButton("Create"); + Button viewFolder = new Button("Open Folder"); + viewFolder.setOnAction(_ -> new Thread(() -> { + try { + Desktop.getDesktop().open(Levels.dir); + } catch (IOException ex) { + Driver.setMenu(new ErrorDisplay("Failed to open folder\n"+ex, this)); + } + }).start()); + VBox buttons = new VBox(); - buttons.getChildren().addAll(create, edit, remove, refresh); + buttons.getChildren().addAll(create, edit, remove, refresh, viewFolder); buttons.setSpacing(10); TextField newLevelEntry = new TextField(); diff --git a/src/main/java/net/sowgro/npehero/gui/LevelDetails.java b/src/main/java/net/sowgro/npehero/gui/LevelDetails.java index 844b523..38e8a01 100755 --- a/src/main/java/net/sowgro/npehero/gui/LevelDetails.java +++ b/src/main/java/net/sowgro/npehero/gui/LevelDetails.java @@ -67,16 +67,17 @@ public class LevelDetails extends VBox artist.setText(level.artist); artist.getStyleClass().add("t2"); - Text desc = new Text(); - desc.setText(level.desc); - desc.getStyleClass().add("t3"); - TextFlow titleFlow = new TextFlow(title); titleFlow.setLineSpacing(0); TextFlow artistFlow = new TextFlow(artist); VBox titleArtistDesc = new VBox(titleFlow, artistFlow); if (level.desc != null && !level.desc.isEmpty()) { - + Text desc = new Text(); + desc.setText(level.desc); + desc.getStyleClass().add("t3"); + TextFlow descFlow = new TextFlow(desc); + descFlow.setPadding(new Insets(20, 0, 0, 0)); + titleArtistDesc.getChildren().add(descFlow); } titleArtistDesc.setSpacing(-5); diff --git a/src/main/java/net/sowgro/npehero/levelapi/Levels.java b/src/main/java/net/sowgro/npehero/levelapi/Levels.java index f6251e9..c82c2fa 100755 --- a/src/main/java/net/sowgro/npehero/levelapi/Levels.java +++ b/src/main/java/net/sowgro/npehero/levelapi/Levels.java @@ -20,7 +20,7 @@ public class Levels { public static final ObservableList<Level> list = FXCollections.observableArrayList(); public static final HashMap<String, Exception> problems = new HashMap<>(); - private static final File dir = new File("levels"); + public static final File dir = new File("levels"); /** * Reads contents of the levels folder and creates a level form each subfolder diff --git a/src/main/resources/net/sowgro/npehero/style.css b/src/main/resources/net/sowgro/npehero/style.css index 6985a7f..8fecd98 100755 --- a/src/main/resources/net/sowgro/npehero/style.css +++ b/src/main/resources/net/sowgro/npehero/style.css @@ -1,6 +1,7 @@ @import url('https://fonts.googleapis.com/css2?family=Space+Mono&display=swap'); @import url('https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap'); @import url('https://fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,100..700;1,100..700&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Manrope:wght@200..800&display=swap'); /* global */ @@ -202,13 +203,13 @@ Slider:focused .thumb{ /* text */ .t0 { - -fx-font-size: 125; + -fx-font-size: 100; -fx-fill: black; } .t0e { -fx-fill: #d45500; - -fx-font-size: 250; + -fx-font-size: 200; -fx-font-family: "RIT Meera New"; } |