From 798c67eaefc6e4e1ccfc6b48800816a3be5277d5 Mon Sep 17 00:00:00 2001 From: Haowei Wen Date: Sun, 29 Aug 2021 00:29:49 +0800 Subject: [PATCH] display HMCL full name only in titlebar --- HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java | 9 ++++++--- .../src/main/java/org/jackhuang/hmcl/ui/Controllers.java | 2 +- .../main/java/org/jackhuang/hmcl/ui/main/MainPage.java | 4 ++-- README.md | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java b/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java index 5ab515bd1..130499ec1 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java @@ -1,6 +1,6 @@ /* * Hello Minecraft! Launcher - * Copyright (C) 2020 huangyuhui and contributors + * Copyright (C) 2021 huangyuhui and contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,10 +29,13 @@ import java.nio.file.Paths; public final class Metadata { private Metadata() {} + public static final String NAME = "HMCL"; + public static final String FULL_NAME = "Hello Minecraft! Launcher"; public static final String VERSION = System.getProperty("hmcl.version.override", JarUtils.thisJar().flatMap(JarUtils::getImplementationVersion).orElse("@develop@")); - public static final String NAME = "Hello Minecraft! Launcher"; + public static final String TITLE = NAME + " " + VERSION; - + public static final String FULL_TITLE = FULL_NAME + " v" + VERSION; + public static final String UPDATE_URL = System.getProperty("hmcl.update_source.override", "https://hmcl.huangyuhui.net/api/update_link"); public static final String CONTACT_URL = "https://hmcl.huangyuhui.net/contact"; public static final String HELP_URL = "https://hmcl.huangyuhui.net/help"; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java index 8ec86ddfb..dd4bcf6ad 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java @@ -192,7 +192,7 @@ public final class Controllers { scene.getStylesheets().setAll(config().getTheme().getStylesheets()); stage.getIcons().add(newImage("/assets/img/icon.png")); - stage.setTitle(Metadata.TITLE); + stage.setTitle(Metadata.FULL_TITLE); stage.initStyle(StageStyle.TRANSPARENT); stage.setScene(scene); } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java index a116ec90a..15038d2ae 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java @@ -1,6 +1,6 @@ /* * Hello Minecraft! Launcher - * Copyright (C) 2020 huangyuhui and contributors + * Copyright (C) 2021 huangyuhui and contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -84,7 +84,7 @@ public final class MainPage extends StackPane implements DecoratorPage { ImageView titleIcon = new ImageView(); titleIcon.setImage(new Image("/assets/img/icon.png", 20, 20, false, false)); - Label titleLabel = new Label(Metadata.TITLE); + Label titleLabel = new Label(Metadata.FULL_TITLE); titleLabel.getStyleClass().add("jfx-decorator-title"); titleNode.getChildren().setAll(titleIcon, titleLabel); diff --git a/README.md b/README.md index 4ae2cab6e..1f5eb5a86 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The software is distributed under [GPL v3](https://www.gnu.org/licenses/gpl-3.0. ### Additional terms under GPLv3 Section 7 1. When you distribute a modified version of the software, you must change the software name or the version number in a reasonable way in order to distinguish it from the original version. \[[under GPLv3, 7(c).](https://github.com/huanghongxun/HMCL/blob/11820e31a85d8989e41d97476712b07e7094b190/LICENSE#L372-L374)\] - The software name and the version number can be edited [here](https://github.com/huanghongxun/HMCL/blob/11820e31a85d8989e41d97476712b07e7094b190/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java#L31-L32). + The software name and the version number can be edited [here](https://github.com/huanghongxun/HMCL/blob/javafx/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java#L32-L34). 2. You must not remove the copyright declaration displayed in the software. \[[under GPLv3, 7(b).](https://github.com/huanghongxun/HMCL/blob/11820e31a85d8989e41d97476712b07e7094b190/LICENSE#L368-L370)\] @@ -27,7 +27,7 @@ Chinese Translation: ### 附加条款（依据 GPLv3 协议第七条） 1. 当你分发本程序的修改版本时，你必须以一种合理的方式修改本程序的名称或版本号，以示其与原始版本不同。\[[依据 GPLv3, 7(c).](https://github.com/huanghongxun/HMCL/blob/11820e31a85d8989e41d97476712b07e7094b190/LICENSE#L372-L374)\] - 本程序的名称及版本号可在[此处](https://github.com/huanghongxun/HMCL/blob/11820e31a85d8989e41d97476712b07e7094b190/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java#L31-L32)修改。 + 本程序的名称及版本号可在[此处](https://github.com/huanghongxun/HMCL/blob/javafx/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java#L32-L34)修改。 2. 你不得移除本程序所显示的版权声明。\[[依据 GPLv3, 7(b).](https://github.com/huanghongxun/HMCL/blob/11820e31a85d8989e41d97476712b07e7094b190/LICENSE#L368-L370)\]