#10587 : text editing mode actions are enabled in normal mode

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17308 11d20701-8431-0410-a711-e3c959e3b870

1 files changed, 2 insertions, 27 deletions

diff --git a/scribus/scribus.cpp b/scribus/scribus.cpp
index 1ff9926..13516c1 100644
--- a/scribus/scribus.cpp
+++ b/scribus/scribus.cpp
@@ -6564,6 +6564,8 @@ void ScribusMainWindow::setAppMode(int mode)
 			if (currItem != 0)
 			{
 				currItem->update();
+				if (currItem->asTextFrame())
+					enableTextActions(&scrActions, false);
 				scrMenuMgr->setMenuEnabled("Item", true);
 			}
 			view->horizRuler->textMode(false);
@@ -6732,33 +6734,6 @@ void ScribusMainWindow::setAppMode(int mode)
 			activateWindow();
 		PluginManager& pluginManager(PluginManager::instance());
 		pluginManager.enablePluginActionsForSelection(this);
-/*
-		QStringList pluginNames(pluginManager.pluginNames(false));
-		ScPlugin* plugin;
-		ScActionPlugin* ixplug;
-		ScrAction* pluginAction = 0;
-		QString pName;
-		for (int i = 0; i < pluginNames.count(); ++i)
-		{
-			pName = pluginNames.at(i);
-			plugin = pluginManager.getPlugin(pName, true);
-			Q_ASSERT(plugin); // all the returned names should represent loaded plugins
-			if (plugin->inherits("ScActionPlugin"))
-			{
-				ixplug = dynamic_cast<ScActionPlugin*>(plugin);
-				Q_ASSERT(ixplug);
-				ScActionPlugin::ActionInfo ai(ixplug->actionInfo());
-				pluginAction = ScCore->primaryMainWindow()->scrActions[ai.name];
-				if (pluginAction != 0)
-				{
-					if (doc->m_Selection->count() != 0)
-						pluginAction->setEnabled(ixplug->handleSelection(doc, doc->m_Selection->itemAt(0)->itemType()));
-					else
-						pluginAction->setEnabled(ixplug->handleSelection(doc));
-				}
-			}
-		}
-*/
 	}
 	actionManager->connectModeActions();
 }