Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfbecker2010-02-26 20:13:01 +0000
committerfbecker2010-02-26 20:13:01 +0000
commitf67d195914c9eb65d11ef17af5015bf70b1dada4 (patch)
tree39702c80be566b4ec0119c14803c1ed26ac3e9b8 /org.eclipse.mylyn.bugzilla.ui/src
parent59d49de8540ca44963fe1ed17f32c4307eb2dd18 (diff)
downloadorg.eclipse.mylyn.tasks-f67d195914c9eb65d11ef17af5015bf70b1dada4.tar.gz
org.eclipse.mylyn.tasks-f67d195914c9eb65d11ef17af5015bf70b1dada4.tar.xz
org.eclipse.mylyn.tasks-f67d195914c9eb65d11ef17af5015bf70b1dada4.zip
ASSIGNED - bug 290197: [ui] refactor bugzilla search query page layout
https://bugs.eclipse.org/bugs/show_bug.cgi?id=290197
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.ui/src')
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java92
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/Messages.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties2
3 files changed, 48 insertions, 48 deletions
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
index 0f29e09cf..a92876f32 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java
@@ -264,7 +264,7 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L
private final FormToolkit toolkit;
- private ExpandableComposite advancedExpandComposite;
+ private ExpandableComposite moreOptionsExpandComposite;
private final SelectionAdapter updateActionSelectionAdapter = new SelectionAdapter() {
@Override
@@ -420,35 +420,35 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L
queryTitle.setFocus();
}
- advancedExpandComposite = toolkit.createExpandableComposite(control, ExpandableComposite.COMPACT
+ moreOptionsExpandComposite = toolkit.createExpandableComposite(control, ExpandableComposite.COMPACT
| ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR);
- advancedExpandComposite.setFont(control.getFont());
- advancedExpandComposite.setBackground(null);
- advancedExpandComposite.setText(Messages.BugzillaSearchPage_Advanced);
- advancedExpandComposite.setLayout(new GridLayout(3, false));
+ moreOptionsExpandComposite.setFont(control.getFont());
+ moreOptionsExpandComposite.setBackground(null);
+ moreOptionsExpandComposite.setText(Messages.BugzillaSearchPage_More_Options);
+ moreOptionsExpandComposite.setLayout(new GridLayout(3, false));
g = new GridData(GridData.FILL_HORIZONTAL);
g.horizontalSpan = 3;
- advancedExpandComposite.setLayoutData(g);
- advancedExpandComposite.addExpansionListener(new ExpansionAdapter() {
+ moreOptionsExpandComposite.setLayoutData(g);
+ moreOptionsExpandComposite.addExpansionListener(new ExpansionAdapter() {
@Override
public void expansionStateChanged(ExpansionEvent e) {
getControl().getShell().pack();
}
});
- Composite advancedComposite = new Composite(advancedExpandComposite, SWT.NULL);
- advancedComposite.setLayout(new GridLayout(4, false));
+ Composite moreOptionsComposite = new Composite(moreOptionsExpandComposite, SWT.NULL);
+ moreOptionsComposite.setLayout(new GridLayout(4, false));
g = new GridData(GridData.FILL_HORIZONTAL);
g.widthHint = 500;
g.heightHint = 200;
- advancedComposite.setLayoutData(g);
- Dialog.applyDialogFont(advancedComposite);
- advancedExpandComposite.setClient(advancedComposite);
+ moreOptionsComposite.setLayoutData(g);
+ Dialog.applyDialogFont(moreOptionsComposite);
+ moreOptionsExpandComposite.setClient(moreOptionsComposite);
createBasicComposite(basicComposite);
- createAdvancedComposite(advancedComposite);
- createSearchGroup(advancedComposite);
+ createMoreOptionsComposite(moreOptionsComposite);
+ createSearchGroup(moreOptionsComposite);
}
private void createBasicComposite(Composite basicComposite) {
@@ -616,26 +616,26 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L
status.setLayoutData(gd_status);
status.addSelectionListener(updateActionSelectionAdapter);
- Composite priorityComposite = new Composite(topForm, SWT.NONE);
- GridLayout priorityLayout = new GridLayout();
- priorityLayout.marginWidth = 0;
- priorityLayout.marginHeight = 0;
- priorityLayout.horizontalSpacing = 0;
- priorityComposite.setLayout(priorityLayout);
+ Composite severityComposite = new Composite(topForm, SWT.NONE);
+ GridLayout severityLayout = new GridLayout();
+ severityLayout.marginWidth = 0;
+ severityLayout.marginHeight = 0;
+ severityLayout.horizontalSpacing = 0;
+ severityComposite.setLayout(severityLayout);
- Label priorityLabel = new Label(priorityComposite, SWT.LEFT);
- priorityLabel.setText(Messages.BugzillaSearchPage_PROORITY);
- priorityLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ Label severityLabel = new Label(severityComposite, SWT.LEFT);
+ severityLabel.setText(Messages.BugzillaSearchPage_Severity);
+ severityLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- priority = new List(priorityComposite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
- final GridData gd_priority = new GridData(SWT.FILL, SWT.FILL, true, true);
- gd_priority.heightHint = HEIGHT_ATTRIBUTE_COMBO;
- priority.setLayoutData(gd_priority);
- priority.addSelectionListener(updateActionSelectionAdapter);
+ severity = new List(severityComposite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
+ final GridData gd_severity = new GridData(SWT.FILL, SWT.FILL, true, true);
+ gd_severity.heightHint = HEIGHT_ATTRIBUTE_COMBO;
+ severity.setLayoutData(gd_severity);
+ severity.addSelectionListener(updateActionSelectionAdapter);
}
- private void createAdvancedComposite(Composite advancedComposite) {
+ private void createMoreOptionsComposite(Composite advancedComposite) {
// Info text
Label labelComment = new Label(advancedComposite, SWT.LEFT);
@@ -767,22 +767,22 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L
bottomLayoutData.widthHint = 400;
bottomForm.setLayoutData(bottomLayoutData);
- Composite severityComposite = new Composite(bottomForm, SWT.NONE);
- GridLayout severityLayout = new GridLayout();
- severityLayout.marginWidth = 0;
- severityLayout.marginHeight = 0;
- severityLayout.horizontalSpacing = 0;
- severityComposite.setLayout(severityLayout);
+ Composite priorityComposite = new Composite(bottomForm, SWT.NONE);
+ GridLayout priorityLayout = new GridLayout();
+ priorityLayout.marginWidth = 0;
+ priorityLayout.marginHeight = 0;
+ priorityLayout.horizontalSpacing = 0;
+ priorityComposite.setLayout(priorityLayout);
- Label severityLabel = new Label(severityComposite, SWT.LEFT);
- severityLabel.setText(Messages.BugzillaSearchPage_Severity);
- severityLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ Label priorityLabel = new Label(priorityComposite, SWT.LEFT);
+ priorityLabel.setText(Messages.BugzillaSearchPage_PROORITY);
+ priorityLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- severity = new List(severityComposite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
- final GridData gd_severity = new GridData(SWT.FILL, SWT.FILL, true, true);
- gd_severity.heightHint = HEIGHT_ATTRIBUTE_COMBO;
- severity.setLayoutData(gd_severity);
- severity.addSelectionListener(updateActionSelectionAdapter);
+ priority = new List(priorityComposite, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
+ final GridData gd_priority = new GridData(SWT.FILL, SWT.FILL, true, true);
+ gd_priority.heightHint = HEIGHT_ATTRIBUTE_COMBO;
+ priority.setLayoutData(gd_priority);
+ priority.addSelectionListener(updateActionSelectionAdapter);
Composite resolutionComposite = new Composite(bottomForm, SWT.NONE);
GridLayout resolutionLayout = new GridLayout();
@@ -1785,10 +1785,10 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L
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$
- severity.getSelection().length > 0 || resolution.getSelection().length > 0
+ priority.getSelection().length > 0 || resolution.getSelection().length > 0
|| version.getSelection().length > 0 || target.getSelection().length > 0
|| hardware.getSelection().length > 0 || os.getSelection().length > 0) {
- advancedExpandComposite.setExpanded(true);
+ moreOptionsExpandComposite.setExpanded(true);
}
} catch (IllegalArgumentException e) {
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/Messages.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/Messages.java
index c7f83b450..362bd86d8 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/Messages.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/Messages.java
@@ -111,5 +111,5 @@ public class Messages extends NLS {
public static String BugzillaSearchPage_ClearFields;
- public static String BugzillaSearchPage_Advanced;
+ public static String BugzillaSearchPage_More_Options;
}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties
index b01409462..fd854ae1f 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/messages.properties
@@ -51,4 +51,4 @@ BugzillaSearchPage_Update_Attributes_from_Repository=Up&date Attributes from Rep
BugzillaSearchPage_Updating_search_options_=Updating search options...
BugzillaSearchPage_Version=Vers&ion:
BugzillaSearchPage_ClearFields=Clear Fields
-BugzillaSearchPage_Advanced=Advanced
+BugzillaSearchPage_More_Options=more Options

Back to the top