From 6a0cbd243b3656e045c4b5860d6735b3e7fe066d Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Mon, 9 May 2011 12:50:54 +0200
Subject: [PATCH] Removed PDF option in printing configuration dialog.

FEA: ItEr74S05PrintingSupportItEr73S05
---
 .../FunctionalityExposedForExtensions.java    |  6 +-
 .../webapp/planner/print_configuration.zul    | 70 +++++--------------
 2 files changed, 17 insertions(+), 59 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
index 029d21697..978bde49d 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
@@ -60,7 +60,6 @@ import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.Button;
 import org.zkoss.zul.Checkbox;
-import org.zkoss.zul.Radiogroup;
 import org.zkoss.zul.Window;
 
 public class FunctionalityExposedForExtensions<T> implements IContext<T> {
@@ -474,7 +473,6 @@ public class FunctionalityExposedForExtensions<T> implements IContext<T> {
     private HashMap<String, String> buildParameters(Component parent) {
         HashMap<String, String> parameters = new HashMap<String, String>();
 
-        Radiogroup layout = (Radiogroup) parent.getFellow("print_layout");
         Checkbox expanded = (Checkbox) parent.getFellow("print_expanded");
         Checkbox resources = (Checkbox) parent.getFellow("print_resources");
         Checkbox labels = (Checkbox) parent.getFellow("print_labels");
@@ -482,9 +480,7 @@ public class FunctionalityExposedForExtensions<T> implements IContext<T> {
         Checkbox reportedHours = (Checkbox) parent
                 .getFellow("print_reported_hours");
 
-        if (layout.getSelectedIndex() == 2) {
-            parameters.put("extension", ".png");
-        }
+        parameters.put("extension", ".png");
         if (expanded.isChecked() == true) {
             parameters.put("expanded", "all");
         }
diff --git a/navalplanner-webapp/src/main/webapp/planner/print_configuration.zul b/navalplanner-webapp/src/main/webapp/planner/print_configuration.zul
index 07e094f16..d5161b79c 100644
--- a/navalplanner-webapp/src/main/webapp/planner/print_configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/print_configuration.zul
@@ -25,60 +25,22 @@
 
     <window border="normal" title="${i18n:_('Print configuration')}"
         closable="true" id="printConfigurationWindow">
-        <panel title="${i18n:_('Select print page properties')}"
-            border="normal" style="margin-bottom:10px;">
-            <panelchildren>
-                <groupbox>
-                    <caption label="${i18n:_('Print layout')}" />
-                    <radiogroup id="print_layout"
-                        onCheck="choice.value = self.selectedItem.label">
-                        <radio label="${i18n:_('PDF')}"
-                            selected="true" />
-                        <radio label="${i18n:_('Landscape')}" disabled="true" visible="false" />
-                        <radio label="${i18n:_('Single image')}" />
-                    </radiogroup>
-                </groupbox>
-                <groupbox visible="false">
-                    <caption label="${i18n:_('Paper size')}" />
-                    <radiogroup id="print_paper_size"
-                        onCheck="choice.value = self.selectedItem.label">
-                        <radio label="${i18n:_('A4')}" selected="true" />
-                        <radio label="${i18n:_('A3')}" disabled="true" />
-                        <radio label="${i18n:_('A2')}" disabled="true" />
-                        <radio label="${i18n:_('A1')}" disabled="true" />
-                    </radiogroup>
-                </groupbox>
-                <groupbox visible="false">
-                    <caption label="${i18n:_('Zoom level')}" />
-                    <radiogroup id="print_zoom_level"
-                        onCheck="choice.value = self.selectedItem.label">
-                        <radio label="${i18n:_('Year')}" selected="true" />
-                        <radio label="${i18n:_('Quarter')}" />
-                        <radio label="${i18n:_('Month')}" />
-                        <radio label="${i18n:_('Week')}" />
-                        <radio label="${i18n:_('Day')}" />
-                    </radiogroup>
-                </groupbox>
-            </panelchildren>
-        </panel>
-        <panel title="${i18n:_('Select print visualization options')}"
-            border="normal" style="margin-bottom:10px;">
-            <panelchildren>
-                <vbox>
-                    <checkbox id="print_labels" label="${i18n:_('Show all labels')}" checked="true" />
-                    <checkbox id="print_resources"
-                        label="${i18n:_('Show all resource assignments')}" checked="true"  />
-                    <checkbox id="print_expanded"
-                        label="${i18n:_('Expand all taskgroups')}" checked="true"  />
-                    <checkbox id="print_shrinked"
-                        label="${i18n:_('Shrink to fit page width')}" checked="true" disabled="true" visible="false"/>
-                    <checkbox id="print_advances"
-                        label="${i18n:_('Show all progress')}" checked="true"/>
-                    <checkbox id="print_reported_hours"
-                        label="${i18n:_('Show all reported hours')}" checked="true"/>
-                </vbox>
-            </panelchildren>
-        </panel>
+        <groupbox>
+            <caption label="${i18n:_('Export options')}" />
+            <vbox>
+                <checkbox id="print_labels" label="${i18n:_('Show labels')}" checked="true" />
+                <checkbox id="print_resources"
+                    label="${i18n:_('Show resource assignments')}" checked="true"  />
+                <checkbox id="print_expanded"
+                    label="${i18n:_('Expand taskgroups')}" checked="true"  />
+                <checkbox id="print_shrinked"
+                    label="${i18n:_('Shrink to fit page width')}" checked="true" disabled="true" visible="false"/>
+                <checkbox id="print_advances"
+                    label="${i18n:_('Show progress')}" checked="true"/>
+                <checkbox id="print_reported_hours"
+                    label="${i18n:_('Show all reported hours')}" checked="true"/>
+            </vbox>
+        </groupbox>
         <button id="printButton" label="${i18n:_('Print')}" sclass="save-button global-action"></button>
         <button id="cancelPrintButton" label="${i18n:_('Cancel')}" sclass="cancel-button global-action" onClick="printConfigurationWindow.detach()"/>
     </window>