View | Details | Raw Unified | Return to bug 283200 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java (-6 / +32 lines)
Lines 70-75 Link Here
70
import org.eclipse.swt.events.ModifyListener;
70
import org.eclipse.swt.events.ModifyListener;
71
import org.eclipse.swt.events.SelectionAdapter;
71
import org.eclipse.swt.events.SelectionAdapter;
72
import org.eclipse.swt.events.SelectionEvent;
72
import org.eclipse.swt.events.SelectionEvent;
73
import org.eclipse.swt.graphics.Color;
73
import org.eclipse.swt.graphics.Point;
74
import org.eclipse.swt.graphics.Point;
74
import org.eclipse.swt.graphics.Rectangle;
75
import org.eclipse.swt.graphics.Rectangle;
75
import org.eclipse.swt.layout.GridData;
76
import org.eclipse.swt.layout.GridData;
Lines 909-915 Link Here
909
		sashForm.setLayout(sashFormLayout);
910
		sashForm.setLayout(sashFormLayout);
910
		final GridData gd_sashForm = new GridData(SWT.FILL, SWT.FILL, true, true, 4, 1);
911
		final GridData gd_sashForm = new GridData(SWT.FILL, SWT.FILL, true, true, 4, 1);
911
		gd_sashForm.widthHint = 400;
912
		gd_sashForm.widthHint = 400;
912
		gd_sashForm.heightHint = 60;
913
		gd_sashForm.heightHint = 80;
913
		sashForm.setLayoutData(gd_sashForm);
914
		sashForm.setLayoutData(gd_sashForm);
914
915
915
		GridLayout topLayout = new GridLayout();
916
		GridLayout topLayout = new GridLayout();
Lines 1044-1061 Link Here
1044
		chartFieldValues = chartFieldValuesDefault.toArray(new String[chartFieldValuesDefault.size()]);
1045
		chartFieldValues = chartFieldValuesDefault.toArray(new String[chartFieldValuesDefault.size()]);
1045
		chartExpandComposite = scrolledComposite.createSection(Messages.BugzillaSearchPage_BooleanChart,
1046
		chartExpandComposite = scrolledComposite.createSection(Messages.BugzillaSearchPage_BooleanChart,
1046
				ExpandableComposite.COMPACT | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR, false);
1047
				ExpandableComposite.COMPACT | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR, false);
1047
		chartExpandComposite.setLayout(new GridLayout(3, false));
1048
		GridLayout optionsLayout = new GridLayout(3, false);
1049
		optionsLayout.marginHeight = 0;
1050
		optionsLayout.marginWidth = 0;
1051
		optionsLayout.horizontalSpacing = 0;
1052
		optionsLayout.verticalSpacing = 0;
1053
		chartExpandComposite.setLayout(optionsLayout);
1048
		chartExpandComposite.setBackground(parent.getBackground());
1054
		chartExpandComposite.setBackground(parent.getBackground());
1049
		GridData g = new GridData(GridData.FILL, GridData.BEGINNING, true, false);
1055
		GridData g = new GridData(GridData.FILL, GridData.BEGINNING, true, false);
1050
		g.horizontalSpan = 4;
1056
		g.horizontalSpan = 4;
1051
		g.horizontalIndent = INDENT;
1057
		g.horizontalIndent = INDENT;
1052
		chartExpandComposite.setLayoutData(g);
1058
		chartExpandComposite.setLayoutData(g);
1053
		Composite chartComposite = new Composite(chartExpandComposite, SWT.NULL);
1059
		Composite chartComposite = new Composite(chartExpandComposite, SWT.NULL);
1054
		GridLayout optionsLayout = new GridLayout(4, false);
1060
		optionsLayout = new GridLayout(4, false);
1055
		optionsLayout.marginHeight = 0;
1061
		optionsLayout.marginHeight = 0;
1056
		optionsLayout.marginWidth = 0;
1062
		optionsLayout.marginWidth = 0;
1063
		optionsLayout.horizontalSpacing = 0;
1064
		optionsLayout.verticalSpacing = 0;
1057
		chartComposite.setLayout(optionsLayout);
1065
		chartComposite.setLayout(optionsLayout);
1058
		g = new GridData(GridData.FILL, GridData.FILL, true, true);
1066
		g = new GridData(SWT.FILL, SWT.FILL, true, true);
1067
		g.horizontalIndent = INDENT;
1059
		g.widthHint = 400;
1068
		g.widthHint = 400;
1060
		chartComposite.setLayoutData(g);
1069
		chartComposite.setLayoutData(g);
1061
		Dialog.applyDialogFont(chartComposite);
