diff options
5 files changed, 22 insertions, 14 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 6a3164890..be1eab319 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 @@ -40,6 +40,7 @@ import org.eclipse.jface.fieldassist.ComboContentAdapter; import org.eclipse.jface.fieldassist.ContentProposalAdapter; import org.eclipse.jface.fieldassist.IContentProposalProvider; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.window.Window; import org.eclipse.mylyn.commons.core.CoreUtil; @@ -97,6 +98,7 @@ import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; * @author Mik Kersten (hardening of prototype) * @author Frank Becker */ +@SuppressWarnings("restriction") public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements Listener { private static final int HEIGHT_ATTRIBUTE_COMBO = 70; @@ -431,7 +433,7 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L moreOptionsExpandComposite = toolkit.createExpandableComposite(control, ExpandableComposite.COMPACT | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR); - moreOptionsExpandComposite.setFont(control.getFont()); + moreOptionsExpandComposite.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT)); moreOptionsExpandComposite.setBackground(null); moreOptionsExpandComposite.setText(Messages.BugzillaSearchPage_More_Options); moreOptionsExpandComposite.setLayout(new GridLayout(3, false)); @@ -512,7 +514,7 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L new Label(basicComposite, SWT.NONE); Composite emailComposite = new Composite(basicComposite, SWT.NONE); - emailComposite.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false, 2, 1)); + emailComposite.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1)); GridLayout emailLayout = new GridLayout(); emailLayout.marginWidth = 0; emailLayout.marginHeight = 0; @@ -699,7 +701,7 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L new Label(advancedComposite, SWT.NONE); Composite emailComposite2 = new Composite(advancedComposite, SWT.NONE); - emailComposite2.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false, 2, 1)); + emailComposite2.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1)); GridLayout emailLayout2 = new GridLayout(); emailLayout2.marginWidth = 0; emailLayout2.marginHeight = 0; @@ -1123,10 +1125,16 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L moreOptionsExpandComposite.setExpanded(true); } setPageComplete(isPageComplete()); + } + if (visible) { + getControl().getShell().layout(false, true); Point oldSize = getControl().getSize(); Point newSize = getControl().computeSize(SWT.DEFAULT, SWT.DEFAULT, true); + if (!moreOptionsExpandComposite.isExpanded()) { + // for some reason in not expanded state the width is a little to small + newSize.x += 36; + } resizeDialogIfNeeded(oldSize, newSize); - if (getWizard() == null) { // TODO: wierd check summaryPattern.setFocus(); 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 fd854ae1f..9399fdba1 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 @@ -13,10 +13,10 @@ BugzillaSearchPage_all_words=all words BugzillaSearchPage_any=any BugzillaSearchPage_any_word=any word BugzillaSearchPage_Bugzilla_Query=Bugzilla Query -BugzillaSearchPage_cc=cc +BugzillaSearchPage_cc=CC BugzillaSearchPage_Changed_in=Ch&anged in: BugzillaSearchPage_Comment=&Comment: -BugzillaSearchPage_commenter=commenter +BugzillaSearchPage_commenter=Commenter BugzillaSearchPage_Component=Compo&nent: BugzillaSearchPage_days=\ days. BugzillaSearchPage_Email=&Email: @@ -33,22 +33,22 @@ BugzillaSearchPage_none=none BugzillaSearchPage_notregexp=notregexp BugzillaSearchPage_Number_of_days_must_be_a_positive_integer=Number of days must be a positive integer. {0} is invalid. BugzillaSearchPage_Operating_System=&Operating System: -BugzillaSearchPage_owner=owner +BugzillaSearchPage_owner=Owner BugzillaSearchPage_Product=&Product: BugzillaSearchPage_PROORITY=Priori&ty: -BugzillaSearchPage_qacontact=qa +BugzillaSearchPage_qacontact=QA Contact BugzillaSearchPage_Query_Title=&Query Title: BugzillaSearchPage_regexp=regexp -BugzillaSearchPage_reporter=reporter +BugzillaSearchPage_reporter=Reporter BugzillaSearchPage_Resolution=&Resolution: BugzillaSearchPage_Select_=Select... BugzillaSearchPage_Select_the_Bugzilla_query_parameters=Select the Bugzilla query parameters. Use the Update Attributes button to retrieve updated values from the repository. BugzillaSearchPage_Severity=Se&verity: BugzillaSearchPage_Status=Stat&us: -BugzillaSearchPage_substring=substring +BugzillaSearchPage_substring=contains BugzillaSearchPage_Summary=Summar&y: BugzillaSearchPage_Update_Attributes_from_Repository=Up&date Attributes from Repository BugzillaSearchPage_Updating_search_options_=Updating search options... BugzillaSearchPage_Version=Vers&ion: BugzillaSearchPage_ClearFields=Clear Fields -BugzillaSearchPage_More_Options=more Options +BugzillaSearchPage_More_Options=More Options diff --git a/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java b/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java index 06050c204..6f6fe241b 100644 --- a/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java +++ b/org.eclipse.mylyn.tasks.search/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java @@ -166,7 +166,7 @@ public class TaskSearchPage extends DialogPage implements ISearchPage { group.setLayoutData(gd); Label label = new Label(group, SWT.NONE); - label.setText(Messages.TaskSearchPage_Select_Repository_); + label.setText(Messages.TaskSearchPage_Repository); repositoryCombo = new Combo(group, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY); repositoryCombo.addSelectionListener(new SelectionAdapter() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/Messages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/Messages.java index d399b6d3a..eb2855366 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/Messages.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/Messages.java @@ -91,7 +91,7 @@ public class Messages extends NLS { public static String TaskSearchPage_Repository_Search; - public static String TaskSearchPage_Select_Repository_; + public static String TaskSearchPage_Repository; public static String TaskSearchPage_Task_Key_ID; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/messages.properties b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/messages.properties index 6cfd0b7de..874487bde 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/messages.properties +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/messages.properties @@ -58,7 +58,7 @@ TaskSearchPage_ERROR_Unable_to_present_query_page=ERROR: Unable to present query TaskSearchPage_No_task_found_matching_key_=No task found matching key: TaskSearchPage_Repository_Search=Repository Search -TaskSearchPage_Select_Repository_=Se&lect Repository: +TaskSearchPage_Repository=Repository: TaskSearchPage_Task_Key_ID=Task Key/ID: TaskSearchPage_Task_Search=Task Search |