1.0.7.48

yccheok · yccheok · commit c4bb6d88647a · 2021-04-09T14:09:56.000+08:00
diff --git a/appengine/jstock-static/war/news_information/index.html b/appengine/jstock-static/war/news_information/index.html
@@ -4,21 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.47 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.48 had been released.</p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
 
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">    
-      Feature: Added stock rename. Change stock code or stock symbol in buy portfolio, sell portfolio and dividend.
+      Feature: Able to launch cloud login page in external browser.
     </p>   
 
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
     
-    <img src="https://raw.githubusercontent.com/yccheok/jstock/master/appengine/jstock-static/war/news_information/0.png"></img>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.47 from <a href="http://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.48 from <a href="http://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
     
     </body>
 </html>
diff --git a/appengine/jstock-static/war/news_information/index.txt b/appengine/jstock-static/war/news_information/index.txt
@@ -1,3 +1,3 @@
 id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
-news_id=31/01/2021
+news_id=09/04/2021
 news_url=https://raw.githubusercontent.com/yccheok/jstock/master/appengine/jstock-static/war/news_information/index.html
diff --git a/appengine/jstock-static/war/news_information/zh/index.html b/appengine/jstock-static/war/news_information/zh/index.html
@@ -4,21 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.47 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.48 had been released.</p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
 
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">    
-      Feature: Added stock rename. Change stock code or stock symbol in buy portfolio, sell portfolio and dividend.
+      Feature: Able to launch cloud login page in external browser.
     </p>   
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
     
-    <img src="https://raw.githubusercontent.com/yccheok/jstock/master/appengine/jstock-static/war/news_information/0.png"></img>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.47 from <a href="http://jstock.org/zh/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/zh/download.html</a>. After upgrade, your personal data will be preserved.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.48 from <a href="http://jstock.org/zh/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/zh/download.html</a>. After upgrade, your personal data will be preserved.</p>
     
     </body>
 </html>
diff --git a/appengine/jstock-static/war/news_information/zh/index.txt b/appengine/jstock-static/war/news_information/zh/index.txt
@@ -1,3 +1,3 @@
 id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
-news_id=31/01/2021
+news_id=09/04/2021
 news_url=https://raw.githubusercontent.com/yccheok/jstock/master/appengine/jstock-static/war/news_information/index.html
diff --git a/appengine/jstock-static/war/version_information/index.txt b/appengine/jstock-static/war/version_information/index.txt
@@ -1,5 +1,5 @@
-applicationVersionID=1177
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-47/jstock-1.0.7.47-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-47/jstock-1.0.7.47-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-47/jstock-1.0.7.47-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-47/jstock-1.0.7.47-bin.zip
+applicationVersionID=1178
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-48/jstock-1.0.7.48-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-48/jstock-1.0.7.48-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-48/jstock-1.0.7.48-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-48/jstock-1.0.7.48-bin.zip
diff --git a/appengine/jstock-static/war/version_information/zh/index.txt b/appengine/jstock-static/war/version_information/zh/index.txt
@@ -1,5 +1,5 @@
-applicationVersionID=1177
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-47/jstock-1.0.7.47-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-47/jstock-1.0.7.47-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-47/jstock-1.0.7.47-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-47/jstock-1.0.7.47-bin.zip
+applicationVersionID=1178
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-48/jstock-1.0.7.48-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-48/jstock-1.0.7.48-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-48/jstock-1.0.7.48-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-48/jstock-1.0.7.48-bin.zip
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,6 +1,9 @@
 ﻿This file summarizes changes in JStock releases.
 Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX)
 
+JStock 1.0.7.48 - 2021-04-09
+  Feature: Able to launch cloud login page in external browser.
+  
 JStock 1.0.7.47 - 2021-01-31
   Bugfix:  Fix "open from cloud" for macOS.
            
diff --git a/installer/windows/jstock.nsi b/installer/windows/jstock.nsi
@@ -12,7 +12,7 @@ Name ${PRODUCT_NAME}
 RequestExecutionLevel admin ;Workaround for Vista
 
 ; The file to write
