Attachment #133498 for bug #224546

View | Details | Raw Unified | Return to bug 224546
Collapse All | Expand All




/*******************************************************************************
 * Copyright (c) 2000, 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

import java.util.ArrayList;
import java.util.Iterator;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.PopupDialog;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.FocusAdapter;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;

import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.FilteredTree;


        layoutTopControl(filteredTree);
        
        // Use F2... label
        Label label = new Label(composite, SWT.WRAP);
        label.setText(WorkbenchMessages.ShowView_selectViewHelp);
        label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));

        // Restore the last state
        restoreWidgetValues();


		treeViewer.addSelectionChangedListener(this);
		treeViewer.addDoubleClickListener(this);
		treeViewer.addFilter(new CapabilityFilter());
		treeViewer.getControl().addKeyListener(new KeyAdapter() {
            public void keyPressed(KeyEvent e) {
                handleTreeViewerKeyPressed(e);
            }
        });

		// if the tree has only one or zero views, disable the filter text control
		if (hasAtMostOneView(filteredTree.getViewer())) {

	protected IDialogSettings getDialogBoundsSettings() {
        return getDialogSettings();
	}
    void handleTreeViewerKeyPressed(KeyEvent event) {
		// popup the description for the selected view
		if (event.keyCode == SWT.F2 && event.stateMask == 0) {
			ITreeSelection selection = (ITreeSelection) filteredTree
					.getViewer().getSelection();
			// only show description if one view is selected
			if (selection.size() == 1) {
				Object o = selection.getFirstElement();
				if (o instanceof IViewDescriptor) {
					String description = ((IViewDescriptor) o).getDescription();
					if (description.length() == 0)
						description = WorkbenchMessages.ShowView_noDesc;
					popUp(description);
				}
			}
		}
	}

	private void popUp(final String description) {
		new PopupDialog(filteredTree.getShell(), PopupDialog.HOVER_SHELLSTYLE,
				true, false, false, false, false, null, null) {
			private static final int CURSOR_SIZE = 15;

			protected Point getInitialLocation(Point initialSize) {
				//show popup relative to cursor
				Display display = getShell().getDisplay();
				Point location = display.getCursorLocation();
				location.x += CURSOR_SIZE;
				location.y += CURSOR_SIZE;
				return location;
			}

			protected Control createDialogArea(Composite parent) {
				Label label = new Label(parent, SWT.WRAP);
				label.setText(description);
				label.addFocusListener(new FocusAdapter() {
					public void focusLost(FocusEvent event) {
						close();
					}
				});
				// Use the compact margins employed by PopupDialog.
				GridData gd = new GridData(GridData.BEGINNING
						| GridData.FILL_BOTH);
				gd.horizontalIndent = PopupDialog.POPUP_HORIZONTALSPACING;
				gd.verticalIndent = PopupDialog.POPUP_VERTICALSPACING;
				label.setLayoutData(gd);
				return label;
			}
		}.open();
	}
    /*
     * (non-Javadoc)
     * @see org.eclipse.jface.dialogs.Dialog#isResizable()

Lines 123-130 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/messages.properties (-2 lines)
123	ShowView_title = &Other...	123	ShowView_title = &Other...
124	ShowView_shellTitle = Show View	124	ShowView_shellTitle = Show View
125	ShowView_errorTitle = Problems Showing View	125	ShowView_errorTitle = Problems Showing View
126	ShowView_selectViewHelp = Use F2 to display the description for a selected view.
127	ShowView_noDesc = No description available.
128		126
129	ToggleEditor_hideEditors = Hide &Editors	127	ToggleEditor_hideEditors = Hide &Editors
130	ToggleEditor_showEditors = Show &Editors	128	ToggleEditor_showEditors = Show &Editors

Lines 168-175 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java (-2 lines)
168	public static String ShowView_title;	168	public static String ShowView_title;
169	public static String ShowView_shellTitle;	169	public static String ShowView_shellTitle;
170	public static String ShowView_errorTitle;	170	public static String ShowView_errorTitle;
171	public static String ShowView_selectViewHelp;
172	public static String ShowView_noDesc;
173		171
174	public static String ToggleEditor_hideEditors;	172	public static String ToggleEditor_hideEditors;
175	public static String ToggleEditor_showEditors;	173	public static String ToggleEditor_showEditors;

Return to bug 224546

Lines 1-5 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/dialogs/ShowViewDialog.java (-80 / +14 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 14-50 Link Here
14	import java.util.ArrayList;	14	import java.util.ArrayList;
15	import java.util.Iterator;	15	import java.util.Iterator;
16		16
17	import org.eclipse.jface.dialogs.Dialog;
18	import org.eclipse.jface.dialogs.IDialogConstants;
19	import org.eclipse.jface.dialogs.IDialogSettings;
20	import org.eclipse.jface.dialogs.PopupDialog;
21	import org.eclipse.jface.viewers.DoubleClickEvent;
22	import org.eclipse.jface.viewers.IDoubleClickListener;
23	import org.eclipse.jface.viewers.ISelectionChangedListener;
24	import org.eclipse.jface.viewers.IStructuredSelection;
25	import org.eclipse.jface.viewers.ITreeContentProvider;
26	import org.eclipse.jface.viewers.ITreeSelection;
27	import org.eclipse.jface.viewers.SelectionChangedEvent;
28	import org.eclipse.jface.viewers.StructuredSelection;
29	import org.eclipse.jface.viewers.TreeViewer;
30	import org.eclipse.swt.SWT;	17	import org.eclipse.swt.SWT;
31	import org.eclipse.swt.events.DisposeEvent;	18	import org.eclipse.swt.events.DisposeEvent;
32	import org.eclipse.swt.events.DisposeListener;	19	import org.eclipse.swt.events.DisposeListener;
33	import org.eclipse.swt.events.FocusAdapter;
34	import org.eclipse.swt.events.FocusEvent;
35	import org.eclipse.swt.events.KeyAdapter;
36	import org.eclipse.swt.events.KeyEvent;
37	import org.eclipse.swt.graphics.Color;	20	import org.eclipse.swt.graphics.Color;
38	import org.eclipse.swt.graphics.Point;
39	import org.eclipse.swt.graphics.RGB;	21	import org.eclipse.swt.graphics.RGB;
40	import org.eclipse.swt.layout.GridData;	22	import org.eclipse.swt.layout.GridData;
41	import org.eclipse.swt.widgets.Button;	23	import org.eclipse.swt.widgets.Button;
42	import org.eclipse.swt.widgets.Composite;	24	import org.eclipse.swt.widgets.Composite;
43	import org.eclipse.swt.widgets.Control;	25	import org.eclipse.swt.widgets.Control;
44	import org.eclipse.swt.widgets.Display;
45	import org.eclipse.swt.widgets.Label;
46	import org.eclipse.swt.widgets.Shell;	26	import org.eclipse.swt.widgets.Shell;
47	import org.eclipse.swt.widgets.Text;	27	import org.eclipse.swt.widgets.Text;
		28
		29	import org.eclipse.jface.dialogs.Dialog;
		30	import org.eclipse.jface.dialogs.IDialogConstants;
		31	import org.eclipse.jface.dialogs.IDialogSettings;
		32	import org.eclipse.jface.viewers.DoubleClickEvent;
		33	import org.eclipse.jface.viewers.IDoubleClickListener;
		34	import org.eclipse.jface.viewers.ISelectionChangedListener;
		35	import org.eclipse.jface.viewers.IStructuredSelection;
		36	import org.eclipse.jface.viewers.ITreeContentProvider;
		37	import org.eclipse.jface.viewers.SelectionChangedEvent;
		38	import org.eclipse.jface.viewers.StructuredSelection;
		39	import org.eclipse.jface.viewers.TreeViewer;
		40
48	import org.eclipse.ui.IWorkbenchWindow;	41	import org.eclipse.ui.IWorkbenchWindow;
49	import org.eclipse.ui.PlatformUI;	42	import org.eclipse.ui.PlatformUI;
50	import org.eclipse.ui.dialogs.FilteredTree;	43	import org.eclipse.ui.dialogs.FilteredTree;
Lines 163-173 Link Here
163		156
164	layoutTopControl(filteredTree);	157	layoutTopControl(filteredTree);
165		158
166	// Use F2... label
167	Label label = new Label(composite, SWT.WRAP);
168	label.setText(WorkbenchMessages.ShowView_selectViewHelp);
169	label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
170
171	// Restore the last state	159	// Restore the last state
172	restoreWidgetValues();	160	restoreWidgetValues();
173		161
Lines 231-241 Link Here
231	treeViewer.addSelectionChangedListener(this);	219	treeViewer.addSelectionChangedListener(this);
232	treeViewer.addDoubleClickListener(this);	220	treeViewer.addDoubleClickListener(this);
233	treeViewer.addFilter(new CapabilityFilter());	221	treeViewer.addFilter(new CapabilityFilter());
234	treeViewer.getControl().addKeyListener(new KeyAdapter() {
235	public void keyPressed(KeyEvent e) {
236	handleTreeViewerKeyPressed(e);
237	}
238	});
239		222
240	// if the tree has only one or zero views, disable the filter text control	223	// if the tree has only one or zero views, disable the filter text control
241	if (hasAtMostOneView(filteredTree.getViewer())) {	224	if (hasAtMostOneView(filteredTree.getViewer())) {
Lines 424-479 Link Here
424	protected IDialogSettings getDialogBoundsSettings() {	407	protected IDialogSettings getDialogBoundsSettings() {
425	return getDialogSettings();	408	return getDialogSettings();
426	}	409	}
427	void handleTreeViewerKeyPressed(KeyEvent event) {
428	// popup the description for the selected view
429	if (event.keyCode == SWT.F2 && event.stateMask == 0) {
430	ITreeSelection selection = (ITreeSelection) filteredTree
431	.getViewer().getSelection();
432	// only show description if one view is selected
433	if (selection.size() == 1) {
434	Object o = selection.getFirstElement();
435	if (o instanceof IViewDescriptor) {
436	String description = ((IViewDescriptor) o).getDescription();
437	if (description.length() == 0)
438	description = WorkbenchMessages.ShowView_noDesc;
439	popUp(description);
440	}
441	}
442	}
443	}
444		410
445	private void popUp(final String description) {
446	new PopupDialog(filteredTree.getShell(), PopupDialog.HOVER_SHELLSTYLE,
447	true, false, false, false, false, null, null) {
448	private static final int CURSOR_SIZE = 15;
449
450	protected Point getInitialLocation(Point initialSize) {
451	//show popup relative to cursor
452	Display display = getShell().getDisplay();
453	Point location = display.getCursorLocation();
454	location.x += CURSOR_SIZE;
455	location.y += CURSOR_SIZE;
456	return location;
457	}
458
459	protected Control createDialogArea(Composite parent) {
460	Label label = new Label(parent, SWT.WRAP);
461	label.setText(description);
462	label.addFocusListener(new FocusAdapter() {
463	public void focusLost(FocusEvent event) {
464	close();
465	}
466	});
467	// Use the compact margins employed by PopupDialog.
468	GridData gd = new GridData(GridData.BEGINNING
469	\| GridData.FILL_BOTH);
470	gd.horizontalIndent = PopupDialog.POPUP_HORIZONTALSPACING;
471	gd.verticalIndent = PopupDialog.POPUP_VERTICALSPACING;
472	label.setLayoutData(gd);
473	return label;
474	}
475	}.open();
476	}
477	/*	411	/*
478	* (non-Javadoc)	412	* (non-Javadoc)
479	* @see org.eclipse.jface.dialogs.Dialog#isResizable()	413	* @see org.eclipse.jface.dialogs.Dialog#isResizable()