Author: vjrj Date: 2008-09-18 19:24:02 +0200 (Thu, 18 Sep 2008) New Revision: 875 Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java Log: Minor changes Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2008-09-18 15:37:09 UTC (rev 874) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2008-09-18 17:24:02 UTC (rev 875) @@ -118,9 +118,9 @@ private void createActions() { final ActionMenuDescriptor<StateToken> addFolder = createFolderAction(TYPE_FOLDER, "images/nav/folder_add.png", - i18n.t("New folder"), i18n.t("File"), i18n.t("New")); + i18n.t("New folder"), i18n.t("Folder"), i18n.t("New")); final ActionMenuDescriptor<StateToken> addGallery = createFolderAction(TYPE_GALLERY, - "images/nav/gallery_add.png", i18n.t("New gallery"), i18n.t("File"), i18n.t("New")); + "images/nav/gallery_add.png", i18n.t("New gallery"), i18n.t("Folder"), i18n.t("New")); final ActionMenuDescriptor<StateToken> addDoc = new ActionMenuDescriptor<StateToken>(AccessRolDTO.Editor, ActionPosition.topbarAndItemMenu, new Slot<StateToken>() { @@ -137,7 +137,7 @@ } }); addDoc.setTextDescription(i18n.t("New document")); - addDoc.setParentMenuTitle(i18n.t("File")); + addDoc.setParentMenuTitle(i18n.t("Folder")); addDoc.setParentSubMenuTitle(i18n.t("New")); addDoc.setIconUrl("images/nav/page_add.png"); @@ -147,7 +147,7 @@ Site.info("Sorry, in development"); } }); - delContainer.setParentMenuTitle(i18n.t("File")); + delContainer.setParentMenuTitle(i18n.t("Folder")); delContainer.setTextDescription(i18n.t("Delete folder")); delContainer.setMustBeConfirmed(true); delContainer.setConfirmationTitle(i18n.t("Please confirm")); @@ -165,7 +165,7 @@ }); } }); - delContent.setParentMenuTitle(i18n.t("File")); + delContent.setParentMenuTitle(i18n.t("Folder")); delContent.setTextDescription(i18n.t("Delete document")); delContent.setMustBeConfirmed(true); delContent.setConfirmationTitle(i18n.t("Please confirm")); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java 2008-09-18 15:37:09 UTC (rev 874) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java 2008-09-18 17:24:02 UTC (rev 875) @@ -179,15 +179,10 @@ final String menuKey) { final Menu menu = new Menu(); final ToolbarButton toolbarMenu = new ToolbarButton(menuTitle); + toolbarMenu.setMenu(menu); if (iconUrl != null) { toolbarMenu.setIcon(iconUrl); } - toolbarMenu.addListener(new ButtonListenerAdapter() { - @Override - public void onClick(final Button button, final EventObject e) { - menu.showAt(e.getXY()); - } - }); toolbarMenus.put(menuKey, menu); add(barPosition, toolbarMenu); return menu;