From b463c5f93117d960d9c1b8b0ca05651eba8002a6 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Mon, 28 Dec 2009 19:17:57 +0100
Subject: [PATCH]  ItEr41S16ImplantacionAplicacionItEr40S21: Combo for change
 the zoom already added to resources load and advance allocation.

---
 .../zkoss/ganttz/resourceload/ResourcesLoadPanel.java | 11 +++++++++++
 .../resources/web/ganttz/zul/resourcesLoadLayout.zul  | 10 ++++++----
 .../allocation/AdvancedAllocationController.java      | 10 ++++++++++
 .../src/main/webapp/planner/advance_allocation.zul    | 10 ++++++----
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
index dafd1fa49..bc714cd52 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
@@ -26,6 +26,7 @@ import org.zkoss.ganttz.data.resourceload.LoadTimeLine;
 import org.zkoss.ganttz.data.resourceload.LoadTimelinesGroup;
 import org.zkoss.ganttz.timetracker.TimeTracker;
 import org.zkoss.ganttz.timetracker.TimeTrackerComponent;
+import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
 import org.zkoss.ganttz.util.ComponentsFinder;
 import org.zkoss.ganttz.util.MutableTreeModel;
 import org.zkoss.ganttz.util.OnZKDesktopRegistry;
@@ -37,7 +38,9 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.Button;
+import org.zkoss.zul.ListModel;
 import org.zkoss.zul.Separator;
+import org.zkoss.zul.SimpleListModel;
 
 public class ResourcesLoadPanel extends HtmlMacroComponent {
 
@@ -70,6 +73,14 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
         registerNeededScripts();
     }
 
+    public ListModel getZoomLevels() {
+        return new SimpleListModel(ZoomLevel.values());
+    }
+
+    public void setZoomLevel(final ZoomLevel zoomLevel) {
+        timeTracker.setZoomLevel(zoomLevel);
+    }
+
     public void zoomIncrease() {
         timeTracker.zoomIncrease();
     }
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
index 364accf61..9aa765920 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
@@ -32,10 +32,12 @@ resourcesLoadPanel = self;
        <north height="30px" border="0">
        <hbox align="center" id="toolbar">
         <separator/>
-        <button onClick="resourcesLoadPanel.zoomIncrease();" class="planner-icon"
-            image="/common/img/zoom_in.png" tooltiptext="${i18n:_('Zoom increase')}" />
-        <button onClick="resourcesLoadPanel.zoomDecrease();" class="planner-icon"
-            image="/common/img/zoom_out.png" tooltiptext="${i18n:_('Zoom decrease')}" />
+        <label>${i18n:_('Zoom level')}:</label>
+        <listbox mold="select" rows="1"
+            model="${resourcesLoadPanel.zoomLevels}"
+            onSelect="resourcesLoadPanel.setZoomLevel(self.selectedItem.value);" >
+        </listbox>
+        <separator/>
         From: <datebox /> to: <datebox />
         <separator/>
         Filter:
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
index ceacbd5fb..9834bf62d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
@@ -78,7 +78,9 @@ import org.zkoss.zul.Grid;
 import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Intbox;
 import org.zkoss.zul.Label;
+import org.zkoss.zul.ListModel;
 import org.zkoss.zul.Messagebox;
+import org.zkoss.zul.SimpleListModel;
 import org.zkoss.zul.api.Column;
 import org.zkoss.zul.api.Window;
 
@@ -461,6 +463,14 @@ public class AdvancedAllocationController extends GenericForwardComposer {
         }
     }
 
+    public ListModel getZoomLevels() {
+        return new SimpleListModel(ZoomLevel.values());
+    }
+
+    public void setZoomLevel(final ZoomLevel zoomLevel) {
+        timeTracker.setZoomLevel(zoomLevel);
+    }
+
     public void onClick$zoomIncrease() {
         timeTracker.zoomIncrease();
     }
diff --git a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
index 10f9b09a9..aea3c73fd 100644
--- a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul
@@ -33,10 +33,12 @@
         <button label="${i18n:_('Accept')}" id="acceptButton" class="planner-command" />
         <button label="${i18n:_('Cancel')}" id="cancelButton" class="planner-command" />
         <separator/>
-        <button class="planner-icon" id="zoomIncrease"
-            image="/common/img/zoom_in.png" tooltiptext="${i18n:_('Zoom increase')}" />
-        <button class="planner-icon" id="zoomDecrease"
-            image="/common/img/zoom_out.png" tooltiptext="${i18n:_('Zoom decrease')}"/>
+        <label>${i18n:_('Zoom level')}:</label>
+        <listbox mold="select" rows="1"
+            model="${advancedAllocationController.zoomLevels}"
+            onSelect="advancedAllocationController.setZoomLevel(self.selectedItem.value);" >
+        </listbox>
+        <separator/>
         <div id="messages" />
        </hbox>
        </north>