diff --git a/applets/kicker/package/contents/code/tools.js b/applets/kicker/package/contents/code/tools.js --- a/applets/kicker/package/contents/code/tools.js +++ b/applets/kicker/package/contents/code/tools.js @@ -19,11 +19,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * ***************************************************************************/ -function fillActionMenu(actionMenu, actionList, favoriteModel, favoriteId) { +.pragma library + +function fillActionMenu(i18n, actionMenu, actionList, favoriteModel, favoriteId) { // Accessing actionList can be a costly operation, so we don't // access it until we need the menu. - var actions = createFavoriteActions(favoriteModel, favoriteId); + var actions = createFavoriteActions(i18n, favoriteModel, favoriteId); if (actions) { if (actionList && actionList.length > 0) { @@ -39,7 +41,7 @@ actionMenu.actionList = actionList; } -function createFavoriteActions(favoriteModel, favoriteId) { +function createFavoriteActions(i18n, favoriteModel, favoriteId) { if (favoriteModel === null || !favoriteModel.enabled || favoriteId == null) { return null; } diff --git a/applets/kicker/package/contents/ui/DashboardRepresentation.qml b/applets/kicker/package/contents/ui/DashboardRepresentation.qml --- a/applets/kicker/package/contents/ui/DashboardRepresentation.qml +++ b/applets/kicker/package/contents/ui/DashboardRepresentation.qml @@ -907,7 +907,7 @@ onAboutToShowActionMenu: { var actionList = hasActionList ? model.actionList : []; - Tools.fillActionMenu(actionMenu, actionList, ListView.view.model.favoritesModel, model.favoriteId); + Tools.fillActionMenu(i18n, actionMenu, actionList, ListView.view.model.favoritesModel, model.favoriteId); } onActionTriggered: { diff --git a/applets/kicker/package/contents/ui/ItemGridDelegate.qml b/applets/kicker/package/contents/ui/ItemGridDelegate.qml --- a/applets/kicker/package/contents/ui/ItemGridDelegate.qml +++ b/applets/kicker/package/contents/ui/ItemGridDelegate.qml @@ -45,7 +45,7 @@ function openActionMenu(x, y) { var actionList = hasActionList ? model.actionList : []; - Tools.fillActionMenu(actionMenu, actionList, GridView.view.model.favoritesModel, model.favoriteId); + Tools.fillActionMenu(i18n, actionMenu, actionList, GridView.view.model.favoritesModel, model.favoriteId); actionMenu.visualParent = item; actionMenu.open(x, y); } diff --git a/applets/kicker/package/contents/ui/ItemListDelegate.qml b/applets/kicker/package/contents/ui/ItemListDelegate.qml --- a/applets/kicker/package/contents/ui/ItemListDelegate.qml +++ b/applets/kicker/package/contents/ui/ItemListDelegate.qml @@ -53,7 +53,7 @@ onAboutToShowActionMenu: { var actionList = hasActionList ? model.actionList : []; - Tools.fillActionMenu(actionMenu, actionList, ListView.view.model.favoritesModel, model.favoriteId); + Tools.fillActionMenu(i18n, actionMenu, actionList, ListView.view.model.favoritesModel, model.favoriteId); } onActionTriggered: { diff --git a/applets/kicker/package/contents/ui/SideBarItem.qml b/applets/kicker/package/contents/ui/SideBarItem.qml --- a/applets/kicker/package/contents/ui/SideBarItem.qml +++ b/applets/kicker/package/contents/ui/SideBarItem.qml @@ -39,7 +39,7 @@ onAboutToShowActionMenu: { var actionList = (model.hasActionList != null) ? model.actionList : []; - Tools.fillActionMenu(actionMenu, actionList, repeater.model, model.favoriteId); + Tools.fillActionMenu(i18n, actionMenu, actionList, repeater.model, model.favoriteId); } onActionTriggered: { diff --git a/applets/kickoff/package/contents/code/tools.js b/applets/kickoff/package/contents/code/tools.js --- a/applets/kickoff/package/contents/code/tools.js +++ b/applets/kickoff/package/contents/code/tools.js @@ -19,11 +19,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * ***************************************************************************/ -function fillActionMenu(actionMenu, actionList, favoriteModel, favoriteId) { +.pragma library + +function fillActionMenu(i18n, actionMenu, actionList, favoriteModel, favoriteId) { // Accessing actionList can be a costly operation, so we don't // access it until we need the menu. - var actions = createFavoriteActions(favoriteModel, favoriteId); + var actions = createFavoriteActions(i18n, favoriteModel, favoriteId); if (actions) { if (actionList && actionList.length > 0) { @@ -39,7 +41,7 @@ actionMenu.actionList = actionList; } -function createFavoriteActions(favoriteModel, favoriteId) { +function createFavoriteActions(i18n, favoriteModel, favoriteId) { if (favoriteModel === null || !favoriteModel.enabled || favoriteId == null) { return null; } diff --git a/applets/kickoff/package/contents/ui/KickoffItem.qml b/applets/kickoff/package/contents/ui/KickoffItem.qml --- a/applets/kickoff/package/contents/ui/KickoffItem.qml +++ b/applets/kickoff/package/contents/ui/KickoffItem.qml @@ -50,7 +50,7 @@ onAboutToShowActionMenu: { var actionList = hasActionList ? model.actionList : []; - Tools.fillActionMenu(actionMenu, actionList, ListView.view.model.favoritesModel, model.favoriteId); + Tools.fillActionMenu(i18n, actionMenu, actionList, ListView.view.model.favoritesModel, model.favoriteId); } onActionTriggered: {