1、更新Readme文件；2、更新jar包。

dewey00 · Jan 3, 2018 · 7be373c · 7be373c
1 parent 2fc3ad0
commit 7be373c
Show file tree

Hide file tree

Showing 27 changed files with 10 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -148,6 +148,7 @@ xJavaFxTool
 ```
 
 ![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/文件复制.png "文件复制.png")
+![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/邮件发送工具.png "邮件发送工具.png")
 ![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/Cron表达式生成器.png "Cron表达式生成器.png")
 ![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/Mq调试工具.png "Mq调试工具.png")
 ![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/正则表达式生成工具.png "正则表达式生成工具.png")
@@ -164,4 +165,8 @@ xJavaFxTool
 ![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/Redis连接工具.png "Redis连接工具.png")
 ![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/Ftp服务器.png "Ftp服务器.png")
 ![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/文件列表生成器.png "文件列表生成器.png")
-![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/图片压缩工具.jpg "图片压缩工具.jpg")
+![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/图片压缩工具.png "图片压缩工具.png")
+![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/Ftp客户端调试工具.png "Ftp客户端调试工具.png")
+![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/Pdf转换工具.png "Pdf转换工具.png")
+![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/图片转码工具.png "图片转码工具.png")
+![输入图片说明](https://git.oschina.net/xwintop/xJavaFxTool/raw/master/images/Cmd调试工具.png "Cmd调试工具.png")
diff --git a/images/Cmd调试工具.png b/images/Cmd调试工具.png
diff --git a/images/Cron表达式生成器.png b/images/Cron表达式生成器.png
diff --git a/images/Ftp客户端调试工具.png b/images/Ftp客户端调试工具.png
diff --git a/images/Ftp服务器.png b/images/Ftp服务器.png
diff --git a/images/Http调试工具.png b/images/Http调试工具.png
diff --git a/images/Mq调试工具.png b/images/Mq调试工具.png
diff --git a/images/Pdf转换工具.png b/images/Pdf转换工具.png
diff --git a/images/Redis连接工具.png b/images/Redis连接工具.png
diff --git a/images/Time转换.png b/images/Time转换.png
diff --git a/images/二维码生成工具.png b/images/二维码生成工具.png
diff --git a/images/加密解密.png b/images/加密解密.png
diff --git a/images/图标生成工具.png b/images/图标生成工具.png
diff --git a/images/图片压缩工具.jpg b/images/图片压缩工具.jpg
diff --git a/images/图片压缩工具.png b/images/图片压缩工具.png
diff --git a/images/图片转码工具.png b/images/图片转码工具.png
diff --git a/images/字符串转换.png b/images/字符串转换.png
diff --git a/images/文件列表生成器.png b/images/文件列表生成器.png
diff --git a/images/文件复制.png b/images/文件复制.png
diff --git a/images/正则表达式生成工具.png b/images/正则表达式生成工具.png
diff --git a/images/编码转换.png b/images/编码转换.png
diff --git a/images/网址缩短.png b/images/网址缩短.png
diff --git a/images/转义字符.png b/images/转义字符.png
diff --git a/images/邮件发送工具.png b/images/邮件发送工具.png
diff --git a/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java
@@ -1,6 +1,5 @@
 package com.xwintop.xJavaFxTool.controller;
 
-import com.xwintop.xJavaFxTool.Main;
 import com.xwintop.xJavaFxTool.model.ToolFxmlLoaderConfiguration;
 import com.xwintop.xJavaFxTool.services.IndexService;
 import com.xwintop.xJavaFxTool.utils.Config;
@@ -22,11 +21,11 @@
 import javafx.scene.control.Tab;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.springframework.boot.SpringApplication;
 
 import java.net.URL;
 import java.util.HashMap;
@@ -235,7 +234,7 @@ private void addWebView(String title, String url, String iconPath) {
 			webEngine.load(IndexController.class.getResource(url).toExternalForm());
 		}
 		if (singleWindowBootCheckBox.isSelected()) {
-			JavaFxViewUtil.getNewStage(title,iconPath, browser);
+			JavaFxViewUtil.getNewStage(title, iconPath, new BorderPane(browser));
 			return;
 		}
 		Tab tab = new Tab(title);

diff --git a/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java b/src/main/java/com/xwintop/xJavaFxTool/utils/Config.java
@@ -8,6 +8,6 @@
 public class Config {
 	public static Locale defaultLocale = Locale.getDefault();// 设置系统语言
 
-	public static final String xJavaFxToolVersions = "V0.1.1";// xJavaFxTool版本信息
-	public static final int xJavaFxToolVersionsInteger = 2;// xJavaFxTool更新信息
+	public static final String xJavaFxToolVersions = "V0.1.2";// xJavaFxTool版本信息
+	public static final int xJavaFxToolVersionsInteger = 3;// xJavaFxTool更新信息
 }
diff --git a/xJavaFxTool.jar b/xJavaFxTool.jar