Revision: 6865 Author: [email protected] Date: Wed Nov 11 21:04:39 2009 Log: Merge r6786 and r6863 from releases/2.0 into this branch, which were adding and then updating the MissingPlugin GWT app.
http://code.google.com/p/google-web-toolkit/source/detail?r=6865 Added: /trunk/eclipse/plugins /trunk/plugins/MissingPlugin Replaced: /trunk/eclipse/plugins/MissingPlugin /trunk/eclipse/plugins/MissingPlugin/.checkstyle /trunk/eclipse/plugins/MissingPlugin/.classpath /trunk/eclipse/plugins/MissingPlugin/.project /trunk/eclipse/plugins/MissingPlugin/MissingPlugin-gwtc.launch /trunk/eclipse/plugins/MissingPlugin/MissingPlugin.launch /trunk/plugins/MissingPlugin/assets /trunk/plugins/MissingPlugin/assets/Download.psd /trunk/plugins/MissingPlugin/assets/download.png /trunk/plugins/MissingPlugin/build.xml /trunk/plugins/MissingPlugin/src /trunk/plugins/MissingPlugin/src/com /trunk/plugins/MissingPlugin/src/com/google /trunk/plugins/MissingPlugin/src/com/google/gwt /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/MissingPlugin.gwt.xml /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/AllDownloadsPane.java /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/AllDownloadsPane.ui.xml /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/DownloadBox.java /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/DownloadBox.ui.xml /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/DownloadEntry.java /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/DownloadInfo.java /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/InferredDownloadPane.java /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/InferredDownloadPane.ui.xml /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/MissingPlugin.java /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/MissingPluginPane.java /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/MissingPluginPane.ui.xml /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/UnsupportedBox.ui.xml /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/download.gif /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/unsupported.gif /trunk/plugins/MissingPlugin/war /trunk/plugins/MissingPlugin/war/MissingPlugin.html ======================================= --- /releases/2.0/plugins/MissingPlugin/assets/Download.psd Mon Nov 9 21:01:39 2009 +++ /trunk/plugins/MissingPlugin/assets/Download.psd Wed Nov 11 21:04:39 2009 Binary file, no diff available. ======================================= --- /releases/2.0/plugins/MissingPlugin/assets/download.png Mon Nov 9 21:01:39 2009 +++ /trunk/plugins/MissingPlugin/assets/download.png Wed Nov 11 21:04:39 2009 Binary file, no diff available. ======================================= --- /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/AllDownloadsPane.java Mon Nov 9 21:01:39 2009 +++ /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/AllDownloadsPane.java Wed Nov 11 21:04:39 2009 @@ -18,6 +18,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.JsArray; import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.resources.client.CssResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.uibinder.client.UiHandler; @@ -36,6 +37,13 @@ interface DownloadListPaneBinder extends UiBinder<Widget, AllDownloadsPane> { } + interface MyStyle extends CssResource { + String platforms(); + } + + @UiField + MyStyle style; + @UiField VerticalPanel downloadBoxes; @@ -54,6 +62,11 @@ if (link.isSupported()) { String linkContentHtml = link.getLinkContentHtml(); String href = link.getHref(); + String platforms = link.getPlatforms(); + if (platforms != null) { + linkContentHtml += "<br><span class=\"" + style.platforms() + "\">" + + platforms + "</span>"; + } DownloadBox box = new DownloadBox(linkContentHtml, href, true); downloadBoxes.add(box); downloadBoxes.setCellWidth(box, "100%"); ======================================= --- /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/AllDownloadsPane.ui.xml Mon Nov 9 21:01:39 2009 +++ /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/AllDownloadsPane.ui.xml Wed Nov 11 21:04:39 2009 @@ -12,7 +12,7 @@ <!-- implied. License for the specific language governing permissions and --> <!-- limitations under the License. --> <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"> - <ui:style> + <ui:style type='com.google.gwt.missingplugin.client.AllDownloadsPane.MyStyle'> .pane { } @@ -20,18 +20,23 @@ margin: 10px 0 0 30px; font-size: 100%; } - + .downloadBoxes { } - + .inferredDownloadLink { - margin-top: 2px; + margin-top: 2px; margin-right: 8px; - text-align: right; - font-size: 80%; - display: block; + text-align: right; + font-size: 80%; + display: block; color: black; } + + .platforms { + font-size: 80%; + font-style: italic; + } </ui:style> <g:HTMLPanel styleName="{style.pane}"> @@ -49,4 +54,4 @@ </table> </g:HTMLPanel> -</ui:UiBinder> +</ui:UiBinder> ======================================= --- /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/DownloadEntry.java Mon Nov 9 21:01:39 2009 +++ /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/DownloadEntry.java Wed Nov 11 21:04:39 2009 @@ -23,7 +23,7 @@ public final class DownloadEntry extends JavaScriptObject { protected DownloadEntry() { } - + public native String getHref()/*-{ return this.url; }-*/; @@ -31,9 +31,13 @@ public native String getLinkContentHtml()/*-{ return this.caption; }-*/; - - public native boolean isSupported() /*-{ + + public native String getPlatforms()/*-{ + return this.platforms; + }-*/; + + public native boolean isSupported() /*-{ return this.supported; }-*/; - -} + +} ======================================= --- /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/MissingPlugin.java Mon Nov 9 21:01:39 2009 +++ /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/MissingPlugin.java Wed Nov 11 21:04:39 2009 @@ -33,7 +33,7 @@ DownloadInfo r = getAmbientLinkInfo0(); assert r != null : "expecting $wnd.downloadInfo"; return r; - }; + } private native DownloadInfo getAmbientLinkInfo0() /*-{ return $wnd.downloadInfo; ======================================= --- /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/download.gif Mon Nov 9 21:01:39 2009 +++ /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/download.gif Wed Nov 11 21:04:39 2009 Binary file, no diff available. ======================================= --- /releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/unsupported.gif Mon Nov 9 21:01:39 2009 +++ /trunk/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/unsupported.gif Wed Nov 11 21:04:39 2009 Binary file, no diff available. ======================================= --- /releases/2.0/plugins/MissingPlugin/war/MissingPlugin.html Mon Nov 9 21:01:39 2009 +++ /trunk/plugins/MissingPlugin/war/MissingPlugin.html Wed Nov 11 21:04:39 2009 @@ -19,27 +19,27 @@ <script> var troubleshootingUrl = "http://code.google.com/webtoolkit/doc/1.6/FAQ_Troubleshooting.html";; - + // The missing plugin module expects downloadInfo.inferredDownloadId to contain the key to use // in allDownloads field. var downloadInfo = { "inferredDownloadId" : null, "troubleshootingUrl" : troubleshootingUrl, "allDownloads" : { - "unknown" : + "unknown" : { "caption" : "Regrettably, this browser is currently unsupported :-(", "url" : troubleshootingUrl, "supported" : false }, - - "firefox-old" : + + "firefox-old" : { "caption" : "Sorry, the GWT Developer Plugin only supports Firefox 3.0 and 3.5 at present", "url" : "http://www.getfirefox.com";, "supported" : false }, - + "opera" : { "caption" : "Sorry, there is currently no GWT Developer Plugin for Opera", @@ -47,21 +47,21 @@ "url" : "http://code.google.com/webtoolkit/makinggwtbetter.html#contributingcode";, "supported" : false }, - + "safari-mac-sl" : { "caption" : "Sorry, at the moment, there is not yet a GWT Developer Plugin for Safari on Mac OS X 10.6", "url" : troubleshootingUrl, "supported" : false }, - + "safari-iphone" : { "caption" : "Sorry, there is currently no GWT Developer Plugin for mobile Safari", "url" : troubleshootingUrl, "supported" : false }, - + "webkit-android" : { "caption" : "Sorry, there is currently no GWT Developer Plugin for mobile WebKit", @@ -83,14 +83,14 @@ "supported" : false }, - "chrome-win" : + "chrome-win" : { "caption" : "The GWT Developer Plugin requires Chrome 4 or later,<br>so click here to learn about switching to the Chrome DevChannel to get early access", "url" : "http://dev.chromium.org/getting-involved/dev-channel";, "supported" : false }, - "safari-win" : + "safari-win" : { "caption" : "Sorry, there is currently no GWT Developer Plugin for Safar on Windows", "url" : troubleshootingUrl, @@ -98,9 +98,10 @@ }, "firefox" : - { + { "caption" : "Download the GWT Developer Plugin<br>For Firefox", "url" : "https://dl-ssl.google.com/gwt/plugins/firefox/gwt-dev-plugin.xpi";, + "platforms" : "Win x86, Linux x86/x86_64, Mac x86/PPC", "supported" : true }, @@ -108,20 +109,23 @@ { "caption" : "Download the GWT Developer Plugin<br>For Internet Explorer", "url" : "http://google-web-toolkit.googlecode.com/svn/trunk/plugins/ie/prebuilt/GwtDevModeIePluginInstaller.msi";, + "platforms" : "Win x86", "supported" : true }, - - "chrome4-win" : + + "chrome4-win" : { "caption" : "Download the GWT Developer Plugin<br>For Chrome", - "url" : "http://google-web-toolkit.googlecode.com/svn/trunk/plugins/npapi/prebuilt/gwtdmp.crx";, + "url" : "https://dl-ssl.google.com/gwt/plugins/chrome/gwt-dev-plugin.crx";, + "platforms" : "Win x86", "supported" : true }, - - "safari-mac" : + + "safari-mac" : { "caption" : "Download the GWT Developer Plugin<br>For Safari", "url" : "http://google-web-toolkit.googlecode.com/svn/trunk/plugins/webkit/prebuilt/oophm.dmg";, + "platforms" : "Mac x86/PPC", "supported" : true } } @@ -170,17 +174,17 @@ id = 'firefox-old'; } } - downloadInfo.inferredDownloadId = id; - </script> - + downloadInfo.inferredDownloadId = id; + </script> + <script type="text/javascript" language="javascript" src="missingplugin/missingplugin.nocache.js"></script> </head> <noscript> <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> - The Google Web Toolkit Developer Plugin does not appear to be installed. - However, you also don't seem to have a browser that is willing to run JavaScript. - Please enable JavaScript or switch to a browser that supports JavaScript and try again. + The Google Web Toolkit Developer Plugin does not appear to be installed. + However, you also don't seem to have a browser that is willing to run JavaScript. + Please enable JavaScript or switch to a browser that supports JavaScript and try again. </div> </noscript> </body> -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
