Version update

12 files changed, 70 insertions, 29 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java
index 9bb07363d..2feff48b5 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java
@@ -58,7 +58,7 @@ public class BugzillaConnectorUi extends AbstractRepositoryConnectorUi {
 	public List<AbstractTaskContainer> getLegendItems() {
 		List<AbstractTaskContainer> legendItems = new ArrayList<AbstractTaskContainer>();
 
-		BugzillaTask blocker = new BugzillaTask("", "critical", "Critical or Blocker");
+		BugzillaTask blocker = new BugzillaTask("", "critical", "Critical, Blocker");
 		blocker.setSeverity("critical");
 		legendItems.add(blocker);
 
@@ -70,7 +70,7 @@ public class BugzillaConnectorUi extends AbstractRepositoryConnectorUi {
 		enhancement.setSeverity("enhancement");
 		legendItems.add(enhancement);
 
-		BugzillaTask trivial = new BugzillaTask("", "trivial", "Trivial or Minor");
+		BugzillaTask trivial = new BugzillaTask("", "trivial", "Trivial, Minor");
 		trivial.setSeverity("trivial");
 		legendItems.add(trivial);
 
diff --git a/org.eclipse.mylyn.help.ui/images/topiclabel/tu_query48.gif b/org.eclipse.mylyn.help.ui/images/topiclabel/tu_query48.gif
index 8c7bda4b1..d6c5de214 100644
--- a/org.eclipse.mylyn.help.ui/images/topiclabel/tu_query48.gif
+++ b/org.eclipse.mylyn.help.ui/images/topiclabel/tu_query48.gif
diff --git a/org.eclipse.mylyn.help.ui/images/topiclabel/tu_query48_hov.gif b/org.eclipse.mylyn.help.ui/images/topiclabel/tu_query48_hov.gif
index b28265db8..d6c5de214 100644
--- a/org.eclipse.mylyn.help.ui/images/topiclabel/tu_query48_hov.gif
+++ b/org.eclipse.mylyn.help.ui/images/topiclabel/tu_query48_hov.gif
diff --git a/org.eclipse.mylyn.help.ui/intro/overviewExtensionContent.xml b/org.eclipse.mylyn.help.ui/intro/overviewExtensionContent.xml
index cc564a3bf..7d5510bfd 100644
--- a/org.eclipse.mylyn.help.ui/intro/overviewExtensionContent.xml
+++ b/org.eclipse.mylyn.help.ui/intro/overviewExtensionContent.xml
@@ -10,10 +10,10 @@
 				<text>Learn more about Mylyn's Task-Focused UI</text>
 			</link>
 			-->
-			<link label="Mylyn UI Legend"
+			<link label="Mylyn Overview"
 				url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.mylyn.help.ui&amp;class=org.eclipse.mylyn.internal.help.ui.actions.ShowMylynLegendAction&amp;id=org.eclipse.mylyn.doc.legend.show.action"
 				id="mylyn-overview" style-id="content-link">
-				<text>Open the UI Legend, also available in the Help menu</text>
+				<text>See a summary of Mylyn's Task-Focused UI and open the Task List</text>
 			</link>
 		</group>
 	</extensionContent>
diff --git a/org.eclipse.mylyn.help.ui/intro/tutorialsExtensionContent.xml b/org.eclipse.mylyn.help.ui/intro/tutorialsExtensionContent.xml
index c6c1f5012..6f0b0a3c0 100644
--- a/org.eclipse.mylyn.help.ui/intro/tutorialsExtensionContent.xml
+++ b/org.eclipse.mylyn.help.ui/intro/tutorialsExtensionContent.xml
@@ -5,13 +5,13 @@
 		<group label="Mylyn" id="mylyn" style-id="content-group">
 			<link 
 				url="http://org.eclipse.ui.intro/showStandby?partId=org.eclipse.platform.cheatsheet&amp;input=org.eclipse.mylyn.cheatsheet.query" 
-				label="Create a query" id="mylyn-query"	style-id="content-link">
-				<text>Learn how to create a query from bugs.eclipse.org.</text>
+				label="Use the Task List" id="mylyn-query"	style-id="content-link">
+				<text>Learn how to create tasks and task repository queries.</text>
 			</link>
 			<link
 				url="http://org.eclipse.ui.intro/showStandby?partId=org.eclipse.platform.cheatsheet&amp;input=org.eclipse.mylyn.cheatsheet.taskfocus"
-				label="Use Task-Focused UI" id="mylyn-task" style-id="content-link">
-				<text>Learn how to use Task-Focused UI.</text>
+				label="Use the Task-Focused UI" id="mylyn-task" style-id="content-link">
+				<text>Learn how to reduce information overload and multitask with ease.</text>
 			</link>
 		</group>
 	</extensionContent>
diff --git a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/actions/ShowMylynLegendAction.java b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/actions/ShowMylynLegendAction.java
index 3ecaa42eb..7866c0cd8 100644
--- a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/actions/ShowMylynLegendAction.java
+++ b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/actions/ShowMylynLegendAction.java
@@ -11,6 +11,7 @@ package org.eclipse.mylyn.internal.help.ui.actions;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.mylyn.internal.help.ui.dialogs.UiLegendDialog;
+import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;
@@ -32,6 +33,7 @@ public class ShowMylynLegendAction implements IWorkbenchWindowActionDelegate, IV
 	}
 
 	public void run(IAction action) {
+		TaskListView.openInActivePerspective();
 		Shell parentShell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
 		UiLegendDialog uiLegendDialog = new UiLegendDialog(parentShell);
 		uiLegendDialog.open();
diff --git a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
index 5782ecaa8..4ddf641d4 100644
--- a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
+++ b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
@@ -15,6 +15,7 @@ import org.eclipse.jface.dialogs.PopupDialog;
 import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
+import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
 import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel;
@@ -45,7 +46,7 @@ import org.eclipse.ui.themes.IThemeManager;
  */
 public class UiLegendDialog extends PopupDialog {
 
-	public static final String TITLE = "Mylyn UI Legend";
+	public static final String TITLE = "  Mylyn UI Overview";
 
 	private FormToolkit toolkit;
 
@@ -61,14 +62,14 @@ public class UiLegendDialog extends PopupDialog {
 
 	@Override
 	protected Control createContents(Composite parent) {
-		getShell().setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_GRAY));
-
+		getShell().setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
 		return createDialogArea(parent);
 	}
 
 	@Override
 	public int open() {
 		int open = super.open();
+		getShell().setLocation(getShell().getLocation().x, 20);
 		getShell().setFocus();
 		return open;
 	}
@@ -96,7 +97,7 @@ public class UiLegendDialog extends PopupDialog {
 		Label image = null;
 
 		Section section = toolkit.createSection(form.getBody(), Section.DESCRIPTION);
-		section.setText(TITLE + "                                                        ");
+		section.setText(TITLE + "                                                 ");
 		Composite sectionClient = toolkit.createComposite(section);
 		GridLayout layout = new GridLayout();
 		layout.verticalSpacing = 0;
@@ -138,14 +139,6 @@ public class UiLegendDialog extends PopupDialog {
 		image.setImage(TasksUiImages.getImage(TasksUiImages.TASK));
 		toolkit.createLabel(sectionClient, "Task                       ");
 
-// image = toolkit.createLabel(sectionClient, "");
-// image.setImage(TasksUiImages.getImage(TasksUiImages.TASK_NOTES));
-// toolkit.createLabel(sectionClient, "Task with notes");
-
-// image = toolkit.createLabel(sectionClient, "");
-// image.setImage(TasksUiImages.getImage(TasksUiImages.TASK_REPOSITORY));
-// toolkit.createLabel(sectionClient, "Repository task");
-
 		image = toolkit.createLabel(sectionClient, "");
 		image.setImage(TasksUiImages.getImage(TasksUiImages.CATEGORY));
 		toolkit.createLabel(sectionClient, "Category");
@@ -161,6 +154,28 @@ public class UiLegendDialog extends PopupDialog {
 		image = toolkit.createLabel(sectionClient, "");
 		image.setImage(TasksUiImages.getImage(TasksUiImages.BLANK));
 
+		
+		Hyperlink openView = toolkit.createHyperlink(sectionClient, "Open Task List...", SWT.NULL);
+		openView.addHyperlinkListener(new IHyperlinkListener() {
+
+			public void linkActivated(HyperlinkEvent e) {
+				close();
+				TaskListView.openInActivePerspective();
+			}
+
+			public void linkEntered(HyperlinkEvent e) {
+				// ignore
+			}
+
+			public void linkExited(HyperlinkEvent e) {
+				// ignore
+			}
+		});
+		
+//		image = toolkit.createLabel(sectionClient, "");
+		
+		
+		
 		section = toolkit.createSection(tasksComposite, Section.TITLE_BAR);
 		section.setText("Priorities                       ");
 		sectionClient = toolkit.createComposite(section);
@@ -254,11 +269,15 @@ public class UiLegendDialog extends PopupDialog {
 		});
 
 		section = toolkit.createSection(form.getBody(), Section.TITLE_BAR);
-		section.setText("Context                                                                            ");
+		section.setText("Task Context                                                                  ");
 		sectionClient = toolkit.createComposite(section);
 		setSectionLayout(sectionClient, section, false);
 
 		image = toolkit.createLabel(sectionClient, "");
+		image.setImage(TasksUiImages.getImage(TasksUiImages.CONTEXT_FOCUS));
+		toolkit.createLabel(sectionClient, "Focus view on active task");
+		
+		image = toolkit.createLabel(sectionClient, "");
 		image.setImage(TasksUiImages.getImage(TasksUiImages.TASK_INACTIVE));
 		toolkit.createLabel(sectionClient, "Inactive task with no context");
 
@@ -269,7 +288,7 @@ public class UiLegendDialog extends PopupDialog {
 		image = toolkit.createLabel(sectionClient, "");
 		image.setImage(TasksUiImages.getImage(TasksUiImages.TASK_ACTIVE));
 		toolkit.createLabel(sectionClient, "Active task");
-
+		
 		section = toolkit.createSection(form.getBody(), Section.TITLE_BAR);
 		section.setText("Synchronization                                                             ");
 		sectionClient = toolkit.createComposite(section);
@@ -297,8 +316,12 @@ public class UiLegendDialog extends PopupDialog {
 
 		// Connector specifics
 		Composite connectorComposite = toolkit.createComposite(form.getBody());
-		connectorComposite.setLayout(new GridLayout(2, false));
+		connectorComposite.setLayout(new GridLayout(3, false));
 
+		GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING, GridData.VERTICAL_ALIGN_BEGINNING, false, false);
+		gridData.verticalIndent = 0;
+		connectorComposite.setData(gridData);
+		
 		Collection<AbstractRepositoryConnector> connectors = TasksUiPlugin.getRepositoryManager()
 				.getRepositoryConnectors();
 		for (AbstractRepositoryConnector connector : connectors) {
@@ -307,22 +330,26 @@ public class UiLegendDialog extends PopupDialog {
 				List<AbstractTaskContainer> elements = connectorUi.getLegendItems();
 
 				if (!elements.isEmpty()) {
-					section = toolkit.createSection(connectorComposite, Section.TITLE_BAR);
+					section = toolkit.createSection(connectorComposite, Section.TITLE_BAR | SWT.TOP);
 					String label = connector.getLabel();
 					int parenIndex = label.indexOf('(');
 					if (parenIndex != -1) {
 						label = label.substring(0, parenIndex);
 					}
 
-					section.setText("Connector: " + label + " ");
+					section.setText(label);
 					sectionClient = toolkit.createComposite(section);
-					setSectionLayout(sectionClient, section, true);
+					setSectionLayout(sectionClient, section, false);
 
 					for (AbstractTaskContainer taskListElement : elements) {
 						image = toolkit.createLabel(sectionClient, "");
 						image.setImage(labelProvider.getImage(taskListElement));
 						toolkit.createLabel(sectionClient, taskListElement.getSummary());
 					}
+					if (elements.size() < 4)  {
+						image = toolkit.createLabel(sectionClient, "");
+						toolkit.createLabel(sectionClient, "");
+					}
 				}
 			}
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/icons/eview16/focus-view.gif b/org.eclipse.mylyn.tasks.ui/icons/eview16/focus-view.gif
new file mode 100644
index 000000000..bf8439c52
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.ui/icons/eview16/focus-view.gif
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationManager.java
index c7af2a8d1..8df027eb6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationManager.java
@@ -37,7 +37,7 @@ public class TaskListNotificationManager implements IPropertyChangeListener {
 
 	private static final long CLOSE_POPUP_DELAY = 1000 * 12;
 
-	private static final long OPEN_POPUP_DELAY = 1000 * 60;
+	private static final long OPEN_POPUP_DELAY = 1000 * 30;
 
 	private static final boolean runSystem = true;
 
@@ -73,6 +73,16 @@ public class TaskListNotificationManager implements IPropertyChangeListener {
 										cleanNotified();
 										popup.setBlockOnOpen(false);
 										popup.open();
+										
+										for (int i = 2; i <= 6; i+= 2) {
+											popup.getShell().setLocation(popup.getShell().getLocation().x, popup.getShell().getLocation().y - i);
+											try {
+												Thread.sleep(70);
+											} catch (InterruptedException e) {
+												// ignore
+											}
+										}
+										
 										closeJob.setSystem(runSystem);
 										closeJob.schedule(CLOSE_POPUP_DELAY);
 										popup.getShell().addShellListener(SHELL_LISTENER);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java
index fa094582e..a105b2e98 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java
@@ -63,7 +63,7 @@ public class TaskListNotificationPopup extends PopupDialog {
 
 	@Override
 	protected Control createContents(Composite parent) {
-		getShell().setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_GRAY));
+		getShell().setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
 		return createDialogArea(parent);
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java
index 81c0f8718..1833028e1 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java
@@ -148,6 +148,8 @@ public class TasksUiImages {
 
 	public static final ImageDescriptor PERSON_ME_NARROW = create(T_TOOL, "person-me-narrow.gif");
 
+	public static final ImageDescriptor CONTEXT_FOCUS = create(T_EVIEW, "focus-view.gif");
+	
 	public static final ImageDescriptor CONTEXT_ATTACH = create(T_TOOL, "context-attach.gif");
 
 	public static final ImageDescriptor CONTEXT_RETRIEVE = create(T_TOOL, "context-retrieve.gif");
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java
index a357cce88..3c476b606 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java
@@ -123,7 +123,7 @@ public class TracConnectorUi extends AbstractRepositoryConnectorUi {
 		TracTask task = new TracTask("", Kind.TASK.name(), Kind.TASK.toString());
 		task.setTaskKind(Kind.TASK.toString());
 		legendItems.add(task);
-
+		
 		return legendItems;
 	}