diff options
21 files changed, 76 insertions, 74 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-search-new.gif b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-search-new.gif Binary files differnew file mode 100644 index 000000000..8ac5e5706 --- /dev/null +++ b/org.eclipse.mylyn.bugzilla.core/icons/elcl16/bug-search-new.gif diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/BugzillaImages.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/BugzillaImages.java index 7af463b56..0a9800832 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/BugzillaImages.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/BugzillaImages.java @@ -59,6 +59,7 @@ public class BugzillaImages { public static final String IMG_TOOL_ADD_TO_FAVORITES = "IMG_TOOL_FAVORITE"; public static final String BUG = "IMG_BUG"; + public static final String IMG_COMMENT = "IMG_COMMENT"; private static HashMap<String, ImageDescriptor> descriptors = new HashMap<String, ImageDescriptor>(); @@ -68,12 +69,13 @@ public class BugzillaImages { // Subdirectory (under the package containing this class) where 16 color images are private static final URL URL_BASIC = BugzillaPlugin.getDefault().getBundle().getEntry("/"); - public final static String ICONS_PATH = "Icons/";//$NON-NLS-1$ + public final static String ICONS_PATH = "icons/";//$NON-NLS-1$ private final static void declareImages() { // toolbar icons for the result view - declareImage(IMG_TOOL_ADD_TO_FAVORITES, ICONS_PATH+"bugzilla-bookmark.gif");//$NON-NLS-1$ - declareImage(BUG, ICONS_PATH+"bug.gif");//$NON-NLS-1$ + declareImage(IMG_TOOL_ADD_TO_FAVORITES, ICONS_PATH+"elcl16/bug-favorite.gif");//$NON-NLS-1$ + declareImage(BUG, ICONS_PATH+"elcl16/bug.gif");//$NON-NLS-1$ + declareImage(IMG_COMMENT, ICONS_PATH+"elcl16/bug-comment.gif");//$NON-NLS-1$ } /** diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/AddFavoriteAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/AddFavoriteAction.java index 1a342d61e..b65853c25 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/AddFavoriteAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/AddFavoriteAction.java @@ -44,7 +44,7 @@ public class AddFavoriteAction extends AbstractFavoritesAction { */ public AddFavoriteAction(String text, BugzillaSearchResultView resultView) { setText(text); - setIcon("Icons/bugzilla-bookmark.gif"); + setIcon("icons/elcl16/bug-favorite.gif"); this.resultView = resultView; selected = null; } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/DeleteFavoriteAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/DeleteFavoriteAction.java index 6a8bdab46..4498cf895 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/DeleteFavoriteAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/DeleteFavoriteAction.java @@ -38,13 +38,13 @@ public class DeleteFavoriteAction extends AbstractFavoritesAction { setToolTipText("Remove all favorites"); setText("Remove all"); - setIcon("Icons/remove-all.gif"); + setIcon("icons/remove-all.gif"); } else { setToolTipText( "Remove selected favorites" ); setText( "Remove" ); - setIcon( "Icons/remove.gif" ); + setIcon( "icons/remove.gif" ); } view = favoritesView; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/ViewFavoriteAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/ViewFavoriteAction.java index 3ed3da1e5..2eda2d52a 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/ViewFavoriteAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/favorites/actions/ViewFavoriteAction.java @@ -34,7 +34,7 @@ public class ViewFavoriteAction extends AbstractFavoritesAction { setToolTipText( "View selected favorites" ); setText( "View selected" ); - setIcon( "Icons/openresult.gif" ); + setIcon( "icons/openresult.gif" ); view = resultsView; } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/DeleteOfflineReportAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/DeleteOfflineReportAction.java index ac66960c5..fa223e190 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/DeleteOfflineReportAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/DeleteOfflineReportAction.java @@ -38,13 +38,13 @@ public class DeleteOfflineReportAction extends AbstractOfflineReportsAction { setToolTipText("Remove all offline reports"); setText("Remove all"); - setIcon("Icons/remove-all.gif"); + setIcon("icons/remove-all.gif"); } else { setToolTipText( "Remove selected offline reports" ); setText( "Remove" ); - setIcon( "Icons/remove.gif" ); + setIcon( "icons/remove.gif" ); } view = offlineReportsView; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/ViewOfflineReportAction.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/ViewOfflineReportAction.java index 91d7297d9..847d56f37 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/ViewOfflineReportAction.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/offlineReports/ViewOfflineReportAction.java @@ -42,7 +42,7 @@ public class ViewOfflineReportAction extends AbstractOfflineReportsAction { setToolTipText( "View selected offline reports" ); setText( "View selected" ); - setIcon( "Icons/openresult.gif" ); + setIcon( "icons/openresult.gif" ); view = resultsView; } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/FavoritesView.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/FavoritesView.java index 23d6e0b14..98a75c0c4 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/FavoritesView.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/FavoritesView.java @@ -475,7 +475,7 @@ public class FavoritesView extends ViewPart { public SelectAllAction() { setToolTipText("Select all favorites"); setText("Select all"); - setIcon("Icons/selectAll.gif"); + setIcon("icons/selectAll.gif"); } @Override diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java index 89c868854..91cfb0590 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/OfflineView.java @@ -559,7 +559,7 @@ public class OfflineView extends ViewPart { public SelectAllAction() { setToolTipText("Select all offline Bugzilla reports"); setText("Select all"); - setIcon("Icons/selectAll.gif"); + setIcon("icons/selectAll.gif"); } @Override diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java index a705b9f75..9c12c1afb 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/bugzilla/ui/outline/BugzillaOutlineNode.java @@ -210,7 +210,7 @@ public class BugzillaOutlineNode implements IBugzillaReportSelection { protected static BugzillaOutlineNode parseBugReport(NewBugModel bug){ int bugId = bug.getId(); String bugServer = bug.getServer(); - Image defaultImage = BugzillaImages.getImageDescriptor(BugzillaImages.BUG).createImage(); + Image defaultImage = BugzillaImages.getImageDescriptor(BugzillaImages.IMG_COMMENT).createImage(); BugzillaOutlineNode topNode = new BugzillaOutlineNode(bugId, bugServer, bug.getLabel(), defaultImage, bug, bug.getSummary()); topNode.addChild(new BugzillaOutlineNode(bugId, bugServer, "New Description", defaultImage, null, bug.getSummary())); @@ -234,7 +234,7 @@ public class BugzillaOutlineNode implements IBugzillaReportSelection { int bugId = bug.getId(); String bugServer = bug.getServer(); - Image defaultImage = BugzillaImages.getImageDescriptor(BugzillaImages.BUG).createImage(); + Image defaultImage = BugzillaImages.getImageDescriptor(BugzillaImages.IMG_COMMENT).createImage(); BugzillaOutlineNode topNode = new BugzillaOutlineNode(bugId, bugServer, bug.getLabel(), defaultImage, bug, bug.getSummary()); BugzillaOutlineNode desc = new BugzillaOutlineNode(bugId, bugServer, "Description", defaultImage, bug.getDescription(), bug.getSummary()); diff --git a/org.eclipse.mylyn.tasks.ui/icons/elcl16/synched.gif b/org.eclipse.mylyn.tasks.ui/icons/elcl16/synched.gif Binary files differdeleted file mode 100644 index 870934b69..000000000 --- a/org.eclipse.mylyn.tasks.ui/icons/elcl16/synched.gif +++ /dev/null diff --git a/org.eclipse.mylyn.tasks.ui/icons/elcl16/task-bugzilla.gif b/org.eclipse.mylyn.tasks.ui/icons/elcl16/task-bugzilla.gif Binary files differdeleted file mode 100644 index 8704e4df2..000000000 --- a/org.eclipse.mylyn.tasks.ui/icons/elcl16/task-bugzilla.gif +++ /dev/null diff --git a/org.eclipse.mylyn.tasks.ui/icons/elcl16/task-category-new.gif b/org.eclipse.mylyn.tasks.ui/icons/elcl16/task-category-new.gif Binary files differdeleted file mode 100644 index bcae2d487..000000000 --- a/org.eclipse.mylyn.tasks.ui/icons/elcl16/task-category-new.gif +++ /dev/null diff --git a/org.eclipse.mylyn.tasks.ui/icons/elcl16/task-category.gif b/org.eclipse.mylyn.tasks.ui/icons/elcl16/task-category.gif Binary files differdeleted file mode 100644 index 112cb65b4..000000000 --- a/org.eclipse.mylyn.tasks.ui/icons/elcl16/task-category.gif +++ /dev/null diff --git a/org.eclipse.mylyn.tasks.ui/icons/elcl16/task.gif b/org.eclipse.mylyn.tasks.ui/icons/elcl16/task.gif Binary files differdeleted file mode 100644 index a2948dff6..000000000 --- a/org.eclipse.mylyn.tasks.ui/icons/elcl16/task.gif +++ /dev/null diff --git a/org.eclipse.mylyn.tasks.ui/icons/eview16/task-bug.gif b/org.eclipse.mylyn.tasks.ui/icons/eview16/task-bug.gif Binary files differnew file mode 100644 index 000000000..99e9e98f2 --- /dev/null +++ b/org.eclipse.mylyn.tasks.ui/icons/eview16/task-bug.gif diff --git a/org.eclipse.mylyn.tasks.ui/icons/eview16/task-list.gif b/org.eclipse.mylyn.tasks.ui/icons/eview16/task-list.gif Binary files differnew file mode 100644 index 000000000..009443dfe --- /dev/null +++ b/org.eclipse.mylyn.tasks.ui/icons/eview16/task-list.gif diff --git a/org.eclipse.mylyn.tasks.ui/icons/eview16/task.gif b/org.eclipse.mylyn.tasks.ui/icons/eview16/task.gif Binary files differnew file mode 100644 index 000000000..9881d3872 --- /dev/null +++ b/org.eclipse.mylyn.tasks.ui/icons/eview16/task.gif diff --git a/org.eclipse.mylyn.tasks.ui/icons/eview16/tasklist.gif b/org.eclipse.mylyn.tasks.ui/icons/eview16/tasklist.gif Binary files differdeleted file mode 100644 index 3efb0536a..000000000 --- a/org.eclipse.mylyn.tasks.ui/icons/eview16/tasklist.gif +++ /dev/null diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml index f2940a527..06fee1ced 100644 --- a/org.eclipse.mylyn.tasks.ui/plugin.xml +++ b/org.eclipse.mylyn.tasks.ui/plugin.xml @@ -10,7 +10,7 @@ <extension point="org.eclipse.ui.views"> <view name="Mylar Tasks" - icon="icons/eview16/tasklist.gif" + icon="icons/eview16/task-list.gif" category="org.eclipse.mylar" class="org.eclipse.mylar.tasks.ui.views.TaskListView" id="org.eclipse.mylar.tasks.ui.views.TaskListView" /> @@ -18,29 +18,17 @@ <extension point="org.eclipse.ui.editors"> <editor - icon="icons/eview16/tasklist.gif" + icon="icons/eview16/task.gif" class="org.eclipse.mylar.tasks.ui.TaskEditor" name="Task Viewer" id="org.eclipse.mylar.tasks.ui.taskEditor"/> <editor - icon="icons/eview16/tasklist.gif" + icon="icons/eview16/task-bug.gif" name="Bugzilla task viewer" class="org.eclipse.mylar.tasks.ui.BugzillaTaskEditor" id="org.eclipse.mylar.tasks.ui.bugzillaTaskEditor"/> </extension> <extension point="org.eclipse.ui.commands"> - <command - name="Interest filtering" - description="Interest filtering" - id="org.eclipse.mylar.ui.interest.filtering" - categoryId="org.eclipse.mylar.ui"> - </command> - <command - name="Intersection mode" - description="Intersection mode" - id="org.eclipse.mylar.ui.interest.intersection" - categoryId="org.eclipse.mylar.ui"> - </command> </extension> </plugin> 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 e59a862d5..24a130996 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 @@ -115,8 +115,9 @@ public class TaskListView extends ViewPart { private RefreshAction refresh; private CreateTaskAction createTask; private CreateCategoryAction createCategory; + private CreateQueryCategoryAction createQueryCategory; private CreateBugzillaTaskAction createBugzillaTask; - private RenameAction rename; +// private RenameAction rename; private DeleteAction delete; private OpenTaskEditorAction doubleClickAction; private ClearTaskscapeAction clearSelectedTaskscapeAction; @@ -194,8 +195,8 @@ public class TaskListView extends ViewPart { private final class FilterCompletedTasksAction extends Action { public FilterCompletedTasksAction() { - setText("Filter Complete tasks"); - setToolTipText("Filter Completed tasks"); + setText("Filter Completed Tasks"); + setToolTipText("Filter Completed Tasks"); setImageDescriptor(MylarImages.FILTER_COMPLETE); setChecked(MylarTasksPlugin.getDefault().isFilterCompleteMode()); } @@ -227,8 +228,8 @@ public class TaskListView extends ViewPart { private final class ClearTaskscapeAction extends Action { public ClearTaskscapeAction() { - setText("Erase Taskscape"); - setToolTipText("Erase Taskscape"); + setText("Clear Task Context"); + setToolTipText("Clear Task Context"); setImageDescriptor(MylarImages.ERASE_TASKSCAPE); } @Override @@ -241,26 +242,26 @@ public class TaskListView extends ViewPart { } } - private final class RenameAction extends Action { - public RenameAction() { - setText("Rename"); - setToolTipText("Rename"); - } - @Override - public void run() { - String label = "category"; - Object selectedObject = ((IStructuredSelection)viewer.getSelection()).getFirstElement(); - if (selectedObject instanceof Task) label = "task"; - - String newName = getLabelNameFromUser(label); - if (selectedObject instanceof Task) { - ((Task)selectedObject).setLabel(newName); - } else if (selectedObject instanceof Category) { - ((Category)selectedObject).setName(newName); - } - viewer.refresh(selectedObject); - } - } +// private final class RenameAction extends Action { +// public RenameAction() { +// setText("Rename"); +// setToolTipText("Rename"); +// } +// @Override +// public void run() { +// String label = "category"; +// Object selectedObject = ((IStructuredSelection)viewer.getSelection()).getFirstElement(); +// if (selectedObject instanceof Task) label = "task"; +// +// String newName = getLabelNameFromUser(label); +// if (selectedObject instanceof Task) { +// ((Task)selectedObject).setLabel(newName); +// } else if (selectedObject instanceof Category) { +// ((Category)selectedObject).setName(newName); +// } +// viewer.refresh(selectedObject); +// } +// } private final class MarkTaskIncompleteAction extends Action { public MarkTaskIncompleteAction() { @@ -345,8 +346,8 @@ public class TaskListView extends ViewPart { private final class CreateBugzillaTaskAction extends Action { public CreateBugzillaTaskAction() { - setText("Add bugzilla report"); - setToolTipText("Add bugzilla report"); + setText("Add Bugzilla Report"); + setToolTipText("Add Bugzilla Report"); setImageDescriptor(MylarImages.TASK_BUGZILLA_NEW); } @Override @@ -387,9 +388,9 @@ public class TaskListView extends ViewPart { private final class RefreshAction extends Action { public RefreshAction() { - setText("Refresh all Bugzilla reports"); - setToolTipText("Refresh all Bugzilla reports"); - setImageDescriptor(MylarImages.REFRESH); + setText("Refresh Bugzilla reports"); + setToolTipText("Refresh Bugzilla reports"); + setImageDescriptor(MylarImages.TASK_BUG_REFRESH); } @Override @@ -455,8 +456,8 @@ public class TaskListView extends ViewPart { private final class CreateTaskAction extends Action { public CreateTaskAction() { - setText("Create task"); - setToolTipText("Create task"); + setText("Add Task"); + setToolTipText("Add Task"); setImageDescriptor(MylarImages.TASK_NEW); } @@ -488,8 +489,8 @@ public class TaskListView extends ViewPart { private final class CreateCategoryAction extends Action { public CreateCategoryAction() { - setText("Create category"); - setToolTipText("Create category"); + setText("Add Category"); + setToolTipText("Add Category"); setImageDescriptor(MylarImages.CATEGORY_NEW); } @@ -503,6 +504,19 @@ public class TaskListView extends ViewPart { } } + private final class CreateQueryCategoryAction extends Action { + public CreateQueryCategoryAction() { + setText("Add Bugzilla Query"); + setToolTipText("Add Bugzilla Query"); + setImageDescriptor(MylarImages.CATEGORY_QUERY_NEW); + } + + @Override + public void run() { + MylarPlugin.log("not implemented", this); + } + } + private final class PriorityDropDownAction extends Action implements IMenuCreator { private Menu dropDownMenu = null; @@ -510,7 +524,7 @@ public class TaskListView extends ViewPart { super(); setText("Display Priorities"); setToolTipText("Show Tasks with Priority Levels"); - setImageDescriptor(MylarImages.MYLAR); + setImageDescriptor(MylarImages.FILTER_PRIORITY); setMenuCreator(this); } @@ -1163,12 +1177,12 @@ public class TaskListView extends ViewPart { // manager.add(new Separator()); manager.add(createTask); manager.add(createBugzillaTask); - manager.add(rename); +// manager.add(rename); manager.add(delete); manager.add(clearSelectedTaskscapeAction); manager.add(moveTaskToRoot); manager.add(new Separator()); - MenuManager subMenuManager = new MenuManager("choose highlighter"); + MenuManager subMenuManager = new MenuManager("Choose Highlighter"); for (Iterator<Highlighter> it = MylarUiPlugin.getDefault().getHighlighters().iterator(); it.hasNext();) { final Highlighter highlighter = it.next(); final Object selectedObject = ((IStructuredSelection)viewer.getSelection()).getFirstElement(); @@ -1200,19 +1214,16 @@ public class TaskListView extends ViewPart { } private void fillLocalToolBar(IToolBarManager manager) { - manager.add(createCategory); manager.add(createTask); -// manager.add(new Separator()); + manager.add(createCategory); + manager.add(new Separator()); manager.add(createBugzillaTask); + manager.add(createQueryCategory); manager.add(refresh); -// manager.add(new Separator()); -// manager.add(toggleFilteringAction); - //manager.add(toggleIntersectionModeAction); manager.add(new Separator()); manager.add(filterCompleteTask); // manager.add(filterInCompleteTask); manager.add(filterOnPriority); - } /** @@ -1223,11 +1234,12 @@ public class TaskListView extends ViewPart { refresh = new RefreshAction(); createTask = new CreateTaskAction(); createCategory = new CreateCategoryAction(); - createBugzillaTask = new CreateBugzillaTaskAction(); + createBugzillaTask = new CreateBugzillaTaskAction(); + createQueryCategory = new CreateQueryCategoryAction(); delete = new DeleteAction(); completeTask = new MarkTaskCompleteAction(); incompleteTask = new MarkTaskIncompleteAction(); - rename = new RenameAction(); +// rename = new RenameAction(); clearSelectedTaskscapeAction = new ClearTaskscapeAction(); moveTaskToRoot = new MoveTaskToRootAction(); doubleClickAction = new OpenTaskEditorAction(); |
