Bug 516453 - [Print] Support configuration to specify default print page

orientation

Change-Id: Ibe90961ebffb201fedd9bf8f38994dcce54330f2
Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com>

14 files changed, 39 insertions, 23 deletions

diff --git a/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml
index b5beeb4d..b6035c43 100644
--- a/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.core.feature"
       label="NatTable Core Feature"
-      version="1.5.0.qualifier">
+      version="1.6.0.qualifier">
 
    <description url="http://nattable.org">
       NatTable Core
diff --git a/org.eclipse.nebula.widgets.nattable.core.source.feature/feature.xml b/org.eclipse.nebula.widgets.nattable.core.source.feature/feature.xml
index e47143c1..5641cf65 100644
--- a/org.eclipse.nebula.widgets.nattable.core.source.feature/feature.xml
+++ b/org.eclipse.nebula.widgets.nattable.core.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.nebula.widgets.nattable.core.source.feature"
       label="NatTable Core Source Feature"
-      version="1.5.0.qualifier">
+      version="1.6.0.qualifier">
 
    <description url="http://nattable.org">
       NatTable Core Source
diff --git a/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF
index 9a2694ae..6b66ceb3 100644
--- a/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable Core Tests
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.core.tests
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.6.0.qualifier
 Fragment-Host: org.eclipse.nebula.widgets.nattable.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.core.commands.common,
diff --git a/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
index c19e7fc8..597343e2 100644
--- a/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable Core
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.core
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.6.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Eclipse-ExtensibleAPI: true
 Export-Package: org.eclipse.nebula.widgets.nattable;version="1.5.0",
@@ -98,10 +98,10 @@ Export-Package: org.eclipse.nebula.widgets.nattable;version="1.5.0",
  org.eclipse.nebula.widgets.nattable.persistence;version="1.5.0",
  org.eclipse.nebula.widgets.nattable.persistence.command;version="1.5.0",
  org.eclipse.nebula.widgets.nattable.persistence.gui;version="1.5.0",
- org.eclipse.nebula.widgets.nattable.print;version="1.5.0",
+ org.eclipse.nebula.widgets.nattable.print;version="1.6.0",
  org.eclipse.nebula.widgets.nattable.print.action;version="1.5.0",
  org.eclipse.nebula.widgets.nattable.print.command;version="1.5.0",
