diff options
17 files changed, 37 insertions, 36 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/Icons/bug.gif b/org.eclipse.mylyn.bugzilla.core/Icons/bug.gif Binary files differdeleted file mode 100644 index 7f4b2a8d8..000000000 --- a/org.eclipse.mylyn.bugzilla.core/Icons/bug.gif +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.core/Icons/bugzilla-bookmark.gif b/org.eclipse.mylyn.bugzilla.core/Icons/bugzilla-bookmark.gif Binary files differdeleted file mode 100644 index 89ca9d889..000000000 --- a/org.eclipse.mylyn.bugzilla.core/Icons/bugzilla-bookmark.gif +++ /dev/null diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-comment.gif b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-comment.gif Binary files differnew file mode 100644 index 000000000..97bbdf7dd --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-comment.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-dirty.gif b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-dirty.gif Binary files differnew file mode 100644 index 000000000..8628881c7 --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-dirty.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-favorite.gif b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-favorite.gif Binary files differnew file mode 100644 index 000000000..6830e3348 --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-favorite.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-new.gif b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-new.gif Binary files differnew file mode 100644 index 000000000..312ca8f9d --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-new.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-search.gif b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-search.gif Binary files differnew file mode 100644 index 000000000..b70606376 --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-search.gif diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug.gif b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug.gif Binary files differnew file mode 100644 index 000000000..54525a775 --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug.gif diff --git a/org.eclipse.mylyn.bugzilla.core/Icons/openresult.gif b/org.eclipse.mylyn.bugzilla.core/icons/openresult.gif Binary files differindex 2b645a88f..2b645a88f 100644 --- a/org.eclipse.mylyn.bugzilla.core/Icons/openresult.gif +++ b/org.eclipse.mylyn.bugzilla.core/icons/openresult.gif diff --git a/org.eclipse.mylyn.bugzilla.core/Icons/remove-all.gif b/org.eclipse.mylyn.bugzilla.core/icons/remove-all.gif Binary files differindex 2c069ab3f..2c069ab3f 100644 --- a/org.eclipse.mylyn.bugzilla.core/Icons/remove-all.gif +++ b/org.eclipse.mylyn.bugzilla.core/icons/remove-all.gif diff --git a/org.eclipse.mylyn.bugzilla.core/Icons/remove.gif b/org.eclipse.mylyn.bugzilla.core/icons/remove.gif Binary files differindex 12a9167c5..12a9167c5 100644 --- a/org.eclipse.mylyn.bugzilla.core/Icons/remove.gif +++ b/org.eclipse.mylyn.bugzilla.core/icons/remove.gif diff --git a/org.eclipse.mylyn.bugzilla.core/Icons/selectAll.gif b/org.eclipse.mylyn.bugzilla.core/icons/selectAll.gif Binary files differindex e159862e3..e159862e3 100644 --- a/org.eclipse.mylyn.bugzilla.core/Icons/selectAll.gif +++ b/org.eclipse.mylyn.bugzilla.core/icons/selectAll.gif diff --git a/org.eclipse.mylyn.bugzilla.core/plugin.xml b/org.eclipse.mylyn.bugzilla.core/plugin.xml index abe3b7ccd..7c11b7070 100644 --- a/org.eclipse.mylyn.bugzilla.core/plugin.xml +++ b/org.eclipse.mylyn.bugzilla.core/plugin.xml @@ -13,7 +13,7 @@ </category> <wizard name="New Bug Report" - icon="Icons/bug.gif" + icon="icons/elcl16/bug-new.gif" category="org.eclipse.mylar.bugzilla.wizard.category" class="org.eclipse.mylar.bugzilla.ui.wizard.NewBugWizard" id="org.eclipse.mylar.bugzilla.bugWizard"> @@ -41,7 +41,7 @@ id="org.eclipse.mylar.bugzilla.category"/> <view name="Bugzilla Favorites" - icon="Icons/bugzilla-bookmark.gif" + icon="icons/elcl16/bug-favorite.gif" category="org.eclipse.mylar.bugzilla.category" class="org.eclipse.mylar.bugzilla.ui.FavoritesView" id="org.eclipse.mylar.bugzilla.ui.favoritesView"/> @@ -55,7 +55,7 @@ id="org.eclipse.mylar.bugzilla.category"/> <view name="Bugzilla Offline Reports" - icon="Icons/bugzilla-bookmark.gif" + icon="icons/elcl16/bug-dirty.gif" category="org.eclipse.mylar.bugzilla.category" class="org.eclipse.mylar.bugzilla.ui.OfflineView" id="org.eclipse.mylar.bugzilla.ui.offlineReportsView"/> @@ -67,7 +67,7 @@ <page label="Bugzilla Search" enabled="true" - icon="Icons/bug.gif" + icon="icons/elcl16/bug-search.gif" class="org.eclipse.mylar.bugzilla.search.BugzillaSearchPage" id="org.eclipse.mylar.bugzilla.search.bugzillaSearchPage"/> </extension> @@ -75,13 +75,13 @@ point="org.eclipse.ui.editors"> <editor name="Bugzilla viewer" - icon="Icons/bug.gif" + icon="icons/elcl16/bug.gif" class="org.eclipse.mylar.bugzilla.ui.editor.ExistingBugEditor" id="org.eclipse.mylar.bugzilla.ui.existingBugEditor"> </editor> <editor name="Bugzilla viewer" - icon="Icons/bug.gif" + icon="icons/elcl16/bug.gif" class="org.eclipse.mylar.bugzilla.ui.editor.NewBugEditor" id="org.eclipse.mylar.bugzilla.ui.newBugEditor"> </editor> 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(); } |
