diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountAdvancedListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountAdvancedListItem.java index 0e0252e18..57d585b4b 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountAdvancedListItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountAdvancedListItem.java @@ -78,6 +78,8 @@ public class AccountAdvancedListItem extends AdvancedListItem { setLeftGraphic(view.getKey()); imageView = view.getValue(); + setActionButtonVisible(false); + setOnScroll(event -> { Account current = account.get(); if (current == null) return; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/LauncherSettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/LauncherSettingsPage.java index a95b50ae9..425b29598 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/LauncherSettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/LauncherSettingsPage.java @@ -20,6 +20,7 @@ package org.jackhuang.hmcl.ui.main; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.scene.layout.BorderPane; +import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Profiles; import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.SVG; @@ -66,11 +67,12 @@ public class LauncherSettingsPage extends BorderPane implements DecoratorPage { { AdvancedListBox sideBar = new AdvancedListBox() .addNavigationDrawerItem(settingsItem -> { - settingsItem.setTitle(i18n("settings.game")); + settingsItem.setTitle(i18n("settings.type.global.manage")); settingsItem.setLeftGraphic(wrap(SVG.gamepad(null, 20, 20))); settingsItem.activeProperty().bind(tab.getSelectionModel().selectedItemProperty().isEqualTo(gameTab)); settingsItem.setOnAction(e -> tab.getSelectionModel().select(gameTab)); }) + .startCategory(i18n("settings.launcher")) .addNavigationDrawerItem(settingsItem -> { settingsItem.setTitle(i18n("settings.launcher")); settingsItem.setLeftGraphic(wrap(SVG.applicationOutline(null, 20, 20))); @@ -114,6 +116,11 @@ public class LauncherSettingsPage extends BorderPane implements DecoratorPage { setCenter(transitionPane); } + public void showGameSettings(Profile profile) { + gameTab.getNode().loadVersion(profile, null); + tab.getSelectionModel().select(gameTab); + } + @Override public ReadOnlyObjectProperty stateProperty() { return state.getReadOnlyProperty(); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java index 3b16ee106..737872b63 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java @@ -182,7 +182,6 @@ public class RootPage extends DecoratorTabPage { .startCategory(i18n("version").toUpperCase()) .add(gameListItem) .add(gameItem) - .startCategory(i18n("launcher").toUpperCase()) .add(launcherSettingsItem); // the root page, with the sidebar in left, navigator in center. diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java index 8190c58fa..9631833f0 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java @@ -226,9 +226,11 @@ public final class Versions { } public static void modifyGlobalSettings(Profile profile) { - VersionSettingsPage page = new VersionSettingsPage(); - page.loadVersion(profile, null); - Controllers.navigate(page); + Controllers.getSettingsPage().showGameSettings(profile); + Controllers.navigate(Controllers.getSettingsPage()); +// VersionSettingsPage page = new VersionSettingsPage(); +// page.loadVersion(profile, null); +// Controllers.navigate(page); } public static void modifyGameSettings(Profile profile, String version) { diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties index d2e5496bd..e6e2944e8 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -493,7 +493,7 @@ settings.game.java_directory=Java 路径 settings.game.java_directory.bit=,%s 位 settings.game.java_directory.choose=选择 Java 路径 settings.game.management=管理 -settings.game.working_directory=运行路径(版本隔离,修改后请自行移动相关游戏文件,如存档模组配置等) +settings.game.working_directory=版本隔离(修改后请自行移动相关游戏文件,如存档模组配置等) settings.game.working_directory.choose=选择运行路径 settings.icon=游戏图标