Attachment 189135 Details for Bug 283200 – patch V4

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch V4

patch283200V4.txt (text/plain), 5.63 KB, created by Frank Becker

on 2011-02-16 16:40:35 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2011-02-16 16:40:35 EST

Size: 5.63 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.ui
>Index: src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java,v
>retrieving revision 1.152
>diff -u -r1.152 BugzillaSearchPage.java
>--- src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java	10 Feb 2011 20:37:13 -0000	1.152
>+++ src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java	16 Feb 2011 21:34:07 -0000
>@@ -70,6 +70,7 @@
> import org.eclipse.swt.events.ModifyListener;
> import org.eclipse.swt.events.SelectionAdapter;
> import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.graphics.Color;
> import org.eclipse.swt.graphics.Point;
> import org.eclipse.swt.graphics.Rectangle;
> import org.eclipse.swt.layout.GridData;
>@@ -909,7 +910,7 @@
> 		sashForm.setLayout(sashFormLayout);
> 		final GridData gd_sashForm = new GridData(SWT.FILL, SWT.FILL, true, true, 4, 1);
> 		gd_sashForm.widthHint = 400;
>-		gd_sashForm.heightHint = 60;
>+		gd_sashForm.heightHint = 80;
> 		sashForm.setLayoutData(gd_sashForm);
> 
> 		GridLayout topLayout = new GridLayout();
>@@ -1044,18 +1045,26 @@
> 		chartFieldValues = chartFieldValuesDefault.toArray(new String[chartFieldValuesDefault.size()]);
> 		chartExpandComposite = scrolledComposite.createSection(Messages.BugzillaSearchPage_BooleanChart,
> 				ExpandableComposite.COMPACT | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR, false);
>-		chartExpandComposite.setLayout(new GridLayout(3, false));
>+		GridLayout optionsLayout = new GridLayout(3, false);
>+		optionsLayout.marginHeight = 0;
>+		optionsLayout.marginWidth = 0;
>+		optionsLayout.horizontalSpacing = 0;
>+		optionsLayout.verticalSpacing = 0;
>+		chartExpandComposite.setLayout(optionsLayout);
> 		chartExpandComposite.setBackground(parent.getBackground());
> 		GridData g = new GridData(GridData.FILL, GridData.BEGINNING, true, false);
> 		g.horizontalSpan = 4;
> 		g.horizontalIndent = INDENT;
> 		chartExpandComposite.setLayoutData(g);
> 		Composite chartComposite = new Composite(chartExpandComposite, SWT.NULL);
>-		GridLayout optionsLayout = new GridLayout(4, false);
>+		optionsLayout = new GridLayout(4, false);
> 		optionsLayout.marginHeight = 0;
> 		optionsLayout.marginWidth = 0;
>+		optionsLayout.horizontalSpacing = 0;
>+		optionsLayout.verticalSpacing = 0;
> 		chartComposite.setLayout(optionsLayout);
>-		g = new GridData(GridData.FILL, GridData.FILL, true, true);
>+		g = new GridData(SWT.FILL, SWT.FILL, true, true);
>+		g.horizontalIndent = INDENT;
> 		g.widthHint = 400;
> 		chartComposite.setLayoutData(g);
> 		Dialog.applyDialogFont(chartComposite);
>@@ -1240,7 +1249,7 @@
> 		bottomLayout.numColumns = 6;
> 		bottomForm.setLayout(bottomLayout);
> 		GridData bottomLayoutData = new GridData(SWT.FILL, SWT.FILL, true, true, 4, 1);
>-		bottomLayoutData.heightHint = 60;
>+		bottomLayoutData.heightHint = 80;
> 		bottomLayoutData.widthHint = 400;
> 		bottomForm.setLayoutData(bottomLayoutData);
> 
>@@ -1483,6 +1492,22 @@
> 						// ignore
> 					}
> 				}
>+				if ((commentPattern.getText() != null && !commentPattern.getText().equals("")) || // //$NON-NLS-1$
>+						(emailPattern2.getText() != null && !emailPattern2.getText().equals("")) || // //$NON-NLS-1$
>+						(keywords.getText() != null && !keywords.getText().equals("")) || // //$NON-NLS-1$
>+						(whiteboardPattern.getText() != null && !whiteboardPattern.getText().equals("")) || // //$NON-NLS-1$
>+						priority.getSelection().length > 0 || resolution.getSelection().length > 0
>+						|| version.getSelection().length > 0 || target.getSelection().length > 0
>+						|| hardware.getSelection().length > 0 || os.getSelection().length > 0) {
>+					moreOptionsExpandComposite.setExpanded(true);
>+					scrolledComposite.reflow(true);
>+					refreshChartControls();
>+				}
>+				if (charts.get(0).getChartExpression(0, 0).getFieldName() > 0) {
>+					chartExpandComposite.setExpanded(true);
>+					scrolledComposite.reflow(true);
>+					refreshChartControls();
>+				}
> 			}
> 
> 			/*
>@@ -2542,6 +2567,7 @@
> 		layout.horizontalSpacing = 0;
> 		chartGroup.setLayout(layout);
> 		gd = new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1);
>+		gd.horizontalIndent = INDENT;
> 		chartGroup.setLayoutData(gd);
> 		charts.add(0, new Chart());
> 		recreateChartControls();
>@@ -2667,7 +2693,7 @@
> 					orButton.addSelectionListener(new SelectionAdapter() {
> 						@Override
> 						public void widgetSelected(SelectionEvent e) {
>-							if (e.stateMask == SWT.CTRL) {
>+							if (e.stateMask == SWT.SHIFT) {
> 								if (charts.size() == 1 && charts.get(0).getRowSize() == 1
> 										&& charts.get(0).getColumnSize(0) == 1) {
> 									return;
>Index: src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties,v
>retrieving revision 1.15
>diff -u -r1.15 messages.properties
>--- src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties	9 Feb 2011 21:59:10 -0000	1.15
>+++ src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties	16 Feb 2011 21:34:07 -0000
>@@ -142,5 +142,5 @@
> BugzillaSearchPage_Field_Votes=Votes
> BugzillaSearchPage_More_Options=More Options
> BugzillaSearchPage_Tooltip_Custom_fields_at_end=Custom fields are at the end of the list\!
>-BugzillaSearchPage_Tooltip_remove_row=Press CTRL to remove this row
>+BugzillaSearchPage_Tooltip_remove_row=Press SHIFT to remove this row
> BugzillaSearchPage_Whiteboard=Whiteboard:

Actions: View | Diff

Attachments on bug 283200: 181786 | 182765 | 182766 | 182767 | 183027 | 188185 | 188187 | 188209 | 188628 | 188629 | 188651 | 189135 | 189136 | 189525