# HG changeset patch
# User hgs
# Date 1279701471 -10800
# Node ID 81c360d47083e004374e472a5bfd598ec7d88ce1
# Parent  77bc263e1626c4eb640ae1120a790c60499ec72b
201027_1

diff -r 77bc263e1626 -r 81c360d47083 contactwidgethsplugin/contactwidgeths/src/commlauncherwidget.cpp
--- a/contactwidgethsplugin/contactwidgeths/src/commlauncherwidget.cpp	Wed Jul 21 11:21:49 2010 +0300
+++ b/contactwidgethsplugin/contactwidgeths/src/commlauncherwidget.cpp	Wed Jul 21 11:37:51 2010 +0300
@@ -522,11 +522,6 @@
         // Call key initializes a call
         makeCall();
         event->accept();
-    } else if (event->key() == Qt::Key_No || event->key() == Qt::Key_Select) {
-        // End key and Select key close the communication launcher and 
-        // forward the key event to HbPopup
-        close();
-        HbPopup::keyPressEvent(event);
     } else {
         HbPopup::keyPressEvent(event);
     } 
diff -r 77bc263e1626 -r 81c360d47083 contactwidgethsplugin/contactwidgeths/src/contactwidgeths.cpp
--- a/contactwidgethsplugin/contactwidgeths/src/contactwidgeths.cpp	Wed Jul 21 11:21:49 2010 +0300
+++ b/contactwidgethsplugin/contactwidgeths/src/contactwidgeths.cpp	Wed Jul 21 11:37:51 2010 +0300
@@ -41,6 +41,9 @@
 #include "commlauncherwidget.h"
 #include "ihswidgetpreferenceservice.h"
  
+const QString translationsPath = "/resource/qt/translations/";
+const QString translationsFile = "contactwidgethsplugin";
+
 const QString defaultAvatar = "qtg_large_avatar";
 const QString addContactAvatar = "qtg_small_add";
 const QString normalFrameName = "qtg_fr_hsshortcut_normal";
