← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to stage/part/KPrView.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
stage/part/KPrView.cpp
29
29
#include <kfiledialog.h>
30
30
#include <kstatusbar.h>
31
31
 
 
32
#include <KoIcon.h>
 
33
 
32
34
#include <KoSelection.h>
33
35
#include <KoShapeManager.h>
34
36
#include <KoMainWindow.h>
41
43
#include <KoZoomController.h>
42
44
 
43
45
#include "KPrDocument.h"
 
46
#include "KPrPart.h"
44
47
#include "KPrPage.h"
45
48
#include "KPrMasterPage.h"
46
49
#include "KPrPageApplicationData.h"
64
67
 
65
68
#include "KPrPdfPrintJob.h"
66
69
 
67
 
KPrView::KPrView( KPrDocument *document, QWidget *parent )
68
 
  : KoPAView( document, parent )
 
70
KPrView::KPrView(KPrPart *part, KPrDocument *document, QWidget *parent)
 
71
  : KoPAView(part, document, parent)
 
72
  , m_part(part)
69
73
  , m_presentationMode( new KPrViewModePresentation( this, kopaCanvas() ))
70
74
  , m_normalMode( viewMode() )
71
75
  , m_notesMode( new KPrViewModeNotes( this, kopaCanvas() ))
201
205
void KPrView::initActions()
202
206
{
203
207
    setComponentData(KPrFactory::componentData());
204
 
    if ( !kopaDocument()->isReadWrite() )
 
208
    if (!m_part->isReadWrite() )
205
209
       setXMLFile( "stage_readonly.rc" );
206
210
    else
207
211
       setXMLFile( "stage.rc" );
250
254
    actionCollection()->addAction( "edit_customslideshows", m_actionEditCustomSlideShows );
251
255
    connect( m_actionEditCustomSlideShows, SIGNAL( activated() ), this, SLOT( editCustomSlideShows() ) );
252
256
 
253
 
    m_actionStartPresentation = new KActionMenu( KIcon("view-presentation"), i18n( "Start Presentation" ), this );
 
257
    m_actionStartPresentation = new KActionMenu(koIcon("view-presentation"), i18n("Start Presentation"), this);
254
258
    actionCollection()->addAction( "slideshow_start", m_actionStartPresentation );
255
259
    connect( m_actionStartPresentation, SIGNAL( activated() ), this, SLOT( startPresentation() ) );
256
260
    KAction* action = new KAction( i18n( "From Current Slide" ), this );
519
523
    centerPage();
520
524
}
521
525
 
 
526
void KPrView::replaceActivePage(KoPAPageBase *page, KoPAPageBase *newActivePage)
 
527
{
 
528
    if (page == activePage() ) {
 
529
        viewMode()->updateActivePage(newActivePage);
 
530
    }
 
531
}
 
532
 
522
533
#include "KPrView.moc"