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

List:       kde-commits
Subject:    koffice/kpresenter/part
From:       Jean-Nicolas Artaud <jeannicolasartaud () gmail ! com>
Date:       2010-08-31 9:38:44
Message-ID: 20100831093844.E05F2AC876 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1170239 by artaud:

* Add of the slides sorter mode.


 M  +1 -0      CMakeLists.txt  
 M  +25 -2     KPrView.cpp  
 M  +4 -0      KPrView.h  
 A             KPrViewModeSlidesSorter.cpp   [License: LGPL (v2+)]
 A             KPrViewModeSlidesSorter.h   [License: LGPL (v2+)]
 M  +2 -1      kpresenter.rc  


--- trunk/koffice/kpresenter/part/CMakeLists.txt #1170238:1170239
@@ -20,6 +20,7 @@
      KPrViewAdaptor.cpp
      KPrViewModePresentation.cpp
      KPrViewModeNotes.cpp
+     KPrViewModeSlidesSorter.cpp
      KPrViewModePreviewPageEffect.cpp
      KPrPresentationTool.cpp
      KPrAnimationDirector.cpp
--- trunk/koffice/kpresenter/part/KPrView.cpp #1170238:1170239
@@ -45,6 +45,7 @@
 #include "KPrViewAdaptor.h"
 #include "KPrViewModePresentation.h"
 #include "KPrViewModeNotes.h"
+#include "KPrViewModeSlidesSorter.h"
 #include "KPrShapeManagerDisplayMasterStrategy.h"
 #include "KPrPageSelectStrategyActive.h"
 #include "KPrPicturesImport.h"
@@ -60,13 +61,12 @@
 #include "ui/KPrHtmlExportDialog.h"
 #include <QtGui/QDesktopWidget>
 
-#include <KDebug>
-
 KPrView::KPrView( KPrDocument *document, QWidget *parent )
   : KoPAView( document, parent )
   , m_presentationMode( new KPrViewModePresentation( this, kopaCanvas() ))
   , m_normalMode( viewMode() )
   , m_notesMode( new KPrViewModeNotes( this, kopaCanvas() ))
+//   , m_slidesSorterMode( new KPrViewModeSlidesSorter( this, kopaCanvas() ))
   , m_dbus( new KPrViewAdaptor( this ) )
 {
     initGUI();
@@ -93,12 +93,18 @@
 
     masterShapeManager()->setPaintingStrategy( new \
                KPrShapeManagerDisplayMasterStrategy( masterShapeManager(),
                                                    new KPrPageSelectStrategyActive( \
this ) ) ); +
+    KoPACanvas * canvas = dynamic_cast<KoPACanvas*>(kopaCanvas());
+    if (canvas) {
+        m_slidesSorterMode = new KPrViewModeSlidesSorter(this, canvas);
 }
+}
 
 KPrView::~KPrView()
 {
     delete m_presentationMode;
     delete m_notesMode;
+    delete m_slidesSorterMode;
 }
 
 KoViewConverter * KPrView::viewConverter( KoPACanvasBase * canvas )
@@ -191,6 +197,11 @@
     actionCollection()->addAction("view_notes", m_actionViewModeNotes);
     connect(m_actionViewModeNotes, SIGNAL(triggered()), this, SLOT(showNotes()));
 
+    m_actionViewModeSlidesSorter = new KAction(i18n("Slides Sorter"), this);
+    m_actionViewModeSlidesSorter->setCheckable(true);
+    actionCollection()->addAction("view_slides_sorter", \
m_actionViewModeSlidesSorter); +    connect(m_actionViewModeSlidesSorter, \
SIGNAL(triggered()), this, SLOT(showSlidesSorter())); +
     m_actionInsertPictures = new KAction(i18n("Insert Pictures..."), this);
     actionCollection()->addAction("insert_pictures", m_actionInsertPictures);
     connect(m_actionInsertPictures, SIGNAL(activated()), this, \
SLOT(insertPictures())); @@ -198,6 +209,7 @@
     QActionGroup *viewModesGroup = new QActionGroup(this);
     viewModesGroup->addAction(m_actionViewModeNormal);
     viewModesGroup->addAction(m_actionViewModeNotes);
+    viewModesGroup->addAction(m_actionViewModeSlidesSorter);
 
     m_actionCreateAnimation = new KAction( i18n( "Create Appear Animation" ), this \
                );
     actionCollection()->addAction( "edit_createanimation", m_actionCreateAnimation \
); @@ -311,6 +323,17 @@
     setViewMode(m_notesMode);
 }
 
+void KPrView::showSlidesSorter()
+{
+    // Make sure that we are not in master mode
+    // Sort master does not make sense
+    if ( viewMode()->masterMode() ) {
+        actionCollection()->action( "view_masterpages" )->setChecked( false );
+        setMasterMode( false );
+    }
+    setViewMode(m_slidesSorterMode);
+}
+
 void KPrView::dialogCustomSlideShows()
 {
     KPrDocument *doc = static_cast<KPrDocument *>( kopaDocument() );
--- trunk/koffice/kpresenter/part/KPrView.h #1170238:1170239
@@ -30,6 +30,7 @@
 class KPrDocument;
 class KPrViewAdaptor;
 class KPrViewModeNotes;
+class KPrViewModeSlidesSorter;
 class KPrViewModePresentation;
 class KPrViewModePresenterView;
 class KActionMenu;
@@ -89,6 +90,7 @@
     void createAnimation();
     void showNormal();
     void showNotes();
+    void showSlidesSorter();
     void dialogCustomSlideShows();
     void configureSlideShow();
     void configurePresenterView();
@@ -103,6 +105,7 @@
     KAction *m_actionCreateAnimation;
     KAction *m_actionViewModeNormal;
     KAction *m_actionViewModeNotes;
+    KAction *m_actionViewModeSlidesSorter;
     KAction *m_actionCreateCustomSlideShowsDialog;
     KAction *m_actionExportHtml;
     KAction *m_actionInsertPictures;
@@ -113,6 +116,7 @@
     KPrViewModePresentation *m_presentationMode;
     KoPAViewMode *m_normalMode;
     KPrViewModeNotes *m_notesMode;
+    KPrViewModeSlidesSorter *m_slidesSorterMode;
 
     KPrViewAdaptor *m_dbus;
 };
--- trunk/koffice/kpresenter/part/kpresenter.rc #1170238:1170239
@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 
-<kpartgui name="kpresenter" version="120">
+<kpartgui name="kpresenter" version="123">
     <MenuBar>
         <Menu name="file">
             <Action name="file_export_html" />
@@ -32,6 +32,7 @@
             <Separator/>
             <Action name="view_normal"/>
             <Action name="view_notes"/>
+            <Action name="view_slides_sorter"/>
             <Separator/>
             <Action name="view_masterpages"/>
             <Separator/>


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