feat: EULA.
This commit is contained in:
@@ -26,7 +26,6 @@ import javafx.scene.layout.VBox;
|
|||||||
import org.jackhuang.hmcl.Metadata;
|
import org.jackhuang.hmcl.Metadata;
|
||||||
import org.jackhuang.hmcl.ui.construct.ComponentList;
|
import org.jackhuang.hmcl.ui.construct.ComponentList;
|
||||||
import org.jackhuang.hmcl.ui.construct.IconedTwoLineListItem;
|
import org.jackhuang.hmcl.ui.construct.IconedTwoLineListItem;
|
||||||
import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
|
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
@@ -68,6 +67,7 @@ public class AboutPage extends StackPane {
|
|||||||
gamerteam.setTitle("gamerteam");
|
gamerteam.setTitle("gamerteam");
|
||||||
gamerteam.setImage(new Image("/assets/img/gamerteam.jpg", 32, 32, false, true));
|
gamerteam.setImage(new Image("/assets/img/gamerteam.jpg", 32, 32, false, true));
|
||||||
gamerteam.setSubtitle(i18n("about.thanks_to.gamerteam.statement"));
|
gamerteam.setSubtitle(i18n("about.thanks_to.gamerteam.statement"));
|
||||||
|
gamerteam.setExternalLink("http://www.zhaisoul.com/");
|
||||||
|
|
||||||
IconedTwoLineListItem redLnn = new IconedTwoLineListItem();
|
IconedTwoLineListItem redLnn = new IconedTwoLineListItem();
|
||||||
redLnn.setTitle("Red_lnn");
|
redLnn.setTitle("Red_lnn");
|
||||||
@@ -149,17 +149,20 @@ public class AboutPage extends StackPane {
|
|||||||
|
|
||||||
ComponentList legal = new ComponentList();
|
ComponentList legal = new ComponentList();
|
||||||
{
|
{
|
||||||
TwoLineListItem copyright = new TwoLineListItem();
|
IconedTwoLineListItem copyright = new IconedTwoLineListItem();
|
||||||
copyright.setTitle(i18n("about.copyright"));
|
copyright.setTitle(i18n("about.copyright"));
|
||||||
copyright.setSubtitle(i18n("about.copyright.statement"));
|
copyright.setSubtitle(i18n("about.copyright.statement"));
|
||||||
|
copyright.setExternalLink("https://hmcl.huangyuhui.net/about/");
|
||||||
|
|
||||||
TwoLineListItem claim = new TwoLineListItem();
|
IconedTwoLineListItem claim = new IconedTwoLineListItem();
|
||||||
claim.setTitle(i18n("about.claim"));
|
claim.setTitle(i18n("about.claim"));
|
||||||
claim.setSubtitle(i18n("about.claim.statement"));
|
claim.setSubtitle(i18n("about.claim.statement"));
|
||||||
|
claim.setExternalLink(Metadata.EULA_URL);
|
||||||
|
|
||||||
TwoLineListItem openSource = new TwoLineListItem();
|
IconedTwoLineListItem openSource = new IconedTwoLineListItem();
|
||||||
openSource.setTitle(i18n("about.open_source"));
|
openSource.setTitle(i18n("about.open_source"));
|
||||||
openSource.setSubtitle(i18n("about.open_source.statement"));
|
openSource.setSubtitle(i18n("about.open_source.statement"));
|
||||||
|
openSource.setExternalLink("https://github.com/huanghongxun/HMCL");
|
||||||
|
|
||||||
legal.getContent().setAll(copyright, claim, openSource);
|
legal.getContent().setAll(copyright, claim, openSource);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,8 +22,8 @@ about.copyright=Copyright
|
|||||||
about.copyright.statement=Copyright (c) 2021 huangyuhui.
|
about.copyright.statement=Copyright (c) 2021 huangyuhui.
|
||||||
about.author=Author
|
about.author=Author
|
||||||
about.author.statement=huanghongxun (hmcl@huangyuhui.net)
|
about.author.statement=huanghongxun (hmcl@huangyuhui.net)
|
||||||
about.claim=Statement
|
about.claim=EULA
|
||||||
about.claim.statement=Minecraft is copyrighted by Mojang AB. We are not responsible for any copyright infringement arising from the use of this software.
|
about.claim.statement=Click the link for the whole text.
|
||||||
about.dependency=Dependencies
|
about.dependency=Dependencies
|
||||||
about.legal=Legal Acknowledgement
|
about.legal=Legal Acknowledgement
|
||||||
about.thanks_to=Thanks to
|
about.thanks_to=Thanks to
|
||||||
|
|||||||
@@ -22,8 +22,8 @@ about.copyright=著作權
|
|||||||
about.copyright.statement=著作權所有 (c) 2021 huangyuhui。
|
about.copyright.statement=著作權所有 (c) 2021 huangyuhui。
|
||||||
about.author=作者
|
about.author=作者
|
||||||
about.author.statement=huanghongxun (hmcl@huangyuhui.net)
|
about.author.statement=huanghongxun (hmcl@huangyuhui.net)
|
||||||
about.claim=免責聲明
|
about.claim=用戶協議
|
||||||
about.claim.statement=Minecraft 著作權歸 Mojang AB 所有,使用本軟體產生的著作權問題,軟體製作方概不負責。請支援正版。
|
about.claim.statement=點擊連結以查看全文
|
||||||
about.dependency=相依元件
|
about.dependency=相依元件
|
||||||
about.legal=法律聲明
|
about.legal=法律聲明
|
||||||
about.thanks_to=鳴謝
|
about.thanks_to=鳴謝
|
||||||
|
|||||||
@@ -22,8 +22,8 @@ about.copyright=版权
|
|||||||
about.copyright.statement=版权所有 (c) 2021 huangyuhui.
|
about.copyright.statement=版权所有 (c) 2021 huangyuhui.
|
||||||
about.author=作者
|
about.author=作者
|
||||||
about.author.statement=huanghongxun (hmcl@huangyuhui.net)
|
about.author.statement=huanghongxun (hmcl@huangyuhui.net)
|
||||||
about.claim=免责声明
|
about.claim=用户协议
|
||||||
about.claim.statement=Minecraft 版权归 Mojang AB 所有,使用本软件产生的版权问题,软件制作方概不负责。请支持正版。
|
about.claim.statement=点击链接以查看全文
|
||||||
about.dependency=依赖
|
about.dependency=依赖
|
||||||
about.legal=法律声明
|
about.legal=法律声明
|
||||||
about.thanks_to=鸣谢
|
about.thanks_to=鸣谢
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import static org.junit.Assert.assertEquals;
|
|||||||
*/
|
*/
|
||||||
public class AggregatedObservableListTest {
|
public class AggregatedObservableListTest {
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testInteger() {
|
public void testInteger() {
|
||||||
final AggregatedObservableList<Integer> aggregatedWrapper = new AggregatedObservableList<>();
|
final AggregatedObservableList<Integer> aggregatedWrapper = new AggregatedObservableList<>();
|
||||||
@@ -91,4 +90,4 @@ public class AggregatedObservableListTest {
|
|||||||
b.setAll(7, 8, 9);
|
b.setAll(7, 8, 9);
|
||||||
assertEquals("[1,7,8,9]", aggregatedWrapper.dump());
|
assertEquals("[1,7,8,9]", aggregatedWrapper.dump());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user