Changeset 544

Timestamp:

11/27/13 15:29:04 (10 years ago)

Author:

jts21

Message:

Updated JfxBrowser to use search engine variable, and also fixed some logic errors in it

Location:

trunk/src/org/expeditee

Files:

• gui/FrameUtils.java (modified) (3 diffs)
• gui/UserSettings.java (modified) (1 diff)
• items/widgets/JfxBrowser.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -709 +709 @@
                                 } else if (attribute.equals("proxy")) {
                                         proxySetup(item);
+                                } else if (attribute.equals("settings")) {
+                                        generalSetup(item);
                                 } else if (attribute.equals("fillcolorwheel")) {
                                         Item.FILL_COLOR_WHEEL = getColorWheel(item);
@@ -736 +738 @@
                 return errors;
         }
+        
+        /**
+         * Loads general config from a frame
+         * @author jts21
+         */
+        private static void generalSetup(Item item) {
+                try {
+                        Frame child = item.getChild();
+                        String str, strLower;
+                        String searchEngine = "";
+                        // gather all the settings
+                        for(Item config : child.getAllItems()) {
+                                if(config instanceof Text) {
+                                        str = config.getText().trim();
+                                        strLower = str.toLowerCase();
+                                        if(strLower.startsWith("searchengine:")) {
+                                                searchEngine = str.substring(13).trim();
+                                        }
+                                }
+                        }
+                        // set all the settings to their defined values or their defaults
+                        if(searchEngine.length() == 0 || searchEngine.toLowerCase().equals("default")) {
+                                UserSettings.searchEngine = UserSettings.defaultSearchEngine;
+                                MessageBay.displayMessage("Defaulted search engine to " + UserSettings.searchEngine);
+                        } else {
+                                UserSettings.searchEngine = searchEngine;
+                                MessageBay.displayMessage("Set search engine to " + UserSettings.searchEngine);
+                        }
+                } catch(Exception e) {
+                        System.err.println("Failed to load config");
+                        e.printStackTrace();
+                }
+        }
 
         /**
@@ -748 +783 @@
                         for(Item config : child.getAllItems()) {
                                 if(config instanceof Text) {
-                                        String str = config.getText().trim().toLowerCase();
-                                        if(str.startsWith("host:")) {
+                                        String str = config.getText().trim();
+                                        String strLower = str.toLowerCase();
+                                        if(strLower.startsWith("host:")) {
                                                 if(host != null) {
                                                         MessageBay.displayMessage("host was defined multiple times!", Color.ORANGE);
                                                 }
                                                 host = str.substring(5).trim();
-                                        } else if(str.startsWith("port:")) {
+                                        } else if(strLower.startsWith("port:")) {
                                                 if(port!= null) {
                                                         MessageBay.displayMessage("port was defined multiple times!", Color.ORANGE);
                                                 }
                                                 port = str.substring(5).trim();
-                                        } else if(str.startsWith("user:")) {
+                                        } else if(strLower.startsWith("user:")) {
                                                 if(user != null) {
                                                         MessageBay.displayMessage("user was defined multiple times!", Color.ORANGE);
                                                 }
                                                 user = str.substring(6).trim();
-                                        } else if(str.startsWith("pass:")) {    // unencrypted password
+                                        } else if(strLower.startsWith("pass:")) {       // unencrypted password
                                                 if(pass != null) {
                                                         MessageBay.displayMessage("pass was defined multiple times!", Color.ORANGE);
                                                 }
                                                 pass = str.substring(6).trim();
-                                        } else if(str.startsWith("@iw:")) {             // widget
+                                        } else if(strLower.startsWith("@iw:")) {                // widget
                                                 // check if it's a password widget
-                                                if(str.substring(4).trim().startsWith("org.expeditee.items.widgets.password")) {
+                                                if(strLower.substring(4).trim().startsWith("org.expeditee.items.widgets.password")) {
                                                         if(passwordWidget == null) {
                                                                 try {

trunk/src/org/expeditee/gui/UserSettings.java

@@ -70 +70 @@
 
         public static Text StatTemplate = null;
+        
+        // The URL to prepend to web searches
+        public static final String defaultSearchEngine = "https://duckduckgo.com/?q=";
+        public static String searchEngine = defaultSearchEngine;
 
         // add default values

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

@@ -19 +19 @@
 import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.gui.UserSettings;
 import org.expeditee.items.Text;
 
@@ -292 +293 @@
                         // TODO: can/should we support other protocols such as ftp ???
                         if(!(textLower.startsWith("http://") || text.startsWith("https://"))) {
-                                // check if it's a search (will be a search if there is a ' ' before the first '.')
-                                // TODO: maybe support changing the default search engine (using a settings frame like the proxy settings frame)
+                                // check if it's a search
                                 int firstSpace = text.indexOf(" ");
                                 int firstDot = text.indexOf(".");
-                                if(firstSpace != -1 && firstSpace < firstDot) {
+                                int firstSlash = text.indexOf('/');
+                                int firstQuestion = text.indexOf('?');
+                                if(firstDot == -1 ||                                        // no '.' and no protocol -> search
+                                        (firstSpace != -1 && firstSpace <= firstDot + 1) || // ' ' before '.'         -> search
+                                        (firstSlash == -1 && firstQuestion == -1)) {        // no '/' or '?'          -> search
                                         // make it a search
-                                        text = "https://duckduckgo.com/?q=" + text;
+                                        text = UserSettings.searchEngine + text;
                                 } else {
                                         // add the missing protocol