--- a/.hgignore Fri Apr 03 14:27:34 2009 -0500
+++ b/.hgignore Mon Apr 06 14:02:48 2009 -0500
@@ -1,6 +1,5 @@
# use glob syntax.
syntax: glob
-*.class
bin
runtime
.DS_Store
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService.java Fri Apr 03 14:27:34 2009 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService.java Mon Apr 06 14:02:48 2009 -0500
@@ -32,7 +32,7 @@
public abstract class AbstractConnectedService implements IConnectedService {
- protected final static int TIMEOUT = 2000;
+ public final static int TIMEOUT = 2000;
public static class ConnectionFailException extends Exception {
public ConnectionFailException(String string) {
@@ -122,6 +122,7 @@
protected IRunnableContext runnableContext;
protected Status currentStatus;
protected Tester tester;
+ protected boolean manualTesting;
public AbstractConnectedService(IService service, AbstractSynchronizedConnection connection) {
this.service = service;
@@ -173,7 +174,7 @@
}
public void testStatus() {
- if (!isEnabled())
+ if (!(isEnabled() || manualTesting))
return;
final TestResult result[] = { null };
@@ -196,12 +197,16 @@
result[0] = runTestStatus(new NullProgressMonitor());
}
- if (!isEnabled()) // could be waiting for response past when service testing was disabled
+ if (!(isEnabled() || manualTesting)) // could be waiting for response past when service testing was disabled
return;
if (result[0].shortDescription != null && result[0].longDescription != null) {
currentStatus.setEStatus(result[0].estatus, result[0].shortDescription, result[0].longDescription);
}
}
+
+ public void setManualTesting() {
+ manualTesting = true;
+ }
public boolean isEnabled() {
return tester != null;
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java Fri Apr 03 14:27:34 2009 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java Mon Apr 06 14:02:48 2009 -0500
@@ -23,6 +23,7 @@
import com.nokia.carbide.remoteconnections.interfaces.*;
import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus;
import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatusChangedListener;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory.IValidationErrorReporter;
import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider.IRemoteAgentInstaller;
import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider.IRemoteAgentInstaller.IPackageContents;
@@ -55,6 +56,23 @@
import java.util.List;
public class ConnectionSettingsPage extends WizardPage {
+
+ public final class Tester extends Thread {
+ @Override
+ public void run() {
+ ((AbstractConnectedService) connectedService).setManualTesting();
+ for (int i = 0; i < 3 && connectedService != null; i++) {
+ connectedService.testStatus();
+ try {
+ if (i < 2)
+ sleep(AbstractConnectedService.TIMEOUT);
+ } catch (InterruptedException e) {
+ break;
+ }
+ }
+ resetServiceTesting(false);
+ }
+ }
private final static TreeNode LOADING_CONTENT_TREENODE =
new TreeNode(Messages.getString("ConnectionSettingsPage.GettingDataMessage")); //$NON-NLS-1$
@@ -78,8 +96,9 @@
private IConnectionFactory connectionFactory;
private IConnection connection;
private IService service;
- private IConnectedService connectedService;
+ private volatile IConnectedService connectedService;
private IStatusChangedListener statusListener;
+ private Tester tester;
private SashForm installerSashForm;
private TreeViewer installerTreeViewer;
private Text installerInfoText;
@@ -201,7 +220,7 @@
IService curService = (IService) selection.getFirstElement();
if (!curService.equals(service)) {
service = curService;
- resetServiceTesting();
+ resetServiceTesting(true);
}
}
});
@@ -230,7 +249,7 @@
public void widgetSelected(SelectionEvent e) {
if (isTesting) {
serviceTestButton.setText(Messages.getString("ConnectionSettingsPage.StartServiceTestButtonLabel")); //$NON-NLS-1$
- resetServiceTesting();
+ resetServiceTesting(true);
}
else {
serviceTestButton.setText(Messages.getString("ConnectionSettingsPage.StopServiceTestButtonLabel")); //$NON-NLS-1$
@@ -443,7 +462,7 @@
}
servicesListViewer.getList().addFocusListener(new FocusAdapter() {
public void focusGained(FocusEvent e) {
- resetServiceTesting();
+ resetServiceTesting(true);
}
});
@@ -505,7 +524,7 @@
}
deviceOSComboViewer.getCombo().addFocusListener(new FocusAdapter() {
public void focusGained(FocusEvent e) {
- resetServiceTesting();
+ resetServiceTesting(true);
}
});
}
@@ -568,13 +587,16 @@
public void run() {
if (!statusText.isDisposed())
statusText.setText(status.getLongDescription());
+ if (status.getEStatus().equals(EStatus.UP))
+ resetServiceTesting(false);
}
});
}
});
if (connectedService instanceof AbstractConnectedService)
((AbstractConnectedService) connectedService).setRunnableContext(getContainer());
- connectedService.setEnabled(true);
+ tester = new Tester();
+ tester.start();
isTesting = true;
}
}
@@ -764,16 +786,23 @@
}
}
- private void resetServiceTesting() {
+ private void resetServiceTesting(final boolean resetAll) {
isTesting = false;
if (service == null)
return;
- serviceTestInfo.setText(service.getAdditionalServiceInfo());
- agentTestTabComposite.layout(true, true);
- statusText.setText(STATUS_NOT_TESTED);
- disposeConnectedService();
- String buttonLabel = Messages.getString("ConnectionSettingsPage.StartServiceTestButtonLabel"); //$NON-NLS-1$
- serviceTestButton.setText(buttonLabel);
+ // may be called from a test thread
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ if (resetAll) {
+ statusText.setText(STATUS_NOT_TESTED);
+ serviceTestInfo.setText(service.getAdditionalServiceInfo());
+ agentTestTabComposite.layout(true, true);
+ }
+ disposeConnectedService();
+ String buttonLabel = Messages.getString("ConnectionSettingsPage.StartServiceTestButtonLabel"); //$NON-NLS-1$
+ serviceTestButton.setText(buttonLabel);
+ }
+ });
}
}
Binary file core/carbide_releases/readme/background_carbide.jpg has changed
--- a/core/carbide_releases/readme/readme_sdks.html Fri Apr 03 14:27:34 2009 -0500
+++ b/core/carbide_releases/readme/readme_sdks.html Mon Apr 06 14:02:48 2009 -0500
@@ -1,69 +1,65 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>SDK Support in Carbide.c++</title>
-<style type="text/css">
-<!--
-body { background-image: url(background_carbide.jpg);}
-.style1 {font-size: x-small}
-.style2 {font-family: "Courier New", Courier, mono}
-.style3 {color: #FF0000; font-weight: bold}
-.style4 {font-weight: bold}
-.style5 {color: #FFFFFF; }
--->
-</style>
-</head>
-
-<body >
-
-<h2>You're not done installing just yet... </h2>
-<p>Release: 2.0.3<br>
- Revised: Feb 2009</p>
-<p>Read the <b>Release Notes</b> and <b>What's New</b> for the latest infomation about this product. In Carbide.c++ simply click <b>Help > Help Contents > Carbide Help</b>.</p>
-<p>To complete your installation and start Symbian C++ application development, you <span class="style3">must</span> install the following: </p>
-<table width="80%" border="0">
- <tr>
- <td height="30" valign="bottom"><h3 class="style4">Installing Perl </h3></td>
- </tr>
- <tr>
- <td height="71" bgcolor="#ffffff">
- <p>The Carbide.c++ tools require a copy of Perl to run build scripts:</p>
- <b>Perl</b> (<a href="http://www.activestate.com">www.activestate.com</a>)
- <ul>
- <li><A href="ftp://ftp.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.635-MSWin32-x86.msi">ActivePerl-5.6.1.635</a> (5.6.1 is required by Symbian tools, later versions will not work) </li>
- </ul></td>
- </tr>
-</table>
-<table width="80%" border="0">
- <tr>
- <td height="30" valign="bottom"><h3 class="style4">Installing SDKs</h3></td>
- </tr>
- <tr>
- <td bgcolor="#ffffff">
- <p>Also, you must install at least one of the following SDKs to develop Symbian applications:
-</p>
- <p><b>NOTE</b> Carbide.c++ requires SDKs built to support <span class="style2">WINSCW</span> format. </p>
- <p><strong>S60 Platform SDKs</strong> (<a href="http://forum.nokia.com/info/sw.nokia.com/id/4a7149a5-95a5-4726-913a-3c6f21eb65a5/S60-SDK-0616-3.0-mr.html">forum.nokia.com/main/resources/tools_and_sdks/carbide/</a>) </p>
- <ul>
- <li>S60 5th Edition
- <li>S60 3rd Edition, FP2
- <li>S60 3rd Edition, FP1
- <li>S60 3rd Edition, MR
- </ul>
- <p><strong>Qt SDKs</strong> (<a href="http://www.trolltech.com/">www.trolltech.com</a>) </p>
- <ul>
- <li>Qt SDK for S60
- </ul>
- <p><strong>UIQ SDKs</strong> (<a href="http://developer.uiq.com/">developer.uiq.com</a>) </p>
- <ul>
- <li>UIQ 3.1
- <li>UIQ 3.0
- </ul></td>
- </tr>
-</table>
-<hr size="1" noshade>
-<p class="footer style1" >Copyright ©2006-2008 Nokia Corporation</p>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>SDK Support in Carbide.c++</title>
+<style type="text/css">
+<!--
+.style6 {font-weight: bold}
+-->
+</style>
+</head>
+
+<body background="background_carbide.jpg">
+
+<h2>You're not done installing just yet... </h2>
+<p>Release: 2.1.0<br>
+ Revised: April 2009</p>
+<p>Read the <b>Release Notes</b> and <b>Bug Fixes</b> for the latest infomation about this product. In Carbide.c++ simply click the <b>Help > Help Contents > Carbide.c++ User Guide</b> to find the pages.</p>
+<p>To complete your installation and start Symbian C++ application development, you <span class="style3">must</span> install the following: </p>
+<table width="80%" border="0">
+ <tr>
+ <td height="30" valign="bottom"><h3 class="style4">Installing Perl </h3></td>
+ </tr>
+ <tr>
+ <td height="71" bgcolor="#ffffff">
+ <p>The Carbide.c++ tools require a copy of Perl to run build scripts:</p>
+ <b>Perl</b> (<a href="http://www.activestate.com">www.activestate.com</a>)
+ <ul>
+ <li><A href="ftp://ftp.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.635-MSWin32-x86.msi">ActivePerl-5.6.1.635</a> (5.6.1 is required by Symbian tools, later versions will not work) </li>
+ </ul></td>
+ </tr>
+</table>
+<table width="80%" border="0">
+ <tr>
+ <td height="30" valign="bottom"><h3 class="style4">Installing SDKs</h3></td>
+ </tr>
+ <tr>
+ <td bgcolor="#ffffff">
+ <p>Also, you must install at least one of the following SDKs to develop Symbian applications:
+</p>
+ <p><b>NOTE</b> Carbide.c++ requires SDKs built to support <span class="style2">WINSCW</span> format. </p>
+ <p><strong>S60 Platform SDKs</strong> (<a href="http://forum.nokia.com/info/sw.nokia.com/id/4a7149a5-95a5-4726-913a-3c6f21eb65a5/S60-SDK-0616-3.0-mr.html">forum.nokia.com/main/resources/tools_and_sdks/carbide/</a>) </p>
+ <ul>
+ <li>S60 5th Edition
+ <li>S60 3rd Edition, FP2
+ <li>S60 3rd Edition, FP1
+ <li>S60 3rd Edition, MR
+ </ul>
+ <p><strong>Qt SDKs</strong> (<a href="http://www.trolltech.com/">www.trolltech.com</a>) </p>
+ <ul>
+ <li>Qt SDK for S60
+ </ul>
+ <p><strong>UIQ SDKs</strong> (<a href="http://developer.uiq.com/">developer.uiq.com</a>) </p>
+ <ul>
+ <li>UIQ 3.1
+ <li>UIQ 3.0
+ </ul></td>
+ </tr>
+</table>
+<p> </p>
+<div id="footer"><span class="style6">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
+License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></span></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.codescanner/book.css Fri Apr 03 14:27:34 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/book.css Mon Apr 06 14:02:48 2009 -0500
@@ -1,184 +1,184 @@
-/*
- Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- License: http://www.eclipse.org/legal/epl-v10.html
-*/
-
-/* Add whitespace around entire display to avoid crowding edges of view */
-/* 20070523-Removed top margin size to close gap between location breadcrumbs and page title */
-html {
- margin: 2px 10px 10px 10px;
- }
-
-/* Set default font to serif style, 12-pt and plain */
-body, p, table {
- font-family: Georgia, "Times New Roman", Times, serif;
- font-size: 13px;
- font-weight: normal;
-}
-
-/* Use sans-serif fonts for all title styles */
-h1, h2, h3, h4, h5, h6, strong, em {
- font-family: Helvetica, sans-serif;
- color: #000000;
- }
-
-h1 { font-size:20px }
-h2 { font-size:18px }
-h3 { font-size:16px }
-h4 { font-size:14px }
-h5 { font-size:13px }
-h6 { font-size:12px }
-
-/* For headlines at the top of a view, add space */
-/* 20090224-changed green fade to gold header image */
-h1, h2, h3 {
- background-image: url(html/images/brand/gold_header.png);
- background-repeat: no-repeat;
- padding:10px 0px 10px 12px;
- }
-
-li {
- margin-bottom:8px;
- margin-top:8px;
- }
-
-/* Footer includes space and a gray line above the company logo */
-#footer {
- padding-top:10px;
- margin-top:20px;
- border-top:1px solid #999;
- font-family: Helvetica, sans-serif;
- font-size: 11px;
- color:#333;
- }
-
-.listing {
- font-family: "Courier New", Courier, mono;
- color: #000000;
- background-color: #FFFFCC;
- margin: 5px 0px;
- }
-
-.code, pre {
- font-family: "Courier New", Courier, mono;
- font-size: 13px;
- color: #000000;
- }
-
-.step {
- /* background-color: #EEE; */
- /* margin: 10px 0px; */
- color: #111;
- /* border-bottom:2px solid #EEE; */
- }
-
-.substep {
- background-color: #EEE;
- }
-
-
-/* Figure/Listing/Table titles are centered and gray */
-p.table {
- color: #999;
- font-weight: bold;
- padding-top: 5px;
- }
-
-table {
- border: solid #999 1px;
- table-layout: auto;
- font-size: 13px;
- }
-
-td, th {
- border: solid #999 1px;
- padding: 5px;
- vertical-align:top;
- }
-
-/* 20070522-replaced gray with green background to match gradiant color for title */
-th {
- background-color:#FDDD1F; /* background-color:#acd79b;
- background-color:#999;
- color:#FFF; */
- }
-
-div.ol.p {
- margin-left: 3em;
- }
-
-/* Make all ordered/unordered list items appear in bold gray */
-div ol > li, div ul > li {
- font-weight:bold;
- color: #333;
- }
-
-div ol > p, div ul > p, div li > p {
- font-weight:normal;
- }
-
-/* Make all H4 and H5 items appear in bold gray against a light green background */
-div h5, div h4 {
- padding:5px 0px 5px 12px;
- background-color:#FFFF66;
- /* background-color: #EEE; */
- font-weight:bold;
- color: #000000;
- }
-
-
-/* Notes stand out using a light top & bottom borders with dark gray text */
-p.note {
- /* color: #03C; */
- /* background-color: #FFFF99; */
- color: #333;
- padding: 5px;
- margin-left: 1em;
- margin-right: 1em;
- border-top: solid #BBB thin;
- border-bottom: solid #BBB thin;
- }
-
-
-/* Figure/Listing/Table titles are centered and gray */
-p.figure {
- color: #333;
- text-align: center;
- font-weight: bold;
- }
-
-/* highly visible red background and white text for things that need fixing before release */
-/* SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
-.fix {
- background-color: red;
- font-weight: bold;
- color: white;
- }
-
-.question {
- font-style:italic;
- font-weight:bold;
- color: #555;
- }
-
-.titleSmall {
- font-family: Helvetica, sans-serif;
- font-size: 11px;
- }
-
-
-.plain {
- font-family: Helvetica, sans-serif;
- font-size: 12px;
- font-style: normal;
- line-height: normal;
- font-weight: normal;
- font-variant: normal;
- color: #000000;
- text-decoration: none;
- }
-
-a:link { color: #0033CC }
-a:visited { color: #555555 }
-a:hover { color: #0033CC }
+/*
+ Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ License: http://www.eclipse.org/legal/epl-v10.html
+*/
+
+/* Add whitespace around entire display to avoid crowding edges of view */
+/* 20070523-Removed top margin size to close gap between location breadcrumbs and page title */
+html {
+ margin: 2px 10px 10px 10px;
+ }
+
+/* Set default font to serif style, 12-pt and plain */
+body, p, table {
+ font-family: Georgia, "Times New Roman", Times, serif;
+ font-size: 13px;
+ font-weight: normal;
+}
+
+/* Use sans-serif fonts for all title styles */
+h1, h2, h3, h4, h5, h6, strong, em {
+ font-family: Helvetica, sans-serif;
+ color: #000000;
+ }
+
+h1 { font-size:20px }
+h2 { font-size:18px }
+h3 { font-size:16px }
+h4 { font-size:14px }
+h5 { font-size:13px }
+h6 { font-size:12px }
+
+/* For headlines at the top of a view, add space */
+/* 20090224-changed green fade to gold header image */
+h1, h2, h3 {
+ background-image: url(html/images/brand/gold_header.png);
+ background-repeat: no-repeat;
+ padding:10px 0px 10px 12px;
+ }
+
+li {
+ margin-bottom:8px;
+ margin-top:8px;
+ }
+
+/* Footer includes space and a gray line above the company logo */
+#footer {
+ padding-top:10px;
+ margin-top:20px;
+ border-top:1px solid #999;
+ font-family: Helvetica, sans-serif;
+ font-size: 11px;
+ color:#333;
+ }
+
+.listing {
+ font-family: "Courier New", Courier, mono;
+ color: #000000;
+ background-color: #FFFFCC;
+ margin: 5px 0px;
+ }
+
+.code, pre {
+ font-family: "Courier New", Courier, mono;
+ font-size: 13px;
+ color: #000000;
+ }
+
+.step {
+ /* background-color: #EEE; */
+ /* margin: 10px 0px; */
+ color: #111;
+ /* border-bottom:2px solid #EEE; */
+ }
+
+.substep {
+ background-color: #EEE;
+ }
+
+
+/* Figure/Listing/Table titles are centered and gray */
+p.table {
+ color: #999;
+ font-weight: bold;
+ padding-top: 5px;
+ }
+
+table {
+ border: solid #999 1px;
+ table-layout: auto;
+ font-size: 13px;
+ }
+
+td, th {
+ border: solid #999 1px;
+ padding: 5px;
+ vertical-align:top;
+ }
+
+/* 20070522-replaced gray with green background to match gradiant color for title */
+th {
+ background-color:#FDDD1F; /* background-color:#acd79b;
+ background-color:#999;
+ color:#FFF; */
+ }
+
+div.ol.p {
+ margin-left: 3em;
+ }
+
+/* Make all ordered/unordered list items appear in bold gray */
+div ol > li, div ul > li {
+ font-weight:bold;
+ color: #333;
+ }
+
+div ol > p, div ul > p, div li > p {
+ font-weight:normal;
+ }
+
+/* Make all H4 and H5 items appear in bold gray against a light green background */
+div h5, div h4 {
+ padding:5px 0px 5px 12px;
+ background-color:#FFFF66;
+ /* background-color: #EEE; */
+ font-weight:bold;
+ color: #000000;
+ }
+
+
+/* Notes stand out using a light top & bottom borders with dark gray text */
+p.note {
+ /* color: #03C; */
+ /* background-color: #FFFF99; */
+ color: #333;
+ padding: 5px;
+ margin-left: 1em;
+ margin-right: 1em;
+ border-top: solid #BBB thin;
+ border-bottom: solid #BBB thin;
+ }
+
+
+/* Figure/Listing/Table titles are centered and gray */
+p.figure {
+ color: #333;
+ text-align: center;
+ font-weight: bold;
+ }
+
+/* highly visible red background and white text for things that need fixing before release */
+/* SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
+.fix {
+ background-color: red;
+ font-weight: bold;
+ color: white;
+ }
+
+.question {
+ font-style:italic;
+ font-weight:bold;
+ color: #555;
+ }
+
+.titleSmall {
+ font-family: Helvetica, sans-serif;
+ font-size: 10px;
+ }
+
+
+.plain {
+ font-family: Helvetica, sans-serif;
+ font-size: 12px;
+ font-style: normal;
+ line-height: normal;
+ font-weight: normal;
+ font-variant: normal;
+ color: #000000;
+ text-decoration: none;
+ }
+
+a:link { color: #0033CC }
+a:visited { color: #555555 }
+a:hover { color: #0033CC }
--- a/core/com.nokia.carbide.cpp.codescanner/html/codescanner.htm Fri Apr 03 14:27:34 2009 -0500
+++ b/core/com.nokia.carbide.cpp.codescanner/html/codescanner.htm Mon Apr 06 14:02:48 2009 -0500
@@ -1,32 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>CodeScanner User Guide</title>
- <link href="../book.css" rel="stylesheet" type="text/css">
- <style>
- table, td, th { border: 0px none #FFF; }
- </style>
-</head>
-
-<body background="images/brand/background_carbide.jpg" >
-<p> </p>
-<table width="530" border="0" align="center" cellpadding="0" cellspacing="5" bgcolor="#FFFFFF" >
- <tr>
- <td width="215"><img src="images/brand/about_cpp.png" width="225" height="200"></td>
- <td width="294" valign="bottom"><p align="right"><b><img src="images/brand/brandmark_cpp.gif" width="106" height="52"></b></p>
- <p align="right"> </p>
- <p align="right"> </p>
- <p align="right"> </p>
- <p class="titleSmall">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
- </td>
- </tr>
- <tr>
- <td colspan="2"><h1 align="center">CodeScanner User Guide</h1>
- <p align="center" class="titleSmall">Version 2.1.1; February, 2009</p></td>
- </tr>
-</table>
-<p align="center"> </p>
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>CodeScanner User Guide</title>
+ <link href="../book.css" rel="stylesheet" type="text/css">
+ <style>
+ table, td, th { border: 0px none #FFF; }
+ </style>
+</head>
+
+<body background="images/brand/background_carbide.jpg" >
+<p> </p>
+<table width="530" border="0" align="center" cellpadding="0" cellspacing="5" bgcolor="#FFFFFF" >
+ <tr>
+ <td width="215"><img src="images/brand/about_cpp.png" width="225" height="200"></td>
+ <td width="294" valign="bottom"><p align="right"><b><img src="images/brand/brandmark_cpp.gif" width="106" height="52"></b></p>
+ <p align="right"> </p>
+ <p align="right"> </p>
+ <p class="titleSmall">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><h1 align="center">CodeScanner User Guide</h1>
+ <p align="center" class="titleSmall">Version 2.1.3; April, 2009</p></td>
+ </tr>
+</table>
+<p align="center"> </p>
+</body>
</html>
\ No newline at end of file
Binary file core/com.nokia.carbide.cpp.codescanner/html/images/brand/about_cpp.png has changed
Binary file core/com.nokia.carbide.cpp.codescanner/html/images/brand/background_carbide.jpg has changed
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/contentpage/background.jpg has changed
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/root/background.jpg has changed