-OutFile "jstock-1.0.7.46-setup.exe"
+OutFile "jstock-1.0.7.48-setup.exe"
 LicenseData "gpl-2.0.txt"
  
 ; The default installation directory
diff --git a/installer/windows/jstock.xml b/installer/windows/jstock.xml
@@ -27,12 +27,12 @@
     <opt>-Dsun.java2d.dpiaware=false</opt>
   </jre>
   <versionInfo>
-    <fileVersion>1.1.7.6</fileVersion>
-    <txtFileVersion>1.1.7.6</txtFileVersion>
+    <fileVersion>1.1.7.8</fileVersion>
+    <txtFileVersion>1.1.7.8</txtFileVersion>
     <fileDescription>JStock - Stock Market Software</fileDescription>
     <copyright>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</copyright>
-    <productVersion>1.1.7.6</productVersion>
-    <txtProductVersion>1.1.7.6</txtProductVersion>
+    <productVersion>1.1.7.8</productVersion>
+    <txtProductVersion>1.1.7.8</txtProductVersion>
     <productName>JStock - Stock Market Software</productName>
     <companyName>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</companyName>
     <internalName>jstock</internalName>
diff --git a/src/org/yccheok/jstock/data/gui.properties b/src/org/yccheok/jstock/data/gui.properties
@@ -800,3 +800,6 @@ RenameStockJDialog_OriginalCode=Original Code
 RenameStockJDialog_OriginalSymbol=Original Symbol
 RenameStockJDialog_OK=OK
 RenameStockJDialog_Cancel=Cancel
+
+SimpleSwingBrowser_File=File
+SimpleSwingBrowser_OpenInBrowser=Open in Browser
diff --git a/src/org/yccheok/jstock/data/gui_de.properties b/src/org/yccheok/jstock/data/gui_de.properties
@@ -797,3 +797,6 @@ RenameStockJDialog_NewSymbol=New Symbol
 RenameStockJDialog_New=New
 RenameStockDialog_NewCode=New Code
 RenameStockJDialog_Description=Change stock code or stock symbol in buy portfolio, sell portfolio and dividend.
+
+SimpleSwingBrowser_File=File
+SimpleSwingBrowser_OpenInBrowser=Open in Browser
diff --git a/src/org/yccheok/jstock/data/gui_en.properties b/src/org/yccheok/jstock/data/gui_en.properties
@@ -800,3 +800,6 @@ RenameStockJDialog_NewSymbol=New Symbol
 RenameStockJDialog_New=New
 RenameStockDialog_NewCode=New Code
 RenameStockJDialog_Description=Change stock code or stock symbol in buy portfolio, sell portfolio and dividend.
+
+SimpleSwingBrowser_File=File
+SimpleSwingBrowser_OpenInBrowser=Open in Browser
diff --git a/src/org/yccheok/jstock/data/gui_it.properties b/src/org/yccheok/jstock/data/gui_it.properties
@@ -800,3 +800,6 @@ RenameStockJDialog_NewSymbol=New Symbol
 RenameStockJDialog_New=New
 RenameStockDialog_NewCode=New Code
 RenameStockJDialog_Description=Change stock code or stock symbol in buy portfolio, sell portfolio and dividend.
+SimpleSwingBrowser_File=File
+SimpleSwingBrowser_OpenInBrowser=Open in Browser
+
diff --git a/src/org/yccheok/jstock/data/gui_zh.properties b/src/org/yccheok/jstock/data/gui_zh.properties
@@ -794,3 +794,6 @@ RenameStockJDialog_Original=\u539f\u59cb
 RenameStockJDialog_OriginalCode=\u539f\u59cb\u80a1\u7968\u4ee3\u53f7
 RenameStockJDialog_OriginalSymbol=\u539f\u59cb\u540d\u79f0
 RenameStockJDialog_Description=\u5728\u4e70\u5165\u7ec4\u5408\u3001\u5356\u51fa\u7ec4\u5408\u548c\u80a1\u606f\u4e2d\u66f4\u6539\u80a1\u7968\u4ee3\u53f7\u6216\u540d\u79f0\u3002
