r18075 by fschmid - Several fixes for the Scrapbook palette.

[scribus-commit]

Author: fschmid
Date: Tue Jan  8 11:02:27 2013
New Revision: 18075

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18075
Log:
Several fixes for the Scrapbook palette.

Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/scrapbookpalette.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18075&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Tue Jan  8 11:02:27 2013
@@ -9543,7 +9543,7 @@
 	}
 	objectString = docu.toString();
 	scrapbookPalette->ObjFromMainMenu(objectString, scID);
-}
+ }
 
 void ScribusMainWindow::changeLayer(int )
 {
@@ -10378,6 +10378,8 @@
 	undoManager->setUndoEnabled(wasUndo);
 	inlinePalette->unsetDoc();
 	inlinePalette->setDoc(doc);
+	if (outlinePalette->isVisible())
+		outlinePalette->BuildTree();
 	view->Deselect(false);
 }
 
@@ -10438,6 +10440,8 @@
 	undoManager->setUndoEnabled(wasUndo);
 	inlinePalette->unsetDoc();
 	inlinePalette->setDoc(doc);
+	if (outlinePalette->isVisible())
+		outlinePalette->BuildTree();
 	view->Deselect(false);
 }
 
@@ -10573,11 +10577,11 @@
 	propertiesPalette->updateColorList();
 	symbolPalette->updateSymbolList();
 	emit UpdateRequest(reqColorsUpdate);
-	if (outlinePalette->isVisible())
-		outlinePalette->BuildTree();
 	doc->minCanvasCoordinate = minSize;
 	doc->maxCanvasCoordinate = maxSize;
 	view->DrawNew();
+	if (outlinePalette->isVisible())
+		outlinePalette->BuildTree();
 	undoManager->setUndoEnabled(wasUndo);
 }
 

Modified: trunk/Scribus/scribus/ui/scrapbookpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18075&path=/trunk/Scribus/scribus/ui/scrapbookpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrapbookpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scrapbookpalette.cpp Tue Jan  8 11:02:27 2013
@@ -899,7 +899,8 @@
 			bv->ReadContents(fileName);
 			bv->ScFilename = fileName;
 			QDir d(fileName);
-			bv->visibleName = d.dirName();
+			if (a > 1)
+				bv->visibleName = d.dirName();
 			bv->scrollToTop();
 		}
 	}
@@ -1037,18 +1038,10 @@
 	else
 	{
 		QMenu *pmenu = new QMenu();
-		QAction* delAct;
-		QAction* saveAct;
-		QAction* closeAct;
-		if (activeBView->objectMap.count() != 0)
-		{
-			saveAct = pmenu->addAction( tr("Save as..."));
-			connect(saveAct, SIGNAL(triggered()), this, SLOT(SaveAs()));
-		}
-		closeAct = pmenu->addAction( tr("Close"));
+		QAction* closeAct = pmenu->addAction( tr("Close"));
 		if ((activeBView->canWrite) && (activeBView->objectMap.count() != 0))
 		{
-			delAct = pmenu->addAction( tr("Delete Contents"));
+			QAction* delAct = pmenu->addAction( tr("Delete Contents"));
 			connect(delAct, SIGNAL(triggered()), this, SLOT(deleteAllObj()));
 		}
 		connect(closeAct, SIGNAL(triggered()), this, SLOT(closeLib()));
@@ -1488,6 +1481,7 @@
 			}
 			emit updateRecentMenue();
 		}
+		reloadLib(activeBView->ScFilename);
 	}
 }
 
@@ -1585,6 +1579,7 @@
 			}
 		}
 		emit updateRecentMenue();
+		reloadLib(activeBView->ScFilename);
 	}
 }
 
@@ -1658,6 +1653,7 @@
 			delete tempBView->takeItem(tempBView->row(ite));
 		}
 	}
+	reloadLib(tempBView->ScFilename);
 }
 
 void Biblio::ObjFromMainMenu(QString text, int scrapID)
@@ -1709,6 +1705,7 @@
 	QListWidgetItem *item = new QListWidgetItem(QIcon(pm2), nam, actBView);
 	actBView->objectMap[nam].widgetItem = item;
 	delete pre;
+	reloadLib(actBView->ScFilename);
 }
 
 void Biblio::CleanUpTemp()