|
Lines 2603-2611
Link Here
|
| 2603 |
storeMultiSelection(); |
2603 |
storeMultiSelection(); |
| 2604 |
} |
2604 |
} |
| 2605 |
}); |
2605 |
}); |
|
|
2606 |
|
| 2607 |
// calculate max combo width |
| 2608 |
ArrayList allOperators = new ArrayList(); |
| 2609 |
String[] keys = getMultiMatcherKeys(); |
| 2610 |
for (int i = 0; i < keys.length; i++) { |
| 2611 |
allOperators.addAll(Arrays.asList(getLocalOperatorsForKey(MultiMatcherLocalization.getMultiMatcherKey(keys[i])))); |
| 2612 |
} |
| 2613 |
Combo tmp = new Combo(multiArgumentComposite, SWT.READ_ONLY); |
| 2614 |
tmp.setItems((String []) allOperators.toArray(new String[0])); |
| 2615 |
int maxWidth = tmp.computeSize(SWT.DEFAULT, SWT.DEFAULT).x; |
| 2616 |
tmp.dispose(); |
| 2606 |
|
2617 |
|
| 2607 |
multiOperator = new Combo(multiArgumentComposite, SWT.READ_ONLY); |
2618 |
multiOperator = new Combo(multiArgumentComposite, SWT.READ_ONLY); |
| 2608 |
data = new GridData(SWT.LEFT, SWT.TOP, false, false); |
2619 |
data = new GridData(SWT.LEFT, SWT.TOP, false, false); |
|
|
2620 |
data.widthHint = maxWidth; |
| 2609 |
multiOperator.setLayoutData(data); |
2621 |
multiOperator.setLayoutData(data); |
| 2610 |
multiOperator.setFont(font); |
2622 |
multiOperator.setFont(font); |
| 2611 |
multiOperator.addSelectionListener(new SelectionAdapter() { |
2623 |
multiOperator.addSelectionListener(new SelectionAdapter() { |
|
Lines 2691-2701
Link Here
|
| 2691 |
argument.pattern = new String(); |
2703 |
argument.pattern = new String(); |
| 2692 |
filter.setArguments(FileInfoAttributesMatcher.encodeArguments(argument)); |
2704 |
filter.setArguments(FileInfoAttributesMatcher.encodeArguments(argument)); |
| 2693 |
} |
2705 |
} |
|
|
2706 |
// We remove '6' from the height, otherwise it will be 6 pixels larger than the hint |
| 2707 |
// (tested on Windows XP) If we set the heightHint to 21, it ends up being 27 high. |
| 2708 |
// Why, I haven't figured out. So instead we set the height hint to 21-6. |
| 2709 |
int textHeightHint = multiOperator.computeSize(SWT.DEFAULT, SWT.DEFAULT).y - 6; |
| 2710 |
|
| 2694 |
if (selectedKeyOperatorType.equals(String.class)) { |
2711 |
if (selectedKeyOperatorType.equals(String.class)) { |
| 2695 |
|
2712 |
|
| 2696 |
arguments = new Text(multiArgumentComposite, SWT.SINGLE | SWT.BORDER); |
2713 |
arguments = new Text(multiArgumentComposite, SWT.SINGLE | SWT.BORDER); |
| 2697 |
GridData data = new GridData(SWT.FILL, SWT.CENTER, true, false); |
2714 |
GridData data = new GridData(SWT.FILL, SWT.CENTER, true, false); |
| 2698 |
data.widthHint = 150; |
2715 |
data.widthHint = 150; |
|
|
2716 |
data.heightHint = textHeightHint; |
| 2699 |
arguments.setLayoutData(data); |
2717 |
arguments.setLayoutData(data); |
| 2700 |
arguments.setFont(multiArgumentComposite.getFont()); |
2718 |
arguments.setFont(multiArgumentComposite.getFont()); |
| 2701 |
arguments.addModifyListener(new ModifyListener() { |
2719 |
arguments.addModifyListener(new ModifyListener() { |
|
Lines 2786-2791
Link Here
|
| 2786 |
GridData data; |
2804 |
GridData data; |
| 2787 |
arguments = new Text(multiArgumentComposite, SWT.SINGLE | SWT.BORDER); |
2805 |
arguments = new Text(multiArgumentComposite, SWT.SINGLE | SWT.BORDER); |
| 2788 |
data = new GridData(SWT.FILL, SWT.CENTER, true, false); |
2806 |
data = new GridData(SWT.FILL, SWT.CENTER, true, false); |
|
|
2807 |
data.heightHint = textHeightHint; |
| 2789 |
data.widthHint = 150; |
2808 |
data.widthHint = 150; |
| 2790 |
arguments.setLayoutData(data); |
2809 |
arguments.setLayoutData(data); |
| 2791 |
arguments.setFont(multiArgumentComposite.getFont()); |
2810 |
arguments.setFont(multiArgumentComposite.getFont()); |
|
Lines 2811-2817
Link Here
|
| 2811 |
} |
2830 |
} |
| 2812 |
if (selectedKeyOperatorType.equals(Date.class)) { |
2831 |
if (selectedKeyOperatorType.equals(Date.class)) { |
| 2813 |
GridData data; |
2832 |
GridData data; |
| 2814 |
argumentsDate = new DateTime(multiArgumentComposite, SWT.DATE | SWT.MEDIUM); |
2833 |
argumentsDate = new DateTime(multiArgumentComposite, SWT.DATE | SWT.MEDIUM | SWT.BORDER); |
| 2815 |
data = new GridData(SWT.FILL, SWT.CENTER, true, false); |
2834 |
data = new GridData(SWT.FILL, SWT.CENTER, true, false); |
| 2816 |
argumentsDate.setLayoutData(data); |
2835 |
argumentsDate.setLayoutData(data); |
| 2817 |
argumentsDate.setFont(multiArgumentComposite.getFont()); |
2836 |
argumentsDate.setFont(multiArgumentComposite.getFont()); |
|
Lines 3316-3320
Link Here
|
| 3316 |
} |
3335 |
} |
| 3317 |
return null; |
3336 |
return null; |
| 3318 |
} |
3337 |
} |
| 3319 |
|
|
|
| 3320 |
} |
3338 |
} |