@@ -79,7 +82,7 @@
   mTranslator(0)
 {
     // Localization file loading   
-	mTranslator = new HbTranslator();
+	mTranslator = new HbTranslator(translationsPath, translationsFile);
 	mTranslator->loadCommon();    
     
     // UI creation done in onInitialize()
@@ -579,7 +582,11 @@
 */
 void ContactWidgetHs::onHide()
 {
-    qDebug() << "ContactWidgetHs::onHide()";	
+    qDebug() << "ContactWidgetHs::onHide()";
+    // close the launcher if it's open
+    if (mLauncher->isVisible()) {
+        mLauncher->close();
+    }
 }
 
 
diff -r 77bc263e1626 -r 81c360d47083 contactwidgethsplugin/contactwidgethsplugin.pro
--- a/contactwidgethsplugin/contactwidgethsplugin.pro	Wed Jul 21 11:21:49 2010 +0300
+++ b/contactwidgethsplugin/contactwidgethsplugin.pro	Wed Jul 21 11:37:51 2010 +0300
@@ -18,8 +18,7 @@
 CONFIG += plugin hb mobility
 MOBILITY = serviceframework contacts
 
-TRANSLATIONS = common.ts
-TRANSLATIONS += contactwidgethsplugin.ts
+TRANSLATIONS = contactwidgethsplugin.ts
 
 win32: PLUGIN_SUBDIR = /hsresources/import/widgetregistry/2002C353
 symbian: PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/2002C353
@@ -57,11 +56,10 @@
     BLD_INF_RULES.prj_exports += "./resource/contactwidgethsplugin.manifest z:$$PLUGIN_SUBDIR/contactwidgethsplugin.manifest"
     # xml files for emulator, sisx and hw rom
     BLD_INF_RULES.prj_exports += "./resource/contactwidgethsplugin.xml z:$$PLUGIN_SUBDIR/contactwidgethsplugin.xml"
-    # copy resources graphics png, svg
-    BLD_INF_RULES.prj_exports += "./resource/qtg_large_friend.svg z:$$PLUGIN_SUBDIR/qtg_large_friend.svg"
 
     # copy iby file
-    BLD_INF_RULES.prj_exports += "./rom/contactwidgeths.iby CORE_APP_LAYER_IBY_EXPORT_PATH( contactwidgeths.iby )"
+    BLD_INF_RULES.prj_exports += "./rom/contactwidgeths.iby CORE_APP_LAYER_IBY_EXPORT_PATH(contactwidgeths.iby)"
+    BLD_INF_RULES.prj_exports += "./rom/contactwidgeths_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(contactwidgeths_resources.iby)"
 }
 
 symbian {
diff -r 77bc263e1626 -r 81c360d47083 contactwidgethsplugin/resource/contactwidgethsplugin.manifest
--- a/contactwidgethsplugin/resource/contactwidgethsplugin.manifest	Wed Jul 21 11:21:49 2010 +0300
+++ b/contactwidgethsplugin/resource/contactwidgethsplugin.manifest	Wed Jul 21 11:37:51 2010 +0300
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <hswidgetmanifest>
     <uri>contactwidgethsplugin</uri>
-    <title>Contact</title>
-    <description>Contact widget.</description>
+    <title>txt_long_caption_friend</title>
+    <description>txt_friend_widget_dblist_friend_widget_val_quickly</description>
     <icon>qtg_large_friend</icon>
     <hidden>false</hidden>
     <servicexml>contactwidgethsplugin.xml</servicexml>
+    <translationfile>contactwidgethsplugin</translationfile>
 </hswidgetmanifest>
diff -r 77bc263e1626 -r 81c360d47083 contactwidgethsplugin/rom/contactwidgeths.iby
--- a/contactwidgethsplugin/rom/contactwidgeths.iby	Wed Jul 21 11:21:49 2010 +0300
+++ b/contactwidgethsplugin/rom/contactwidgeths.iby	Wed Jul 21 11:37:51 2010 +0300
@@ -17,6 +17,8 @@
 #ifndef __CONTACTWIDGETHSPLUGIN_IBY__
 #define __CONTACTWIDGETHSPLUGIN_IBY__
 
+#include <data_caging_paths_for_iby.hrh>
+
 // -------- contactwidgethsplugin
 file=ABI_DIR\BUILD_DIR\contactwidgethsplugin.dll                                        SHARED_LIB_DIR\contactwidgethsplugin.dll
 data=ZPRIVATE\20022f35\import\widgetregistry\2002C353\contactwidgethsplugin.qtplugin	private\20022f35\import\widgetregistry\2002C353\contactwidgethsplugin.qtplugin
@@ -25,4 +27,6 @@
 
 data=ZPRIVATE\20022f35\import\widgetregistry\2002C353\qtg_large_friend.svg              private\20022f35\import\widgetregistry\2002C353\qtg_large_friend.svg
 
+data=DATAZ_\APP_RESOURCE_DIR\contactwidgethsplugin.rsc                                  APP_RESOURCE_DIR\contactwidgethsplugin.rsc
+
 #endif //__CONTACTWIDGETHSPLUGIN_IBY__
diff -r 77bc263e1626 -r 81c360d47083 contactwidgethsplugin/rom/contactwidgeths_resources.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contactwidgethsplugin/rom/contactwidgeths_resources.iby	Wed Jul 21 11:37:51 2010 +0300
@@ -0,0 +1,24 @@
+/*
+* 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 "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 __CONTACTWIDGETHSPLUGIN_RESOURCES_IBY__
+#define __CONTACTWIDGETHSPLUGIN_RESOURCES_IBY__
+
+#include <data_caging_paths_for_iby.hrh>
+
+data=DATAZ_\QT_TRANSLATIONS_DIR\contactwidgethsplugin.qm QT_TRANSLATIONS_DIR\contactwidgethsplugin.qm
+
+#endif //__CONTACTWIDGETHSPLUGIN_RESOURCES_IBY__