From 0241b4579953c5aa33fe4900fcaa14aff19b9ace Mon Sep 17 00:00:00 2001
From: mkersten
Date: Wed, 29 Jun 2005 02:49:09 +0000
Subject: Bug #101898: improve icons

---
 org.eclipse.mylyn.tasks.ui/plugin.xml              |  1 -
 .../mylyn/tasks/bugzilla/ui/BugzillaUiBridge.java  |  2 +-
 .../ui/actions/ToggleIntersectionModeAction.java   |  2 +-
 .../eclipse/mylyn/tasks/ui/views/TaskListView.java | 56 +++++++++++-----------
 4 files changed, 31 insertions(+), 30 deletions(-)

(limited to 'org.eclipse.mylyn.tasks.ui')

diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index 2061a3803..f2940a527 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -8,7 +8,6 @@
    </extension>
 
   <extension point="org.eclipse.ui.views">
-      <category name="Mylar Tools" id="org.eclipse.mylar"/>
 
 	  <view name="Mylar Tasks" 
 	  	icon="icons/eview16/tasklist.gif" 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/ui/BugzillaUiBridge.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/ui/BugzillaUiBridge.java
index acd09e20c..406566baa 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/ui/BugzillaUiBridge.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/bugzilla/ui/BugzillaUiBridge.java
@@ -131,7 +131,7 @@ public class BugzillaUiBridge implements IMylarUiBridge {
     }
 
     public ImageDescriptor getIconForRelationship(String relationshipHandle) {
-        return MylarImages.RELATIONSHIPS_REFS_BUGZILLA; 
+        return MylarImages.EDGE_REF_BUGZILLA; 
         
     }
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/ToggleIntersectionModeAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/ToggleIntersectionModeAction.java
index 2681be3df..f80225f4d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/ToggleIntersectionModeAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/actions/ToggleIntersectionModeAction.java
@@ -28,7 +28,7 @@ public class ToggleIntersectionModeAction extends Action {
         super();
         setText("Intersect Tasskscapes");
         setToolTipText("Intersect Taskscapes");
-        setImageDescriptor(MylarImages.INTERSECTION);
+        setImageDescriptor(MylarImages.MYLAR);
         setActionDefinitionId("org.eclipse.mylar.ui.interest.intersection");
         setChecked(MylarUiPlugin.getDefault().isGlobalFilteringEnabled());
     }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListView.java
index 454b5e307..e59a862d5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/views/TaskListView.java
@@ -127,7 +127,7 @@ public class TaskListView extends ViewPart {
     private MarkTaskCompleteAction completeTask;
     private MarkTaskIncompleteAction incompleteTask;
     private FilterCompletedTasksAction filterCompleteTask;
-    private FilterIncompleteTasksAction filterInCompleteTask;
+//    private FilterIncompleteTasksAction filterInCompleteTask;
     private PriorityDropDownAction filterOnPriority;
     private Action moveTaskToRoot; 
     private PriorityFilter priorityFilter = new PriorityFilter();
@@ -170,33 +170,33 @@ public class TaskListView extends ViewPart {
 		}
 	}
     
-    private final class FilterIncompleteTasksAction extends Action {
-    	public FilterIncompleteTasksAction() {
-    		setText("Filter Incomplete tasks");
-            setToolTipText("Filter Incomplete tasks");
-            setImageDescriptor(MylarImages.TASK_INACTIVE);
-            setChecked(MylarTasksPlugin.getDefault().isFilterInCompleteMode());
-    	}
-    	
-		@Override
-		public void run() {
-			MylarTasksPlugin.getDefault().setFilterInCompleteMode(isChecked());
-			if (isChecked()) {
-				viewer.addFilter(inCompleteFilter);
-				filterCompleteTask.setChecked(false);
-				viewer.removeFilter(completeFilter);
-			} else {
-				viewer.removeFilter(inCompleteFilter);
-			}
-		    viewer.refresh();
-		}
-	}
+//    private final class FilterIncompleteTasksAction extends Action {
+//    	public FilterIncompleteTasksAction() {
+//    		setText("Filter Incomplete Tasks");
+//            setToolTipText("Filter Incomplete Tasks");
+////            setImageDescriptor(MylarImages.FILTER_COMPLETE);
+//            setChecked(MylarTasksPlugin.getDefault().isFilterInCompleteMode());
+//    	}
+//    	
+//		@Override
+//		public void run() {
+//			MylarTasksPlugin.getDefault().setFilterInCompleteMode(isChecked());
+//			if (isChecked()) {
+//				viewer.addFilter(inCompleteFilter);
+//				filterCompleteTask.setChecked(false);
+//				viewer.removeFilter(completeFilter);
+//			} else {
+//				viewer.removeFilter(inCompleteFilter);
+//			}
+//		    viewer.refresh();
+//		}
+//	}
 
 	private final class FilterCompletedTasksAction extends Action {
 		public FilterCompletedTasksAction() {
 			setText("Filter Complete tasks");
 	        setToolTipText("Filter Completed tasks");
-	        setImageDescriptor(MylarImages.TASK_ACTIVE);
+	        setImageDescriptor(MylarImages.FILTER_COMPLETE);
 	        setChecked(MylarTasksPlugin.getDefault().isFilterCompleteMode());
 		}
 		@Override
@@ -204,7 +204,7 @@ public class TaskListView extends ViewPart {
 			MylarTasksPlugin.getDefault().setFilterCompleteMode(isChecked());
 			if (isChecked()) {
 				viewer.addFilter(completeFilter);
-				filterInCompleteTask.setChecked(false);
+//				filterInCompleteTask.setChecked(false);
 				viewer.removeFilter(inCompleteFilter);
 			} else {
 				viewer.removeFilter(completeFilter);        			
@@ -266,6 +266,7 @@ public class TaskListView extends ViewPart {
 		public MarkTaskIncompleteAction() {
 			setText("Mark Incomplete");
 	        setToolTipText("Mark Incomplete");
+	        setImageDescriptor(MylarImages.TASK_INCOMPLETE);
 		}
 		@Override
 		public void run() {              
@@ -281,6 +282,7 @@ public class TaskListView extends ViewPart {
 		public MarkTaskCompleteAction() {
 			setText("Mark Complete");
 	        setToolTipText("Mark Complete");
+	        setImageDescriptor(MylarImages.TASK_COMPLETE);
 		}
 		@Override
 		public void run() {              
@@ -508,7 +510,7 @@ public class TaskListView extends ViewPart {
 			super();
 			setText("Display Priorities");
 			setToolTipText("Show Tasks with Priority Levels");
-			setImageDescriptor(MylarImages.FILTER_DECLARATIONS);
+			setImageDescriptor(MylarImages.MYLAR);
 			setMenuCreator(this);			
 		}
     	
@@ -1208,7 +1210,7 @@ public class TaskListView extends ViewPart {
         //manager.add(toggleIntersectionModeAction);
         manager.add(new Separator());
         manager.add(filterCompleteTask);
-        manager.add(filterInCompleteTask);
+//        manager.add(filterInCompleteTask);
         manager.add(filterOnPriority);
         
     }
@@ -1230,7 +1232,7 @@ public class TaskListView extends ViewPart {
         moveTaskToRoot = new MoveTaskToRootAction();
         doubleClickAction = new OpenTaskEditorAction();            
         filterCompleteTask = new FilterCompletedTasksAction();        
-        filterInCompleteTask = new FilterIncompleteTasksAction();                        
+//        filterInCompleteTask = new FilterIncompleteTasksAction();                        
         filterOnPriority = new PriorityDropDownAction();             
     }
 
-- 
cgit v1.2.3