--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java Tue Nov 17 14:13:05 2009 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java Mon Nov 30 14:30:06 2009 -0600
@@ -64,7 +64,6 @@
import com.nokia.carbide.cdt.internal.builder.ICarbideBuilder;
import com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage;
import com.nokia.carbide.cdt.internal.builder.ui.MMPSelectionDialog;
-import com.nokia.carbide.cdt.internal.builder.ui.Messages;
import com.nokia.carbide.cpp.epoc.engine.EpocEnginePlugin;
import com.nokia.carbide.cpp.epoc.engine.MMPDataRunnableAdapter;
import com.nokia.carbide.cpp.epoc.engine.PKGViewRunnableAdapter;
@@ -1220,31 +1219,27 @@
return;
} else if (!pkgPath.toFile().exists()) {
- try {
- // Check to see if this is a Qt project and if the template format could have changed.
- IProject project = config.getCarbideProject().getProject();
- if (project != null && project.hasNature(QtCorePlugin.QT_PROJECT_NATURE_ID)){
- final String currentPKGName = pkgPath.lastSegment();
- pkgPath = pkgPath.removeLastSegments(1).append(project.getName() + "_template.pkg" ); //$NON-NLS-N$
- if (pkgPath.toFile().exists()){
-
- final IPath finalPkgPath = pkgPath;
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- if (true == MessageDialog.openQuestion(WorkbenchUtils.getSafeShell(), "Can not find PKG file for SIS builder", "The file \"" + currentPKGName + "\" does not exist for this Qt project. The suggested file is \"" + finalPkgPath.lastSegment() + "\".\n\nDo you want to update your build configuration to use this PKG file?")) { //$NON-NLS-1$ //$NON-NLS-2$
- IWorkspace workspace= ResourcesPlugin.getWorkspace();
- IFile ifile= workspace.getRoot().getFileForLocation(finalPkgPath);
- sisInfo.setPKGFile(ifile.getLocation().toOSString());
- config.getSISBuilderInfoList().remove(sisInfo);
- config.getSISBuilderInfoList().add(sisInfo);
- config.saveConfiguration(false);
- }
- }
- });
- }
- }
- } catch (CoreException e) {
- e.printStackTrace();
+ // Check to see if this is a Qt project and if the template format could have changed.
+ IProject project = config.getCarbideProject().getProject();
+ if (QtCorePlugin.isQtProject(project)) {
+ final String currentPKGName = pkgPath.lastSegment();
+ pkgPath = pkgPath.removeLastSegments(1).append(project.getName() + "_template.pkg" ); //$NON-NLS-N$
+ if (pkgPath.toFile().exists()){
+
+ final IPath finalPkgPath = pkgPath;
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ if (true == MessageDialog.openQuestion(WorkbenchUtils.getSafeShell(), "Can not find PKG file for SIS builder", "The file \"" + currentPKGName + "\" does not exist for this Qt project. The suggested file is \"" + finalPkgPath.lastSegment() + "\".\n\nDo you want to update your build configuration to use this PKG file?")) { //$NON-NLS-1$ //$NON-NLS-2$
+ IWorkspace workspace= ResourcesPlugin.getWorkspace();
+ IFile ifile= workspace.getRoot().getFileForLocation(finalPkgPath);
+ sisInfo.setPKGFile(ifile.getLocation().toOSString());
+ config.getSISBuilderInfoList().remove(sisInfo);
+ config.getSISBuilderInfoList().add(sisInfo);
+ config.saveConfiguration(false);
+ }
+ }
+ });
+ }
}
if (!sisInfo.getPKGFullPath().toFile().exists()){
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java Tue Nov 17 14:13:05 2009 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java Mon Nov 30 14:30:06 2009 -0600
@@ -20,7 +20,6 @@
import java.util.Iterator;
import java.util.List;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TrayDialog;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -183,13 +182,9 @@
new FilteringContentProviderWrapper(treeNodeContentProvider);
// add filters for Qt projects
- try {
- if (cpi.getProject().hasNature(QtCorePlugin.QT_PROJECT_NATURE_ID)) {
- filteringContentProviderWrapper.setFilter(new QtSDKFilter());
- filteringContentProviderWrapper.setConfigFilter(new QtConfigFilter());
- }
- } catch (CoreException e) {
- e.printStackTrace();
+ if (QtCorePlugin.isQtProject(cpi.getProject())) {
+ filteringContentProviderWrapper.setFilter(new QtSDKFilter());
+ filteringContentProviderWrapper.setConfigFilter(new QtConfigFilter());
}
boolean sbsv2Project = CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(cpi.getProject());
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Tue Nov 17 14:13:05 2009 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Mon Nov 30 14:30:06 2009 -0600
@@ -28,7 +28,6 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.*;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
import com.nokia.carbide.cdt.builder.*;
import com.nokia.carbide.cdt.builder.builder.CarbideCPPBuilder;
@@ -47,7 +46,6 @@
import com.nokia.carbide.cpp.internal.qt.core.QtCorePlugin;
import com.nokia.carbide.cpp.sdk.core.*;
import com.nokia.cpp.internal.api.utils.core.FileUtils;
-import com.nokia.cpp.internal.api.utils.ui.QueryWithTristatePrefDialog;
import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
@@ -1940,12 +1938,8 @@
// ignore this for Qt projects since the mmp will be regenerated before each build.
final IProject project = buildConfig.getCarbideProject().getProject();
- try {
- if (project.hasNature(QtCorePlugin.QT_PROJECT_NATURE_ID)) {
- return true;
- }
- } catch (CoreException e) {
- e.printStackTrace();
+ if (QtCorePlugin.isQtProject(project)) {
+ return true;
}
// we used to ignore this for emulator builds, thinking everything of interest was in the .uid.cpp file. well, a lot of
@@ -1975,12 +1969,8 @@
// ignore this for Qt projects since the mmp will be regenerated before each build.
final IProject project = buildConfig.getCarbideProject().getProject();
- try {
- if (project.hasNature(QtCorePlugin.QT_PROJECT_NATURE_ID)) {
- return true;
- }
- } catch (CoreException e) {
- e.printStackTrace();
+ if (QtCorePlugin.isQtProject(project)) {
+ return true;
}
// we used to ignore this for emulator builds, thinking everything of interest was in the .uid.cpp file. well, a lot of
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideCPPProjectSettingsPage.java Tue Nov 17 14:13:05 2009 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideCPPProjectSettingsPage.java Mon Nov 30 14:30:06 2009 -0600
@@ -374,17 +374,8 @@
private void enableOrDisableControls() {
boolean buildFromInf = buildFromBldInfButton.getSelection();
boolean useProjectSettings = fUseProjectSettings.getSelection();
- boolean isQtProject = false;
IProject project = getProject();
- if (project != null) {
- try {
- if (project.hasNature(QtCorePlugin.QT_PROJECT_NATURE_ID)) {
- isQtProject = true;
- }
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
+ boolean isQtProject = QtCorePlugin.isQtProject(project);
selectionUI.setEnabled(!buildFromInf);
optionsGroup.setEnabled(useProjectSettings);
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/core/HoverManager.java Tue Nov 17 14:13:05 2009 -0600
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/core/HoverManager.java Mon Nov 30 14:30:06 2009 -0600
@@ -16,6 +16,9 @@
*/
package com.nokia.carbide.cpp.sysdoc.internal.hover.core;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.testing.TestableObject;
+
import com.nokia.carbide.cpp.sysdoc.hover.Activator;
import com.nokia.carbide.cpp.sysdoc.internal.hover.dal.devlib.DevLibProperties;
import com.nokia.carbide.cpp.sysdoc.internal.hover.dal.devlib.locator.DevLiblocatorFactory;
@@ -200,4 +203,13 @@
public static HoverManager getInstance() {
return instance;
}
+
+ public static boolean isJunitRunning() {
+ boolean result = false;
+ TestableObject testableObject = PlatformUI.getTestableObject();
+ if (testableObject != null) {
+ result = testableObject.getTestHarness() != null;
+ }
+ return result;
+ }
}
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/uitlis/DialogHelper.java Tue Nov 17 14:13:05 2009 -0600
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/uitlis/DialogHelper.java Mon Nov 30 14:30:06 2009 -0600
@@ -44,7 +44,7 @@
}
};
- if (!HoverManager.isTestMode()) {
+ if (!HoverManager.isTestMode() && !HoverManager.isJunitRunning()) {
ExecutorAgent.run(mssageRunnable);
}
}
--- a/core/com.nokia.carbide.templatewizard.tests/src/com/nokia/carbide/templatewizard/tests/AllTests.java Tue Nov 17 14:13:05 2009 -0600
+++ b/core/com.nokia.carbide.templatewizard.tests/src/com/nokia/carbide/templatewizard/tests/AllTests.java Mon Nov 30 14:30:06 2009 -0600
@@ -28,6 +28,7 @@
//$JUnit-BEGIN$
suite.addTestSuite(TemplateLoaderTest.class);
suite.addTestSuite(ProcessesTest.class);
+ suite.addTestSuite(TemplateCopyFilesTest.class);
//$JUnit-END$
return suite;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.templatewizard.tests/src/com/nokia/carbide/templatewizard/tests/TemplateCopyFilesTest.java Mon Nov 30 14:30:06 2009 -0600
@@ -0,0 +1,145 @@
+/*
+* Copyright (c) 2009 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.templatewizard.tests;
+
+import com.nokia.carbide.internal.api.template.engine.*;
+import com.nokia.carbide.internal.template.gen.Template.ParameterType;
+import com.nokia.carbide.internal.template.gen.Template.ProcessType;
+import com.nokia.carbide.internal.template.gen.Template.TemplateType;
+import com.nokia.carbide.internal.templatewizard.tests.TestsPlugin;
+import com.nokia.carbide.template.engine.*;
+import com.nokia.cpp.internal.api.utils.core.FileUtils;
+import com.nokia.cpp.internal.api.utils.core.TextUtils;
+
+import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.*;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.FeatureMap;
+import org.osgi.framework.Bundle;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
+import java.util.*;
+
+import junit.framework.TestCase;
+
+/**
+ * Test that the CopyFile* processes refer to extant files
+ */
+public class TemplateCopyFilesTest extends TestCase {
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ private ILoadedTemplate loadTemplate(File file, boolean validate) throws CoreException, IOException {
+ assertNotNull(file);
+ assertTrue(file.exists());
+ Bundle bundle = TestsPlugin.getDefault().getBundle();
+ URL templateUrl = file.toURL();
+ TemplateType templateType = TemplateLoader.loadTemplate(bundle, templateUrl, validate);
+ assertNotNull(templateType);
+ ITemplate template = new Template(templateUrl, bundle, null, null, null, null, null, null, null);
+ return template.getLoadedTemplate();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ @SuppressWarnings("unchecked")
+ public void testTemplates() throws Exception {
+ String errors = "";
+ for (ITemplate templateInfo : TemplateEngine.getInstance().getFilteredTemplates(null)) {
+ if (templateInfo instanceof Template) {
+ ILoadedTemplate template;
+ try {
+ template = templateInfo.getLoadedTemplate();
+ } catch (CoreException e) {
+ // too bad!
+ e.printStackTrace();
+ continue;
+ }
+ if (template instanceof LoadedTemplate) {
+ LoadedTemplate loadedTemplate = (LoadedTemplate) template;
+ String error = validateProcesses(templateInfo.getTemplateId(),
+ templateInfo.getBundle(),
+ templateInfo.getTemplateUrl(),
+ loadedTemplate.getTemplateType().getProcess());
+ if (error != null)
+ errors += error;
+ }
+ }
+ }
+ if (errors.length() > 0)
+ fail(errors);
+ }
+
+ @SuppressWarnings("unchecked")
+ private String validateProcesses(String templateId, Bundle bundle, URL templateBase, EList<ProcessType> processes) {
+ if (processes == null)
+ return null;
+ List<String> invalidFiles = new ArrayList<String>();
+ for (ProcessType process : processes) {
+ String nameOrClass = process.getName();
+ if (nameOrClass == null)
+ nameOrClass = process.getClass_();
+ if (nameOrClass == null)
+ continue;
+ if (!nameOrClass.contains("CopyFile"))
+ continue;
+ EList<ParameterType> parameters = process.getParameter();
+ for (ParameterType parameter : parameters) {
+ FeatureMap attributes = parameter.getAnyAttribute();
+ for (Iterator iter = attributes.iterator(); iter.hasNext();) {
+ FeatureMap.Entry entry = (FeatureMap.Entry) iter.next();
+ String attributeName = entry.getEStructuralFeature().getName();
+ if (attributeName.equals("sourcePath")) {
+ String rawString = (String) entry.getValue();
+ if (!rawString.contains("$(")) {
+ String fileName = templateBase.getFile();
+ IPath path = new Path(fileName).removeLastSegments(1);
+ IPath sourcePath = path.append(rawString);
+ URL url = FileLocator.find(bundle, sourcePath, null);
+ if (url == null) {
+ invalidFiles.add(rawString);
+ continue;
+ }
+ try {
+ InputStream stream = url.openStream();
+ stream.close();
+ } catch (IOException e) {
+ invalidFiles.add(rawString);
+ }
+ }
+ }
+ }
+ }
+ }
+ if (!invalidFiles.isEmpty()) {
+ return (templateId + " references nonexistent files (check capitalization):\n"
+ + TextUtils.catenateStrings(invalidFiles.toArray(), "\n")
+ + "\n");
+ }
+ return null;
+ }
+}
--- a/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/template/engine/TemplateEngine.java Tue Nov 17 14:13:05 2009 -0600
+++ b/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/template/engine/TemplateEngine.java Mon Nov 30 14:30:06 2009 -0600
@@ -169,7 +169,7 @@
for (Iterator<ITemplate> iter = templates.iterator(); iter.hasNext();) {
ITemplate template = iter.next();
if (isEnabledActivity(template.getTemplateId()) &&
- filter.accept(template)) {
+ (filter == null || filter.accept(template))) {
filteredTemplates.add(template);
}
}
--- a/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF Tue Nov 17 14:13:05 2009 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF Mon Nov 30 14:30:06 2009 -0600
@@ -11,7 +11,7 @@
org.eclipse.jface,
com.nokia.carbide.cpp.sdk.core,
com.nokia.carbide.cpp.sdk.ui,
- com.trolltech.qtcppproject;bundle-version="1.5.0"
+ com.trolltech.qtcppproject;bundle-version="1.5.0";resolution:=optional
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: com.nokia.carbide.cpp.internal.qt.core
--- a/qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtCorePlugin.java Tue Nov 17 14:13:05 2009 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtCorePlugin.java Mon Nov 30 14:30:06 2009 -0600
@@ -83,5 +83,16 @@
description.setNatureIds(newNatures);
project.setDescription(description, monitor);
}
+
+ public static boolean isQtProject(IProject project) {
+ if (project == null)
+ return false;
+ try {
+ return project.hasNature(QT_PROJECT_NATURE_ID);
+ } catch (CoreException e) {
+ getDefault().getLog().log(e.getStatus());
+ return false;
+ }
+ }
}
--- a/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF Tue Nov 17 14:13:05 2009 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF Mon Nov 30 14:30:06 2009 -0600
@@ -22,7 +22,7 @@
com.nokia.carbide.cdt.builder,
org.eclipse.cdt.core,
org.eclipse.ui.ide,
- com.trolltech.qtcppproject;bundle-version="1.5.0"
+ com.trolltech.qtcppproject;bundle-version="1.5.0";resolution:=optional
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Import-Package: com.trolltech.qtcppproject,
--- a/uidesigner/com.nokia.carbide.cpp.uiq.ui/templates/UIQ v3.0/template.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.carbide.cpp.uiq.ui/templates/UIQ v3.0/template.xml Mon Nov 30 14:30:06 2009 -0600
@@ -70,11 +70,11 @@
<parameter name="project" projectName="$(projectName)" />
<parameter name="file"
- sourcePath="reg/basename_reg.loc"
+ sourcePath="reg/baseName_reg.loc"
targetPath="$(regDir)/$(baseName)_reg.loc"
/>
<parameter name="file"
- sourcePath="reg/basename_reg.rss"
+ sourcePath="reg/baseName_reg.rss"
targetPath="$(regDir)/$(baseName)_reg.rss"
/>
@@ -111,7 +111,7 @@
/>
<parameter name="file"
- sourcePath="group/basename.mmp"
+ sourcePath="group/baseName.mmp"
targetPath="$(groupDir)/$(baseName).mmp"
/>
<parameter name="file"
@@ -119,7 +119,7 @@
targetPath="$(groupDir)/bld.inf"
/>
<parameter name="file"
- sourcePath="sis/basename.pkg"
+ sourcePath="sis/baseName.pkg"
targetPath="$(sisDir)/$(baseName).pkg"
/>
<parameter name="file"
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_landscape_right.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_landscape_right.xml Mon Nov 30 14:30:06 2009 -0600
@@ -17,7 +17,7 @@
<!-- fonts are found relative to data/s60/fonts -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="8" />
<font key="EditorFont" initData="s60ssb.ttf" size="10" />
<font key="HalfTitleFont" initData="s60tsb.ttf" size="10" />
@@ -35,7 +35,7 @@
<font key="standard.AnnotationFont" initData="s60ssb.ttf" size="9" />
<font key="standard.LegendFont" initData="s60ssb.ttf" size="10" />
<font key="standard.NormalFont" initData="s60ssb.ttf" size="10" />
-<font key="status.TitleFont" initData="Alb13.10.ttf" size="10" />
+<font key="status.TitleFont" initData="alb13.10.ttf" size="10" />
<rectangle key="control.pane.bounds" x="140" y="0" width="68" height="176"/>
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_portrait.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_portrait.xml Mon Nov 30 14:30:06 2009 -0600
@@ -18,7 +18,7 @@
<!-- fonts are found relative to data/s60/fonts -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="8" />
<font key="EditorFont" initData="s60ssb.ttf" size="10" />
<font key="HalfTitleFont" initData="s60tsb.ttf" size="10" />
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_portrait_2_x.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_portrait_2_x.xml Mon Nov 30 14:30:06 2009 -0600
@@ -18,26 +18,26 @@
<!-- fonts are found relative to data/s60/fonts -->
-<font key="AnnotationFont" initData="Alb12.9.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
-<font key="DenseFont" initData="Alp13.10.ttf" size="10" />
-<font key="EditorFont" initData="Alb13.10.ttf" size="10" />
-<font key="HalfTitleFont" initData="Alb13.10.ttf" size="10" />
-<font key="MessageFont" initData="Alb13.10.ttf" size="10" />
-<font key="NormalFont" initData="Alb13.10.ttf" size="10" />
-<font key="SymbolFont" initData="Alb12.9.ttf" size="9" />
+<font key="AnnotationFont" initData="alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
+<font key="DenseFont" initData="alp13.10.ttf" size="10" />
+<font key="EditorFont" initData="alb13.10.ttf" size="10" />
+<font key="HalfTitleFont" initData="alb13.10.ttf" size="10" />
+<font key="MessageFont" initData="alb13.10.ttf" size="10" />
+<font key="NormalFont" initData="alb13.10.ttf" size="10" />
+<font key="SymbolFont" initData="alb12.9.ttf" size="9" />
<font key="TimeFont" initData="Acb14.11.ttf" size="11" />
-<font key="TitleFont" initData="Alb19.15.ttf" size="15" />
-<font key="control.pane.font" initData="Alb17.14.ttf" size="14" />
-<font key="menuitem.font" initData="Alb13.10.ttf" size="10" />
-<font key="menuitem.submenu.font" initData="Alb12.9.ttf" size="9" />
-<font key="message.font" initData="Alb13.10.ttf" size="10" />
+<font key="TitleFont" initData="alb19.15.ttf" size="15" />
+<font key="control.pane.font" initData="alb17.14.ttf" size="14" />
+<font key="menuitem.font" initData="alb13.10.ttf" size="10" />
+<font key="menuitem.submenu.font" initData="alb12.9.ttf" size="9" />
+<font key="message.font" initData="alb13.10.ttf" size="10" />
<font key="navi.tab.font" initData="s60ssb.ttf" size="8" />
-<font key="navi.text.font" initData="Alp13.10.ttf" size="10" />
-<font key="standard.AnnotationFont" initData="Alb12.9.ttf" size="9" />
-<font key="standard.LegendFont" initData="Alb12.9.ttf" size="9" />
-<font key="standard.NormalFont" initData="Alb13.10.ttf" size="10" />
-<font key="status.TitleFont" initData="Alb19.15.ttf" size="15" />
+<font key="navi.text.font" initData="alp13.10.ttf" size="10" />
+<font key="standard.AnnotationFont" initData="alb12.9.ttf" size="9" />
+<font key="standard.LegendFont" initData="alb12.9.ttf" size="9" />
+<font key="standard.NormalFont" initData="alb13.10.ttf" size="10" />
+<font key="status.TitleFont" initData="alb19.15.ttf" size="15" />
<color key="status.bar.color" r="0" g="0" b="150"/>
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/dblres_landscape_right.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/dblres_landscape_right.xml Mon Nov 30 14:30:06 2009 -0600
@@ -18,7 +18,7 @@
<!-- fonts are found relative to data/s60/fonts -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="16" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="16" />
<font key="EditorFont" initData="s60ssb.ttf" size="20" />
<font key="HalfTitleFont" initData="s60tsb.ttf" size="18" />
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/dblres_portrait.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/dblres_portrait.xml Mon Nov 30 14:30:06 2009 -0600
@@ -18,7 +18,7 @@
<!-- fonts are found relative to data/s60/fonts -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="16" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="16" />
<font key="EditorFont" initData="s60ssb.ttf" size="20" />
<font key="HalfTitleFont" initData="s60tsb.ttf" size="18" />
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/masterFonts.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/masterFonts.xml Mon Nov 30 14:30:06 2009 -0600
@@ -1,7 +1,7 @@
<!-- bundleentry://1111/data/s60/laf/qvga_landscape_right_3_1.xml -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="10" />
<font key="ButtonFont" initData="s60ssb.ttf" size="14" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="11" />
<font key="EditorFont" initData="s60snrc.ttf" size="10" />
<font key="EditorFont.settings.list" initData="s60ssb.ttf" size="16" />
@@ -25,7 +25,7 @@
<!-- bundleentry://1111/data/s60/laf/vga_portrait.xml -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
<font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="17" />
<font key="EditorFont" initData="s60snrc.ttf" size="15" />
<font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />
@@ -51,7 +51,7 @@
<!-- bundleentry://1111/data/s60/laf/qvga_portrait.xml -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="12" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="10" />
<font key="EditorFont" initData="s60ssb.ttf" size="12" />
<font key="HalfTitleFont" initData="s60tsb.ttf" size="10" />
@@ -75,7 +75,7 @@
<!-- bundleentry://1111/data/s60/laf/classic_landscape_right.xml -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="8" />
<font key="EditorFont" initData="s60ssb.ttf" size="10" />
<font key="NormalFont" initData="s60ssb.ttf" size="10" />
@@ -83,14 +83,14 @@
<font key="message.font" initData="s60ssb.ttf" size="10" />
<font key="navi.tab.font" initData="s60ssb.ttf" size="8" />
<font key="navi.text.font" initData="s60snrc.ttf" size="8" />
-<font key="status.TitleFont" initData="Alb13.10.ttf" size="10" />
+<font key="status.TitleFont" initData="alb13.10.ttf" size="10" />
<!-- END -->
<!-- bundleentry://1111/data/s60/laf/qhd_landscape_right.xml -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
<font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="17" />
<font key="EditorFont" initData="s60snrc.ttf" size="15" />
<font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />
@@ -115,7 +115,7 @@
<!-- bundleentry://1111/data/s60/laf/qhd_portrait.xml -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
<font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="17" />
<font key="EditorFont" initData="s60snrc.ttf" size="15" />
<font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />
@@ -141,7 +141,7 @@
<!-- bundleentry://1111/data/s60/laf/classic_portrait.xml -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="8" />
<font key="EditorFont" initData="s60ssb.ttf" size="10" />
<font key="HalfTitleFont" initData="s60tsb.ttf" size="10" />
@@ -165,7 +165,7 @@
<!-- bundleentry://1111/data/s60/laf/dblres_landscape_right.xml -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="16" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="16" />
<font key="EditorFont" initData="s60ssb.ttf" size="20" />
<font key="NormalFont" initData="s60ssb.ttf" size="20" />
@@ -180,7 +180,7 @@
<!-- bundleentry://1111/data/s60/laf/vga_landscape.xml -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
<font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="17" />
<font key="EditorFont" initData="s60snrc.ttf" size="15" />
<font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />
@@ -206,7 +206,7 @@
<!-- bundleentry://1111/data/s60/laf/qvga_landscape_right.xml -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="9" />
<font key="EditorFont" initData="s60ssb.ttf" size="11" />
<font key="NormalFont" initData="s60ssb.ttf" size="11" />
@@ -221,7 +221,7 @@
<!-- bundleentry://1111/data/s60/laf/qvga_portrait_3_1.xml -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="10" />
<font key="ButtonFont" initData="s60ssb.ttf" size="14" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="11" />
<font key="EditorFont" initData="s60snrc.ttf" size="10" />
<font key="EditorFont.settings.list" initData="s60ssb.ttf" size="16" />
@@ -246,7 +246,7 @@
<!-- bundleentry://1111/data/s60/laf/dblres_portrait.xml -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="16" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="16" />
<font key="EditorFont" initData="s60ssb.ttf" size="20" />
<font key="HalfTitleFont" initData="s60tsb.ttf" size="18" />
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qhd_landscape_right.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qhd_landscape_right.xml Mon Nov 30 14:30:06 2009 -0600
@@ -20,7 +20,7 @@
<font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
<font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="17" />
<font key="EditorFont" initData="s60snrc.ttf" size="15" />
<font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qhd_portrait.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qhd_portrait.xml Mon Nov 30 14:30:06 2009 -0600
@@ -20,7 +20,7 @@
<font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
<font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="17" />
<font key="EditorFont" initData="s60snrc.ttf" size="15" />
<font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_landscape_right.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_landscape_right.xml Mon Nov 30 14:30:06 2009 -0600
@@ -18,7 +18,7 @@
<!-- fonts are found relative to data/s60/fonts -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="9" />
<font key="EditorFont" initData="s60ssb.ttf" size="11" />
<font key="HalfTitleFont" initData="s60tsb.ttf" size="10" />
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_landscape_right_3_1.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_landscape_right_3_1.xml Mon Nov 30 14:30:06 2009 -0600
@@ -30,7 +30,7 @@
<font key="AnnotationFont" initData="s60ssb.ttf" size="10" />
<font key="ButtonFont" initData="s60ssb.ttf" size="14" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="11" />
<font key="EditorFont" initData="s60snrc.ttf" size="10" />
<font key="EditorFont.settings.list" initData="s60ssb.ttf" size="16" />
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_portrait.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_portrait.xml Mon Nov 30 14:30:06 2009 -0600
@@ -18,7 +18,7 @@
<!-- fonts are found relative to data/s60/fonts -->
<font key="AnnotationFont" initData="s60ssb.ttf" size="12" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="10" />
<font key="EditorFont" initData="s60ssb.ttf" size="12" />
<font key="HalfTitleFont" initData="s60tsb.ttf" size="10" />
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_portrait_3_1.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_portrait_3_1.xml Mon Nov 30 14:30:06 2009 -0600
@@ -27,7 +27,7 @@
<font key="AnnotationFont" initData="s60ssb.ttf" size="10" />
<font key="ButtonFont" initData="s60ssb.ttf" size="14" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="11" />
<font key="EditorFont" initData="s60snrc.ttf" size="10" />
<font key="EditorFont.settings.list" initData="s60ssb.ttf" size="16" />
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/vga_landscape.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/vga_landscape.xml Mon Nov 30 14:30:06 2009 -0600
@@ -20,7 +20,7 @@
<font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
<font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="17" />
<font key="EditorFont" initData="s60snrc.ttf" size="15" />
<font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />
--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/vga_portrait.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/vga_portrait.xml Mon Nov 30 14:30:06 2009 -0600
@@ -20,7 +20,7 @@
<font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
<font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
<font key="DenseFont" initData="s60snrc.ttf" size="17" />
<font key="EditorFont" initData="s60snrc.ttf" size="15" />
<font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/template.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/template.xml Mon Nov 30 14:30:06 2009 -0600
@@ -81,15 +81,15 @@
<parameter name="project" projectName="$(projectName)" />
<parameter name="file"
- sourcePath="data/basename_reg.loc"
+ sourcePath="data/baseName_reg.loc"
targetPath="$(dataDir)/$(baseName)_reg.loc"
/>
<parameter name="file"
- sourcePath="data/basename_reg.rss"
+ sourcePath="data/baseName_reg.rss"
targetPath="$(dataDir)/$(baseName)_reg.rss"
/>
<parameter name="file"
- sourcePath="inc/basename.pan"
+ sourcePath="inc/baseName.pan"
targetPath="$(incDir)/$(baseName).pan"
/>
<!-- provide some sample BMP images -->
@@ -114,12 +114,12 @@
substitute="false"
/>
<parameter name="file"
- sourcePath="gfx/qgn_menu_basename.svg"
+ sourcePath="gfx/qgn_menu_baseName.svg"
targetPath="$(gfxDir)/qgn_menu_$(baseName).svg"
substitute="false"
/>
<parameter name="file"
- sourcePath="group/basename.mmp"
+ sourcePath="group/baseName.mmp"
targetPath="$(groupDir)/$(baseName).mmp"
/>
<parameter name="file"
@@ -131,7 +131,7 @@
targetPath="$(groupDir)/Icons_aif_scalable_dc.mk"
/>
<parameter name="file"
- sourcePath="sis/basename.pkg"
+ sourcePath="sis/baseName.pkg"
targetPath="$(sisDir)/$(baseName).pkg"
/>
<parameter name="file"
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/Birthdays/template.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/Birthdays/template.xml Mon Nov 30 14:30:06 2009 -0600
@@ -143,8 +143,8 @@
targetPath="$(groupDir)/bld.inf"
/>
<parameter name="file"
- sourcePath="group/Icons_aif_scalable_dc.mk"
- targetPath="$(groupDir)/Icons_aif_scalable_dc.mk"
+ sourcePath="group/icons_aif_scalable_dc.mk"
+ targetPath="$(groupDir)/icons_aif_scalable_dc.mk"
/>
<parameter name="file"
sourcePath="sis/baseName.pkg"
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/YahooImageSearch/template.xml Tue Nov 17 14:13:05 2009 -0600
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/YahooImageSearch/template.xml Mon Nov 30 14:30:06 2009 -0600
@@ -143,8 +143,8 @@
targetPath="$(groupDir)/bld.inf"
/>
<parameter name="file"
- sourcePath="group/Icons_aif_scalable_dc.mk"
- targetPath="$(groupDir)/Icons_aif_scalable_dc.mk"
+ sourcePath="group/icons_aif_scalable_dc.mk"
+ targetPath="$(groupDir)/icons_aif_scalable_dc.mk"
/>
<parameter name="file"
sourcePath="sis/YahooImageSearch.pkg"