← Back to branch summary

~ubuntu-branches/debian/sid/scribus/sid

« back to all changes in this revision

Viewing changes to scribus/pagepalette.cpp

  • Committer: Package Import Robot
  • Author(s): Oleksandr Moskalenko
  • Date: 2012-02-09 21:50:56 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120209215056-2wrx1ara0jbm7fi5
Tags: 1.4.0.dfsg+r17287-1
http://bugs.debian.org/654703
http://bugs.debian.org/655885
http://bugs.debian.org/630751
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
  - Moved icc-profiles from Recommends to Suggests (Closes: #655885).
  - Updated Standards-Version to 3.9.2.
  - Updated extended description per lintian warning.
* debian/rules:
  - Update mailcap (Closes: #630751). A request for mime.types update has
    been sent to the mime-support maintainer.
  - Added build-arch and build-indep targets per lintian warning.
* debian/patches:
  - top_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't install the non-free "doc" dir.
  - profiles_cmakelists.patch - don't install non-free sRGB profile.
* debian/copyright: 
  - Converted to the DEP5 machine readable foramt.
  - Added licenses for free color swatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/pagepalette.cpp
620
620
        connect(this, SIGNAL(EditTemp(QString)), m_scMW, SLOT(manageMasterPages(QString)));
621
621
        connect(pageView, SIGNAL(UseTemp(QString, int)), m_scMW, SLOT(Apply_MasterPage(QString, int)));
622
622
        connect(pageView, SIGNAL(NewPage(int, QString)), m_scMW, SLOT(slotNewPageP(int, QString)));
623
 
        connect(Trash, SIGNAL(DelPage(int)), m_scMW, SLOT(DeletePage2(int)));
624
 
        connect(pageView, SIGNAL(DelPage(int)), m_scMW, SLOT(DeletePage2(int)));
 
623
        connect(Trash, SIGNAL(DelPage(int)), m_scMW, SLOT(deletePage2(int)));
 
624
        connect(pageView, SIGNAL(DelPage(int)), m_scMW, SLOT(deletePage2(int)));
625
625
        connect(this, SIGNAL(gotoPage(int)), m_scMW, SLOT(selectPagesFromOutlines(int)));
626
626
}
627
627
 
647
647
                int  storedViewYCoor = currView->verticalScrollBar()->value();
648
648
 
649
649
                currView->Doc->setMasterPageMode(true);
650
 
                currView->Doc->scMW()->DeletePage2(currView->Doc->MasterNames[tmp]);
 
650
                currView->Doc->scMW()->deletePage2(currView->Doc->MasterNames[tmp]);
651
651
                //<<CB TODO Move back into ScribusDoc::deleteMasterPage();
652
652
                //This must happen after the pages have been reformed (view/doc)
653
653
                currView->Doc->rebuildMasterNames();