Tested browser, works fine with forum and for viewing wiki (editing not so much).
This commit is contained in:
skylarmt
parent
91f0bd27c7
commit
2fc829d2af
@ -67,7 +67,7 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<echo message="running.on.mac = ${running.on.mac}" level="verbose"/>
|
||||
<echo message="running.on.unix = ${running.on.unix}" level="verbose"/>
|
||||
<echo message="running.on.windows = ${running.on.windows}" level="verbose"/>
|
||||
</target>
|
||||
</target>
|
||||
|
||||
|
||||
<!-- Check availability of JavaFX SDK deployment support (ant-javafx.jar) -->
|
||||
@ -89,27 +89,19 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<condition property="javafx.sdk.defined">
|
||||
<and>
|
||||
<isset property="javafx.sdk"/>
|
||||
<not>
|
||||
<contains string="${javafx.sdk}" substring="$${platform" casesensitive="false"/>
|
||||
</not>
|
||||
<not><contains string="${javafx.sdk}" substring="$${platform" casesensitive="false"/></not>
|
||||
</and>
|
||||
</condition>
|
||||
<condition property="javafx.sdk.missing+default">
|
||||
<and>
|
||||
<equals arg1="${platform.active}" arg2="Default_JavaFX_Platform" trim="true"/>
|
||||
<not>
|
||||
<isset property="javafx.sdk.defined"/>
|
||||
</not>
|
||||
<not><isset property="javafx.sdk.defined"/></not>
|
||||
</and>
|
||||
</condition>
|
||||
<condition property="javafx.sdk.missing-default">
|
||||
<and>
|
||||
<not>
|
||||
<equals arg1="${platform.active}" arg2="Default_JavaFX_Platform" trim="true"/>
|
||||
</not>
|
||||
<not>
|
||||
<isset property="javafx.sdk.defined"/>
|
||||
</not>
|
||||
<not><equals arg1="${platform.active}" arg2="Default_JavaFX_Platform" trim="true"/></not>
|
||||
<not><isset property="javafx.sdk.defined"/></not>
|
||||
</and>
|
||||
</condition>
|
||||
<echo message="javafx.sdk.defined = ${javafx.sdk.defined}" level="verbose"/>
|
||||
@ -120,9 +112,7 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<target name="-check-ant-javafx-in-fxsdk-lib" depends="-check-property-javafx.sdk" if="javafx.sdk.defined">
|
||||
<condition property="do.set.ant-javafx.in.fxsdk.lib">
|
||||
<and>
|
||||
<not>
|
||||
<isset property="ant-javafx.jar.location"/>
|
||||
</not>
|
||||
<not><isset property="ant-javafx.jar.location"/></not>
|
||||
<available file="${javafx.sdk}${file.separator}lib${file.separator}ant-javafx.jar"/>
|
||||
</and>
|
||||
</condition>
|
||||
@ -133,9 +123,7 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<target name="-check-ant-javafx-in-fxsdk-tools" depends="-check-property-javafx.sdk" if="javafx.sdk.defined">
|
||||
<condition property="do.set.ant-javafx.in.fxsdk.tools">
|
||||
<and>
|
||||
<not>
|
||||
<isset property="ant-javafx.jar.location"/>
|
||||
</not>
|
||||
<not><isset property="ant-javafx.jar.location"/></not>
|
||||
<available file="${javafx.sdk}${file.separator}tools${file.separator}ant-javafx.jar"/>
|
||||
</and>
|
||||
</condition>
|
||||
@ -146,9 +134,7 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<target name="-check-ant-javafx-in-platform-home-lib" if="platform.home">
|
||||
<condition property="do.set.ant-javafx.in.platform.home.lib">
|
||||
<and>
|
||||
<not>
|
||||
<isset property="ant-javafx.jar.location"/>
|
||||
</not>
|
||||
<not><isset property="ant-javafx.jar.location"/></not>
|
||||
<available file="${platform.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
|
||||
</and>
|
||||
</condition>
|
||||
@ -159,9 +145,7 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<target name="-check-ant-javafx-in-platform-home-tools" if="platform.home">
|
||||
<condition property="do.set.ant-javafx.in.platform.home.tools">
|
||||
<and>
|
||||
<not>
|
||||
<isset property="ant-javafx.jar.location"/>
|
||||
</not>
|
||||
<not><isset property="ant-javafx.jar.location"/></not>
|
||||
<available file="${platform.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
|
||||
</and>
|
||||
</condition>
|
||||
@ -172,9 +156,7 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<target name="-check-ant-javafx-in-probjdk-lib" unless="ant-javafx.jar.location">
|
||||
<condition property="do.set.ant-javafx.in.probjdk.lib">
|
||||
<and>
|
||||
<not>
|
||||
<isset property="ant-javafx.jar.location"/>
|
||||
</not>
|
||||
<not><isset property="ant-javafx.jar.location"/></not>
|
||||
<available file="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
|
||||
</and>
|
||||
</condition>
|
||||
@ -185,9 +167,7 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<target name="-check-ant-javafx-in-probjdk-tools" unless="ant-javafx.jar.location">
|
||||
<condition property="do.set.ant-javafx.in.probjdk.tools">
|
||||
<and>
|
||||
<not>
|
||||
<isset property="ant-javafx.jar.location"/>
|
||||
</not>
|
||||
<not><isset property="ant-javafx.jar.location"/></not>
|
||||
<available file="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
|
||||
</and>
|
||||
</condition>
|
||||
@ -198,9 +178,7 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<target name="-check-ant-javafx-in-macjdk-lib" unless="ant-javafx.jar.location">
|
||||
<condition property="do.set.ant-javafx.in.macjdk.lib">
|
||||
<and>
|
||||
<not>
|
||||
<isset property="ant-javafx.jar.location"/>
|
||||
</not>
|
||||
<not><isset property="ant-javafx.jar.location"/></not>
|
||||
<available file="${java.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
|
||||
</and>
|
||||
</condition>
|
||||
@ -212,9 +190,7 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<property environment="env"/>
|
||||
<condition property="do.set.ant-javafx.in.envjdk.lib">
|
||||
<and>
|
||||
<not>
|
||||
<isset property="ant-javafx.jar.location"/>
|
||||
</not>
|
||||
<not><isset property="ant-javafx.jar.location"/></not>
|
||||
<available file="${env.JAVA_HOME}${file.separator}lib${file.separator}ant-javafx.jar"/>
|
||||
</and>
|
||||
</condition>
|
||||
@ -226,9 +202,7 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<property environment="env"/>
|
||||
<condition property="do.set.ant-javafx.in.envjdk.tools">
|
||||
<and>
|
||||
<not>
|
||||
<isset property="ant-javafx.jar.location"/>
|
||||
</not>
|
||||
<not><isset property="ant-javafx.jar.location"/></not>
|
||||
<available file="${env.JAVA_HOME}${file.separator}tools${file.separator}ant-javafx.jar"/>
|
||||
</and>
|
||||
</condition>
|
||||
@ -240,9 +214,7 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<condition property="do.check.ant-javafx.version">
|
||||
<and>
|
||||
<isset property="ant-javafx.jar.location"/>
|
||||
<not>
|
||||
<isset property="ant-javafx-version-already-checked-in-jfximpl"/>
|
||||
</not>
|
||||
<not><isset property="ant-javafx-version-already-checked-in-jfximpl"/></not>
|
||||
</and>
|
||||
</condition>
|
||||
</target>
|
||||
@ -258,8 +230,8 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<echo message="ant-javafx.jar.location = ${ant-javafx.jar.location}" level="verbose"/>
|
||||
<echo message="javafx.ant.classpath = ${javafx.ant.classpath}" level="verbose"/>
|
||||
<taskdef resource="com/sun/javafx/tools/ant/antlib.xml"
|
||||
uri="javafx:com.sun.javafx.tools.ant"
|
||||
classpath="${javafx.ant.classpath}"/>
|
||||
uri="javafx:com.sun.javafx.tools.ant"
|
||||
classpath="${javafx.ant.classpath}"/>
|
||||
<condition property="have-fx-ant-init">
|
||||
<typefound name="javafx:com.sun.javafx.tools.ant:init-ant"/>
|
||||
</condition>
|
||||
@ -397,23 +369,13 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<echo message="exec-error:${exec-error}" level="verbose"/>
|
||||
<echo message="exec-result:${exec-result}" level="verbose"/>
|
||||
<condition property="missing.Inno">
|
||||
<not>
|
||||
<and>
|
||||
<contains string="${exec-output}" substring="Inno Setup"/>
|
||||
<not>
|
||||
<contains string="${exec-output}" substring="Inno Setup 1"/>
|
||||
</not>
|
||||
<not>
|
||||
<contains string="${exec-output}" substring="Inno Setup 2"/>
|
||||
</not>
|
||||
<not>
|
||||
<contains string="${exec-output}" substring="Inno Setup 3"/>
|
||||
</not>
|
||||
<not>
|
||||
<contains string="${exec-output}" substring="Inno Setup 4"/>
|
||||
</not>
|
||||
</and>
|
||||
</not>
|
||||
<not><and>
|
||||
<contains string="${exec-output}" substring="Inno Setup"/>
|
||||
<not><contains string="${exec-output}" substring="Inno Setup 1"/></not>
|
||||
<not><contains string="${exec-output}" substring="Inno Setup 2"/></not>
|
||||
<not><contains string="${exec-output}" substring="Inno Setup 3"/></not>
|
||||
<not><contains string="${exec-output}" substring="Inno Setup 4"/></not>
|
||||
</and></not>
|
||||
</condition>
|
||||
</target>
|
||||
<target name="-check-WiX-presence" depends="-check-native-bundling-type" if="need.WiX.presence">
|
||||
@ -427,17 +389,11 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<echo message="exec-error:${exec-error}" level="verbose"/>
|
||||
<echo message="exec-result:${exec-result}" level="verbose"/>
|
||||
<condition property="missing.WiX">
|
||||
<not>
|
||||
<and>
|
||||
<contains string="${exec-output}" substring="Windows Installer Xml Compiler version"/>
|
||||
<not>
|
||||
<contains string="${exec-output}" substring="Windows Installer Xml Compiler version 1"/>
|
||||
</not>
|
||||
<not>
|
||||
<contains string="${exec-output}" substring="Windows Installer Xml Compiler version 2"/>
|
||||
</not>
|
||||
</and>
|
||||
</not>
|
||||
<not><and>
|
||||
<contains string="${exec-output}" substring="Windows Installer Xml Compiler version"/>
|
||||
<not><contains string="${exec-output}" substring="Windows Installer Xml Compiler version 1"/></not>
|
||||
<not><contains string="${exec-output}" substring="Windows Installer Xml Compiler version 2"/></not>
|
||||
</and></not>
|
||||
</condition>
|
||||
</target>
|
||||
<target name="-check-dpkg-presence" depends="-check-native-bundling-type" if="need.dpkg.presence">
|
||||
@ -447,16 +403,12 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<arg line="-v dpkg"/>
|
||||
</exec>
|
||||
<condition property="missing.dpkg">
|
||||
<not>
|
||||
<and>
|
||||
<isset property="exec.which.dpkg.result"/>
|
||||
<equals arg1="${exec.which.dpkg.result}" arg2="0"/>
|
||||
<isset property="exec.which.dpkg.output"/>
|
||||
<not>
|
||||
<equals arg1="${exec.which.dpkg.output}" arg2=""/>
|
||||
</not>
|
||||
</and>
|
||||
</not>
|
||||
<not><and>
|
||||
<isset property="exec.which.dpkg.result"/>
|
||||
<equals arg1="${exec.which.dpkg.result}" arg2="0"/>
|
||||
<isset property="exec.which.dpkg.output"/>
|
||||
<not><equals arg1="${exec.which.dpkg.output}" arg2=""/></not>
|
||||
</and></not>
|
||||
</condition>
|
||||
</target>
|
||||
<target name="-check-rpmbuild-presence" depends="-check-native-bundling-type" if="need.rpmbuild.presence">
|
||||
@ -466,16 +418,12 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<arg line="-v rpmbuild"/>
|
||||
</exec>
|
||||
<condition property="missing.rpmbuild">
|
||||
<not>
|
||||
<and>
|
||||
<isset property="exec.which.rpmbuild.result"/>
|
||||
<equals arg1="${exec.which.rpmbuild.result}" arg2="0"/>
|
||||
<isset property="exec.which.rpmbuild.output"/>
|
||||
<not>
|
||||
<equals arg1="${exec.which.rpmbuild.output}" arg2=""/>
|
||||
</not>
|
||||
</and>
|
||||
</not>
|
||||
<not><and>
|
||||
<isset property="exec.which.rpmbuild.result"/>
|
||||
<equals arg1="${exec.which.rpmbuild.result}" arg2="0"/>
|
||||
<isset property="exec.which.rpmbuild.output"/>
|
||||
<not><equals arg1="${exec.which.rpmbuild.output}" arg2=""/></not>
|
||||
</and></not>
|
||||
</condition>
|
||||
</target>
|
||||
<target name="-check-native-packager-external-tools" depends="-check-Inno-presence, -check-WiX-presence, -check-dpkg-presence, -check-rpmbuild-presence">
|
||||
@ -514,11 +462,11 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
|
||||
<map from="${basedir}${file.separator}${dist.jar}" to=""/>
|
||||
<scriptmapper language="javascript">
|
||||
self.addMappedName(
|
||||
(source.indexOf("jfxrt.jar") >= 0) ||
|
||||
(source.indexOf("deploy.jar") >= 0) ||
|
||||
(source.indexOf("javaws.jar") >= 0) ||
|
||||
(source.indexOf("plugin.jar") >= 0)
|
||||
? "" : source
|
||||
(source.indexOf("jfxrt.jar") >= 0) ||
|
||||
(source.indexOf("deploy.jar") >= 0) ||
|
||||
(source.indexOf("javaws.jar") >= 0) ||
|
||||
(source.indexOf("plugin.jar") >= 0)
|
||||
? "" : source
|
||||
);
|
||||
</scriptmapper>
|
||||
</pathconvert>
|
||||
|
||||
@ -330,8 +330,10 @@
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="wikiBtn" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||
<Component id="jLabel4" pref="632" max="32767" attributes="0"/>
|
||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||
<Component id="forumBtn" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
|
||||
<Component id="jLabel4" pref="571" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
@ -341,6 +343,7 @@
|
||||
<Group type="103" groupAlignment="1" max="-2" attributes="0">
|
||||
<Component id="jLabel4" alignment="0" max="32767" attributes="0"/>
|
||||
<Component id="wikiBtn" alignment="0" max="32767" attributes="0"/>
|
||||
<Component id="forumBtn" alignment="1" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace max="32767" attributes="0"/>
|
||||
</Group>
|
||||
@ -380,6 +383,26 @@
|
||||
<Property name="focusable" type="boolean" value="false"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JButton" name="forumBtn">
|
||||
<Properties>
|
||||
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
|
||||
<Image iconType="3" name="/net/apocalypselabs/symat/images/forum.png"/>
|
||||
</Property>
|
||||
<Property name="text" type="java.lang.String" value="Forum"/>
|
||||
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
|
||||
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
|
||||
<EmptyBorder bottom="5" left="5" right="5" top="5"/>
|
||||
</Border>
|
||||
</Property>
|
||||
<Property name="focusable" type="boolean" value="false"/>
|
||||
<Property name="horizontalTextPosition" type="int" value="0"/>
|
||||
<Property name="opaque" type="boolean" value="false"/>
|
||||
<Property name="verticalTextPosition" type="int" value="3"/>
|
||||
</Properties>
|
||||
<Events>
|
||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="forumBtnActionPerformed"/>
|
||||
</Events>
|
||||
</Component>
|
||||
</SubComponents>
|
||||
</Container>
|
||||
</SubComponents>
|
||||
|
||||
@ -50,11 +50,14 @@ import java.awt.Font;
|
||||
import java.awt.FontFormatException;
|
||||
import static java.awt.Frame.MAXIMIZED_BOTH;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Image;
|
||||
import java.awt.event.KeyEvent;
|
||||
import java.awt.event.WindowAdapter;
|
||||
import java.awt.event.WindowEvent;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import javafx.application.Platform;
|
||||
@ -86,6 +89,9 @@ public class MainGUI extends javax.swing.JFrame {
|
||||
|
||||
public static boolean updateAvailable = false;
|
||||
public static String updateString = "";
|
||||
|
||||
// Logo for frames
|
||||
public static ArrayList<Image> symatlogo = new ArrayList<>();
|
||||
|
||||
/**
|
||||
* Creates the main app window and does some quick things that aren't
|
||||
@ -93,8 +99,12 @@ public class MainGUI extends javax.swing.JFrame {
|
||||
*/
|
||||
public MainGUI() {
|
||||
initComponents();
|
||||
setIconImage((new ImageIcon(
|
||||
getClass().getResource("icon.png"))).getImage());
|
||||
|
||||
// Set icon
|
||||
String[] sizes = {"16","32","48","64","128","256"};
|
||||
setIconImages(symatlogo);
|
||||
|
||||
// Center screen
|
||||
setLocationRelativeTo(null);
|
||||
|
||||
// Run things when app closed
|
||||
@ -319,6 +329,7 @@ public class MainGUI extends javax.swing.JFrame {
|
||||
jPanel5 = new javax.swing.JPanel();
|
||||
wikiBtn = new javax.swing.JButton();
|
||||
jLabel4 = new javax.swing.JLabel();
|
||||
forumBtn = new javax.swing.JButton();
|
||||
mainPane = mainPane = new javax.swing.JDesktopPane() {
|
||||
@Override
|
||||
protected void paintComponent(Graphics g) {
|
||||
@ -536,6 +547,19 @@ public class MainGUI extends javax.swing.JFrame {
|
||||
jLabel4.setText(namemark());
|
||||
jLabel4.setFocusable(false);
|
||||
|
||||
forumBtn.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/images/forum.png"))); // NOI18N
|
||||
forumBtn.setText("Forum");
|
||||
forumBtn.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
|
||||
forumBtn.setFocusable(false);
|
||||
forumBtn.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
|
||||
forumBtn.setOpaque(false);
|
||||
forumBtn.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
|
||||
forumBtn.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
forumBtnActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5);
|
||||
jPanel5.setLayout(jPanel5Layout);
|
||||
jPanel5Layout.setHorizontalGroup(
|
||||
@ -543,15 +567,18 @@ public class MainGUI extends javax.swing.JFrame {
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addComponent(wikiBtn)
|
||||
.addGap(18, 18, 18)
|
||||
.addComponent(jLabel4, javax.swing.GroupLayout.DEFAULT_SIZE, 632, Short.MAX_VALUE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(forumBtn)
|
||||
.addGap(12, 12, 12)
|
||||
.addComponent(jLabel4, javax.swing.GroupLayout.DEFAULT_SIZE, 571, Short.MAX_VALUE))
|
||||
);
|
||||
jPanel5Layout.setVerticalGroup(
|
||||
jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
|
||||
.addComponent(jLabel4, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(wikiBtn, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addComponent(wikiBtn, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(forumBtn, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
@ -763,13 +790,17 @@ public class MainGUI extends javax.swing.JFrame {
|
||||
}//GEN-LAST:event_recentItemsTitleMouseClicked
|
||||
|
||||
private void wikiBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_wikiBtnActionPerformed
|
||||
loadFrame(new WebBrowser("SyMAT Wiki"));
|
||||
loadFrame(new WebBrowser("SyMAT Wiki", "http://wiki.symatapp.com", WebBrowser.WIKI_LOGO));
|
||||
}//GEN-LAST:event_wikiBtnActionPerformed
|
||||
|
||||
private void globalsBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_globalsBtnActionPerformed
|
||||
loadFrame(new Globals());
|
||||
}//GEN-LAST:event_globalsBtnActionPerformed
|
||||
|
||||
private void forumBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_forumBtnActionPerformed
|
||||
loadFrame(new WebBrowser("Community Forum", "http://forum.symatapp.com/", WebBrowser.FORUM_LOGO));
|
||||
}//GEN-LAST:event_forumBtnActionPerformed
|
||||
|
||||
/*
|
||||
End the button handlers.
|
||||
*/
|
||||
@ -883,6 +914,13 @@ public class MainGUI extends javax.swing.JFrame {
|
||||
ubuntuRegular = Font.getFont(Font.SANS_SERIF);
|
||||
System.err.println("Error loading fonts: " + ex.getMessage());
|
||||
}
|
||||
|
||||
// Set icon
|
||||
String[] sizes = {"16","32","48","64","128","256"};
|
||||
for (String s : sizes) {
|
||||
symatlogo.add(new ImageIcon(
|
||||
MainGUI.class.getResource("logo-filled"+s+".png")).getImage());
|
||||
}
|
||||
|
||||
// Command line args
|
||||
for (String arg : args) {
|
||||
@ -922,6 +960,7 @@ public class MainGUI extends javax.swing.JFrame {
|
||||
public static javax.swing.JButton arrangeWindowsBtn;
|
||||
public static javax.swing.JButton displaySettingsBtn;
|
||||
public static javax.swing.JButton editorBtn;
|
||||
public static javax.swing.JButton forumBtn;
|
||||
public static javax.swing.JButton globalsBtn;
|
||||
public static javax.swing.JButton graphBtn;
|
||||
public static javax.swing.JButton helpBtn;
|
||||
|
||||
@ -46,7 +46,6 @@
|
||||
package net.apocalypselabs.symat;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.geom.RoundRectangle2D;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
@ -69,8 +68,7 @@ public class SplashScreen extends javax.swing.JFrame {
|
||||
public SplashScreen() {
|
||||
initComponents();
|
||||
setBackground(new Color(0, 0, 0, 0));
|
||||
setIconImage((new ImageIcon(
|
||||
getClass().getResource("icon.png"))).getImage());
|
||||
setIconImages(MainGUI.symatlogo);
|
||||
setLocationRelativeTo(null);
|
||||
}
|
||||
|
||||
|
||||
@ -7,6 +7,10 @@
|
||||
<Property name="maximizable" type="boolean" value="true"/>
|
||||
<Property name="resizable" type="boolean" value="true"/>
|
||||
<Property name="title" type="java.lang.String" value="Browser"/>
|
||||
<Property name="frameIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
|
||||
<Image iconType="3" name="/net/apocalypselabs/symat/icons/browser.png"/>
|
||||
</Property>
|
||||
<Property name="icon" type="boolean" value="true"/>
|
||||
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||
<Dimension value="[300, 300]"/>
|
||||
</Property>
|
||||
|
||||
@ -54,6 +54,7 @@ import javafx.scene.Node;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.scene.web.WebEngine;
|
||||
import javafx.scene.web.WebView;
|
||||
import javax.swing.ImageIcon;
|
||||
|
||||
/**
|
||||
*
|
||||
@ -67,6 +68,10 @@ public class WebBrowser extends javax.swing.JInternalFrame {
|
||||
private Group root;
|
||||
private Scene scene;
|
||||
|
||||
public static final int DEFAULT_LOGO = 0;
|
||||
public static final int WIKI_LOGO = 1;
|
||||
public static final int FORUM_LOGO = 2;
|
||||
|
||||
/**
|
||||
* Creates new form WebBrowser
|
||||
*/
|
||||
@ -102,6 +107,28 @@ public class WebBrowser extends javax.swing.JInternalFrame {
|
||||
loadURL(url);
|
||||
}
|
||||
|
||||
public WebBrowser(String title, String url, int icon) {
|
||||
this(title, url);
|
||||
switch (icon) {
|
||||
case WIKI_LOGO:
|
||||
setFrameIcon(new ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/wiki.png")));
|
||||
break;
|
||||
case FORUM_LOGO:
|
||||
setFrameIcon(new ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/forum.png")));
|
||||
Platform.runLater(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
browser.getEngine().setJavaScriptEnabled(false);
|
||||
}
|
||||
});
|
||||
break;
|
||||
case DEFAULT_LOGO:
|
||||
default:
|
||||
setFrameIcon(new ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/browser.png")));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public WebBrowser(String url, boolean isurl) {
|
||||
this();
|
||||
loadURL(url);
|
||||
@ -141,6 +168,7 @@ public class WebBrowser extends javax.swing.JInternalFrame {
|
||||
setMaximizable(true);
|
||||
setResizable(true);
|
||||
setTitle("Browser");
|
||||
setFrameIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/icons/browser.png"))); // NOI18N
|
||||
setMinimumSize(new java.awt.Dimension(300, 300));
|
||||
setPreferredSize(new java.awt.Dimension(480, 400));
|
||||
addInternalFrameListener(new javax.swing.event.InternalFrameListener() {
|
||||
@ -192,7 +220,7 @@ public class WebBrowser extends javax.swing.JInternalFrame {
|
||||
@Override
|
||||
public void run() {
|
||||
jfxPanel.setSize(getWidth(), getHeight());
|
||||
browser.resize(getWidth() - 12, getHeight());
|
||||
browser.resize(getWidth() - 12, getHeight() - 12);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
BIN
src/net/apocalypselabs/symat/icons/browser.png
Normal file
BIN
src/net/apocalypselabs/symat/icons/browser.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 806 B |
BIN
src/net/apocalypselabs/symat/icons/forum.png
Normal file
BIN
src/net/apocalypselabs/symat/icons/forum.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 713 B |
BIN
src/net/apocalypselabs/symat/icons/wiki.png
Normal file
BIN
src/net/apocalypselabs/symat/icons/wiki.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 388 B |
BIN
src/net/apocalypselabs/symat/images/forum.png
Normal file
BIN
src/net/apocalypselabs/symat/images/forum.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 401 KiB After Width: | Height: | Size: 404 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 1.7 KiB |
BIN
src/net/apocalypselabs/symat/logo-filled128.png
Normal file
BIN
src/net/apocalypselabs/symat/logo-filled128.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.1 KiB |
BIN
src/net/apocalypselabs/symat/logo-filled16.png
Normal file
BIN
src/net/apocalypselabs/symat/logo-filled16.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 664 B |
BIN
src/net/apocalypselabs/symat/logo-filled256.png
Normal file
BIN
src/net/apocalypselabs/symat/logo-filled256.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
BIN
src/net/apocalypselabs/symat/logo-filled32.png
Normal file
BIN
src/net/apocalypselabs/symat/logo-filled32.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
BIN
src/net/apocalypselabs/symat/logo-filled48.png
Normal file
BIN
src/net/apocalypselabs/symat/logo-filled48.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
BIN
src/net/apocalypselabs/symat/logo-filled64.png
Normal file
BIN
src/net/apocalypselabs/symat/logo-filled64.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 962 KiB |
Loading…
x
Reference in New Issue
Block a user