+
+SimpleSwingBrowser_File=\u6863\u6848
+SimpleSwingBrowser_OpenInBrowser=\u5728\u6d4f\u89c8\u5668\u4e2d\u6253\u5f00
diff --git a/src/org/yccheok/jstock/data/gui_zh_TW.properties b/src/org/yccheok/jstock/data/gui_zh_TW.properties
@@ -792,3 +792,6 @@ RenameStockDialog_NewCode=\u65b0\u80a1\u7968\u4ee3\u865f
 RenameStockJDialog_Cancel=\u53d6\u6d88
 RenameStockJDialog_OK=\u78ba\u5b9a
 RenameStockJDialog_Description=\u5728\u8cb7\u5165\u7d44\u5408\u3001\u8ce3\u51fa\u7d44\u5408\u548c\u80a1\u606f\u4e2d\u66f4\u6539\u80a1\u7968\u4ee3\u865f\u6216\u540d\u7a31\u3002
+
+SimpleSwingBrowser_File=\u6a94\u6848
+SimpleSwingBrowser_OpenInBrowser=\u5728\u700f\u89bd\u5668\u4e2d\u6253\u958b
diff --git a/src/org/yccheok/jstock/google/SimpleSwingBrowser.java b/src/org/yccheok/jstock/google/SimpleSwingBrowser.java
@@ -20,11 +20,18 @@
 package org.yccheok.jstock.google;
 
 import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
+import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -37,21 +44,51 @@
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javax.swing.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.yccheok.jstock.gui.JStock;
 import org.yccheok.jstock.internationalization.MessagesBundle;
   
 public class SimpleSwingBrowser extends JDialog {
  
+    private static final Log log = LogFactory.getLog(SimpleSwingBrowser.class);
+    
     private final JFXPanel jfxPanel = new JFXPanel();
     private WebEngine engine;
     private String loadedURL = null;
     private final JPanel panel = new JPanel(new BorderLayout());
- 
+    private String url;
+    
     public SimpleSwingBrowser() {
         super(JStock.instance(), JDialog.ModalityType.APPLICATION_MODAL);
         initComponents();
+        initMenu();
     }
 
+    private void initMenu() {
+        JMenuBar jMenuBar = new javax.swing.JMenuBar();
+        JMenu jMenu = new javax.swing.JMenu();
+        JMenuItem jMenuItem = new javax.swing.JMenuItem();
+        
+        jMenu.add(jMenuItem);
+        jMenuBar.add(jMenu);
+
+        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/yccheok/jstock/data/gui");
+        jMenu.setText(bundle.getString("SimpleSwingBrowser_File"));
+        jMenuItem.setText(bundle.getString("SimpleSwingBrowser_OpenInBrowser"));
+
+        jMenuItem.addActionListener((ActionEvent e) -> {
+            if (url != null && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+                try {
+                    Desktop.getDesktop().browse(new URI(url));
+                } catch (URISyntaxException | IOException ex) {
+                    log.error(null, ex);
+                }
+            }
+        });
+        
+        setJMenuBar(jMenuBar);
+    }
     
     private void initComponents() {
         createScene();
@@ -137,6 +174,8 @@ public void onChanged(Change<? extends Node> change) {
     }
  
     public void loadURL(final String url) {
+        this.url = url;
+        
         Platform.runLater(new Runnable() {
             @Override 
             public void run() {
diff --git a/src/org/yccheok/jstock/gui/Utils.java b/src/org/yccheok/jstock/gui/Utils.java
@@ -2752,11 +2752,11 @@ public ApplicationInfo(int applicationVersionID, String windowsDownloadLink, Str
 
     ////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////
-    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.47";
+    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.48";
 
-    // 1.0.7.47
+    // 1.0.7.48
     // For About box comparision on latest version purpose.
-    private static final int APPLICATION_VERSION_ID = 1177;
+    private static final int APPLICATION_VERSION_ID = 1178;
     ////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////
     
