View | Details | Raw Unified | Return to bug 186769 | Differences between
and this patch

Collapse All | Expand All

(-)UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java (-3 / +12 lines)
Lines 53-58 Link Here
53
import org.eclipse.jface.action.IMenuManager;
53
import org.eclipse.jface.action.IMenuManager;
54
import org.eclipse.jface.action.IStatusLineManager;
54
import org.eclipse.jface.action.IStatusLineManager;
55
import org.eclipse.jface.action.IToolBarManager;
55
import org.eclipse.jface.action.IToolBarManager;
56
import org.eclipse.jface.action.MenuManager;
56
import org.eclipse.jface.action.Separator;
57
import org.eclipse.jface.action.Separator;
57
import org.eclipse.jface.resource.ImageDescriptor;
58
import org.eclipse.jface.resource.ImageDescriptor;
58
import org.eclipse.jface.viewers.DoubleClickEvent;
59
import org.eclipse.jface.viewers.DoubleClickEvent;
Lines 84-95 Link Here
84
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
85
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
85
import org.eclipse.rse.internal.core.RSEInitJob;
86
import org.eclipse.rse.internal.core.RSEInitJob;
86
import org.eclipse.rse.internal.ui.SystemResources;
87
import org.eclipse.rse.internal.ui.SystemResources;
87
import org.eclipse.rse.internal.ui.actions.SystemCascadingPreferencesAction;
88
import org.eclipse.rse.internal.ui.actions.SystemCollapseAllAction;
88
import org.eclipse.rse.internal.ui.actions.SystemCollapseAllAction;
89
import org.eclipse.rse.internal.ui.actions.SystemImportConnectionAction;
89
import org.eclipse.rse.internal.ui.actions.SystemImportConnectionAction;
90
import org.eclipse.rse.internal.ui.actions.SystemPreferenceQualifyConnectionNamesAction;
90
import org.eclipse.rse.internal.ui.actions.SystemPreferenceQualifyConnectionNamesAction;
91
import org.eclipse.rse.internal.ui.actions.SystemPreferenceRestoreStateAction;
91
import org.eclipse.rse.internal.ui.actions.SystemPreferenceRestoreStateAction;
92
import org.eclipse.rse.internal.ui.actions.SystemPreferenceShowFilterPoolsAction;
92
import org.eclipse.rse.internal.ui.actions.SystemPreferenceShowFilterPoolsAction;
93
import org.eclipse.rse.internal.ui.actions.SystemShowPreferencesPageAction;
93
import org.eclipse.rse.internal.ui.actions.SystemWorkWithProfilesAction;
94
import org.eclipse.rse.internal.ui.actions.SystemWorkWithProfilesAction;
94
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
95
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
95
import org.eclipse.rse.ui.ISystemContextMenuConstants;
96
import org.eclipse.rse.ui.ISystemContextMenuConstants;
Lines 679-686 Link Here
679
680
680
		// Now display any contributed action shortcuts for bringing up
681
		// Now display any contributed action shortcuts for bringing up
681
		// a particular preference page...
682
		// a particular preference page...
682
		SystemCascadingPreferencesAction preferencesAction = new SystemCascadingPreferencesAction(shell);
683
		MenuManager subMenu = new MenuManager(SystemResources.ACTION_CASCADING_PREFERENCES_LABEL, ISystemContextMenuConstants.MENU_PREFERENCES);
683
		menuMgr.add(preferencesAction.getSubMenu());
684
		menuMgr.add(subMenu);
685
		
686
		SystemShowPreferencesPageAction action = new SystemShowPreferencesPageAction();
687
		action.setPreferencePageID("org.eclipse.rse.ui.preferences.RemoteSystemsPreferencePage"); //$NON-NLS-1$
688
		action.setText(SystemResources.ACTION_SHOW_PREFERENCEPAGE_LABEL);
689
		action.setToolTipText(SystemResources.ACTION_SHOW_PREFERENCEPAGE_TOOLTIP);
690
		action.setHelp("org.eclipse.rse.ui.aprefrse"); //$NON-NLS-1$
691
		subMenu.add(action);
692
		subMenu.add(new GroupMarker(ISystemContextMenuConstants.GROUP_ADDITIONS));
