Changeset 829

Timestamp:

02/04/14 22:59:03 (10 years ago)

Author:

ngw8

Message:

More updates to jfxbrowser appearance - added progress bar behind URL bar, + minor CSS changes. Made go button actually work.

Location:

trunk/src/org/expeditee

Files:

• assets/style/jfx.css (modified) (3 diffs)
• items/widgets/JfxBrowser.java (modified) (10 diffs)

trunk/src/org/expeditee/assets/style/jfx.css

@@ -3 +3 @@
  * Author: ngw8
  */
+#jfxbrowser {
+    -light-gray: rgb(245, 245, 245);
+    -dark-gray: rgb(10, 10, 10);
+    -highlight: #79b3d4;
+    -fx-accent: -highlight;
+    -fx-shadow-highlight-color: rgba(255,255, 255, 0.4);
+    -fx-base: #eee;
+}
+
 
 .browser-overlay .progress-indicator {    
@@ -19 +28 @@
 }
 
-.button, .text-field
-{
+.button, .text-field {
     -fx-background-radius: 2;
     -fx-padding: 0.2em 1em 0.2em 1em;
 }
 
-.button.first, .text-field.first {
-    -fx-background-radius: 2 0 0 2;    
+.first {
+    -fx-background-radius: 2 0 0 2;
 }
 
-.button.last, .text-field.last {
+.last {
     -fx-background-radius: 0 2 2 0;
 }
@@ -35 +43 @@
 .custom-toolbar {
     -fx-font-size: 12px;
-    -fx-background-color:  linear-gradient(to bottom, rgb(230,230,230), rgba(200, 200,200));       
+    -fx-background-color:  linear-gradient(to bottom, derive(-fx-base, -2%), derive(-fx-base, -12%));       
     -fx-padding: 0.4em;
 }
 
-.hidden {
-    visibility: hidden;
+.url-field {
+    -fx-background-color: transparent;
+    -fx-text-fill: -dark-gray;
 }
+
+.url-progress-bar .track {
+    -fx-background-color:-light-gray;
+    
+    -fx-background-radius: 2 0 0 2;  
+
+}
+
+.url-progress-bar .bar {
+    -fx-background-color:
+        -light-gray, -light-gray, 
+        linear-gradient(to bottom, derive(-highlight,50%), derive(-highlight,30%)); /* actual color of the progess bit of the bar */
+    -fx-background-insets: 1;
+}
+
+/* Used when the page has completed loading */
+.url-progress-bar.completed .bar {
+    -fx-background-color:
+        -light-gray, -light-gray,
+        transparent; /* actual color of the progess bit of the bar */
+}
+

trunk/src/org/expeditee/items/widgets/JfxBrowser.java

@@ -30 +30 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
+import javafx.scene.control.ProgressBar;
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.TextField;
+import javafx.scene.effect.BlendMode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseButton;
@@ -73 +75 @@
         private WebEngine _webEngine;
         private TextField _urlField;
+        private ProgressBar _urlProgressBar;
         private StackPane _overlay;
         
@@ -152 +155 @@
                 try {
                         StackPane mainLayout = new StackPane();
+                        mainLayout.setId("jfxbrowser");
+                        
                         VBox vertical = new VBox();
                         HBox horizontal = new HBox();
@@ -167 +172 @@
 
                         this._urlField = new TextField(url);
-                        this._urlField.getStyleClass().add("first");
-                        this._urlField.setMinWidth(0);
+                        this._urlField.getStyleClass().addAll("first", "url-field");
                         this._urlField.setMaxWidth(Double.MAX_VALUE);
                         this._urlField.setFocusTraversable(false);
@@ -180 +184 @@
                         convertButton.setMinWidth(Button.USE_PREF_SIZE);
                         convertButton.setFocusTraversable(false);
-                        
-                        horizontal.getChildren().addAll(backButton, forwardButton, this._urlField, goButton, convertButton);
+                                                
+                        this._urlProgressBar = new ProgressBar();               
+                        this._urlProgressBar.getStyleClass().addAll("first", "url-progress-bar");
+                        this._urlProgressBar.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
+
+                        StackPane urlbar = new StackPane();
+                        urlbar.getChildren().addAll(_urlProgressBar, this._urlField);
+                                                
+                        horizontal.getChildren().addAll(backButton, forwardButton, urlbar, goButton, convertButton);
 
                         HBox.setHgrow(backButton, Priority.NEVER);
@@ -187 +198 @@
                         HBox.setHgrow(convertButton, Priority.NEVER);
                         HBox.setHgrow(goButton, Priority.NEVER);
-                        HBox.setHgrow(this._urlField, Priority.ALWAYS);
+                        HBox.setHgrow(urlbar, Priority.ALWAYS);
                         
                         HBox.setMargin(goButton, new Insets(0, 5, 0, 0));
@@ -198 +209 @@
                         VBox.setVgrow(this._webView, Priority.ALWAYS);
                         this._webEngine = this._webView.getEngine();
+                        
+                        this._urlProgressBar.progressProperty().bind(_webEngine.getLoadWorker().progressProperty());
 
                         vertical.getChildren().addAll(horizontal, this._webView);
@@ -223 +236 @@
                         mainLayout.getChildren().addAll(vertical, this._overlay);
                         
-                        Scene scene = new Scene(mainLayout);
-
-                        scene.getStylesheets().add(ClassLoader.getSystemResource("org/expeditee/assets/style/jfx.css").toString());
-
+                        final Scene scene = new Scene(mainLayout);
+                        
+                        final String cssPath = "file:///G:/Programming/Expeditee/Expeditee/src/org/expeditee/assets/style/jfx.css"; // ClassLoader.getSystemResource("org/expeditee/assets/style/jfx.css").toString();
+                        scene.getStylesheets().add(cssPath);
+                
                         this._panel.setScene(scene);
                         
@@ -258 +272 @@
                     navigateForward();
                 }
+                        });
+                        
+                        goButton.setOnAction(new EventHandler<ActionEvent>() {
+                                
+                                @Override
+                                public void handle(ActionEvent arg0) {
+                    navigate(JfxBrowser.this._urlField.getText());
+                                }
                         });
                         
@@ -396 +418 @@
                                                 // Updating the URL bar to display the URL of the page being loaded
                                                 JfxBrowser.this._urlField.setText(JfxBrowser.this._webEngine.getLocation());
-
+                                                
+                                                // Removing the style from the progress bar that causes it to hide
+                                                JfxBrowser.this._urlProgressBar.getStyleClass().remove("completed");
                                                 break;
                                         case SUCCEEDED: // SUCCEEDED
                                                 MessageBay.displayMessage("Finished loading page");
+                                                JfxBrowser.this._urlProgressBar.getStyleClass().add("completed");
                                                 break;
                                         case CANCELLED: // CANCELLED