diff --git a/alkitab-core/src/kiyut/alkitab/bookviewer/ParallelBookViewerPane.java b/alkitab-core/src/kiyut/alkitab/bookviewer/ParallelBookViewerPane.java index 47c2ab5..a8a6662 100644 --- 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 index a36a1a5..eb3ff1b 100644 --- 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/alkitab-suite/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/alkitab-suite/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index decf19e..405b0a3 100644 --- a/alkitab-suite/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/alkitab-suite/branding/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 index bbf21ee..c463c25 100644 --- 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 index 88b7d89..2eed52b 100755 Binary files a/alkitab-suite/installer/izpack/setup.exe and b/alkitab-suite/installer/izpack/setup.exe differ diff --git a/alkitab-suite/installer/izpack/uninstaller.exe b/alkitab-suite/installer/izpack/uninstaller.exe index 487c99b..e5aa5e9 100755 Binary files a/alkitab-suite/installer/izpack/uninstaller.exe and b/alkitab-suite/installer/izpack/uninstaller.exe differ diff --git a/alkitab-suite/installer/launch4j/launch4j-installer-config.xml b/alkitab-suite/installer/launch4j/launch4j-installer-config.xml index c744dc7..a10d9da 100644 --- a/alkitab-suite/installer/launch4j/launch4j-installer-config.xml +++ b/alkitab-suite/installer/launch4j/launch4j-installer-config.xml @@ -8,17 +8,17 @@ normal - https://www.java.com/getjava + https://adoptopenjdk.net false false exe_icon.ico - + %JAVA_HOME%;%PATH% false - false - 11.0.4 + true + 1.11 preferJre 64/32 diff --git a/alkitab-suite/installer/launch4j/launch4j-uninstaller-config.xml b/alkitab-suite/installer/launch4j/launch4j-uninstaller-config.xml index ecb3112..004f6f3 100644 --- a/alkitab-suite/installer/launch4j/launch4j-uninstaller-config.xml +++ b/alkitab-suite/installer/launch4j/launch4j-uninstaller-config.xml @@ -8,17 +8,17 @@ normal - https://www.java.com/getjava + https://adoptopenjdk.net false false exe_icon.ico - + %JAVA_HOME%;%PATH% false - false - 11.0.4 + true + 1.11 preferJre 64/32 diff --git a/alkitab-suite/installer/readme.html b/alkitab-suite/installer/readme.html index 1974207..1e8bea8 100644 --- a/alkitab-suite/installer/readme.html +++ b/alkitab-suite/installer/readme.html @@ -40,6 +40,13 @@

What is it?

What's New

+

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)
  • @@ -149,6 +156,22 @@

    Launching Application

  • enjoy the product
+

Error cannot find Java 1.8 or higher

+

If you encounter this error cannot find Java 1.8 or higher, please reinstall the AdoptOpenJDK + (if you use AdopOpenJDK), and make sure to set both +

    +
  • to set JAVA_HOME variable enabled
  • +
  • to set Javasoft(Oracle) registry key enabled
  • +
+

+

Alternatively, you can edit the [INSTALL_DIR]/etc/alkitab.conf file and set the jdkhome directly by: +

    +
  • uncomment the jdkhome entry, by removing the # symbol
  • +
  • set it to your java path eg:
    + jdkhome="C:\Program Files\AdoptOpenJDK\jdk-11.0.4.11-hotspot" +
  • +
+