← Back to branch summary

~ubuntu-branches/ubuntu/maverick/scribus-ng/maverick-backports

« back to all changes in this revision

Viewing changes to scribus/pagepalette.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Oleksandr Moskalenko
  • Date: 2010-07-15 12:43:00 UTC
  • mfrom: (0.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100715124300-2u304r2rvy55vpkv
Tags: 1.3.7.dfsg~svn20100715-1
* Upstream svn. update.
* debian/scribus-ng.lintian: Updated overrides.
* debian/control: Updated standards version to 3.9.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/pagepalette.cpp
642
642
        if (exit == QMessageBox::Yes)
643
643
        {
644
644
                bool oldMPMode = currView->Doc->masterPageMode();
 
645
                int  storedPageNum = currView->Doc->currentPageNumber();
 
646
                int  storedViewXCoor = currView->horizontalScrollBar()->value();
 
647
                int  storedViewYCoor = currView->verticalScrollBar()->value();
 
648
 
645
649
                currView->Doc->setMasterPageMode(true);
646
650
                currView->Doc->scMW()->DeletePage2(currView->Doc->MasterNames[tmp]);
647
651
                //<<CB TODO Move back into ScribusDoc::deleteMasterPage();
651
655
                currView->Doc->replaceMasterPage(tmp);
652
656
                currView->Doc->setMasterPageMode(oldMPMode);
653
657
                currView->Doc->setModified(true);
 
658
 
 
659
                currView->Doc->setCurrentPage(currView->Doc->DocPages.at(storedPageNum));
 
660
                currView->reformPages(false);
 
661
                currView->setContentsPos(storedViewXCoor, storedViewYCoor);
 
662
                currView->DrawNew();
654
663
        }
655
664
}
656
665
 
712
721
 
713
722
void PagePalette::rebuildMasters()
714
723
{
715
 
        if (m_scMW->ScriptRunning)
 
724
        if (m_scMW->scriptIsRunning())
716
725
                return;
717
726
        masterPageList->clear();
718
727
        if (currView == 0)
733
742
 
734
743
void PagePalette::rebuildPages()
735
744
{
736
 
        if (m_scMW->ScriptRunning)
 
745
        if (m_scMW->scriptIsRunning())
737
746
                return;
738
747
        QString str;
739
748
        disconnect(pageLayout, SIGNAL(selectedLayout(int )), this, SLOT(handlePageLayout(int )));
750
759
        pageLayout->updateLayoutSelector(currView->Doc->pageSets);
751
760
        pageLayout->selectItem(currView->Doc->currentPageLayout);
752
761
        pageLayout->firstPage->setCurrentIndex(currView->Doc->pageSets[currView->Doc->currentPageLayout].FirstPage);
753
 
        pageView->MaxC = currView->Doc->Pages->count()-1;
 
762
        pageView->MaxC = currView->Doc->DocPages.count()-1;
754
763
        int counter, rowcounter, colmult, rowmult, coladd,rowadd;
755
764
        counter = currView->Doc->pageSets[currView->Doc->currentPageLayout].FirstPage;
756
765
        int cols = currView->Doc->pageSets[currView->Doc->currentPageLayout].Columns;
757
 
        int rows = (currView->Doc->Pages->count()+counter) / currView->Doc->pageSets[currView->Doc->currentPageLayout].Columns;
758
 
        if (((currView->Doc->Pages->count()+counter) % currView->Doc->pageSets[currView->Doc->currentPageLayout].Columns) != 0)
 
766
        int rows = (currView->Doc->DocPages.count()+counter) / currView->Doc->pageSets[currView->Doc->currentPageLayout].Columns;
 
767
        if (((currView->Doc->DocPages.count()+counter) % currView->Doc->pageSets[currView->Doc->currentPageLayout].Columns) != 0)
759
768
                rows++;
760
769
        rowcounter = 0;
761
770
        if (cols == 1)
792
801
        pageView->firstP = counter;
793
802
        pageView->cols = currView->Doc->pageSets[currView->Doc->currentPageLayout].Columns;
794
803
        pageList.clear();
795
 
        for (int a = 0; a < currView->Doc->Pages->count(); ++a)
 
804
        for (int a = 0; a < currView->Doc->DocPages.count(); ++a)
796
805
        {
797
 
                str = currView->Doc->Pages->at(a)->MPageNam;
 
806
                str = currView->Doc->DocPages.at(a)->MPageNam;
798
807
                SeItem *it = new SeItem(str, a, CreateIcon(a, pix));
799
808
                pageList.append(it);
800
809
                pageView->setItem(rowcounter*rowmult+rowadd, counter*colmult+coladd, (QTableWidgetItem *)it);
861
870
 
862
871
void PagePalette::setView(ScribusView *view)
863
872
{
864
 
        if (m_scMW->ScriptRunning)
 
873
        if (m_scMW->scriptIsRunning())
865
874
                return;
866
875
        currView = view;
867
876
}
939
948
        return masterPageList->Thumb;
940
949
}
941
950
 
 
951