From: preecej <preecej@localhost>
Date: Tue, 2 Oct 2012 00:57:28 +0000 (+0000)
Subject: Added OS license text and image to About dialog.
X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=ab6b18d64282cf4a836e7cb31eccd8b2d7759dcc;p=old-jaiswallab-svn%2F.git

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 cd6e904..bf67034 100644
--- 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 e55b5ce..317d660 100644
--- 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 907d4ce..ae661a8 100644
--- 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;
 		}