[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kpresenter/part
From:       Martin Pfeiffer <hubipete () gmx ! net>
Date:       2007-11-01 14:30:59
Message-ID: 1193927459.311513.10288.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 731675 by mpfeiffer:

* add an effect docker
* simple GUI atm - implementation will follow


 M  +2 -0      CMakeLists.txt  
 M  +11 -5     KPrView.cpp  
 M  +4 -4      KPrViewModePresentation.cpp  
 A             dockers (directory)  
 A             dockers/KPrPageEffectDocker.cpp   [License: LGPL (v2+)]
 A             dockers/KPrPageEffectDocker.h   [License: LGPL (v2+)]
 A             dockers/KPrPageEffectDockerFactory.cpp   [License: LGPL (v2+)]
 A             dockers/KPrPageEffectDockerFactory.h   [License: LGPL (v2+)]


--- trunk/koffice/kpresenter/part/CMakeLists.txt #731674:731675
@@ -27,6 +27,8 @@
      KPrShapeApplicationData.cpp
      commands/KPrAnimationCreateCommand.cpp
      commands/KPrPageEffectSetCommand.cpp
+     dockers/KPrPageEffectDockerFactory.cpp
+     dockers/KPrPageEffectDocker.cpp
      pageeffects/KPrPageEffectRunner.cpp
      pageeffects/KPrPageEffect.cpp
      pageeffects/KPrCoverDownEffect.cpp
--- trunk/koffice/kpresenter/part/KPrView.cpp #731674:731675
@@ -35,6 +35,8 @@
 #include "commands/KPrAnimationCreateCommand.h"
 #include "commands/KPrPageEffectSetCommand.h"
 #include "pageeffects/KPrCoverDownEffect.h"
+#include "dockers/KPrPageEffectDocker.h"
+#include "dockers/KPrPageEffectDockerFactory.h"
 #include "shapeanimations/KPrAnimationMoveAppear.h"
 
 KPrView::KPrView( KPrDocument *document, QWidget *parent )
@@ -42,6 +44,7 @@
 , m_presentationMode( new KPrViewModePresentation( this, m_canvas ))
 , m_normalMode( 0 )
 {
+    initGUI();
     initActions();
 }
 
@@ -58,9 +61,12 @@
 }
 
 void KPrView::initGUI()
-{
-    // KoPAView::initGUI();
-    // do special kpresenter stuff here
+{ 
+    // add page effect docker to the main window
+    KPrPageEffectDockerFactory factory;
+    KPrPageEffectDocker* docker;
+    docker = qobject_cast<KPrPageEffectDocker*>( createDockWidget( &factory ) );
+    docker->setView( this );
 }
 
 void KPrView::initActions()
@@ -111,7 +117,7 @@
 
 void KPrView::createPageEffect()
 {
-    // this does not work n master pages
+    // this does not work in master pages
     if ( dynamic_cast<KPrPage *>( activePage() ) ) {
         KPrPageEffectSetCommand * command = new KPrPageEffectSetCommand( \
activePage(), new KPrCoverDownEffect() );  m_canvas->addCommand( command );
@@ -120,7 +126,7 @@
 
 void KPrView::deletePageEffect()
 {
-    // this does not work n master pages
+    // this does not work in master pages
     if ( dynamic_cast<KPrPage *>( activePage() ) && KPrPage::pageData( activePage() \
                )->pageEffect() ) {
         KPrPageEffectSetCommand * command = new KPrPageEffectSetCommand( \
activePage(), 0 );  m_canvas->addCommand( command );
--- trunk/koffice/kpresenter/part/KPrViewModePresentation.cpp #731674:731675
@@ -106,11 +106,11 @@
 
 void KPrViewModePresentation::activate( KoPAViewMode * previousViewMode )
 {
-    m_savedViewMode = previousViewMode;
+    m_savedViewMode = previousViewMode;               // store the previous view \
mode  m_savedParent = m_canvas->parentWidget();
-    m_canvas->setParent( ( QWidget* )0, Qt::Window );
-    m_canvas->showFullScreen();
-    m_canvas->setFocus();
+    m_canvas->setParent( ( QWidget* )0, Qt::Window ); // set parent to 0 and
+    m_canvas->showFullScreen();                       // detach widget to make
+    m_canvas->setFocus();                             // it shown full screen
 
     m_animationDirector = new KPrAnimationDirector( m_view, \
m_view->kopaDocument()->pages() );  }


[prev in list] [next in list] [prev in thread] [next in thread]