- org.eclipse.nebula.widgets.nattable.print.config;version="1.5.0",
+ org.eclipse.nebula.widgets.nattable.print.config;version="1.6.0",
  org.eclipse.nebula.widgets.nattable.reorder;version="1.5.0",
  org.eclipse.nebula.widgets.nattable.reorder.action;version="1.5.0",
  org.eclipse.nebula.widgets.nattable.reorder.command;version="1.5.0",
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/print/LayerPrinter.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/print/LayerPrinter.java
index b42dbbac..c29f7528 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/print/LayerPrinter.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/print/LayerPrinter.java
@@ -632,6 +632,14 @@ public class LayerPrinter {
         printDialog.setStartPage(1);
         printDialog.setScope(PrinterData.ALL_PAGES);
 
+        Integer orientation = this.printTargets.get(0).configRegistry.getConfigAttribute(
+                PrintConfigAttributes.DEFAULT_PAGE_ORIENTATION,
+                DisplayMode.NORMAL);
+
+        if (orientation != null) {
+            printDialog.getPrinterData().orientation = orientation;
+        }
+
         if (this.calculatePageCount) {
             // if pre-rendering is enabled, render in-memory to
             // trigger content based auto-resizing
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/print/config/PrintConfigAttributes.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/print/config/PrintConfigAttributes.java
index 5d3b21d0..2800a753 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/print/config/PrintConfigAttributes.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/print/config/PrintConfigAttributes.java
@@ -80,4 +80,13 @@ public interface PrintConfigAttributes {
      * total page count, e.g. <i>Page {0}/{1}</i> to show <i>Page 1/6</i>
      */
     ConfigAttribute<String> FOOTER_PAGE_PATTERN = new ConfigAttribute<String>();
+
+    /**
+     * Configuration attribute to configure the default orientation of the paper
+     * that should be applied to the PrintDialog. Can be either
+     * PrinterData#PORTRAIT or PrinterData#LANDSCAPE.
+     * 
+     * @since 1.6
+     */
+    ConfigAttribute<Integer> DEFAULT_PAGE_ORIENTATION = new ConfigAttribute<Integer>();
 }
diff --git a/org.eclipse.nebula.widgets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product b/org.eclipse.nebula.widgets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product
index f0efc52f..be82596a 100644
--- a/org.eclipse.nebula.widgets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product
+++ b/org.eclipse.nebula.widgets.nattable.examples.e4.product/org.eclipse.nebula.widgets.nattable.examples.e4.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="org.eclipse.nebula.widgets.nattable.examples.e4" uid="org.eclipse.nebula.widgets.nattable.examples.e4.product" id="org.eclipse.nebula.widgets.nattable.examples.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="org.eclipse.nebula.widgets.nattable.examples.e4" uid="org.eclipse.nebula.widgets.nattable.examples.e4.product" id="org.eclipse.nebula.widgets.nattable.examples.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -14,7 +14,6 @@
    <windowImages i16="/org.eclipse.nebula.widgets.nattable.examples.e4/icons/nebula_logo_16.png" i32="/org.eclipse.nebula.widgets.nattable.examples.e4/icons/nebula_logo_32.png" i64="/org.eclipse.nebula.widgets.nattable.examples.e4/icons/nebula_logo_64.png"/>
 
    <launcher name="nattable_examples">
-      <solaris/>
       <win useIco="false">
          <bmp/>
       </win>
@@ -30,7 +29,7 @@
       <feature id="org.eclipse.emf.ecore"/>
       <feature id="org.eclipse.emf.common"/>
       <feature id="org.eclipse.nebula.widgets.nattable.examples.e4.rcp.feature" version="1.0.0.qualifier"/>
-      <feature id="org.eclipse.nebula.widgets.nattable.core.feature" version="1.5.0.qualifier"/>
+      <feature id="org.eclipse.nebula.widgets.nattable.core.feature" version="1.6.0.qualifier"/>
       <feature id="org.eclipse.nebula.widgets.nattable.extension.e4.feature" version="1.1.0.qualifier"/>
       <feature id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature" version="1.5.0.qualifier"/>
       <feature id="org.eclipse.nebula.widgets.nattable.examples.e4.feature" version="1.5.0.qualifier"/>
diff --git a/org.eclipse.nebula.widgets.nattable.examples.e4.product/pom.xml b/org.eclipse.nebula.widgets.nattable.examples.e4.product/pom.xml
index ed52cce6..44cd0909 100644
--- a/org.eclipse.nebula.widgets.nattable.examples.e4.product/pom.xml
+++ b/org.eclipse.nebula.widgets.nattable.examples.e4.product/pom.xml
@@ -8,7 +8,7 @@
   <parent>
 		<artifactId>parent</artifactId>
 		<groupId>org.eclipse.nebula.widgets.nattable</groupId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.6.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
   </parent>
 
diff --git a/org.eclipse.nebula.widgets.nattable.examples/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.examples/META-INF/MANIFEST.MF
index e6fee7e6..27dc9eb2 100644
--- a/org.eclipse.nebula.widgets.nattable.examples/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable Examples
 Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.examples
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.6.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: ca.odell.glazedlists;bundle-version="1.9.0",
  org.eclipse.swt;bundle-version="3.5.1",
diff --git a/org.eclipse.nebula.widgets.nattable.examples/pom.xml b/org.eclipse.nebula.widgets.nattable.examples/pom.xml
index cfb06e87..089749e5 100644
--- a/org.eclipse.nebula.widgets.nattable.examples/pom.xml
+++ b/org.eclipse.nebula.widgets.nattable.examples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.nebula.widgets.nattable</groupId>
     <artifactId>parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/org.eclipse.nebula.widgets.nattable.updatesite/category.xml b/org.eclipse.nebula.widgets.nattable.updatesite/category.xml
index 733cf68a..26884742 100644
--- a/org.eclipse.nebula.widgets.nattable.updatesite/category.xml
+++ b/org.eclipse.nebula.widgets.nattable.updatesite/category.xml
@@ -6,12 +6,6 @@
    <feature url="features/org.eclipse.nebula.widgets.nattable.extension.poi.source.feature_1.5.0.qualifier.jar" id="org.eclipse.nebula.widgets.nattable.extension.poi.source.feature" version="1.5.0.qualifier">
       <category name="nattable-extensions"/>
    </feature>
-   <feature url="features/org.eclipse.nebula.widgets.nattable.core.feature_1.5.0.qualifier.jar" id="org.eclipse.nebula.widgets.nattable.core.feature" version="1.5.0.qualifier">
-      <category name="nattable-core"/>
-   </feature>
-   <feature url="features/org.eclipse.nebula.widgets.nattable.core.source.feature_1.5.0.qualifier.jar" id="org.eclipse.nebula.widgets.nattable.core.source.feature" version="1.5.0.qualifier">
-      <category name="nattable-core"/>
-   </feature>
    <feature url="features/org.eclipse.nebula.widgets.nattable.extension.nebula.feature_1.1.0.qualifier.jar" id="org.eclipse.nebula.widgets.nattable.extension.nebula.feature" version="1.1.0.qualifier">
       <category name="nattable-extensions"/>
    </feature>
@@ -30,6 +24,12 @@
    <feature url="features/org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature_1.5.0.qualifier.jar" id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature" version="1.5.0.qualifier">
       <category name="nattable-extensions"/>
    </feature>
+   <feature url="features/org.eclipse.nebula.widgets.nattable.core.feature_1.6.0.qualifier.jar" id="org.eclipse.nebula.widgets.nattable.core.feature" version="1.6.0.qualifier">
+      <category name="nattable-core"/>
+   </feature>
+   <feature url="features/org.eclipse.nebula.widgets.nattable.core.source.feature_1.6.0.qualifier.jar" id="org.eclipse.nebula.widgets.nattable.core.source.feature" version="1.6.0.qualifier">
+      <category name="nattable-core"/>
+   </feature>
    <category-def name="nattable-core" label="NatTable Core">
       <description>
          NatTable Core plugin
diff --git a/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml b/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml
index 33b2f71f..f06fc5ef 100644
--- a/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml
+++ b/org.eclipse.nebula.widgets.nattable.updatesite/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<groupId>org.eclipse.nebula.widgets.nattable</groupId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.6.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 16f72cf8..cd5e8290 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.eclipse.nebula.widgets.nattable</groupId>
 	<artifactId>parent</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+	<version>1.6.0-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
 
@@ -45,9 +45,9 @@
 	</modules>
 
 	<properties>
-		<tycho-version>0.25.0</tycho-version>
+		<tycho-version>1.0.0</tycho-version>
         <cbi-version>1.0.5</cbi-version>
-        <nattable-version>1.5.0-SNAPSHOT</nattable-version>
+        <nattable-version>1.6.0-SNAPSHOT</nattable-version>
 	</properties>
 
   <pluginRepositories>
diff --git a/target-platform/pom.xml b/target-platform/pom.xml
index 2de7659e..7d01ec50 100644
--- a/target-platform/pom.xml
+++ b/target-platform/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.nebula.widgets.nattable</groupId>
     <artifactId>parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>