REOPENED - bug 280564: make section header sizes and icons consistent with each other and with Workbench

https://bugs.eclipse.org/bugs/show_bug.cgi?id=280564

3 files changed, 40 insertions, 10 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPart.java
index c3373a354..cbb65c93e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPart.java
@@ -515,6 +515,8 @@ public class PlanningPart extends AbstractLocalEditorPart {
 			toolbarComposite = toolkit.createComposite(section);
 			toolbarComposite.setBackground(null);
 			RowLayout rowLayout = new RowLayout();
+			rowLayout.marginLeft = 0;
+			rowLayout.marginRight = 0;
 			rowLayout.marginTop = 0;
 			rowLayout.marginBottom = 0;
 			rowLayout.center = true;
@@ -523,9 +525,18 @@ public class PlanningPart extends AbstractLocalEditorPart {
 			//createActualTime(toolkit, toolbarComposite);
 			createScheduledText(toolkit, toolbarComposite);
 
-			fillToolbar(toolbarComposite);
-			section.setTextClient(toolbarComposite);
+			ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
+			fillToolBar(toolBarManager);
+
+			// TODO toolBarManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
 
+			if (toolBarManager.getSize() > 0) {
+				toolBarManager.createControl(toolbarComposite);
+				section.clientVerticalSpacing = 0;
+				section.descriptionVerticalSpacing = 0;
+			}
+
+			section.setTextClient(toolbarComposite);
 		}
 
 		super.setSection(toolkit, section);
@@ -542,12 +553,7 @@ public class PlanningPart extends AbstractLocalEditorPart {
 		scheduledText.setBackground(null);
 	}
 
-	private void fillToolbar(Composite parent) {
-//		if (toolBarManager == null) {
-//			toolBarManager = new ToolBarManager(SWT.FLAT | SWT.HORIZONTAL);
-//			toolBarManager.add(new TaskEditorScheduleAction(getTask()));
-//			toolBarManager.createControl(parent);
-//		}
+	protected void fillToolBar(ToolBarManager toolBarManager) {
 	}
 
 	public boolean needsNotes() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java
index 6b4e7e03a..8e46760d2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java
@@ -11,6 +11,10 @@
 
 package org.eclipse.mylyn.internal.tasks.ui.editors;
 
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ToolBarManager;
+import org.eclipse.mylyn.internal.provisional.commons.ui.CommonFormUtil;
+import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
 import org.eclipse.mylyn.internal.provisional.commons.ui.CommonTextSupport;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
@@ -24,10 +28,28 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
  */
 public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 
+	private class NotesAction extends Action {
+		public NotesAction() {
+			setImageDescriptor(CommonImages.NOTES_SMALL);
+			setToolTipText("Add Private Notes");
+		}
+
+		@Override
+		public void run() {
+			CommonFormUtil.setExpanded(part.getSection(), true);
+			part.getControl().setFocus();
+		}
+	};
+
 	private final PlanningPart part;
 
 	public TaskEditorPlanningPart() {
-		part = new PlanningPart(ExpandableComposite.TWISTIE);
+		part = new PlanningPart(ExpandableComposite.TWISTIE) {
+			@Override
+			protected void fillToolBar(ToolBarManager toolBarManager) {
+				toolBarManager.add(new NotesAction());
+			}
+		};
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java
index 55177b706..28efefdc8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java
@@ -138,7 +138,9 @@ public abstract class AbstractTaskEditorPart extends AbstractFormPart {
 				Composite toolbarComposite = toolkit.createComposite(section);
 				toolbarComposite.setBackground(null);
 				RowLayout rowLayout = new RowLayout();
-				rowLayout.marginTop = 2;
+				rowLayout.marginLeft = 0;
+				rowLayout.marginRight = 0;
+				rowLayout.marginTop = 0;
 				rowLayout.marginBottom = 0;
 				rowLayout.center = true;
 				toolbarComposite.setLayout(rowLayout);