diff --git a/src/net/apocalypselabs/symat/Main.java b/src/net/apocalypselabs/symat/Main.java index 7b6fa0f..85c2d78 100644 --- a/src/net/apocalypselabs/symat/Main.java +++ b/src/net/apocalypselabs/symat/Main.java @@ -355,6 +355,9 @@ public class Main extends JRibbonFrame { public static ResizableIcon getTinyRibbonIcon(String name) { int d = 32; + if (name.endsWith("icon")) { + d = 24; + } return ImageWrapperResizableIcon.getIcon( Main.class.getResource("icons/" + name + ".png"), new Dimension(d, d)); @@ -502,6 +505,9 @@ public class Main extends JRibbonFrame { maingui.getRibbon().setApplicationMenu(menu); } + /** + * (Re)load recent file lists from storage. + */ public static void loadRecentFiles() { String files = PrefStorage.getSetting("recentfiles"); if (files.equals("")) { @@ -556,6 +562,10 @@ public class Main extends JRibbonFrame { PrefStorage.saveSetting("recentfiles", list); } + /** + * Add a file to the recent files lists. + * @param file The file path. + */ public static void addRecentFile(String file) { file = (new File(file)).getAbsolutePath(); String files = PrefStorage.getSetting("recentfiles"); diff --git a/src/net/apocalypselabs/symat/Settings.form b/src/net/apocalypselabs/symat/Settings.form index c8825c7..22a18a2 100644 --- a/src/net/apocalypselabs/symat/Settings.form +++ b/src/net/apocalypselabs/symat/Settings.form @@ -243,6 +243,9 @@ + + + diff --git a/src/net/apocalypselabs/symat/Settings.java b/src/net/apocalypselabs/symat/Settings.java index 1d5642f..129c2af 100644 --- a/src/net/apocalypselabs/symat/Settings.java +++ b/src/net/apocalypselabs/symat/Settings.java @@ -56,6 +56,7 @@ public class Settings extends javax.swing.JInternalFrame { */ public Settings() { initComponents(); + jPanel3.setVisible(false); setBackground(Theme.windowColor()); } @@ -187,6 +188,11 @@ public class Settings extends javax.swing.JInternalFrame { ); applyBtn.setText("Apply"); + applyBtn.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + applyBtnActionPerformed(evt); + } + }); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); @@ -266,6 +272,10 @@ public class Settings extends javax.swing.JInternalFrame { Main.loadRecentFiles(); }//GEN-LAST:event_clrRecentBtnActionPerformed + private void applyBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_applyBtnActionPerformed + doSave(); + }//GEN-LAST:event_applyBtnActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton applyBtn; private javax.swing.JButton clrRecentBtn; diff --git a/src/net/apocalypselabs/symat/help/licenses.html b/src/net/apocalypselabs/symat/help/licenses.html index 6ac32b9..d4212fd 100644 --- a/src/net/apocalypselabs/symat/help/licenses.html +++ b/src/net/apocalypselabs/symat/help/licenses.html @@ -48,6 +48,7 @@ contact Apocalypse Laboratories. If Apocalypse Laboratories allows or denies you permission, that decision is considered final and binding.

This application also uses libraries from third-parties.

+

tl;dr: Apache License, Modified BSD, GNU LGPL, Python Software License, Ubuntu Font License

Symja (parser), log4j, Java-Prettify, json-simple, java-etherpad-lite:

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -61,7 +62,34 @@ See the License for the specific language governing permissions and
limitations under the License.


-

Jython


+

Flamingo, Trident

+

Copyright (c) 2005-2010 Flamingo Kirill Grouchnikov. All Rights Reserved. + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: +
+ o Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +
+ o Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +
+ o Neither the name of Flamingo Kirill Grouchnikov nor the names of + its contributors may be used to endorse or promote products derived + from this software without specific prior written permission. +
+ 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 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 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 SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

Jython

PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and @@ -127,7 +155,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


-

JMathPlot


+

JMathPlot

Copyright (c) 2009, ยต-Labs All rights reserved.

Redistribution and use in source and binary forms, @@ -158,7 +186,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

HtmlCleaner


+

HtmlCleaner

Copyright (c) 2006-2014, HtmlCleaner team.
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -358,7 +386,7 @@ permanent authorization for you to choose that version for the
Library.


-

Additional License

+

GPL (inclusion required by LGPL)

GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

diff --git a/src/net/apocalypselabs/symat/icons/jsicon.png b/src/net/apocalypselabs/symat/icons/jsicon.png index 7edceb6..ec9061e 100644 Binary files a/src/net/apocalypselabs/symat/icons/jsicon.png and b/src/net/apocalypselabs/symat/icons/jsicon.png differ diff --git a/src/net/apocalypselabs/symat/icons/pyicon.png b/src/net/apocalypselabs/symat/icons/pyicon.png index 2ddc3fb..c1648f4 100644 Binary files a/src/net/apocalypselabs/symat/icons/pyicon.png and b/src/net/apocalypselabs/symat/icons/pyicon.png differ