# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1272457255 -3600
# Node ID f693f7318d3e98d4d40579713ed0ad9f9f510658
# Parent  2512355b303afe3ff67a72c5f00a39d75fe4bd9f# Parent  613a5ff70823db537fc59a846e510a79cca5a215
Merge in DirectPrint contribution from Kanrikogaku Kenkyusho, Ltd.

diff -r 613a5ff70823 -r f693f7318d3e ImagePrint/ImagePrintEngine/DeviceProtocols/rom/deviceprotocols.iby
--- a/ImagePrint/ImagePrintEngine/DeviceProtocols/rom/deviceprotocols.iby	Wed Mar 31 00:04:55 2010 +0900
+++ b/ImagePrint/ImagePrintEngine/DeviceProtocols/rom/deviceprotocols.iby	Wed Apr 28 13:20:55 2010 +0100
@@ -36,7 +36,7 @@
 #endif
 
 #ifdef FF_IMAGEPRINT_UPNP_PROTOCOL
-IP_PLUGIN(upnpprotocol.dll, upnpprotocol.rsc)
+//IP_PLUGIN(upnpprotocol.dll, upnpprotocol.rsc)
 #endif
 
 file=ABI_DIR\IP_DIR\xhtmlfilecomposer.dll	SHARED_LIB_DIR\xhtmlfilecomposer.dll
diff -r 613a5ff70823 -r f693f7318d3e ImagePrint/ImagePrintUI/imageprintapp/inc/imageprintapp.hrh
--- a/ImagePrint/ImagePrintUI/imageprintapp/inc/imageprintapp.hrh	Wed Mar 31 00:04:55 2010 +0900
+++ b/ImagePrint/ImagePrintUI/imageprintapp/inc/imageprintapp.hrh	Wed Apr 28 13:20:55 2010 +0100
@@ -35,7 +35,7 @@
     ECmdPrint = 0x1000,
     ECmdPrintSettings,
     ECmdPrintNumberOfCopies,
-    ECmdPrintHelp
+    ECmdPrintHelp = EAknCmdHelp
     };
 
 // Commands for the setting view's HandleCommandL()
diff -r 613a5ff70823 -r f693f7318d3e ImagePrint/group/bld.inf
--- a/ImagePrint/group/bld.inf	Wed Mar 31 00:04:55 2010 +0900
+++ b/ImagePrint/group/bld.inf	Wed Apr 28 13:20:55 2010 +0100
@@ -21,6 +21,8 @@
 #include "../clog/group/bld.inf"
 #include "../ImagePrintEngine/group/bld.inf"
 #include "../ImagePrintUI/group/bld.inf"
+// Help exports
+#include "../help/group/bld.inf"
 
 PRJ_PLATFORMS
 WINSCW ARMV5
diff -r 613a5ff70823 -r f693f7318d3e ImagePrint/help/group/bld.inf
--- a/ImagePrint/help/group/bld.inf	Wed Mar 31 00:04:55 2010 +0900
+++ b/ImagePrint/help/group/bld.inf	Wed Apr 28 13:20:55 2010 +0100
@@ -2,13 +2,13 @@
 * 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"
+* under the terms of "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
-* 
+* Nokia Corporation - initial contribution.
+*
 * Contributors:
 * 
 * 
diff -r 613a5ff70823 -r f693f7318d3e ImagePrint/help/rom/imageprintuihelps_variant.iby
--- a/ImagePrint/help/rom/imageprintuihelps_variant.iby	Wed Mar 31 00:04:55 2010 +0900
+++ b/ImagePrint/help/rom/imageprintuihelps_variant.iby	Wed Apr 28 13:20:55 2010 +0100
@@ -1,11 +1,27 @@
-#ifndef __ANYAPPHELPS_VARIANT_IBY__
-#define __ANYAPPHELPS_VARIANT_IBY__
+/*
+* 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 "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:
+*
+*/
+#ifndef __IMAGEPRINTHELPS_VARIANT_IBY__
+#define __IMAGEPRINTHELPS_VARIANT_IBY__
 
-#if defined(FF_S60_HELPS_IN_USE) && defined(__ANYAPP_USED)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x00000000\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x00000000\contents.zip)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x00000000\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x00000000\index.xml)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x00000000\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x00000000\keywords.xml)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x00000000\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x00000000\meta.xml)
+#if defined(FF_S60_HELPS_IN_USE)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x101FFA84\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x101FFA84\contents.zip)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x101FFA84\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x101FFA84\index.xml)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x101FFA84\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x101FFA84\keywords.xml)
+    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x101FFA84\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x101FFA84\meta.xml)
 #endif
 
 #endif
\ No newline at end of file
diff -r 613a5ff70823 -r f693f7318d3e layers.sysdef.xml
--- a/layers.sysdef.xml	Wed Mar 31 00:04:55 2010 +0900
+++ b/layers.sysdef.xml	Wed Apr 28 13:20:55 2010 +0100
@@ -12,3 +12,4 @@
     </layer>
   </systemModel>
 </SystemDefinition>
+
diff -r 613a5ff70823 -r f693f7318d3e package_definition.xml
--- a/package_definition.xml	Wed Mar 31 00:04:55 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="printing" name="Printing" levels="app">
-    <collection id="imageprint" name="ImagePrint" level="app">
-      <component id="clog" filter="s60" name="ImagePrint Logging" introduced="^2">
-        <unit bldFile="imageprint/clog/group"/>
-      </component>
-      <component id="imageprintengine" filter="s60" name="ImagePrint Engine" introduced="^2">
-        <unit bldFile="imageprint/imageprintengine/group"/>
-       		<!--  do these other bld.infs need to be #included? -->
-        <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/btprotocol/group"/> -->
-        <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/dpof/group"/> -->
-        <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/pictbridge2/group"/> -->
-        <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/upnpprotocolfw2/group"/> -->
-        <!-- <unit bldFile="imageprint/imageprintengine/deviceprotocols/xhtmlfilecomposer/group"/> -->
-        <!-- <unit bldFile="imageprint/imageprintengine/imageprintserver/group"/> -->
-      </component>
-      <component id="imageprintui" filter="s60" name="ImagePrint UI" introduced="^2">
-        <unit bldFile="imageprint/imageprintui/group"/>
-      </component>
-      <component id="imageprint_build" filter="s60" name="ImagePrint Build" introduced="^2">	
-      	<!--  Need to break the IBY includes into the other components -->
-        <unit bldFile="imageprint/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>