From d12dd3d128a08b12ba0c61a232f41bceef4b3cd3 Mon Sep 17 00:00:00 2001 From: skylarmt Date: Fri, 27 Feb 2015 12:23:13 -0700 Subject: [PATCH] License file updated for added libraries --- src/net/apocalypselabs/symat/Main.java | 10 +++++ src/net/apocalypselabs/symat/Settings.form | 3 ++ src/net/apocalypselabs/symat/Settings.java | 10 +++++ .../apocalypselabs/symat/help/licenses.html | 36 ++++++++++++++++-- src/net/apocalypselabs/symat/icons/jsicon.png | Bin 654 -> 525 bytes src/net/apocalypselabs/symat/icons/pyicon.png | Bin 704 -> 587 bytes 6 files changed, 55 insertions(+), 4 deletions(-) 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 7edceb6c5ecbd8a603ef0fa5ee6c98c14aacf3b9..ec9061e1b5420fef80ffa04d5f8fab3d927a2e0d 100644 GIT binary patch delta 476 zcmV<20VDp71&stDiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_>mzR3k5L% z00l7tx9uoWkwzzf0g6dPK~zYIwbW0DjbRkW@z2quQM0iiMcE96-4qKeOABQ&8?m)V z$x2ySN$hPbWnp6}Wut~!$e>AL!EPdd8mYnjEbcqGruVvky7#v^=Y8JO@B5zfyw6j( zjzyEv;VCR8xibm(s`O9>JxP9!3-FZ delta 606 zcmV-k0-^nl1datEiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPN3kK`} z00!&<9(6c1kwzzf0t-n*K~z|U)t5bJ6+sk*zmr5I7SRxhKd6Nmv`RoQiRq%PSj03o zVq+s%*@z%2HmMcCCSoHfB8o*Kg4me|3Mmxq%!}A)h$smf5;+!c0^{TP_N~lj@xsE{ zJ9GDZyR$R1E8sCOO*t{x229%?E5lvVg_bgmz3rTSBtHw|EW1$Y{z9;E`vGX$rA)4&|?WZeO5e+RB-^^>#{SOMm3 zJF9=5S#U?vOgPTgwC#{|Thb!%3HS{Bkn~(qZ`})q$TI{zKwr??BlFF`3t)du|4qOV zGHx=(LUg8o#(WuA2>K`Ru4sURk$whr*zN+lfRQkR3I$k=bO+E5V0*##WL9wsfH#pI z1U^W*B56xA#VG*Bf%nmQCvX{^ s3J@SAKBhK}qx4@hQT@h$Rg(X}Z^}!F91DhL^#A|>07*qoM6N<$f-+J7KmY&$ diff --git a/src/net/apocalypselabs/symat/icons/pyicon.png b/src/net/apocalypselabs/symat/icons/pyicon.png index 2ddc3fbaeb59b76991b9362778ff03c526bb1a10..c1648f493cea8638c7051742d5a97729d84bea4c 100644 GIT binary patch delta 538 zcmV+#0_FX{1iBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_>mzR3k5L% z00l7tx9uoWkwzzf0mw;2K~zYI)s?+VTtO7YfA_J1XrmZVvZ+#;A_NvpVIhh^u&_v# zg$UZ%huHWh*jQ<2lc=C#5L9pxA+eDVB!Q47f|J)$efk79;K1YD zd*;qLZ|2RsF<=N-qdcuC1*}P$Du=q65tTzYY`5Pa6((kXmI2yb2K~7RT@BmnMuHW$;aOm+9$5zK*z-kf$03>YybDq|iS-qrV zV9B{o$2P}*Wl5)@Mv`6hF^KOv7MAI;nKb|{o-dvsoW$UM5brt8lK;pNFbLEFClqIU zr9lK>X4Mpz;Rx6PkaPe{JKy7&lk_90!E-Zv4}7CI{nwICf|}8DV5}kvuK)O&D z)PM2*pFm}a{%q=^9{?-B2O#aHW0Lm50yB$%zn;Efk@TmOP@KWGq=8Z$X7&uI13G|5 zP7lZE#2Q@I`pEyU3T<4{=bJP*Ab*mN$ZyvdmldBekd(PfUDDI*yv^;uaQ@4U)@){# cWzx_518Bjw{9B}Kr~m)}07*qoM6N<$f;b%V&j0`b delta 656 zcmV;B0&o4x1i%F$iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPN3kK`} z00!&<9(6c1kwzzf0zFAYK~z|U?Up%cRACf_zoTOnaRmz-R}e+CG7bugMYK>13K1)t zG?q4E3M(rsK`aCR8l>#?cl8%x?jIk`_x^C27f=36OL`(j7_f zff6tVOi1dJbXn5URQ#2M>yvanqu$lPU&s>CVVm**o&&Bj-U3@g{Mo=w0ENH_7!UlZ zRIgbb!!5wgFn=6y6R<1Hw*e~?Y~WG4Se}3zz(!y%&>j5ElG*@l_X8t=YYBK?z^`qO z&Q!pN?IGKLJwPik9JscCA65{sKj8QQH4B(B+rNRX;MyGUy?~37RwVd9-2@~y81SZm zp8?+!TmTMA+77HqeB;2YdI(U!r82NxV)CzAwxhtIFz>egw;lpE1pG0@#XH~#a6HUA zD;2C+fTSkiWN^KUyzLiE-Vp%HfjtQx1)fx@Tgd5uds@=6q{uN~UEpqI#9sq0rF>ns z|5R%-)0@yhf6NKFtASss*ygO*|G5d@0Ee>(+ha^Wk^{CgcYoRPmY@^(0PFz10zJT8 z+uy3>#En{U^VKR~*!KBq0g~1;c|3mtXMkctm6(1qW+k8&YX`DK-nRWYFS#BsqMaGO zA>dqBEy?u|;1qrewB+oQDa%@dcA)&~`I6h+ZcScEYk^O;f7H^rq5#{2S%EnsCV+vN q=D~b_6)y;w3lnf3c-f%-yZ-^T^!tB2Vu|Vi0000