get title of welcome window working wagain

benfry · benfry · commit 49f9819b2989 · 2015-08-06T16:34:21.000-04:00
diff --git a/app/src/processing/app/ui/WebFrame.java b/app/src/processing/app/ui/WebFrame.java
@@ -47,35 +47,27 @@ public class WebFrame extends JFrame {
 
 
   public WebFrame(File file, int width) throws IOException {
-    //setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
-
-//    String content = "Could not load " + file.getAbsolutePath();
-//    if (file != null) {
-//      String[] lines = PApplet.loadStrings(file);
-//      content = PApplet.join(lines, "\n");
-//    }
-
     // Need to use the URL version so that relative paths work for images
     // https://github.com/processing/processing/issues/3494
     URL fileUrl = file.toURI().toURL();  //.toExternalForm();
-//    int high = getContentHeight(width, content);
     requestContentHeight(width, fileUrl);
 
-//    while (contentHeight == 0) {
-//      try {
-//        Thread.sleep(2);
-//      } catch (InterruptedException ie) { }
-//    }
-
-//    int high = getContentHeight(width, content);
-//    editorPane = new JEditorPane("text/html", content);
     editorPane = new JEditorPane();
+
+    // Title cannot be set until the page has loaded
+    editorPane.addPropertyChangeListener("page", new PropertyChangeListener() {
+      public void propertyChange(PropertyChangeEvent evt) {
+        Object title = editorPane.getDocument().getProperty("title");
+        if (title instanceof String) {
+          setTitle((String) title);
+        }
+      }
+    });
+
     editorPane.setPage(fileUrl);
     editorPane.setEditable(false);
     // set height to something generic
     editorPane.setPreferredSize(new Dimension(width, width));
-//    editorPane.setPreferredSize(new Dimension(width, high));
-//    editorPane.setPreferredSize(new Dimension(width, contentHeight));
     getContentPane().add(editorPane);
 
     Toolkit.registerWindowCloseKeys(getRootPane(), new ActionListener() {
@@ -88,11 +80,6 @@ public void actionPerformed(ActionEvent e) {
     editorKit = (HTMLEditorKit) editorPane.getEditorKit();
     editorKit.setAutoFormSubmission(false);
 
-    Object title = editorPane.getDocument().getProperty("title");
-    if (title instanceof String) {
-      setTitle((String) title);
-    }
-
     editorPane.addHyperlinkListener(new HyperlinkListener() {
       @Override
       public void hyperlinkUpdate(HyperlinkEvent e) {
@@ -119,9 +106,6 @@ public void hyperlinkUpdate(HyperlinkEvent e) {
         }
       }
     });
-//    pack();
-//    setLocationRelativeTo(null);
-    //setVisible(true);
   }
 
 
@@ -146,7 +130,6 @@ public void run() {
             e.printStackTrace();
           }
         }
-//          System.out.println("setting visible");
         WebFrame.super.setVisible(visible);
       }
     }).start();
diff --git a/todo.txt b/todo.txt
@@ -16,6 +16,8 @@ X try to get images working in welcome screen
 X   https://github.com/processing/processing/blob/master/build/shared/lib/welcome/sketchbook.html#L60
 X   https://github.com/processing/processing/issues/3494
 X update to launch4j 3.8
+X inquire about updated document icon
+X fix frame title for web frame (welcome window title disappeared)
 
 fixed earlier
 X font fixes for Georgia in the examples
@@ -55,12 +57,7 @@ X   https://github.com/processing/processing/pull/3522
 X Adding ellipses only when text is long
 X   https://github.com/processing/processing/pull/3470
 
-_ re-close the google code stuff (goes read-only on 8/25)
-_   https://code.google.com/p/processing/adminAdvanced
-_   https://github.com/processing/
-
 beta
-_ set title of welcome window
 _ fix the red for the console/error stuff
 _   also the sidebar, the squiggly line beneath code, and the status bar
 _ write notes about changes with Toolkit and Util, and packages
@@ -81,7 +78,6 @@ _   https://github.com/processing/processing/issues/2953
 
 gui
 _ show hover text with 'debug'
-_ inquire about updated document icon
 _ don't show breakpoints when debugger is off
 _   https://github.com/processing/processing/issues/3093
 _ no setting breakpoints when debugger is off
@@ -117,6 +113,8 @@ _ recent menu gets huge with other p5 versions on osx
 
 
 pde/build
+_ move processing.mode.java.pdex.XQErrorTable to processing.ui.ErrorTable
+_   need to make the list abstract, also "scroll to line" feature
 _ can't install processing-java into /usr/bin with El Capitan
 _   https://github.com/processing/processing/issues/3497
 _ Foundation library examples should appear under "Core" or "Foundation"
