Skip to content

Commit

Permalink
flatlaf update and new icons after instalation
Browse files Browse the repository at this point in the history
  • Loading branch information
davidbuzatto committed Dec 26, 2023
1 parent 8480495 commit df103c1
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 14 deletions.
4 changes: 2 additions & 2 deletions instalador/build-jpackage-options.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
--input ../dist/
--name CSCH
--main-jar CSCH.jar
--app-version 1.5.1
--app-version 1.5.2
--vendor 'Prof. Dr. David Buzatto'
--description 'Computer Supported Class Helper'
--icon pallete.ico
--icon icons.ico
--license-file ../dist/LICENSE.MD
--win-dir-chooser
--win-menu-group 'CSCH'
Expand Down
Binary file added instalador/icons.ico
Binary file not shown.
Binary file removed lib/FlatLaf-1.0/flatlaf-1.0.jar
Binary file not shown.
Binary file added lib/FlatLaf-3.2.5/flatlaf-3.2.5.jar
Binary file not shown.
6 changes: 3 additions & 3 deletions lib/nblibraries.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ libs.CopyLibs.classpath=\
${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
libs.CopyLibs.displayName=CopyLibs Task
libs.CopyLibs.prop-version=3.0
libs.FlatLaf-1.0.classpath=\
${base}/FlatLaf-1.0/flatlaf-1.0.jar
libs.FlatLaf-1.0.displayName=FlatLaf-1.0
libs.FlatLaf-3.2.5.classpath=\
${base}/FlatLaf-3.2.5/flatlaf-3.2.5.jar
libs.FlatLaf-3.2.5.displayName=FlatLaf-3.2.5
libs.JTS_1.18.1.classpath=\
${base}/JTS_1.18.1/jts-core-1.18.1.jar;\
${base}/JTS_1.18.1/jts-io-common-1.18.1.jar
Expand Down
Empty file added nbproject/licenseheader.txt
Empty file.
2 changes: 1 addition & 1 deletion nbproject/private/private.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ do.jlink=false
javac.debug=true
javadoc.preview=true
jlink.strip=false
user.properties.file=C:\\Users\\David\\AppData\\Roaming\\NetBeans\\16\\build.properties
user.properties.file=C:\\Users\\David\\AppData\\Roaming\\NetBeans\\19\\build.properties
8 changes: 7 additions & 1 deletion nbproject/private/private.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@
</file>
</editor-bookmarks>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group/>
<group>
<file>file:/D:/Google%20Drive/Projetos%20e%20Códigos/Computer%20Supported%20Class%20Helper/ComputerSupportedClassHelper/lib/nblibraries.properties</file>
<file>file:/D:/Google%20Drive/Projetos%20e%20Códigos/Computer%20Supported%20Class%20Helper/ComputerSupportedClassHelper/src/br/com/davidbuzatto/computersupportedclasshelper/gui/geom/CatmullRom.java</file>
<file>file:/D:/Google%20Drive/Projetos%20e%20Códigos/Computer%20Supported%20Class%20Helper/ComputerSupportedClassHelper/src/br/com/davidbuzatto/computersupportedclasshelper/gui/geom/Curve.java</file>
<file>file:/D:/Google%20Drive/Projetos%20e%20Códigos/Computer%20Supported%20Class%20Helper/ComputerSupportedClassHelper/src/br/com/davidbuzatto/computersupportedclasshelper/Main.java</file>
<file>file:/D:/Google%20Drive/Projetos%20e%20Códigos/Computer%20Supported%20Class%20Helper/ComputerSupportedClassHelper/src/br/com/davidbuzatto/computersupportedclasshelper/utils/Constants.java</file>
</group>
</open-files>
</project-private>
11 changes: 6 additions & 5 deletions nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ jar.archive.disabled=${jnlp.enabled}
jar.compress=false
jar.index=${jnlp.enabled}
javac.classpath=\
${libs.FlatLaf-1.0.classpath}:\
${libs.JTS_1.18.1.classpath}
${libs.JTS_1.18.1.classpath}:\
${libs.FlatLaf-3.2.5.classpath}
# Space-separated list of extra javac options
javac.compilerargs=-Xlint:unchecked
javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
javac.deprecation=false
javac.external.vm=true
javac.modulepath=
javac.processormodulepath=
javac.processorpath=\
${javac.classpath}
javac.source=17
javac.target=17
javac.source=18
javac.target=18
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
Expand Down Expand Up @@ -94,6 +94,7 @@ manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=default_platform
project.licensePath=./nbproject/licenseheader.txt
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class Main {
*/
public static void main( String args[] ) {

FlatDarkLaf.install();
FlatDarkLaf.setup();

/* Create and display the form */
java.awt.EventQueue.invokeLater(new Runnable() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
public interface Constants {

public static final long SERIAL_VERSION = 1;
public static final String VERSION = "v1.5.1";
public static final String VERSION = "v1.5.2";

public static final Color TRANSPARENT_COLOR = new Color( 0, 0, 0, 1 );

Expand Down

0 comments on commit df103c1

Please sign in to comment.