Fix bug , not reloading website after internet connection

goxr3plus · Jan 13, 2018 · b434b2e · b434b2e
1 parent 2ffb673
commit b434b2e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 42 deletions.
diff --git a/resources/fxml/WebBrowserTabController.fxml b/resources/fxml/WebBrowserTabController.fxml
@@ -6,6 +6,7 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.control.TextArea?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.control.Tooltip?>
@@ -75,11 +76,6 @@
                                  </cursor>
                               </Button>
                               <TextField fx:id="searchBar" promptText="Search..." style="-fx-background-radius: 45;" styleClass="jfx-text-area" HBox.hgrow="ALWAYS" />
-                              <ComboBox fx:id="searchEngineComboBox" promptText="Search Engine">
-                                 <cursor>
-                                    <Cursor fx:constant="HAND" />
-                                 </cursor>
-                              </ComboBox>
                               <Button fx:id="goButton" mnemonicParsing="false" style="-fx-background-radius: 0 45 45 0;" text="Go">
                                  <tooltip>
                                     <Tooltip text="Load the Web Site" />
@@ -88,6 +84,14 @@
                                     <Cursor fx:constant="HAND" />
                                  </cursor>
                               </Button>
+                              <ComboBox fx:id="searchEngineComboBox" promptText="Search Engine">
+                                 <cursor>
+                                    <Cursor fx:constant="HAND" />
+                                 </cursor>
+                                 <HBox.margin>
+                                    <Insets left="5.0" />
+                                 </HBox.margin>
+                              </ComboBox>
                            </children>
                         </HBox>
 <!--                         <SearchEngineComboBox fx:id="searchEngineComboBox" prefHeight="31.0" prefWidth="152.0" promptText="search engine">
@@ -115,11 +119,17 @@
                </image>
             </ImageView>
             <Label styleClass="sideBarSectionLabel" text="Server not found" textAlignment="CENTER" wrapText="true" />
-            <TextArea editable="false" focusTraversable="false" maxHeight="-Infinity" maxWidth="-Infinity" mouseTransparent="true" prefHeight="156.0" prefWidth="587.0" text="&#10;1.Check the address for typing errors such as ww.example.com instead of www.example.com&#10;&#10;2.If you are unable to load any pages, check your computer’s network connection.&#10;&#10;3.If your computer or network is protected by a firewall or proxy, make sure that XR3Player is permitted to access the Web." wrapText="true" />
-            <JFXButton fx:id="tryAgain" buttonType="RAISED" ripplerFill="#fa0c0c" text="Try Again">
+            <TextArea editable="false" focusTraversable="false" maxHeight="-Infinity" maxWidth="-Infinity" mouseTransparent="true" text="&#10;1.Check the address for typing errors such as ww.example.com instead of www.example.com&#10;&#10;2.If you are unable to load any pages, check your computer’s network connection.&#10;&#10;3.If your computer or network is protected by a firewall or proxy, make sure that XR3Player is permitted to access the Web." wrapText="true">
+               <VBox.margin>
+                  <Insets left="5.0" right="5.0" />
+               </VBox.margin></TextArea>
+            <JFXButton fx:id="tryAgain" buttonType="RAISED" contentDisplay="RIGHT" ripplerFill="#fa0c0c" text="Try Again">
                <cursor>
                   <Cursor fx:constant="HAND" />
                </cursor>
+               <graphic>
+                  <ProgressIndicator fx:id="tryAgainIndicator" styleClass="dropbox-progress-indicator" visible="false" />
+               </graphic>
             </JFXButton>
          </children>
       </VBox>

diff --git a/src/main/java/assembly/assembly.xml b/src/main/java/assembly/assembly.xml
diff --git a/src/main/java/com/goxr3plus/javafxwebbrowser/browser/WebBrowserTabController.java b/src/main/java/com/goxr3plus/javafxwebbrowser/browser/WebBrowserTabController.java
@@ -33,6 +33,7 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.ProgressBar;
+import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TextField;
 import javafx.scene.control.Tooltip;
@@ -96,6 +97,9 @@ public class WebBrowserTabController extends StackPane {
 
     @FXML
     private JFXButton tryAgain;
+
+	@FXML
+	private ProgressIndicator tryAgainIndicator;
 
 	// -------------------------------------------------------------
 
@@ -429,13 +433,19 @@ public VBox getErrorPane() {
 	 */
 	void checkForInternetConnection() {
 
+		//tryAgainIndicator
+		tryAgainIndicator.setVisible(true);
+
 		//Check for internet connection
 		Thread thread = new Thread(() -> {
 			boolean hasInternet = InfoTool.isReachableByPing("www.google.com");
 			Platform.runLater(() -> {
 				errorPane.setVisible(!hasInternet);
-				if (hasInternet)
-					reloadWebSite();
+				tryAgainIndicator.setVisible(false);
+
+				//Reload the website if it has internet
+				if(hasInternet)
+					reloadWebSite();	
 			});
 		}, "Internet Connection Tester Thread");
 		thread.setDaemon(true);