License file updated for added libraries

master
skylarmt 9 years ago
parent 4f7aa90b08
commit d12dd3d128

@ -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");

@ -243,6 +243,9 @@
<Properties>
<Property name="text" type="java.lang.String" value="Apply"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="applyBtnActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Form>

@ -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;

@ -48,6 +48,7 @@
contact Apocalypse Laboratories. If Apocalypse Laboratories allows or denies
you permission, that decision is considered final and binding.</p>
<h2>This application also uses libraries from third-parties.</h2>
<h3>tl;dr: Apache License, Modified BSD, GNU LGPL, Python Software License, Ubuntu Font License</h3>
<p><b>Symja (parser), log4j, Java-Prettify, json-simple, java-etherpad-lite:</b></p>
<p>Licensed under the Apache License, Version 2.0 (the "License");<br>
you may not use this file except in compliance with the License.<br>
@ -61,7 +62,34 @@
See the License for the specific language governing permissions and<br>
limitations under the License.</p>
<br>
<p><b>Jython</b></p><br>
<p><b>Flamingo, Trident</b></p>
<p>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:
<br />
o Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
<br />
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.
<br />
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.
<br />
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.</p>
<p><b>Jython</b></p>
<p>PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2<br>
1. This LICENSE AGREEMENT is between the Python Software Foundation
(&quot;PSF&quot;), and the Individual or Organization (&quot;Licensee&quot;) 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.</p>
<br>
<p><b>JMathPlot</b></p><br>
<p><b>JMathPlot</b></p>
<p>Copyright (c) 2009, µ-Labs
All rights reserved.<br><br>
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.</p>
<p><b>HtmlCleaner</b></p><br>
<p><b>HtmlCleaner</b></p>
<p>Copyright (c) 2006-2014, HtmlCleaner team.<br>
All rights reserved.<br>
Redistribution and use of this software in source and binary forms, <br>
@ -358,7 +386,7 @@
permanent authorization for you to choose that version for the<br>
Library.<br>
</p><br>
<p><b>Additional License</b></p>
<p><b>GPL (inclusion required by LGPL)</b></p>
<p> GNU GENERAL PUBLIC LICENSE<br>
Version 3, 29 June 2007<br>
<br>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 654 B

After

Width:  |  Height:  |  Size: 525 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 704 B

After

Width:  |  Height:  |  Size: 587 B

Loading…
Cancel
Save