Merge branch 'develop' into featSlideVisible

Author: Progi1984

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Bugfix
 - Fixed the image project - @mvargasmoran GH-177
+- PowerPoint2007 Writer : Bugfix for printing slide notes - @JewrassicPark @Progi1984 GH-179
 
 ### Changes
 - PhpOffice\PhpPresentation\Writer\ODPresentation : Move to Design Pattern Decorator - @Progi1984
@@ -22,6 +23,7 @@
 - ODPresentation & PowerPoint2007 & Serialized Writer : Support for Zip Adapter - @Progi1984 GH-176
 - ODPresentation & PowerPoint2007 Writer : language property to TextElement - @skrajewski & @Progi1984 GH-180
 - ODPresentation & PowerPoint2007 Writer : Add Font Support For Chart Axis - @jrking4 GH-186
+- ODPresentation & PowerPoint2007 Writer : Support for video - @Progi1984 GH-123
 - ODPresentation & PowerPoint2007 Writer : Support for Visibility for slides - @Progi1984
 - PowerPoint2007 Writer : Presentation with predefined View Type - @Progi1984 GH-120
 

docs/index.rst

@@ -34,6 +34,7 @@ PHPPresentation is a library written in pure PHP that provides a set of classes
 
    shapes_chart
    shapes_comment
+   shapes_media
    shapes_richtext
    shapes_table
 

docs/shapes.rst

@@ -27,25 +27,11 @@ Example:
 		->setOffsetX(170)
 		->setOffsetY(180);
 
-Rich text
----------
-
-The Rich text has :ref:`its own page <shapes_richtext>`.
-
 Line
 ----
 
 To create a line, use `createLineShape` method of slide.
 
-Chart
------
-
-The Chart has :ref:`its own page <shapes_chart>`.
-
-Comment
--------
-
-The Comment has :ref:`its own page <shapes_comment>`.
 
 Drawing
 -------
@@ -58,8 +44,3 @@ To create a drawing, use `createDrawingShape` method of slide.
 	$drawing->setName('Unique name')
 		->setDescription('Description of the drawing')
 		->setPath('/path/to/drawing.filename');
-		
-Table
------
-
-The Table has :ref:`its own page <shapes_table>`.

docs/shapes_media.rst

@@ -0,0 +1,36 @@
+.. _shapes_table:
+
+Media
+=====
+
+To create a video, create an object `Media`.
+
+Example:
+
+.. code-block:: php
+
+    use PhpOffice\PhpPresentation\Shape\Media;
+
+    $oMedia = new Media();
+    $oMedia->setPath('file.mp4');
+    // $oMedia->setPath('file.ogv');
+    $oSlide->addShape($oMedia);
+
+You can define text and date with setters.
+
+Example:
+
+.. code-block:: php
+
+    use PhpOffice\PhpPresentation\Shape\Media;
+
+    $oMedia = new Media();
+    $oMedia->setName('Name of the Media');
+    $oSlide->addShape($oMedia);
+
+
+Quirks
+------
+
+For PowerPoint2007 Writer, the prefered file format is MP4.
+For ODPresentation Writer, the prefered file format is OGV.

samples/Sample_03_Image.php

@@ -4,6 +4,7 @@
 
 use PhpOffice\PhpPresentation\PhpPresentation;
 use PhpOffice\PhpPresentation\Shape\Drawing;
+use PhpOffice\PhpPresentation\Shape\Media;
 use PhpOffice\PhpPresentation\Shape\MemoryDrawing;
 
 // Create new PHPPresentation object
@@ -24,13 +25,13 @@
 echo date('H:i:s') . ' Add a drawing to the slide'.EOL;
 $shape = new MemoryDrawing();
 $shape->setName('Sample image')
-      ->setDescription('Sample image')
-      ->setImageResource($gdImage)
-      ->setRenderingFunction(MemoryDrawing::RENDERING_JPEG)
-      ->setMimeType(MemoryDrawing::MIMETYPE_DEFAULT)
-      ->setHeight(36)
-      ->setOffsetX(10)
-      ->setOffsetY(10);
+    ->setDescription('Sample image')
+    ->setImageResource($gdImage)
+    ->setRenderingFunction(MemoryDrawing::RENDERING_JPEG)
+    ->setMimeType(MemoryDrawing::MIMETYPE_DEFAULT)
+    ->setHeight(36)
+    ->setOffsetX(10)
+    ->setOffsetY(10);
 $currentSlide->addShape($shape);
 
 // Add a file drawing (GIF) to the slide
@@ -55,6 +56,18 @@
     ->setOffsetY(200);
 $currentSlide->addShape($shape);
 
