From ef00dc1104a15cc33a54a05bc752f9add14f3397 Mon Sep 17 00:00:00 2001 From: sowgro Date: Wed, 28 Aug 2024 21:39:42 -0400 Subject: Various tweaks - resize logo - add icon images to repo - add open folder button in level editor - add description back to level details --- README.md | 11 ++- icon.png | Bin 0 -> 7478 bytes icon.svg | 83 +++++++++++++++++++++ .../java/net/sowgro/npehero/editor/LevelList.java | 16 +++- .../java/net/sowgro/npehero/gui/LevelDetails.java | 11 +-- .../java/net/sowgro/npehero/levelapi/Levels.java | 2 +- src/main/resources/net/sowgro/npehero/style.css | 5 +- 7 files changed, 114 insertions(+), 14 deletions(-) create mode 100644 icon.png create mode 100644 icon.svg diff --git a/README.md b/README.md index dd4d27e..accb8db 100755 --- a/README.md +++ b/README.md @@ -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 new file mode 100644 index 0000000..c15f069 Binary files /dev/null and b/icon.png differ diff --git a/icon.svg b/icon.svg new file mode 100644 index 0000000..7c4e981 --- /dev/null +++ b/icon.svg @@ -0,0 +1,83 @@ + + + + + + + + + < + > + + + 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 list = FXCollections.observableArrayList(); public static final HashMap 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"; } -- cgit v1.2.3