1070
		Dialog.applyDialogFont(chartComposite);
Lines 1240-1246 Link Here
1240
		bottomLayout.numColumns = 6;
1249
		bottomLayout.numColumns = 6;
1241
		bottomForm.setLayout(bottomLayout);
1250
		bottomForm.setLayout(bottomLayout);
1242
		GridData bottomLayoutData = new GridData(SWT.FILL, SWT.FILL, true, true, 4, 1);
1251
		GridData bottomLayoutData = new GridData(SWT.FILL, SWT.FILL, true, true, 4, 1);
1243
		bottomLayoutData.heightHint = 60;
1252
		bottomLayoutData.heightHint = 80;
1244
		bottomLayoutData.widthHint = 400;
1253
		bottomLayoutData.widthHint = 400;
1245
		bottomForm.setLayoutData(bottomLayoutData);
1254
		bottomForm.setLayoutData(bottomLayoutData);
1246
1255
Lines 1483-1488 Link Here
1483
						// ignore
1492
						// ignore
1484
					}
1493
					}
1485
				}
1494
				}
1495
				if ((commentPattern.getText() != null && !commentPattern.getText().equals("")) || // //$NON-NLS-1$
1496
						(emailPattern2.getText() != null && !emailPattern2.getText().equals("")) || // //$NON-NLS-1$
1497
						(keywords.getText() != null && !keywords.getText().equals("")) || // //$NON-NLS-1$
1498
						(whiteboardPattern.getText() != null && !whiteboardPattern.getText().equals("")) || // //$NON-NLS-1$
1499
						priority.getSelection().length > 0 || resolution.getSelection().length > 0
1500
						|| version.getSelection().length > 0 || target.getSelection().length > 0
1501
						|| hardware.getSelection().length > 0 || os.getSelection().length > 0) {
1502
					moreOptionsExpandComposite.setExpanded(true);
1503
					scrolledComposite.reflow(true);
1504
					refreshChartControls();
1505
				}
1506
				if (charts.get(0).getChartExpression(0, 0).getFieldName() > 0) {
1507
					chartExpandComposite.setExpanded(true);
1508
					scrolledComposite.reflow(true);
1509
					refreshChartControls();
1510
				}
1486
			}
1511
			}
1487
1512
1488
			/*
1513
			/*
Lines 2542-2547 Link Here
2542
		layout.horizontalSpacing = 0;
2567
		layout.horizontalSpacing = 0;
2543
		chartGroup.setLayout(layout);
2568
		chartGroup.setLayout(layout);
2544
		gd = new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1);
2569
		gd = new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1);
2570
		gd.horizontalIndent = INDENT;
2545
		chartGroup.setLayoutData(gd);
2571
		chartGroup.setLayoutData(gd);
2546
		charts.add(0, new Chart());
2572
		charts.add(0, new Chart());
2547
		recreateChartControls();
2573
		recreateChartControls();
Lines 2667-2673 Link Here
2667
					orButton.addSelectionListener(new SelectionAdapter() {
2693
					orButton.addSelectionListener(new SelectionAdapter() {
2668
						@Override
2694
						@Override
2669
						public void widgetSelected(SelectionEvent e) {
2695
						public void widgetSelected(SelectionEvent e) {
2670
							if (e.stateMask == SWT.CTRL) {
2696
							if (e.stateMask == SWT.SHIFT) {
2671
								if (charts.size() == 1 && charts.get(0).getRowSize() == 1
2697
								if (charts.size() == 1 && charts.get(0).getRowSize() == 1
2672
										&& charts.get(0).getColumnSize(0) == 1) {
2698
										&& charts.get(0).getColumnSize(0) == 1) {
2673
									return;
2699
									return;
(-)src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties (-1 / +1 lines)
Lines 142-146 Link Here
142
BugzillaSearchPage_Field_Votes=Votes
142
BugzillaSearchPage_Field_Votes=Votes
143
BugzillaSearchPage_More_Options=More Options
143
BugzillaSearchPage_More_Options=More Options
144
BugzillaSearchPage_Tooltip_Custom_fields_at_end=Custom fields are at the end of the list\!
144
BugzillaSearchPage_Tooltip_Custom_fields_at_end=Custom fields are at the end of the list\!
145
BugzillaSearchPage_Tooltip_remove_row=Press CTRL to remove this row
145
BugzillaSearchPage_Tooltip_remove_row=Press SHIFT to remove this row
146
BugzillaSearchPage_Whiteboard=Whiteboard:
146
BugzillaSearchPage_Whiteboard=Whiteboard:

Return to bug 283200