Binary file core/com.nokia.carbide.discovery.ui/icons/icon_home.png has changed
--- 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 @@
</portalPage>
<portalPage
id="com.nokia.carbide.discovery.ui.homePage"
- image="icons/Carbide_c_icon_16x16.png"
+ image="icons/icon_home.png"
order="1"
title="%home.title">
</portalPage>
@@ -66,6 +66,12 @@
order="100"
title="%support.title">
</portalPage>
+ <portalPage
+ id="com.nokia.carbide.discovery.ui.kitsPage"
+ image="icons/Carbide_c_icon_16x16.png"
+ order="75"
+ title="Kits">
+ </portalPage>
</extension>
<extension
point="com.nokia.carbide.discovery.ui.portalPageLayer">
@@ -94,6 +100,11 @@
pageId="com.nokia.carbide.discovery.ui.homePage"
title="%creatingcarbide.title">
</portalPageLayer>
+ <portalPageLayer
+ class="com.nokia.carbide.internal.discovery.ui.view.BugzillaPage"
+ pageId="com.nokia.carbide.discovery.ui.bugzillaPageLayer"
+ title="Report Bugs">
+ </portalPageLayer>
</extension>
</plugin>
--- 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;
--- 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
--- 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("<div class=\"channelBody\">"); //$NON-NLS-1$
buf.append(clean(channel.getDescription()));
buf.append("</div><br>"); //$NON-NLS-1$
+ buf.append("<ul>"); //$NON-NLS-1$
for (Item item : channel.getItems()) {
- buf.append("<div class=\"item\"><a class=\"itemTitle\" href=\""); //$NON-NLS-1$
+ buf.append("<li><div class=\"item\"><a class=\"itemTitle\" href=\""); //$NON-NLS-1$
buf.append(item.getLink().toString());
buf.append("\">"); //$NON-NLS-1$
buf.append(clean(item.getTitle()));
buf.append("</a>"); //$NON-NLS-1$
buf.append("<div class=\"itemBody\">"); //$NON-NLS-1$
buf.append(clean(item.getDescription()));
- buf.append("</div>"); //$NON-NLS-1$
+ buf.append("</div></li>"); //$NON-NLS-1$
}
+ buf.append("</ul>"); //$NON-NLS-1$
}
buf.append(HTML_BODY_FOOTER);
System.out.println(buf.toString());
--- /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();
+ }
+}
--- /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 {
+}
--- 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;
--- 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;
--- 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<IAction> actions = new ArrayList<IAction>();
+ 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() {
--- 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() {
+ }
}
--- 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;
