From 635351d58d03ffaa8d41d3a2335192c1daa597bc Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Sat, 28 Aug 2021 16:57:33 +0800 Subject: [PATCH] feat: move doc link to help page. --- .../org/jackhuang/hmcl/ui/main/HelpPage.java | 11 ++++++++ .../jackhuang/hmcl/ui/main/SettingsPage.java | 6 ----- .../jackhuang/hmcl/ui/main/SettingsView.java | 26 ------------------- 3 files changed, 11 insertions(+), 32 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/HelpPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/HelpPage.java index 12549d3e0..dd5ad90bf 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/HelpPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/HelpPage.java @@ -21,6 +21,7 @@ import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; import javafx.geometry.Insets; import javafx.scene.layout.VBox; +import org.jackhuang.hmcl.Metadata; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.ui.construct.ComponentList; @@ -31,6 +32,8 @@ import org.jackhuang.hmcl.util.io.HttpRequest; import java.util.Collections; import java.util.List; +import static org.jackhuang.hmcl.util.i18n.I18n.i18n; + public class HelpPage extends SpinnerPane { private final VBox content; @@ -42,6 +45,14 @@ public class HelpPage extends SpinnerPane { content.setFillWidth(true); setContent(content); + IconedTwoLineListItem docPane = new IconedTwoLineListItem(); + docPane.setTitle(i18n("help.doc")); + docPane.setSubtitle(i18n("help.detail")); + docPane.setExternalLink(Metadata.HELP_URL); + ComponentList doc = new ComponentList(); + doc.getContent().setAll(docPane); + content.getChildren().add(doc); + loadHelp(); } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java index 977ba0c43..530c5524e 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java @@ -27,7 +27,6 @@ import javafx.scene.control.ColorPicker; import javafx.scene.control.ToggleGroup; import javafx.scene.paint.Color; import javafx.scene.text.Font; -import org.jackhuang.hmcl.Metadata; import org.jackhuang.hmcl.setting.*; import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.FXUtils; @@ -239,11 +238,6 @@ public final class SettingsPage extends SettingsView { }); } - @Override - protected void onHelp() { - FXUtils.openLink(Metadata.HELP_URL); - } - @Override protected void onSponsor() { FXUtils.openLink("https://hmcl.huangyuhui.net/api/redirect/sponsor"); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java index 467b25abc..af12e5841 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java @@ -158,30 +158,6 @@ public abstract class SettingsView extends StackPane { settingsPane.getContent().add(updatePane); } - { - BorderPane docPane = new BorderPane(); - { - VBox headerLeft = new VBox(); - - Label help = new Label(i18n("help.doc")); - Label helpSubtitle = new Label(i18n("help.detail")); - helpSubtitle.getStyleClass().add("subtitle-label"); - - headerLeft.getChildren().setAll(help, helpSubtitle); - docPane.setLeft(headerLeft); - } - - { - JFXButton btnExternal = new JFXButton(); - btnExternal.setOnMouseClicked(e -> onHelp()); - btnExternal.getStyleClass().add("toggle-icon4"); - btnExternal.setGraphic(SVG.openInNew(Theme.blackFillBinding(), -1, -1)); - - docPane.setRight(btnExternal); - } - settingsPane.getContent().add(docPane); - } - { fileCommonLocation = new MultiFileItem<>(true); fileCommonLocation.setTitle(i18n("launcher.cache_directory")); @@ -470,8 +446,6 @@ public abstract class SettingsView extends StackPane { protected abstract void onUpdate(); - protected abstract void onHelp(); - protected abstract void onExportLogs(); protected abstract void onSponsor();