# HG changeset patch # User dadubrow # Date 1280435400 18000 # Node ID 743cc54fdffef9fd155675c3fb3378cb0141aed4 # Parent a9ad516f44aed7fab43f20326e408544401e6616 more portal changes - add kits page + pref page links to customize diff -r a9ad516f44ae -r 743cc54fdffe core/com.nokia.carbide.discovery.ui/icons/icon_home.png Binary file core/com.nokia.carbide.discovery.ui/icons/icon_home.png has changed diff -r a9ad516f44ae -r 743cc54fdffe core/com.nokia.carbide.discovery.ui/plugin.xml --- a/core/com.nokia.carbide.discovery.ui/plugin.xml Thu Jul 29 14:52:28 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/plugin.xml Thu Jul 29 15:30:00 2010 -0500 @@ -56,7 +56,7 @@ @@ -66,6 +66,12 @@ order="100" title="%support.title"> + + @@ -94,6 +100,11 @@ pageId="com.nokia.carbide.discovery.ui.homePage" title="%creatingcarbide.title"> + + diff -r a9ad516f44ae -r 743cc54fdffe core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Messages.java --- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Messages.java Thu Jul 29 14:52:28 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Messages.java Thu Jul 29 15:30:00 2010 -0500 @@ -19,13 +19,11 @@ public static String AbstractRSSPortalPageLayer_RSSReadError; public static String Activator_MissingConfigURLError; public static String InstallExtensionsPage_AdvancedInstallLabel; - public static String InstallExtensionsPage_BuzillaActionName; public static String InstallExtensionsPage_CheckAllLabel; public static String InstallExtensionsPage_GatherExtensionsTitle; public static String InstallExtensionsPage_GatheringInstallInfoTitle; public static String InstallExtensionsPage_InstallLabel; public static String InstallExtensionsPage_InstallTip; - public static String InstallExtensionsPage_LinkBarTitle; public static String InstallExtensionsPage_RefreshLabel; public static String InstallExtensionsPage_StatusLineFmt; public static String InstallExtensionsPage_UncheckAllLabel; diff -r a9ad516f44ae -r 743cc54fdffe core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/messages.properties --- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/messages.properties Thu Jul 29 14:52:28 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/messages.properties Thu Jul 29 15:30:00 2010 -0500 @@ -13,13 +13,11 @@ AbstractRSSPortalPageLayer_RSSReadError=Could not read RSS from: {0} Activator_MissingConfigURLError=Could not find URL in configuration/server.properties file for key={0} InstallExtensionsPage_AdvancedInstallLabel=Advanced install... -InstallExtensionsPage_BuzillaActionName=Carbide Bugzilla InstallExtensionsPage_CheckAllLabel=Check all InstallExtensionsPage_GatherExtensionsTitle=Gathering Extensions InstallExtensionsPage_GatheringInstallInfoTitle=Gathering Install Information InstallExtensionsPage_InstallLabel=Install... InstallExtensionsPage_InstallTip=Install checked items -InstallExtensionsPage_LinkBarTitle=Links InstallExtensionsPage_RefreshLabel=Refresh InstallExtensionsPage_StatusLineFmt={0} item(s) checked InstallExtensionsPage_UncheckAllLabel=Check none diff -r a9ad516f44ae -r 743cc54fdffe core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractRSSPortalPageLayer.java --- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractRSSPortalPageLayer.java Thu Jul 29 14:52:28 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractRSSPortalPageLayer.java Thu Jul 29 15:30:00 2010 -0500 @@ -85,16 +85,18 @@ buf.append("
"); //$NON-NLS-1$ buf.append(clean(channel.getDescription())); buf.append("

