Changeset 37341

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

Location:

main/trunk/gli

Files:

• classes/xml/configWebswing.xml (modified) (1 diff)
• src/org/greenstone/gatherer/Configuration.java (modified) (1 diff)
• src/org/greenstone/gatherer/Gatherer.java (modified) (5 diffs)
• src/org/greenstone/gatherer/GathererProg.java (modified) (2 diffs)
• src/org/greenstone/gatherer/file/FileManager.java (modified) (1 diff)

main/trunk/gli/classes/xml/configWebswing.xml

@@ -69 +69 @@
     <Argument name="coloring.collection_selection_background">128, 180, 216</Argument>
     <Argument name="coloring.collection_selection_foreground">0, 0, 0</Argument>
-    <Argument name="coloring.collection_tree_background">215, 237, 205</Argument>   <!-- pale green, used to be 223 250 224-->
+    <Argument name="coloring.collection_tree_background">215, 237, 205</Argument>   <!-- pale green, used to be 223, 250, 224-->
     <Argument name="coloring.collection_tree_foreground">0, 0, 0</Argument>
-    <Argument name="coloring.collection_noneditable_background">212, 212, 212</Argument> <!-- used to be 192, 192, 292 -->
+    <Argument name="coloring.collection_noneditable_background">212, 212, 212</Argument> <!-- used to be 192, 192, 192 -->
     <Argument name="coloring.collection_noneditable_foreground">0, 0, 0</Argument>
     <Argument name="coloring.disabled">206, 206, 206</Argument>

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

@@ -945 +945 @@
     UIManager.put("Panel.background", new ColorUIResource(getColor("coloring.collection_heading_background", false)));
     UIManager.put("Label.background", new ColorUIResource(getColor("coloring.collection_heading_background", false)));
-    UIManager.put("TabbedPane.background", new ColorUIResource(getColor("coloring.collection_heading_background", false)));
+
+    //
+    // Commenting out the following, as did not give the desired result in WebSwing GLI
+    // => Was causing the disabled text to tabs (e.g., when a collection is closed) to be bright green text
+    //    If comment this out has, in turn, an undesirable effect on Desktop GLI, then wrap up in an if-statement
+    //
+    //UIManager.put("TabbedPane.background", new ColorUIResource(getColor("coloring.collection_heading_background", false)));
     UIManager.put("SplitPane.background", new ColorUIResource(getColor("coloring.collection_heading_background", false)));
     UIManager.put("CheckBox.background", new ColorUIResource(getColor("coloring.collection_heading_background", false)));

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);
         }
 

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

@@ -61 +61 @@
     }
 
+
     GetOpt go = new GetOpt(args);
             
@@ -73 +74 @@
         // which is engineered through webswing.config to be the GLI home directory     
         
-        gli_user_directory_path = System.getProperty("user.dir") + File.separator + "webswing-users" + File.separator;
-        
-        //gli_user_directory_path = go.gsdl3_src_path + File.separator;
-        
-        // or GSDL3SRCHOME ???
-        //gli_user_directory_path = System.getProperty("user.dir") + File.separator;
-        //gli_user_directory_path = System.getenv("GSDL3SRCHOME") + File.separator;
+        gli_user_directory_path = System.getProperty("user.dir") + File.separator + "webswing-users" + File.separator;      
 
         File gli_user_directory = new File(gli_user_directory_path);

main/trunk/gli/src/org/greenstone/gatherer/file/FileManager.java

@@ -401 +401 @@
             String library_collect_file_url = library_collect_url + "/" + local_filename;
             
-            WebswingUtil.getWebswingApi().sendActionEvent("previewURL", library_collect_file_url, null);
+            WebswingUtil.getWebswingApi().sendActionEvent("downloadURL", library_collect_file_url, null);
             }
             else {