diff --git a/build.xml b/build.xml index 97ee1db..bc22f55 100644 --- a/build.xml +++ b/build.xml @@ -79,7 +79,7 @@ identifier="${main.class}" mainclassname="${main.class}" icon="mac/icon.icns" - shortversion="1.0.3" + shortversion="1.0.4" copyright="© Bernhard Jenny 2007–2017" applicationCategory="public.app-category.graphics-design"> diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 210e903..3fecc42 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -903,6 +903,14 @@ is divided into following sections: + + + + + + + + @@ -1388,6 +1396,14 @@ is divided into following sections: + + + + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 4f0599a..6634e3d 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=2b38d8ad build.xml.stylesheet.CRC32=240b97a2 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=04319c1f -nbproject/build-impl.xml.script.CRC32=8aa11cdc +nbproject/build-impl.xml.data.CRC32=be631d95 +nbproject/build-impl.xml.script.CRC32=0f5a9361 nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48 diff --git a/nbproject/project.properties b/nbproject/project.properties index a626642..4d3407e 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -28,17 +28,16 @@ endorsed.classpath= excludes= file.reference.iText-2.1.3.jar=lib/iText-2.1.3.jar file.reference.jai_imageio.jar=lib/jai_imageio.jar -file.reference.JMapProjLib.jar=lib/JMapProjLib.jar file.reference.l2fprod-common-fontchooser.jar=lib/l2fprod-common-fontchooser.jar includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=false jar.index=${jnlp.enabled} javac.classpath=\ - ${file.reference.JMapProjLib.jar}:\ ${file.reference.jai_imageio.jar}:\ ${file.reference.l2fprod-common-fontchooser.jar}:\ ${file.reference.iText-2.1.3.jar}:\ + ${reference.JMapProjLib.jar}:\ ${libs.absolutelayout.classpath}:\ ${libs.swing-layout.classpath} # Space-separated list of extra javac options @@ -78,7 +77,9 @@ manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF mkdist.disabled=false platform.active=default_platform +project.JMapProjLib=../JMapProjLib project.license=gpl20 +reference.JMapProjLib.jar=${project.JMapProjLib}/dist/JMapProjLib.jar run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/nbproject/project.xml b/nbproject/project.xml index 7976e90..8a69e28 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -12,6 +12,15 @@ - + + + JMapProjLib + jar + + jar + clean + jar + + diff --git a/src/ika/app/Application.properties b/src/ika/app/Application.properties index 8d65295..28fb169 100644 --- a/src/ika/app/Application.properties +++ b/src/ika/app/Application.properties @@ -10,7 +10,7 @@ PreferencesPanel=ika.gui.FlexProjectorPreferencesPanel #The version of the application, numbers only in the format X.Y.Z, e.g. "1.12.5" #The last number is optional, i.e. "1.12" is valid. #The numbers can be followed by a string, such as "0.12 alpha" -ApplicationVersion=1.0.3 +ApplicationVersion=1.0.4 #a small icon for display in information dialogs ApplicationIcon=logo64x64.png diff --git a/src/ika/data/projections.txt b/src/ika/data/projections.txt index 63658d3..82cf252 100644 --- a/src/ika/data/projections.txt +++ b/src/ika/data/projections.txt @@ -12,11 +12,12 @@ Eckert IV, true Eckert V, true Eckert VI, true Eckert-Greifendorff, true, approx -Equidistant Cylindrical (Plate Carrée), true +Equirectangular, true Fahey, true, approx Foucaut, true, Foucaut Sinusoidal, true Gall (Gall Stereographic), true +Gall-Peters, true Ginzburg VIII (TsNIIGAiK 1944), true Goode Homolosine, true Hammer, true, approx