Changeset 37341 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2023-02-22T22:17:16+13:00 (14 months ago)

Author:

davidb

Message:

Next phase of webswing gli development: better colour for text on disabled tab text; busy cursor shown when first loading in; expanded to previewURL and downloadURL for better future-proofing

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (5 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -37 +37 @@
 import javax.swing.text.*;
 
+import org.webswing.toolkit.api.WebswingUtil;
 
 import org.greenstone.gatherer.Configuration;
@@ -92 +93 @@
     static private Dimension size = new Dimension(800, 540);
     static public RemoteGreenstoneServer remoteGreenstoneServer = null;
-    static public WebswingAuthenticator webswingAuthenticator = null;
+    static public WebswingAuthenticator webswingAuthenticator = null;
     
 
@@ -130 +131 @@
     static public boolean isGsdlRemote = false;
     static public boolean isLocalLibrary = false;
-    static public boolean isWebswing = false;
-
-    // for storing the original proxy settings on GLI startup    
-    private static Properties startup_proxy_settings = new Properties();
+    static public boolean isWebswing = false;
+
+    // for storing the original proxy settings on GLI startup    
+    private static Properties startup_proxy_settings = new Properties();
     
     /* TODO: If we're using local GLI, collections are built locally. If we're using client-GLI
@@ -175 +176 @@
         System.err.println("Version: " + PROGRAM_VERSION + "\n");
 
+        if (go.webswing) {
+            WebswingUtil.getWebswingApi().sendActionEvent("setCursor", "wait", null);
+        }
+        
         JarTools.initialise(this); 
 
-        //GetOpt go = new GetOpt(args);
 
         // Remember the GSDLOS value
@@ -828 +832 @@
         else {
             g_man.setVisible(true);
+        }
+        
+        if (isWebswing) {
+            WebswingUtil.getWebswingApi().sendActionEvent("setCursor", "default", null);
         }