You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2011/12/09 23:59:59 UTC
svn commit: r1212676 - in /incubator/airavata/trunk/modules:
commons/utils/src/main/java/org/apache/airavata/common/utils/
xbaya-gui/src/main/java/org/apache/airavata/xbaya/
xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/
xbaya-gui/src/main/reso...
Author: samindaw
Date: Fri Dec 9 22:59:59 2011
New Revision: 1212676
URL: http://svn.apache.org/viewvc?rev=1212676&view=rev
Log:
updating application icon + updating about dialog
Added:
incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/images/airavata-name.png (with props)
Modified:
incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/SwingUtil.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaVersion.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java
Modified: incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/SwingUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/SwingUtil.java?rev=1212676&r1=1212675&r2=1212676&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/SwingUtil.java (original)
+++ incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/SwingUtil.java Fri Dec 9 22:59:59 2011
@@ -28,7 +28,9 @@ import java.awt.Dimension;
import java.awt.Frame;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
+import java.awt.Image;
import java.awt.Insets;
+import java.awt.Toolkit;
import java.net.URL;
import java.util.List;
@@ -81,8 +83,7 @@ public class SwingUtil {
*/
public static ImageIcon createImageIcon(String filename) {
ImageIcon icon = null;
- String path = "/images/" + filename;
- URL imgURL = SwingUtil.class.getResource(path);
+ URL imgURL = getImageURL(filename);
if (imgURL != null) {
icon = new ImageIcon(imgURL);
}
@@ -90,6 +91,27 @@ public class SwingUtil {
}
/**
+ * Creates an image from an image contained in the "images" directory.
+ *
+ * @param filename
+ * @return the Image created
+ */
+ public static Image createImage(String filename) {
+ Image icon = null;
+ URL imgURL = getImageURL(filename);
+ if (imgURL != null) {
+ icon = Toolkit.getDefaultToolkit().getImage(imgURL);
+ }
+ return icon;
+ }
+
+ public static URL getImageURL(String filename) {
+ String path = "/images/" + filename;
+ URL imgURL = SwingUtil.class.getResource(path);
+ return imgURL;
+ }
+
+ /**
* Return the Frame of a specified component if any.
*
* @param component
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaVersion.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaVersion.java?rev=1212676&r1=1212675&r2=1212676&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaVersion.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaVersion.java Fri Dec 9 22:59:59 2011
@@ -26,7 +26,7 @@ public class XBayaVersion {
/**
* Version number
*/
- public final static String VERSION = "0.1-INCUBATING";
+ public final static String VERSION = "0.2-INCUBATING";
/**
* Prints the version
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java?rev=1212676&r1=1212675&r2=1212676&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java Fri Dec 9 22:59:59 2011
@@ -25,6 +25,7 @@ import java.awt.event.ActionEvent;
import java.net.URL;
import javax.swing.AbstractAction;
+import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JEditorPane;
import javax.swing.JPanel;
@@ -33,6 +34,7 @@ import javax.swing.event.HyperlinkEvent.
import javax.swing.event.HyperlinkListener;
import org.apache.airavata.common.utils.BrowserLauncher;
+import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.XBayaVersion;
@@ -80,12 +82,26 @@ public class AboutWindow {
}
});
buttonPanel.add(okButton);
-
- String message = "<html>" + "<h2>" + XBayaConstants.PROJECT_NAME + "</h2>" + XBayaConstants.APPLICATION_NAME
- + "<br>" + "Version: " + XBayaVersion.VERSION + "<br>" + "<a href='"
- + XBayaConstants.WEB_URL.toString() + "'>" + XBayaConstants.WEB_URL.toString() + "</a>" + "</html>";
+ String styles="<style type=\"text/css\">"+
+ "body {"+
+ "font-family:Arial, Helvetica, sans-serif"+
+ "}"+
+ ".centeredImage"+
+ "{"+
+ " text-align:center;"+
+ " display:block;"+
+ "}"+
+ "</style>";
+ buttonPanel.setBorder(BorderFactory.createEtchedBorder());
+ String imgLogoTag="";//"<img src=\""+SwingUtil.getImageURL("airavata-2.png").toString()+"\" class=\".centeredImage\" /><br>";
+ String imgHeadingTag="<div style=\"width:100%;margin-right:10px;margin-left:10px;margin-top:5px;\" ><img src=\""+SwingUtil.getImageURL("airavata-name.png").toString()+"\" class=\".centeredImage\" /></div><br>";
+ String projectNameText = "";//"<h1>" + XBayaConstants.PROJECT_NAME + "</h1>";
+ String message = "<html>"+ styles +"<body align=\"center\">" + "<div style=\"background-color:white;width:100%;margin-bottom:0px;\">"+projectNameText + imgHeadingTag+ imgLogoTag +"</div><br><h2>" +XBayaConstants.APPLICATION_NAME + "</h2>" + "Version: "
+ + XBayaVersion.VERSION + "<br>" + "<a href='" + XBayaConstants.WEB_URL.toString() + "'>" + XBayaConstants.WEB_URL.toString() + "</a>"
+ + "<br> </body></html>";
JEditorPane editorPane = new JEditorPane(XmlConstants.CONTENT_TYPE_HTML, message);
editorPane.setEditable(false);
+ editorPane.setBorder(BorderFactory.createEtchedBorder());
editorPane.setBackground(buttonPanel.getBackground());
editorPane.addHyperlinkListener(new HyperlinkListener() {
public void hyperlinkUpdate(HyperlinkEvent event) {
@@ -104,5 +120,6 @@ public class AboutWindow {
this.dialog = new XBayaDialog(this.engine, XBayaConstants.PROJECT_NAME, editorPane, buttonPanel);
this.dialog.setDefaultButton(okButton);
+// this.dialog.setCancelButton(okButton);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaDialog.java?rev=1212676&r1=1212675&r2=1212676&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaDialog.java Fri Dec 9 22:59:59 2011
@@ -27,6 +27,8 @@ import java.awt.Dimension;
import java.awt.Frame;
import java.awt.Toolkit;
import java.awt.Window;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
import javax.swing.JButton;
import javax.swing.JComponent;
@@ -212,6 +214,27 @@ public class XBayaDialog {
public void setDefaultButton(JButton button) {
this.dialog.getRootPane().setDefaultButton(button);
}
+
+ public void setCancelButton(final JButton button){
+ this.dialog.getRootPane().addKeyListener(new KeyListener(){
+
+ @Override
+ public void keyPressed(KeyEvent event) {
+ if (event.getKeyCode()==27){
+ button.getAction().actionPerformed(null);
+ }
+ }
+
+ @Override
+ public void keyReleased(KeyEvent arg0) {
+ }
+
+ @Override
+ public void keyTyped(KeyEvent arg0) {
+ }
+
+ });
+ }
private void init() {
if (this.owner instanceof Frame) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java?rev=1212676&r1=1212675&r2=1212676&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java Fri Dec 9 22:59:59 2011
@@ -806,6 +806,7 @@ public class XBayaGUI implements EventLi
}
}
});
+ this.frame.setIconImage(SwingUtil.createImage("airavata-2.png"));
}
private void activeTabChanged() {
Added: incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/images/airavata-name.png
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/images/airavata-name.png?rev=1212676&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/images/airavata-name.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream