Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2011-07-31 14:12:44 -0400
committerFrank Becker2011-07-31 14:12:44 -0400
commit9c6cf8454ebecbd382cb6e809468518ac6583a36 (patch)
tree0c73244c3e939fb4faf871a358268e7f07e8a9e5
parentbf1697f24682ca2a3eb498f849862b313df12b99 (diff)
downloadorg.eclipse.mylyn.tasks-9c6cf8454ebecbd382cb6e809468518ac6583a36.tar.gz
org.eclipse.mylyn.tasks-9c6cf8454ebecbd382cb6e809468518ac6583a36.tar.xz
org.eclipse.mylyn.tasks-9c6cf8454ebecbd382cb6e809468518ac6583a36.zip
ASSIGNED - bug 349771: create UI for support adding private comments
https://bugs.eclipse.org/bugs/show_bug.cgi?id=349771
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorCommentPart.java4
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties4
-rw-r--r--org.eclipse.mylyn.tasks.ui/icons/etool12/lock.gifbin0 -> 342 bytes
-rw-r--r--org.eclipse.mylyn.tasks.ui/icons/etool12/unlock.gifbin0 -> 333 bytes
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorCommentPart.java16
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiImages.java4
6 files changed, 18 insertions, 10 deletions
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorCommentPart.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorCommentPart.java
index 5380593c8..48355b9f2 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorCommentPart.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorCommentPart.java
@@ -80,13 +80,13 @@ public class BugzillaTaskEditorCommentPart extends TaskEditorCommentPart {
}
@Override
- protected void addActionsToToolbar(ToolBarManager toolBarManager, TaskComment taskComment,
+ protected void addActionsToToolbarTitle(ToolBarManager toolBarManager, TaskComment taskComment,
CommentViewer commentViewer) {
String insidergroup = getModel().getTaskRepository().getProperty(IBugzillaConstants.BUGZILLA_INSIDER_GROUP);
if (Boolean.parseBoolean(insidergroup)) {
LockAction lockAction = new LockAction(taskComment);
toolBarManager.add(lockAction);
}
- super.addActionsToToolbar(toolBarManager, taskComment, commentViewer);
}
+
}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties
index 542a311ab..c1f412f67 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/messages.properties
@@ -43,8 +43,8 @@ BugzillaRepositorySettingsPage_DescriptorFileNotExists=Descriptor File does not
BugzillaRepositorySettingsPage_DownloadText=Download From Server
BugzillaRepositorySettingsPage_DownloadToolTip=The Administrator must create the file\nso this may fail\!
BugzillaRepositorySettingsPage_Error_updating_repository_configuration=Error updating repository configuration
-BugzillaRepositorySettingsPage_insiderGroup=insider group
-BugzillaRepositorySettingsPage_insiderGroup_ToolTip=User ID is member of the insider group
+BugzillaRepositorySettingsPage_insiderGroup=Enable private comments:
+BugzillaRepositorySettingsPage_insiderGroup_ToolTip=User ID is member of the insider group\nso private comments are supported
BugzillaRepositorySettingsPage_local_users_enabled=Local users enabled:
BugzillaRepositorySettingsPage_override_auto_detection_of_platform=Override auto detection of Platform and OS for new bug reports.
BugzillaRepositorySettingsPage_RequiresBugzilla3_6=Requires Bugzilla > 3.6\nThe description file is not used
diff --git a/org.eclipse.mylyn.tasks.ui/icons/etool12/lock.gif b/org.eclipse.mylyn.tasks.ui/icons/etool12/lock.gif
new file mode 100644
index 000000000..d08149301
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.ui/icons/etool12/lock.gif
Binary files differ
diff --git a/org.eclipse.mylyn.tasks.ui/icons/etool12/unlock.gif b/org.eclipse.mylyn.tasks.ui/icons/etool12/unlock.gif
new file mode 100644
index 000000000..994fb859d
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.ui/icons/etool12/unlock.gif
Binary files differ
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorCommentPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorCommentPart.java
index bfcd6ef50..218c23d6e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorCommentPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorCommentPart.java
@@ -363,6 +363,10 @@ public class TaskEditorCommentPart extends AbstractTaskEditorPart {
}
});
+ ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
+ addActionsToToolbarTitle(toolBarManager, taskComment, this);
+ toolBarManager.createControl(titleComposite);
+
// only visible when section is expanded
final Composite buttonComposite = toolkit.createComposite(titleComposite);
RowLayout buttonCompLayout = new RowLayout();
@@ -372,9 +376,9 @@ public class TaskEditorCommentPart extends AbstractTaskEditorPart {
buttonComposite.setBackground(null);
buttonComposite.setVisible(commentComposite.isExpanded());
- ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
- addActionsToToolbar(toolBarManager, taskComment, this);
- toolBarManager.createControl(buttonComposite);
+ ToolBarManager toolBarManager1 = new ToolBarManager(SWT.FLAT);
+ addActionsToToolbarButton(toolBarManager1, taskComment, this);
+ toolBarManager1.createControl(buttonComposite);
return buttonComposite;
}
@@ -554,13 +558,17 @@ public class TaskEditorCommentPart extends AbstractTaskEditorPart {
setPartName(Messages.TaskEditorCommentPart_Comments);
}
- protected void addActionsToToolbar(ToolBarManager toolBarManager, final TaskComment taskComment,
+ protected void addActionsToToolbarButton(ToolBarManager toolBarManager, final TaskComment taskComment,
CommentViewer commentViewer) {
ReplyToCommentAction replyAction = new ReplyToCommentAction(commentViewer, taskComment);
replyAction.setImageDescriptor(TasksUiImages.COMMENT_REPLY_SMALL);
toolBarManager.add(replyAction);
}
+ protected void addActionsToToolbarTitle(ToolBarManager toolBarManager, final TaskComment taskComment,
+ CommentViewer commentViewer) {
+ }
+
private void collapseAllComments() {
try {
getTaskEditorPage().setReflow(false);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiImages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiImages.java
index b2491ece8..358a61d07 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiImages.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiImages.java
@@ -203,12 +203,12 @@ public class TasksUiImages {
* @since 3.7
*/
- public static final ImageDescriptor LOCK_CLOSE = create(TOOL, "lock.gif"); //$NON-NLS-1$
+ public static final ImageDescriptor LOCK_CLOSE = create(TOOL_SMALL, "lock.gif"); //$NON-NLS-1$
/**
* @since 3.7
*/
- public static final ImageDescriptor LOCK_OPEN = create(TOOL, "unlock.gif"); //$NON-NLS-1$
+ public static final ImageDescriptor LOCK_OPEN = create(TOOL_SMALL, "unlock.gif"); //$NON-NLS-1$
public static Image getImageForPriority(PriorityLevel priorityLevel) {
if (priorityLevel == null) {

Back to the top