Added OS license text and image to About dialog.

svn path=/; revision=382

diff --git a/Annotation/resources/config/actions.mac.properties b/Annotation/resources/config/actions.mac.properties
index cd6e904590b42c1c0b12d936abdff8956b6b3020..bf67034e6bc7c85ad0a5c76eeb14f2752fcc7820 100644 (file)
--- a/Annotation/resources/config/actions.mac.properties
+++ b/Annotation/resources/config/actions.mac.properties
@@ -98,7 +98,9 @@ action.HelpAction.helpURL=http://kspace.cdvp.dcu.ie/public/interactive-segmentat
 action.AboutAction.text=&About...
 action.AboutAction.image=file:resources/icons/about.png
 action.AboutAction.tooltip=About the application
-action.AboutAction.aboutImage=file:resources/icons/about-box.png
+action.AboutAction.aboutImage=file:resources/icons/About_screenshot.png
+action.AboutAction.aboutImageOrig=file:resources/icons/about_box.png
+action.AboutAction.os_license_image=file:resources/icons/cc_license.png
 
 action.OpenExperimentAction.text=Open &Experiment...
 action.OpenExperimentAction.image=file:resources/icons/experiment.png

diff --git a/Annotation/resources/config/actions.properties b/Annotation/resources/config/actions.properties
index e55b5cea50de504f9882f2d7626139b5153e07a1..317d660348ad0c7755a76b076ba50db9de1c2029 100644 (file)
--- a/Annotation/resources/config/actions.properties
+++ b/Annotation/resources/config/actions.properties
@@ -1,7 +1,7 @@
 
 OpenAction.dialog.text=Open an image or saved context
 OpenAction.dialog.filter.exts=*.jpg;*.jpeg;*.png;*.gif;*.bmp;*.ctx;*.zip
-OpenAction.dialog.filter.text=Image,Zip and Context Files
+OpenAction.dialog.filter.text=Image, Zip and Context Files
 
 SaveAction.dialog.text=Save Segmentation Context
 SaveAction.dialog.filter.exts=*.ctx
@@ -101,6 +101,7 @@ action.AboutAction.image=file:resources/icons/about.png
 action.AboutAction.tooltip=About the application
 action.AboutAction.aboutImage=file:resources/icons/About_screenshot.png
 action.AboutAction.aboutImageOrig=file:resources/icons/about_box.png
+action.AboutAction.os_license_image=file:resources/icons/cc_license.png
 
 action.OpenExperimentAction.text=Open &Experiment...
 action.OpenExperimentAction.image=file:resources/icons/experiment.png

diff --git a/Annotation/src/ie/dcu/apps/ist/actions/AboutAction.java b/Annotation/src/ie/dcu/apps/ist/actions/AboutAction.java
index 907d4ce9a80fc95ebf77e3b43a988444930b16d0..ae661a8546831536e9611b55201d8cee921808d1 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/actions/AboutAction.java
+++ b/Annotation/src/ie/dcu/apps/ist/actions/AboutAction.java
@@ -78,6 +78,7 @@ public class AboutAction extends AppAction {
 
                @Override
                protected Control createDialogArea(Composite parent) {
+
                        composite = new Composite(parent, SWT.NONE);
                        composite.setLayout(LayoutFactory.createGridLayout(5, 5, 2, false));
                        
@@ -104,12 +105,17 @@ public class AboutAction extends AppAction {
                        addLabel(" Based on software:", SWT.RIGHT);
                        addLink(MESSAGE_ORIG_SOFTWARE);
 
-                       // bottom row
+                       // 6th row
                        addLabel(" Originally developed by:", SWT.RIGHT);
                        addLink(MESSAGE_ORIG);
 
-                       //String imageOrig = string("aboutImageOrig");
-                       //addImage(imageOrig);
+                       // Last row
+                       addLink("This work is licensed under\n" +
+                                       "a Creative Commons\n" +
+                                       "Attribution-NonCommercial-NoDerivs\n" +
+                                       "3.0 Unported License");
+                       String osImage = string("os_license_image");
+                       addImage(osImage);
                
                        return composite;
                }