1 files changed, 25 insertions, 33 deletions

diff --git a/scribus/scribus.cpp b/scribus/scribus.cpp
index f6c7ea2..1505862 100644
--- a/scribus/scribus.cpp
+++ b/scribus/scribus.cpp
@@ -5701,10 +5701,7 @@ void ScribusMainWindow::slotNewPageP(int wo, QString templ)
 	else
 		doc->addPageToSection(wo+1, where, 1);
 	doc->changed();
-	if (outlinePalette->isVisible())
-		outlinePalette->BuildTree();
-	pagePalette->rebuildPages();
-	view->DrawNew();
+	updateGUIAfterPagesChanged();
 }
 
 /** Erzeugt eine neue Seite */
@@ -5830,11 +5827,8 @@ void ScribusMainWindow::addNewPages(int wo, int where, int numPages, double heig
 	//Use wo, the dialog currently returns a page Index +1 due to old numbering scheme, function now does the -1 as required
 	doc->changed();
 	doc->addPageToSection(wo, where, numPages);
-	pagePalette->rebuildPages();
-	view->reformPages(mov);
-	view->DrawNew();
-	if (outlinePalette->isVisible())
-		outlinePalette->BuildTree();
+	doc->reformPages();
+	updateGUIAfterPagesChanged();
 
 	undoManager->setUndoEnabled(true);
 
@@ -6857,28 +6851,28 @@ void ScribusMainWindow::setItemHoch(int h)
 }
 
 //CB-->Doc partly
-void ScribusMainWindow::DeletePage2(int pg)
+void ScribusMainWindow::deletePage2(int pg)
 {
 	if (HaveDoc && doc->appMode == modeEditClip)
 		view->requestMode(submodeEndNodeEdit);
 	view->Deselect(true);
 	if (doc->Pages->count() == 1)
 		return;
-	DeletePage(pg+1, pg+1);
+	deletePage(pg+1, pg+1);
 }
 
-void ScribusMainWindow::DeletePage()
+void ScribusMainWindow::deletePage()
 {
 	if (HaveDoc && doc->appMode == modeEditClip)
 		view->requestMode(submodeEndNodeEdit);
 	view->Deselect(true);
 	DelPages *dia = new DelPages(this, doc->currentPage()->pageNr()+1, doc->Pages->count());
 	if (dia->exec())
-		DeletePage(dia->getFromPage(), dia->getToPage());
+		deletePage(dia->getFromPage(), dia->getToPage());
 	delete dia;
 }
 
-void ScribusMainWindow::DeletePage(int from, int to)
+void ScribusMainWindow::deletePage(int from, int to)
 {
 	UndoTransaction* activeTransaction = NULL;
 	assert( from > 0 );
@@ -6946,14 +6940,11 @@ void ScribusMainWindow::DeletePage(int from, int to)
 			doc->removePageFromSection(a);
 	}
 	undoManager->setUndoEnabled(false); // ugly hack to disable object moving when undoing page deletion
-	view->reformPages();
+	view->reformPagesView();
 	undoManager->setUndoEnabled(true); // ugly hack continues
 	view->GotoPage(qMin(doc->Pages->count()-1, oldPg));
-	view->DrawNew();
-	if (outlinePalette->isVisible())
-		outlinePalette->BuildTree();
+	updateGUIAfterPagesChanged();
 	doc->rebuildMasterNames();
-	pagePalette->rebuildPages();
 	pagePalette->rebuildMasters();
 	if (activeTransaction)
 	{
@@ -6963,7 +6954,7 @@ void ScribusMainWindow::DeletePage(int from, int to)
 	}
 }
 
-void ScribusMainWindow::MovePage()
+void ScribusMainWindow::movePage()
 {
 	if (HaveDoc && doc->appMode == modeEditClip)
 		view->requestMode(submodeEndNodeEdit);
@@ -6977,17 +6968,13 @@ void ScribusMainWindow::MovePage()
 		if (from != wo || (wie == 2 && to != signed(doc->Pages->count()) ) )
 		{
 			doc->movePage(from-1, to, wo-1, wie);
-			view->reformPages();
-			view->DrawNew();
-			pagePalette->rebuildPages();
-			if (outlinePalette->isVisible())
-				outlinePalette->BuildTree();
+			updateGUIAfterPagesChanged();
 		}
 	}
 	delete dia;
 }
 
-void ScribusMainWindow::CopyPage()
+void ScribusMainWindow::copyPage()
 {
 	if (HaveDoc && doc->appMode == modeEditClip)
 		view->requestMode(submodeEndNodeEdit);
@@ -7000,10 +6987,7 @@ void ScribusMainWindow::CopyPage()
 		int wo = dia->getWherePage();
 		doc->copyPage(pageNumberToCopy, wo, whereToInsert, copyCount);
 		view->Deselect(true);
-		view->DrawNew();
-		pagePalette->rebuildPages();
-		if (outlinePalette->isVisible())
-			outlinePalette->BuildTree();
+		updateGUIAfterPagesChanged();
 	}
 	delete dia;
 }
@@ -8485,7 +8469,7 @@ void ScribusMainWindow::manageMasterPages(QString temp)
 			storedViewScale = view->scale();
 			MasterPagesPalette *dia = new MasterPagesPalette(this, doc, view, temp);
 			//connect(dia, SIGNAL(createNew(int)), this, SLOT(slotNewMasterPage(int)));
-			connect(dia, SIGNAL(removePage(int )), this, SLOT(DeletePage2(int )));
+			connect(dia, SIGNAL(removePage(int )), this, SLOT(deletePage2(int )));
 			//connect(dia, SIGNAL(loadPage(QString, int, bool)), this, SLOT(loadPage(QString, int, bool)));
 			connect(dia, SIGNAL(finished()), this, SLOT(manageMasterPagesEnd()));
 			scrActions["pageInsert"]->setEnabled(false);
@@ -8734,7 +8718,7 @@ void ScribusMainWindow::restoreDeletePage(SimpleState *state, bool isUndo)
 		uint id = static_cast<uint>(duo->getUId());
 		undoManager->replaceObject(doc->Pages->at(pagenr - 1)->getUId(), duo);
 		state->set("DUMMY_ID", id);
-		DeletePage(pagenr, pagenr);
+		deletePage(pagenr, pagenr);
 	}
 	if (!pageName.isEmpty() && !oldPageMode)
 	{
@@ -8793,7 +8777,7 @@ void ScribusMainWindow::restoreAddPage(SimpleState *state, bool isUndo)
 		if (HaveDoc && doc->appMode == modeEditClip)
 			view->requestMode(submodeEndNodeEdit);
 		view->Deselect(true);
-		DeletePage(delFrom, delTo);
+		deletePage(delFrom, delTo);
 	}
 	else
 	{
@@ -9834,3 +9818,11 @@ void ScribusMainWindow::enableTextActions(QMap<QString, QPointer<ScrAction> > *a
 	scrMenuMgr->setMenuEnabled("InsertSpace", enabled);
 	scrMenuMgr->setMenuEnabled("InsertLigature", enabled);
 }
+
+void ScribusMainWindow::updateGUIAfterPagesChanged()
+{
+	view->DrawNew();
+	pagePalette->rebuildPages();
+	if (outlinePalette->isVisible())
+		outlinePalette->BuildTree();
+}