Author: fschmid
Date: Sun May 1 09:31:22 2016
New Revision: 21265
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21265
Log:
Fixed Bug #13579: Entering masterpage edit mode should exit preview mode
Modified:
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/ui/outlinepalette.cpp
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=21265&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun May 1 09:31:22 2016
@@ -7513,6 +7513,11 @@
else
mpName = temp;
view->Deselect(true);
+ if (doc->drawAsPreview)
+ {
+ view->togglePreview(false);
+ scrActions["viewPreviewMode"]->setChecked(false);
+ }
m_WasAutoSave = doc->autoSave();
if (m_WasAutoSave)
{
Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=21265&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Sun May 1 09:31:22 2016
@@ -915,13 +915,13 @@
return;
if (currDoc==NULL)
return;
- if (currDoc->drawAsPreview)
- return;
disconnect(reportDisplay, SIGNAL(itemSelectionChanged()), this,
SLOT(slotMultiSelect()));
selectionTriggered = true;
QList<QTreeWidgetItem *> items = reportDisplay->selectedItems();
if (items.count() != 1)
{
+ if (currDoc->drawAsPreview)
+ return;
if (currDoc->appMode == modeEditClip)
currDoc->view()->requestMode(submodeEndNodeEdit);
currDoc->m_Selection->delaySignalsOn();
@@ -965,8 +965,6 @@
{
if (!m_MainWindow || m_MainWindow->scriptIsRunning())
return;
- if (currDoc->drawAsPreview)
- return;
selectionTriggered = true;
OutlineTreeItem *item = (OutlineTreeItem*)ite;
uint pg = 0;
@@ -988,6 +986,8 @@
emit selectElementByItem(pgItem, true);
break;
case 2:
+ if (currDoc->drawAsPreview)
+ return;
if (!currDoc->symbolEditMode())
{
pg = item->PageObject->pageNr();
@@ -997,6 +997,8 @@
break;
case 3:
case 4:
+ if (currDoc->drawAsPreview)
+ return;
pgItem = item->PageItemObject;
m_MainWindow->closeActiveWindowMasterPageEditor();
currDoc->setActiveLayer(pgItem->LayerID);
@@ -1007,6 +1009,8 @@
emit selectElementByItem(pgItem, true);
break;
case 5:
+ if (currDoc->drawAsPreview)
+ return;
currDoc->setActiveLayer(item->LayerID);
m_MainWindow->changeLayer(currDoc->activeLayer());
break;
@@ -1019,8 +1023,6 @@
void OutlinePalette::slotDoubleClick(QTreeWidgetItem* ite, int)
{
if (!m_MainWindow || m_MainWindow->scriptIsRunning())
- return;
- if (currDoc->drawAsPreview)
return;
OutlineTreeItem *item = (OutlineTreeItem*)ite;
PageItem *pgItem = NULL;
@@ -1034,6 +1036,8 @@
break;
case 3:
case 4:
+ if (currDoc->drawAsPreview)
+ return;
pgItem = item->PageItemObject;
m_MainWindow->closeActiveWindowMasterPageEditor();
emit editElementByItem(pgItem);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