684
693
685
		SystemViewMenuListener menuListener = new SystemViewMenuListener(true); // true says this is a persistent menu
694
		SystemViewMenuListener menuListener = new SystemViewMenuListener(true); // true says this is a persistent menu
686
		if (viewPart instanceof ISystemMessageLine)
695
		if (viewPart instanceof ISystemMessageLine)
(-)UI/org/eclipse/rse/internal/ui/actions/SystemShowPreferencesPageAction.java (+1 lines)
Lines 127-132 Link Here
127
	
127
	
128
		if (pm != null) 
128
		if (pm != null) 
129
		{
129
		{
130
			shell = RSEUIPlugin.getTheSystemRegistryUI().getShell();
130
			PreferenceDialog d = new WorkbenchPreferenceDialog(shell, pm);
131
			PreferenceDialog d = new WorkbenchPreferenceDialog(shell, pm);
131
			d.create();
132
			d.create();
132
			// TODO - hack to make this work in  3.1
133
			// TODO - hack to make this work in  3.1
(-)plugin.xml (-1 / +41 lines)
Lines 508-512 Link Here
508
              id="org.eclipse.rse.ui.commands.category"
508
              id="org.eclipse.rse.ui.commands.category"
509
              name="%View.Category.RemoteSystems">
509
              name="%View.Category.RemoteSystems">
510
        </category>
510
        </category>
511
      </extension>  
511
      </extension>
512
     
513
     <extension
514
         point="org.eclipse.ui.commands">
515
 	<command
516
            categoryId="org.eclipse.rse.ui.commands.category"
517
            defaultHandler="org.eclipse.rse.internal.ui.actions.ShowPreferenceHandler"
518
            id="org.eclipse.rse.internal.ui.actions.ShowRemoteSystemsPref"
519
            name="Show Preference Page">
520
         <commandParameter
521
               id="org.eclipse.rse.internal.ui.actions.preference.page"
522
               name="Preference Page ID"
523
               optional="false">
524
          </commandParameter>
525
      </command>
526
      </extension>
527
     <extension
528
           point="org.eclipse.ui.menus">
529
        <menuContribution
530
              locationURI="menu:menu.preferences?after=additions">
531
           <command
532
                 commandId="org.eclipse.rse.internal.ui.actions.ShowRemoteSystemsPref"
533
                 label="Files..."
534
                 style="push">
535
              <parameter
536
                    name="org.eclipse.rse.internal.ui.actions.preference.page"
537
                    value="org.eclipse.rse.files.ui.UniversalFilesPreferences">
538
              </parameter>
539
           </command>
540
           <command
541
                 commandId="org.eclipse.rse.internal.ui.actions.ShowRemoteSystemsPref"
542
                 label="File Cache...."
543
                 style="push">
544
              <parameter
545
                    name="org.eclipse.rse.internal.ui.actions.preference.page"
546
                    value="org.eclipse.rse.core.ui.preferences.SystemCachePreferencePage">
547
              </parameter>
548
           </command>
549
        </menuContribution>
550
     </extension>
551
512
</plugin>
552
</plugin>
(-)UI/org/eclipse/rse/internal/ui/actions/ShowPreferenceHandler.java (+27 lines)
Added Link Here
1
package org.eclipse.rse.internal.ui.actions;
2
3
import org.eclipse.core.commands.AbstractHandler;
4
import org.eclipse.core.commands.ExecutionEvent;
5
import org.eclipse.core.commands.ExecutionException;
6
import org.eclipse.ui.IWorkbenchWindow;
7
import org.eclipse.ui.handlers.HandlerUtil;
8
9
public class ShowPreferenceHandler extends AbstractHandler {
10
11
	private final String PARAM_PREF_PAGE = "org.eclipse.rse.internal.ui.actions.preference.page";
12
	
13
	/*
14
	 * (non-Javadoc)
15
	 * 
16
	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
17
	 */
18
	public Object execute(ExecutionEvent event) throws ExecutionException {
19
		String page = (String) event.getParameter(PARAM_PREF_PAGE);
20
		
21
		SystemShowPreferencesPageAction action = new SystemShowPreferencesPageAction();
22
		action.setPreferencePageID(page);
23
		action.run();
24
		return null;
25
	}
26
	
27
}

Return to bug 186769