r17095 by jghali - merge trunk revisions up to r17094

[scribus-commit]

Author: jghali
Date: Sat Dec 17 22:03:57 2011
New Revision: 17095

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17095
Log:
merge trunk revisions up to r17094

Modified:
    branches/ScribusOIF/scribus/canvasmode_normal.cpp
    branches/ScribusOIF/scribus/scribus.cpp
    branches/ScribusOIF/scribus/scribus.h
    branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
    branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h
    branches/ScribusOIF/scribus/ui/propertywidget_pos.cpp
    branches/ScribusOIF/scribus/ui/propertywidget_pos.h

Modified: branches/ScribusOIF/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17095&path=/branches/ScribusOIF/scribus/canvasmode_normal.cpp
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_normal.cpp (original)
+++ branches/ScribusOIF/scribus/canvasmode_normal.cpp Sat Dec 17 22:03:57 2011
@@ -218,7 +218,6 @@
 			{
 				m_view->requestMode(modeEditClip);
 				m_ScMW->scrActions["itemUngroup"]->setEnabled(false);
-				m_ScMW->propertiesPalette->xyzPal->doUnGroup->setEnabled(false);
 			}
 		}
 		else if (currItem->itemType() == PageItem::TextFrame)

Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17095&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Sat Dec 17 22:03:57 2011
@@ -1352,13 +1352,14 @@
 				case modeEdit:
 					view->cancelGroupTransaction();
 					break;
+				case modeCopyProperties:
+				case modeEditGradientVectors:
+				case modeEditMeshGradient:
 				case modeLinkFrames:
 				case modeUnlinkFrames:
 				case modeRotation:
-				case modeEditGradientVectors:
-				case modeEditMeshGradient:
-				case modeCopyProperties:
 					view->Deselect(false);
+				case modeEditWeldPoint:
 				case modeEyeDropper:
 				case modeImportObject:
 				case modePanning:
@@ -3115,13 +3116,7 @@
 		scrActions["itemPrintingEnabled"]->setEnabled(true);
 		if (currItem->isGroup())
 		{
-			if (doc->appMode == modeEdit)
-			{
-				propertiesPalette->xyzPal->doUnGroup->setEnabled(false);
-				scrActions["itemUngroup"]->setEnabled(false);
-			}
-			else
-				scrActions["itemUngroup"]->setEnabled(true);
+			scrActions["itemUngroup"]->setEnabled(doc->appMode != modeEdit);
 		}
 		else
 		{
@@ -6639,6 +6634,8 @@
 			activateWindow();
 		PluginManager& pluginManager(PluginManager::instance());
 		pluginManager.enablePluginActionsForSelection(this);
+
+		emit AppModeChanged(oldMode, mode);
 /*
 		QStringList pluginNames(pluginManager.pluginNames(false));
 		ScPlugin* plugin;
@@ -7491,7 +7488,6 @@
 		{
 			view->requestMode(modeEditClip);
 			scrActions["itemUngroup"]->setEnabled(false);
-			propertiesPalette->xyzPal->doUnGroup->setEnabled(false);
 		}
 	}
 	else if (ite->itemType() == PageItem::TextFrame)

Modified: branches/ScribusOIF/scribus/scribus.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17095&path=/branches/ScribusOIF/scribus/scribus.h
==============================================================================
--- branches/ScribusOIF/scribus/scribus.h (original)
+++ branches/ScribusOIF/scribus/scribus.h Sat Dec 17 22:03:57 2011
@@ -523,6 +523,7 @@
 	void updateTableMenuActions();
 
 signals:
+	void AppModeChanged(int oldMode, int newMode);
 	void TextStyle(const ParagraphStyle&);
 //deprecated: (av)
 	void TextEffects(int);

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17095&path=/branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_group.cpp Sat Dec 17 22:03:57 2011
@@ -585,7 +585,6 @@
 		m_item->update();
 		m_ScMW->view->requestMode(modeEditClip);
 		m_ScMW->scrActions["itemUngroup"]->setEnabled(false);
-		m_ScMW->propertiesPalette->xyzPal->doUnGroup->setEnabled(false);
 		connect(m_ScMW->nodePalette, SIGNAL(paletteClosed()), this, SLOT(handleShapeEditEnded()));
 		emit shapeEditStarted();
 	}

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17095&path=/branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp Sat Dec 17 22:03:57 2011
@@ -149,6 +149,7 @@
 	m_ScMW = mw;
 
 	connect(this, SIGNAL(DocChanged()), m_ScMW, SLOT(slotDocCh()));
+	connect(mw, SIGNAL(AppModeChanged(int, int)), this, SLOT(handleAppModeChanged(int, int)));
 }
 
 void PropertiesPalette_XYZ::setDoc(ScribusDoc *d)
@@ -412,6 +413,11 @@
 		setEnabled(true);
 	}
 	updateSpinBoxConstants();
+}
+
+void PropertiesPalette_XYZ::handleAppModeChanged(int oldMode, int mode)
+{
+	doUnGroup->setEnabled(mode != modeEdit && mode != modeEditClip);
 }
 
 void PropertiesPalette_XYZ::handleSelectionChanged()

Modified: branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17095&path=/branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_xyz.h Sat Dec 17 22:03:57 2011
@@ -65,6 +65,7 @@
 	void displayFlippedH(bool);
 	void displayFlippedV(bool);
 
+	void handleAppModeChanged(int oldMode, int mode);
 	void handleSelectionChanged();
 
 private slots:

Modified: branches/ScribusOIF/scribus/ui/propertywidget_pos.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17095&path=/branches/ScribusOIF/scribus/ui/propertywidget_pos.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_pos.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_pos.cpp Sat Dec 17 22:03:57 2011
@@ -294,6 +294,7 @@
 	m_ScMW = mw;
 
 	connect(this, SIGNAL(DocChanged()), m_ScMW, SLOT(slotDocCh()));
+	connect(mw, SIGNAL(AppModeChanged(int, int)), this, SLOT(handleAppModeChanged(int, int)));
 }
 
 void PropertyWidget_Position::setDoc(ScribusDoc *d)
@@ -445,6 +446,11 @@
 	}
 
 	updateSpinBoxConstants();
+}
+
+void PropertyWidget_Position::handleAppModeChanged(int oldMode, int newMode)
+{
+	doUngroup->setEnabled(newMode != modeEdit && newMode != modeEditClip);
 }
 
 void PropertyWidget_Position::handleSelectionChanged()

Modified: branches/ScribusOIF/scribus/ui/propertywidget_pos.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17095&path=/branches/ScribusOIF/scribus/ui/propertywidget_pos.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_pos.h (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_pos.h Sat Dec 17 22:03:57 2011
@@ -64,6 +64,7 @@
 	void setMainWindow(ScribusMainWindow *mw);
 	void setDoc(ScribusDoc *d);
 	
+	void handleAppModeChanged(int oldMode, int newMode);
 	void handleSelectionChanged();
 
 	void languageChange();