Release Alkitab 5.0

tonny-kohar · Sep 14, 2020 · f52e0bf · f52e0bf
1 parent fca3a30
commit f52e0bf
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 10 deletions.
diff --git a/alkitab-core/src/kiyut/alkitab/bookviewer/ParallelBookViewerPane.java b/alkitab-core/src/kiyut/alkitab/bookviewer/ParallelBookViewerPane.java
@@ -1060,6 +1060,15 @@ protected void search(String searchString, boolean ranked, int searchLimit) {
         }
 
         searching = true;
+        SwingUtilities.invokeLater(() -> {
+            try {
+                searchImpl(searchString, ranked, searchLimit);
+            } finally {
+                searching = false;
+            }
+        });
+
+        /*searching = true;
         Runnable runnable = () -> {
             ProgressHandle handle = ProgressHandleFactory.createHandle(bundle.getString("MSG_SearchInProgress.Text"), null, null);
             handle.switchToIndeterminate();
@@ -1073,6 +1082,7 @@ protected void search(String searchString, boolean ranked, int searchLimit) {
             }
         };
         RequestProcessor.getDefault().post(runnable);
+        */
     }
 
     private void searchImpl(String searchString, boolean ranked, int searchLimit) {

diff --git a/alkitab-suite/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/alkitab-suite/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -1,4 +1,5 @@
-#Mon, 14 Sep 2020 07:14:48 +0700
+#Updated by build script
+#Mon, 14 Sep 2020 17:55:28 +0700
 #Updated by build script
 #Mon, 14 Sep 2020 07:12:38 +0700
 SplashProgressBarBounds=0,255,530,6

diff --git a/...modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/...modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,3 +1,4 @@
-#Mon, 14 Sep 2020 07:14:48 +0700
+#Updated by build script
+#Mon, 14 Sep 2020 17:55:28 +0700
 CTL_MainWindow_Title=Alkitab Bible Study 5.0
 CTL_MainWindow_Title_No_Project=Alkitab Bible Study 5.0
diff --git a/alkitab-suite/changelogs.txt b/alkitab-suite/changelogs.txt
@@ -1,3 +1,9 @@
+ver 5.0
+- Improved performance
+- Updated to use JavaFX WebView
+- Updated to use Java 11 or higher
+- Updated to use Netbeans 12.0
+
 ver 4.0.1
 - Improved performance (search using thread)
 - Fix general options panel

diff --git a/alkitab-suite/installer/izpack/setup.exe b/alkitab-suite/installer/izpack/setup.exe
diff --git a/alkitab-suite/installer/izpack/uninstaller.exe b/alkitab-suite/installer/izpack/uninstaller.exe
diff --git a/alkitab-suite/installer/launch4j/launch4j-installer-config.xml b/alkitab-suite/installer/launch4j/launch4j-installer-config.xml
@@ -8,17 +8,17 @@
   <cmdLine></cmdLine>
   <chdir></chdir>
   <priority>normal</priority>
-  <downloadUrl>https://www.java.com/getjava</downloadUrl>
+  <downloadUrl>https://adoptopenjdk.net</downloadUrl>
   <supportUrl></supportUrl>
   <stayAlive>false</stayAlive>
   <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
   <icon>exe_icon.ico</icon>
   <jre>
-    <path></path>
+    <path>%JAVA_HOME%;%PATH%</path>
     <bundledJre64Bit>false</bundledJre64Bit>
-    <bundledJreAsFallback>false</bundledJreAsFallback>
-    <minVersion>11.0.4</minVersion>
+    <bundledJreAsFallback>true</bundledJreAsFallback>
+    <minVersion>1.11</minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
     <runtimeBits>64/32</runtimeBits>

diff --git a/alkitab-suite/installer/launch4j/launch4j-uninstaller-config.xml b/alkitab-suite/installer/launch4j/launch4j-uninstaller-config.xml
@@ -8,17 +8,17 @@
   <cmdLine></cmdLine>
   <chdir></chdir>
   <priority>normal</priority>
-  <downloadUrl>https://www.java.com/getjava</downloadUrl>
+  <downloadUrl>https://adoptopenjdk.net</downloadUrl>
   <supportUrl></supportUrl>
   <stayAlive>false</stayAlive>
   <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
   <icon>exe_icon.ico</icon>
   <jre>
-    <path></path>
+    <path>%JAVA_HOME%;%PATH%</path>
     <bundledJre64Bit>false</bundledJre64Bit>
-    <bundledJreAsFallback>false</bundledJreAsFallback>
-    <minVersion>11.0.4</minVersion>
+    <bundledJreAsFallback>true</bundledJreAsFallback>
+    <minVersion>1.11</minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
     <runtimeBits>64/32</runtimeBits>

diff --git a/alkitab-suite/installer/readme.html b/alkitab-suite/installer/readme.html
@@ -40,6 +40,13 @@ <h2>What is it?</h2>
         <p><a name="what_new"></a></p>
         <h2>What's New</h2>
         <blockquote>
+            <p>ver 5.0.</p>
+            <ul>
+                <li>Improved performance</li>
+                <li>Updated to use JavaFX WebView</li>
+                <li>Updated to use Java 11 or higher</li>
+                <li>Updated to use Netbeans 12.0</li>
+            </ul>
             <p>ver 4.0.1</p>
             <ul>
                 <li>Improved performance (search using thread)</li>
@@ -149,6 +156,22 @@ <h2>Launching Application</h2>
                 </li>
                 <li>enjoy the product</li>
             </ul>
+            <h3>Error cannot find Java 1.8 or higher</h3>
+            <p>If you encounter this error cannot find Java 1.8 or higher, please <strong>reinstall</strong> the AdoptOpenJDK 
+                (if you use AdopOpenJDK), and make sure to set both 
+                <ul>
+                    <li>to set JAVA_HOME variable <strong>enabled</strong></li>
+                    <li>to set Javasoft(Oracle) registry key <strong>enabled</strong></li>
+                </ul>
+            </p>
+            <p>Alternatively, you can edit the [INSTALL_DIR]/etc/alkitab.conf file and set the jdkhome directly by:
+                <ul>
+                    <li>uncomment the jdkhome entry, by removing the # symbol </li>
+                    <li>set it to your java path eg:<br/>
+                        jdkhome=&quot;C:\Program Files\AdoptOpenJDK\jdk-11.0.4.11-hotspot&quot;
+                    </li>
+                </ul>
+            </p>
         </blockquote>
         <p>&nbsp;</p>