--- a/homescreenapp/hsutils/src/hsmenueventfactory.cpp	Fri Apr 16 14:54:01 2010 +0300
+++ b/homescreenapp/hsutils/src/hsmenueventfactory.cpp	Mon May 03 12:24:59 2010 +0300
@@ -22,7 +22,7 @@
 
 /*!
     \class HsMenuEventFactory
-    \ingroup group_hsmenustateplugin
+    \ingroup group_hsutils
 
     \brief Menu event factory class.
 
@@ -44,44 +44,11 @@
     \param attributes Widget params.
     \return Event for adding the widget to homescreen.
 */
-QEvent *HsMenuEventFactory::createAddToHomeScreenEvent(
-    int entryId,
-    const QString &entryTypeName,
-    const QString &uri,
-    const QString &library,
-    QMap<QString, QString>* attributes)
+QEvent *HsMenuEventFactory::createAddToHomeScreenEvent(int entryId)
 {
     // get CaEntry type, and if widget get uri and library stored as properties...
     QVariantMap params;
-    QVariantMap widgetParams;
-
     params.insert(itemIdKey(), entryId);
-
-    if (entryTypeName == widgetTypeName() || entryTypeName == templatedApplicationTypeName()) {
-        params.insert(
-            widgetUriAttributeName(),
-            uri);
-
-        params.insert(
-            widgetLibraryAttributeName(),
-            library);
-
-        params.insert(entryTypeNameKey(), entryTypeName);
-        
-        if (entryTypeName == templatedApplicationTypeName()) {
-            QMapIterator<QString, QString> i(*attributes);
-            while (i.hasNext()) {
-                i.next();
-                QString key(i.key());
-                QString value(i.value());
-                if (key.contains(widgetParam())) {
-                    widgetParams.insert(key,value);
-                }
-            }
-            params.insert(widgetParam(),widgetParams);
-        }
-    }
-
     return new HsMenuEvent(HsMenuEvent::AddToHomeScreen, params);
 }
 
@@ -153,6 +120,16 @@
 }
 
 /*!
+    Creates an HsMenuEvent::OpenApplicationLibrary event.
+
+    \return Open Applications Library event.
+ */
+QEvent *HsMenuEventFactory::createOpenInstalledViewEvent()
+{
+	return new HsMenuEvent(HsMenuEvent::OpenInstalledView);
+}
+
+/*!
     Creates an HsMenuEvent::OpenHomeScreen event.
 
     \return Open HomeScreen event.
@@ -274,6 +251,19 @@
 }
 
 /*!
+    Creates an HsMenuEvent::ShowAppSettings event.
+    \param entryId Id of an item.
+    \return Event for view the Application Settings.
+*/
+QEvent *HsMenuEventFactory::createAppSettingsViewEvent(int entryId)
+{
+    QVariantMap params;
+    params.insert(itemIdKey(), entryId);
+
+    return new HsMenuEvent(HsMenuEvent::ShowAppSettings, params);
+}
+
+/*!
     Creates an HsMenuEvent::Unknown event.
 
     \return Unknown event.