Bugfixes and startup optimizations, update README.md
Skylar
9 years ago
parent
db689e81b6
commit
8a5cdb94d1
@ -1,18 +1,18 @@
|
|||||||
SyMAT
|
SyMAT
|
||||||
=====
|
=====
|
||||||
|
|
||||||
SyMAT is a programmable symbolic math system written in Java.
|
SyMAT is a programmable symbolic math system written in Java.
|
||||||
|
|
||||||
This repository is extremely bleeding-edge.
|
This repository is extremely bleeding-edge.
|
||||||
We test new features before committing (usually), but there are bugs.
|
We test new features before committing (usually), but there are bugs.
|
||||||
If you want a more stable release, download the latest one from our website.
|
If you want a more stable release, download the latest one from our website.
|
||||||
|
|
||||||
Get SyMAT
|
Get SyMAT
|
||||||
------
|
------
|
||||||
|
|
||||||
To get SyMAT for your platform, go to:
|
To get SyMAT for your platform, go to:
|
||||||
http://symatapp.com/
|
http://symatapp.com/
|
||||||
|
|
||||||
Report a Bug
|
Report a Bug
|
||||||
------
|
------
|
||||||
To report bugs, go to: http://bugs.aplabs.us/thebuggenie/symat/issues/new
|
To report bugs, go to: https://github.com/ApocalypseLaboratories/SyMAT/issues
|
||||||
@ -1,360 +1,371 @@
|
|||||||
/*
|
/*
|
||||||
* CODE LICENSE =====================
|
* CODE LICENSE =====================
|
||||||
* Copyright (c) 2015, Apocalypse Laboratories
|
* Copyright (c) 2015, Apocalypse Laboratories
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without modification,
|
* Redistribution and use in source and binary forms, with or without modification,
|
||||||
* are permitted provided that the following conditions are met:
|
* are permitted provided that the following conditions are met:
|
||||||
*
|
*
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||||
* list of conditions and the following disclaimer.
|
* list of conditions and the following disclaimer.
|
||||||
*
|
*
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
* this list of conditions and the following disclaimer in the documentation and/or
|
* this list of conditions and the following disclaimer in the documentation and/or
|
||||||
* other materials provided with the distribution.
|
* other materials provided with the distribution.
|
||||||
*
|
*
|
||||||
* 3. Neither the name of the copyright holder nor the names of its contributors
|
* 3. Neither the name of the copyright holder nor the names of its contributors
|
||||||
* may be used to endorse or promote products derived from this software without
|
* may be used to endorse or promote products derived from this software without
|
||||||
* specific prior written permission.
|
* specific prior written permission.
|
||||||
*
|
*
|
||||||
* 4. You adhere to the Media License detailed below. If you do not, this license
|
* 4. You adhere to the Media License detailed below. If you do not, this license
|
||||||
* is automatically revoked and you must purge all copies of the software you
|
* is automatically revoked and you must purge all copies of the software you
|
||||||
* possess, in source or binary form.
|
* possess, in source or binary form.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* MEDIA LICENSE ====================
|
* MEDIA LICENSE ====================
|
||||||
* All images and other graphical files (the "graphics") included with this
|
* All images and other graphical files (the "graphics") included with this
|
||||||
* software are copyright (c) 2015 Apocalypse Laboratories. You may not distribute
|
* software are copyright (c) 2015 Apocalypse Laboratories. You may not distribute
|
||||||
* the graphics or any program, source code repository, or other digital storage
|
* the graphics or any program, source code repository, or other digital storage
|
||||||
* media containing them without written permission from Apocalypse Laboratories.
|
* media containing them without written permission from Apocalypse Laboratories.
|
||||||
* This ban on distribution only applies to publicly available systems.
|
* This ban on distribution only applies to publicly available systems.
|
||||||
* A password-protected network file share, USB drive, or other storage scheme that
|
* A password-protected network file share, USB drive, or other storage scheme that
|
||||||
* cannot be easily accessed by the public is generally allowed. If in doubt,
|
* cannot be easily accessed by the public is generally allowed. If in doubt,
|
||||||
* contact Apocalypse Laboratories. If Apocalypse Laboratories allows or denies
|
* contact Apocalypse Laboratories. If Apocalypse Laboratories allows or denies
|
||||||
* you permission, that decision is considered final and binding.
|
* you permission, that decision is considered final and binding.
|
||||||
*/
|
*/
|
||||||
package net.apocalypselabs.symat;
|
package net.apocalypselabs.symat;
|
||||||
|
|
||||||
import java.awt.BorderLayout;
|
import java.awt.BorderLayout;
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import javafx.application.Platform;
|
import javafx.application.Platform;
|
||||||
import javafx.beans.value.ChangeListener;
|
import javafx.beans.value.ChangeListener;
|
||||||
import javafx.beans.value.ObservableValue;
|
import javafx.beans.value.ObservableValue;
|
||||||
import javafx.collections.ObservableList;
|
import javafx.collections.ObservableList;
|
||||||
import javafx.concurrent.Worker;
|
import javafx.concurrent.Worker;
|
||||||
import javafx.concurrent.Worker.State;
|
import javafx.concurrent.Worker.State;
|
||||||
import javafx.embed.swing.JFXPanel;
|
import javafx.embed.swing.JFXPanel;
|
||||||
import javafx.scene.Group;
|
import javafx.scene.Group;
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.Scene;
|
import javafx.scene.Scene;
|
||||||
import javafx.scene.web.WebEngine;
|
import javafx.scene.web.WebEngine;
|
||||||
import javafx.scene.web.WebView;
|
import javafx.scene.web.WebView;
|
||||||
import javax.swing.ImageIcon;
|
import javax.swing.ImageIcon;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Skylar
|
* @author Skylar
|
||||||
*/
|
*/
|
||||||
public class WebBrowser extends javax.swing.JInternalFrame {
|
public class WebBrowser extends javax.swing.JInternalFrame {
|
||||||
|
|
||||||
private WebView browser;
|
private WebView browser;
|
||||||
private WebEngine webEngine;
|
private WebEngine webEngine;
|
||||||
private JFXPanel jfxPanel;
|
private JFXPanel jfxPanel;
|
||||||
private Group root;
|
private Group root;
|
||||||
private Scene scene;
|
private Scene scene;
|
||||||
|
|
||||||
public static final int DEFAULT_LOGO = 0;
|
public static final int DEFAULT_LOGO = 0;
|
||||||
public static final int WIKI_LOGO = 1;
|
public static final int WIKI_LOGO = 1;
|
||||||
public static final int FORUM_LOGO = 2;
|
public static final int FORUM_LOGO = 2;
|
||||||
public static final int PAD_LOGO = 3;
|
public static final int PAD_LOGO = 3;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates new form WebBrowser
|
* Creates new form WebBrowser
|
||||||
*/
|
*/
|
||||||
public WebBrowser() {
|
public WebBrowser() {
|
||||||
initComponents();
|
initComponents();
|
||||||
jfxPanel = new JFXPanel();
|
jfxPanel = new JFXPanel();
|
||||||
Platform.runLater(new Runnable() {
|
Platform.runLater(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
browser = new WebView();
|
browser = new WebView();
|
||||||
browser.setPrefSize(getWidth(), getHeight());
|
browser.setPrefSize(getWidth(), getHeight());
|
||||||
root = new Group();
|
root = new Group();
|
||||||
scene = new Scene(root);
|
scene = new Scene(root);
|
||||||
ObservableList<Node> children = root.getChildren();
|
ObservableList<Node> children = root.getChildren();
|
||||||
children.add(browser);
|
children.add(browser);
|
||||||
jfxPanel.setScene(scene);
|
jfxPanel.setScene(scene);
|
||||||
webEngine = browser.getEngine();
|
webEngine = browser.getEngine();
|
||||||
webEngine.getLoadWorker().stateProperty().addListener(
|
webEngine.getLoadWorker().stateProperty().addListener(
|
||||||
new ChangeListener<State>() {
|
new ChangeListener<State>() {
|
||||||
@Override
|
@Override
|
||||||
public void changed(ObservableValue ov, State oldState, State newState) {
|
public void changed(ObservableValue ov, State oldState, State newState) {
|
||||||
if (newState == Worker.State.SUCCEEDED) {
|
if (newState == Worker.State.SUCCEEDED) {
|
||||||
urlBox.setText(webEngine.getLocation());
|
urlBox.setText(webEngine.getLocation());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
webEngine.setUserAgent("Mozilla/5.0 SyMAT/" + Main.VERSION_NAME);
|
webEngine.setUserAgent("Mozilla/5.0 SyMAT/" + Main.VERSION_NAME);
|
||||||
webEngine.loadContent(homepage());
|
webEngine.loadContent(homepage());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
getContentPane().add(jfxPanel, BorderLayout.CENTER);
|
browserBox.add(jfxPanel, BorderLayout.CENTER);
|
||||||
}
|
}
|
||||||
|
|
||||||
public WebBrowser(String title) {
|
public WebBrowser(String title) {
|
||||||
this();
|
this();
|
||||||
setTitle(title);
|
setTitle(title);
|
||||||
loadURL("http://wiki.symatapp.com/");
|
loadURL("http://wiki.symatapp.com/");
|
||||||
}
|
}
|
||||||
|
|
||||||
public String homepage() {
|
public String homepage() {
|
||||||
try {
|
try {
|
||||||
String text = "";
|
String text = "";
|
||||||
BufferedReader reader = new BufferedReader(
|
BufferedReader reader = new BufferedReader(
|
||||||
new InputStreamReader(
|
new InputStreamReader(
|
||||||
WebBrowser.class
|
WebBrowser.class
|
||||||
.getResourceAsStream("resources/homepage.html")));
|
.getResourceAsStream("resources/homepage.html")));
|
||||||
String line;
|
String line;
|
||||||
while ((line = reader.readLine()) != null) {
|
while ((line = reader.readLine()) != null) {
|
||||||
text += line;
|
text += line;
|
||||||
}
|
}
|
||||||
return text;
|
return text;
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
return "Error: " + ex.getMessage();
|
return "Error: " + ex.getMessage();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public WebBrowser(String title, String url) {
|
public WebBrowser(String title, String url) {
|
||||||
this();
|
this();
|
||||||
setTitle(title);
|
setTitle(title);
|
||||||
loadURL(url);
|
loadURL(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
public WebBrowser(String title, String url, int icon) {
|
public WebBrowser(String title, String url, int icon) {
|
||||||
this(title, url);
|
this(title, url);
|
||||||
switch (icon) {
|
switch (icon) {
|
||||||
case WIKI_LOGO:
|
case WIKI_LOGO:
|
||||||
setFrameIcon(new ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/wiki.png")));
|
setFrameIcon(new ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/wiki.png")));
|
||||||
break;
|
break;
|
||||||
case FORUM_LOGO:
|
case FORUM_LOGO:
|
||||||
setFrameIcon(new ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/forum.png")));
|
setFrameIcon(new ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/forum.png")));
|
||||||
break;
|
break;
|
||||||
case PAD_LOGO:
|
case PAD_LOGO:
|
||||||
navBar.setVisible(false);
|
navBar.setVisible(false);
|
||||||
goBtn.setEnabled(false);
|
goBtn.setEnabled(false);
|
||||||
backBtn.setEnabled(false);
|
backBtn.setEnabled(false);
|
||||||
setFrameIcon(new ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/editor.png")));
|
setFrameIcon(new ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/editor.png")));
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
setFrameIcon(new ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/browser.png")));
|
setFrameIcon(new ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/browser.png")));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public WebBrowser(String url, boolean isurl) {
|
public WebBrowser(String url, boolean isurl) {
|
||||||
this();
|
this();
|
||||||
loadURL(url);
|
loadURL(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void loadURL(final String url) {
|
public void showNavbar(boolean yesno) {
|
||||||
Platform.runLater(new Runnable() {
|
navBar.setVisible(yesno);
|
||||||
@Override
|
goBtn.setEnabled(yesno);
|
||||||
public void run() {
|
backBtn.setEnabled(yesno);
|
||||||
webEngine.load(url);
|
}
|
||||||
resizeAll();
|
|
||||||
}
|
public void loadURL(final String url) {
|
||||||
});
|
Platform.runLater(new Runnable() {
|
||||||
urlBox.setText(url);
|
@Override
|
||||||
}
|
public void run() {
|
||||||
|
webEngine.load(url);
|
||||||
public void open() {
|
resizeAll();
|
||||||
Main.loadFrame(this, true);
|
}
|
||||||
}
|
});
|
||||||
|
urlBox.setText(url);
|
||||||
public void loadString(final String content) {
|
}
|
||||||
Platform.runLater(new Runnable() {
|
|
||||||
@Override
|
public void open() {
|
||||||
public void run() {
|
Main.loadFrame(this, true);
|
||||||
webEngine.loadContent(content);
|
}
|
||||||
resizeAll();
|
|
||||||
}
|
public void loadString(final String content) {
|
||||||
});
|
Platform.runLater(new Runnable() {
|
||||||
urlBox.setText("");
|
@Override
|
||||||
}
|
public void run() {
|
||||||
|
webEngine.loadContent(content);
|
||||||
/**
|
resizeAll();
|
||||||
* This method is called from within the constructor to initialize the form.
|
}
|
||||||
* WARNING: Do NOT modify this code. The content of this method is always
|
});
|
||||||
* regenerated by the Form Editor.
|
urlBox.setText("");
|
||||||
*/
|
}
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
/**
|
||||||
private void initComponents() {
|
* This method is called from within the constructor to initialize the form.
|
||||||
|
* WARNING: Do NOT modify this code. The content of this method is always
|
||||||
navBar = new javax.swing.JToolBar();
|
* regenerated by the Form Editor.
|
||||||
backBtn = new javax.swing.JButton();
|
*/
|
||||||
urlBox = new javax.swing.JTextField();
|
@SuppressWarnings("unchecked")
|
||||||
goBtn = new javax.swing.JButton();
|
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
||||||
|
private void initComponents() {
|
||||||
setClosable(true);
|
|
||||||
setIconifiable(true);
|
navBar = new javax.swing.JToolBar();
|
||||||
setMaximizable(true);
|
backBtn = new javax.swing.JButton();
|
||||||
setResizable(true);
|
urlBox = new javax.swing.JTextField();
|
||||||
setTitle("Browser");
|
goBtn = new javax.swing.JButton();
|
||||||
setFrameIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/browser.png"))); // NOI18N
|
browserBox = new javax.swing.JPanel();
|
||||||
setMinimumSize(new java.awt.Dimension(300, 300));
|
|
||||||
setPreferredSize(new java.awt.Dimension(480, 400));
|
setClosable(true);
|
||||||
addInternalFrameListener(new javax.swing.event.InternalFrameListener() {
|
setIconifiable(true);
|
||||||
public void internalFrameActivated(javax.swing.event.InternalFrameEvent evt) {
|
setMaximizable(true);
|
||||||
}
|
setResizable(true);
|
||||||
public void internalFrameClosed(javax.swing.event.InternalFrameEvent evt) {
|
setTitle("Browser");
|
||||||
}
|
setFrameIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/browser.png"))); // NOI18N
|
||||||
public void internalFrameClosing(javax.swing.event.InternalFrameEvent evt) {
|
setMinimumSize(new java.awt.Dimension(300, 300));
|
||||||
}
|
setPreferredSize(new java.awt.Dimension(480, 400));
|
||||||
public void internalFrameDeactivated(javax.swing.event.InternalFrameEvent evt) {
|
addInternalFrameListener(new javax.swing.event.InternalFrameListener() {
|
||||||
}
|
public void internalFrameActivated(javax.swing.event.InternalFrameEvent evt) {
|
||||||
public void internalFrameDeiconified(javax.swing.event.InternalFrameEvent evt) {
|
}
|
||||||
}
|
public void internalFrameClosed(javax.swing.event.InternalFrameEvent evt) {
|
||||||
public void internalFrameIconified(javax.swing.event.InternalFrameEvent evt) {
|
}
|
||||||
}
|
public void internalFrameClosing(javax.swing.event.InternalFrameEvent evt) {
|
||||||
public void internalFrameOpened(javax.swing.event.InternalFrameEvent evt) {
|
}
|
||||||
formInternalFrameOpened(evt);
|
public void internalFrameDeactivated(javax.swing.event.InternalFrameEvent evt) {
|
||||||
}
|
}
|
||||||
});
|
public void internalFrameDeiconified(javax.swing.event.InternalFrameEvent evt) {
|
||||||
addComponentListener(new java.awt.event.ComponentAdapter() {
|
}
|
||||||
public void componentResized(java.awt.event.ComponentEvent evt) {
|
public void internalFrameIconified(javax.swing.event.InternalFrameEvent evt) {
|
||||||
formComponentResized(evt);
|
}
|
||||||
}
|
public void internalFrameOpened(javax.swing.event.InternalFrameEvent evt) {
|
||||||
public void componentShown(java.awt.event.ComponentEvent evt) {
|
formInternalFrameOpened(evt);
|
||||||
formComponentShown(evt);
|
}
|
||||||
}
|
});
|
||||||
});
|
addComponentListener(new java.awt.event.ComponentAdapter() {
|
||||||
|
public void componentResized(java.awt.event.ComponentEvent evt) {
|
||||||
navBar.setFloatable(false);
|
formComponentResized(evt);
|
||||||
navBar.setRollover(true);
|
}
|
||||||
navBar.setLayout(new java.awt.BorderLayout());
|
public void componentShown(java.awt.event.ComponentEvent evt) {
|
||||||
|
formComponentShown(evt);
|
||||||
backBtn.setFont(Main.ubuntuRegular.deriveFont(16.0f));
|
}
|
||||||
backBtn.setText("<");
|
});
|
||||||
backBtn.setFocusable(false);
|
|
||||||
backBtn.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
|
navBar.setFloatable(false);
|
||||||
backBtn.setMaximumSize(new java.awt.Dimension(30, 21));
|
navBar.setRollover(true);
|
||||||
backBtn.setMinimumSize(new java.awt.Dimension(30, 21));
|
navBar.setLayout(new java.awt.BorderLayout());
|
||||||
backBtn.setPreferredSize(new java.awt.Dimension(30, 21));
|
|
||||||
backBtn.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
|
backBtn.setFont(Main.ubuntuRegular.deriveFont(16.0f));
|
||||||
navBar.add(backBtn, java.awt.BorderLayout.WEST);
|
backBtn.setText("<");
|
||||||
backBtn.addActionListener(new java.awt.event.ActionListener() {
|
backBtn.setFocusable(false);
|
||||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
backBtn.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
|
||||||
backBtnActionPerformed(evt);
|
backBtn.setMaximumSize(new java.awt.Dimension(30, 21));
|
||||||
}
|
backBtn.setMinimumSize(new java.awt.Dimension(30, 21));
|
||||||
});
|
backBtn.setPreferredSize(new java.awt.Dimension(30, 21));
|
||||||
/*
|
backBtn.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
|
||||||
navBar.add(backBtn);
|
navBar.add(backBtn, java.awt.BorderLayout.WEST);
|
||||||
*/
|
backBtn.addActionListener(new java.awt.event.ActionListener() {
|
||||||
|
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||||
urlBox.addKeyListener(new java.awt.event.KeyAdapter() {
|
backBtnActionPerformed(evt);
|
||||||
public void keyTyped(java.awt.event.KeyEvent evt) {
|
}
|
||||||
urlBoxKeyTyped(evt);
|
});
|
||||||
}
|
/*
|
||||||
});
|
navBar.add(backBtn);
|
||||||
navBar.add(urlBox, java.awt.BorderLayout.CENTER);
|
*/
|
||||||
/*
|
|
||||||
navBar.add(urlBox);
|
urlBox.addKeyListener(new java.awt.event.KeyAdapter() {
|
||||||
*/
|
public void keyTyped(java.awt.event.KeyEvent evt) {
|
||||||
|
urlBoxKeyTyped(evt);
|
||||||
goBtn.setText("Go");
|
}
|
||||||
goBtn.setFocusable(false);
|
});
|
||||||
goBtn.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
|
navBar.add(urlBox, java.awt.BorderLayout.CENTER);
|
||||||
goBtn.setMaximumSize(new java.awt.Dimension(30, 21));
|
/*
|
||||||
goBtn.setMinimumSize(new java.awt.Dimension(30, 21));
|
navBar.add(urlBox);
|
||||||
goBtn.setPreferredSize(new java.awt.Dimension(30, 21));
|
*/
|
||||||
goBtn.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
|
|
||||||
navBar.add(goBtn, java.awt.BorderLayout.EAST);
|
goBtn.setText("Go");
|
||||||
goBtn.addActionListener(new java.awt.event.ActionListener() {
|
goBtn.setFocusable(false);
|
||||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
goBtn.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
|
||||||
goBtnActionPerformed(evt);
|
goBtn.setMaximumSize(new java.awt.Dimension(30, 21));
|
||||||
}
|
goBtn.setMinimumSize(new java.awt.Dimension(30, 21));
|
||||||
});
|
goBtn.setPreferredSize(new java.awt.Dimension(30, 21));
|
||||||
/*
|
goBtn.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
|
||||||
navBar.add(goBtn);
|
navBar.add(goBtn, java.awt.BorderLayout.EAST);
|
||||||
*/
|
goBtn.addActionListener(new java.awt.event.ActionListener() {
|
||||||
|
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||||
getContentPane().add(navBar, java.awt.BorderLayout.PAGE_START);
|
goBtnActionPerformed(evt);
|
||||||
|
}
|
||||||
pack();
|
});
|
||||||
}// </editor-fold>//GEN-END:initComponents
|
/*
|
||||||
|
navBar.add(goBtn);
|
||||||
private void formInternalFrameOpened(javax.swing.event.InternalFrameEvent evt) {//GEN-FIRST:event_formInternalFrameOpened
|
*/
|
||||||
// resizeAll();
|
|
||||||
// // Ensure scrollbars show up correctly.
|
getContentPane().add(navBar, java.awt.BorderLayout.PAGE_START);
|
||||||
// setSize(getWidth() + 1, getHeight());
|
|
||||||
// setSize(getWidth() - 1, getHeight());
|
browserBox.setLayout(new java.awt.BorderLayout());
|
||||||
}//GEN-LAST:event_formInternalFrameOpened
|
getContentPane().add(browserBox, java.awt.BorderLayout.CENTER);
|
||||||
|
|
||||||
private void formComponentResized(java.awt.event.ComponentEvent evt) {//GEN-FIRST:event_formComponentResized
|
pack();
|
||||||
resizeAll();
|
}// </editor-fold>//GEN-END:initComponents
|
||||||
}//GEN-LAST:event_formComponentResized
|
|
||||||
|
private void formInternalFrameOpened(javax.swing.event.InternalFrameEvent evt) {//GEN-FIRST:event_formInternalFrameOpened
|
||||||
private void formComponentShown(java.awt.event.ComponentEvent evt) {//GEN-FIRST:event_formComponentShown
|
// resizeAll();
|
||||||
resizeAll();
|
// // Ensure scrollbars show up correctly.
|
||||||
}//GEN-LAST:event_formComponentShown
|
// setSize(getWidth() + 1, getHeight());
|
||||||
|
// setSize(getWidth() - 1, getHeight());
|
||||||
private void urlBoxKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_urlBoxKeyTyped
|
}//GEN-LAST:event_formInternalFrameOpened
|
||||||
if (evt.getKeyChar() == '\n') {
|
|
||||||
goBtn.doClick();
|
private void formComponentResized(java.awt.event.ComponentEvent evt) {//GEN-FIRST:event_formComponentResized
|
||||||
}
|
resizeAll();
|
||||||
}//GEN-LAST:event_urlBoxKeyTyped
|
}//GEN-LAST:event_formComponentResized
|
||||||
|
|
||||||
private void goBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_goBtnActionPerformed
|
private void formComponentShown(java.awt.event.ComponentEvent evt) {//GEN-FIRST:event_formComponentShown
|
||||||
if (urlBox.getText().equals("about:home")) {
|
resizeAll();
|
||||||
loadString(homepage());
|
}//GEN-LAST:event_formComponentShown
|
||||||
} else {
|
|
||||||
if (!urlBox.getText().startsWith("http")) {
|
private void urlBoxKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_urlBoxKeyTyped
|
||||||
urlBox.setText("http://" + urlBox.getText());
|
if (evt.getKeyChar() == '\n') {
|
||||||
}
|
goBtn.doClick();
|
||||||
loadURL(urlBox.getText());
|
}
|
||||||
}
|
}//GEN-LAST:event_urlBoxKeyTyped
|
||||||
}//GEN-LAST:event_goBtnActionPerformed
|
|
||||||
|
private void goBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_goBtnActionPerformed
|
||||||
private void backBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_backBtnActionPerformed
|
if (urlBox.getText().equals("about:home")) {
|
||||||
Platform.runLater(new Runnable() {
|
loadString(homepage());
|
||||||
@Override
|
} else {
|
||||||
public void run() {
|
if (!urlBox.getText().startsWith("http")) {
|
||||||
try {
|
urlBox.setText("http://" + urlBox.getText());
|
||||||
browser.getEngine().getHistory().go(-1);
|
}
|
||||||
} catch (Exception ex) {
|
loadURL(urlBox.getText());
|
||||||
}
|
}
|
||||||
}
|
}//GEN-LAST:event_goBtnActionPerformed
|
||||||
});
|
|
||||||
}//GEN-LAST:event_backBtnActionPerformed
|
private void backBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_backBtnActionPerformed
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
private void resizeAll() {
|
@Override
|
||||||
Platform.runLater(new Runnable() {
|
public void run() {
|
||||||
@Override
|
try {
|
||||||
public void run() {
|
browser.getEngine().getHistory().go(-1);
|
||||||
jfxPanel.setSize(getWidth(), getHeight());
|
} catch (Exception ex) {
|
||||||
browser.setPrefSize(getWidth() - 12, getHeight() - 32);
|
}
|
||||||
browser.resize(getWidth() - 12, getHeight() - 32);
|
}
|
||||||
}
|
});
|
||||||
});
|
}//GEN-LAST:event_backBtnActionPerformed
|
||||||
}
|
|
||||||
|
private void resizeAll() {
|
||||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
Platform.runLater(new Runnable() {
|
||||||
private javax.swing.JButton backBtn;
|
@Override
|
||||||
private javax.swing.JButton goBtn;
|
public void run() {
|
||||||
private javax.swing.JToolBar navBar;
|
jfxPanel.setSize(browserBox.getWidth(), browserBox.getHeight());
|
||||||
private javax.swing.JTextField urlBox;
|
browser.setPrefSize(browserBox.getWidth(), browserBox.getHeight());
|
||||||
// End of variables declaration//GEN-END:variables
|
browser.resize(browserBox.getWidth(), browserBox.getHeight());
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||||
|
private javax.swing.JButton backBtn;
|
||||||
|
private javax.swing.JPanel browserBox;
|
||||||
|
private javax.swing.JButton goBtn;
|
||||||
|
private javax.swing.JToolBar navBar;
|
||||||
|
private javax.swing.JTextField urlBox;
|
||||||
|
// End of variables declaration//GEN-END:variables
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue