Author: vjrj_ Date: 2011-12-21 18:45:17 +0100 (Wed, 21 Dec 2011) New Revision: 1646 Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java Log: calendar updated Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java 2011-12-21 16:48:51 UTC (rev 1645) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java 2011-12-21 17:45:17 UTC (rev 1646) @@ -98,6 +98,10 @@ return (Boolean) super.getValue(MENU_STANDALONE); } + public void setMenuPosition(final Position position) { + putValue(MENU_SHOW_NEAR_TO, position); + } + public void setRightIcon(final ImageResource icon) { putValue(MENU_RIGHTICON, icon); } @@ -118,6 +122,13 @@ } /** + * Show the menu (remember to set the menu position before) + */ + public void show() { + putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); + } + + /** * Show the menu near the Element object specified * * @param object @@ -125,7 +136,7 @@ */ public void show(final Object object) { putValue(MENU_SHOW_NEAR_TO, object); - putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); + show(); } /** @@ -135,8 +146,8 @@ * the position to show menu near of it */ public void show(final Position position) { - putValue(MENU_SHOW_NEAR_TO, position); - putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); + setMenuPosition(position); + show(); } /** @@ -147,6 +158,6 @@ */ public void show(final String id) { putValue(MENU_SHOW_NEAR_TO, id); - putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); + show(); } } Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2011-12-21 16:48:51 UTC (rev 1645) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2011-12-21 17:45:17 UTC (rev 1646) @@ -6,6 +6,7 @@ import cc.kune.common.client.actions.ui.descrip.Position; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.tooltip.Tooltip; import cc.kune.core.shared.dto.HasContent; import cc.kune.events.client.actions.CalendarOnOverMenu; import cc.kune.gspace.client.viewers.AbstractFolderViewerView; @@ -37,6 +38,7 @@ import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.datepicker.client.CalendarUtil; import com.google.inject.Inject; import com.gwtplatform.mvp.client.Presenter; @@ -108,19 +110,24 @@ appToEdit = NO_APPOINT; onOverDate = event.getTarget(); updateMenuItems(); + showMenu(); } }); getView().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { - onOverMenu.get().show(new Position(event.getClientX(), event.getClientY())); + setMenuPosition(event.getClientX(), event.getClientY()); } + }); getView().addMouseOverHandler(new MouseOverHandler<Appointment>() { @Override public void onMouseOver(final MouseOverEvent<Appointment> event) { NotifyUser.info("on mouse over"); - // Tooltip.to((Widget) event.getSource(), "kk"); + // final Element element = (Element) event.getElement(); + // showMenu(element.getAbsoluteLeft() + 10, element.getAbsoluteTop() + + // 10); + Tooltip.to((Widget) event.getElement(), "kk"); // final Tooltip tooltip = new Tooltip(); // tooltip.setText("lalala"); // tooltip.setPopupPosition(, currentDaysView) @@ -146,6 +153,7 @@ onOverDate = event.getSelectedItem().getStart(); NotifyUser.info("on selection"); updateMenuItems(); + showMenu(); // getView().removeAppointment(event.getSelectedItem()); } }); @@ -220,6 +228,10 @@ getView().setDate(date); } + private void setMenuPosition(final int x, final int y) { + onOverMenu.get().setMenuPosition(new Position(x, y)); + } + @Override public void setView(final CalendarViews calView) { setViewImpl(calView); @@ -242,6 +254,10 @@ getView().setView(calView, days); } + private void showMenu() { + onOverMenu.get().show(); + } + private void updateMenuItems() { CalendarStateChangeEvent.fire(getEventBus()); }