Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 125493 Details for
Bug 242445
[api] update layout of repository settings page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Patch including last suggestions from ui review
clipboard.txt (text/plain), 35.59 KB, created by
Helen Bershadskaya
on 2009-02-12 02:44:57 EST
(
hide
)
Description:
Patch including last suggestions from ui review
Filename:
MIME Type:
Creator:
Helen Bershadskaya
Created:
2009-02-12 02:44:57 EST
Size:
35.59 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.mylyn.tasks.ui >Index: .refactorings/2009/1/5/refactorings.history >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/.refactorings/2009/1/5/refactorings.history,v >retrieving revision 1.4 >diff -u -r1.4 refactorings.history >--- .refactorings/2009/1/5/refactorings.history 30 Jan 2009 06:21:08 -0000 1.4 >+++ .refactorings/2009/1/5/refactorings.history 12 Feb 2009 07:44:09 -0000 >@@ -1,3 +1,4 @@ > <?xml version="1.0" encoding="UTF-8"?> >-<session version="1.0">
<refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.tasks.ui'
- Original project: 'org.eclipse.mylyn.tasks.ui'
- Original element: 'org.eclipse.mylyn.internal.tasks.ui.TaskTransfer.java'" description="Delete element" element1="/src<org.eclipse.mylyn.internal.tasks.ui{TaskTransfer.java" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1233206491298" subPackages="false" version="1.0"/>
<refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.tasks.ui'
- Original project: 'org.eclipse.mylyn.tasks.ui'
- Original element: 'org.eclipse.mylyn.internal.tasks.ui.actions.QueryExportAction.java'" description="Delete element" element1="/src<org.eclipse.mylyn.internal.tasks.ui.actions{QueryExportAction.java" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1233210889491" subPackages="false" version="1.0"/>
<refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.tasks.ui'
- Original project: 'org.eclipse.mylyn.tasks.ui'
- Original element: 'org.eclipse.mylyn.internal.tasks.ui.actions.TaskImportAction.java'" description="Delete element" element1="/src<org.eclipse.mylyn.internal.tasks.ui.actions{TaskImportAction.java" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1233210899590" subPackages="false" version="1.0"/>
<refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.tasks.ui'
- Original project: 'org.eclipse.mylyn.tasks.ui'
- Original element: 'org.eclipse.mylyn.internal.tasks.ui.actions.TaskExportAction.java'" description="Delete element" element1="/src<org.eclipse.mylyn.internal.tasks.ui.actions{TaskExportAction.java" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1233210913620" subPackages="false" version="1.0"/>
<refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.tasks.ui'
- Original project: 'org.eclipse.mylyn.tasks.ui'
- Original element: 'org.eclipse.mylyn.internal.tasks.ui.actions.QueryImportAction.java'" description="Delete element" element1="/src<org.eclipse.mylyn.internal.tasks.ui.actions{QueryImportAction.java" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1233210970772" subPackages="false" version="1.0"/>

<refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.tasks.ui'
- Original project: 'org.eclipse.mylyn.tasks.ui'
- Original element: 'org.eclipse.mylyn.internal.tasks.ui.util.TaskListElementImporter.java'" description="Delete element" element1="/src<org.eclipse.mylyn.internal.tasks.ui.util{TaskListElementImporter.java" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1233213919708" subPackages="false" version="1.0"/>
<refactoring comment="Rename type 'org.eclipse.mylyn.internal.tasks.ui.util.TaskDataExportOperation' to 'TaskDataSnapshotOperation'
- Original project: 'org.eclipse.mylyn.tasks.ui'
- Original element: 'org.eclipse.mylyn.internal.tasks.ui.util.TaskDataExportOperation'
- Renamed element: 'org.eclipse.mylyn.internal.tasks.ui.util.TaskDataSnapshotOperation'
- Update references to refactored element
- Update textual occurrences in comments and strings" description="Rename type 'TaskDataExportOperation'" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/src<org.eclipse.mylyn.internal.tasks.ui.util{TaskDataExportOperation.java[TaskDataExportOperation" matchStrategy="1" name="TaskDataSnapshotOperation" qualified="false" references="true" similarDeclarations="false" stamp="1233271233628" textual="false" version="1.0"/>
<refactoring comment="Copy 1 elements(s) to 'org.eclipse.mylyn.tasks.ui/src/org.eclipse.mylyn.internal.tasks.ui.util'
- Original project: 'org.eclipse.mylyn.tasks.ui'
- Destination element: 'org.eclipse.mylyn.tasks.ui/src/org.eclipse.mylyn.internal.tasks.ui.util'
- Original element: 'org.eclipse.mylyn.internal.tasks.ui.util.TaskDataSnapshotOperation.java'" description="Copy compilation unit" destination="/src<org.eclipse.mylyn.internal.tasks.ui.util" element1="/src<org.eclipse.mylyn.internal.tasks.ui.util{TaskDataSnapshotOperation.java" files="0" flags="589830" folders="0" id="org.eclipse.jdt.ui.copy" policy="org.eclipse.jdt.ui.copyResources" stamp="1233271281116" units="1" version="1.0"/>
<refactoring accessors="true" comment="Delete 1 element(s) from project 'org.eclipse.mylyn.tasks.ui'
- Original project: 'org.eclipse.mylyn.tasks.ui'
- Original element: 'org.eclipse.mylyn.internal.tasks.ui.util.TaskDataSnapshotOperation.java'" description="Delete element" element1="/src<org.eclipse.mylyn.internal.tasks.ui.util{TaskDataSnapshotOperation.java" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1233271369065" subPackages="false" version="1.0"/>
<refactoring comment="Extract method 'private void exportChosen(IProgressMonitor monitor)' from 'org.eclipse.mylyn.internal.tasks.ui.util.TaskDataExportOperation.run()' to 'org.eclipse.mylyn.internal.tasks.ui.util.TaskDataExportOperation'
- Original project: 'org.eclipse.mylyn.tasks.ui'
- Method name: 'exportChosen'
- Destination type: 'org.eclipse.mylyn.internal.tasks.ui.util.TaskDataExportOperation'
- Declared visibility: 'private'" comments="false" description="Extract method 'exportChosen'" destination="0" exceptions="false" flags="786434" id="org.eclipse.jdt.ui.extract.method" input="/src<org.eclipse.mylyn.internal.tasks.ui.util{TaskDataExportOperation.java" name="exportChosen" replace="false" selection="4119 4737" stamp="1233271755850" version="1.0" visibility="2"/>
<refactoring comment="Encapsulate field 'org.eclipse.mylyn.internal.tasks.ui.util.TaskDataExportOperation.totalWork' in 'org.eclipse.mylyn.internal.tasks.ui.util.TaskDataExportOperation'
- Original project: 'org.eclipse.mylyn.tasks.ui'
- Original element: 'org.eclipse.mylyn.internal.tasks.ui.util.TaskDataExportOperation.totalWork'
- Getter method name: 'getTotalWork'
- Setter method name: 'setTotalWork'
- Field visibility: 'public'
- Use getter and setter methods in declaring type" comments="false" declaring="true" description="Encapsulate field 'totalWork'" flags="589830" getter="getTotalWork" id="org.eclipse.jdt.ui.self.encapsulate" input="/src<org.eclipse.mylyn.internal.tasks.ui.util{TaskDataExportOperation.java[TaskDataExportOperation^totalWork" insertion="5" setter="setTotalWork" stamp="1233292540383" version="1.0" visibility="1"/>
<refactoring comment="Extract constant 'EXPORT_JOB_LABEL' from expression '"Task Data Export"'
- Original project: 'org.eclipse.mylyn.tasks.ui'
- Constant name: 'EXPORT_JOB_LABEL'
- Constant expression: '"Task Data Export"'
- Declared visibility: 'private'
- Replace occurrences of expression with constant" description="Extract constant 'EXPORT_JOB_LABEL'" flags="786432" id="org.eclipse.jdt.ui.extract.constant" input="/src<org.eclipse.mylyn.internal.tasks.ui.util{TaskDataExportOperation.java" name="EXPORT_JOB_LABEL" qualify="false" replace="true" selection="4221 18" stamp="1233292644568" version="1.0" visibility="2"/> >+<session version="1.0"> >+<refactoring comment="Convert local variable 'org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage.createSettingControls().userNameComposite' in 'org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage.createSettingControls()' to field
- Original project: 'org.eclipse.mylyn.tasks.ui'
- Original element: 'org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage.createSettingControls().userNameComposite'
- Field name: 'userNameComposite'
- Initialize field in method
- Declared visibility: 'private'" description="Convert local variable 'userNameComposite' to field" final="false" flags="2" id="org.eclipse.jdt.ui.promote.temp" initialize="1" input="/src<org.eclipse.mylyn.tasks.ui.wizards{AbstractRepositorySettingsPage.java" name="userNameComposite" selection="11025 63" stamp="1233037857281" static="false" version="1.0" visibility="2"/> > </session> >\ No newline at end of file >Index: .refactorings/2009/1/5/refactorings.index >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/.refactorings/2009/1/5/refactorings.index,v >retrieving revision 1.4 >diff -u -r1.4 refactorings.index >--- .refactorings/2009/1/5/refactorings.index 30 Jan 2009 06:21:08 -0000 1.4 >+++ .refactorings/2009/1/5/refactorings.index 12 Feb 2009 07:44:09 -0000 >@@ -1,12 +1 @@ >-1233206491298 Delete element >-1233210889491 Delete element >-1233210899590 Delete element >-1233210913620 Delete element >-1233210970772 Delete element >-1233213919708 Delete element >-1233271233628 Rename type 'TaskDataExportOperation' >-1233271281116 Copy compilation unit >-1233271369065 Delete element >-1233271755850 Extract method 'exportChosen' >-1233292540383 Encapsulate field 'totalWork' >-1233292644568 Extract constant 'EXPORT_JOB_LABEL' >+1233037857281 Convert local variable 'userNameComposite' to field >Index: src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties,v >retrieving revision 1.9 >diff -u -r1.9 messages.properties >--- src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties 11 Feb 2009 00:14:00 -0000 1.9 >+++ src/org/eclipse/mylyn/internal/tasks/ui/wizards/messages.properties 12 Feb 2009 07:44:09 -0000 >@@ -82,7 +82,7 @@ > AbstractRepositoryQueryPage_Please_specify_a_title_for_the_query=Please specify a title for the query. > AbstractRepositoryQueryPage_A_query_with_this_name_already_exists=A query with this name already exists, please choose another name. > AbstractRepositorySettingsPage_Additional_Settings=Additional Settings >-AbstractRepositorySettingsPage_Anonymous_Access=Anonymous Access >+AbstractRepositorySettingsPage_Anonymous_Access=Anonymous > AbstractRepositorySettingsPage_Authentication_credentials_are_valid=Authentication credentials are valid. > AbstractRepositorySettingsPage_Change_account_settings=Change account settings > AbstractRepositorySettingsPage_Change_Settings=Change Settings >@@ -90,7 +90,8 @@ > AbstractRepositorySettingsPage_Create_new_account=Create new account > AbstractRepositorySettingsPage_Default__=Default ( > AbstractRepositorySettingsPage_Disconnected=Disconnected >-AbstractRepositorySettingsPage_Enable_proxy_authentication=Enable proxy authentication >+AbstractRepositorySettingsPage_Enable_http_authentication=Enable Http Authentication >+AbstractRepositorySettingsPage_Enable_proxy_authentication=Enable Proxy Authentication > AbstractRepositorySettingsPage_Enabled=Enabled > AbstractRepositorySettingsPage_Enter_a_valid_server_url=Enter a valid server url > AbstractRepositorySettingsPage_Http_Authentication=Http Authentication >@@ -106,9 +107,7 @@ > AbstractRepositorySettingsPage_Repository_is_valid=Repository is valid. > AbstractRepositorySettingsPage_Repository_url_is_invalid=Repository url is invalid. > AbstractRepositorySettingsPage_Repository_user_name_and_password_must_not_be_blank=Repository user name and password must not be blank >-AbstractRepositorySettingsPage_Save_Http_Password=Save Http Password > AbstractRepositorySettingsPage_Save_Password=Save Password >-AbstractRepositorySettingsPage_Save_Proxy_Password=Save Proxy Password > AbstractRepositorySettingsPage_Server_=Server\:\ > AbstractRepositorySettingsPage_Status=Status > AbstractRepositorySettingsPage_Unable_to_authenticate_with_repository=Unable to authenticate with repository. Login credentials invalid. >Index: src/org/eclipse/mylyn/internal/tasks/ui/wizards/Messages.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/Messages.java,v >retrieving revision 1.9 >diff -u -r1.9 Messages.java >--- src/org/eclipse/mylyn/internal/tasks/ui/wizards/Messages.java 11 Feb 2009 00:14:00 -0000 1.9 >+++ src/org/eclipse/mylyn/internal/tasks/ui/wizards/Messages.java 12 Feb 2009 07:44:09 -0000 >@@ -179,6 +179,8 @@ > > public static String AbstractRepositorySettingsPage_Disconnected; > >+ public static String AbstractRepositorySettingsPage_Enable_http_authentication; >+ > public static String AbstractRepositorySettingsPage_Enable_proxy_authentication; > > public static String AbstractRepositorySettingsPage_Enabled; >@@ -211,12 +213,8 @@ > > public static String AbstractRepositorySettingsPage_Repository_user_name_and_password_must_not_be_blank; > >- public static String AbstractRepositorySettingsPage_Save_Http_Password; >- > public static String AbstractRepositorySettingsPage_Save_Password; > >- public static String AbstractRepositorySettingsPage_Save_Proxy_Password; >- > public static String AbstractRepositorySettingsPage_Server_; > > public static String AbstractRepositorySettingsPage_Status; >Index: src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java,v >retrieving revision 1.66 >diff -u -r1.66 AbstractRepositorySettingsPage.java >--- src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java 29 Jan 2009 23:32:44 -0000 1.66 >+++ src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java 12 Feb 2009 07:44:10 -0000 >@@ -29,6 +29,7 @@ > import org.eclipse.jface.operation.IRunnableWithProgress; > import org.eclipse.jface.preference.PreferenceDialog; > import org.eclipse.jface.preference.StringFieldEditor; >+import org.eclipse.jface.resource.JFaceResources; > import org.eclipse.mylyn.commons.core.StatusHandler; > import org.eclipse.mylyn.commons.net.AuthenticationCredentials; > import org.eclipse.mylyn.commons.net.AuthenticationType; >@@ -50,7 +51,6 @@ > import org.eclipse.swt.events.SelectionAdapter; > import org.eclipse.swt.events.SelectionEvent; > import org.eclipse.swt.events.SelectionListener; >-import org.eclipse.swt.layout.FillLayout; > import org.eclipse.swt.layout.GridData; > import org.eclipse.swt.layout.GridLayout; > import org.eclipse.swt.widgets.Button; >@@ -288,8 +288,8 @@ > oldHttpAuthUserId = null; > } > >- compositeContainer = new Composite(parent, SWT.NULL); >- FillLayout layout = new FillLayout(); >+ compositeContainer = new Composite(parent, SWT.NONE); >+ GridLayout layout = new GridLayout(3, false); > compositeContainer.setLayout(layout); > > new Label(compositeContainer, SWT.NONE).setText(LABEL_SERVER); >@@ -317,7 +317,8 @@ > } > }); > >- GridDataFactory.fillDefaults().hint(300, SWT.DEFAULT).grab(true, false).applyTo(serverUrlCombo); >+ GridDataFactory.fillDefaults().hint(300, SWT.DEFAULT).grab(true, false).span(2, SWT.DEFAULT).applyTo( >+ serverUrlCombo); > > repositoryLabelEditor = new StringFieldEditor("", LABEL_REPOSITORY_LABEL, StringFieldEditor.UNLIMITED, //$NON-NLS-1$ > compositeContainer) { >@@ -335,22 +336,17 @@ > getWizard().getContainer().updateButtons(); > } > } >+ >+ @Override >+ public int getNumberOfControls() { >+ return 2; >+ } > }; > // repositoryLabelEditor.setErrorMessage("error"); >- >- if (needsAnonymousLogin()) { >- anonymousButton = new Button(compositeContainer, SWT.CHECK); >- GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(anonymousButton); >- >- anonymousButton.setText(Messages.AbstractRepositorySettingsPage_Anonymous_Access); >- anonymousButton.addSelectionListener(new SelectionAdapter() { >- @Override >- public void widgetSelected(SelectionEvent e) { >- setAnonymous(anonymousButton.getSelection()); >- isPageComplete(); >- } >- }); >- } >+ ((GridLayout) (compositeContainer.getLayout())).numColumns++; >+ disconnectedButton = new Button(compositeContainer, SWT.CHECK); >+ disconnectedButton.setText(Messages.AbstractRepositorySettingsPage_Disconnected); >+ disconnectedButton.setSelection(repository != null ? repository.isOffline() : false); > > repositoryUserNameEditor = new StringFieldEditor("", LABEL_USER, StringFieldEditor.UNLIMITED, //$NON-NLS-1$ > compositeContainer) { >@@ -368,7 +364,27 @@ > getWizard().getContainer().updateButtons(); > } > } >+ >+ @Override >+ public int getNumberOfControls() { >+ // if will have anonymous checkbox on same line, make this control only span 2 columns >+ return needsAnonymousLogin() ? 2 : 3; >+ } > }; >+ if (needsAnonymousLogin()) { >+ // need to increase column number here, because above string editor will use them if declared beforehand >+ ((GridLayout) (compositeContainer.getLayout())).numColumns++; >+ anonymousButton = new Button(compositeContainer, SWT.CHECK); >+ >+ anonymousButton.setText(Messages.AbstractRepositorySettingsPage_Anonymous_Access); >+ anonymousButton.addSelectionListener(new SelectionAdapter() { >+ @Override >+ public void widgetSelected(SelectionEvent e) { >+ setAnonymous(anonymousButton.getSelection()); >+ isPageComplete(); >+ } >+ }); >+ } > > repositoryPasswordEditor = new RepositoryStringFieldEditor("", LABEL_PASSWORD, StringFieldEditor.UNLIMITED, //$NON-NLS-1$ > compositeContainer) { >@@ -386,10 +402,16 @@ > getWizard().getContainer().updateButtons(); > } > } >+ >+ @Override >+ public int getNumberOfControls() { >+ return 2; >+ } > }; > >+ // need to increase column number here, because above string editor will use them if declared beforehand >+ ((GridLayout) (compositeContainer.getLayout())).numColumns++; > savePasswordButton = new Button(compositeContainer, SWT.CHECK); >- GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(savePasswordButton); > savePasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Password); > > if (repository != null) { >@@ -452,13 +474,10 @@ > > if (needsAdvanced() || needsEncoding()) { > >- advancedExpComposite = toolkit.createExpandableComposite(compositeContainer, ExpandableComposite.COMPACT >- | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR); >+ advancedExpComposite = toolkit.createExpandableComposite(compositeContainer, ExpandableComposite.TWISTIE >+ | ExpandableComposite.CLIENT_INDENT | ExpandableComposite.COMPACT); > advancedExpComposite.clientVerticalSpacing = 0; >- GridData gridData_2 = new GridData(SWT.FILL, SWT.FILL, true, false); >- gridData_2.horizontalIndent = -5; >- advancedExpComposite.setLayoutData(gridData_2); >- advancedExpComposite.setFont(compositeContainer.getFont()); >+ advancedExpComposite.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT)); > advancedExpComposite.setBackground(compositeContainer.getBackground()); > advancedExpComposite.setText(Messages.AbstractRepositorySettingsPage_Additional_Settings); > advancedExpComposite.addExpansionListener(new ExpansionAdapter() { >@@ -468,12 +487,13 @@ > } > }); > >- GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(advancedExpComposite); >+ GridDataFactory.fillDefaults().indent(0, 8).span(3, SWT.DEFAULT).applyTo(advancedExpComposite); > > advancedComp = toolkit.createComposite(advancedExpComposite, SWT.NONE); > GridLayout gridLayout2 = new GridLayout(); > gridLayout2.numColumns = 2; > gridLayout2.verticalSpacing = 5; >+ gridLayout2.marginWidth = 0; > advancedComp.setLayout(gridLayout2); > advancedComp.setBackground(compositeContainer.getBackground()); > advancedExpComposite.setClient(advancedComp); >@@ -558,13 +578,10 @@ > } > > if (needsHttpAuth()) { >- httpAuthExpComposite = toolkit.createExpandableComposite(compositeContainer, ExpandableComposite.COMPACT >- | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR); >+ httpAuthExpComposite = toolkit.createExpandableComposite(compositeContainer, ExpandableComposite.TWISTIE >+ | ExpandableComposite.CLIENT_INDENT | ExpandableComposite.COMPACT); > httpAuthExpComposite.clientVerticalSpacing = 0; >- GridData gridData_2 = new GridData(SWT.FILL, SWT.FILL, true, false); >- gridData_2.horizontalIndent = -5; >- httpAuthExpComposite.setLayoutData(gridData_2); >- httpAuthExpComposite.setFont(compositeContainer.getFont()); >+ httpAuthExpComposite.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT)); > httpAuthExpComposite.setBackground(compositeContainer.getBackground()); > httpAuthExpComposite.setText(Messages.AbstractRepositorySettingsPage_Http_Authentication); > httpAuthExpComposite.addExpansionListener(new ExpansionAdapter() { >@@ -574,20 +591,23 @@ > } > }); > >- GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(httpAuthExpComposite); >+ GridDataFactory.fillDefaults().indent(0, 5).span(3, SWT.DEFAULT).applyTo(httpAuthExpComposite); > > httpAuthComp = toolkit.createComposite(httpAuthExpComposite, SWT.NONE); > GridLayout gridLayout2 = new GridLayout(); >- gridLayout2.numColumns = 2; > gridLayout2.verticalSpacing = 0; >+ gridLayout2.numColumns = 3; > httpAuthComp.setLayout(gridLayout2); > httpAuthComp.setBackground(compositeContainer.getBackground()); >+ GridDataFactory.fillDefaults().span(3, SWT.DEFAULT).applyTo(httpAuthComp); > httpAuthExpComposite.setClient(httpAuthComp); > >+ // need to increase column number here, because above string editor will use them if declared beforehand > httpAuthButton = new Button(httpAuthComp, SWT.CHECK); >- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(2, SWT.DEFAULT).applyTo(httpAuthButton); >+ GridDataFactory.fillDefaults().indent(0, 5).align(SWT.LEFT, SWT.TOP).span(3, SWT.DEFAULT).applyTo( >+ httpAuthButton); > >- httpAuthButton.setText(Messages.AbstractRepositorySettingsPage_Enabled); >+ httpAuthButton.setText(Messages.AbstractRepositorySettingsPage_Enable_http_authentication); > > httpAuthButton.addSelectionListener(new SelectionListener() { > public void widgetSelected(SelectionEvent e) { >@@ -614,15 +634,28 @@ > getWizard().getContainer().updateButtons(); > } > } >+ >+ @Override >+ public int getNumberOfControls() { >+ return 3; >+ } > }; >+ > httpAuthPasswordEditor = new RepositoryStringFieldEditor( > "", Messages.AbstractRepositorySettingsPage_Password_, StringFieldEditor.UNLIMITED, //$NON-NLS-1$ >- httpAuthComp); >+ httpAuthComp) { >+ @Override >+ public int getNumberOfControls() { >+ return 2; >+ } >+ }; > ((RepositoryStringFieldEditor) httpAuthPasswordEditor).getTextControl().setEchoChar('*'); > >+ // need to increase column number here, because above string editor will use them if declared beforehand >+ ((GridLayout) (httpAuthComp.getLayout())).numColumns++; >+ > saveHttpPasswordButton = new Button(httpAuthComp, SWT.CHECK); >- GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(saveHttpPasswordButton); >- saveHttpPasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Http_Password); >+ saveHttpPasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Password); > > httpAuthUserNameEditor.setEnabled(httpAuthButton.getSelection(), httpAuthComp); > httpAuthPasswordEditor.setEnabled(httpAuthButton.getSelection(), httpAuthComp); >@@ -641,8 +674,6 @@ > addProxySection(); > } > >- addStatusSection(); >- > addContributionSection(); > > Composite managementComposite = new Composite(compositeContainer, SWT.NULL); >@@ -711,13 +742,10 @@ > > private void addProxySection() { > >- proxyExpComposite = toolkit.createExpandableComposite(compositeContainer, ExpandableComposite.COMPACT >- | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR); >+ proxyExpComposite = toolkit.createExpandableComposite(compositeContainer, ExpandableComposite.TWISTIE >+ | ExpandableComposite.CLIENT_INDENT | ExpandableComposite.COMPACT); > proxyExpComposite.clientVerticalSpacing = 0; >- GridData gridData_2 = new GridData(SWT.FILL, SWT.FILL, true, false); >- gridData_2.horizontalIndent = -5; >- proxyExpComposite.setLayoutData(gridData_2); >- proxyExpComposite.setFont(compositeContainer.getFont()); >+ proxyExpComposite.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT)); > proxyExpComposite.setBackground(compositeContainer.getBackground()); > proxyExpComposite.setText(Messages.AbstractRepositorySettingsPage_Proxy_Server_Configuration); > proxyExpComposite.addExpansionListener(new ExpansionAdapter() { >@@ -727,27 +755,39 @@ > } > }); > >- GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(proxyExpComposite); >+ GridDataFactory.fillDefaults().indent(0, 5).span(3, SWT.DEFAULT).applyTo(proxyExpComposite); > > proxyAuthComp = toolkit.createComposite(proxyExpComposite, SWT.NONE); > GridLayout gridLayout2 = new GridLayout(); >- gridLayout2.numColumns = 2; > gridLayout2.verticalSpacing = 0; >+ gridLayout2.numColumns = 3; > proxyAuthComp.setLayout(gridLayout2); > proxyAuthComp.setBackground(compositeContainer.getBackground()); > proxyExpComposite.setClient(proxyAuthComp); > >- Composite settingsComposite = new Composite(proxyAuthComp, SWT.NULL); >+ Composite systemSettingsComposite = new Composite(proxyAuthComp, SWT.NULL); > GridLayout gridLayout3 = new GridLayout(); >- gridLayout3.numColumns = 2; > gridLayout3.verticalSpacing = 0; >- settingsComposite.setLayout(gridLayout3); >+ gridLayout3.numColumns = 2; >+ gridLayout3.marginWidth = 0; >+ systemSettingsComposite.setLayout(gridLayout3); > >- systemProxyButton = new Button(settingsComposite, SWT.CHECK); >- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(2, SWT.DEFAULT).applyTo(settingsComposite); >+ systemProxyButton = new Button(systemSettingsComposite, SWT.CHECK); >+ GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(3, SWT.DEFAULT).applyTo(systemSettingsComposite); > > systemProxyButton.setText(Messages.AbstractRepositorySettingsPage_Use_global_Network_Connections_preferences); >- Hyperlink changeProxySettingsLink = toolkit.createHyperlink(settingsComposite, >+ >+ systemProxyButton.addSelectionListener(new SelectionListener() { >+ public void widgetSelected(SelectionEvent e) { >+ setUseDefaultProxy(systemProxyButton.getSelection()); >+ } >+ >+ public void widgetDefaultSelected(SelectionEvent e) { >+ // ignore >+ } >+ }); >+ >+ Hyperlink changeProxySettingsLink = toolkit.createHyperlink(systemSettingsComposite, > Messages.AbstractRepositorySettingsPage_Change_Settings, SWT.NULL); > changeProxySettingsLink.setBackground(compositeContainer.getBackground()); > changeProxySettingsLink.addHyperlinkListener(new IHyperlinkListener() { >@@ -767,9 +807,12 @@ > } > }); > >- systemProxyButton.addSelectionListener(new SelectionListener() { >+ proxyAuthButton = new Button(proxyAuthComp, SWT.CHECK); >+ GridDataFactory.fillDefaults().span(3, SWT.DEFAULT).applyTo(proxyAuthButton); >+ proxyAuthButton.setText(Messages.AbstractRepositorySettingsPage_Enable_proxy_authentication); >+ proxyAuthButton.addSelectionListener(new SelectionListener() { > public void widgetSelected(SelectionEvent e) { >- setUseDefaultProxy(systemProxyButton.getSelection()); >+ setProxyAuth(proxyAuthButton.getSelection()); > } > > public void widgetDefaultSelected(SelectionEvent e) { >@@ -793,12 +836,23 @@ > getWizard().getContainer().updateButtons(); > } > } >+ >+ @Override >+ public int getNumberOfControls() { >+ return 3; >+ } > }; > proxyHostnameEditor.setStringValue(oldProxyHostname); > > proxyPortEditor = new RepositoryStringFieldEditor( > "", Messages.AbstractRepositorySettingsPage_Proxy_host_port_, StringFieldEditor.UNLIMITED, //$NON-NLS-1$ >- proxyAuthComp); >+ proxyAuthComp) { >+ >+ @Override >+ public int getNumberOfControls() { >+ return 3; >+ } >+ }; > > proxyPortEditor.setStringValue(oldProxyPort); > >@@ -807,20 +861,6 @@ > > // ************* PROXY AUTHENTICATION ************** > >- proxyAuthButton = new Button(proxyAuthComp, SWT.CHECK); >- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(2, SWT.DEFAULT).applyTo(proxyAuthButton); >- >- proxyAuthButton.setText(Messages.AbstractRepositorySettingsPage_Enable_proxy_authentication); >- proxyAuthButton.addSelectionListener(new SelectionListener() { >- public void widgetSelected(SelectionEvent e) { >- setProxyAuth(proxyAuthButton.getSelection()); >- } >- >- public void widgetDefaultSelected(SelectionEvent e) { >- // ignore >- } >- }); >- > proxyUserNameEditor = new StringFieldEditor( > "", Messages.AbstractRepositorySettingsPage_User_ID_, StringFieldEditor.UNLIMITED, proxyAuthComp) { //$NON-NLS-1$ > >@@ -836,10 +876,21 @@ > getWizard().getContainer().updateButtons(); > } > } >+ >+ @Override >+ public int getNumberOfControls() { >+ return 3; >+ } > }; >+ > proxyPasswordEditor = new RepositoryStringFieldEditor( > "", Messages.AbstractRepositorySettingsPage_Password_, StringFieldEditor.UNLIMITED, //$NON-NLS-1$ >- proxyAuthComp); >+ proxyAuthComp) { >+ @Override >+ public int getNumberOfControls() { >+ return 2; >+ } >+ }; > ((RepositoryStringFieldEditor) proxyPasswordEditor).getTextControl().setEchoChar('*'); > > // proxyPasswordEditor.setEnabled(httpAuthButton.getSelection(), >@@ -848,9 +899,10 @@ > // httpAuthPasswordEditor).setEnabled(httpAuthButton.getSelection(), > // advancedComp); > >+ // need to increase column number here, because above string editor will use them if declared beforehand >+ ((GridLayout) (proxyAuthComp.getLayout())).numColumns++; > saveProxyPasswordButton = new Button(proxyAuthComp, SWT.CHECK); >- GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(saveProxyPasswordButton); >- saveProxyPasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Proxy_Password); >+ saveProxyPasswordButton.setText(Messages.AbstractRepositorySettingsPage_Save_Password); > saveProxyPasswordButton.setEnabled(proxyAuthButton.getSelection()); > > if (repository != null) { >@@ -867,7 +919,7 @@ > > private void addContributionSection() { > Composite composite = toolkit.createComposite(compositeContainer); >- GridDataFactory.fillDefaults().grab(true, false).span(2, SWT.DEFAULT).applyTo(composite); >+ GridDataFactory.fillDefaults().grab(true, false).span(3, SWT.DEFAULT).applyTo(composite); > > GridLayout layout = new GridLayout(1, false); > layout.marginWidth = 0; >@@ -879,39 +931,6 @@ > createContributionControls(composite); > } > >- private void addStatusSection() { >- ExpandableComposite statusComposite = toolkit.createExpandableComposite(compositeContainer, >- ExpandableComposite.COMPACT | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR); >- statusComposite.clientVerticalSpacing = 0; >- GridData gd = new GridData(SWT.FILL, SWT.FILL, true, false); >- gd.horizontalIndent = -5; >- statusComposite.setLayoutData(gd); >- statusComposite.setFont(compositeContainer.getFont()); >- statusComposite.setBackground(compositeContainer.getBackground()); >- statusComposite.setText(Messages.AbstractRepositorySettingsPage_Status); >- statusComposite.addExpansionListener(new ExpansionAdapter() { >- @Override >- public void expansionStateChanged(ExpansionEvent e) { >- getControl().getShell().pack(); >- } >- }); >- GridDataFactory.fillDefaults().span(2, SWT.DEFAULT).applyTo(statusComposite); >- >- Composite composite = toolkit.createComposite(statusComposite, SWT.NONE); >- GridLayout layout = new GridLayout(); >- layout.numColumns = 2; >- layout.verticalSpacing = 0; >- composite.setLayout(layout); >- composite.setBackground(compositeContainer.getBackground()); >- statusComposite.setClient(composite); >- >- disconnectedButton = new Button(composite, SWT.CHECK); >- disconnectedButton.setText(Messages.AbstractRepositorySettingsPage_Disconnected); >- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.TOP).span(2, SWT.DEFAULT).applyTo(disconnectedButton); >- disconnectedButton.setSelection(repository != null ? repository.isOffline() : false); >- statusComposite.setExpanded(disconnectedButton.getSelection()); >- } >- > protected void setEncoding(String encoding) { > if (encoding.equals(TaskRepository.DEFAULT_CHARACTER_ENCODING)) { > setDefaultEncoding(); >Index: src/org/eclipse/mylyn/tasks/ui/wizards/AbstractTaskRepositoryPage.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractTaskRepositoryPage.java,v >retrieving revision 1.6 >diff -u -r1.6 AbstractTaskRepositoryPage.java >--- src/org/eclipse/mylyn/tasks/ui/wizards/AbstractTaskRepositoryPage.java 13 Jan 2009 06:59:04 -0000 1.6 >+++ src/org/eclipse/mylyn/tasks/ui/wizards/AbstractTaskRepositoryPage.java 12 Feb 2009 07:44:10 -0000 >@@ -28,6 +28,7 @@ > import org.eclipse.core.runtime.Status; > import org.eclipse.jface.dialogs.IMessageProvider; > import org.eclipse.jface.layout.GridDataFactory; >+import org.eclipse.jface.resource.JFaceResources; > import org.eclipse.jface.util.SafeRunnable; > import org.eclipse.jface.wizard.WizardPage; > import org.eclipse.mylyn.commons.core.StatusHandler; >@@ -207,10 +208,10 @@ > > for (final AbstractTaskRepositoryPageContribution contribution : contributions) { > final ExpandableComposite section = toolkit.createExpandableComposite(parentControl, >- ExpandableComposite.COMPACT | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR); >+ ExpandableComposite.TWISTIE | ExpandableComposite.CLIENT_INDENT | ExpandableComposite.COMPACT); > section.clientVerticalSpacing = 0; > section.setBackground(parentControl.getBackground()); >- section.setFont(parentControl.getFont()); >+ section.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT)); > section.addExpansionListener(new ExpansionAdapter() { > @Override > public void expansionStateChanged(ExpansionEvent e) { >@@ -220,7 +221,7 @@ > section.setText(contribution.getTitle()); > section.setToolTipText(contribution.getDescription()); > >- GridDataFactory.fillDefaults().grab(true, false).applyTo(section); >+ GridDataFactory.fillDefaults().indent(0, 5).grab(true, false).applyTo(section); > > SafeRunnable.run(new SafeRunnable() { > public void run() throws Exception {
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=125493">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 242445
:
124346
|
124780
|
124781
|
124782
| 125493 |
125494
|
125495
|
125496
|
125497
|
125700
|
125846
|
126259
|
126260
