Attachment 130249 Details for Bug 270460 – Adds labels to composite's tab list making them accessible via keyboard. Adds mnemonics as well.

[patch] Adds labels to composite's tab list making them accessible via keyboard. Adds mnemonics as well.

wtp270460_20090327_1535.txt (text/plain), 8.80 KB, created by Mike Oetlinger

on 2009-03-30 10:59:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Oetlinger

Created: 2009-03-30 10:59:01 EDT

Size: 8.80 KB

patch

obsolete

>Index: src/org/eclipse/wst/common/ui/internal/CommonUIMessages.properties
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/CommonUIMessages.properties,v
>retrieving revision 1.1
>diff -u -r1.1 CommonUIMessages.properties
>--- src/org/eclipse/wst/common/ui/internal/CommonUIMessages.properties	12 Nov 2008 19:26:10 -0000	1.1
>+++ src/org/eclipse/wst/common/ui/internal/CommonUIMessages.properties	27 Mar 2009 19:35:06 -0000
>@@ -83,24 +83,27 @@
> _UI_RADIO_FILE             = Workspace projects
> _UI_RADIO_URL              = HTTP
> 
>-_UI_LABEL_COMPONENTS				   = Components:
>+_UI_LABEL_COMPONENTS				   = Componen&ts:
> _UI_LABEL_QUALIFIER					   = Qualifier:
> 
> !- component selection dialogs 
> _UI_LABEL_COMPONENT_NAME			   = Component Name:
> _UI_LABEL_MATCHING_COMPONENTS		   = Matching Components:
> _UI_LABEL_SPECIFIED_FILE			   = Specified File
>-_UI_LABEL_ENCLOSING_PROJECT			   = Enclosing Project
>-_UI_LABEL_WORKSPACE					   = Workspace
>-_UI_LABEL_CURRENT_RESOURCE			   = Current Resource
>+_UI_LABEL_ENCLOSING_PROJECT			   = &Enclosing Project
>+_UI_LABEL_WORKSPACE					   = &Workspace
>+_UI_LABEL_CURRENT_RESOURCE			   = C&urrent Resource
> _UI_LABEL_SEARCH_SCOPE				   = Search Scope
> _UI_LABEL_NARROW_SEARCH_SCOPE_RESOURCE = Use resource view to narrow search scope
> _UI_LABEL_AVAILABLE_TYPES			   = Available Types
>-_UI_LABEL_WORKING_SETS                 = Working Sets
>+_UI_LABEL_WORKING_SETS                 = Wor&king Sets
> 
> _UI_LABEL_New=New...
>-_UI_LABEL_DECLARATION_LOCATION=Declaration Location:
>-_UI_LABEL_CHOOSE=Choose...
>+_UI_LABEL_DECLARATION_LOCATION=&Declaration Location:
>+_UI_LABEL_CHOOSE=C&hoose...
>+
>+_UI_SEPARATOR_NAMESPACE = Name Space:
>+_UI_SEPARATOR_FILEPATH = File Path:
> 
> !======================================================================================
> !
>Index: src/org/eclipse/wst/common/ui/internal/Messages.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/Messages.java,v
>retrieving revision 1.3
>diff -u -r1.3 Messages.java
>--- src/org/eclipse/wst/common/ui/internal/Messages.java	12 Nov 2008 19:26:10 -0000	1.3
>+++ src/org/eclipse/wst/common/ui/internal/Messages.java	27 Mar 2009 19:35:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2008 IBM Corporation and others.
>+ * Copyright (c) 2001, 2009 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -120,6 +120,9 @@
> 	public static String _UI_LABEL_New;
> 	public static String _UI_LABEL_DECLARATION_LOCATION;
> 	public static String _UI_LABEL_CHOOSE;
>+	
>+	public static String _UI_SEPARATOR_NAMESPACE;
>+	public static String _UI_SEPARATOR_FILEPATH;
> 
> 
> 
>Index: src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSearchListDialog.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSearchListDialog.java,v
>retrieving revision 1.10
>diff -u -r1.10 ComponentSearchListDialog.java
>--- src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSearchListDialog.java	16 Oct 2008 01:42:26 -0000	1.10
>+++ src-search/org/eclipse/wst/common/ui/internal/search/dialogs/ComponentSearchListDialog.java	27 Mar 2009 19:35:06 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006, 2008 IBM Corporation and others.
>+ * Copyright (c) 2006, 2009 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -39,8 +39,9 @@
> import org.eclipse.jface.viewers.ViewerSorter;
> import org.eclipse.osgi.util.TextProcessor;
> import org.eclipse.swt.SWT;
>-import org.eclipse.swt.custom.CLabel;
> import org.eclipse.swt.custom.ViewForm;
>+import org.eclipse.swt.events.FocusEvent;
>+import org.eclipse.swt.events.FocusListener;
> import org.eclipse.swt.events.ModifyEvent;
> import org.eclipse.swt.events.ModifyListener;
> import org.eclipse.swt.events.SelectionEvent;
>@@ -78,7 +79,8 @@
>     
>     protected String fileLocationLabel = Messages._UI_LABEL_DECLARATION_LOCATION;
>     protected ViewForm fileLocationView;    
>-    protected CLabel locationLabel;
>+    protected Label locationLabel;
>+    protected Label locationImageLabel;
> 
>     // keep track of the item previously selected in the table
> 	private TableItem prevItem;
>@@ -178,21 +180,47 @@
> 
>         configuration.createWidgetAboveQualifierBox(mainComposite);
>         
>+        Composite qualifierComposite = new Composite(mainComposite, SWT.NONE);
>+        qualifierComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>+        qualifierComposite.setLayout(new GridLayout(1,false));
>         // Create Qualifier List widget
>-        Label qualifierLabel = new Label(mainComposite, SWT.NONE);
>+        Label qualifierLabel = new Label(qualifierComposite, SWT.NONE);
>         qualifierLabel.setText(Messages._UI_LABEL_QUALIFIER);
> 		qualifierLabel.setText(fileLocationLabel);
> 
>-        fileLocationView = new ViewForm(mainComposite, SWT.BORDER | SWT.FLAT );
>+        fileLocationView = new ViewForm(qualifierComposite, SWT.BORDER | SWT.FLAT );
>         GridData data = new GridData();
>         data.horizontalAlignment = GridData.FILL;
>         data.grabExcessHorizontalSpace = true;
>         data.heightHint = 22;
>         fileLocationView.setLayoutData(data);
>+        fileLocationView.setLayout(new GridLayout(1, false));
>         
>-    	locationLabel = new CLabel(fileLocationView, SWT.FLAT);
>-        fileLocationView.setContent(locationLabel);
>+    	Composite locationComposite = new Composite(fileLocationView, SWT.NONE);
>+    	locationComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>+    	locationComposite.setLayout(new GridLayout(2, false));
>+    	locationComposite.setVisible(true);
>+        
>+    	locationImageLabel = new Label(locationComposite, SWT.FLAT);
>+        locationLabel = new Label(locationComposite, SWT.NONE);        
>+        fileLocationView.setContent(locationComposite);
>     	locationLabel.setFont(fileLocationView.getFont());
>+    	locationLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>+    	locationImageLabel.setText("     ");
>+    	
>+    	Control[] locationViewTabs = new Control[1];
>+    	locationViewTabs[0] = locationLabel;
>+    	locationComposite.setTabList(locationViewTabs);
>+    	
>+    	Control[] fileViewTabs = new Control[1];
>+    	fileViewTabs[0] = locationComposite;
>+    	fileLocationView.setTabList(fileViewTabs);
>+    	
>+    	Control [] qTabs = new Control[2];
>+    	qTabs[0] = qualifierLabel;
>+    	qTabs[1] = fileLocationView;
>+    	qualifierComposite.setTabList(qTabs);
>+    	qualifierComposite.setVisible(true);
> 
>         configuration.createWidgetBelowQualifierBox(mainComposite);
>         
>@@ -290,12 +318,24 @@
>         filterToolBar = new ToolBar(labelAndFilter,SWT.FLAT);
>         configuration.createToolBarItems(filterToolBar);
> 
>-        TableViewer tableViewer = new TableViewer(new Table(labelAndFilter, SWT.SINGLE | SWT.BORDER));
>+        final TableViewer tableViewer = new TableViewer(new Table(labelAndFilter, SWT.SINGLE | SWT.BORDER));
>         Control TableWidget = tableViewer.getTable();
>         GridData gd = new GridData(GridData.FILL_BOTH);
>         gd.horizontalSpan = 2;
>         TableWidget.setLayoutData(gd);
> 
>+        filterToolBar.addFocusListener(new FocusListener(){
>+
>+        	public void focusGained(FocusEvent arg0) {
>+        		tableViewer.getTable().setFocus();
>+
>+        	}
>+
>+        	public void focusLost(FocusEvent arg0) {
>+        		// TODO Auto-generated method stub
>+
>+        	}});
>+        
>         return tableViewer;
>     }
>     
>@@ -304,15 +344,14 @@
>     	
>     	if ( file == null ){
>     		locationLabel.setText("");
>-    		locationLabel.setImage(null);
>+    		locationImageLabel.setImage(null);
>     		return;
>     	}
>     	String filePath = "";
>     	filePath = file.getFullPath().toString();
>-        //locationView.redraw();
>-        
>+        //locationView.redraw();        
>         locationLabel.setText(TextProcessor.process(filePath));
>-        locationLabel.setImage(lp.getFileIcon(component));
>+        locationImageLabel.setImage(lp.getFileIcon(component));
>     }
>     
>

Actions: View | Diff

Attachments on bug 270460: 130244 | 130249 | 145195 | 145305