From c22ee3dea1e34b9e3b1f2e46240490f134349d8e Mon Sep 17 00:00:00 2001 From: skylarmt Date: Fri, 2 Jan 2015 00:14:19 -0700 Subject: [PATCH] Combine About screen with Welcome page in manual --- src/net/apocalypselabs/symat/Help.java | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/net/apocalypselabs/symat/Help.java b/src/net/apocalypselabs/symat/Help.java index 9733c50..aa41dca 100644 --- a/src/net/apocalypselabs/symat/Help.java +++ b/src/net/apocalypselabs/symat/Help.java @@ -77,10 +77,13 @@ public class Help extends javax.swing.JInternalFrame { } public void loadTopic(String name) { - if (name.equals("about")) { + if (name.equals("welcome")) { String text = "About SyMAT" + "" - + "

About

" + + "

Welcome to SyMAT!

" + + "

SyMAT is a Java-based algebra and calculus system. " + + "Scripts and commands can be written in " + + "JavaScript or Python.

" + "

This is SyMAT version " + MainGUI.VERSION_NAME + " (" + (int) MainGUI.APP_CODE + ")." + "

" @@ -89,14 +92,17 @@ public class Help extends javax.swing.JInternalFrame { + " Apocalypse Laboratories. Some rights reserved." + "

" + "

Internal help documentation is " - + "licensed under the Creative Commons Attribution " - + "license (CC-BY). You can use it in part or in whole " - + "for any purpose, including commercial, as long as " - + "you attribute Apocalypse Laboratories.

" - + ""; + + "licensed under the Creative Commons " + + "Attribution-NonCommercial 4.0 International" + + " license (CC-BY-NC). " + + "You can use it in part or in whole " + + "for any purpose, excepting commercial, as long as " + + "you attribute Apocalypse Laboratories. See " + + "http://creativecommons.org/licenses/by-nc/4.0/" + + " for more information.

"; topicBrowser.setText(text); topicBrowser.setCaretPosition(0); - setTitle("About SyMAT"); + setTitle("Manual"); } else { try { String text = "";