# HG changeset patch # User Ed Swartz # Date 1259613006 21600 # Node ID 095227a6f44214db029806b781a23500aa521615 # Parent aa7a8dc8006aaf702c2323add137f5047e74b676# Parent 089181adb8a9bd2202ebf5eb6f87bcaec935110c Merged remote changes diff -r 089181adb8a9 -r 095227a6f442 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java --- 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()){ diff -r 089181adb8a9 -r 095227a6f442 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java --- 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()); diff -r 089181adb8a9 -r 095227a6f442 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java --- 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 diff -r 089181adb8a9 -r 095227a6f442 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideCPPProjectSettingsPage.java --- 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); diff -r 089181adb8a9 -r 095227a6f442 core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/core/HoverManager.java --- 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; + } } diff -r 089181adb8a9 -r 095227a6f442 core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/uitlis/DialogHelper.java --- 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); } } diff -r 089181adb8a9 -r 095227a6f442 core/com.nokia.carbide.templatewizard.tests/src/com/nokia/carbide/templatewizard/tests/AllTests.java --- 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; } diff -r 089181adb8a9 -r 095227a6f442 core/com.nokia.carbide.templatewizard.tests/src/com/nokia/carbide/templatewizard/tests/TemplateCopyFilesTest.java --- /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 processes) { + if (processes == null) + return null; + List invalidFiles = new ArrayList(); + for (ProcessType process : processes) { + String nameOrClass = process.getName(); + if (nameOrClass == null) + nameOrClass = process.getClass_(); + if (nameOrClass == null) + continue; + if (!nameOrClass.contains("CopyFile")) + continue; + EList 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; + } +} diff -r 089181adb8a9 -r 095227a6f442 core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/template/engine/TemplateEngine.java --- 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 iter = templates.iterator(); iter.hasNext();) { ITemplate template = iter.next(); if (isEnabledActivity(template.getTemplateId()) && - filter.accept(template)) { + (filter == null || filter.accept(template))) { filteredTemplates.add(template); } } diff -r 089181adb8a9 -r 095227a6f442 qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF --- 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 diff -r 089181adb8a9 -r 095227a6f442 qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtCorePlugin.java --- 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; + } + } } diff -r 089181adb8a9 -r 095227a6f442 qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF --- 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, diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.carbide.cpp.uiq.ui/templates/UIQ v3.0/template.xml --- 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 @@ @@ -111,7 +111,7 @@ /> - + @@ -35,7 +35,7 @@ - + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_portrait.xml --- 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 @@ - + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_portrait_2_x.xml --- 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 @@ - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - + + + + + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/dblres_landscape_right.xml --- 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 @@ - + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/dblres_portrait.xml --- 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 @@ - + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/masterFonts.xml --- 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 @@ - + @@ -25,7 +25,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -83,14 +83,14 @@ - + - + @@ -115,7 +115,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -246,7 +246,7 @@ - + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qhd_landscape_right.xml --- 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 @@ - + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qhd_portrait.xml --- 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 @@ - + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_landscape_right.xml --- 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 @@ - + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_landscape_right_3_1.xml --- 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 @@ - + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_portrait.xml --- 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 @@ - + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_portrait_3_1.xml --- 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 @@ - + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/vga_landscape.xml --- 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 @@ - + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/vga_portrait.xml --- 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 @@ - + diff -r 089181adb8a9 -r 095227a6f442 uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/template.xml --- 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 @@ @@ -114,12 +114,12 @@ substitute="false" />