"); //$NON-NLS-1$ + buf.append(""); //$NON-NLS-1$ } buf.append(HTML_BODY_FOOTER); System.out.println(buf.toString()); diff -r a9ad516f44ae -r 743cc54fdffe core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/OpenPreferencePageAction.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/OpenPreferencePageAction.java Thu Jul 29 15:30:00 2010 -0500 @@ -0,0 +1,47 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +package com.nokia.carbide.internal.discovery.ui.extension; + +import org.eclipse.jface.action.Action; +import org.eclipse.jface.preference.PreferenceDialog; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.dialogs.PreferencesUtil; + +import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils; + +/** + * An action to show a preference page + */ +public class OpenPreferencePageAction extends Action { + + private String preferencePageId; + + public OpenPreferencePageAction(String text, String preferencePageId) { + super(text); + this.preferencePageId = preferencePageId; + } + + @Override + public void run() { + Shell shell = WorkbenchUtils.getSafeShell(); + + PreferenceDialog dialog = + PreferencesUtil.createPreferenceDialogOn(shell, preferencePageId, null, null); + + dialog.open(); + } +} diff -r a9ad516f44ae -r 743cc54fdffe core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/BugzillaPage.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/BugzillaPage.java Thu Jul 29 15:30:00 2010 -0500 @@ -0,0 +1,22 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +package com.nokia.carbide.internal.discovery.ui.view; + +import com.nokia.carbide.internal.discovery.ui.extension.AbstractBrowserPortalPageLayer; + +public class BugzillaPage extends AbstractBrowserPortalPageLayer { +} diff -r a9ad516f44ae -r 743cc54fdffe core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/CreatingCarbidePage.java --- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/CreatingCarbidePage.java Thu Jul 29 14:52:28 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/CreatingCarbidePage.java Thu Jul 29 15:30:00 2010 -0500 @@ -1,3 +1,19 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ package com.nokia.carbide.internal.discovery.ui.view; import com.nokia.carbide.internal.discovery.ui.extension.AbstractRSSPortalPageLayer; diff -r a9ad516f44ae -r 743cc54fdffe core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/HomePage.java --- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/HomePage.java Thu Jul 29 14:52:28 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/HomePage.java Thu Jul 29 15:30:00 2010 -0500 @@ -1,3 +1,19 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ package com.nokia.carbide.internal.discovery.ui.view; import com.nokia.carbide.internal.discovery.ui.extension.AbstractBrowserPortalPageLayer; diff -r a9ad516f44ae -r 743cc54fdffe core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/InstallExtensionsPortalExtension.java --- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/InstallExtensionsPortalExtension.java Thu Jul 29 14:52:28 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/InstallExtensionsPortalExtension.java Thu Jul 29 15:30:00 2010 -0500 @@ -1,3 +1,19 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ package com.nokia.carbide.internal.discovery.ui.view; import java.net.MalformedURLException; @@ -48,6 +64,7 @@ import com.nokia.carbide.discovery.ui.Activator; import com.nokia.carbide.discovery.ui.Messages; import com.nokia.carbide.internal.discovery.ui.extension.IPortalPageLayer; +import com.nokia.carbide.internal.discovery.ui.extension.OpenPreferencePageAction; import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils; @SuppressWarnings("restriction") @@ -94,27 +111,28 @@ } } - private final class LinkBar implements IActionBar { + private class SettingsBar implements IActionBar { @Override public String getTitle() { - return Messages.InstallExtensionsPage_LinkBarTitle; + return "Settings"; } @Override public IAction[] getActions() { - IAction action = new Action(Messages.InstallExtensionsPage_BuzillaActionName) { - @Override - public void run() { - try { - URL url = new URL("https://xdabug001.ext.nokia.com/bugzilla"); //$NON-NLS-1$ - IWorkbenchBrowserSupport browserSupport = PlatformUI.getWorkbench().getBrowserSupport(); - browserSupport.createBrowser(null).openURL(url); - } catch (MalformedURLException e) { - } catch (PartInitException e) { - } - } - }; - return new IAction[] { action }; + List actions = new ArrayList(); + actions.add(new OpenPreferencePageAction( + "Capabilities", + "org.eclipse.sdk.capabilities")); + actions.add(new OpenPreferencePageAction( + "Code Style", + "org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage")); + actions.add(new OpenPreferencePageAction( + "Key bindings", + "org.eclipse.ui.preferencePages.Keys")); + actions.add(new OpenPreferencePageAction( + "Proxies", + "org.eclipse.ui.net.NetPreferences")); + return (IAction[]) actions.toArray(new IAction[actions.size()]); } @Override @@ -167,7 +185,7 @@ @Override public IActionBar[] createCommandBars(IEditorPart part, IActionUIUpdater updater) { this.updater = updater; - return new IActionBar[] { new ActionBar(part), new LinkBar() }; + return new IActionBar[] { new ActionBar(part), new SettingsBar() }; } private CatalogConfiguration getConfiguration() { diff -r a9ad516f44ae -r 743cc54fdffe core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/SupportPage.java --- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/SupportPage.java Thu Jul 29 14:52:28 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/SupportPage.java Thu Jul 29 15:30:00 2010 -0500 @@ -1,6 +1,50 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ package com.nokia.carbide.internal.discovery.ui.view; -import com.nokia.carbide.internal.discovery.ui.extension.AbstractBrowserPortalPageLayer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.IEditorPart; + +import com.nokia.carbide.internal.discovery.ui.extension.IPortalPageLayer; + +public class SupportPage implements IPortalPageLayer { + + @Override + public Control createControl(Composite parent, IEditorPart part) { + Composite composite = new Composite(parent, SWT.NONE); + composite.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND)); + composite.setLayout(new FillLayout()); -public class SupportPage extends AbstractBrowserPortalPageLayer { + return composite; + } + + @Override + public void init() { + } + + @Override + public IActionBar[] createCommandBars(IEditorPart part, IActionUIUpdater updater) { + return null; + } + + @Override + public void dispose() { + } } diff -r a9ad516f44ae -r 743cc54fdffe core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/WrenchSciencePage.java --- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/WrenchSciencePage.java Thu Jul 29 14:52:28 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/WrenchSciencePage.java Thu Jul 29 15:30:00 2010 -0500 @@ -1,3 +1,19 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ package com.nokia.carbide.internal.discovery.ui.view; import com.nokia.carbide.internal.discovery.ui.extension.AbstractRSSPortalPageLayer;