+// Add a video to the slide
+$shape = new Media();
+$shape->setName('Video')
+    ->setDescription('Video')
+    ->setPath(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' ? './resources/sintel_trailer-480p.mp4' : './resources/sintel_trailer-480p.ogv')
+    ->setResizeProportional(false)
+    ->setHeight(90)
+    ->setWidth(90)
+    ->setOffsetX(10)
+    ->setOffsetY(300);
+$currentSlide->addShape($shape);
+
 // Save file
 echo write($objPHPPresentation, basename(__FILE__, '.php'), $writers);
 if (!CLI) {

samples/Sample_09_SlideNote.php

@@ -11,46 +11,51 @@
 // Create new PHPPresentation object
 echo date('H:i:s') . ' Create new PHPPresentation object' . EOL;
 $objPHPPresentation = new PhpPresentation();
+$oLayout = $objPHPPresentation->getLayout();
 
 // Set properties
 echo date('H:i:s') . ' Set properties' . EOL;
-$objPHPPresentation->getProperties()->setCreator('PHPOffice')->setLastModifiedBy('PHPPresentation Team')->setTitle('Sample 01 Title')->setSubject('Sample 01 Subject')->setDescription('Sample 01 Description')->setKeywords('office 2007 openxml libreoffice odt php')->setCategory('Sample Category');
+$objPHPPresentation->getDocumentProperties()->setCreator('PHPOffice')->setLastModifiedBy('PHPPresentation Team')->setTitle('Sample 01 Title')->setSubject('Sample 01 Subject')->setDescription('Sample 01 Description')->setKeywords('office 2007 openxml libreoffice odt php')->setCategory('Sample Category');
 
 // Create slide
 echo date('H:i:s') . ' Create slide' . EOL;
 $currentSlide = $objPHPPresentation->getActiveSlide();
 
 // Create a shape (drawing)
-echo date('H:i:s') . ' Create a shape (drawing)'.EOL;
+echo date('H:i:s') . ' Create a shape (drawing)' . EOL;
 $shape = $currentSlide->createDrawingShape();
 $shape->setName('PHPPresentation logo')
-->setDescription('PHPPresentation logo')
-->setPath('./resources/phppowerpoint_logo.gif')
-->setHeight(36)
-->setOffsetX(10)
-->setOffsetY(10);
+    ->setDescription('PHPPresentation logo')
+    ->setPath('./resources/phppowerpoint_logo.gif')
+    ->setHeight(36)
+    ->setOffsetX(10)
+    ->setOffsetY(10);
 $shape->getShadow()->setVisible(true)
-->setDirection(45)
-->setDistance(10);
+    ->setDirection(45)
+    ->setDistance(10);
 $shape->getHyperlink()->setUrl('https://github.com/PHPOffice/PHPPresentation/')->setTooltip('PHPPresentation');
 
 // Create a shape (text)
-echo date('H:i:s') . ' Create a shape (rich text)'.EOL;
+echo date('H:i:s') . ' Create a shape (rich text)' . EOL;
 $shape = $currentSlide->createRichTextShape()
     ->setHeight(300)
     ->setWidth(600)
     ->setOffsetX(170)
     ->setOffsetY(180);
-$shape->getActiveParagraph()->getAlignment()->setHorizontal( Alignment::HORIZONTAL_CENTER );
+$shape->getActiveParagraph()->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER);
 $textRun = $shape->createTextRun('Thank you for using PHPPresentation!');
 $textRun->getFont()->setBold(true)
-->setSize(60)
-->setColor( new Color( 'FFE06B20' ) );
+    ->setSize(60)
+    ->setColor(new Color('FFE06B20'));
 
 // Set Note
 echo date('H:i:s') . ' Set Note' . EOL;
 $oNote = $currentSlide->getNote();
-$oRichText = $oNote->createRichTextShape()->setHeight(300)->setWidth(600)->setOffsetX(170)->setOffsetY(180);;
+$oRichText = $oNote->createRichTextShape()
+    ->setHeight($oLayout->getCY($oLayout::UNIT_PIXEL))
+    ->setWidth($oLayout->getCX($oLayout::UNIT_PIXEL))
+    ->setOffsetX(170)
+    ->setOffsetY(180);
 $oRichText->createTextRun('A class library');
 $oRichText->createParagraph()->createTextRun('Written in PHP');
 $oRichText->createParagraph()->createTextRun('Representing a presentation');
@@ -59,5 +64,5 @@
 // Save file
 echo write($objPHPPresentation, basename(__FILE__, '.php'), $writers);
 if (!CLI) {
-	include_once 'Sample_Footer.php';
+    include_once 'Sample_Footer.php';
 }

samples/resources/sintel_trailer-480p.mp4

@@ -0,0 +1,27 @@
+<?php
+/**
+ * This file is part of PHPPresentation - A pure PHP library for reading and writing
+ * presentations documents.
+ *
+ * PHPPresentation is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPPresentation/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPPresentation
+ * @copyright   2009-2015 PHPPresentation contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpPresentation\Shape;
+
+use PhpOffice\PhpPresentation\ComparableInterface;
+
+/**
+ * Media element
+ */
+class Media extends Drawing implements ComparableInterface
+{
+}